From 0eecc172d9f7e7e244870d4f53afc25c1dca5bff Mon Sep 17 00:00:00 2001
From: Neo <321592+Neo-Desktop@users.noreply.github.com>
Date: Fri, 19 Dec 2025 00:19:56 -0800
Subject: [PATCH] Version 2.0.0

---
 .../Installation Guide/data/help.html         |     2 +-
 .../Installation Guide/data/install.html      |   513 +-
 .../Installation Guide/data/logo4.gif         |   Bin 0 -> 5476 bytes
 .../Installation Guide/data/logobg.gif        |   Bin 0 -> 3295 bytes
 .../Installation Guide/data/menu.html         |    88 +-
 .../Installation Guide/data/tile_back.gif     |   Bin 157 -> 488 bytes
 .../Installation Guide/data/welcome.html      |    12 +-
 .../Installation Guide/install_guide.html     |     2 +-
 Documentation/upgrade_v11x.html               |   361 -
 Documentation/upgradefromipb_1x.html          |   116 +
 .../Other Scripts/update_auth.php             |   262 -
 Tools_and_Scripts/Other Scripts/upgrade5.php  |  2625 ----
 Tools_and_Scripts/SQL Schematic/macros.sql    |    58 -
 Tools_and_Scripts/SQL Schematic/required2.sql |   123 -
 Tools_and_Scripts/SQL Schematic/tables.sql    |   760 --
 Tools_and_Scripts/hivemail/hivemail.html      |   112 -
 .../hivemail/ipb_modules/ipb_member_sync.php  |   355 -
 .../hivemail/ipb_modules/mod_hivemail.php     |   176 -
 .../hivemail/ipb_root/register.php            |    29 -
 .../mail_includes/invision_plugin.php         |   284 -
 Tools_and_Scripts/index.html                  |    11 +
 Tools_and_Scripts/ipbportal/index_rename.php  |   420 +
 .../ipbp_readme.txt}                          |    24 +-
 Tools_and_Scripts/ipchat.php                  |   320 +
 Tools_and_Scripts/ipdynamiclite/index.php     |   236 -
 {upload => Tools_and_Scripts}/ssi.php         |   313 +-
 .../ssi_templates/active.html                 |     0
 .../ssi_templates}/index.html                 |     0
 .../ssi_templates/news.html                   |     0
 .../ssi_templates/stats.html                  |     0
 .../ssi_templates/syndicate_rss.html          |     2 +-
 .../ssi_templates/syndicate_xml.html          |    39 +
 Tools_and_Scripts/upgrade6.php                |  1367 --
 helpfulGuide.htm                              |   262 +
 readme.html                                   |    32 +-
 upload/Skin/s1/skin_boards.php                |   294 -
 upload/Skin/s1/skin_buddy.php                 |   154 -
 upload/Skin/s1/skin_calendar.php              |   444 -
 upload/Skin/s1/skin_csite.php                 |   436 -
 upload/Skin/s1/skin_emails.php                |   311 -
 upload/Skin/s1/skin_forum.php                 |   266 -
 upload/Skin/s1/skin_global.php                |   448 -
 upload/Skin/s1/skin_help.php                  |    65 -
 upload/Skin/s1/skin_legends.php               |   220 -
 upload/Skin/s1/skin_login.php                 |    77 -
 upload/Skin/s1/skin_mlist.php                 |   124 -
 upload/Skin/s1/skin_mod.php                   |   510 -
 upload/Skin/s1/skin_modcp.php                 |   754 --
 upload/Skin/s1/skin_msg.php                   |   983 --
 upload/Skin/s1/skin_online.php                |    82 -
 upload/Skin/s1/skin_poll.php                  |   120 -
 upload/Skin/s1/skin_post.php                  |   623 -
 upload/Skin/s1/skin_printpage.php             |    78 -
 upload/Skin/s1/skin_profile.php               |   414 -
 upload/Skin/s1/skin_register.php              |   534 -
 upload/Skin/s1/skin_search.php                |   489 -
 upload/Skin/s1/skin_stats.php                 |   182 -
 upload/Skin/s1/skin_subscriptions.php         |   550 -
 upload/Skin/s1/skin_topic.php                 |   410 -
 upload/Skin/s1/skin_ucp.php                   |  1253 --
 upload/admin.php                              |   821 +-
 upload/cache/css_1.css                        |   133 -
 upload/conf_global.php                        |   100 +-
 upload/conf_mime_types.php                    |    44 -
 upload/css.php                                |    34 -
 upload/fonts/font_license.txt                 |    33 -
 upload/fonts/geodesic.ttf                     |   Bin 36880 -> 0 bytes
 upload/fonts/progbot.ttf                      |   Bin 86956 -> 0 bytes
 upload/fonts/scandal.ttf                      |   Bin 41320 -> 0 bytes
 upload/fonts/xsuni.ttf                        |   Bin 97128 -> 0 bytes
 upload/html/ibfcode_old.js                    |     1 -
 upload/html/mime_types/apps.gif               |   Bin 245 -> 0 bytes
 upload/html/mime_types/bmp.gif                |   Bin 183 -> 0 bytes
 upload/html/mime_types/gif.gif                |   Bin 183 -> 0 bytes
 upload/html/mime_types/html.gif               |   Bin 123 -> 0 bytes
 upload/html/mime_types/jpeg.gif               |   Bin 183 -> 0 bytes
 upload/html/mime_types/jpg.gif                |   Bin 183 -> 0 bytes
 upload/html/mime_types/mp3.gif                |   Bin 256 -> 0 bytes
 upload/html/mime_types/parent.gif             |   Bin 216 -> 0 bytes
 upload/html/mime_types/pdf.gif                |   Bin 616 -> 0 bytes
 upload/html/mime_types/png.gif                |   Bin 153 -> 0 bytes
 upload/html/mime_types/postscript.gif         |   Bin 130 -> 0 bytes
 upload/html/mime_types/quicktime.gif          |   Bin 395 -> 0 bytes
 upload/html/mime_types/text.gif               |   Bin 111 -> 0 bytes
 upload/html/mime_types/txt.gif                |   Bin 135 -> 0 bytes
 upload/html/mime_types/win_player.gif         |   Bin 177 -> 0 bytes
 upload/html/mime_types/word.gif               |   Bin 170 -> 0 bytes
 upload/html/mime_types/zip.gif                |   Bin 182 -> 0 bytes
 upload/html/sys-img/acp_check.gif             |   Bin 535 -> 0 bytes
 upload/html/sys-img/ad-logo.jpg               |   Bin 8948 -> 0 bytes
 upload/html/sys-img/colours.html              |     1 -
 upload/html/sys-img/ipshosting.gif            |   Bin 16358 -> 0 bytes
 upload/html/sys-img/tile_back.gif             |   Bin 157 -> 0 bytes
 upload/index.php                              |   582 +-
 upload/{html/sys-img => install/img}/fade.jpg |   Bin
 .../{html/sys-img => install/img}/fadebg.jpg  |   Bin
 .../sys-img => install/img}/install_face.jpg  |   Bin
 .../img}/install_proceed.gif                  |   Bin
 .../sys-img => install/img}/install_text.gif  |   Bin
 upload/install/img/tile_back.gif              |   Bin 0 -> 488 bytes
 .../{html/sys-img => install/img}/title.gif   |   Bin
 upload/install/index.php                      |  1525 +++
 upload/install/installfiles/components.php    |  1349 ++
 upload/install/installfiles/ipb_macro.xml     |   845 ++
 upload/install/installfiles/ipb_settings.xml  |  4808 +++++++
 upload/install/sql/mysql_fulltext.php         |     6 +
 upload/install/sql/mysql_inserts.php          |   183 +
 upload/install/sql/mysql_install.php          |    75 +
 upload/install/sql/mysql_tables.php           |   973 ++
 upload/install_templates.txt                  |     1 -
 upload/ipb_templates.xml                      | 10579 ++++++++++++++++
 upload/ipchat.php                             |   154 +-
 upload/ips_kernel/class_converge.php          |   217 +
 upload/ips_kernel/class_db_mysql.php          |  1054 ++
 upload/ips_kernel/class_image.php             |   457 +
 upload/ips_kernel/class_template.php          |   465 +
 upload/ips_kernel/class_upload.php            |   270 +
 upload/ips_kernel/class_xml.php               |   400 +
 upload/ips_kernel/class_xmlarchive.php        |   431 +
 upload/{Skin/s1 => ips_kernel}/index.html     |     0
 .../ibfcode.js => jscripts/ipb_bbcode.js}     |   285 +-
 upload/jscripts/ipb_board.js                  |    14 +
 upload/jscripts/ipb_centerdiv.js              |   108 +
 upload/jscripts/ipb_finduser.js               |    75 +
 upload/jscripts/ipb_forum.js                  |   109 +
 upload/jscripts/ipb_global.js                 |   415 +
 upload/jscripts/ipb_pm.js                     |   178 +
 upload/jscripts/ipb_register.js               |    40 +
 upload/jscripts/ipb_topic.js                  |   192 +
 upload/lang/en/lang_boards.php                |     9 +-
 upload/lang/en/lang_calendar.php              |     4 +
 ...ail_content.php => lang_email_content.php} |   221 +-
 upload/lang/en/lang_error.php                 |    18 +-
 upload/lang/en/lang_forum.php                 |   148 +-
 upload/lang/en/lang_global.php                |    28 +-
 upload/lang/en/lang_help.php                  |    27 +-
 upload/lang/en/lang_login.php                 |    18 +-
 upload/lang/en/lang_mlist.php                 |    47 +-
 upload/lang/en/lang_mod.php                   |   111 +-
 upload/lang/en/lang_modcp.php                 |   197 -
 upload/lang/en/lang_msg.php                   |     7 +-
 upload/lang/en/lang_online.php                |    41 +-
 .../en/{lang_csite.php => lang_portal.php}    |     6 +-
 upload/lang/en/lang_post.php                  |    30 +-
 upload/lang/en/lang_profile.php               |    34 +-
 upload/lang/en/lang_register.php              |    78 +-
 upload/lang/en/lang_search.php                |    32 +-
 upload/lang/en/lang_subscriptions.php         |    17 +-
 upload/lang/en/lang_topic.php                 |    42 +-
 upload/lang/en/lang_ucp.php                   |   178 +-
 upload/lofiversion/index.php                  |   833 ++
 upload/lofiversion/lofi_skin.php              |   111 +
 upload/lofiversion/lofihandheld.css           |     8 +
 upload/lofiversion/lofiprint.css              |     8 +
 upload/lofiversion/lofiscreen.css             |   208 +
 upload/modules/mod_hivemail.php               |   176 -
 upload/retail/chatauth.php                    |   346 +
 upload/retail/chatservice.php                 |    46 +
 upload/{fonts => retail}/index.html           |     0
 upload/retail/regkey.php                      |     4 +
 upload/show.php                               |    55 -
 upload/skin_acp/IPB2_Standard/acp_check.gif   |   Bin 0 -> 309 bytes
 upload/skin_acp/IPB2_Standard/acp_css.css     |     1 +
 .../IPB2_Standard}/acp_delete.gif             |   Bin
 .../IPB2_Standard}/acp_edit.gif               |   Bin
 upload/skin_acp/IPB2_Standard/acp_js.js       |   220 +
 .../IPB2_Standard}/acp_resync.gif             |   Bin
 .../IPB2_Standard}/acp_rules.gif              |   Bin
 .../IPB2_Standard}/acp_search.gif             |   Bin
 .../skin_acp/IPB2_Standard/acp_trashcan.gif   |   Bin 0 -> 1194 bytes
 .../IPB2_Standard}/add.gif                    |   Bin
 .../IPB2_Standard}/bar.gif                    |   Bin
 .../IPB2_Standard}/bar_left.gif               |   Bin
 .../IPB2_Standard}/bar_right.gif              |   Bin
 .../IPB2_Standard}/blank.gif                  |   Bin
 .../IPB2_Standard}/clickinfo.gif              |   Bin
 upload/skin_acp/IPB2_Standard/colorselect.png |   Bin 0 -> 264 bytes
 .../IPB2_Standard}/colours.gif                |   Bin
 upload/skin_acp/IPB2_Standard/colours.html    |     1 +
 .../IPB2_Standard}/css.html                   |     0
 .../skin_acp/IPB2_Standard/editor_closed.gif  |   Bin 0 -> 1700 bytes
 upload/skin_acp/IPB2_Standard/editor_open.gif |   Bin 0 -> 2213 bytes
 upload/skin_acp/IPB2_Standard/emo_delete.gif  |   Bin 0 -> 410 bytes
 .../IPB2_Standard/emoticon_folder.gif         |   Bin 0 -> 624 bytes
 upload/skin_acp/IPB2_Standard/file.gif        |   Bin 0 -> 179 bytes
 upload/skin_acp/IPB2_Standard/folder.gif      |   Bin 0 -> 652 bytes
 .../IPB2_Standard/folder_with_page.gif        |   Bin 0 -> 660 bytes
 .../skin_acp/IPB2_Standard/icon_can_write.gif |   Bin 0 -> 555 bytes
 .../IPB2_Standard/icon_cannot_write.gif       |   Bin 0 -> 795 bytes
 .../IPB2_Standard}/index.html                 |     0
 .../IPB2_Standard}/item.gif                   |   Bin
 upload/skin_acp/IPB2_Standard/logo4.gif       |   Bin 0 -> 5476 bytes
 upload/skin_acp/IPB2_Standard/logobg.gif      |   Bin 0 -> 3295 bytes
 .../IPB2_Standard/memsearch_changename.gif    |   Bin 0 -> 571 bytes
 .../IPB2_Standard/memsearch_delete.gif        |   Bin 0 -> 282 bytes
 .../skin_acp/IPB2_Standard/memsearch_edit.gif |   Bin 0 -> 525 bytes
 .../IPB2_Standard/memsearch_email.gif         |   Bin 0 -> 543 bytes
 .../IPB2_Standard/memsearch_group.gif         |   Bin 0 -> 1036 bytes
 .../skin_acp/IPB2_Standard/memsearch_head.gif |   Bin 0 -> 349 bytes
 .../skin_acp/IPB2_Standard/memsearch_ip.gif   |   Bin 0 -> 1070 bytes
 .../IPB2_Standard/memsearch_posts.gif         |   Bin 0 -> 396 bytes
 .../IPB2_Standard/memsearch_suspend.gif       |   Bin 0 -> 573 bytes
 .../skin_acp/IPB2_Standard/menu_collapsed.gif |   Bin 0 -> 429 bytes
 .../skin_acp/IPB2_Standard/menu_shortcut.gif  |   Bin 0 -> 833 bytes
 .../IPB2_Standard}/minus.gif                  |   Bin
 .../IPB2_Standard}/nav.gif                    |   Bin
 .../IPB2_Standard}/plus.gif                   |   Bin
 .../IPB2_Standard}/remove.gif                 |   Bin
 .../IPB2_Standard/settings_folder.gif         |   Bin 0 -> 1177 bytes
 .../skin_acp/IPB2_Standard/skin_default.gif   |   Bin 0 -> 710 bytes
 upload/skin_acp/IPB2_Standard/skin_folder.gif |   Bin 0 -> 805 bytes
 .../IPB2_Standard/skin_folder_children.gif    |   Bin 0 -> 799 bytes
 .../IPB2_Standard/skin_folder_hidden.gif      |   Bin 0 -> 803 bytes
 .../IPB2_Standard/skin_folder_master.gif      |   Bin 0 -> 802 bytes
 upload/skin_acp/IPB2_Standard/skin_forums.gif |   Bin 0 -> 667 bytes
 .../IPB2_Standard/skin_icon_email.gif         |   Bin 0 -> 662 bytes
 .../skin_acp/IPB2_Standard/skin_invisible.gif |   Bin 0 -> 380 bytes
 upload/skin_acp/IPB2_Standard/skin_item.gif   |   Bin 0 -> 662 bytes
 .../IPB2_Standard/skin_item_altered.gif       |   Bin 0 -> 166 bytes
 .../IPB2_Standard/skin_item_inherited.gif     |   Bin 0 -> 463 bytes
 .../IPB2_Standard/skin_item_unaltered.gif     |   Bin 0 -> 166 bytes
 .../IPB2_Standard/skin_line_double.gif        |   Bin 0 -> 97 bytes
 .../IPB2_Standard/skin_line_double_t.gif      |   Bin 0 -> 98 bytes
 upload/skin_acp/IPB2_Standard/skin_line_l.gif |   Bin 0 -> 71 bytes
 .../IPB2_Standard/skin_line_single.gif        |   Bin 0 -> 84 bytes
 upload/skin_acp/IPB2_Standard/skin_line_t.gif |   Bin 0 -> 75 bytes
 .../IPB2_Standard/skin_notdefault.gif         |   Bin 0 -> 717 bytes
 .../skin_acp/IPB2_Standard/skin_notforums.gif |   Bin 0 -> 658 bytes
 upload/skin_acp/IPB2_Standard/skin_pkg.gif    |   Bin 0 -> 662 bytes
 .../skin_acp/IPB2_Standard/skin_visible.gif   |   Bin 0 -> 583 bytes
 .../IPB2_Standard/skineditor_bigger.gif       |   Bin 0 -> 117 bytes
 .../IPB2_Standard/skineditor_close.gif        |   Bin 0 -> 118 bytes
 .../IPB2_Standard/skineditor_enlarge.gif      |   Bin 0 -> 121 bytes
 .../IPB2_Standard/skineditor_float.gif        |   Bin 0 -> 125 bytes
 .../IPB2_Standard/skineditor_slice.gif        |   Bin 0 -> 52 bytes
 .../IPB2_Standard/skineditor_smaller.gif      |   Bin 0 -> 113 bytes
 .../IPB2_Standard/skineditor_tick.gif         |   Bin 0 -> 119 bytes
 upload/skin_acp/IPB2_Standard/task_cron.gif   |   Bin 0 -> 686 bytes
 upload/skin_acp/IPB2_Standard/task_run.gif    |   Bin 0 -> 680 bytes
 .../skin_acp/IPB2_Standard/task_run_now.gif   |   Bin 0 -> 680 bytes
 upload/skin_acp/IPB2_Standard/te_html.gif     |   Bin 0 -> 645 bytes
 .../skin_acp/IPB2_Standard/te_previewoff.gif  |   Bin 0 -> 688 bytes
 .../skin_acp/IPB2_Standard/te_previewon.gif   |   Bin 0 -> 671 bytes
 upload/skin_acp/IPB2_Standard/te_remove.gif   |   Bin 0 -> 333 bytes
 upload/skin_acp/IPB2_Standard/te_revert.gif   |   Bin 0 -> 333 bytes
 upload/skin_acp/IPB2_Standard/te_text.gif     |   Bin 0 -> 651 bytes
 upload/skin_acp/IPB2_Standard/tile_back.gif   |   Bin 0 -> 488 bytes
 upload/skin_acp/IPB2_Standard/tile_cat.gif    |   Bin 0 -> 2760 bytes
 .../IPB2_Standard}/tile_sub.gif               |   Bin
 .../IPB2_Standard}/top_cell.gif               |   Bin
 upload/{archive_out => skin_acp}/index.html   |     0
 .../{html/avatars => skin_cache}/index.html   |     0
 upload/sm_install.php                         |  2028 ---
 upload/sources/Admin/ad_adminlogs.php         |   348 -
 upload/sources/Admin/ad_categories.php        |   728 --
 upload/sources/Admin/ad_emaillogs.php         |   492 -
 upload/sources/Admin/ad_forums.php            |  2220 ----
 upload/sources/Admin/ad_groups.php            |  2246 ----
 upload/sources/Admin/ad_help.php              |   302 -
 upload/sources/Admin/ad_imagemacros.php       |   890 --
 upload/sources/Admin/ad_index.php             |   510 -
 upload/sources/Admin/ad_languages.php         |  1111 --
 upload/sources/Admin/ad_member.php            |  3182 -----
 upload/sources/Admin/ad_member_tools.php      |   524 -
 upload/sources/Admin/ad_moderator.php         |   958 --
 upload/sources/Admin/ad_modlogs.php           |   362 -
 upload/sources/Admin/ad_multi_moderate.php    |   684 -
 upload/sources/Admin/ad_plugins.php           |  1064 --
 upload/sources/Admin/ad_profilefields.php     |   468 -
 upload/sources/Admin/ad_settings.php          |  2548 ----
 upload/sources/Admin/ad_skin_import.php       |  1067 --
 upload/sources/Admin/ad_spiderlogs.php        |   281 -
 upload/sources/Admin/ad_statistics.php        |   566 -
 upload/sources/Admin/ad_stylesets.php         |   973 --
 upload/sources/Admin/ad_stylesheets.php       |  1349 --
 upload/sources/Admin/ad_templates.php         |  2198 ----
 upload/sources/Admin/ad_warnlogs.php          |   542 -
 upload/sources/Admin/ad_wrappers.php          |   550 -
 upload/sources/Admin/admin_functions.php      |   762 --
 upload/sources/Admin/admin_pages.php          |   174 -
 upload/sources/Admin/skin_info.php            |   582 -
 upload/sources/Boards.php                     |   911 --
 upload/sources/Drivers/mySQL.php              |   413 -
 upload/sources/Forums.php                     |  1047 --
 upload/sources/Login.php                      |   624 -
 upload/sources/Memberlist.php                 |   387 -
 upload/sources/Messenger.php                  |  2413 ----
 upload/sources/Moderate.php                   |  2120 ----
 upload/sources/Post.php                       |  1239 --
 upload/sources/Register.php                   |  1582 ---
 upload/sources/Search.php                     |  1751 ---
 upload/sources/Topics.php                     |  1795 ---
 upload/sources/Usercp.php                     |  2123 ----
 upload/sources/admin/ad_administration.php    |  3201 +++++
 upload/sources/admin/ad_adminlogs.php         |   336 +
 upload/sources/admin/ad_attachments.php       |  1052 ++
 upload/sources/admin/ad_emailerror.php        |   382 +
 upload/sources/admin/ad_emaillogs.php         |   494 +
 upload/sources/admin/ad_forums.php            |  1629 +++
 upload/sources/admin/ad_gallery.php           |    73 +
 upload/sources/admin/ad_groups.php            |  2251 ++++
 upload/sources/admin/ad_help.php              |   298 +
 upload/sources/admin/ad_imagemacros.php       |   470 +
 upload/sources/admin/ad_index.php             |   604 +
 upload/sources/{Admin => admin}/ad_ips.php    |    46 +-
 upload/sources/admin/ad_languages.php         |  1294 ++
 upload/sources/admin/ad_member.php            |  3283 +++++
 upload/sources/admin/ad_member_tools.php      |   526 +
 upload/sources/admin/ad_moderator.php         |   861 ++
 upload/sources/admin/ad_modlogs.php           |   357 +
 upload/sources/admin/ad_multi_moderate.php    |   542 +
 upload/sources/{Admin => admin}/ad_mysql.php  |   367 +-
 upload/sources/admin/ad_plugins.php           |  1249 ++
 upload/sources/admin/ad_postoffice.php        |   997 ++
 upload/sources/{Admin => admin}/ad_prefs.php  |    45 +-
 upload/sources/admin/ad_profilefields.php     |   559 +
 .../sources/{Admin => admin}/ad_quickhelp.php |    35 +-
 upload/sources/admin/ad_rebuild.php           |  1780 +++
 .../{Admin => admin}/ad_remote_template.php   |   433 +-
 upload/sources/admin/ad_settings.php          |  1887 +++
 upload/sources/admin/ad_skin_import.php       |  1266 ++
 .../sources/{Admin => admin}/ad_skinfix.php   |   386 +-
 upload/sources/admin/ad_skintools.php         |  1466 +++
 upload/sources/admin/ad_spiderlogs.php        |   305 +
 upload/sources/admin/ad_statistics.php        |   557 +
 upload/sources/admin/ad_stylesets.php         |  1847 +++
 upload/sources/admin/ad_stylesheets.php       |  1050 ++
 .../{Admin => admin}/ad_subsmanager.php       |    60 +-
 upload/sources/admin/ad_task_manager.php      |   843 ++
 upload/sources/admin/ad_templates.php         |  1377 ++
 upload/sources/{Admin => admin}/ad_warn.php   |    52 +-
 upload/sources/admin/ad_warnlogs.php          |   527 +
 upload/sources/admin/ad_wrappers.php          |   288 +
 .../sources/admin/admin_cache_functions.php   |   939 ++
 .../sources/admin/admin_forum_functions.php   |   659 +
 upload/sources/admin/admin_functions.php      |  1176 ++
 upload/sources/admin/admin_pages.php          |   213 +
 .../sources/{Admin => admin}/admin_skin.php   |   667 +-
 .../admin/admin_template_functions.php        |   356 +
 .../sys-img => sources/admin}/index.html      |     0
 upload/sources/admin/skin_info.php            |   190 +
 upload/sources/announcements.php              |   263 +
 upload/sources/boards.php                     |   389 +
 upload/sources/browsebuddy.php                |   138 +-
 upload/sources/calendar.php                   |  1760 ++-
 .../sources/classes/class_custom_fields.php   |   543 +
 upload/sources/classes/class_display.php      |   927 ++
 .../emailer.php => classes/class_email.php}   |   411 +-
 upload/sources/classes/class_forums.php       |   795 ++
 upload/sources/classes/class_session.php      |   968 ++
 upload/sources/dynamiclite/ad_dynamiclite.php |   281 -
 upload/sources/findpost.php                   |    95 +
 upload/sources/forums.php                     |  1264 ++
 upload/sources/functions.php                  |  3194 ++---
 upload/sources/{Help.php => help.php}         |   143 +-
 .../{dynamiclite/csite.php => ipbportal.php}  |   581 +-
 upload/sources/lib/add_poll.php               |    89 +-
 upload/sources/lib/boardstats_functions.php   |   506 +
 upload/sources/lib/chat04_functions.php       |   215 +
 upload/sources/lib/chat_functions.php         |    55 +-
 upload/sources/lib/digest_functions.php       |   357 +
 upload/sources/lib/modfunctions.php           |   796 +-
 upload/sources/lib/msg_functions.php          |  1179 ++
 upload/sources/lib/post_edit_post.php         |   449 +-
 upload/sources/lib/post_new_post.php          |   488 +-
 upload/sources/lib/post_parser.php            |   930 +-
 upload/sources/lib/post_poll.php              |   536 +-
 upload/sources/lib/post_poll_after.php        |   103 +-
 upload/sources/lib/post_q_reply_post.php      |   546 -
 upload/sources/lib/post_reply_post.php        |   534 +-
 upload/sources/lib/search_mysql_ftext.php     |   489 +-
 upload/sources/lib/search_mysql_man.php       |    96 +-
 upload/sources/lib/tar.php                    |   141 +-
 upload/sources/lib/task_functions.php         |   472 +
 upload/sources/lib/template_engine.bak.php    |   451 +
 upload/sources/lib/topic_linear.php           |   418 +
 upload/sources/lib/topic_threaded.php         |   508 +
 upload/sources/lib/usercp_functions.php       |  1264 +-
 upload/sources/login.php                      |   739 ++
 upload/sources/memberlist.php                 |   488 +
 upload/sources/messenger.php                  |  1805 +++
 upload/sources/misc/attach.php                |   271 +-
 upload/sources/misc/contact_member.php        |   706 +-
 upload/sources/misc/forward_page.php          |   121 +-
 upload/sources/misc/ib3.php                   |   367 -
 upload/sources/misc/legends.php               |   171 +-
 upload/sources/misc/multi_moderate.php        |   187 +-
 upload/sources/misc/print_page.php            |   309 +-
 upload/sources/misc/stats.php                 |   375 +-
 upload/sources/misc/tracker.php               |   505 +-
 upload/sources/misc/warn.php                  |   256 +-
 upload/sources/mod_cp.php                     |  2882 -----
 upload/sources/moderate.php                   |  4028 ++++++
 upload/sources/{Online.php => online.php}     |   242 +-
 upload/sources/post.php                       |  2092 +++
 upload/sources/{Profile.php => profile.php}   |   512 +-
 upload/sources/register.php                   |  1845 +++
 upload/sources/search.php                     |  1645 +++
 upload/sources/{Admin => sql}/index.html      |     0
 upload/sources/sql/mysql_admin_queries.php    |   496 +
 upload/sources/sql/mysql_extra_queries.php    |    89 +
 upload/sources/sql/mysql_queries.php          |   684 +
 upload/sources/sql/mysql_subsm_queries.php    |   180 +
 upload/sources/taskloader.php                 |    79 +
 upload/sources/tasks/announcements.php        |    90 +
 upload/sources/tasks/bulkmail.php             |    86 +
 upload/sources/tasks/calendarevents.php       |   191 +
 upload/sources/tasks/cleanout.php             |   105 +
 upload/sources/tasks/dailycleanout.php        |   123 +
 upload/sources/tasks/dailydigest.php          |    96 +
 upload/sources/tasks/rebuildstats.php         |   121 +
 upload/sources/tasks/weeklydigest.php         |    96 +
 upload/sources/topics.php                     |  2082 +++
 upload/sources/usercp.php                     |  3056 +++++
 upload/ssi_templates/index.html               |     1 -
 upload/ssi_templates/syndicate_xml.html       |     1 -
 .../{html/avatars => style_avatars}/Abu.gif   |   Bin
 .../avatars => style_avatars}/Aladdin.gif     |   Bin
 .../avatars => style_avatars}/Alfred.gif      |   Bin
 .../{html/avatars => style_avatars}/Ares.gif  |   Bin
 .../ArmondoGuitierrez.gif                     |   Bin
 .../avatars => style_avatars}/Arthur.gif      |   Bin
 .../{html/avatars => style_avatars}/Atta.gif  |   Bin
 .../avatars => style_avatars}/Batman.gif      |   Bin
 .../avatars => style_avatars}/Batman2.gif     |   Bin
 .../avatars => style_avatars}/BlackWidow.gif  |   Bin
 .../avatars => style_avatars}/BruceWayne.gif  |   Bin
 .../avatars => style_avatars}/Catwoman2.gif   |   Bin
 .../{html/avatars => style_avatars}/Flik.gif  |   Bin
 .../IPB_Community_Pack/Aeroplane.gif          |   Bin
 .../IPB_Community_Pack/Crazyman.jpg           |   Bin
 .../IPB_Community_Pack/Dolphin.jpg            |   Bin
 .../IPB_Community_Pack/Fish.gif               |   Bin
 .../IPB_Community_Pack/Golfball.gif           |   Bin
 .../IPB_Community_Pack/Green-haze.gif         |   Bin
 .../IPB_Community_Pack/Hammer-man.jpg         |   Bin
 .../IPB_Community_Pack/IBFstars.jpg           |   Bin
 .../IPB_Community_Pack/Leaf.gif               |   Bin
 .../IPB_Community_Pack/Melon.gif              |   Bin
 .../IPB_Community_Pack/Meow.gif               |   Bin
 .../IPB_Community_Pack/Orange-sticks.gif      |   Bin
 .../IPB_Community_Pack/Pink-sea.gif           |   Bin
 .../IPB_Community_Pack/Pow.gif                |   Bin
 .../IPB_Community_Pack/Radioactive.gif        |   Bin
 .../IPB_Community_Pack/Whale.jpg              |   Bin
 .../IPB_Community_Pack/Woof.gif               |   Bin
 .../IPB_Community_Pack/Wub.gif                |   Bin
 .../IPB_Community_Pack/avatar-readme.txt      |     0
 .../Smiley_Avatars/smiley-aloof.gif           |   Bin
 .../Smiley_Avatars/smiley-biggrin.gif         |   Bin
 .../Smiley_Avatars/smiley-blunder.gif         |   Bin
 .../Smiley_Avatars/smiley-evil.gif            |   Bin
 .../Smiley_Avatars/smiley-grimmace.gif        |   Bin
 .../Smiley_Avatars/smiley-punched.gif         |   Bin
 .../{html/avatars => style_avatars}/abra1.gif |   Bin
 .../{html/avatars => style_avatars}/arbok.gif |   Bin
 .../artistbirdie.gif                          |   Bin
 .../avatars => style_avatars}/avengers.gif    |   Bin
 upload/{html => style_avatars}/index.html     |     0
 .../default}/angry.gif                        |   Bin
 .../default}/biggrin.gif                      |   Bin
 .../default}/blink.gif                        |   Bin
 .../default}/blush.gif                        |   Bin
 .../default}/closedeyes.gif                   |   Bin
 .../default}/cool.gif                         |   Bin
 .../default}/dry.gif                          |   Bin
 .../default}/excl.gif                         |   Bin
 .../default}/glare.gif                        |   Bin
 .../default}/happy.gif                        |   Bin
 .../default}/huh.gif                          |   Bin
 .../default}/index.html                       |     0
 .../default}/laugh.gif                        |   Bin
 .../default}/mad.gif                          |   Bin
 .../default}/mellow.gif                       |   Bin
 .../default}/ninja.gif                        |   Bin
 .../default}/ohmy.gif                         |   Bin
 .../default}/ph34r.gif                        |   Bin
 .../default}/rolleyes.gif                     |   Bin
 .../default}/sad.gif                          |   Bin
 .../default}/sleep.gif                        |   Bin
 .../default}/smile.gif                        |   Bin
 .../default}/tongue.gif                       |   Bin
 .../default}/unsure.gif                       |   Bin
 .../default}/wacko.gif                        |   Bin
 .../default}/wink.gif                         |   Bin
 .../default}/wub.gif                          |   Bin
 upload/style_images/1/addresscard.gif         |   Bin 1382 -> 0 bytes
 upload/style_images/1/atb_calendar.gif        |   Bin 627 -> 0 bytes
 upload/style_images/1/atb_chat.gif            |   Bin 361 -> 0 bytes
 upload/style_images/1/atb_help.gif            |   Bin 617 -> 0 bytes
 upload/style_images/1/atb_members.gif         |   Bin 685 -> 0 bytes
 upload/style_images/1/atb_search.gif          |   Bin 576 -> 0 bytes
 upload/style_images/1/attachicon.gif          |   Bin 0 -> 59 bytes
 upload/style_images/1/bar.gif                 |   Bin 65 -> 107 bytes
 upload/style_images/1/bar_left.gif            |   Bin 69 -> 106 bytes
 upload/style_images/1/bar_right.gif           |   Bin 69 -> 106 bytes
 upload/style_images/1/bc_new.gif              |   Bin 1435 -> 772 bytes
 upload/style_images/1/bc_nonew.gif            |   Bin 1426 -> 754 bytes
 upload/style_images/1/bc_queued.gif           |   Bin 0 -> 70 bytes
 upload/style_images/1/bf_new.gif              |   Bin 1425 -> 771 bytes
 upload/style_images/1/bf_nonew.gif            |   Bin 1412 -> 768 bytes
 upload/style_images/1/bf_readonly.gif         |   Bin 1428 -> 755 bytes
 upload/style_images/1/birthdays.gif           |   Bin 1508 -> 0 bytes
 upload/style_images/1/br_new.gif              |   Bin 1455 -> 552 bytes
 upload/style_images/1/br_nonew.gif            |   Bin 1441 -> 547 bytes
 upload/style_images/1/br_redirect.gif         |   Bin 1447 -> 770 bytes
 upload/style_images/1/cal_addevent.gif        |   Bin 0 -> 1987 bytes
 upload/style_images/1/cal_goto.gif            |   Bin 0 -> 1267 bytes
 upload/style_images/1/cal_monthview.gif       |   Bin 0 -> 406 bytes
 upload/style_images/1/cal_newevent.bak.gif    |   Bin 0 -> 2064 bytes
 upload/style_images/1/cal_newevent.gif        |   Bin 1560 -> 1944 bytes
 upload/style_images/1/cal_weekview.gif        |   Bin 0 -> 687 bytes
 upload/style_images/1/calen.gif               |   Bin 0 -> 369 bytes
 upload/style_images/1/camera.gif              |   Bin 1756 -> 728 bytes
 upload/style_images/1/click2enlarge.gif       |   Bin 0 -> 304 bytes
 upload/style_images/1/css_img_code.gif        |   Bin 0 -> 408 bytes
 upload/style_images/1/css_img_quote.gif       |   Bin 0 -> 406 bytes
 upload/style_images/1/exp_minus.gif           |   Bin 0 -> 59 bytes
 upload/style_images/1/exp_plus.gif            |   Bin 0 -> 61 bytes
 upload/style_images/1/f_closed.gif            |   Bin 595 -> 91 bytes
 upload/style_images/1/f_hot.gif               |   Bin 367 -> 169 bytes
 upload/style_images/1/f_hot_dot.gif           |   Bin 574 -> 174 bytes
 upload/style_images/1/f_hot_no.gif            |   Bin 367 -> 169 bytes
 upload/style_images/1/f_hot_no_dot.gif        |   Bin 574 -> 174 bytes
 upload/style_images/1/f_moved.gif             |   Bin 578 -> 85 bytes
 upload/style_images/1/f_msg.gif               |   Bin 0 -> 258 bytes
 upload/style_images/1/f_msg_no.gif            |   Bin 0 -> 258 bytes
 upload/style_images/1/f_norm.gif              |   Bin 572 -> 169 bytes
 upload/style_images/1/f_norm_dot.gif          |   Bin 576 -> 174 bytes
 upload/style_images/1/f_norm_no.gif           |   Bin 571 -> 169 bytes
 upload/style_images/1/f_norm_no_dot.gif       |   Bin 576 -> 174 bytes
 upload/style_images/1/f_pinned.gif            |   Bin 1030 -> 85 bytes
 upload/style_images/1/f_poll.gif              |   Bin 367 -> 169 bytes
 upload/style_images/1/f_poll_dot.gif          |   Bin 574 -> 174 bytes
 upload/style_images/1/f_poll_no.gif           |   Bin 366 -> 169 bytes
 upload/style_images/1/f_poll_no_dot.gif       |   Bin 574 -> 174 bytes
 .../style_images/1/folder_mime_types/doc.gif  |   Bin 0 -> 1018 bytes
 .../style_images/1/folder_mime_types/eps.gif  |   Bin 0 -> 1051 bytes
 .../style_images/1/folder_mime_types/gif.gif  |   Bin 0 -> 1045 bytes
 .../style_images/1/folder_mime_types/html.gif |   Bin 0 -> 1055 bytes
 .../1/folder_mime_types}/index.html           |     0
 .../1/folder_mime_types/music.gif             |   Bin 0 -> 619 bytes
 .../style_images/1/folder_mime_types/pdf.gif  |   Bin 0 -> 617 bytes
 .../style_images/1/folder_mime_types/php.gif  |   Bin 0 -> 1088 bytes
 .../style_images/1/folder_mime_types/ppt.gif  |   Bin 0 -> 1046 bytes
 .../1/folder_mime_types/quicktime.gif         |   Bin 0 -> 1034 bytes
 .../1/folder_mime_types}/real_audio.gif       |   Bin
 .../style_images/1/folder_mime_types/rtf.gif  |   Bin 0 -> 1028 bytes
 .../1/folder_mime_types/script.gif            |   Bin 0 -> 172 bytes
 .../1/folder_mime_types}/sound.gif            |   Bin
 .../1/folder_mime_types}/stuffit.gif          |   Bin
 .../style_images/1/folder_mime_types/txt.gif  |   Bin 0 -> 640 bytes
 .../1/folder_mime_types/unknown.gif           |   Bin 0 -> 614 bytes
 .../1/folder_mime_types/win_player.gif        |   Bin 0 -> 1073 bytes
 .../style_images/1/folder_mime_types/zip.gif  |   Bin 0 -> 610 bytes
 .../1/{ => folder_post_icons}/icon1.gif       |   Bin
 .../1/{ => folder_post_icons}/icon10.gif      |   Bin
 .../1/{ => folder_post_icons}/icon11.gif      |   Bin
 .../1/{ => folder_post_icons}/icon12.gif      |   Bin
 .../1/{ => folder_post_icons}/icon13.gif      |   Bin
 .../1/{ => folder_post_icons}/icon14.gif      |   Bin
 .../1/{ => folder_post_icons}/icon2.gif       |   Bin
 .../1/{ => folder_post_icons}/icon3.gif       |   Bin
 .../1/{ => folder_post_icons}/icon4.gif       |   Bin
 .../1/{ => folder_post_icons}/icon5.gif       |   Bin
 .../1/{ => folder_post_icons}/icon6.gif       |   Bin
 .../1/{ => folder_post_icons}/icon7.gif       |   Bin
 .../1/{ => folder_post_icons}/icon8.gif       |   Bin
 .../1/{ => folder_post_icons}/icon9.gif       |   Bin
 .../1/folder_team_icons}/admin.gif            |   Bin
 .../1/folder_team_icons}/index.html           |     0
 upload/style_images/1/forum_markers_180.gif   |   Bin 0 -> 226 bytes
 upload/style_images/1/forum_rules.gif         |   Bin 1095 -> 61 bytes
 upload/style_images/1/img_larger.gif          |   Bin 0 -> 54 bytes
 upload/style_images/1/index.html              |     2 +-
 upload/style_images/1/lastpost.gif            |   Bin 255 -> 61 bytes
 upload/style_images/1/login-button.gif        |   Bin 0 -> 1226 bytes
 upload/style_images/1/login_button.gif        |   Bin 0 -> 1226 bytes
 upload/style_images/1/login_button.jpg        |   Bin 0 -> 853 bytes
 upload/style_images/1/logo4.gif               |   Bin 5946 -> 7692 bytes
 upload/style_images/1/logobg.gif              |   Bin 0 -> 3295 bytes
 upload/style_images/1/msg_folder.gif          |   Bin 0 -> 173 bytes
 upload/style_images/1/nav.gif                 |   Bin 1072 -> 87 bytes
 upload/style_images/1/newpost.gif             |   Bin 316 -> 82 bytes
 upload/style_images/1/newpost_n.gif           |   Bin 0 -> 61 bytes
 upload/style_images/1/nophoto.gif             |   Bin 2866 -> 3288 bytes
 upload/style_images/1/p_aim.gif               |   Bin 1661 -> 1294 bytes
 upload/style_images/1/p_card.gif              |   Bin 0 -> 1557 bytes
 upload/style_images/1/p_delete.gif            |   Bin 1783 -> 1583 bytes
 upload/style_images/1/p_edit.gif              |   Bin 1633 -> 1438 bytes
 upload/style_images/1/p_email.gif             |   Bin 1813 -> 1574 bytes
 upload/style_images/1/p_icq.gif               |   Bin 1699 -> 1290 bytes
 upload/style_images/1/p_im.gif                |   Bin 1568 -> 1200 bytes
 upload/style_images/1/p_move.gif              |   Bin 0 -> 1586 bytes
 upload/style_images/1/p_mq_add.gif            |   Bin 0 -> 1633 bytes
 upload/style_images/1/p_mq_remove.gif         |   Bin 0 -> 1578 bytes
 upload/style_images/1/p_msn.gif               |   Bin 1721 -> 1310 bytes
 upload/style_images/1/p_offline.gif           |   Bin 0 -> 815 bytes
 upload/style_images/1/p_online.gif            |   Bin 0 -> 1231 bytes
 upload/style_images/1/p_pin.gif               |   Bin 0 -> 1415 bytes
 upload/style_images/1/p_pm.gif                |   Bin 1682 -> 1222 bytes
 upload/style_images/1/p_quote.gif             |   Bin 1784 -> 1516 bytes
 upload/style_images/1/p_report.gif            |   Bin 1758 -> 1601 bytes
 upload/style_images/1/p_unpin.gif             |   Bin 0 -> 1553 bytes
 upload/style_images/1/p_up.gif                |   Bin 1176 -> 1402 bytes
 upload/style_images/1/p_www.gif               |   Bin 1840 -> 1523 bytes
 upload/style_images/1/p_yim.gif               |   Bin 1754 -> 1271 bytes
 upload/style_images/1/pages_icon.gif          |   Bin 0 -> 94 bytes
 upload/style_images/1/pip.gif                 |   Bin 125 -> 125 bytes
 upload/style_images/1/post_snapback.gif       |   Bin 0 -> 61 bytes
 upload/style_images/1/profile_aim.gif         |   Bin 0 -> 163 bytes
 upload/style_images/1/profile_icq.gif         |   Bin 0 -> 163 bytes
 upload/style_images/1/profile_item.gif        |   Bin 0 -> 1134 bytes
 upload/style_images/1/profile_msn.gif         |   Bin 0 -> 1028 bytes
 upload/style_images/1/profile_yahoo.gif       |   Bin 0 -> 153 bytes
 upload/style_images/1/rate1.gif               |   Bin 0 -> 311 bytes
 upload/style_images/1/rate2.gif               |   Bin 0 -> 319 bytes
 upload/style_images/1/rate3.gif               |   Bin 0 -> 319 bytes
 upload/style_images/1/rate4.gif               |   Bin 0 -> 308 bytes
 upload/style_images/1/rate5.gif               |   Bin 0 -> 226 bytes
 upload/style_images/1/stat_gzip.gif           |   Bin 0 -> 266 bytes
 upload/style_images/1/stat_load.gif           |   Bin 0 -> 1055 bytes
 upload/style_images/1/stat_sql.gif            |   Bin 0 -> 633 bytes
 upload/style_images/1/stat_time.gif           |   Bin 0 -> 1039 bytes
 upload/style_images/1/stats.gif               |   Bin 1301 -> 478 bytes
 upload/style_images/1/t_addpoll.gif           |   Bin 0 -> 1911 bytes
 upload/style_images/1/t_closed.gif            |   Bin 2601 -> 1817 bytes
 upload/style_images/1/t_comments.gif          |   Bin 0 -> 1953 bytes
 upload/style_images/1/t_ecard.gif             |   Bin 0 -> 1834 bytes
 upload/style_images/1/t_favorite.gif          |   Bin 0 -> 2102 bytes
 upload/style_images/1/t_media.gif             |   Bin 0 -> 2241 bytes
 upload/style_images/1/t_new.gif               |   Bin 2629 -> 1947 bytes
 upload/style_images/1/t_newimage.gif          |   Bin 0 -> 2108 bytes
 upload/style_images/1/t_options.gif           |   Bin 1480 -> 1932 bytes
 upload/style_images/1/t_poll.gif              |   Bin 2499 -> 1891 bytes
 upload/style_images/1/t_qr-small.gif          |   Bin 1508 -> 0 bytes
 upload/style_images/1/t_qr.gif                |   Bin 2616 -> 1972 bytes
 upload/style_images/1/t_reply.gif             |   Bin 2609 -> 1957 bytes
 upload/style_images/1/t_slideshow.gif         |   Bin 0 -> 2176 bytes
 upload/style_images/1/tile_back.gif           |   Bin 157 -> 940 bytes
 upload/style_images/1/tile_cat.gif            |   Bin 0 -> 2760 bytes
 upload/style_images/1/tile_sub.gif            |   Bin 155 -> 1581 bytes
 upload/style_images/1/to_down_pipe.gif        |   Bin 0 -> 76 bytes
 upload/style_images/1/to_post.gif             |   Bin 0 -> 321 bytes
 upload/style_images/1/to_post_no_children.gif |   Bin 0 -> 73 bytes
 upload/style_images/1/to_post_off.gif         |   Bin 0 -> 64 bytes
 .../style_images/1/to_post_with_children.gif  |   Bin 0 -> 79 bytes
 upload/style_images/1/topic_l.gif             |   Bin 0 -> 69 bytes
 upload/style_images/1/topic_selected.gif      |   Bin 0 -> 70 bytes
 upload/style_images/1/topic_unselected.gif    |   Bin 0 -> 70 bytes
 upload/style_images/1/user.gif                |   Bin 1574 -> 790 bytes
 upload/style_images/1/users.gif               |   Bin 0 -> 1386 bytes
 upload/style_images/1/warn0.gif               |   Bin 235 -> 213 bytes
 upload/style_images/1/warn1.gif               |   Bin 321 -> 301 bytes
 upload/style_images/1/warn2.gif               |   Bin 328 -> 315 bytes
 upload/style_images/1/warn3.gif               |   Bin 334 -> 314 bytes
 upload/style_images/1/warn4.gif               |   Bin 319 -> 302 bytes
 upload/style_images/1/warn5.gif               |   Bin 235 -> 213 bytes
 upload/style_images/1/warn_add.gif            |   Bin 130 -> 120 bytes
 upload/style_images/1/warn_minus.gif          |   Bin 125 -> 121 bytes
 upload/upgrade/core/functions.php             |   727 ++
 upload/upgrade/core/template.php              |   124 +
 upload/upgrade/index.php                      |   419 +
 upload/upgrade/manual_upgradekit/readme.txt   |    81 +
 upload/upgrade/manual_upgradekit/sql_1.sql    |   331 +
 upload/upgrade/manual_upgradekit/sql_2.sql    |   138 +
 .../upgrade/pre_20000/10001_mysql_queries.php |  1630 +++
 .../upgrade/pre_20000/10002_mysql_queries.php |  1428 +++
 .../upgrade/pre_20000/10003_mysql_queries.php |  1342 ++
 upload/upgrade/upg_20002/version_history.php  |     9 +
 upload/upgrade/upg_20002/version_upgrade.php  |   248 +
 upload/upgrade/upg_20003/version_history.php  |    10 +
 upload/upgrade/upg_20003/version_upgrade.php  |   116 +
 upload/upgrade/upg_20004/version_history.php  |    11 +
 upload/upgrade/upg_20004/version_upgrade.php  |   180 +
 upload/upgrade/upg_20005/version_history.php  |    12 +
 upload/upgrade/upg_20005/version_upgrade.php  |   161 +
 upload/upgrade/upg_20006/version_history.php  |    13 +
 upload/upgrade/upg_20006/version_upgrade.php  |   208 +
 .../upg_20007/ipb_settings_partial.xml        |  1139 ++
 upload/upgrade/upg_20007/version_history.php  |    14 +
 upload/upgrade/upg_20007/version_upgrade.php  |   159 +
 .../upg_20008/ipb_settings_partial.xml        |   565 +
 upload/upgrade/upg_20008/mysql_updates.php    |     5 +
 upload/upgrade/upg_20008/version_history.php  |    15 +
 upload/upgrade/upg_20008/version_upgrade.php  |   149 +
 upload/upgrade/upg_20009/components.php       |  1356 ++
 .../upg_20009/ipb_settings_partial.xml        |    80 +
 upload/upgrade/upg_20009/mysql_updates.php    |    15 +
 upload/upgrade/upg_20009/version_history.php  |    16 +
 upload/upgrade/upg_20009/version_upgrade.php  |   163 +
 upload/upgrade/upg_20010/components.php       |  1349 ++
 upload/upgrade/upg_20010/mysql_updates.php    |    15 +
 upload/upgrade/upg_20010/version_history.php  |    17 +
 upload/upgrade/upg_20010/version_upgrade.php  |   163 +
 upload/upgrade/upgrade.php                    |  1596 +++
 696 files changed, 120723 insertions(+), 77160 deletions(-)
 create mode 100644 Documentation/Installation Guide/data/logo4.gif
 create mode 100644 Documentation/Installation Guide/data/logobg.gif
 delete mode 100644 Documentation/upgrade_v11x.html
 create mode 100644 Documentation/upgradefromipb_1x.html
 delete mode 100644 Tools_and_Scripts/Other Scripts/update_auth.php
 delete mode 100644 Tools_and_Scripts/Other Scripts/upgrade5.php
 delete mode 100644 Tools_and_Scripts/SQL Schematic/macros.sql
 delete mode 100644 Tools_and_Scripts/SQL Schematic/required2.sql
 delete mode 100644 Tools_and_Scripts/SQL Schematic/tables.sql
 delete mode 100644 Tools_and_Scripts/hivemail/hivemail.html
 delete mode 100644 Tools_and_Scripts/hivemail/ipb_modules/ipb_member_sync.php
 delete mode 100644 Tools_and_Scripts/hivemail/ipb_modules/mod_hivemail.php
 delete mode 100644 Tools_and_Scripts/hivemail/ipb_root/register.php
 delete mode 100644 Tools_and_Scripts/hivemail/mail_includes/invision_plugin.php
 create mode 100644 Tools_and_Scripts/index.html
 create mode 100644 Tools_and_Scripts/ipbportal/index_rename.php
 rename Tools_and_Scripts/{ipdynamiclite/ipdl_readme.txt => ipbportal/ipbp_readme.txt} (51%)
 create mode 100644 Tools_and_Scripts/ipchat.php
 delete mode 100644 Tools_and_Scripts/ipdynamiclite/index.php
 rename {upload => Tools_and_Scripts}/ssi.php (55%)
 rename {upload => Tools_and_Scripts}/ssi_templates/active.html (100%)
 rename {upload/archive_in => Tools_and_Scripts/ssi_templates}/index.html (100%)
 rename {upload => Tools_and_Scripts}/ssi_templates/news.html (100%)
 rename {upload => Tools_and_Scripts}/ssi_templates/stats.html (100%)
 rename {upload => Tools_and_Scripts}/ssi_templates/syndicate_rss.html (73%)
 create mode 100644 Tools_and_Scripts/ssi_templates/syndicate_xml.html
 delete mode 100644 Tools_and_Scripts/upgrade6.php
 create mode 100644 helpfulGuide.htm
 delete mode 100644 upload/Skin/s1/skin_boards.php
 delete mode 100644 upload/Skin/s1/skin_buddy.php
 delete mode 100644 upload/Skin/s1/skin_calendar.php
 delete mode 100644 upload/Skin/s1/skin_csite.php
 delete mode 100644 upload/Skin/s1/skin_emails.php
 delete mode 100644 upload/Skin/s1/skin_forum.php
 delete mode 100644 upload/Skin/s1/skin_global.php
 delete mode 100644 upload/Skin/s1/skin_help.php
 delete mode 100644 upload/Skin/s1/skin_legends.php
 delete mode 100644 upload/Skin/s1/skin_login.php
 delete mode 100644 upload/Skin/s1/skin_mlist.php
 delete mode 100644 upload/Skin/s1/skin_mod.php
 delete mode 100644 upload/Skin/s1/skin_modcp.php
 delete mode 100644 upload/Skin/s1/skin_msg.php
 delete mode 100644 upload/Skin/s1/skin_online.php
 delete mode 100644 upload/Skin/s1/skin_poll.php
 delete mode 100644 upload/Skin/s1/skin_post.php
 delete mode 100644 upload/Skin/s1/skin_printpage.php
 delete mode 100644 upload/Skin/s1/skin_profile.php
 delete mode 100644 upload/Skin/s1/skin_register.php
 delete mode 100644 upload/Skin/s1/skin_search.php
 delete mode 100644 upload/Skin/s1/skin_stats.php
 delete mode 100644 upload/Skin/s1/skin_subscriptions.php
 delete mode 100644 upload/Skin/s1/skin_topic.php
 delete mode 100644 upload/Skin/s1/skin_ucp.php
 delete mode 100644 upload/cache/css_1.css
 delete mode 100644 upload/conf_mime_types.php
 delete mode 100644 upload/css.php
 delete mode 100644 upload/fonts/font_license.txt
 delete mode 100644 upload/fonts/geodesic.ttf
 delete mode 100644 upload/fonts/progbot.ttf
 delete mode 100644 upload/fonts/scandal.ttf
 delete mode 100644 upload/fonts/xsuni.ttf
 delete mode 100644 upload/html/ibfcode_old.js
 delete mode 100644 upload/html/mime_types/apps.gif
 delete mode 100644 upload/html/mime_types/bmp.gif
 delete mode 100644 upload/html/mime_types/gif.gif
 delete mode 100644 upload/html/mime_types/html.gif
 delete mode 100644 upload/html/mime_types/jpeg.gif
 delete mode 100644 upload/html/mime_types/jpg.gif
 delete mode 100644 upload/html/mime_types/mp3.gif
 delete mode 100644 upload/html/mime_types/parent.gif
 delete mode 100644 upload/html/mime_types/pdf.gif
 delete mode 100644 upload/html/mime_types/png.gif
 delete mode 100644 upload/html/mime_types/postscript.gif
 delete mode 100644 upload/html/mime_types/quicktime.gif
 delete mode 100644 upload/html/mime_types/text.gif
 delete mode 100644 upload/html/mime_types/txt.gif
 delete mode 100644 upload/html/mime_types/win_player.gif
 delete mode 100644 upload/html/mime_types/word.gif
 delete mode 100644 upload/html/mime_types/zip.gif
 delete mode 100644 upload/html/sys-img/acp_check.gif
 delete mode 100644 upload/html/sys-img/ad-logo.jpg
 delete mode 100644 upload/html/sys-img/colours.html
 delete mode 100644 upload/html/sys-img/ipshosting.gif
 delete mode 100644 upload/html/sys-img/tile_back.gif
 rename upload/{html/sys-img => install/img}/fade.jpg (100%)
 rename upload/{html/sys-img => install/img}/fadebg.jpg (100%)
 rename upload/{html/sys-img => install/img}/install_face.jpg (100%)
 rename upload/{html/sys-img => install/img}/install_proceed.gif (100%)
 rename upload/{html/sys-img => install/img}/install_text.gif (100%)
 create mode 100644 upload/install/img/tile_back.gif
 rename upload/{html/sys-img => install/img}/title.gif (100%)
 create mode 100644 upload/install/index.php
 create mode 100644 upload/install/installfiles/components.php
 create mode 100644 upload/install/installfiles/ipb_macro.xml
 create mode 100644 upload/install/installfiles/ipb_settings.xml
 create mode 100644 upload/install/sql/mysql_fulltext.php
 create mode 100644 upload/install/sql/mysql_inserts.php
 create mode 100644 upload/install/sql/mysql_install.php
 create mode 100644 upload/install/sql/mysql_tables.php
 delete mode 100644 upload/install_templates.txt
 create mode 100644 upload/ipb_templates.xml
 create mode 100644 upload/ips_kernel/class_converge.php
 create mode 100644 upload/ips_kernel/class_db_mysql.php
 create mode 100644 upload/ips_kernel/class_image.php
 create mode 100644 upload/ips_kernel/class_template.php
 create mode 100644 upload/ips_kernel/class_upload.php
 create mode 100644 upload/ips_kernel/class_xml.php
 create mode 100644 upload/ips_kernel/class_xmlarchive.php
 rename upload/{Skin/s1 => ips_kernel}/index.html (100%)
 rename upload/{html/ibfcode.js => jscripts/ipb_bbcode.js} (53%)
 create mode 100644 upload/jscripts/ipb_board.js
 create mode 100644 upload/jscripts/ipb_centerdiv.js
 create mode 100644 upload/jscripts/ipb_finduser.js
 create mode 100644 upload/jscripts/ipb_forum.js
 create mode 100644 upload/jscripts/ipb_global.js
 create mode 100644 upload/jscripts/ipb_pm.js
 create mode 100644 upload/jscripts/ipb_register.js
 create mode 100644 upload/jscripts/ipb_topic.js
 rename upload/lang/en/{email_content.php => lang_email_content.php} (65%)
 delete mode 100644 upload/lang/en/lang_modcp.php
 rename upload/lang/en/{lang_csite.php => lang_portal.php} (91%)
 create mode 100644 upload/lofiversion/index.php
 create mode 100644 upload/lofiversion/lofi_skin.php
 create mode 100644 upload/lofiversion/lofihandheld.css
 create mode 100644 upload/lofiversion/lofiprint.css
 create mode 100644 upload/lofiversion/lofiscreen.css
 delete mode 100644 upload/modules/mod_hivemail.php
 create mode 100644 upload/retail/chatauth.php
 create mode 100644 upload/retail/chatservice.php
 rename upload/{fonts => retail}/index.html (100%)
 create mode 100644 upload/retail/regkey.php
 delete mode 100644 upload/show.php
 create mode 100644 upload/skin_acp/IPB2_Standard/acp_check.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/acp_css.css
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/acp_delete.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/acp_edit.gif (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/acp_js.js
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/acp_resync.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/acp_rules.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/acp_search.gif (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/acp_trashcan.gif
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/add.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/bar.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/bar_left.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/bar_right.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/blank.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/clickinfo.gif (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/colorselect.png
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/colours.gif (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/colours.html
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/css.html (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/editor_closed.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/editor_open.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/emo_delete.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/emoticon_folder.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/file.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/folder.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/folder_with_page.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/icon_can_write.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/icon_cannot_write.gif
 rename upload/{html/emoticons => skin_acp/IPB2_Standard}/index.html (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/item.gif (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/logo4.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/logobg.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_changename.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_delete.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_edit.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_email.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_group.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_head.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_ip.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_posts.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/memsearch_suspend.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/menu_collapsed.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/menu_shortcut.gif
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/minus.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/nav.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/plus.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/remove.gif (100%)
 create mode 100644 upload/skin_acp/IPB2_Standard/settings_folder.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_default.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_folder.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_folder_children.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_folder_hidden.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_folder_master.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_forums.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_icon_email.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_invisible.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_item.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_item_altered.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_item_inherited.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_item_unaltered.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_line_double.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_line_double_t.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_line_l.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_line_single.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_line_t.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_notdefault.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_notforums.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_pkg.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skin_visible.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_bigger.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_close.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_enlarge.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_float.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_slice.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_smaller.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/skineditor_tick.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/task_cron.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/task_run.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/task_run_now.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/te_html.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/te_previewoff.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/te_previewon.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/te_remove.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/te_revert.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/te_text.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/tile_back.gif
 create mode 100644 upload/skin_acp/IPB2_Standard/tile_cat.gif
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/tile_sub.gif (100%)
 rename upload/{html/sys-img => skin_acp/IPB2_Standard}/top_cell.gif (100%)
 rename upload/{archive_out => skin_acp}/index.html (100%)
 rename upload/{html/avatars => skin_cache}/index.html (100%)
 delete mode 100644 upload/sm_install.php
 delete mode 100644 upload/sources/Admin/ad_adminlogs.php
 delete mode 100644 upload/sources/Admin/ad_categories.php
 delete mode 100644 upload/sources/Admin/ad_emaillogs.php
 delete mode 100644 upload/sources/Admin/ad_forums.php
 delete mode 100644 upload/sources/Admin/ad_groups.php
 delete mode 100644 upload/sources/Admin/ad_help.php
 delete mode 100644 upload/sources/Admin/ad_imagemacros.php
 delete mode 100644 upload/sources/Admin/ad_index.php
 delete mode 100644 upload/sources/Admin/ad_languages.php
 delete mode 100644 upload/sources/Admin/ad_member.php
 delete mode 100644 upload/sources/Admin/ad_member_tools.php
 delete mode 100644 upload/sources/Admin/ad_moderator.php
 delete mode 100644 upload/sources/Admin/ad_modlogs.php
 delete mode 100644 upload/sources/Admin/ad_multi_moderate.php
 delete mode 100644 upload/sources/Admin/ad_plugins.php
 delete mode 100644 upload/sources/Admin/ad_profilefields.php
 delete mode 100644 upload/sources/Admin/ad_settings.php
 delete mode 100644 upload/sources/Admin/ad_skin_import.php
 delete mode 100644 upload/sources/Admin/ad_spiderlogs.php
 delete mode 100644 upload/sources/Admin/ad_statistics.php
 delete mode 100644 upload/sources/Admin/ad_stylesets.php
 delete mode 100644 upload/sources/Admin/ad_stylesheets.php
 delete mode 100644 upload/sources/Admin/ad_templates.php
 delete mode 100644 upload/sources/Admin/ad_warnlogs.php
 delete mode 100644 upload/sources/Admin/ad_wrappers.php
 delete mode 100644 upload/sources/Admin/admin_functions.php
 delete mode 100644 upload/sources/Admin/admin_pages.php
 delete mode 100644 upload/sources/Admin/skin_info.php
 delete mode 100644 upload/sources/Boards.php
 delete mode 100644 upload/sources/Drivers/mySQL.php
 delete mode 100644 upload/sources/Forums.php
 delete mode 100644 upload/sources/Login.php
 delete mode 100644 upload/sources/Memberlist.php
 delete mode 100644 upload/sources/Messenger.php
 delete mode 100644 upload/sources/Moderate.php
 delete mode 100644 upload/sources/Post.php
 delete mode 100644 upload/sources/Register.php
 delete mode 100644 upload/sources/Search.php
 delete mode 100644 upload/sources/Topics.php
 delete mode 100644 upload/sources/Usercp.php
 create mode 100644 upload/sources/admin/ad_administration.php
 create mode 100644 upload/sources/admin/ad_adminlogs.php
 create mode 100644 upload/sources/admin/ad_attachments.php
 create mode 100644 upload/sources/admin/ad_emailerror.php
 create mode 100644 upload/sources/admin/ad_emaillogs.php
 create mode 100644 upload/sources/admin/ad_forums.php
 create mode 100644 upload/sources/admin/ad_gallery.php
 create mode 100644 upload/sources/admin/ad_groups.php
 create mode 100644 upload/sources/admin/ad_help.php
 create mode 100644 upload/sources/admin/ad_imagemacros.php
 create mode 100644 upload/sources/admin/ad_index.php
 rename upload/sources/{Admin => admin}/ad_ips.php (65%)
 create mode 100644 upload/sources/admin/ad_languages.php
 create mode 100644 upload/sources/admin/ad_member.php
 create mode 100644 upload/sources/admin/ad_member_tools.php
 create mode 100644 upload/sources/admin/ad_moderator.php
 create mode 100644 upload/sources/admin/ad_modlogs.php
 create mode 100644 upload/sources/admin/ad_multi_moderate.php
 rename upload/sources/{Admin => admin}/ad_mysql.php (59%)
 create mode 100644 upload/sources/admin/ad_plugins.php
 create mode 100644 upload/sources/admin/ad_postoffice.php
 rename upload/sources/{Admin => admin}/ad_prefs.php (79%)
 create mode 100644 upload/sources/admin/ad_profilefields.php
 rename upload/sources/{Admin => admin}/ad_quickhelp.php (89%)
 create mode 100644 upload/sources/admin/ad_rebuild.php
 rename upload/sources/{Admin => admin}/ad_remote_template.php (50%)
 create mode 100644 upload/sources/admin/ad_settings.php
 create mode 100644 upload/sources/admin/ad_skin_import.php
 rename upload/sources/{Admin => admin}/ad_skinfix.php (60%)
 create mode 100644 upload/sources/admin/ad_skintools.php
 create mode 100644 upload/sources/admin/ad_spiderlogs.php
 create mode 100644 upload/sources/admin/ad_statistics.php
 create mode 100644 upload/sources/admin/ad_stylesets.php
 create mode 100644 upload/sources/admin/ad_stylesheets.php
 rename upload/sources/{Admin => admin}/ad_subsmanager.php (68%)
 create mode 100644 upload/sources/admin/ad_task_manager.php
 create mode 100644 upload/sources/admin/ad_templates.php
 rename upload/sources/{Admin => admin}/ad_warn.php (72%)
 create mode 100644 upload/sources/admin/ad_warnlogs.php
 create mode 100644 upload/sources/admin/ad_wrappers.php
 create mode 100644 upload/sources/admin/admin_cache_functions.php
 create mode 100644 upload/sources/admin/admin_forum_functions.php
 create mode 100644 upload/sources/admin/admin_functions.php
 create mode 100644 upload/sources/admin/admin_pages.php
 rename upload/sources/{Admin => admin}/admin_skin.php (51%)
 create mode 100644 upload/sources/admin/admin_template_functions.php
 rename upload/{html/sys-img => sources/admin}/index.html (100%)
 create mode 100644 upload/sources/admin/skin_info.php
 create mode 100644 upload/sources/announcements.php
 create mode 100644 upload/sources/boards.php
 create mode 100644 upload/sources/classes/class_custom_fields.php
 create mode 100644 upload/sources/classes/class_display.php
 rename upload/sources/{lib/emailer.php => classes/class_email.php} (53%)
 create mode 100644 upload/sources/classes/class_forums.php
 create mode 100644 upload/sources/classes/class_session.php
 delete mode 100644 upload/sources/dynamiclite/ad_dynamiclite.php
 create mode 100644 upload/sources/findpost.php
 create mode 100644 upload/sources/forums.php
 rename upload/sources/{Help.php => help.php} (52%)
 rename upload/sources/{dynamiclite/csite.php => ipbportal.php} (55%)
 create mode 100644 upload/sources/lib/boardstats_functions.php
 create mode 100644 upload/sources/lib/chat04_functions.php
 create mode 100644 upload/sources/lib/digest_functions.php
 create mode 100644 upload/sources/lib/msg_functions.php
 delete mode 100644 upload/sources/lib/post_q_reply_post.php
 create mode 100644 upload/sources/lib/task_functions.php
 create mode 100644 upload/sources/lib/template_engine.bak.php
 create mode 100644 upload/sources/lib/topic_linear.php
 create mode 100644 upload/sources/lib/topic_threaded.php
 create mode 100644 upload/sources/login.php
 create mode 100644 upload/sources/memberlist.php
 create mode 100644 upload/sources/messenger.php
 delete mode 100644 upload/sources/misc/ib3.php
 delete mode 100644 upload/sources/mod_cp.php
 create mode 100644 upload/sources/moderate.php
 rename upload/sources/{Online.php => online.php} (62%)
 create mode 100644 upload/sources/post.php
 rename upload/sources/{Profile.php => profile.php} (51%)
 create mode 100644 upload/sources/register.php
 create mode 100644 upload/sources/search.php
 rename upload/sources/{Admin => sql}/index.html (100%)
 create mode 100644 upload/sources/sql/mysql_admin_queries.php
 create mode 100644 upload/sources/sql/mysql_extra_queries.php
 create mode 100644 upload/sources/sql/mysql_queries.php
 create mode 100644 upload/sources/sql/mysql_subsm_queries.php
 create mode 100644 upload/sources/taskloader.php
 create mode 100644 upload/sources/tasks/announcements.php
 create mode 100644 upload/sources/tasks/bulkmail.php
 create mode 100644 upload/sources/tasks/calendarevents.php
 create mode 100644 upload/sources/tasks/cleanout.php
 create mode 100644 upload/sources/tasks/dailycleanout.php
 create mode 100644 upload/sources/tasks/dailydigest.php
 create mode 100644 upload/sources/tasks/rebuildstats.php
 create mode 100644 upload/sources/tasks/weeklydigest.php
 create mode 100644 upload/sources/topics.php
 create mode 100644 upload/sources/usercp.php
 delete mode 100644 upload/ssi_templates/index.html
 delete mode 100644 upload/ssi_templates/syndicate_xml.html
 rename upload/{html/avatars => style_avatars}/Abu.gif (100%)
 rename upload/{html/avatars => style_avatars}/Aladdin.gif (100%)
 rename upload/{html/avatars => style_avatars}/Alfred.gif (100%)
 rename upload/{html/avatars => style_avatars}/Ares.gif (100%)
 rename upload/{html/avatars => style_avatars}/ArmondoGuitierrez.gif (100%)
 rename upload/{html/avatars => style_avatars}/Arthur.gif (100%)
 rename upload/{html/avatars => style_avatars}/Atta.gif (100%)
 rename upload/{html/avatars => style_avatars}/Batman.gif (100%)
 rename upload/{html/avatars => style_avatars}/Batman2.gif (100%)
 rename upload/{html/avatars => style_avatars}/BlackWidow.gif (100%)
 rename upload/{html/avatars => style_avatars}/BruceWayne.gif (100%)
 rename upload/{html/avatars => style_avatars}/Catwoman2.gif (100%)
 rename upload/{html/avatars => style_avatars}/Flik.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Aeroplane.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Crazyman.jpg (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Dolphin.jpg (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Fish.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Golfball.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Green-haze.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Hammer-man.jpg (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/IBFstars.jpg (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Leaf.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Melon.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Meow.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Orange-sticks.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Pink-sea.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Pow.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Radioactive.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Whale.jpg (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Woof.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/Wub.gif (100%)
 rename upload/{html/avatars => style_avatars}/IPB_Community_Pack/avatar-readme.txt (100%)
 rename upload/{html/avatars => style_avatars}/Smiley_Avatars/smiley-aloof.gif (100%)
 rename upload/{html/avatars => style_avatars}/Smiley_Avatars/smiley-biggrin.gif (100%)
 rename upload/{html/avatars => style_avatars}/Smiley_Avatars/smiley-blunder.gif (100%)
 rename upload/{html/avatars => style_avatars}/Smiley_Avatars/smiley-evil.gif (100%)
 rename upload/{html/avatars => style_avatars}/Smiley_Avatars/smiley-grimmace.gif (100%)
 rename upload/{html/avatars => style_avatars}/Smiley_Avatars/smiley-punched.gif (100%)
 rename upload/{html/avatars => style_avatars}/abra1.gif (100%)
 rename upload/{html/avatars => style_avatars}/arbok.gif (100%)
 rename upload/{html/avatars => style_avatars}/artistbirdie.gif (100%)
 rename upload/{html/avatars => style_avatars}/avengers.gif (100%)
 rename upload/{html => style_avatars}/index.html (100%)
 rename upload/{html/emoticons => style_emoticons/default}/angry.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/biggrin.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/blink.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/blush.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/closedeyes.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/cool.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/dry.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/excl.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/glare.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/happy.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/huh.gif (100%)
 rename upload/{sources/Drivers => style_emoticons/default}/index.html (100%)
 rename upload/{html/emoticons => style_emoticons/default}/laugh.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/mad.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/mellow.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/ninja.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/ohmy.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/ph34r.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/rolleyes.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/sad.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/sleep.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/smile.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/tongue.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/unsure.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/wacko.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/wink.gif (100%)
 rename upload/{html/emoticons => style_emoticons/default}/wub.gif (100%)
 delete mode 100644 upload/style_images/1/addresscard.gif
 delete mode 100644 upload/style_images/1/atb_calendar.gif
 delete mode 100644 upload/style_images/1/atb_chat.gif
 delete mode 100644 upload/style_images/1/atb_help.gif
 delete mode 100644 upload/style_images/1/atb_members.gif
 delete mode 100644 upload/style_images/1/atb_search.gif
 create mode 100644 upload/style_images/1/attachicon.gif
 create mode 100644 upload/style_images/1/bc_queued.gif
 delete mode 100644 upload/style_images/1/birthdays.gif
 create mode 100644 upload/style_images/1/cal_addevent.gif
 create mode 100644 upload/style_images/1/cal_goto.gif
 create mode 100644 upload/style_images/1/cal_monthview.gif
 create mode 100644 upload/style_images/1/cal_newevent.bak.gif
 create mode 100644 upload/style_images/1/cal_weekview.gif
 create mode 100644 upload/style_images/1/calen.gif
 create mode 100644 upload/style_images/1/click2enlarge.gif
 create mode 100644 upload/style_images/1/css_img_code.gif
 create mode 100644 upload/style_images/1/css_img_quote.gif
 create mode 100644 upload/style_images/1/exp_minus.gif
 create mode 100644 upload/style_images/1/exp_plus.gif
 create mode 100644 upload/style_images/1/f_msg.gif
 create mode 100644 upload/style_images/1/f_msg_no.gif
 create mode 100644 upload/style_images/1/folder_mime_types/doc.gif
 create mode 100644 upload/style_images/1/folder_mime_types/eps.gif
 create mode 100644 upload/style_images/1/folder_mime_types/gif.gif
 create mode 100644 upload/style_images/1/folder_mime_types/html.gif
 rename upload/{html/mime_types => style_images/1/folder_mime_types}/index.html (100%)
 create mode 100644 upload/style_images/1/folder_mime_types/music.gif
 create mode 100644 upload/style_images/1/folder_mime_types/pdf.gif
 create mode 100644 upload/style_images/1/folder_mime_types/php.gif
 create mode 100644 upload/style_images/1/folder_mime_types/ppt.gif
 create mode 100644 upload/style_images/1/folder_mime_types/quicktime.gif
 rename upload/{html/mime_types => style_images/1/folder_mime_types}/real_audio.gif (100%)
 create mode 100644 upload/style_images/1/folder_mime_types/rtf.gif
 create mode 100644 upload/style_images/1/folder_mime_types/script.gif
 rename upload/{html/mime_types => style_images/1/folder_mime_types}/sound.gif (100%)
 rename upload/{html/mime_types => style_images/1/folder_mime_types}/stuffit.gif (100%)
 create mode 100644 upload/style_images/1/folder_mime_types/txt.gif
 create mode 100644 upload/style_images/1/folder_mime_types/unknown.gif
 create mode 100644 upload/style_images/1/folder_mime_types/win_player.gif
 create mode 100644 upload/style_images/1/folder_mime_types/zip.gif
 rename upload/style_images/1/{ => folder_post_icons}/icon1.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon10.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon11.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon12.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon13.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon14.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon2.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon3.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon4.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon5.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon6.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon7.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon8.gif (100%)
 rename upload/style_images/1/{ => folder_post_icons}/icon9.gif (100%)
 rename upload/{html/team_icons => style_images/1/folder_team_icons}/admin.gif (100%)
 rename upload/{html/team_icons => style_images/1/folder_team_icons}/index.html (100%)
 create mode 100644 upload/style_images/1/forum_markers_180.gif
 create mode 100644 upload/style_images/1/img_larger.gif
 create mode 100644 upload/style_images/1/login-button.gif
 create mode 100644 upload/style_images/1/login_button.gif
 create mode 100644 upload/style_images/1/login_button.jpg
 create mode 100644 upload/style_images/1/logobg.gif
 create mode 100644 upload/style_images/1/msg_folder.gif
 create mode 100644 upload/style_images/1/newpost_n.gif
 create mode 100644 upload/style_images/1/p_card.gif
 create mode 100644 upload/style_images/1/p_move.gif
 create mode 100644 upload/style_images/1/p_mq_add.gif
 create mode 100644 upload/style_images/1/p_mq_remove.gif
 create mode 100644 upload/style_images/1/p_offline.gif
 create mode 100644 upload/style_images/1/p_online.gif
 create mode 100644 upload/style_images/1/p_pin.gif
 create mode 100644 upload/style_images/1/p_unpin.gif
 create mode 100644 upload/style_images/1/pages_icon.gif
 create mode 100644 upload/style_images/1/post_snapback.gif
 create mode 100644 upload/style_images/1/profile_aim.gif
 create mode 100644 upload/style_images/1/profile_icq.gif
 create mode 100644 upload/style_images/1/profile_item.gif
 create mode 100644 upload/style_images/1/profile_msn.gif
 create mode 100644 upload/style_images/1/profile_yahoo.gif
 create mode 100644 upload/style_images/1/rate1.gif
 create mode 100644 upload/style_images/1/rate2.gif
 create mode 100644 upload/style_images/1/rate3.gif
 create mode 100644 upload/style_images/1/rate4.gif
 create mode 100644 upload/style_images/1/rate5.gif
 create mode 100644 upload/style_images/1/stat_gzip.gif
 create mode 100644 upload/style_images/1/stat_load.gif
 create mode 100644 upload/style_images/1/stat_sql.gif
 create mode 100644 upload/style_images/1/stat_time.gif
 create mode 100644 upload/style_images/1/t_addpoll.gif
 create mode 100644 upload/style_images/1/t_comments.gif
 create mode 100644 upload/style_images/1/t_ecard.gif
 create mode 100644 upload/style_images/1/t_favorite.gif
 create mode 100644 upload/style_images/1/t_media.gif
 create mode 100644 upload/style_images/1/t_newimage.gif
 delete mode 100644 upload/style_images/1/t_qr-small.gif
 create mode 100644 upload/style_images/1/t_slideshow.gif
 create mode 100644 upload/style_images/1/tile_cat.gif
 create mode 100644 upload/style_images/1/to_down_pipe.gif
 create mode 100644 upload/style_images/1/to_post.gif
 create mode 100644 upload/style_images/1/to_post_no_children.gif
 create mode 100644 upload/style_images/1/to_post_off.gif
 create mode 100644 upload/style_images/1/to_post_with_children.gif
 create mode 100644 upload/style_images/1/topic_l.gif
 create mode 100644 upload/style_images/1/topic_selected.gif
 create mode 100644 upload/style_images/1/topic_unselected.gif
 create mode 100644 upload/style_images/1/users.gif
 create mode 100644 upload/upgrade/core/functions.php
 create mode 100644 upload/upgrade/core/template.php
 create mode 100644 upload/upgrade/index.php
 create mode 100644 upload/upgrade/manual_upgradekit/readme.txt
 create mode 100644 upload/upgrade/manual_upgradekit/sql_1.sql
 create mode 100644 upload/upgrade/manual_upgradekit/sql_2.sql
 create mode 100644 upload/upgrade/pre_20000/10001_mysql_queries.php
 create mode 100644 upload/upgrade/pre_20000/10002_mysql_queries.php
 create mode 100644 upload/upgrade/pre_20000/10003_mysql_queries.php
 create mode 100644 upload/upgrade/upg_20002/version_history.php
 create mode 100644 upload/upgrade/upg_20002/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20003/version_history.php
 create mode 100644 upload/upgrade/upg_20003/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20004/version_history.php
 create mode 100644 upload/upgrade/upg_20004/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20005/version_history.php
 create mode 100644 upload/upgrade/upg_20005/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20006/version_history.php
 create mode 100644 upload/upgrade/upg_20006/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20007/ipb_settings_partial.xml
 create mode 100644 upload/upgrade/upg_20007/version_history.php
 create mode 100644 upload/upgrade/upg_20007/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20008/ipb_settings_partial.xml
 create mode 100644 upload/upgrade/upg_20008/mysql_updates.php
 create mode 100644 upload/upgrade/upg_20008/version_history.php
 create mode 100644 upload/upgrade/upg_20008/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20009/components.php
 create mode 100644 upload/upgrade/upg_20009/ipb_settings_partial.xml
 create mode 100644 upload/upgrade/upg_20009/mysql_updates.php
 create mode 100644 upload/upgrade/upg_20009/version_history.php
 create mode 100644 upload/upgrade/upg_20009/version_upgrade.php
 create mode 100644 upload/upgrade/upg_20010/components.php
 create mode 100644 upload/upgrade/upg_20010/mysql_updates.php
 create mode 100644 upload/upgrade/upg_20010/version_history.php
 create mode 100644 upload/upgrade/upg_20010/version_upgrade.php
 create mode 100644 upload/upgrade/upgrade.php

diff --git a/Documentation/Installation Guide/data/help.html b/Documentation/Installation Guide/data/help.html
index f3424abe..4fd647b3 100644
--- a/Documentation/Installation Guide/data/help.html	
+++ b/Documentation/Installation Guide/data/help.html	
@@ -104,7 +104,7 @@
 
   After installing, Invision Power Board attempts to create a "lock" file which disables the installation script. If you receive this error, the installer
 
-  has not been able to create this file. After you have logged into the Admin Center for the first time, you should remove the "sm_install.php" script
+  has not been able to create this file. After you have logged into the Admin Center for the first time, you should remove the "install/index.php" script
 
   from your server and only re-upload it if you wish to make a fresh install. You can then safely ignore this warning.
 
diff --git a/Documentation/Installation Guide/data/install.html b/Documentation/Installation Guide/data/install.html
index 681d075d..41c9ab1c 100644
--- a/Documentation/Installation Guide/data/install.html	
+++ b/Documentation/Installation Guide/data/install.html	
@@ -1,671 +1,336 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-
         "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
-
 <html lang="en">
-
 <head>
-
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-
 	<title>Invision Install Guide: Installing</title>
-
 <style>
-
 		BODY, TABLE { font-family: verdana, arial; font-size:12px; line-height:150% }
-
 		.title      { background-image: url(tile_back.gif); font-family:arial; font-size:18px; color:white; font-weight:bold; height:40px }
-
 		.table1     { border:1px solid #999999 }
-
 		.table2     { border:1px dotted #999999 }
-
 		.menustrip  { font-color:black; background-color:#EEEEEE; font-size:12px; height:24px }
-
 		a:link, a:visited, a:active  { color:#000055 }
-
 		a:hover                      { color:#333377;text-decoration:underline }
-
 		.header     { border-bottom:1px dashed #999999; font-family:Verdana, Arial; font-weight:bold; color:#4C77B6; font-size:20px; background-color:#FEFEFE; letter-spacing:-1px }
 
-
-
 	</style>
-
 </head>
-
 <body bgcolor="#FFFFFF" topmargin='5' leftmargin='0'>
 
-
-
 <!-- Start content -->
 
-
-
 <a name='top'></a>
-
 <table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
  <tr>
-
   <td class='header' align='left'>Installing: Step 1 - Uploading</td>
-
  </tr>
-
  <tr>
-
   <td align='left'>
-
   <br>At this point, you should have the zip archive "unzipped" and the contents similar to those shown in the <a href='install.html#structure' target='bottom'>structure and CHMOD guide</a>. If you
-
   do not have a similar structure, check to make sure you have your zip program preferences set to allow creation of directories and to preserve case and long filenames.
-
   <br><br>
-
   If you haven't done so already, create a new directory on your server named appropriately (if you wanted to access the forums via 'http://www.domain.com/forums/', create a directory called 'forums' in the
-
   'public_html' or 'www' directory on your webserver.
-
   <br><br>
-
   Using your FTP client, move into the directory you wish to upload to (if you followed the above advice, move into the newly created 'forums' directory.)
-
   <br><br>
-
-  Using your FTP client, create the following directories "archive_in", "archive_out", "cache", "fonts", "html", "lang", "modules", "Skin", "sources", "ssi_templates", "style_images",
-
-   and "uploads" <span style='color:blue'>(TIP: If your FTP client supports "Drag n' Drop" which most modern clients do, you can save yourself some time and effort by
-
+  Using your FTP client, create the following directories "cache", "install", "ips_kernel", "jscripts", "lang", "lofiversion", "modules", "retail", "skin_acp", "skin_cache", "sources", "style_avatars", "style_emoticons", "style_images", "upgrade" and "uploads" <span style='color:blue'>(TIP: If your FTP client supports "Drag n' Drop" which most modern clients do, you can save yourself some time and effort by
   simply selecting all the files from the "unzipped" zip archive and drag them into your FTP client window, this will then copy all the files, creating the directories as it goes. If you choose
-
   to do this, you can safely ignore most of the following instruction, just remember to CHMOD as outlined in the stucture and CHMOD guide).</span>
-
   <br><br>
-
-   Once the directories have been created, CHMOD "archive_in", "archive_out" and "uploads" to 0755 (if you get permissions errors later on, you can CHMOD these to
-
+   Once the directories have been created, CHMOD "skin_cache" and "uploads" to 0755 (if you get permissions errors later on, you can CHMOD these to
    "0777"). Now, upload the contents of the files in your local folders (from the zip file) into the corresponding directories you've just created on your server. Some folders will contain other
-
    files and folders, upload them all - preserving the structure you have in your zip file (for example, upload the entire contents of the "html" folder on your computer to the "html" directory on the server).
-
    <br><br>
-
-   Once you have finished uploading into the directories, upload the rest of the files "admin.php", "conf_global.php", "conf_mime_types.php", "css.php", "index.php",
-
-   "install_templates.txt", "sm_install.php", "ssi.php" to the same place as you created the directories earlier (into "forums" for our example).
-
+   Once you have finished uploading into the directories, upload the rest of the files "admin.php", "conf_global.php", "ipb_templates.xml" and "index.php" to the same place as you created the directories earlier (into "forums" for our example).
    <br>
-
    CHMOD "conf_global.php" to 0666 (if you get permission denied errors later on, you can CHMOD this to 0777).
-
    <br><br>
-
    That's it, the hard work is now done! You can proceed to the next step.
-
   </td>
-
  </tr>
-
 </table>
 
-
-
 <br>
 
-
-
 <table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
  <tr>
-
   <td class='header' align='left'>Installing: Step 2 - Using the Installer</td>
-
  </tr>
-
  <tr>
-
   <td align='left'>
-
   An installer is provided to assist you in entering the information Invision Power Board needs to connect to your mySQL database and to create your new
-
   administrators account.
-
   <br><br>
-
-  Run the "sm_install.php" file through your web browser by entering the URL to it into your browser address bar (if you have followed our example, type in
-
-  <b>http://www.domain.com/forums/sm_install.php</b>, naturally subsituting 'domain.com' for your web address.)
-
+  Run the installer file through your web browser by entering the URL to it into your browser address bar (if you have followed our example, type in
+  <b>http://www.domain.com/forums/install/index.php</b>, naturally subsituting 'domain.com' for your web address.)
   <br><br>
-
   You will be presented with a short information screen, if you receive an error telling you that "conf_global.php" does not have suitable permissions, CHMOD "conf_global.php" to
-
   0777 via your FTP client.
-
   <br><br>
-
-  Clicking on proceed will present you with a simple information form. You will need to know your mySQL username and password at this point. If you do not know it, please ask your web host - in most
-
+  Clicking on proceed will present you with a simple information form. You will need to know your SQL username and password at this point. If you do not know it, please ask your web host - in most
   cases it is different from the FTP log in information.
-
-  <br><br>The form is very straightfoward, with only the following points needing closer examination. If you do not know what your mySQL "host" is, try "localhost" (without the quotes). if the mySQL server
-
+  <br><br>The form is very straightfoward, with only the following points needing closer examination. If you do not know what your mySQL "host" is, try "localhost" (without the quotes). if the SQL server
   is on the same server as your website (and in most cases it is) this will suffice.
-
   <br>
-
   If you have created a new database for Invision Power Board, or wish to use an existing database, enter the name of the database in the appropriate field.<br><br>Unless you intend to install multiple copies of
-
   Invision Power Board into the same database, you can leave the "table prefix" blank. If you do not have a mySQL password (if you are installing Invision Power Board on your local server) this can be left blank.
-
   <br>
-
   After submitting the form, you will be informed of any errors - if you do get an error similar to "permission denied for user@localhost using password YES" - the chances are you have either your mySQL username, mySQL password
-
   or mySQL database name wrong. Consult with your webhost for the correct information and resubmit the form.
-
   <br><br>
-
   If the installation was successful, you will receive notification to that effect.
-
   <br>
-
   Follow the link to finish off the installation and to log into your newly installed board. When the log in page loads, enter in the information you chose for your administrator account.
-
   <br>
-
   Once you are logged into the board, click on the "Admin CP" link found in the navigation bar to access the Administration Control Panel.
-
   </td>
-
  </tr>
-
 </table>
 
 
-
-
-
 <br>
 
-
-
 <table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
  <tr>
-
-  <td class='header' align='left'>Installing: Step 3 - Admin CP First Steps</td>
-
+  <td class='header' align='left'>Installing: Step 3 - Post Installation</td>
  </tr>
-
  <tr>
-
   <td align='left'>
-
   The Invision Power Board administration control panel is a very sophisticated tool. This is where you can create new categories and forums for your board, as well
-
   as set bad word filters, edit emoticons, change the board colours and so on. We recommend you browse the documentation at <a href='http://www.invisionboard.com/documentation.cgi'>Invision Power Board</a> before getting attempting some of the more complex operations.
-
   <br><br>
-
   <b>Lets get stuck in!</b>
-
   <br>
-
-  The first thing you will need to do is remove the "sm_install.php" file from your server; although Invision Power Board locks the installer after a successful install, it's always a good idea to remove the installer as re-running it
-
+  The first thing you will need to do is remove the "install/index.php" file from your server; although Invision Power Board locks the installer after a successful install, it's always a good idea to remove the installer as re-running it
   <b>will delete your database tables</b>.
-
   <br><br>
-
-  <b>Before anyone can post, we need some forums!</b>
-
-  <br>
-
-  If you wish to get stuck in straight away, now would be a good time to create some forums for your members to post in.
-
-  <br>
-
-  In the Administrators CP, click on the "Forum Control" expanding menu in the left menu frame. When it loads, click on "New Category".
-
-  <br>If your website was about computers, you could enter "PC Software" as the category name. Submit the form by clicking the button at the bottom of the page.
-
-  <br>Now we have a category to "group" the forums, lets create a forum or two.
-
-  <br><br>Click on "New Forum" found in the same expandable menu. Choose "Normal Forum" from the drop down box and proceed.
-
-  <br>There are many options here, which are outside the scope of this guide, for more information see the documentation at <a href='http://www.invisionboard.com/documentation.cgi'>Invision Power Board</a>. We can
-
-  create a new forum without knowing what all the options do. Using our example, you might want a forum dedicated to "Games" - if so, enter "Games" as the forum title, and a suitable description for the new forum. When you have done this
-
-  scroll down and submit the form by clicking the button at the bottom of the page.
-
-  <br><br>
-
-  If you now go back to your board, and refresh the page, you will see the new category and forum. Try a little test post to make sure the system is running perfectly.
-
-  <br><br>
-
   Congratulations! You have installed and set up your new Invision Power Board. If you ran into trouble, please click on the "Help!" link in the top menu bar for the FAQ and how to get support.
-
   <br><br>
-
   <i>Thank you for supporting Invision Power Board</i>
-
   </td>
-
  </tr>
-
 </table>
 
-
-
 <br>
-
 <br>
-
 <br>
-
 <br>
 
-
-
 <a name='structure'></a>
-
 <table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
  <tr>
-
   <td class='header' align='left'>File Structure and CHMOD values</td>
-
  </tr>
-
  <tr>
-
   <td align='left'>Below is a table showing the file structure and recommended CHMOD values for the file (and in the case of directories, the CHMOD
-
   values for the contents of the directories).<br>The CHMOD values are not needed for Windows based servers and can be safely ignored. The CHMOD
-
   values may vary from system to system, if in doubt, CHMOD everything to 0777.<br>Most systems will not need to CHMOD everything to install successfully,
-
   use the table below to determine what needs CHMOD'ding for installation, and what can be left until later.
-
   </td>
-
  </tr>
-
  <tr>
-
   <td align='center'>
-
   <table width='100%' align='center' cellpadding='0' cellspacing='0' bgcolor='#BCBCBC'>
-
   <tr>
-
    <td>
-
     <table width='100%' align='center' cellpadding='4' cellspacing='1'>
-
      <tr>
-
        <td width='5%' bgcolor='#EEEEEE' style='font-size:10px'>&nbsp;</td>
-
        <td width='25%' bgcolor='#EEEEEE' style='font-size:10px'><b>File/Folder Name</b></td>
-
        <td width='20%' bgcolor='#EEEEEE' style='font-size:10px' align='center'><b>Item CHMOD Value</b></td>
-
        <td width='30%' bgcolor='#EEEEEE' style='font-size:10px' align='center'><b>Contents CHMOD Value</b></td>
-
        <td width='15%' bgcolor='#EEEEEE' style='font-size:10px' align='center'><b>CHMOD for install</b></td>
-
        <td width='15%' bgcolor='#EEEEEE' style='font-size:10px' align='center'><b>Can CHMOD later</b></td>
-
       </tr>
-
       
-
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'>admin.php</td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
       
-
        <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>archive_in</span></td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-      </tr>
-
-      <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>archive_out</span></td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-      </tr>
-
-      <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>cache</span></td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'>conf_global.php</td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>0666</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'>conf_mime_types.php</td>
-
+       <td align='left' valign='middle' bgcolor='#FFFFFF'>ipb_templates.xml</td>
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'>css.php</td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-      </tr>
-
-      <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>fonts</span></td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-      </tr>
-
-      <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>html</span></td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-      </tr>
-
-      <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'>index.php</td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
       <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'>install_templates.txt</td>
-
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>install</span></td>
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
+      <tr>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>ips_kernel</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+      </tr>
+      
+      <tr>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>jscripts</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+      </tr>
+      
        <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>lang</span></td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
       </tr>
-
+      
+       <tr>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>lofiversion</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+      </tr>
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>modules</span></td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>Skin</span></td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>retail</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
       </tr>
-
+      
+       <tr>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>skin_acp</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+      </tr>
+      
       <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'>sm_install.php</td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>skin_cache</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
        <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>sources</span></td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+    
       <tr>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='file.gif' border='0' alt='PHP file'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'>ssi.php</td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-      </tr>
-
-      <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>ssi_templates</span></td>
-
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>style_avatars</span></td>
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>style_emoticons</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
+      </tr>
+      <tr>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
        <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>style_images</span></td>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>0755</a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
       </tr>
-
+      
       <tr>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
-
-       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>uploads</span></td>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'>0777</a>
-
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>upgrade</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
-       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
-
        <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
-
       </tr>
-
+      
+      <tr>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><img src='folder.gif' border='0' alt='folder'></td>
+       <td align='left' valign='middle' bgcolor='#FFFFFF'><span style='color:blue'>uploads</span></td>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>0777</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'><span style='color:red'><b>X</b></span></a>
+       <td align='center' valign='middle' bgcolor='#FFFFFF'>-</a>
+      </tr>
       </table>
-
     </td>
-
    </tr>
-
    </table>
-
   </td>
-
  </tr>
-
 </table>
 
-
-
 <!-- End content -->
 
-
-
 </body>
-
 </html>
\ No newline at end of file
diff --git a/Documentation/Installation Guide/data/logo4.gif b/Documentation/Installation Guide/data/logo4.gif
new file mode 100644
index 0000000000000000000000000000000000000000..84421a18cd7d92bf2a0a6b20d6073e8c40d64476
GIT binary patch
literal 5476
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
TXrOi)xW5K@Nwa7`26p}*E3g#;

literal 0
HcmV?d00001

diff --git a/Documentation/Installation Guide/data/logobg.gif b/Documentation/Installation Guide/data/logobg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8ec25f76721f915fc8a15e53a9bf25901b43b8c
GIT binary patch
literal 3295
zcmV<53?TDINk%w1VQ~O70QUd@bgJx3b-T&b>20CocBJ9u>h${i{Zxa?UyRH{X{|(U
zv{;79?C|$jf4*_2>7lpVPj<GPv)Oo*#(uEuPIb0mj?Ywkx@?}`b)nsNo6=c=!aroG
zr^M}vrqyPJyxQjWX`SNp_4-?d#c!nLQFpeAqRrIX?0c-}PI|%U?e=b<<Z-C%NpZDj
zm)KK#y;Xt5wZ-C+s?t(=yjOt0Rer!xe86Lp)Y{_kL1wF7ipx@Xw`_~TW0KNJaItBh
z<Yt=Qn78FvfWcmj(XheaWRuiik=IRly@sOEU5d_wxb-<*qFs*FVvx{wtnN^L#!`B^
zZ=~qs=kfRX{9b{(fwS<1p36*fvuK;$T8YnAhR;ZDvAxRUS%buqt=WR5*?O+-Z<W$$
znc8rr=4+wmQGCBxgvVQl$6JWY^!EC!!Q_6i@Kk-iVwK!XbG2EA%w~$k-sSOPk<!@U
z?^ub_o3GSJa=A}<x@(ZlkEPCGliFXB+Gd*KQFyq3wDMPh!fB7nRe-}_kI}-;=6tT~
zM{KThq~}_U)pe!gWtG-7S)XyE<!PMXWR}}qipyb-&+qg3b*Sofqu_6#;b)iHT8q?D
zfyiZ+*<g^<Ta40KgvC*IwNQ4oc(L<%u=01X@^`QCcCPSKdbw15yH<X^T!_e8gu`5h
z#$AcYV2#asspVyq)n=C0b*%1do!)7h+iINLa;WNTpy6|=>v5*%cB9{Trs8?1<9e&-
ze68tyuIhfT>wdBAfU@s_wDE$q@q)GTg0}Nqh{;cPxMh~z*yQ$Ih{<D<)^e%qR(`*E
zs^<0g`(umAWQxjOg2Kz#?QNOZP<6CXb+%W6#ZGjzQ-H)%f5&T?*-?4Abgl4qt?zWJ
z?RKy6bfMnd=l9#>^4#O_UVgc9pWJ4Lz+R8of3)&sm*7TkwpWMIL~prysN{dB;drU%
zSb@P+eY}3H=&HTmXqw@Hw)DNt=x?6hkEhX9dAqR7?@)Zie6a7a%<zG)>3OT`b*b!o
zvGI4R?EnA&A^8LV00000EC2ui0C4~`000R80FwxeN3P$OCfc-Z<HWF`!-o(fN}Ncs
zqQ#391q%GtM~#{<{Gj+4v!av9lPFWFT*<Pf%a<@?veZa(AUS;e#_aKd&6CfcK!XY$
zO0=laqeznmt;saWFE#$gl=G48lhvzOvufSSwX4^!V8dPoMz*Y3v%l~`0#R-ZsJC$A
z%AHHMuHCzM^Xh&3tFPa`fPYc>G7BCXDA^J#Ud*_$<Hw9yvC;-WmgUQsGi%<w8Gts)
zj(v$9O}g}GUi(z!`SDq@>({Vj%bqQnvI8h%eCXcIySMM(zsEpvAglH3UdWRxU#@(x
zA~t#)B%DsYy7lYW6CQKm&K|LDAHs|OA5Xr#dGg(e<<ke{m~|@f<IA5<e?p;Q<DdZ8
z&%eL_{{RN)z!*S0^3Q<?CaB<o3^w?W6da5}oPWGjXyJtzX2^?u!z?idXCQ{S87#B-
z5Q#Gmrl=x=#Ha%T6tHBr%ZxPEXyc7D4pImkhKvErk3a?~<d8%T2?YpxV8FnNOs1%e
z7e&12fRH#=Y2_e_<Uz>@4s_||mtck|CYWOQz{WX1G^yr-X=IUylweLE=bUubX(yd0
zNHUHgV$9;_pMVA`=%9d#F~AQ?xFNurjLLz8AwLW-f}pxoYU!nzW{T-Li%_D67@&qK
z>ZqiaI_d}@oC!t>j5hg525y4?FhHrf)N1RkxaNv0E{8C3&JQC5E9|hu7HcfA16(oA
z0bLl->WU9kvP7iE;$rQ!*k-G(wzo*K#5pPqAnv&2mTT_0<$}NnB?rj!Y>LjDF$Wv6
zqI<%<_~xtczWg3C$vH)!EAYVP#&SgwS=`~xy9_dr!2w15aDl+LRBZ9Z7-y_;GTt7r
zNGu?SEb_=Cmpt+!j9^kp2hK8_U<6KJ!pO%a$CAp;IOnYM&OE1bNDEnDa>39<7j5*>
zNE_XXE5=|^4Gb<LD1bCs7!yV-Ne|ug)?DA5&OAaK;7TiGmu>dhXs3Pl6_Z?Y05dm4
zox&Z`T5^TjW!s|n-hB7}?f2h$N21CBLcC)5;fN=$_~MCQ5r#2HIB|p&3>(nJJy=+M
z1>=X;;`!&Ghc5c)o)ch=8<n`C`s%E=?)vMlhq1~f3!pFr!-Cv%z$KQ10Xypi1TXyX
z#20V8@L*SCLm13A@BH)7M-P1q#;DAN9M2Z;h7*~$ApP^lhcEu{;n+}#8!e=-{`%~<
z@4owpT;c`_87RZ30Ua2zKp?8D@;>{t2%rE5NWcObP=MTMK^dyCiUvCHfe?(K1SN<F
zA_(CH0eA<awh(|yAi)NRm|z4kK*AE5@PsH#p$VUXgnPt66)=pU3};Bg8rIMTfjGlG
zkb$Bm6`&a?*q;smY*<5X81aZmOrjE(h{SLZ;RW{~f)uAn#VT5{iZ-x89JZLnDaJtv
zWiWySmb4-RR3QK_KtddBFhwnLk&RX4fgI;Z$2!{aj&(!=3ebTHJo*ujOsGHxyx@om
zFky~y$RRZX5CJB=BLGe~Lj~e6$3RxV3mGt^9htz%PI~f_pbX_FTZoPqi1L)7bOb8S
z@PHI_;S30HL?<1QgEF9?9*atm97bV;GBiS#oOA>N&d`Arqyd(|oTVd{$;@Ut^O?|W
zCIVhihX6$Ln$WC3Bgzl~DHPxj3qU{xn7K*}?tqL83V{UbK#en?f|(USfEkwI4FkMG
z8j^G-D)!0$&wl#zp8)kI0?H5o1)L(F2>qu#0nvpJ`~wDlFhdUbiGXd^pbjx;*@7Ox
z0u=ZX0sPE?831uRWjufe5)~){R?5<ry7Z+mb*UNlSc90_^raS!fq|6K0YFHUr8x-3
z3yjbPK`_V!^$37Za{$zl9sv#iKtlw`@X?m$;Hp^7s#dqk)vX2t5OpwUSI4T=VsOC-
zIz12^{_p}boC2%C$izi=PyhunKmz8dK^cO9)l-<^1#gI3R3l&nY4A0xr%0?~7t7ej
zI@YmVC}<5HOIgO6!4F2Dhk*_R0~$!f6vaqvF-(D31<*sI|9F4`jNnsJDAo+pAj9nr
z6aqT`7$KsJC53Kx%iG@i_P4(^Lk-NK0N@(8x1`PNX8)lKdXRw&X4tJ6GC_j?XkiNo
zGC?%zP=icFSGQ*10vV3rP}<T#so&kLDb~y0_PY1I@Qtq@0+4_J#P`1K6#+5=fQRM&
z0}eY_0~bWVUJ>{~1}p#v_M)%@EnH&;nJ6$9))3eP)iwY$h;V*Iz~K&i_`@I$afnN?
z26Ny*10qgwhq+MQ{wfFt7NEg^S4;ytC}0OekbnXLum%*<SO&92P;J{F;18GL$Vg7I
zl9$ZnCYNHq2{4C~r(6mRtf37qPLKg&V21{10LdEggA0Vg0xhtB0xp=rmyfK023({6
z1W>gw9f-VUFl*q>c+Rt)_sr)$vttb`zySsNOz1lY!39|M?|}-igKIQ^9e8F(16*JS
zVc5Y1$OuBDk#P-id}BeiWkH(t%#Ko<`qZdSwW?QL>KR-^0UK}ut64n*1ZP=6g0O%L
z8W03i&!7Qo2zCQzVCo<=Kn8q(8mQ^O0vR9!)ia2;w5Lt&YFqo-(jJ8{5`cp>VEfv~
zX2BR66oWQkn%WIWH?@)B0t%FXatnF{9$0V<WS~3U_|CV!_s#Eq=UWtQ;C4Iw&F@i!
zq7C54<$@Tn0|<y>6a;U;C`2I)aYUg(-|&DHt^x6UkK*GX54p%kPV$nA+yVjr$HBu*
zF7kGSVj6^yfc+RG01I5B9V{P3JDv~<>@vszcpyX@o`Ca^x8vwYPrA~V&h(}){Rvj!
z_RXEHbPGU03pl8P2?`K}u6I2JH}HTkEI{>kSbz^xa7GHe?sYieApu%|Kqy3^bWzy-
z?s(6;-uKS;y<a2h8*q5v@qYF;5Ml#LNQB}QuY?UGpa;Tu!r(;_3K9T5@rzGH;|XB}
zK3G8S76`rQM^F0FoBs5tzlPyA&;!(y{u(4`gBA$EZ5-G>0fgwmG)NE%*IOVIe3(WL
zXm9)C!`%v-&_VA>AByHX|M}35zVxS0eH~B$>j{uM^_|ZL5>UVjJqW+N_^mLFP4Hp+
z+$X^_z%Tyrlb;0Vm%a|>PyhPc|Ni*Tzy9YB0V^Cn0VJ@0^T!9>M*<LVfCoqd@F#%v
zSAd&<fDo_=@W%%XSb-LJf%HcL(9i=3umOY+fEXBpB6xoaSb`>af+(1RD!76uxCvIE
z1szBTyT^hwSc5jWf|`(nI=F*8*n>X!gFxtm&;WjfV0$tcgh-f#O6Y@|(1cF-gisiT
dQaFWFScU61d<lSixn~8)SA|~qg<u#E06Vl?c&h*a

literal 0
HcmV?d00001

diff --git a/Documentation/Installation Guide/data/menu.html b/Documentation/Installation Guide/data/menu.html
index 8a8c77d2..84f8fce5 100644
--- a/Documentation/Installation Guide/data/menu.html	
+++ b/Documentation/Installation Guide/data/menu.html	
@@ -27,7 +27,65 @@
 		a:link, a:visited, a:active  { color:#000055 }
 
 		a:hover                      { color:#333377;text-decoration:underline }
+		
+		#navstrip{ 
+			background-color: #F9F9F9;
+			border-bottom: 1px solid #CCC;
+			border-left: 1px solid #CCC;
+			border-right: 1px solid #CCC;
+			border-top: 0px solid #CCC;
+			color: #999;
+			font-size: 12px;
+			font-weight: bold;
+			padding: 8px 0px 8px 6px; 
+		}
+		
+		#navstrip a:link, 
+		#navstrip  a:visited, 
+		#navstrip a:active{ 
+			background-color: transparent; 
+			color: #222; 
+			text-decoration: none;
+		}
+		
+		#navstrip a:hover{
+			background-color: transparent; 
+			color: #5176B5; 
+			text-decoration: none;
+		}
 
+		#logostrip{ 
+			 background-color: #3860BB;
+			 background-image: url(tile_back.gif);
+			 border-bottom: 5px solid #072A66;
+			 border-left: 1px solid #072A66;
+			 border-right: 1px solid #072A66;
+			 border-top: 1px solid #072A66;
+			 height: 52px;
+			 margin: 0px;
+			 padding: 0px;
+		 }
+		 
+		 #logostripinner{
+			 background-color: transparent;
+			 background-image: url(logobg.gif);
+			 background-position: right;
+			 background-repeat: no-repeat;
+			 height: 52px;
+			 margin: 0px;
+			 padding: 0px;
+		 }
+		 
+		 #logographic{
+			 background-color: transparent;
+			 background-image: url(logo4.gif);
+			 background-position: left;
+			 background-repeat: no-repeat;
+			 cursor: pointer;
+			 height: 52px;
+			 margin: 0px;
+			 padding: 0px;
+		 }
 
 
 	</style>
@@ -36,25 +94,19 @@
 
 <body bgcolor="#FFFFFF" topmargin='5' leftmargin='0'>
 
+<div id='logostrip'>
+	<div id='logostripinner'>
+	 <div id='logographic'><!-- No Content --></div>
+	</div>
+</div>
 
-
-<table width='95%' align='center' cellpadding='4' cellspacing='0' class='table1'>
-
- <tr>
-
-  <td class='title' align='left'>Invision Board Installation and Help Guide</td>
-
- </tr>
-
- <tr>
-
-  <td class='menustrip' align='center'>[ <b><a href='welcome.html#welcome' target='bottom'>Welcome</a></b> ] :: [ <b><a href='welcome.html#require' target='bottom'>Requirements</a></b> ] :: [ <b><a href='install.html#top' target='bottom'>Installing</a></b> ] :: [ <b><a href='install.html#structure' target='bottom'>Structure & CHMOD</a></b> ] :: [ <b><a href='help.html#top' target='bottom'>Help & FAQ</a></b> ]</td>
-
- </tr>
-
-</table>
-
-
+<div id='navstrip' align='center'>
+<b><a href='welcome.html#welcome' target='bottom'>Welcome</a></b> &middot;
+<b><a href='welcome.html#require' target='bottom'>Requirements</a></b> &middot;
+<b><a href='install.html#top' target='bottom'>Installing</a></b> &middot;
+<b><a href='install.html#structure' target='bottom'>Structure & CHMOD</a></b> &middot;
+<b><a href='help.html#top' target='bottom'>Help & FAQ</a></b>
+</div>
 
 </body>
 
diff --git a/Documentation/Installation Guide/data/tile_back.gif b/Documentation/Installation Guide/data/tile_back.gif
index 1286a915b1487f14555cd16f5e89004500db80f5..330833bbb36e28d9eab84af313264885b39be08c 100644
GIT binary patch
literal 488
zcmZ?wbhEHb<Yq8oxXQo~Shlrk>!+5TUn`b9YT5BMqVZsC=gEdm?_)Yn1eR|rTk@cK
z&5MNIvr#RFlO|k9o^&a(|9tcIFCo>t>ejywuiqEma3H8+d(*bhRjZ#jZvGJ8bEahB
z-I%sx(XB^=Dt81|?X2JUu59uB+I6p*cYF;f+uFG0W9h=XAvL>e*1nAEIvrZOr+n$d
z$fiS;D<0Qvd|S8SP1DwoVRd_}Rz77Q4k-R)0V~u2ksv=Yu>E&vEbtH!=sTg3cqGTl
zed3A|shtt)Z+Iu1e#@5dV1q=M*6j03d#cW!lezcd2cygS+m7q@)V;6z`M*J5xVfcO
zSgE74OG%@*uU~_E(&Q=J64PhQlrWkzci#L3M!JiaEY)RRv2qo&_S$vpwYfHJ-omB0
zeaB8kwLN?HsYxF^bXc1I*zptme5cQx<rBDY@sa?~)oa&zq;B25Bc*x&!9z{9Cr_WT
zalCx>nnUK@`wud*pTB&S<^A#V7q8CWfB$v3IAlCFIJ7o%2!|~=uwkJym!Xo^90}*v
zqummrb8ej2_?VMZ!MSV7hlNW{PL{V>5p(iVbL(`2<R}k^&CAZRFciJI!`aYso^`&1
JCkrEkH2{)V;TQk_

literal 157
zcmZ?wbhEHbWMnX5IKlt||Ns9FDBTiLvpcfsP)x^(_@1+gedpu4PE~C9pE~tg%H%6a
z6E9}Wyqz=uVb+|x>C<my&%Kwo@NvP?=lM&XmaqR*w(dje+V>@^-xjZYU9|jV#m3J-
z1HlG^2*sZ)j0_Ai3_2hV$W8`UsRSh+mqrQp%^CrpUHV*nquOG_w!W=-|9`&#gEat5
Cct)uJ

diff --git a/Documentation/Installation Guide/data/welcome.html b/Documentation/Installation Guide/data/welcome.html
index 41421c79..975a0477 100644
--- a/Documentation/Installation Guide/data/welcome.html	
+++ b/Documentation/Installation Guide/data/welcome.html	
@@ -28,7 +28,7 @@
  </tr>
  <tr>
   <td align='left'>
-  <br>Welcome to Invision Power Board, a fast, efficient, scalable community solution written in PHP and using MySQL for database storage.
+  <br>Welcome to Invision Power Board, a fast, efficient, scalable community solution written in PHP.
   <br><br>
   This guide will help you through the installation process and get you on your way to setting up your own Invision Power Board.
   <br>
@@ -59,16 +59,16 @@
   <td align='left'>The exact requirements will depend on many factors, your estimated board traffic being one.
   <br><br><b>Server Requirements</b>
   <br>
-  You must have a webserver that has PHP 4.0.3 (or better) and mySQL 3.22 (or better) installed. If you are unsure whether your server has these
+  You must have a webserver that has PHP 4.1.0 (or better) and mySQL 3.23 (or better) installed. If you are unsure whether your server has these
   programs installed, please check with your web host now. If you are capable, you can always <a href='http://www.php.net' target='_blank'>download PHP</a>
   and <a href='http://www.mysql.com' target='blank'>download mySQL</a> and install it yourself. If your web host does not support PHP or mySQL, consider hosting your entire web site or forums with <a href='http://www.ipshosting.com' target='blank'>IPS Hosting</a> services.
   <br>Invision Power Board works best on an Apache server, and is Apache 1 and Apache 2 savvy.
   <br><br>
   <b>General Requirements</b>
   <br>
-  You <b>do not</b> need a new mySQL database as Invision Power Board supports table prefixes to prevent tables being overwritten.
-  <br>You will also need the mySQL username and mySQL password for a mySQL user that has permission to "CREATE", "DROP" and "ALTER" tables.
-  <br>You will need about 2mb of free web space and roughly 3mb of mySQL database space to allow installation and a moderately sized community.
+  You <b>do not</b> need a new SQL database as Invision Power Board supports table prefixes to prevent tables being overwritten.
+  <br>You will also need the SQL username and SQL password for a SQL user that has permission to "CREATE", "DROP" and "ALTER" tables.
+  <br>You will need about 2mb of free web space and roughly 3mb of SQL database space to allow installation and a moderate sized community.
   <br>If you are unsure on any of these points, please ask your webhost before proceeding.
   <br><br>
   <b>&gt;&gt; <a href='install.html' target='bottom'>Enough chit chat, lets get installing!</a>
@@ -81,7 +81,7 @@
 <table width='95%' align='center' cellpadding='4' cellspacing='0'>
  <tr>
   <td align='center' class='copyright'>
-  Invision Power Board, Invision Power Board Installation Guide &copy; 2002 <a href='http://www.invisionpower' target='_blank'>Invision Power Services</a>
+  Invision Power Board, Invision Power Board Installation Guide &copy; 2004 <a href='http://www.invisionpower' target='_blank'>Invision Power Services</a>
   </td>
  </tr>
 </table>
diff --git a/Documentation/Installation Guide/install_guide.html b/Documentation/Installation Guide/install_guide.html
index e25c9f2d..a3b3693d 100644
--- a/Documentation/Installation Guide/install_guide.html	
+++ b/Documentation/Installation Guide/install_guide.html	
@@ -12,7 +12,7 @@
 
 </head>
 
-<frameset rows='90, *' frameborder='no' border='0' framespacing='0'>
+<frameset rows='115, *' frameborder='no' border='0' framespacing='0'>
 
 <frame src="data/menu.html" name="topmenu" longdesc="Top%20Menu%20Bar" scrolling="no" noresize>
 
diff --git a/Documentation/upgrade_v11x.html b/Documentation/upgrade_v11x.html
deleted file mode 100644
index 5f53db19..00000000
--- a/Documentation/upgrade_v11x.html
+++ /dev/null
@@ -1,361 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-
-        "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
-
-<html lang="en">
-
-<head>
-
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-
-	<title>Invision Power Board Upgrade Guide</title>
-
-<style>
-
-		BODY, TABLE { font-family: verdana, arial; font-size:12px; line-height:150% }
-
-		.title      { background-image: url(tile_back.gif); font-family:arial; font-size:18px; color:white; font-weight:bold; height:40px }
-
-		.table1     { border:1px solid #999999 }
-
-		.table2     { border:1px dotted #999999 }
-
-		.menustrip  { font-color:black; background-color:#EEEEEE; font-size:12px; height:24px }
-
-		a:link, a:visited, a:active  { color:#000055 }
-
-		a:hover                      { color:#333377;text-decoration:underline }
-
-		.header     { border-bottom:1px dashed #999999; font-family:Verdana, Arial; font-weight:bold; color:#4C77B6; font-size:20px; background-color:#FEFEFE; letter-spacing:-1px }
-
-
-
-	</style>
-
-</head>
-
-<body bgcolor="#FFFFFF" topmargin='5' leftmargin='0'>
-
-
-
-<!-- Start content -->
-
-
-
-<a name='top'></a>
-
-<table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
- <tr>
-
-  <td align='center'>
-
-  <b>Sections:</b> <a href='upgrade_v11x.html#intro'>Introduction</a> | <a href='upgrade_v11x.html#upgrade'>Upgrading</a> | <a href='upgrade_v11x.html#main'><b>HELP!!</b></a> | <a href='upgrade_v11x.html#help'>Getting Further Help</a>
-
- </td></tr>
-
-</table>
-
-
-
-<br>
-
-
-
-<a name='intro'></a>
-
-<table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
- <tr>
-
-  <td class='header' align='left'>Welcome!</td>
-
- </tr>
-
- <tr>
-
-  <td align='left'>
-
-  <b>Synopsis: Upgrading from v1.1.x to v1.2</b>
-
-  <br>
-
-  To upgrade your existing board from Invision Board v1.1.x to Invision Board v1.2, you'll need to update all the program files and
-
-  run an upgrade script that is included in this distribution. You may want to create a database back up and download via FTP any
-
-  existing language packs and skin files as these may be over-written during the upgrade.
-
-  <br><br>
-
-  <b>Important: Skins and full text searching</b>
-
-  <br>
-
-  All v1.1.x skins are not compatible with v1.2. IPB v1.2 has an XHTML compliant skin which has been totally rewritten. The upgrade
-
-  process will 'sunset' all your current skins by marking them as hidden so that you may manually update them if desired.
-
-  <br /><br />
-
-  IPB v1.2 also supports full text searching. It is recommended that after the upgrade you log into your Admin CP, expand the "Board Options" sub menu and
-
-  set up full text search. Note, you will not be able to use the "quick" search until full text searching has been enabled.  
-
- </td></tr>
-
-</table>
-
-
-
-<br>
-
-
-
-<a name='upgrade'></a>
-
-<table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
- <tr>
-
-  <td class='header' align='left'>Upgrading</td>
-
- </tr>
-
- <tr>
-
-  <td align='left'>
-
-  <b>Saving Old Data</b>
-
-  <br>
-
-  If you wish to save the information in the old default skin, please do the following:
-
-  <br>
-
-  <span style='color:blue'>Via FTP download the directories "Skin/s1/" and "style_images/1/"</span>. The upgrade will need the
-
-  v1.1 files to reside in those directories and any previous data will be lost. You will also need to export the default macro set if
-
-  you wish to retain the information. This <em>should</em> just be the original v1.1 macro set and overwriting it will be harmless.
-
-  <br><br>
-
-  <b>Uploading the Files</b>
-
-  <br>
-
-  From the unzipped package, upload the following files to the same directory that your existing board is in:
-
-  <br><span style='color:blue'>admin.php
-
-    <br>css.php
-
-	<br>index.php
-
-	<br>install_templates.txt
-
-	<br>show.php
-
-	<br>upgrade5.php</span>
-
-	<br><br>Upload the directories (and any contents / sub directories):
-
-	<br>
-
-	<span style='color:red'>
-
-	cache
-
-	<br>
-
-	fonts
-
-	<br>
-
-	html (All files and sub forums, etc)
-
-	<br>
-
-	lang/en/*.php  (All PHP files. Create the directory if it's not there and upload into it)
-
-	<br>
-
-	Skin/s1/*.php (All PHP files. Create the directory if it's not there and upload into it)
-
-	<br>
-
-	sources/*.*  (All PHP files and sub folders)
-
-	<br>
-
-	style_images/1/ (All files. Create the directory "1" if it's not there and upload into it)</span>
-
-	<br><br>
-
-	In short: Upload everything as if it were a new install!
-
-	<br><br>
-
-	<b>Please check the following before you proceed</b>
-
-	<br>You MUST ensure that the new skin PHP files are in a directory called "Skin/s1/" - if you have previously removed "s1" from the "Skins" directory, please re-create it via FTP and upload the skin PHP files into it.
-
-	<br><br>You MUST ensure that the new images are in a directory called "style_images/1/" - if you have previously
-
-	removed "1" from the "style_images" directory, please re-create it via FTP and upload the images into it.
-
-	<br><br>You MUST make sure the file 'install_templates.txt' is uploaded into the same directory as 'index.php'
-
-	<br><br>You MUST make sure the script 'upgrade5.php' is uploaded into the same directory as 'index.php'
-
-	<br><br>
-
-	<b>Running the upgrade script</b>
-
-	<br>
-
-	Open up a new browser window and enter the URL to the upgrade5.php script (example: www.board.com/forums/upgrade5.php)
-
-	Follow the onscreen instructions to update your database.
-
-	<br><br>
-
-	If you get an error during the upgrade, try hitting back in your browser and try again.
-
-	<br>
-
-	This script will upgrade your database, install new templates and perform a clean up.
-
-	<br><br>
-
-	<span style='color:red'><b>IMPORTANT: PLEASE REMOVE THE SCRIPT WHEN THE UPGRADE IS COMPLETED!</b></span>
-
-	<br><br>
-
-	That's it, you should be done!
-
-  </td></tr>
-
-</table>
-
-
-
-<br>
-
-
-
-<a name='main'></a>
-
-<table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
- <tr>
-
-  <td class='header' align='left'>HELP!!: Common Problems</td>
-
- </tr>
-
- <tr>
-
-  <td align='left'>
-
-  <b>The upgrade worked fine, but I get a blank screen now!!</b>
-
-  <br>
-
-  The upgrade takes it's best guess when it creates the new skin set, it's not impossible that it might not match everything up.
-
-  If you get a blank screen, it's usually because the board wrapper it's chosen is broken / doesn't exist. Try the following:
-
-  <br>Log into your Admin CP. Go to "Skins & Templates". Click on "Manage Skin Sets" and edit "IPB Default Set (1.2)" and make
-
-  sure it's got a valid template set and wrapper.
-
-  <br><br>
-
-  <b>I can't do anything, I get loads of errors!!</b>
-
-  <br>
-
-  This is <b>always</b> caused by a failure to update the files in "Skin/s1/" on your server. Simply put, they MUST be updated from
-
-  the ones included in this zip file (upload/Skins/s1). Upload the skins and refresh your browser.
-
-  
-
-   </td></tr>
-
-</table>
-
-
-
-<br>
-
-
-
-<a name='help'></a>
-
-<table width='95%' align='center' cellpadding='4' cellspacing='0'>
-
- <tr>
-
-  <td class='header' align='left'>Getting further help</td>
-
- </tr>
-
- <tr>
-
-  <td align='left'>
-
-  If you have a problem outside the ones solved in this guide, then don't panic!<br>
-
-  We have a large team of trained support professionals that <b>will</b> be able to provide a solution to your problems.<br>
-
-  Your first stop would be our "Support and Community Forums". We have a large active community who have experience in maintaining their Invision Power Board who may be able to give you a prompt reply - our support professionals also moderate these forums and
-
-  will read your posts. We do recommend that you make use of the search facility on the board to avoid posting problems that have already been posted - there is also a good chance that it's already been reported, discussed and solved.
-
-  <br>
-
-  
-
-  <br>You may wish to consider <b><a href='http://www.invisionboard.com/?whyregister' target='_blank'>registering your board</a></b>. A once only fee will cover you for all support requests for a period of one year (12 months).
-
-  <br>Priority support entitles you to the following benefits:
-
-  <ul>
-
-<li>Your support tickets will be marked priority and only Invision Power Board administrators will have access to those tickets.
-
-<li>You will be given access to a private support forum on our Community Forums.
-
-<li>If you are in the United States you will receive telephone support if desired.
-
-<li>In most cases we will login to your account and address problems for you.
-
-<li>We can install and upgrade the software for you if desired.</ul>
-
-<br>
-
-For more information on our priority support service, please visit our <a href='http://www.invisionboard.com/?services' target='_blank'>advanced services</a> page.
-
-<br><br>
-
-If you wish to contact us for non-technical issues, please visit our <a href='http://www.invisionpower.com/?contact' target='_blank'>Contact Page</a> which includes a handy email form, mailing address and telephone number.
-
-  </td>
-
- </tr>
-
-</table>
-
-
-
-<!-- End content -->
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/Documentation/upgradefromipb_1x.html b/Documentation/upgradefromipb_1x.html
new file mode 100644
index 00000000..3793d8f1
--- /dev/null
+++ b/Documentation/upgradefromipb_1x.html
@@ -0,0 +1,116 @@
+<html>
+<head><title>Invision Power Board UPGRADE</title>
+<style type='text/css'>
+
+BODY		          	
+{
+   background-color:#336699;
+   font-size: 11px;
+   font-family: Verdana, Arial;
+   color: #000;
+   margin: 20px;
+   padding: 0px;
+}
+
+
+h1 { font-family:arial,verdana,sans-serif;font-weight:bold;font-size:30px;color:#000; border-bottom:1px solid #000; }
+h2 { font-family:arial,verdana,sans-serif;font-weight:bold;font-size:20px;color:#000; }
+
+TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 11px; color:#000 }
+
+a:link, a:visited, a:active  { color:#000055 }
+a:hover                      { color:#333377;text-decoration:underline }
+
+.centerbox { margin-right:10%;margin-left:10%;text-align:left }
+
+.warnbox {
+		  border:1px solid #F00;
+		  background: #FFE0E0;
+		  padding:6px;
+		  margin-right:10%;margin-left:10%;text-align:left;
+		}
+
+.tablepad    { background-color:#F5F9FD;padding:6px }
+
+.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px;text-align:left }
+.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
+.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
+
+.tableborder { border:1px solid #345487;background-color:#FFF; padding:0px; margin:0px; width:100% }
+
+
+#copy { font-size:10px }
+				   
+#button   { background-color: #4C77B6; color: #FFFFFF; font-family:Verdana, Arial; font-size:11px }
+
+#textinput { background-color: #EEEEEE; color:Ý#000000; font-family:Verdana, Arial; font-size:10px; width:100% }
+
+#dropdown { background-color: #EEEEEE; color:Ý#000000; font-family:Verdana, Arial; font-size:10px }
+
+#multitext { background-color: #EEEEEE; color:Ý#000000; font-family:Courier, Verdana, Arial; font-size:10px }
+
+#logostrip {
+			padding: 0px;
+			margin: 0px;
+			background: #7AA3D0;
+		  }
+		  
+
+
+</style>
+</head>
+<body>
+<table align="center" width="750" cellpadding="15" cellspacing="0" bgcolor='#FFFFF' style='border:1px solid #000'>
+<tr>
+ <td align='left'>
+   <h1>Welcome to the IPB Upgrade Center</h1>
+   This document will provide you with the information required to upgrade your IPB 1 series board to the IPb 2.0.0 series board.
+   The upgrade process physically updates your current series 1 database and for that reason, we <strong>strongly</strong> recommend that you back up your
+   SQL database and files before attempting this upgrade.
+   <br />
+   <br />
+   Also note that existing skins are not immediately IPB 2.0.0 compatible. They are roughly converted into the IPB 2.0.0 <em>format</em> but they will require
+   <strong>manual</strong> upgrading. The conversion process puts them as children of the "Pre IPB 2.0.0" skin set for your review.
+   <br />
+   <br /><strong>Remember: There is no downgrade path!</strong>
+   <h2>Backing up your database</h2>
+   We recommend that you back up your database by using the <em>mysqldump</em> command line tool:
+   <br />
+   <pre>mysqldump --opt -u<span style='color:red'>username</span> -p <span style='color:red'>databasename</span> &gt; <span style='color:red'>databasename</span>.sql</pre>
+   (Substituting <em>username</em> for your MySQL username and <em>databasename</em> for your MySQL database name)
+   <br />
+   Once the backup is complete (and it may take quite a while for larger boards) you should then download your IPB PHP files to complete the back-up process.
+   <br />
+   <h2>Deleting the old files</h2>
+   Once the backup process is complete, you can safetly delete all the IPB 1 series files EXCEPT <span style='font-family:monospace'>conf_global.php and the uploads folder</span>.
+   <br />
+   You can keep the directory <span style='font-family:monospace'>style_images</span> and its contents if desired and we recommend keeping
+   <span style='font-family:monospace'>html/emoticons</span> to prevent your
+   old posts from showing broken images inplace of emoticons. If you wish to remove this directory, you can rebuild all your post caches once the upgrade
+   has completed.
+   <h2>Uploading the new files</h2>
+   Upload the contents of the unarchived IPB 2.0.0 zip file (all the files in the 'upload' folder EXCEPT <span style='font-family:monospace'>conf_global.php</span>. If you
+   do overwrite this file by mistake, you will have to edit it manually to put back in your database details.
+   <br />Make sure you upload all the files, including the folders and contents: <span style='font-family:monospace'>install</span>, <span style='font-family:monospace'>upgrade</span>
+   and <span style='font-family:monospace'>ipb_templates.xml</span>.
+   <h2>Using the upgrade tool</h2>
+   Once you've uploaded all the files, point your browser at: <span style='font-family:monospace'>http://<span style='color:red'>domain.com/forum/</span>upgrade/upgrade.php</span>. (Substituting
+   <em>domain.com/forum/</em> for your real location to your board.
+   <br />
+   The upgrade tool will figure out which version you are currently running. Take a moment to make sure its correct and read the safety notice before proceeding.
+   <br />
+   The upgrade tool will then automatically run through all the required steps. This may take a while on some of the steps - please be patient.
+   <br />
+   Once the upgrade tool has completed the process, you can log into the board and the administrators control panel to check that the upgrade process has been
+   successful.
+   <br />
+   <br />
+   That's it - you should now be running the latest IPB 2.0.0 version!
+   <br />
+   <br />
+  </td>
+ </tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/Tools_and_Scripts/Other Scripts/update_auth.php b/Tools_and_Scripts/Other Scripts/update_auth.php
deleted file mode 100644
index bb6c65a1..00000000
--- a/Tools_and_Scripts/Other Scripts/update_auth.php	
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-
-
-/*
-
-+--------------------------------------------------------------------------
-
-|   INVISION POWER BOARD PATCH SCRIPT
-
-|   ========================================
-
-|   by Matthew Mecham
-
-|   (c) 2001 - 2003 Invision Power Services
-
-|   http://www.invisionpower.com
-
-|   ========================================
-
-|   Web: http://www.invisionboard.com
-
-|   Email: matt@invisionpower.com
-
-|   Licence Info: http://www.invisionboard.com/?license
-
-+---------------------------------------------------------------------------
-
-|
-
-|   > Patch script
-
-|   > Script written by Matt Mecham
-
-|   > Date started: 17th June 2003
-
-|
-
-+--------------------------------------------------------------------------
-
-*/
-
-
-
-//-----------------------------------------------
-
-// USER CONFIGURABLE ELEMENTS
-
-//-----------------------------------------------
-
- 
-
-// Root path
-
-
-
-$root_path = "./";
-
-
-
-//-----------------------------------------------
-
-// NO USER EDITABLE SECTIONS BELOW
-
-//-----------------------------------------------
-
- 
-
-error_reporting  (E_ERROR | E_WARNING | E_PARSE);
-
-set_magic_quotes_runtime(0);
-
-
-
-
-
-
-
-
-
-//--------------------------------
-
-// Import $INFO, now!
-
-//--------------------------------
-
-
-
-require $root_path."conf_global.php";
-
-
-
-//--------------------------------
-
-// Load the DB driver and such
-
-//--------------------------------
-
-
-
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
-
-
-
-$to_require = $root_path."sources/Drivers/".$INFO['sql_driver'].".php";
-
-require ($to_require);
-
-
-
-$DB = new db_driver;
-
-
-
-$DB->obj['sql_database']     = $INFO['sql_database'];
-
-$DB->obj['sql_user']         = $INFO['sql_user'];
-
-$DB->obj['sql_pass']         = $INFO['sql_pass'];
-
-$DB->obj['sql_host']         = $INFO['sql_host'];
-
-$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
-
-
-
-// Get a DB connection
-
-
-
-$DB->connect();
-
-
-
-$members = array();
-
-
-
-$DB->query("SELECT * FROM ibf_members WHERE mgroup=".$INFO['auth_group']);
-
-
-
-while ( $r = $DB->fetch_row() )
-
-{
-
-	$members[ $r['id'] ] = $r;
-
-}
-
-
-
-$tmp = $members;
-
-
-
-$DB->query("SELECT * FROM ibf_validating");
-
-
-
-while ( $v = $DB->fetch_row() )
-
-{
-
-	if ( is_array( $members[ $v['member_id'] ] ) )
-
-	{
-
-		unset($members[ $v['member_id'] ]);
-
-	}
-
-}
-
-
-
-/*header("Content-type: text/plain");
-
-print_r($tmp);
-
-print_r($members);
-
-exit();*/
-
-
-
-$count = intval( count($members) );
-
-
-
-if ( $count > 0 )
-
-{
-
-	foreach( $members as $mid => $mdata )
-
-	{
-
-		$dbs = array(
-
-					  'vid'        => md5( time() . $mid ),
-
-					  'member_id'  => $mdata['id'],
-
-					  'real_group' => $INFO['member_group'],
-
-					  'temp_group' => $INFO['auth_group'],
-
-					  'entry_date' => time(),
-
-					  'coppa_user' => 0,
-
-					  'new_reg'    => 1,
-
-					  'ip_address' => '127.0.0.1',
-
-					);
-
-					
-
-		$dbstring = $DB->compile_db_insert_string($dbs);
-
-		
-
-		$DB->query("INSERT INTO ibf_validating ({$dbstring['FIELD_NAMES']}) VALUES({$dbstring['FIELD_VALUES']})");
-
-	
-
-	}
-
-}
-
-
-
-echo("<html><body><b>$count members found...</b><br /><br />Update complete, you may now remove this file</body></html>");
-
-
-
-exit();
-
-
-
-
-
-//+-------------------------------------------------
-
-// GLOBAL ROUTINES
-
-//+-------------------------------------------------
-
-
-
-function fatal_error($message="", $help="") {
-
-	echo("$message<br><br>$help");
-
-	exit;
-
-}
-
-?>
-
diff --git a/Tools_and_Scripts/Other Scripts/upgrade5.php b/Tools_and_Scripts/Other Scripts/upgrade5.php
deleted file mode 100644
index c1ff23bc..00000000
--- a/Tools_and_Scripts/Other Scripts/upgrade5.php	
+++ /dev/null
@@ -1,2625 +0,0 @@
-<?php
-
-
-
-/*
-
-+--------------------------------------------------------------------------
-
-|   IBFORUMS v1 UPGRADE FROM 1.1.X to v1.2
-
-|   ========================================
-
-|   by Matthew Mecham
-
-|   (c) 2001,2002 IBForums
-
-|   http://www.ibforums.com
-
-|   ========================================
-
-|   Web: http://www.ibforums.com
-
-|   Email: phpboards@ibforums.com
-
-|   Licence Info: phpib-licence@ibforums.com
-
-+---------------------------------------------------------------------------
-
-|
-
-|   > Upgrade Script #5
-
-|   > Script written by Matt Mecham
-
-|   > Date started: 10th June 2003
-
-|
-
-+--------------------------------------------------------------------------
-
-*/
-
-
-
-//-----------------------------------------------
-
-// USER CONFIGURABLE ELEMENTS
-
-//-----------------------------------------------
-
- 
-
-// Root path
-
-
-
-$root_path = "./";
-
-
-
-//-----------------------------------------------
-
-// NO USER EDITABLE SECTIONS BELOW
-
-//-----------------------------------------------
-
- 
-
-error_reporting  (E_ERROR | E_WARNING | E_PARSE);
-
-set_magic_quotes_runtime(0);
-
-
-
-$template = new template;
-
-$std      = new installer;
-
-
-
-$VARS = $std->parse_incoming();
-
-
-
-//--------------------------------
-
-// Import $INFO, now!
-
-//--------------------------------
-
-
-
-require $root_path."conf_global.php";
-
-
-
-//--------------------------------
-
-// Load the DB driver and such
-
-//--------------------------------
-
-
-
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
-
-
-
-$to_require = $root_path."sources/Drivers/".$INFO['sql_driver'].".php";
-
-require ($to_require);
-
-
-
-$DB = new db_driver;
-
-
-
-$DB->obj['sql_database']     = $INFO['sql_database'];
-
-$DB->obj['sql_user']         = $INFO['sql_user'];
-
-$DB->obj['sql_pass']         = $INFO['sql_pass'];
-
-$DB->obj['sql_host']         = $INFO['sql_host'];
-
-$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
-
-
-
-// Get a DB connection
-
-
-
-$DB->connect();
-
-
-
-// Switch off auto_error
-
-
-
-$DB->return_die = 1;
-
-
-
-//---------------------------------------
-
-// Sort out what to do..
-
-//---------------------------------------
-
-
-
-switch($VARS['a'])
-
-{
-
-	case 'tables':
-
-		do_tables();
-
-		break;
-
-		
-
-	case 'alter':
-
-		do_alter();
-
-		break;
-
-		
-
-	case 'index':
-
-		do_index();
-
-		break;
-
-		
-
-	case 'insert':
-
-		do_insert();
-
-		break;
-
-		
-
-	case 'templates':
-
-		do_templates();
-
-		break;
-
-		
-
-	case 'cleanup':
-
-		do_cleanup();
-
-		break;
-
-		
-
-	case 'optimize':
-
-		do_optimize();
-
-		break;
-
-		
-
-	default:
-
-		do_intro();
-
-		break;
-
-}
-
-
-
-//+---------------------------------------
-
-
-
-
-
-
-
-function do_optimize()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('optimize');
-
-	
-
-	$template->print_top('Optimization Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2 COMPLETE</div>
-
-							  <div class='pformstrip'>Your new v1.2 installation has been optimized</div>
-
-							  <div class='tablepad'>
-
-							   The upgrade is now complete and you may go to your board!
-
-							   <br /><br />
-
-							   <b>PLEASE REMOVE THIS UPGRADE SCRIPT AS SOON AS POSSIBLE</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-	
-
-	$template->output();
-
-}
-
-
-
-//+---------------------------------------
-
-
-
-function do_cleanup()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	// Insert new CSS
-
-	
-
-	$css_text = get_main_css();
-
-	
-
-	$DB->query("INSERT INTO ibf_css (css_name, css_text, css_comments) VALUES ('Invision Style Sheet (1.2)', '$css_text', NULL)");
-
-	
-
-	$new_css_id = $DB->get_insert_id();
-
-	
-
-	//---------------------------------------------
-
-	// Save new wrapper
-
-	//---------------------------------------------
-
-	
-
-	$DB->query("INSERT INTO ibf_templates set template='".get_main_wrapper()."', name='IPB 1.2 Wrapper'");
-
-	
-
-	$new_wrap_id = $DB->get_insert_id();
-
-	
-
-	//---------------------------------------------
-
-	// Change all old skin sets to hidden
-
-	//---------------------------------------------
-
-	
-
-	$DB->query("UPDATE ibf_skins SET hidden=1, default_set=0");
-
-		
-
-	// Get a new ID for the new skin set
-
-	
-
-	$barney = array( 'sname'      => "IPB Skin Set 1.2 (NEW)",
-
-					 'set_id'     => 1,
-
-					 'tmpl_id'    => $new_wrap_id,
-
-					 'img_dir'    => 1,
-
-					 'css_id'     => $new_css_id,
-
-					 'hidden'     => 0,
-
-					 'default_set'=> 1,
-
-					 'macro_id'   => 1,
-
-				   );
-
-					   
-
-	$DB->query("REPLACE INTO ibf_macro_name SET set_id=1, set_name='IPB 1.2 Macro Set'");
-
-	
-
-	$DB->query("SELECT MAX(sid) as new_id FROM ibf_skins");
-
-	
-
-	$row = $DB->fetch_row();
-
-	
-
-	$barney['sid'] = $row['new_id'] + 1;
-
-
-
-	$db_string = $DB->compile_db_insert_string( $barney );
-
-	
-
-	$DB->query("INSERT INTO ibf_skins (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-
-	
-
-	// Change member skins to default
-
-	
-
-	$DB->query("UPDATE ibf_members SET skin=NULL");
-
-	
-
-	//---------------------------------------------
-
-	// Sort out new forum masks
-
-	//---------------------------------------------
-
-	
-
-	$oq = $DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_id");
-
-
-
-	while( $r = $DB->fetch_row($oq) )
-
-	{
-
-		$nq = $DB->query("REPLACE INTO ibf_forum_perms SET perm_id={$r['g_id']}, perm_name='{$r['g_title']} Mask'");
-
-		$bq = $DB->query("UPDATE ibf_groups SET g_perm_id={$r['g_id']} WHERE g_id={$r['g_id']}");
-
-	}
-
-	
-
-	//---------------------------------------------
-
-	// Remove old macros
-
-	//---------------------------------------------
-
-	
-
-	$DB->query("DELETE FROM ibf_macro WHERE macro_value IN ('M_ADDMEM', 'M_DELETE', 'M_REPLY', 'tbl_width', 'tbl_border')");
-
-	
-
-	//---------------------------------------------
-
-	// Other stuff
-
-	//---------------------------------------------
-
-
-
-	$DB->query("update ibf_members SET restrict_post=0");
-
-	
-
-	$oq = $DB->query("SELECT * FROM ibf_rules");
-
-	
-
-	while ( $r = $DB->fetch_row($oq) )
-
-	{
-
-		$nq = $DB->query("UPDATE ibf_forums SET rules_title='{$r['title']}', rules_text='{$r['body']}' WHERE id={$r['fid']}");
-
-	}
-
-	
-
-
-
-	$DB->query("drop table if exists ibf_rules");
-
-
-
-	$DB->query("update ibf_messages SET read_state=1 where vid='sent'");
-
-
-
-	$DB->query("DROP TABLE if exists ibf_attachments");
-
-
-
-	
-
-	$template->print_top('Upgrade Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2</div>
-
-							  <div class='pformstrip'>Upgrade Complete!</div>
-
-							  <div class='tablepad'>
-
-							   <b>The upgrade was successful!</b>
-
-							   <br><br>
-
-							   <b>Skin Set Changes</b>
-
-							   <br>
-
-							   Unfortunately v1.1.X
-
-							   skins are not compatible with this new version. All old skin sets have been set to 'hidden' and all members
-
-							   have been moved onto the new default skin.
-
-							   <br><br>
-
-							   The new skin set will use the directory 'style_images/1/' as the image directory. Ensure that all the images
-
-							   in there have been updated from the download zip. If the directory does not exist, create it and upload
-
-							   the contents of the folder 'style_images/1/' from the zip file.
-
-							   <br><br>
-
-							   <b>IF YOU DO NOT WISH TO OPTIMIZE PLEASE REMOVE THIS UPGRADE SCRIPT AS SOON AS POSSIBLE</b>
-
-							   <br /><br />
-
-							   <b>Optimization</b>
-
-							   <br />
-
-							   Proceed if you wish to complete your IPB upgrade by optimizing the tables - this step can take some time
-
-							   depending on the amount of topics and posts you have. If you have a very large amount of posts (over 500,000) you
-
-							   might want to skip this.
-
-							   <br /><br />
-
-							   <b><a href='upgrade5.php?a=optimize'>Optimize my IPB installation</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-	
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-
-
-
-
-function do_templates()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	//-----------------------------------
-
-	// Lets open the style file
-
-	//-----------------------------------
-
-	
-
-	$style_file = $root.'install_templates.txt';
-
-	
-
-	if ( ! file_exists($style_file) )
-
-	{
-
-		install_error("Could not locate '$style_file'. <br><br>Check to ensure that this file exists in the same location as this script.<br><br>You may need to enter a value for the root path in this installer script, to do this, simply open up this script in a text editor and enter a value in \$root - remember to add a trailing slash. NT users will need to use double backslashes");
-
-	}
-
-	
-
-	if ( $fh = fopen( $style_file, 'r' ) )
-
-	{
-
-		$data = fread($fh, filesize($style_file) );
-
-		fclose($fh);
-
-	}
-
-	else
-
-	{
-
-		install_error("Could open '$style_file'");
-
-	}
-
-	
-
-	if (strlen($data) < 100)
-
-	{
-
-		install_error("Err 1:'$style_file' is incomplete, please re-upload a fresh copy over the existing copy on the server'");
-
-	}
-
-	
-
-	// Chop up the data file.
-
-	
-
-	$template_rows = explode( "||~&~||", $data );
-
-	
-
-	$crows = count($template_rows);
-
-	
-
-	if ( $crows < 100 )
-
-	{
-
-		install_error("Err2: (Found $crows rows) '$style_file' is incomplete, please re-upload a fresh copy over the existing copy on the server'");
-
-	}
-
-	
-
-	//-----------------------------------
-
-	// Delete current skins in #1
-
-	//-----------------------------------
-
-	
-
-	$DB->query("DELETE FROM ibf_skin_templates WHERE set_id=1");
-
-	
-
-	//-----------------------------------
-
-	// Lets populate the database!
-
-	//-----------------------------------
-
-	
-
-	foreach( $template_rows as $q )
-
-	{
-
-		$DB->error = "";
-
-		
-
-		$q = trim($q);
-
-		
-
-		//print $q;
-
-	   
-
-		if (strlen($q) < 5)
-
-		{
-
-			continue;
-
-		}
-
-		
-
-		$DB->query("INSERT INTO ibf_skin_templates (set_id, group_name, section_content, func_name, func_data, updated, can_remove) VALUES $q");
-
-			
-
-		if ( $DB->error != "" )
-
-		{
-
-			install_error( "mySQL Error: ".$DB->error );
-
-		}
-
-	}
-
-   
-
-    //---------------------------------------
-
-	
-
-	$template->print_top('Step 5 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2</div>
-
-							  <div class='pformstrip'>The templates have been inserted</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade5.php?a=cleanup'>Proceed to Step 6: Finishing Up</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-
-
-
-
-function do_insert()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('insert');
-
-	
-
-	$template->print_top('Step 4 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2</div>
-
-							  <div class='pformstrip'>The new data has been inserted</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade5.php?a=templates'>Proceed to Step 5: Insert New Templates</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-
-
-function do_index()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('index');
-
-	
-
-	$template->print_top('Step 3 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2</div>
-
-							  <div class='pformstrip'>The indexes have been adjusted</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade5.php?a=insert'>Proceed to Step 4: Insert New Data</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-function do_alter()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('alter');
-
-	
-
-	$template->print_top('Step 2 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2</div>
-
-							  <div class='pformstrip'>The tables have been altered</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade5.php?a=index'>Proceed to Step 3: Alter Indexes</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-function do_tables()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('tables');
-
-	
-
-	$template->print_top('Step 1 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.1.X to v1.2</div>
-
-							  <div class='pformstrip'>The new tables have been created</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade5.php?a=alter'>Proceed to Step 2: Alter Existing Tables</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-						 	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-function do_intro()
-
-{
-
-	global $std, $template, $root;
-
-	
-
-	$template->print_top('Welcome');
-
-	
-
-	$template->contents .= "<table width='80%' border='0' cellpadding='0' cellspacing='0' align='center'>
-
-							<tr>
-
-							 <td valign='top'><img src='html/sys-img/install_face.jpg' border='0' alt='Intro'></td>
-
-							 <td><img src='html/sys-img/install_text.gif' border='0' alt='Welcome to IPB'>
-
-							  <br /><br />
-
-							   <b>Welcome to the Invision Board Upgrade Utility</b>
-
-							   <br><br>
-
-							   Before you run this upgrade tool, please ensure that ALL of the source, language and skin files
-
-							   have been uploaded into the corresponding directories on your server.
-
-							   <br><br>
-
-							   This script should be in the root forum directory (the same directory that index.php is in).
-
-							   <br><br>
-
-							   This installer will alter the database for the new format and install the skin and macro files.
-
-							   <br><br>
-
-							   Please ensure that 'install_templates.txt' is uploaded and in the same directory as this script.
-
-							   <br><br>
-
-							   Also, please ensure that all the new skin_*.php files have been uploaded into 'Skin/s1' before starting
-
-							   this upgrader. If you wish to keep the old skin data in that directory, please copy the directory now before
-
-							   proceeding. Running this installer will set all existing skins to 'hidden' and install a new default skin pack
-
-							   ";
-
-						 
-
-	$style_file = $root."install_templates.txt";
-
-	
-
-	$warnings = array();
-
-	
-
-	if ( ! file_exists($style_file) )
-
-	{
-
-		$warnings[] = "Cannot locate the file 'install_templates.txt'. This should be uploaded into the same directory as this script!";
-
-	}
-
-						 
-
-	if ( count($warnings) > 0 )
-
-	{
-
-	
-
-		$err_string = "<ul><li>".implode( "<li>", $warnings )."</ul>";
-
-	
-
-		$template->contents .= "<br /><br />
-
-							    <div class='warnbox'>
-
-							     <strong>Warning!</strong>
-
-							     <b>The following errors must be rectified before continuing!</b>
-
-								 <br><br>
-
-								 $err_string
-
-							    </div>";
-
-	}
-
-	else
-
-	{
-
-		$template->contents .= "<br /><br /><div align='center'><b><a href='upgrade5.php?a=tables'>Proceed to Step 1: Create New Tables</a> &gt;&gt;</b></div>";
-
-	}
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-
-
-function install_error($msg="")
-
-{
-
-	global $std, $template, $root;
-
-	
-
-	$template->print_top('Warning!');
-
-	
-
-
-
-	
-
-	$template->contents .= "<tr>
-
-						  <td id='warning'>&#149;&nbsp;WARNING!</td>
-
-						<tr>
-
-						<td>
-
-						  <table cellpadding='8' cellspacing='0' width='100%' align='center' border='0' id='tablewrap'>
-
-						  <tr>
-
-							<td>
-
-						  <table width='100%' cellspacing='1' cellpadding='0' align='center' border='0' id='table1'>
-
-						   <tr>
-
-							<td>
-
-							 <table width='100%' cellspacing='2' cellpadding='3' align='center' border='0'>
-
-							 <tr>
-
-							   <td>
-
-									<b>The following errors must be rectified before continuing!</b><br>Please go back and try again!
-
-									<br><br>
-
-									$msg
-
-								</td>
-
-							 </tr>
-
-							</table>
-
-						  </td>
-
-						 </tr>
-
-						</table>
-
-					   </td>
-
-					  </tr>
-
-					 </table>";
-
-	
-
-	
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-
-
-
-
-//+-------------------------------------------------
-
-// GLOBAL ROUTINES
-
-//+-------------------------------------------------
-
-
-
-function fatal_error($message="", $help="") {
-
-	echo("$message<br><br>$help");
-
-	exit;
-
-}
-
-
-
-
-
-//+--------------------------------------------------------------------------
-
-// CLASSES
-
-//+--------------------------------------------------------------------------
-
-
-
-
-
-
-
-class template
-
-{
-
-	var $contents = "";
-
-	
-
-	function output()
-
-	{
-
-		echo $this->contents;
-
-		echo "   
-
-				 </table>
-
-				 <br><br><center><span id='copy'>&copy 2002 Invision Board (www.invisionboard.com)</span></center>
-
-				 
-
-				 </body>
-
-				 </html>";
-
-		exit();
-
-	}
-
-	
-
-	//--------------------------------------
-
-
-
-	function print_top($title="")
-
-	{
-
-	
-
-		$this->contents = "<html>
-
-		          <head><title>Invision Power Board Set Up :: $title </title>
-
-		          <style type='text/css'>
-
-		          	
-
-		          	BODY		          	
-
-		          	{
-
-		          		font-size: 11px;
-
-		          		font-family: Verdana, Arial;
-
-		          		color: #000;
-
-		          		margin: 0px;
-
-		          		padding: 0px;
-
-		          		background-image: url(html/sys-img/fadebg.jpg);
-
-		          		background-repeat: no-repeat;
-
-		          		background-position: right bottom;
-
-		          	}
-
-		          	
-
-		          	TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 11px; color:#000 }
-
-					
-
-					a:link, a:visited, a:active  { color:#000055 }
-
-					a:hover                      { color:#333377;text-decoration:underline }
-
-					
-
-					.centerbox { margin-right:10%;margin-left:10%;text-align:left }
-
-					
-
-					.warnbox {
-
-							   border:1px solid #F00;
-
-							   background: #FFE0E0;
-
-							   padding:6px;
-
-							   margin-right:10%;margin-left:10%;text-align:left;
-
-							 }
-
-					
-
-					.tablepad    { background-color:#F5F9FD;padding:6px }
-
-
-
-					.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px;text-align:left }
-
-					.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-
-					.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
-
-
-
-					.tableborder { border:1px solid #345487;background-color:#FFF; padding:0px; margin:0px; width:100% }
-
-
-
-					.maintitle { text-align:left;vertical-align:middle;font-weight:bold; color:#FFF; letter-spacing:1px; padding:8px 0px 8px 5px; background-image: url(html/sys-img/tile_back.gif) }
-
-					.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-
-					.maintitle a:hover { text-decoration: underline }
-
-					
-
-					#copy { font-size:10px }
-
-										
-
-					#button   { background-color: #4C77B6; color: #FFFFFF; font-family:Verdana, Arial; font-size:11px }
-
-					
-
-					#textinput { background-color: #EEEEEE; color: #000000; font-family:Verdana, Arial; font-size:10px; width:100% }
-
-					
-
-					#dropdown { background-color: #EEEEEE; color: #000000; font-family:Verdana, Arial; font-size:10px }
-
-					
-
-					#multitext { background-color: #EEEEEE; color: #000000; font-family:Courier, Verdana, Arial; font-size:10px }
-
-					
-
-					#logostrip {
-
-								 padding: 0px;
-
-								 margin: 0px;
-
-								 background: #7AA3D0;
-
-							   }
-
-							   
-
-					.fade					
-
-					{
-
-						background-image: url(html/sys-img/fade.jpg);
-
-						background-repeat: repeat-x;
-
-					}
-
-					
-
-				  </style>
-
-				  </head>
-
-				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>
-
-				 
-
-				 <div id='logostrip'><img src='html/sys-img/title.gif' border='0' alt='Invision Power Board Installer' /></div>
-
-				 <div class='fade'>&nbsp;</div>
-
-				 <br />
-
-				 ";
-
-				  	   
-
-	}
-
-
-
-
-
-}
-
-
-
-
-
-class installer
-
-{
-
-
-
-	function parse_incoming()
-
-    {
-
-    	global $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_CLIENT_IP, $REQUEST_METHOD, $REMOTE_ADDR, $HTTP_PROXY_USER, $HTTP_X_FORWARDED_FOR;
-
-    	$return = array();
-
-    	
-
-		if( is_array($HTTP_GET_VARS) )
-
-		{
-
-			while( list($k, $v) = each($HTTP_GET_VARS) )
-
-			{
-
-				//$k = $this->clean_key($k);
-
-				if( is_array($HTTP_GET_VARS[$k]) )
-
-				{
-
-					while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
-
-					{
-
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
-
-					}
-
-				}
-
-				else
-
-				{
-
-					$return[$k] = $this->clean_value($v);
-
-				}
-
-			}
-
-		}
-
-		
-
-		// Overwrite GET data with post data
-
-		
-
-		if( is_array($HTTP_POST_VARS) )
-
-		{
-
-			while( list($k, $v) = each($HTTP_POST_VARS) )
-
-			{
-
-				//$k = $this->clean_key($k);
-
-				if ( is_array($HTTP_POST_VARS[$k]) )
-
-				{
-
-					while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
-
-					{
-
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
-
-					}
-
-				}
-
-				else
-
-				{
-
-					$return[$k] = $this->clean_value($v);
-
-				}
-
-			}
-
-		}
-
-		
-
-		return $return;
-
-	}
-
-    
-
-    function clean_key($key) {
-
-    
-
-    	if ($key == "")
-
-    	{
-
-    		return "";
-
-    	}
-
-    	
-
-    	$key = preg_replace( "/\.\./"           , ""  , $key );
-
-    	$key = preg_replace( "/\_\_(.+?)\_\_/"  , ""  , $key );
-
-    	$key = preg_replace( "/^([\w\.\-\_]+)$/", "$1", $key );
-
-    	return $key;
-
-    }
-
-    
-
-    function clean_value($val) {
-
-    
-
-    	if ($val == "")
-
-    	{
-
-    		return "";
-
-    	}
-
-    	
-
-    	$val = preg_replace( "/&/"         , "&amp;"         , $val );
-
-    	$val = preg_replace( "/<!--/"      , "&#60;&#33;--"  , $val );
-
-    	$val = preg_replace( "/-->/"       , "--&#62;"       , $val );
-
-    	$val = preg_replace( "/<script/i"  , "&#60;script"   , $val );
-
-    	$val = preg_replace( "/>/"         , "&gt;"          , $val );
-
-    	$val = preg_replace( "/</"         , "&lt;"          , $val );
-
-    	$val = preg_replace( "/\"/"        , "&quot;"        , $val );
-
-    	$val = preg_replace( "/\|/"        , "&#124;"        , $val );
-
-    	$val = preg_replace( "/\n/"        , "<br>"          , $val ); // Convert literal newlines
-
-    	$val = preg_replace( "/\\\$/"      , "&#036;"        , $val );
-
-    	$val = preg_replace( "/\r/"        , ""              , $val ); // Remove literal carriage returns
-
-    	$val = preg_replace( "/!/"         , "&#33;"         , $val );
-
-    	$val = preg_replace( "/'/"         , "&#39;"         , $val ); // IMPORTANT: It helps to increase sql query safety.
-
-    	$val = stripslashes($val);                                     // Swop PHP added backslashes
-
-    	$val = preg_replace( "/\\\/"       , "&#092;"        , $val ); // Swop user inputted backslashes
-
-    	return $val;
-
-    }
-
-   
-
-}
-
-
-
-// Sql stuff
-
-
-
-
-
-function run_sql($type)
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	$DB->error = "";
-
-	
-
-	if ($type == 'tables')
-
-	{
-
-		$SQL = sql_tables();
-
-	}
-
-	else if ($type == 'alter')
-
-	{
-
-		$SQL = sql_alter();
-
-	}
-
-	else if ($type == 'index')
-
-	{
-
-		$SQL = sql_index();
-
-	}
-
-	else if ($type == 'insert')
-
-	{
-
-		$SQL = sql_insert();
-
-	}
-
-	else if ($type == 'optimize')
-
-	{
-
-		$SQL = sql_optimize();
-
-	}
-
-	
-
-	//--------------------------------
-
-		
-
-	foreach( $SQL as $q )
-
-	{
-
-		$DB->query($q);
-
-		
-
-		if ( $DB->error != "" )
-
-		{
-
-			install_error($DB->error);
-
-		}
-
-	}
-
-	
-
-	return TRUE;
-
-}
-
-
-
-
-
-function sql_optimize()
-
-{
-
-	$SQL = array();
-
-	
-
-	$SQL[] = "alter table ibf_calendar_events change eventid eventid mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_calendar_events change userid userid mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_contacts change id id mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_contacts change contact_id contact_id mediumint(8) NOT NULL;";
-
-	$SQL[] = "alter table ibf_contacts change member_id member_id mediumint(8) NOT NULL;";
-
-	$SQL[] = "alter table ibf_faq change id id mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_forum_tracker change frid frid mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_forum_tracker change forum_id forum_id smallint(5) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_forums change last_poster_id last_poster_id mediumint(8) NOT NULL DEFAULT '0';";
-
-	$SQL[] = "alter table ibf_languages change lid lid mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_member_extra change id id mediumint(8) NOT NULL;";
-
-	$SQL[] = "alter table ibf_members change id id mediumint(8) NOT NULL;";
-
-	$SQL[] = "alter table ibf_members change mgroup mgroup smallint(3) NOT NULL;";
-
-	$SQL[] = "alter table ibf_members change msg_from_id msg_from_id mediumint(8);";
-
-	$SQL[] = "alter table ibf_messages change msg_id msg_id int(10) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_messages change from_id from_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_messages change member_id member_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_messages change recipient_id recipient_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_moderator_logs change id id int(10) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_moderator_logs change topic_id topic_id int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_moderator_logs change post_id post_id int(10);";
-
-	$SQL[] = "alter table ibf_moderator_logs change member_id member_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_moderator_logs change ip_address ip_address VARCHAR(16) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_moderators change mid mid mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_moderators change member_id member_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_pfields_content change member_id member_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_polls change pid pid mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_polls change tid tid int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_polls change starter_id starter_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_polls change votes votes smallint(5) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_polls change forum_id forum_id smallint(5) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_posts change pid pid int(10) NOT NULL default '0' auto_increment;";
-
-	$SQL[] = "alter table ibf_posts change author_id author_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_posts change topic_id topic_id int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_posts change forum_id forum_id smallint(5) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_posts change ip_address ip_address varchar(16) NOT NULL DEFAULT '';";
-
-	$SQL[] = "alter table ibf_posts change use_sig use_sig tinyint(1) NOT NULL DEFAULT '0';";
-
-	$SQL[] = "alter table ibf_posts change use_emo use_emo tinyint(1) NOT NULL DEFAULT '0';";
-
-	$SQL[] = "alter table ibf_sessions change member_id member_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_sessions change in_forum in_forum smallint(5) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_stats change TOTAL_REPLIES TOTAL_REPLIES int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_stats change TOTAL_TOPICS TOTAL_TOPICS int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_stats change LAST_MEM_ID LAST_MEM_ID mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_stats change MEM_COUNT MEM_COUNT mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_topics change tid tid int(10) NOT NULL default '0' auto_increment;";
-
-	$SQL[] = "alter table ibf_topics change starter_id starter_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_topics change last_poster_id last_poster_id mediumint(8) NOT NULL DEFAULT '0';";
-
-	$SQL[] = "alter table ibf_tracker change trid trid mediumint(8) NOT NULL auto_increment;";
-
-	$SQL[] = "alter table ibf_tracker change member_id member_id mediumint(8) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_voters change vid vid int(10) NOT NULL default '0' auto_increment;";
-
-	$SQL[] = "alter table ibf_voters change tid tid int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_voters change forum_id forum_id smallint(5) NOT NULL default '0';";
-
-
-
-
-
-	return $SQL;
-
-}
-
-
-
-
-
-function sql_tables()
-
-{
-
-	$SQL = array();
-
-	
-
-$SQL[]="CREATE TABLE ibf_forum_perms(
-
-	perm_id int(10) auto_increment NOT NULL,
-
-	perm_name varchar(250) NOT NULL,
-
-	PRIMARY KEY(perm_id)
-
-);";
-
-
-
-$SQL[]="CREATE TABLE ibf_validating (
-
-vid varchar(32) NOT NULL,
-
-member_id mediumint(8) NOT NULL,
-
-real_group smallint(3) NOT NULL default '0',
-
-temp_group smallint(3) NOT NULL default '0',
-
-entry_date int(10) NOT NULL default '0',
-
-coppa_user tinyint(1) NOT NULL default '0',
-
-lost_pass tinyint(1) NOT NULL default '0',
-
-new_reg tinyint(1) NOT NULL default '0',
-
-email_chg tinyint(1) NOT NULL default '0',
-
-ip_address varchar(16) NOT NULL default '0',
-
-PRIMARY KEY(vid),
-
-KEY new_reg(new_reg)
-
-);";
-
-
-
-$SQL[]="create table ibf_cache_store (
-
-  cs_key varchar(255) NOT NULL default '',
-
-  cs_value text NOT NULL default '',
-
-  cs_extra varchar(255) NOT NULL default '',
-
-  PRIMARY KEY(cs_key)
-
-);";
-
-
-
-$SQL[]="create table ibf_email_logs (
-
-email_id int(10) NOT NULL auto_increment,
-
-email_subject varchar(255) NOT NULL,
-
-email_content text NOT NULL,
-
-email_date int(10) NOT NULL default '0',
-
-from_member_id mediumint(8) NOT NULL default '0',
-
-from_email_address varchar(250) NOT NULL,
-
-from_ip_address varchar(16) NOT NULL default '127.0.0.1',
-
-to_member_id mediumint(8) NOT NULL default '0',
-
-to_email_address varchar(250) NOT NULL,
-
-topic_id int(10) NOT NULL default '0',
-
-PRIMARY KEY(email_id),
-
-KEY from_member_id(from_member_id),
-
-KEY email_date(email_date)
-
-);";
-
-
-
-$SQL[]="CREATE TABLE ibf_topic_mmod (
-
-mm_id smallint(5) NOT NULL auto_increment,
-
-mm_title varchar(250) NOT NULL,
-
-mm_enabled tinyint(1) NOT NULL default '0',
-
-topic_state varchar(10) NOT NULL default 'leave',
-
-topic_pin varchar(10) NOT NULL default 'leave',
-
-topic_move smallint(5) NOT NULL default '0',
-
-topic_move_link tinyint(1) NOT NULL default '0',
-
-topic_title_st varchar(250) NOT NULL default '',
-
-topic_title_end varchar(250) NOT NULL default '',
-
-topic_reply tinyint(1) NOT NULL default '0',
-
-topic_reply_content text NOT NULL default '',
-
-topic_reply_postcount tinyint(1) NOT NULL default '0',
-
-PRIMARY KEY(mm_id)
-
-);";
-
-
-
-$SQL[]="create table ibf_spider_logs (
-
-sid int(10) NOT NULL auto_increment,
-
-bot varchar(255) NOT NULL default '',
-
-query_string text NOT NULL default '',
-
-entry_date int(10) NOT NULL default '0',
-
-ip_address varchar(16) NOT NULL default '',
-
-PRIMARY KEY(sid)
-
-);";
-
-
-
-
-
-
-
-$SQL[]="CREATE TABLE ibf_warn_logs (
-
-wlog_id int(10) auto_increment NOT NULL,
-
-wlog_mid mediumint(8) NOT NULL default '0',
-
-wlog_notes text NOT NULL default '',
-
-wlog_contact varchar(250) NOT NULL default 'none',
-
-wlog_contact_content text NOT NULL default '',
-
-wlog_date int(10) NOT NULL default '',
-
-wlog_type varchar(6) NOT NULL default 'pos',
-
-wlog_addedby mediumint(8) NOT NULL default '0',
-
-PRIMARY KEY(wlog_id)
-
-);";
-
-
-
-
-
-	return $SQL;
-
-}
-
-
-
-function sql_alter()
-
-{
-
-	$SQL = array();
-
-	
-
-	
-
-	$SQL[] = "ALTER TABLE ibf_members ADD org_supmod TINYINT(1) DEFAULT '0';";
-
-	$SQL[] = "ALTER TABLE ibf_members ADD org_perm_id varchar(255) DEFAULT '';";
-
-	$SQL[] = "alter table ibf_members drop validate_key;";
-
-	$SQL[] = "alter table ibf_members drop new_pass;";
-
-	$SQL[] = "alter table ibf_members drop prev_group;";
-
-	$SQL[] = "alter table ibf_members add temp_ban varchar(100);";
-
-	$SQL[] = "alter table ibf_members change allow_post restrict_post varchar(100) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_members change mod_posts mod_posts varchar(100) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_members add warn_lastwarn int(10) not null default '0' after warn_level;";
-
-
-
-	$SQL[] = "ALTER TABLE ibf_groups ADD g_perm_id varchar(255) NOT NULL;";
-
-	$SQL[] = "ALTER TABLE ibf_groups ADD g_photo_max_vars VARCHAR(200) DEFAULT '100:250:250';";
-
-	$SQL[] = "alter table ibf_groups add g_dohtml tinyint(1) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_groups add g_edit_topic tinyint(1) NOT NULL DEFAULT '0';";
-
-	$SQL[] = "alter table ibf_groups add g_email_limit varchar(15) NOT NULL DEFAULT '10:15';";
-
-
-
-	$SQL[] = "alter table ibf_member_extra add photo_type varchar(10) default '';";
-
-	$SQL[] = "alter table ibf_member_extra add photo_location varchar(255) default '';";
-
-	$SQL[] = "alter table ibf_member_extra add photo_dimensions varchar(200) default '';";
-
-
-
-	$SQL[] = "alter table ibf_calendar_events add end_day int(2), add end_month int(2), add end_year int(4);";
-
-	$SQL[] = "alter table ibf_calendar_events add end_unix_stamp int(10);";
-
-	$SQL[] = "alter table ibf_calendar_events add event_ranged tinyint(1) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_calendar_events add event_repeat tinyint(1) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_calendar_events add repeat_unit char(2) NOT NULL default '';";
-
-	$SQL[] = "alter table ibf_calendar_events add event_bgcolor varchar(32) NOT NULL default '';";
-
-	$SQL[] = "alter table ibf_calendar_events add event_color varchar(32) NOT NULL default '';";
-
-
-
-	$SQL[] = "alter table ibf_skins add css_method varchar(100) default 'inline';";
-
-
-
-	$SQL[] = "alter table ibf_css add updated int(10) default '0';";
-
-
-
-	$SQL[] = "alter table ibf_members add integ_msg varchar(250) default '';";
-
-
-
-	$SQL[] = "alter table ibf_search_results add query_cache text;";
-
-
-
-	$SQL[] = "ALTER TABLE ibf_forums ADD quick_reply TINYINT(1) DEFAULT '0';";
-
-	$SQL[] = "alter table ibf_forums add redirect_url VARCHAR(250) default '';";
-
-	$SQL[] = "alter table ibf_forums add redirect_on	TINYINT(1) default '0' NOT NULL;";
-
-	$SQL[] = "alter table ibf_forums add redirect_hits int(10) default '0' NOT NULL;";
-
-	$SQL[] = "alter table ibf_forums add redirect_loc VARCHAR(250) default '';";
-
-	$SQL[] = "alter table ibf_forums add rules_title varchar(255) NOT NULL default '', add rules_text text NOT NULL default '';";
-
-	$SQL[] = "alter table ibf_forums add has_mod_posts tinyint(1) NOT NULL DEFAULT '0';";
-
-
-
-	$SQL[] = "alter table ibf_forums add topic_mm_id varchar(250) NOT NULL default '';";
-
-	$SQL[] = "alter table ibf_moderators add can_mm tinyint(1) NOT NULL default '0';";
-
-
-
-	$SQL[] = "alter table ibf_topics change posts posts int(10) default null, change views views int(10) default '0';";
-
-
-
-
-
-
-
-	
-
-
-
-	return $SQL;
-
-}
-
-
-
-function sql_index()
-
-{
-
-	$SQL = array();
-
-	
-
-	$SQL[] = "ALTER TABLE ibf_topics DROP INDEX forum_id;";
-
-	$SQL[] = "ALTER TABLE ibf_topics ADD INDEX forum_id(forum_id,approved,pinned);";
-
-	$SQL[] = "ALTER TABLE ibf_topics ADD INDEX(last_post);";
-
-
-
-
-
-	return $SQL;
-
-}
-
-
-
-function sql_insert()
-
-{
-
-	$SQL = array();
-
-	
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (1, 'Registration benefits', 'To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br>\r<br>During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br>\r<br>In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br>\r<br>Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br>\r<br>For more information on these items, please see the relevant sections in this documentation.', 'How to register and the added benefits of being a registered member.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (3, 'Recovering lost or forgotten passwords', 'Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br>This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br>\r<br>To do this, click on the <a href=\'index.php?act=Reg&CODE=10\'>Lost Password link</a> found on the log in page.\r<br>\r<br>Further instruction is available from there.', 'How to reset your password if you\'ve forgotton it.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (4, 'Your Control Panel (My Controls)', 'Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br>\r<br><b>Subscriptions</b>\r<br>\r<br>This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br>\r<br><b>Edit Profile Info</b>\r<br>\r<br>This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br>\r<br><b>Edit Signature</b>\r<br>\r<br>A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br>\r<br><b>Edit Avatar Settings</b>\r<br>\r<br>An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br>\r<br><b>Change Personal Photo</b>\r<br>\r<br>This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br>\r<br><b>Email Settings</b>\r<br>\r<br><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br>\r<br><b>Board Settings</b>\r<br>\r<br>From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br>You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br>You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br>\r<br><b>Skins and Languages</b>\r<br>\r<br>If available, you can choose a skin style and language choice. This affects how the board is displayed so you may wish to preview the skin before submitting the form.\r<br>\r<br><b>Change Email Address</b>\r<br>\r<br>At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br>\r<br><b>Change Password</b>\r<br>\r<br>You may change your password from this section. Please note that you will need to know your current password before you can change your password.', 'Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (5, 'Email Notification of new messages', 'This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br>\r<br>There are three ways to subscribe to a topic:\r<br>\r<br><li>Click the \'Track This Topic\' link at the top of the topic that you wish to track\r<br><li> On the posting screen when replying to or creating a topic, check the \'Enable email notification of replies?\' checkbox\r<br><li> From the E-Mail settings section of your User CP (My Controls) check the \'Enable Email Notification by default?\' option, this will automatically subscribe you to any topic that you make a reply to\r<br>\r<br>Please note that to avoid multiple emails being sent to your email address, you will only get one e-mail for each topic you are subscribed to until the next time you visit the board.\r<br>\r<br>You are also able to subscribe to each individual forum on the board, to be notified when a new topic is created in that particular forum. To enable this, click the \'Subscribe to this forum\' link at the bottom of the forum that you wish to subscribe to.\r<br>\r<br>To unsubscribe from any forums or topics that you are subscribed to - just go to the \'Subscriptions\' section of \'My Controls\' and you can do this from there.', 'How to get emailed when a new reply is added to a topic.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (6, 'Your Personal Messenger', 'Your personal messenger acts much like an email account in that you can send and receive messages and store messages in folders.\r<br>\r<br><b>Send a new PM</b>\r<br>\r<br>This will allow you to send a message to another member. If you have names in your contact list, you can choose a name from it - or you may choose to enter a name in the relevant form field. This will be automatically filled in if you clicked a \'PM\' button on the board (from the member list or a post). If allowed, you may also be able to enter in multiple names in the box provided, will need to add one username per line.\r<br>If the administrator allows, you may use BB Code and HTML in your private message. If you choose to check the \'Add a copy of this message to you sent items folder\' box, a copy of the message will be saved for you for later reference. If you tick the \'Track this message?\' box, then the details of the message will be available in your \'Message Tracker\' where you will be able to see if/when it has been read.\r<br>\r<br><b>Go to Inbox</b>\r<br>\r<br>Your inbox is where all new messages are sent to. Clicking on the message title will show you the message in a similar format to the board topic view. You can also delete or move messages from your inbox.\r<br>\r<br><b>Empty PM Folders</b>\r<br>\r<br>This option provides you with a quick and easy way to clear out all of your PM folders.\r<br>\r<br><b>Edit Storage Folders</b>\r<br>\r<br>You may rename, add or remove folders to store messages is, allowing you to organise your messages to your preference. You cannot remove \'Sent Items\' or \'Inbox\'.\r<br>\r<br><b>PM Buddies/Block List</b>\r<br>\r<br>You may add in users names in this section, or edit any saved entries. You can also use this as a ban list, denying the named member the ability to message you.\r<br>Names entered in this section will appear in the drop down list when sending a new PM, allowing you to quickly choose the members name when sending a message.\r<br>\r<br><b>Archive Messages</b>\r<br>\r<br>If your messenger folders are full and you are unable to receive new messages, you can archive them off. This compiles the messages into a single HTML page or Microsoft © Excel Format. This page is then emailed to your registered email address for your convenience.\r<br>\r<br><b>Saved (Unsent) PMs</b>\r<br>\r<br>This area will allow you to go back to any PM\'s that you have chosen to save to be sent later.\r<br>\r<br><b>Message Tracker</B>\r<br>\r<br>This is the page that any messages that you have chosen to track will appear. Details of if and when they have been read by the recipient will appear here. This also gives you the chance to delete any messages that you have sent and not yet been read by the intended recipient.', 'How to send personal messages, track them, edit your messenger folders and archive stored messages.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (7, 'Contacting the moderating team & reporting posts', '<b>Contacting the moderating team</b>\r<br>\r<br>If you need to contact a moderator or simply wish to view the complete administration team, you can click the link \'The moderating team\' found at the bottom of the main board page (the first page you see when visiting the board), or from \'My Assistant\'.\r<br>\r<br>This list will show you administrators (those who have administration control panel access), global moderators (those who can moderate in all forums) and the moderators of the individual forums.\r<br>\r<br>If you wish to contact someone about your member account, then contact an administrator - if you wish to contact someone about a post or topic, contact either a global moderator or the forum moderator.\r<br>\r<br><b>Reporting a post</b>\r<br>\r<br>If the administrator has enabled this function on the board, you\'ll see a \'Report\' button in a post, next to the \'Quote\' button. This function will let you report the post to the forum moderator (or the administrator(s), if there isn\'t a specific moderator available). You can use this function when you think the moderator(s) should be aware of the existance of that post. However, <b>do not use this to chat with the moderator(s)!</b>. You can use the email function or the Personal Messenger function for that.', 'Where to find a list of the board moderators and administrators.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (8, 'Viewing members profile information', 'You can view a members profile at any time by clicking on their name when it is underlined (as a link) or by clicking on their name in a post within a topic.\r<br>\r<br>This will show you their profile page which contains their contact information (if they have entered some) and their \'active stats\'.\r<br>\r<br>You can also click on the \'Mini Profile\' button underneath their posts, this will show up a mini \'e-card\' with their contact information and a photograph if they have chosen to have one.', 'How to view members contact information.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (9, 'Viewing active topics and new posts', 'You can view which new topics have new replies today by clicking on the \'Today\'s Active Topics\' link found at the bottom of the main board page (the first page you see when visiting the board). You can set your own date criteria, choosing to view all topics  with new replies during several date choices.\r<br>\r<br>The \'View New Posts\' link in the member bar at the top of each page, will allow you to view all of the topics which have new replies in since your last visit to the board.', 'How to view all the topics which have a new reply today and the new posts made since your last visit.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (10, 'Searching Topics and Posts', 'The search feature is designed to allow you to quickly find topics and posts that contain the keywords you enter.\r<br>\r<br>There are two types of search form available, simple search and advanced search. You may switch between the two using the \'More Options\' and \'Simple Mode\' buttons.\r<br>\r<br><b>Simple Mode</b>\r<br>\r<br>All you need to do here is enter in a keyword into the search box, and select a forum(s) to search in. (to select multiple forums, hold down the control key on a PC, or the Shift/Apple key on a Mac) choose a sorting order and search.\r<br>\r<br><b>Advanced Mode</b>\r<br>\r<br>The advanced search screen, will give you a much greater range of options to choose from to refine your search. In addition to searching by keyword, you are able to search by a members username or a combination of both. You can also choose to refine your search by selecting a date range, and there are a number of sorting options available. There are also two ways of displaying the search results, can either show the post text in full or just show a link to the topic, can choose this using the radio buttons available.\r<br>\r<br>If the administrator has enabled it, you may have a minimum amount of time to wait between searches, this is known as search flood control.\r<br>\r<br>There are also search boxes available at the bottom of each forum, to allow you to carry out a quick search of all of the topics within that particular forum.', 'How to use the search feature.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (11, 'Logging in and out', 'If you have chosen not to remember your log in details in cookies, or you are accessing the board on another computer, you will need to log into the board to access your member profile and post with your registered name.\r<br>\r<br>When you log in, you have the choice to save cookies that will log you in automatically when you return. Do not use this option on a shared computer for security.\r<br>\r<br>You can also choose to hide - this will keep your name from appearing in the active users list.\r<br>\r<br>Logging out is simply a matter of clicking on the \'Log Out\' link that is displayed when you are logged in. If you find that you are not logged out, you may need to manually remove your cookies. See the \'Cookies\' help file for more information.', 'How to log in and out from the board and how to remain anonymous and not be shown on the active users list.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (13, 'My Assistant', 'This feature is sometimes referred to as a \'Browser Buddy\'. \r<br>\r<br>At the top it tells you how many posts have been made since you last visited the board.. Also underneath this the number of posts with replies that have been made in topics that the individual has also posted in.\r<br>Click on the \'View\' link on either of the two sentences to see the posts.\r<br>\r<br>The next section is five links to useful features:\r<br>\r<br><li>The link to the moderating team is basically a quick link to see all those that either administrate or moderate certain forums on the message board.\r<br><li> The link to \'Today\'s Active Topics\' shows you all the topics that have been created in the last 24 hours on the board.\r<br><li>Today\'s Top 10 Posters link shows you exactly as the name suggests. It shows you the amount of posts by the members and also their total percentage of the total posts made that day.\r<br><li>The overall Top 10 Posters link shows you the top 10 posters for the whole time that the board has been installed.\r<br><li>My last 10 posts links to the latest topics that you have made on the board. These are shortened on the page, to save space, and are linked to if you require to read more of them.\r<br>\r<br>The two search features allow you to search the whole board for certain words in a whole topic. It isn\'t as featured as the normal search option so it is not as comprehensive.\r<br>\r<br>The Help Search is just as comprehensive as the normal help section\'s search function and allows for quick searching of all the help topics on the board.', 'A comprehensive guide to use this handy little feature.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (12, 'Posting', 'There are three different posting screens available. The new topic button, visible in forums and in topics allows you to add a new topic to that particular forum. The new poll button (is the admin has enabled it) will also be viewable in topics and forums allowing you to create a new poll in the forum. When viewing a topic, there will be an add reply button, allowing you to add a new reply onto that particular topic. \r\n<br>\r\n<br><b>Posting new topics and replying</b>\r\n<br>\r\n<br>When making a post, you will most likely have the option to use IBF code when posting. This will allow you to add various types of formatting to your messages. For more information on this, click the \'BB Code Help\' link under the emoticon box to launch the help window.\r\n<br>\r\n<br>On the left of the text entry box, there is the clickable emoticons box - you can click on these to add them to the content of your message (these are sometimes known as \'smilies\').\r\n<br>\r\n<br>There are three options available when making a post or a reply. \'Enable emoticons?\' if this is unchecked, then any text that would normally be converted into an emoticon will not be. \'Enable signature?\' allows you to choose whether or not you would like your signature to appear on that individual post. \'Enable email notification of replies?\' ticking this box will mean that you will receive e-mail updates to the topic, see the \'Email Notification of new messages\' help topic for more information on this.\r\n<br>\r\n<br>You also have the option to choose a post icon for the topic/post when creating one. This icon will appear next to the topic name on the topic listing in that forum, or will appear next to the date/time of the message if making a reply to a topic.\r\n<br>\r\n<br>If the admin has enabled it, you will also see a file attachments option, this will allow you to attach a file to be uploaded when making a post. Click the browse button to select a file from your computer to be uploaded. If you upload an image file, it may be shown in the content of the post, all other file types will be linked to.\r\n<br>\r\n<br><b>Poll Options</b>\r\n<br>\r\n<br>If you have chosen to post a new poll, there will be an extra two option boxes at the top of the help screen. The first input box will allow you to enter the question that you are asking in the poll. The text field underneath is where you will input the choices for the poll. Simply enter a different option on each line. The maximum number of choices is set by the board admin, and this figure is displayed on the left.\r\n<br>\r\n<br><b>Quoting Posts</b>\r\n<br>\r\n<br>Displayed above each post in a topic, there is a \'Quote\' button. Pressing this button will allow you to reply to a topic, and have the text from a particular reply quoted in your own reply. When you choose to do this, an extra text field will appear below the main text input box to allow you to edit the content of the post being quoted.\r\n<br>\r\n<br><b>Editing Posts</b>\r\n<br>\r\n<br>Above any posts that you have made, you may see an \'Edit\' button. Pressing this will allow you to edit the post that you had previously made. \r\n<br>\r\n<br>When editing you may see an option to \'Add the \'Edit by\' line in this post?\'. If you tick this then it will show up in the posts that it has been edited and the time at which it was edited. If this option does not appear, then the edit by line will always be added to the post.\r\n<br>\r\n<br>If you are unable to see the edit button displayed on each post that you have made, then the administrator may have prevented you from editing posts, or the time limit for editing may have expired.\r\n<br>\r\n<br><b>Fast Reply</b>\r\n<br>\r\n<br>Where it has been enabled, there will be a fast reply button on each topic. Clicking this will open up a posting box on the topic view screen, cutting down on the time required to load the main posting screen. Click the fast reply button to expand the reply box and type the post inside of there. Although the fast reply box is not expanded by default, you can choose the option to have it expanded by default, from the board settings section of your control panel. Pressing the \'More Options\' button will take you to the normal posting screen.', 'A guide to the features avaliable when posting on the boards.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (14, 'Member List', 'The member list, accessed via the \'Members\' link at the top of each page, is basically a listing of all of the members that have registered on the board. \r\n<br>\r\n<br>If you are looking to search for a particular member by all/part of their username, then in the drop down box at the bottom of the page, change the selection from \'Search All Available\' to \'Name Begins With\' or \'Name Contains\' and input all/part of their name in the text input field and press the \'Go!\' button. \r\n<br>\r\n<br>Also, at the bottom of the member list page, there are a number of sorting options available to alter the way in which the list is displayed. \r\n<br>\r\n<br>If a member has chosen to add a photo to their profile information, then a camera icon will appear next to their name, and you may click this to view the photo.', 'Explaining the different ways to sort and search through the list of members.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (15, 'Topic Options', 'At the bottom of each topic, there is a \'Topic Options\' button. Pressing this button will expand the topic options box. \r\n<br>\r\n<br>From this box, you can select from the following options: \r\n<br>\r\n<br><li>Track this topic - this option will allow you to receive e-mail updates for the topic, see the \'Email Notification of new messages\' help file for more information on this \r\n<br><li>Subscribe to this forum - will allow you to receive e-mail updates for any new topics posted in the forum, see the Notification of new messages\' help file for more information on this \r\n<br><li>Download / Print this Topic - will show the topic in a number of different formats. \'Printer Friendly Version\' will display a version of the topic that is suitable for printing out. \'Download HTML Version\' will download a copy of the topic to your hard drive, and this can then be viewed in a web browser, without having to visit the board. \'Download Microsoft Word Version\' will allow you to download the file to your hard drive and open it up in the popular word processing application, Microsoft Word, for viewing offline.', 'A guide to the options avaliable when viewing a topic.');";
-
-$SQL[] = "REPLACE INTO ibf_faq VALUES (16, 'Calendar', 'This board features it\'s very own calendar feature, which can be accessed via the calendar link at the top of the board.\r\n<br>\r\n<br>You are able to add your own personal events to the calendar - and these are only viewable by yourself. To add a new event, use the \'Add New Event\' button to be taken to the event posting screen. There are three types of events that you can now add:\r\n<br>\r\n<br><li>A single day/one off event can be added using the first option, by just selecting the date for it to appear on.\r\n<br><li>Ranged Event - is an event that spans across multiple days, to do this in addition to selecting the start date as above, will need to add the end date for the event. There are also options available  to highlight the message on the calendar, useful if there is more than one ranged event being displayed at any one time.\r\n<br><li>Recurring Event - is a one day event, that you can set to appear at set intervals on the calendar, either weekly, monthly or yearly.\r\n<br>\r\n<br>If the admistrator allows you, you may also be able to add a public event, that will not just be shown to yourself, but will be viewable by everyone.\r\n<br>\r\n<br>Also, if the admistrator has chosen,  there will be a link to all the birthdays happening on a particular day displayed on the calendar, and your birthday will appear if you have chosen to enter a date of birth in the Profile Info section of your control panel.', 'More information on the boards calendar feature.');";
-
-
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (1, 'A_LOCKED_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'Closed Topic\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (2, 'A_MOVED_B', '<img src=\'style_images/<#IMG_DIR#>/t_moved.gif\' border=\'0\'  alt=\'Moved Topic\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (3, 'A_POLLONLY_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'Poll Only\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (4, 'A_POST', '<img src=\'style_images/<#IMG_DIR#>/t_new.gif\' border=\'0\'  alt=\'Start new topic\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (5, 'A_REPLY', '<img src=\'style_images/<#IMG_DIR#>/t_reply.gif\' border=\'0\'  alt=\'Reply to this topic\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (6, 'A_POLL', '<img src=\'style_images/<#IMG_DIR#>/t_poll.gif\' border=\'0\'  alt=\'Start Poll\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (7, 'A_STAR', '<img src=\'style_images/<#IMG_DIR#>/pip.gif\' border=\'0\'  alt=\'*\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (8, 'B_HOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot.gif\' border=\'0\'  alt=\'Hot topic\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (9, 'B_HOT_NN', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no.gif\' border=\'0\'  alt=\'No new\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (10, 'B_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/f_closed.gif\' border=\'0\'  alt=\'Closed\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (11, 'B_MOVED', '<img src=\'style_images/<#IMG_DIR#>/f_moved.gif\' border=\'0\'  alt=\'Moved\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (12, 'B_NEW', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (13, 'B_NORM', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (14, 'B_PIN', '<img src=\'style_images/<#IMG_DIR#>/f_pinned.gif\' border=\'0\'  alt=\'Pinned\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (15, 'B_POLL', '<img src=\'style_images/<#IMG_DIR#>/f_poll.gif\' border=\'0\'  alt=\'Poll\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (16, 'B_POLL_NN', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no.gif\' border=\'0\'  alt=\'No new votes\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (17, 'B_HOT_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_dot.gif\' border=\'0\' alt=\'New Posts\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (18, 'B_NEW_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_dot.gif\' border=\'0\' alt=\'No New Posts\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (19, 'B_HOT_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no_dot.gif\' border=\'0\' alt=\'No New Posts*\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (20, 'B_NORM_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no_dot.gif\' border=\'0\' alt=\'No New Posts*\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (21, 'B_POLL_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_dot.gif\' border=\'0\' alt=\'Poll*\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (22, 'B_POLL_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no_dot.gif\' border=\'0\' alt=\'No New Votes*\'>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (23, 'C_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/bf_readonly.gif\' border=\'0\'  alt=\'Read Only Forum\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (24, 'C_OFF', '<img src=\'style_images/<#IMG_DIR#>/bf_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (25, 'C_OFF_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (26, 'C_OFF_RES', '<img src=\'style_images/<#IMG_DIR#>/br_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (27, 'C_ON', '<img src=\'style_images/<#IMG_DIR#>/bf_new.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (28, 'C_ON_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_new.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (29, 'C_ON_RES', '<img src=\'style_images/<#IMG_DIR#>/br_new.gif\' border=\'0\'  alt=\'New Posts\'  />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (30, 'F_ACTIVE', '<img src=\'style_images/<#IMG_DIR#>/user.gif\' border=\'0\'  alt=\'Active Users\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (31, 'F_NAV_SEP', '&nbsp;-&gt;&nbsp;', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (32, 'F_NAV', '<img src=\'style_images/<#IMG_DIR#>/nav.gif\' border=\'0\'  alt=\'&gt;\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (33, 'F_STATS', '<img src=\'style_images/<#IMG_DIR#>/stats.gif\' border=\'0\'  alt=\'Board Stats\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (34, 'NO_PHOTO', '<img src=\'style_images/<#IMG_DIR#>/nophoto.gif\' border=\'0\'  alt=\'No Photo\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (35, 'CAMERA', '<img src=\'style_images/<#IMG_DIR#>/camera.gif\' border=\'0\'  alt=\'Photo\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (36, 'M_READ', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'Read Msg\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (37, 'M_UNREAD', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'Unread Msg\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (38, 'P_AOL', '<img src=\'style_images/<#IMG_DIR#>/p_aim.gif\' border=\'0\'  alt=\'AOL\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (39, 'P_DELETE', '<img src=\'style_images/<#IMG_DIR#>/p_delete.gif\' border=\'0\'  alt=\'Delete Post\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (40, 'P_EDIT', '<img src=\'style_images/<#IMG_DIR#>/p_edit.gif\' border=\'0\'  alt=\'Edit Post\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (41, 'P_EMAIL', '<img src=\'style_images/<#IMG_DIR#>/p_email.gif\' border=\'0\'  alt=\'Email Poster\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (42, 'P_ICQ', '<img src=\'style_images/<#IMG_DIR#>/p_icq.gif\' border=\'0\'  alt=\'ICQ\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (43, 'P_MSG', '<img src=\'style_images/<#IMG_DIR#>/p_pm.gif\' border=\'0\'  alt=\'PM\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (44, 'P_QUOTE', '<img src=\'style_images/<#IMG_DIR#>/p_quote.gif\' border=\'0\'  alt=\'Quote Post\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (45, 'P_WEBSITE', '<img src=\'style_images/<#IMG_DIR#>/p_www.gif\' border=\'0\'  alt=\'Users Website\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (46, 'P_YIM', '<img src=\'style_images/<#IMG_DIR#>/p_yim.gif\' border=\'0\' alt=\'Yahoo\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (47, 'P_REPORT', '<img src=\'style_images/<#IMG_DIR#>/p_report.gif\' border=\'0\'  alt=\'Report Post\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (48, 'P_MSN', '<img src=\'style_images/<#IMG_DIR#>/p_msn.gif\' border=\'0\' alt=\'MSN\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (49, 'CAT_IMG', '<img src=\'style_images/<#IMG_DIR#>/nav_m.gif\' border=\'0\'  alt=\'&gt;\' width=\'8\' height=\'8\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (50, 'NEW_POST', '<img src=\'style_images/<#IMG_DIR#>/newpost.gif\' border=\'0\'  alt=\'Goto last unread\' title=\'Goto last unread\' hspace=2>', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (51, 'LAST_POST', '<img src=\'style_images/<#IMG_DIR#>/lastpost.gif\' border=\'0\'  alt=\'Last Post\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (52, 'BR_REDIRECT', '<img src=\'style_images/<#IMG_DIR#>/br_redirect.gif\' border=\'0\'  alt=\'Redirect\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (53, 'INTEGRITY_MSGR', '<img src=\'style_images/<#IMG_DIR#>/p_im.gif\' border=\'0\'  alt=\'Integrity Messenger IM\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (54, 'ADDRESS_CARD', '<img src=\'style_images/<#IMG_DIR#>/addresscard.gif\' border=\'0\'  alt=\'Mini Profile\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (55, 'T_QREPLY', '<img src=\'style_images/<#IMG_DIR#>/t_qr.gif\' border=\'0\'  alt=\'Quick Reply\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (56, 'T_OPTS', '<img src=\'style_images/<#IMG_DIR#>/t_options.gif\' border=\'0\'  alt=\'Topic Options\' />', 1, 1);";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (57, 'CAL_NEWEVENT', '<img src=\'style_images/<#IMG_DIR#>/cal_newevent.gif\' border=\'0\'  alt=\'Add New Event\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (58, 'F_RULES', '<img src=\'style_images/<#IMG_DIR#>/forum_rules.gif\' border=\'0\'  alt=\'Forum Rules\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (59, 'WARN_0', '<img src=\'style_images/<#IMG_DIR#>/warn0.gif\' border=\'0\'  alt=\'-----\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (60, 'WARN_1', '<img src=\'style_images/<#IMG_DIR#>/warn1.gif\' border=\'0\'  alt=\'X----\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (61, 'WARN_2', '<img src=\'style_images/<#IMG_DIR#>/warn2.gif\' border=\'0\'  alt=\'XX---\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (62, 'WARN_3', '<img src=\'style_images/<#IMG_DIR#>/warn3.gif\' border=\'0\'  alt=\'XXX--\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (63, 'WARN_4', '<img src=\'style_images/<#IMG_DIR#>/warn4.gif\' border=\'0\'  alt=\'XXXX-\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (64, 'WARN_5', '<img src=\'style_images/<#IMG_DIR#>/warn5.gif\' border=\'0\'  alt=\'XXXXX\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (65, 'WARN_ADD', '<img src=\'style_images/<#IMG_DIR#>/warn_add.gif\' border=\'0\'  alt=\'+\' />', 1, 1)";
-
-$SQL[] = "REPLACE INTO ibf_macro VALUES (66, 'WARN_MINUS', '<img src=\'style_images/<#IMG_DIR#>/warn_minus.gif\' border=\'0\'  alt=\'-\' />', 1, 1)";
-
-
-
-	return $SQL;
-
-}
-
-
-
-function get_main_css()
-
-{
-
-return "/* FIX IE6 Scrollbars bug - Leave this in! */
-
-html { overflow-x: auto; } 
-
-
-
-/* Body entry, change forum page background colour, default font, font size, etc. Leave text-align:center to center board content
-
-   #ipwrapper will set text-align back to left for the forum. Any other tables / divs you use must use text-align:left to re-align
-
-   the content properly. This is a work around to a known Internet Explorer bug */
-
-BODY { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; margin:0px;padding:0px;background-color:#FFF; text-align:center }
-
-TABLE, TR, TD { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; }
-
-
-
-/* MAIN WRAPPER: Adjust forum width here. Leave margins alone to auto-center content */
-
-#ipbwrapper { text-align:left; width:95%; margin-left:auto;margin-right:auto }
-
-
-
-a:link, a:visited, a:active { text-decoration: underline; color: #000 }
-
-a:hover { color: #465584; text-decoration:underline }
-
-
-
-fieldset.search { padding:6px; line-height:150% }
-
-label      { cursor:pointer; }
-
-form       { display:inline; }
-
-img        { vertical-align:middle; border:0px }
-
-img.attach { border:2px outset #EEF2F7;padding:2px }
-
-
-
-.googleroot  { padding:6px; line-height:130% }
-
-.googlechild { padding:6px; margin-left:30px; line-height:130% }
-
-.googlebottom, .googlebottom a:link, .googlebottom a:visited, .googlebottom a:active { font-size:11px; color: #3A4F6C; }
-
-.googlish, .googlish a:link, .googlish a:visited, .googlish a:active { font-size:14px; font-weight:bold; color:#00D; }
-
-.googlepagelinks { font-size:1.1em; letter-spacing:1px }
-
-.googlesmall, .googlesmall a:link, .googlesmall a:active, .googlesmall a:visited { font-size:10px; color:#434951 }
-
-
-
-li.helprow { padding:0px; margin:0px 0px 10px 0px }
-
-ul#help    { padding:0px 0px 0px 15px }
-
-
-
-option.cat { font-weight:bold; }
-
-option.sub { font-weight:bold;color:#555 }
-
-.caldate   { text-align:right;font-weight:bold;font-size:11px;color:#777;background-color:#DFE6EF;padding:4px;margin:0px }
-
-
-
-.warngood { color:green }
-
-.warnbad  { color:red }
-
-
-
-#padandcenter { margin-left:auto;margin-right:auto;text-align:center;padding:14px 0px 14px 0px }
-
-
-
-#profilename { font-size:28px; font-weight:bold; }
-
-#calendarname { font-size:22px; font-weight:bold; }
-
-
-
-#photowrap { padding:6px; }
-
-#phototitle { font-size:24px; border-bottom:1px solid black }
-
-#photoimg   { text-align:center; margin-top:15px } 
-
-
-
-#ucpmenu    { line-height:150%;width:22%; border:1px solid #345487;background-color: #F5F9FD }
-
-#ucpmenu p  { padding:2px 5px 6px 9px;margin:0px; }
-
-#ucpcontent { background-color: #F5F9FD; border:1px solid #345487;line-height:150%; width:auto }
-
-#ucpcontent p  { padding:10px;margin:0px; }
-
-
-
-#ipsbanner { position:absolute;top:1px;right:5%; }
-
-#logostrip { border:1px solid #345487;background-color: #3860BB;background-image:url(style_images/<#IMG_DIR#>/tile_back.gif);padding:0px;margin:0px; }
-
-#submenu   { border:1px solid #BCD0ED;background-color: #DFE6EF;font-size:10px;margin:3px 0px 3px 0px;color:#3A4F6C;font-weight:bold;}
-
-#submenu a:link, #submenu  a:visited, #submenu a:active { font-weight:bold;font-size:10px;text-decoration: none; color: #3A4F6C; }
-
-#userlinks { border:1px solid #C2CFDF; background-color: #F0F5FA }
-
-
-
-#navstrip  { font-weight:bold;padding:6px 0px 6px 0px; }
-
-
-
-.activeuserstrip { background-color:#BCD0ED; padding:6px }
-
-
-
-/* Form stuff (post / profile / etc) */
-
-.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px }
-
-.pformleft  { background-color: #F5F9FD; padding:6px; margin-top:1px;width:25%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-
-.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-
-.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
-
-
-
-/* Topic View elements */
-
-.signature   { font-size: 10px; color: #339; line-height:150% }
-
-.postdetails { font-size: 10px }
-
-.postcolor   { font-size: 12px; line-height: 160% }
-
-
-
-.normalname { font-size: 12px; font-weight: bold; color: #003 }
-
-.normalname a:link, .normalname a:visited, .normalname a:active { font-size: 12px }
-
-.unreg { font-size: 11px; font-weight: bold; color: #900 }
-
-
-
-.post1 { background-color: #F5F9FD }
-
-.post2 { background-color: #EEF2F7 }
-
-.postlinksbar { background-color:#D1DCEB;padding:7px;margin-top:1px;font-size:10px; background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif) }
-
-
-
-/* Common elements */
-
-.row1 { background-color: #F5F9FD }
-
-.row2 { background-color: #DFE6EF }
-
-.row3 { background-color: #EEF2F7 }
-
-.row4 { background-color: #E4EAF2 }
-
-
-
-.darkrow1 { background-color: #C2CFDF; color:#4C77B6; }
-
-.darkrow2 { background-color: #BCD0ED; color:#3A4F6C; }
-
-.darkrow3 { background-color: #D1DCEB; color:#3A4F6C; }
-
-
-
-.hlight { background-color: #DFE6EF }
-
-.dlight { background-color: #EEF2F7 }
-
-
-
-.titlemedium { font-weight:bold; color:#3A4F6C; padding:7px; margin:0px; background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif) }
-
-.titlemedium  a:link, .titlemedium  a:visited, .titlemedium  a:active  { text-decoration: underline; color: #3A4F6C }
-
-
-
-/* Main table top (dark blue gradient by default) */
-
-.maintitle { vertical-align:middle;font-weight:bold; color:#FFF; padding:8px 0px 8px 5px; background-image: url(style_images/<#IMG_DIR#>/tile_back.gif) }
-
-.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-
-.maintitle a:hover { text-decoration: underline }
-
-
-
-/* tableborders gives the white column / row lines effect */
-
-.plainborder { border:1px solid #345487;background-color:#F5F9FD }
-
-.tableborder { border:1px solid #345487;background-color:#FFF; padding:0; margin:0 }
-
-.tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px;  }
-
-.tablepad    { background-color:#F5F9FD;padding:6px }
-
-.tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }
-
-
-
-.wrapmini    { float:left;line-height:1.5em;width:25% }
-
-.pagelinks   { float:left;line-height:1.2em;width:35% }
-
-
-
-.desc { font-size:10px; color:#434951 }
-
-.edit { font-size: 9px }
-
-
-
-
-
-.searchlite { font-weight:bold; color:#F00; background-color:#FF0 }
-
-
-
-#QUOTE { font-family: Verdana, Arial; font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-
-#CODE  { font-family: Courier, Courier New, Verdana, Arial;  font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-
-
-
-.copyright { font-family: Verdana, Tahoma, Arial, Sans-Serif; font-size: 9px; line-height: 12px }
-
-
-
-.codebuttons  { font-size: 10px; font-family: verdana, helvetica, sans-serif; vertical-align: middle }
-
-.forminput, .textinput, .radiobutton, .checkbox  { font-size: 11px; font-family: verdana, helvetica, sans-serif; vertical-align: middle }
-
-
-
-.thin { padding:6px 0px 6px 0px;line-height:140%;margin:2px 0px 2px 0px;border-top:1px solid #FFF;border-bottom:1px solid #FFF }
-
-
-
-.purple { color:purple;font-weight:bold }
-
-.red    { color:red;font-weight:bold }
-
-.green  { color:green;font-weight:bold }
-
-.blue   { color:blue;font-weight:bold }
-
-.orange { color:#F90;font-weight:bold }";
-
-}
-
-
-
-function get_main_wrapper()
-
-{
-
-return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
-
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
-
-<head> 
-
-<title><% TITLE %></title> 
-
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
-
-<% GENERATOR %> 
-
-<% CSS %> 
-
-<% JAVASCRIPT %> 
-
-</head> 
-
-<body>
-
-<div id="ipbwrapper">
-
-<% BOARD HEADER %> 
-
-<% NAVIGATION %> 
-
-<% BOARD %> 
-
-<% STATS %> 
-
-<% COPYRIGHT %>
-
-</div>
-
-</body> 
-
-</html>';
-
-}
-
-
-
-
-
-?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/SQL Schematic/macros.sql b/Tools_and_Scripts/SQL Schematic/macros.sql
deleted file mode 100644
index 78866e79..00000000
--- a/Tools_and_Scripts/SQL Schematic/macros.sql	
+++ /dev/null
@@ -1,58 +0,0 @@
-$SQL[] = "INSERT INTO ibf_macro VALUES (1, 'A_LOCKED_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'Closed Topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (2, 'A_MOVED_B', '<img src=\'style_images/<#IMG_DIR#>/t_moved.gif\' border=\'0\'  alt=\'Moved Topic\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (3, 'A_POLLONLY_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'Poll Only\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (4, 'A_POST', '<img src=\'style_images/<#IMG_DIR#>/t_new.gif\' border=\'0\'  alt=\'Start new topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (5, 'A_REPLY', '<img src=\'style_images/<#IMG_DIR#>/t_reply.gif\' border=\'0\'  alt=\'Reply to this topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (6, 'A_POLL', '<img src=\'style_images/<#IMG_DIR#>/t_poll.gif\' border=\'0\'  alt=\'Start Poll\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (7, 'A_STAR', '<img src=\'style_images/<#IMG_DIR#>/pip.gif\' border=\'0\'  alt=\'*\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (8, 'B_HOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot.gif\' border=\'0\'  alt=\'Hot topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (9, 'B_HOT_NN', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no.gif\' border=\'0\'  alt=\'No new\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (10, 'B_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/f_closed.gif\' border=\'0\'  alt=\'Closed\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (11, 'B_MOVED', '<img src=\'style_images/<#IMG_DIR#>/f_moved.gif\' border=\'0\'  alt=\'Moved\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (12, 'B_NEW', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (13, 'B_NORM', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (14, 'B_PIN', '<img src=\'style_images/<#IMG_DIR#>/f_pinned.gif\' border=\'0\'  alt=\'Pinned\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (15, 'B_POLL', '<img src=\'style_images/<#IMG_DIR#>/f_poll.gif\' border=\'0\'  alt=\'Poll\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (16, 'B_POLL_NN', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no.gif\' border=\'0\'  alt=\'No new votes\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (17, 'B_HOT_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_dot.gif\' border=\'0\' alt=\'New Posts\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (18, 'B_NEW_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_dot.gif\' border=\'0\' alt=\'No New Posts\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (19, 'B_HOT_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no_dot.gif\' border=\'0\' alt=\'No New Posts*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (20, 'B_NORM_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no_dot.gif\' border=\'0\' alt=\'No New Posts*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (21, 'B_POLL_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_dot.gif\' border=\'0\' alt=\'Poll*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (22, 'B_POLL_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no_dot.gif\' border=\'0\' alt=\'No New Votes*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (23, 'C_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/bf_readonly.gif\' border=\'0\'  alt=\'Read Only Forum\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (24, 'C_OFF', '<img src=\'style_images/<#IMG_DIR#>/bf_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (25, 'C_OFF_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (26, 'C_OFF_RES', '<img src=\'style_images/<#IMG_DIR#>/br_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (27, 'C_ON', '<img src=\'style_images/<#IMG_DIR#>/bf_new.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (28, 'C_ON_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_new.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (29, 'C_ON_RES', '<img src=\'style_images/<#IMG_DIR#>/br_new.gif\' border=\'0\'  alt=\'New Posts\'  />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (30, 'F_ACTIVE', '<img src=\'style_images/<#IMG_DIR#>/user.gif\' border=\'0\'  alt=\'Active Users\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (31, 'F_NAV_SEP', '&nbsp;-&gt;&nbsp;', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (32, 'F_NAV', '<img src=\'style_images/<#IMG_DIR#>/nav.gif\' border=\'0\'  alt=\'&gt;\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (33, 'F_STATS', '<img src=\'style_images/<#IMG_DIR#>/stats.gif\' border=\'0\'  alt=\'Board Stats\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (34, 'NO_PHOTO', '<img src=\'style_images/<#IMG_DIR#>/nophoto.gif\' border=\'0\'  alt=\'No Photo\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (35, 'CAMERA', '<img src=\'style_images/<#IMG_DIR#>/camera.gif\' border=\'0\'  alt=\'Photo\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (36, 'M_READ', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'Read Msg\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (37, 'M_UNREAD', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'Unread Msg\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (38, 'P_AOL', '<img src=\'style_images/<#IMG_DIR#>/p_aim.gif\' border=\'0\'  alt=\'AOL\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (39, 'P_DELETE', '<img src=\'style_images/<#IMG_DIR#>/p_delete.gif\' border=\'0\'  alt=\'Delete Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (40, 'P_EDIT', '<img src=\'style_images/<#IMG_DIR#>/p_edit.gif\' border=\'0\'  alt=\'Edit Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (41, 'P_EMAIL', '<img src=\'style_images/<#IMG_DIR#>/p_email.gif\' border=\'0\'  alt=\'Email Poster\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (42, 'P_ICQ', '<img src=\'style_images/<#IMG_DIR#>/p_icq.gif\' border=\'0\'  alt=\'ICQ\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (43, 'P_MSG', '<img src=\'style_images/<#IMG_DIR#>/p_pm.gif\' border=\'0\'  alt=\'PM\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (44, 'P_QUOTE', '<img src=\'style_images/<#IMG_DIR#>/p_quote.gif\' border=\'0\'  alt=\'Quote Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (45, 'P_WEBSITE', '<img src=\'style_images/<#IMG_DIR#>/p_www.gif\' border=\'0\'  alt=\'Users Website\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (46, 'P_YIM', '<img src=\'style_images/<#IMG_DIR#>/p_yim.gif\' border=\'0\' alt=\'Yahoo\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (47, 'P_REPORT', '<img src=\'style_images/<#IMG_DIR#>/p_report.gif\' border=\'0\'  alt=\'Report Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (48, 'P_MSN', '<img src=\'style_images/<#IMG_DIR#>/p_msn.gif\' border=\'0\' alt=\'MSN\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (49, 'CAT_IMG', '<img src=\'style_images/<#IMG_DIR#>/nav_m.gif\' border=\'0\'  alt=\'&gt;\' width=\'8\' height=\'8\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (50, 'NEW_POST', '<img src=\'style_images/<#IMG_DIR#>/newpost.gif\' border=\'0\'  alt=\'Goto last unread\' title=\'Goto last unread\' hspace=2>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (51, 'LAST_POST', '<img src=\'style_images/<#IMG_DIR#>/lastpost.gif\' border=\'0\'  alt=\'Last Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (52, 'BR_REDIRECT', '<img src=\'style_images/<#IMG_DIR#>/br_redirect.gif\' border=\'0\'  alt=\'Redirect\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (53, 'INTEGRITY_MSGR', '<img src=\'style_images/<#IMG_DIR#>/p_im.gif\' border=\'0\'  alt=\'Integrity Messenger IM\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (54, 'ADDRESS_CARD', '<img src=\'style_images/<#IMG_DIR#>/addresscard.gif\' border=\'0\'  alt=\'Mini Profile\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (55, 'T_QREPLY', '<img src=\'style_images/<#IMG_DIR#>/t_qr.gif\' border=\'0\'  alt=\'Quick Reply\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (56, 'T_OPTS', '<img src=\'style_images/<#IMG_DIR#>/t_options.gif\' border=\'0\'  alt=\'Topic Options\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (57, 'CAL_NEWEVENT', '<img src=\'style_images/<#IMG_DIR#>/cal_newevent.gif\' border=\'0\'  alt=\'Add New Event\' />', 0, 1);
-$SQL[] = "INSERT INTO ibf_macro VALUES (58, 'F_RULES', '<img src=\'style_images/<#IMG_DIR#>/forum_rules.gif\' border=\'0\'  alt=\'Forum Rules\' />', 0, 1);
\ No newline at end of file
diff --git a/Tools_and_Scripts/SQL Schematic/required2.sql b/Tools_and_Scripts/SQL Schematic/required2.sql
deleted file mode 100644
index 5fbfef58..00000000
--- a/Tools_and_Scripts/SQL Schematic/required2.sql	
+++ /dev/null
@@ -1,123 +0,0 @@
-INSERT INTO ibf_categories (id, position, state, name, description, image, url) VALUES (-1, NULL, NULL, '-', NULL, NULL, NULL);
-INSERT INTO ibf_categories (id, position, state, name, description, image, url) VALUES (1, 1, '1', 'A Test Category', '', '', '');
-
-INSERT INTO ibf_css (cssid, css_name, css_text, css_comments) VALUES (1, 'Invision Style Sheet', 'form { display:inline }\r\nTABLE, TR, TD { font-family: Verdana, Tahoma, Arial; font-size: 8.5pt; color: #000000 }\r\na:link, a:visited, a:active { text-decoration: underline; color: #000000 }\r\na:hover { color: #465584 }\r\n.hlight { background-color: #DFE6EF }\r\n.dlight { background-color: #EEF2F7 }\r\n.mainbg { background-color: #FFFFFF }\r\n.mainfoot { background-color: #BCD0ED }\r\n.forum1 { background-color: #DFE6EF }\r\n.forum2 { background-color: #E4EAF2 }\r\n.post1 { background-color: #F5F9FD }\r\n.post2 { background-color: #EEF2F7 }\r\n.posthead { background-color: #E4EAF2 }\r\n\r\n.postbak { background-color: #D2D2D0 }\r\n.title { background-color: #C4DCF7 }\r\n.row1 { background-color: #EEF2F7 }\r\n.row2 { background-color: #F5F9FD }\r\n.postsep { background-color: #C7D2E0; height: 1px }\r\n\r\n.signature { font-size: 7.5pt; color: #333399 }\r\n.postdetails { font-size: 7.5pt }\r\n.postcolor, #postcolor { font-size: 9pt; line-height: 160% }\r\n.membertitle { font-size: 10px; line-height: 150%; color: #000000 }\r\n.normalname { font-size: 12px; font-weight: bold; color: #000033; padding-bottom: 2px }\r\n.normalname a:link, .normalname a:visited, .normalname a:active { text-decoration: underline; color: #000033; padding-bottom: 2px }\r\n.unreg { font-size: 11px; font-weight: bold; color: #990000 }\r\n.highlight { color: #FF0000 }\r\n.highlight a:link, .highlight a:visited, .highlight a:active { text-decoration: underline; color: #FF0000 }\r\n.highlight a:hover { text-decoration: underline }\r\n.desc { font-size: 8.0pt; color: #434951 }\r\n.copyright { font-family: Verdana, Tahoma, Arial; font-size: 7.5pt; line-height: 12px }\r\n.category { font-weight: bold; line-height: 150%; color: #4C77B6; background-color: #C2CFDF }\r\n.category   a:link, #category   a:visited, #category   a:active { text-decoration: none; color: #4C77B6 }\r\n.postfoot         {\r\n\r\n    font-weight:bold;\r\n\r\n    color:#3A4F6C;\r\n\r\n    height: 24px;\r\n\r\n    background-color: #D1DCEB;\r\n\r\n}\r\n.titlefoot { font-weight: bold; color: #3A4F6C; height: 24px; background-color: #BCD0ED }\r\n.titlemedium         {\r\n\r\n    font-weight:bold;\r\n    color:#3A4F6C;\r\n\r\n    height: 30px;\r\n\r\n    background-color: #9FBCE3;\r\n    \r\n    background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif);\r\n\r\n}\r\n.titlemedium  a:link,  .titlefoot  a:link, .titlemedium  a:visited, .titlefoot  a:visited, .titlemedium  a:active, .titlefoot  a:active { text-decoration: underline; color: #3A4F6C }\r\n.titlemedium a:hover, .subtitle a:hover, .titlefoot a:hover { text-decoration: underline; color: #000000 }\r\n.maintitle         {\r\n\r\n    color:#FFFFFF;\r\n\r\n    font-size: 9.5pt;\r\n    \r\n    height: 26px;\r\n    \r\n    background-image: url(style_images/<#IMG_DIR#>/tile_back.gif);\r\n\r\n}\r\n.edit { font-size: 9px }\r\n.fancyborder { border: 1px dashed #999999 }\r\n.solidborder { border: 1px solid #999999 }\r\n.maintitle  a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFFFFF }\r\n.maintitle a:hover { text-decoration: underline }\r\n.nav { font-weight: bold; color: #000000; font-size: 8.5pt }\r\n.pagetitle { color: #4C77B6; font-size: 18px; font-weight: bold; letter-spacing: -1px; line-height: 120% }\r\n.useroptions { background-color: #598CC3; height: 25px; font-weight: bold; color: #FFFFFF }\r\n.useroptions a:link, .useroptions a:visited,.useroptions a:active { text-decoration: none; color: #FFFFFF }\r\n.bottomborder { border-bottom: 1px dashed #D2D2D0 }\r\n.linkthru { color: #000000; font-size:8.5pt }\r\n.linkthru  a:link, .linkthru  a:active { text-decoration: underline; color: #000000 }\r\n.linkthru  a:visited { text-decoration: underline; color: #000000 }\r\n.linkthru  a:hover { text-decoration: underline; color: #465584 }\r\n#QUOTE { font-family: Verdana, Arial; font-size: 8pt; color: #333333; background-color: #FAFCFE; border: 1px solid Black; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }\r\n#CODE { font-family: Verdana, Arial; font-size: 8pt; color: #333333; background-color: #FAFCFE; border: 1px solid Black; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }\r\n.codebuttons { font-size: 8.5pt; font-family: verdana, helvetica, sans-serif; vertical-align: middle }\r\n.forminput { font-size: 9pt; font-family: verdana, helvetica, sans-serif; vertical-align: middle }\r\n.textinput { font-size: 9pt; font-family: verdana, helvetica, sans-serif; vertical-align: middle }\r\n.input { font-size: 9pt; font-family: verdana, helvetica, sans-serif; vertical-align: middle }\r\n', NULL);
-
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (1, ':mellow:', 'mellow.gif', 0);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (2, ':huh:', 'huh.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (3, '^_^', 'happy.gif', 0);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (4, ':o', 'ohmy.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (5, ';)', 'wink.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (6, ':P', 'tongue.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (7, ':D', 'biggrin.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (8, ':lol:', 'laugh.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (9, 'B)', 'cool.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (10, ':rolleyes:', 'rolleyes.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (11, '-_-', 'sleep.gif', 0);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (12, '&lt;_&lt;', 'dry.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (13, ':)', 'smile.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (14, ':wub:', 'wub.gif', 0);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (15, ':angry:', 'mad.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (16, ':(', 'sad.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (17, ':unsure:', 'unsure.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (18, ':wacko:', 'wacko.gif', 0);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (19, ':blink:', 'blink.gif', 1);
-INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (20, ':ph34r:', 'ph34r.gif', 1);
-
-INSERT INTO ibf_faq (id, title, text, description) VALUES (1, 'Registration benefits', 'To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br>\r<br>During registration, the adminstrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering.\r<br>In some cases, the administrator will need to approve your regsitration before you can use your member account fully. If this is the case you will be notified during registration.\r<br>\r<br>Once you have registered and logged in, you will have access to your private messenger and your control panel.\r<br>\r<br>For more information on these items, please see the relevant sections in this documentation.', 'How to register and the added benefits of being a registered member.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>This board will also allow you to remove the long session id\'s found in the URL\'s. You can do this by entering your control panel (click the link at the top of the board) and entering the \'Board Settings\' section. It is recommended that you enable this feature because you may experience problems if your internet connection shares a proxy and you share a link with another user. If in doubt, choose to hide the session id.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:&#92;Windows&#92;Cookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (3, 'Recovering lost or forgotten passwords', 'Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br>This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br>\r<br>To do this, click on the <a href=\'index.php?act=Reg&CODE=10\'>Lost Password link</a> found on the log in page.\r<br>\r<br>Further instruction is available from there.', 'How to reset your password if you\'ve forgotton it.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (4, 'Your Control Panel', 'Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br>\r<br><b>Edit Profile Info</b>\r<br>\r<br>This section allows you to add or edit your contact information and enter some personal information if you choose. All of this information is optional and can be omitted.\r<br>\r<br><b>Edit Signature</b>\r<br>\r<br>A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br>\r<br><b>Edit Avatar Settings</b>\r<br>\r<br>An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br>\r<br><b>Email Settings</b>\r<br>\r<br><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br>\r<br><b>Board Settings</b>\r<br>\r<br>From this section, you can set your timezone, choose to not see users signatures, avatars and posted images.\r<br>You can choose to get a pop up window informing you when you have a new message and hide the long session ID in links (see the \'Cookies\' help file for more infomation on this).\r<br>\r<br><b>Skins and Languages</b>\r<br>\r<br>If available, you can choose a skin style and language choice. This affects how the board is displayed so you may wish to preview the skin before submitting the form.\r<br>\r<br><b>Change Email Address</b>\r<br>\r<br>At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br>\r<br><b>Change Password</b>\r<br>\r<br>You may change your password from this section. Please note that you will need to know your current password before you can change your password.\r<br>\r<br><b>View Subsciptions</b>\r<br>\r<br>This is where you manage your topic subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.', 'Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (5, 'Email Notification of new messages', 'This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br>\r<br>To do this, simply click on the \'Track This Topic\' link found at the top and bottom of any topic. When you click this link, the topic will be added to your subscriptions that are managed from your control panel.\r<br>\r<br>Please note that to avoid multiple emails being sent to your email address, you will only get notified once per day of new replies.', 'How to get emailed when a new reply is added to a topic.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (6, 'Your Personal Messenger', 'Your personal messenger acts much like an email account in that you can send and receive messages and store messages in folders.\r<br>\r<br><b>Send a new PM</b>\r<br>\r<br>This will allow you to send a message to another member. If you have names in your contact list, you can choose a name from it - or you may choose to enter a name in the relevant form field. This will be automatically filled in if you clicked a \'PM\' button on the board (from the memberlist or a post).\r<br>If the administrator allows, you may use BB Code and HTML in your private message. If you choose to check the \'Add a copy of this message to you sent items folder\' box, a copy of the message will be saved for you for later reference. If you check the \'Get notified when this message is read\' box, you will receive a PM informing you when the message was read for your records.\r<br>\r<br><b>Contact List</b>\r<br>\r<br>You may add in users names in this section, or edit any saved entries. You can also use this as a ban list, denying the named member the ability to message you.\r<br>Names entered in this section will appear in the drop down list when sending a new PM, allowing you to quickly choose the members name when sending a message.\r<br>\r<br><b>Edit Folders</b>\r<br>\r<br>You may rename, add or remove folders to store messages is, allowing you to organise your messages to your preference. You cannot remove \'Sent Items\' or \'Inbox\'.\r<br>\r<br><b>Go to Inbox</b>\r<br>\r<br>Your inbox is where all new messages are sent to. Clicking on the message title will show you the message in a similar format to the board topic view. You can also delete or move messages from your inbox.\r<br>\r<br><b>Archive Messages</b>\r<br>\r<br>If your messenger folders are full and you are unable to receive new messages, you can archive them off. This compiles the messages into a single HTML page or Microsoft &copy; Excel Format. This page is then emailed to your registered email address for your convenience.\r<br>\r<br>', 'How to send personal messages, edit your messenger folders and archive stored messages.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (7, 'Contacting the moderating team', 'If you need to contact a moderator or simply wish to view the complete administration team, you can click the link \'The moderating team\' found at the top of the main board page (the first page you see when visiting the board).\r<br>\r<br>This list will show you administrators (those who have administration control panel access), global moderators (those who can moderate in all forums) and the moderators of the individual forums.\r<br>\r<br>If you wish to contact someone about your member account, then contact an administrator - if you wish to contact someone about a post or topic, contact either a global moderator or the forum moderator.', 'Where to find a list of the board moderators and administrators.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (8, 'Viewing members profile information', 'You can view a members profile at any time by clicking on their name when it is underlined (as a link) or by clicking on their name in a post within a topic.\r<br>\r<br>This will show you their profile page which contains their contact information (if they have entered some) and their \'active stats\'.', 'How to view members contact information.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (9, 'Viewing todays active topics', 'You can view which new topics have new replies today by clicking on the \'Todays Active Topics\' link found on the main board page (the first page you see when visiting the board).\r<br>\r<br>You can set your own date critera, choosing to view all topics  with new replies during several date choices.', 'How to view all the topics which have a new reply today');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (10, 'Searching Topics and Posts', 'The search feature is designed to allow you to quickly find topics and posts that contain the keywords you enter.\r<br>\r<br>The \'Simple Search\' option from the drop down box allows you to enter a single keyword or phrase to search by - the advanced option allows you to join keywords with \'AND\', \'OR\' to fine tune the search. Using this option will make the search slightly slower.\r<br>\r<br>The bottom section of the form allows you to further fine tune the search. You can choose a category to search in, or a forum - or choose all forums to search in.\r<br>\r<br>If you enter a name into the \'Search by member name\' section, all posts started or replied in by this member are returned.', 'How to use the search feature.');
-INSERT INTO ibf_faq (id, title, text, description) VALUES (11, 'Logging in and out', 'If you have chosen not to remember your log in details in cookies, or you are accessing the board on another computer, you will need to log into the board to access your member profile and post with your registered name.\r<br>\r<br>When you log in, you have the choice to save cookies that will log you in automatically when you return. Do not use this option on a shared computer for security.\r<br>\r<br>You can also choose to hide - this will keep your name from appearing in the active users list.\r<br>\r<br>Logging out is simply a matter of clicking on the \'Log Out\' link that is displayed when you are logged in. If you find that you are not logged out, you may need to manually remove your cookies. See the \'Cookies\' help file for more information.', 'How to log in and out from the board and how to remain anonymous and not be shown on the active users list.');
-
-INSERT INTO ibf_forums (id, topics, posts, last_post, last_poster_id, last_poster_name, name, description, position, use_ibc, use_html, status, start_perms, reply_perms, read_perms, password, category, last_title, last_id, sort_key, sort_order, prune, show_rules, upload_perms, preview_posts, allow_poll, allow_pollbump, inc_postcount, skin_id, parent_id, subwrap, sub_can_post) VALUES (1, 1, 1, 0, 1, 'Invision Board Team', 'A Test Forum', 'A test forum that may be removed at any time', 1, 1, 0, '1', '*', '*', '*', '', 1, 'Welcome', 1, 'last_post', 'Z-A', 30, 0, '', 0, 0, 0, 1, NULL, -1, 0, 1);
-
-INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list) VALUES (4, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 'Admin', 0, 1, 1, 1, 1, '', 50000, 1, 1, '', '', 50, 6, 0, 5, '-1&-1', 0);
-INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list) VALUES (2, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 'Guests', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 0);
-INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list) VALUES (3, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 'Members', 0, 1, 0, 0, 0, '', 0, 1, 0, '', '', 50, 0, 20, 0, '-1&-1', 0);
-INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Validating', 0, 1, 0, 0, 0, NULL, 0, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 0);
-INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list) VALUES (5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Banned', 0, 0, 0, 0, 0, NULL, NULL, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 1);
-
-INSERT INTO ibf_languages (lid, ldir, lname, lauthor, lemail) VALUES (1, 'en', 'English', 'Invision Board', 'languages@invisionboard.com');
-
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (1, 'A_LOCKED_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (2, 'A_MOVED_B', '<img src=\'style_images/<#IMG_DIR#>/t_moved.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (4, 'A_POLLONLY_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (5, 'A_POST', '<img src=\'style_images/<#IMG_DIR#>/t_new.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (6, 'A_REPLY', '<img src=\'style_images/<#IMG_DIR#>/t_reply.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (7, 'A_STAR', '<img src=\'style_images/<#IMG_DIR#>/pip.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (8, 'B_HOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (9, 'B_HOT_NN', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (10, 'B_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/f_closed.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (11, 'B_MOVED', '<img src=\'style_images/<#IMG_DIR#>/f_moved.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (12, 'B_NEW', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (13, 'B_NORM', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (14, 'B_PIN', '<img src=\'style_images/<#IMG_DIR#>/f_pinned.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (15, 'B_POLL', '<img src=\'style_images/<#IMG_DIR#>/f_poll.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (16, 'B_POLL_NN', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (17, 'C_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/bf_readonly.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (18, 'C_OFF', '<img src=\'style_images/<#IMG_DIR#>/bf_nonew.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (19, 'C_OFF_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_nonew.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (20, 'C_OFF_RES', '<img src=\'style_images/<#IMG_DIR#>/br_nonew.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (21, 'C_ON', '<img src=\'style_images/<#IMG_DIR#>/bf_new.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (22, 'C_ON_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_new.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (23, 'C_ON_RES', '<img src=\'style_images/<#IMG_DIR#>/br_new.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (24, 'F_ACTIVE', '<img src=\'style_images/<#IMG_DIR#>/user.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (25, 'F_NAV_SEP', ' ->', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (26, 'F_NAV', '<img src=\'style_images/<#IMG_DIR#>/nav.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (27, 'F_STATS', '<img src=\'style_images/<#IMG_DIR#>/stats.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (28, 'GO_LAST_ON', '', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (29, 'GO_LAST_OFF', '', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (30, 'M_ADDMEM', '<img src=\'style_images/<#IMG_DIR#>/msg_l_addmem.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (31, 'M_DELETE', '<img src=\'style_images/<#IMG_DIR#>/msg_l_delete.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (32, 'M_READ', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (33, 'M_REPLY', '<img src=\'style_images/<#IMG_DIR#>/msg_l_reply.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (34, 'M_UNREAD', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (35, 'P_AOL', '<img src=\'style_images/<#IMG_DIR#>/p_aim.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (36, 'P_DELETE', '<img src=\'style_images/<#IMG_DIR#>/p_delete.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (37, 'P_EDIT', '<img src=\'style_images/<#IMG_DIR#>/p_edit.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (38, 'P_EMAIL', '<img src=\'style_images/<#IMG_DIR#>/p_email.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (39, 'P_ICQ', '<img src=\'style_images/<#IMG_DIR#>/p_icq.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (40, 'P_MSG', '<img src=\'style_images/<#IMG_DIR#>/p_pm.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (41, 'P_PROFILE', '[ Profile ]', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (42, 'P_QUOTE', '<img src=\'style_images/<#IMG_DIR#>/p_quote.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (43, 'P_WEBSITE', '<img src=\'style_images/<#IMG_DIR#>/p_www.gif\' border=\'0\'  alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (44, 'CAT_IMG', '<img src=\'style_images/<#IMG_DIR#>/nav_m.gif\' border=\'0\'  alt=\'\' width=\'8\' height=\'8\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (45, 'B_HOT_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_dot.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (46, 'B_NEW_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_dot.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (47, 'B_HOT_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no_dot.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (48, 'B_NORM_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no_dot.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (49, 'B_POLL_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_dot.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (50, 'B_POLL_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no_dot.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (51, 'NEW_POST', '<img src=\'style_images/<#IMG_DIR#>/newpost.gif\' border=\'0\'  alt=\'Goto last unread\' title=\'Goto last unread\' hspace=2>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (52, 'tbl_width', '95%', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (53, 'tbl_border', '#345487', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (55, 'P_YIM', '<img src=\'style_images/<#IMG_DIR#>/p_yim.gif\' border=\'0\' alt=\'\'>', 0, 1);
-INSERT INTO ibf_macro (macro_id, macro_value, macro_replace, can_remove, macro_set) VALUES (56, 'P_MSN', '<img src=\'style_images/<#IMG_DIR#>/p_msn.gif\' border=\'0\' alt=\'\'>', 0, 1);
-
-INSERT INTO ibf_macro_name (set_id, set_name) VALUES (1, 'IBF Default Macro Set');
-
-INSERT INTO ibf_members (id, name, mgroup, password, email, joined, ip_address, avatar, avatar_size, posts, aim_name, icq_number, location, signature, website, yahoo, title, allow_admin_mails, time_offset, interests, hide_email, email_pm, email_full, skin, warn_level, language, msnname, last_post, allow_post, view_sigs, view_img, view_avs, view_pop, bday_day, bday_month, bday_year, new_msg, msg_from_id, msg_msg_id, msg_total, vdirs, show_popup, validate_key, prev_group, new_pass, misc, last_visit, last_activity, dst_in_use, view_prefs, coppa_user, mod_posts, auto_track) VALUES (0, 'Guest', 2, '', 'guest@ibforums.com', 0, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, '0', 0, 0, 0, '-1&-1', 0, 0, 0);
-
-INSERT INTO ibf_posts (append_edit, edit_time, pid, author_id, author_name, use_sig, use_emo, ip_address, post_date, icon_id, post, queued, topic_id, forum_id, attach_id, attach_hits, attach_type, attach_file, post_title, new_topic, edit_name) VALUES (0, NULL, 1, 1, 'Invision Board Team', '1', '1', '127.0.0.1', 0, 0, 'Welcome to your new Invision Board!<br>This is simply a test message confirming that the installation was successful.<br>You can remove this message, topic, forum or even category at any time.', 0, 1, 1, '', 0, '', '', NULL, 1, NULL);
-
-
-INSERT INTO ibf_skins (uid, sname, sid, set_id, tmpl_id, macro_id, css_id, img_dir, tbl_width, tbl_border, hidden, default_set) VALUES (1, 'Invision Board', 0, 1, 1, 1, 1, '1', '95%', '#999999', 0, 1);
-
-INSERT INTO ibf_stats (TOTAL_REPLIES, TOTAL_TOPICS, LAST_MEM_NAME, LAST_MEM_ID, MOST_DATE, MOST_COUNT, MEM_COUNT) VALUES (0, 1, '', '1', 0, 1, 1);
-
-INSERT INTO ibf_templates (tmid, template, name) VALUES (1, '<html>    <head>      <title>                <% TITLE %>      </title>      <% GENERATOR %>      <% CSS %>      <% JAVASCRIPT %>          </head><body bgcolor=\'#FFFFFF\' leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" alink=\'#000000\' vlink=\'#000000\'><% BOARD HEADER %><% NAVIGATION %><% BOARD %><% STATS %><% COPYRIGHT %></body></html>', 'Invision Board Standard');
-
-INSERT INTO ibf_titles (id, posts, title, pips) VALUES (1, 0, 'Newbie', '1');
-INSERT INTO ibf_titles (id, posts, title, pips) VALUES (2, 10, 'Member', '2');
-INSERT INTO ibf_titles (id, posts, title, pips) VALUES (4, 30, 'Advanced Member', '3');
-
-INSERT INTO ibf_tmpl_names (skid, skname, author, email, url) VALUES (1, 'Invision Board Template Set', 'Invision Board', 'skins@invisionboard.com', 'http://www.invisionboard.com');
-
-INSERT INTO ibf_topics (tid, title, description, state, posts, starter_id, start_date, last_poster_id, last_post, icon_id, starter_name, last_poster_name, poll_state, last_vote, views, forum_id, approved, author_mode, pinned, moved_to, rating, total_votes) VALUES (1, 'Welcome', '', 'open', 0, '0', 0, '0', 0, 0, 'Invision Board Team', 'Invision Board Team', '0', 0, 0, 1, 1, 0, 0, NULL, NULL, 0);
diff --git a/Tools_and_Scripts/SQL Schematic/tables.sql b/Tools_and_Scripts/SQL Schematic/tables.sql
deleted file mode 100644
index 7143de4e..00000000
--- a/Tools_and_Scripts/SQL Schematic/tables.sql	
+++ /dev/null
@@ -1,760 +0,0 @@
-CREATE TABLE ibf_admin_logs (
-  id bigint(20) NOT NULL auto_increment,
-  act varchar(255) default NULL,
-  code varchar(255) default NULL,
-  member_id int(10) default NULL,
-  ctime int(10) default NULL,
-  note text,
-  ip_address varchar(255) default NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_admin_sessions (
-  ID varchar(32) NOT NULL default '',
-  IP_ADDRESS varchar(32) NOT NULL default '',
-  MEMBER_NAME varchar(32) NOT NULL default '',
-  MEMBER_ID varchar(32) NOT NULL default '',
-  SESSION_KEY varchar(32) NOT NULL default '',
-  LOCATION varchar(64) default 'index',
-  LOG_IN_TIME int(10) NOT NULL default '0',
-  RUNNING_TIME int(10) NOT NULL default '0',
-  PRIMARY KEY  (ID)
-);
-
-CREATE TABLE ibf_badwords (
-  wid int(3) NOT NULL auto_increment,
-  type varchar(250) NOT NULL default '',
-  swop varchar(250) default NULL,
-  m_exact tinyint(1) default '0',
-  PRIMARY KEY  (wid)
-);
-
-CREATE TABLE ibf_cache_store (
-  cs_key varchar(255) NOT NULL default '',
-  cs_value text NOT NULL,
-  cs_extra varchar(255) NOT NULL default '',
-  PRIMARY KEY  (cs_key)
-);
-
-CREATE TABLE ibf_calendar_events (
-  eventid mediumint(8) NOT NULL auto_increment,
-  userid mediumint(8) NOT NULL default '0',
-  year int(4) NOT NULL default '2002',
-  month int(2) NOT NULL default '1',
-  mday int(2) NOT NULL default '1',
-  title varchar(254) NOT NULL default 'no title',
-  event_text text NOT NULL,
-  read_perms varchar(254) NOT NULL default '*',
-  unix_stamp int(10) NOT NULL default '0',
-  priv_event tinyint(1) NOT NULL default '0',
-  show_emoticons tinyint(1) NOT NULL default '1',
-  rating smallint(2) NOT NULL default '1',
-  event_ranged tinyint(1) NOT NULL default '0',
-  event_repeat tinyint(1) NOT NULL default '0',
-  repeat_unit char(2) NOT NULL default '',
-  end_day int(2) default NULL,
-  end_month int(2) default NULL,
-  end_year int(4) default NULL,
-  end_unix_stamp int(10) default NULL,
-  event_bgcolor varchar(32) NOT NULL default '',
-  event_color varchar(32) NOT NULL default '',
-  PRIMARY KEY  (eventid),
-  KEY unix_stamp (unix_stamp)
-);
-
-CREATE TABLE ibf_categories (
-  id smallint(5) NOT NULL default '0',
-  position tinyint(3) default NULL,
-  state varchar(10) default NULL,
-  name varchar(128) NOT NULL default '',
-  description text,
-  image varchar(128) default NULL,
-  url varchar(128) default NULL,
-  PRIMARY KEY  (id),
-  KEY id (id)
-);
-
-CREATE TABLE ibf_contacts (
-  id mediumint(8) NOT NULL auto_increment,
-  contact_id mediumint(8) NOT NULL default '0',
-  member_id mediumint(8) NOT NULL default '0',
-  contact_name varchar(32) NOT NULL default '',
-  allow_msg tinyint(1) default NULL,
-  contact_desc varchar(50) default NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_css (
-  cssid int(10) NOT NULL auto_increment,
-  css_name varchar(128) NOT NULL default '',
-  css_text text,
-  css_comments text,
-  updated int(10) default '0',
-  PRIMARY KEY  (cssid)
-);
-
-CREATE TABLE ibf_email_logs (
-  email_id int(10) NOT NULL auto_increment,
-  email_subject varchar(255) NOT NULL default '',
-  email_content text NOT NULL,
-  email_date int(10) NOT NULL default '0',
-  from_member_id mediumint(8) NOT NULL default '0',
-  from_email_address varchar(250) NOT NULL default '',
-  from_ip_address varchar(16) NOT NULL default '127.0.0.1',
-  to_member_id mediumint(8) NOT NULL default '0',
-  to_email_address varchar(250) NOT NULL default '',
-  topic_id int(10) NOT NULL default '0',
-  PRIMARY KEY  (email_id),
-  KEY from_member_id (from_member_id),
-  KEY email_date (email_date)
-);
-
-CREATE TABLE ibf_emoticons (
-  id smallint(3) NOT NULL auto_increment,
-  typed varchar(32) NOT NULL default '',
-  image varchar(128) NOT NULL default '',
-  clickable smallint(2) NOT NULL default '1',
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_faq (
-  id mediumint(8) NOT NULL auto_increment,
-  title varchar(128) NOT NULL default '',
-  text text,
-  description text NOT NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_forum_perms (
-  perm_id int(10) NOT NULL auto_increment,
-  perm_name varchar(250) NOT NULL default '',
-  PRIMARY KEY  (perm_id)
-);
-
-CREATE TABLE ibf_forum_tracker (
-  frid mediumint(8) NOT NULL auto_increment,
-  member_id varchar(32) NOT NULL default '',
-  forum_id smallint(5) NOT NULL default '0',
-  start_date int(10) default NULL,
-  last_sent int(10) NOT NULL default '0',
-  PRIMARY KEY  (frid)
-);
-
-CREATE TABLE ibf_forums (
-  id smallint(5) NOT NULL default '0',
-  topics mediumint(6) default NULL,
-  posts mediumint(6) default NULL,
-  last_post int(10) default NULL,
-  last_poster_id mediumint(8) NOT NULL default '0',
-  last_poster_name varchar(32) default NULL,
-  name varchar(128) NOT NULL default '',
-  description text,
-  position tinyint(2) default NULL,
-  use_ibc tinyint(1) default NULL,
-  use_html tinyint(1) default NULL,
-  status varchar(10) default NULL,
-  start_perms varchar(255) NOT NULL default '',
-  reply_perms varchar(255) NOT NULL default '',
-  read_perms varchar(255) NOT NULL default '',
-  password varchar(32) default NULL,
-  category tinyint(2) NOT NULL default '0',
-  last_title varchar(128) default NULL,
-  last_id int(10) default NULL,
-  sort_key varchar(32) default NULL,
-  sort_order varchar(32) default NULL,
-  prune tinyint(3) default NULL,
-  show_rules tinyint(1) default NULL,
-  upload_perms varchar(255) default NULL,
-  preview_posts tinyint(1) default NULL,
-  allow_poll tinyint(1) NOT NULL default '1',
-  allow_pollbump tinyint(1) NOT NULL default '0',
-  inc_postcount tinyint(1) NOT NULL default '1',
-  skin_id int(10) default NULL,
-  parent_id mediumint(5) default '-1',
-  subwrap tinyint(1) default '0',
-  sub_can_post tinyint(1) default '1',
-  quick_reply tinyint(1) default '0',
-  redirect_url varchar(250) default '',
-  redirect_on tinyint(1) NOT NULL default '0',
-  redirect_hits int(10) NOT NULL default '0',
-  redirect_loc varchar(250) default '',
-  rules_title varchar(255) NOT NULL default '',
-  rules_text text NOT NULL,
-  has_mod_posts tinyint(1) NOT NULL default '0',
-  topic_mm_id varchar(250) NOT NULL default '',
-  notify_modq_emails text default '',
-  PRIMARY KEY  (id),
-  KEY category (category),
-  KEY id (id)
-);
-
-CREATE TABLE ibf_groups (
-  g_id int(3) unsigned NOT NULL auto_increment,
-  g_view_board tinyint(1) default NULL,
-  g_mem_info tinyint(1) default NULL,
-  g_other_topics tinyint(1) default NULL,
-  g_use_search tinyint(1) default NULL,
-  g_email_friend tinyint(1) default NULL,
-  g_invite_friend tinyint(1) default NULL,
-  g_edit_profile tinyint(1) default NULL,
-  g_post_new_topics tinyint(1) default NULL,
-  g_reply_own_topics tinyint(1) default NULL,
-  g_reply_other_topics tinyint(1) default NULL,
-  g_edit_posts tinyint(1) default NULL,
-  g_delete_own_posts tinyint(1) default NULL,
-  g_open_close_posts tinyint(1) default NULL,
-  g_delete_own_topics tinyint(1) default NULL,
-  g_post_polls tinyint(1) default NULL,
-  g_vote_polls tinyint(1) default NULL,
-  g_use_pm tinyint(1) default NULL,
-  g_is_supmod tinyint(1) default NULL,
-  g_access_cp tinyint(1) default NULL,
-  g_title varchar(32) NOT NULL default '',
-  g_can_remove tinyint(1) default NULL,
-  g_append_edit tinyint(1) default NULL,
-  g_access_offline tinyint(1) default NULL,
-  g_avoid_q tinyint(1) default NULL,
-  g_avoid_flood tinyint(1) default NULL,
-  g_icon varchar(64) default NULL,
-  g_attach_max bigint(20) default NULL,
-  g_avatar_upload tinyint(1) default '0',
-  g_calendar_post tinyint(1) default '0',
-  prefix varchar(250) default NULL,
-  suffix varchar(250) default NULL,
-  g_max_messages int(5) default '50',
-  g_max_mass_pm int(5) default '0',
-  g_search_flood mediumint(6) default '20',
-  g_edit_cutoff int(10) default '0',
-  g_promotion varchar(10) default '-1&-1',
-  g_hide_from_list tinyint(1) default '0',
-  g_post_closed tinyint(1) default '0',
-  g_perm_id varchar(255) NOT NULL default '',
-  g_photo_max_vars varchar(200) default '',
-  g_dohtml tinyint(1) NOT NULL default '0',
-  g_edit_topic tinyint(1) NOT NULL default '0',
-  g_email_limit varchar(15) NOT NULL default '10:15',
-  PRIMARY KEY  (g_id)
-);
-
-CREATE TABLE ibf_languages (
-  lid mediumint(8) NOT NULL auto_increment,
-  ldir varchar(64) NOT NULL default '',
-  lname varchar(250) NOT NULL default '',
-  lauthor varchar(250) default NULL,
-  lemail varchar(250) default NULL,
-  PRIMARY KEY  (lid)
-);
-
-CREATE TABLE ibf_macro (
-  macro_id smallint(3) NOT NULL auto_increment,
-  macro_value varchar(200) default NULL,
-  macro_replace text,
-  can_remove tinyint(1) default '0',
-  macro_set smallint(3) default NULL,
-  PRIMARY KEY  (macro_id),
-  KEY macro_set (macro_set)
-);
-
-CREATE TABLE ibf_macro_name (
-  set_id smallint(3) NOT NULL default '0',
-  set_name varchar(200) default NULL,
-  PRIMARY KEY  (set_id)
-);
-
-CREATE TABLE ibf_member_extra (
-  id mediumint(8) NOT NULL default '0',
-  notes text,
-  links text,
-  bio text,
-  ta_size char(3) default NULL,
-  photo_type varchar(10) default '',
-  photo_location varchar(255) default '',
-  photo_dimensions varchar(200) default '',
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_members (
-  id mediumint(8) NOT NULL default '0',
-  name varchar(255) NOT NULL default '',
-  mgroup smallint(3) NOT NULL default '0',
-  password varchar(32) NOT NULL default '',
-  email varchar(60) NOT NULL default '',
-  joined int(10) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '',
-  avatar varchar(128) default NULL,
-  avatar_size varchar(9) default NULL,
-  posts mediumint(7) default '0',
-  aim_name varchar(40) default NULL,
-  icq_number varchar(40) default NULL,
-  location varchar(128) default NULL,
-  signature text,
-  website varchar(70) default NULL,
-  yahoo varchar(32) default NULL,
-  title varchar(64) default NULL,
-  allow_admin_mails tinyint(1) default NULL,
-  time_offset varchar(10) default NULL,
-  interests text,
-  hide_email varchar(8) default NULL,
-  email_pm tinyint(1) default NULL,
-  email_full tinyint(1) default NULL,
-  skin smallint(5) default NULL,
-  warn_level int(10) default NULL,
-  warn_lastwarn int(10) NOT NULL default '0',
-  language varchar(32) default NULL,
-  msnname varchar(64) default NULL,
-  last_post int(10) default NULL,
-  restrict_post varchar(100) NOT NULL default '0',
-  view_sigs tinyint(1) default '1',
-  view_img tinyint(1) default '1',
-  view_avs tinyint(1) default '1',
-  view_pop tinyint(1) default '1',
-  bday_day int(2) default NULL,
-  bday_month int(2) default NULL,
-  bday_year int(4) default NULL,
-  new_msg tinyint(2) default NULL,
-  msg_from_id mediumint(8) default NULL,
-  msg_msg_id int(10) default NULL,
-  msg_total smallint(5) default NULL,
-  vdirs text,
-  show_popup tinyint(1) default NULL,
-  misc varchar(128) default NULL,
-  last_visit int(10) default '0',
-  last_activity int(10) default '0',
-  dst_in_use tinyint(1) default '0',
-  view_prefs varchar(64) default '-1&-1',
-  coppa_user tinyint(1) default '0',
-  mod_posts varchar(100) NOT NULL default '0',
-  auto_track tinyint(1) default '0',
-  org_perm_id varchar(255) default '',
-  org_supmod tinyint(1) default '0',
-  integ_msg varchar(250) default '',
-  temp_ban varchar(100) default NULL,
-  sub_end int(10) NOT NULL default '0',
-  PRIMARY KEY  (id),
-  KEY name (name),
-  KEY mgroup (mgroup),
-  KEY bday_day (bday_day),
-  KEY bday_month (bday_month)
-);
-
-CREATE TABLE ibf_messages (
-  msg_id int(10) NOT NULL auto_increment,
-  msg_date int(10) default NULL,
-  read_state tinyint(1) default NULL,
-  title varchar(128) default NULL,
-  message text,
-  from_id mediumint(8) NOT NULL default '0',
-  vid varchar(32) default NULL,
-  member_id mediumint(8) NOT NULL default '0',
-  recipient_id mediumint(8) NOT NULL default '0',
-  attach_type tinyint(128) default NULL,
-  attach_file tinyint(128) default NULL,
-  cc_users text,
-  tracking tinyint(1) default '0',
-  read_date int(10) default NULL,
-  PRIMARY KEY  (msg_id),
-  KEY member_id (member_id),
-  KEY vid (vid)
-);
-
-CREATE TABLE ibf_moderator_logs (
-  id int(10) NOT NULL auto_increment,
-  forum_id int(5) default '0',
-  topic_id int(10) NOT NULL default '0',
-  post_id int(10) default NULL,
-  member_id mediumint(8) NOT NULL default '0',
-  member_name varchar(32) NOT NULL default '',
-  ip_address varchar(16) NOT NULL default '0',
-  http_referer varchar(255) default NULL,
-  ctime int(10) default NULL,
-  topic_title varchar(128) default NULL,
-  action varchar(128) default NULL,
-  query_string varchar(128) default NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_moderators (
-  mid mediumint(8) NOT NULL auto_increment,
-  forum_id int(5) NOT NULL default '0',
-  member_name varchar(32) NOT NULL default '',
-  member_id mediumint(8) NOT NULL default '0',
-  edit_post tinyint(1) default NULL,
-  edit_topic tinyint(1) default NULL,
-  delete_post tinyint(1) default NULL,
-  delete_topic tinyint(1) default NULL,
-  view_ip tinyint(1) default NULL,
-  open_topic tinyint(1) default NULL,
-  close_topic tinyint(1) default NULL,
-  mass_move tinyint(1) default NULL,
-  mass_prune tinyint(1) default NULL,
-  move_topic tinyint(1) default NULL,
-  pin_topic tinyint(1) default NULL,
-  unpin_topic tinyint(1) default NULL,
-  post_q tinyint(1) default NULL,
-  topic_q tinyint(1) default NULL,
-  allow_warn tinyint(1) default NULL,
-  edit_user tinyint(1) NOT NULL default '0',
-  is_group tinyint(1) default '0',
-  group_id smallint(3) default NULL,
-  group_name varchar(200) default NULL,
-  split_merge tinyint(1) default '0',
-  can_mm tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (mid),
-  KEY forum_id (forum_id),
-  KEY group_id (group_id),
-  KEY member_id (member_id)
-);
-
-CREATE TABLE ibf_pfields_content (
-  member_id mediumint(8) NOT NULL default '0',
-  updated int(10) default '0',
-  PRIMARY KEY  (member_id)
-);
-
-CREATE TABLE ibf_pfields_data (
-  fid smallint(5) NOT NULL auto_increment,
-  ftitle varchar(200) NOT NULL default '',
-  fdesc varchar(250) default '',
-  fcontent text,
-  ftype varchar(250) default 'text',
-  freq tinyint(1) default '0',
-  fhide tinyint(1) default '0',
-  fmaxinput smallint(6) default '250',
-  fedit tinyint(1) default '1',
-  forder smallint(6) default '1',
-  fshowreg tinyint(1) default '0',
-  PRIMARY KEY  (fid)
-);
-
-CREATE TABLE ibf_polls (
-  pid mediumint(8) NOT NULL auto_increment,
-  tid int(10) NOT NULL default '0',
-  start_date int(10) default NULL,
-  choices text,
-  starter_id mediumint(8) NOT NULL default '0',
-  votes smallint(5) NOT NULL default '0',
-  forum_id smallint(5) NOT NULL default '0',
-  poll_question varchar(255) default NULL,
-  PRIMARY KEY  (pid)
-);
-
-
-CREATE TABLE ibf_posts (
-  pid int(10) NOT NULL auto_increment,
-  append_edit tinyint(1) default '0',
-  edit_time int(10) default NULL,
-  author_id mediumint(8) NOT NULL default '0',
-  author_name varchar(32) default NULL,
-  use_sig tinyint(1) NOT NULL default '0',
-  use_emo tinyint(1) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '',
-  post_date int(10) default NULL,
-  icon_id smallint(3) default NULL,
-  post text,
-  queued tinyint(1) default NULL,
-  topic_id int(10) NOT NULL default '0',
-  forum_id smallint(5) NOT NULL default '0',
-  attach_id varchar(64) default NULL,
-  attach_hits int(10) default NULL,
-  attach_type varchar(128) default NULL,
-  attach_file varchar(255) default NULL,
-  post_title varchar(255) default NULL,
-  new_topic tinyint(1) default '0',
-  edit_name varchar(255) default NULL,
-  PRIMARY KEY  (pid),
-  KEY topic_id (topic_id,author_id),
-  KEY author_id (author_id),
-  KEY forum_id (forum_id,post_date),
-  FULLTEXT KEY post (post)
-);
-
-
-CREATE TABLE ibf_reg_antispam (
-  regid varchar(32) NOT NULL default '',
-  regcode varchar(8) NOT NULL default '',
-  ip_address varchar(32) default NULL,
-  ctime int(10) default NULL,
-  PRIMARY KEY  (regid)
-);
-
-CREATE TABLE ibf_search_results (
-  id varchar(32) NOT NULL default '',
-  topic_id text NOT NULL,
-  search_date int(12) NOT NULL default '0',
-  topic_max int(3) NOT NULL default '0',
-  sort_key varchar(32) NOT NULL default 'last_post',
-  sort_order varchar(4) NOT NULL default 'desc',
-  member_id mediumint(10) default '0',
-  ip_address varchar(64) default NULL,
-  post_id text,
-  post_max int(10) NOT NULL default '0',
-  query_cache text
-);
-
-CREATE TABLE ibf_sessions (
-  id varchar(32) NOT NULL default '0',
-  member_name varchar(64) default NULL,
-  member_id mediumint(8) NOT NULL default '0',
-  ip_address varchar(16) default NULL,
-  browser varchar(64) default NULL,
-  running_time int(10) default NULL,
-  login_type tinyint(1) default NULL,
-  location varchar(40) default NULL,
-  member_group smallint(3) default NULL,
-  in_forum smallint(5) NOT NULL default '0',
-  in_topic int(10) default NULL,
-  PRIMARY KEY  (id),
-  KEY in_topic (in_topic),
-  KEY in_forum (in_forum)
-);
-
-CREATE TABLE ibf_skin_templates (
-  suid int(10) NOT NULL auto_increment,
-  set_id int(10) NOT NULL default '0',
-  group_name varchar(255) NOT NULL default '',
-  section_content mediumtext,
-  func_name varchar(255) default NULL,
-  func_data text,
-  updated int(10) default NULL,
-  can_remove tinyint(4) default '0',
-  PRIMARY KEY  (suid)
-);
-
-CREATE TABLE ibf_skins (
-  uid int(10) NOT NULL auto_increment,
-  sname varchar(100) NOT NULL default '',
-  sid int(10) NOT NULL default '0',
-  set_id int(5) NOT NULL default '0',
-  tmpl_id int(10) NOT NULL default '0',
-  macro_id int(10) NOT NULL default '1',
-  css_id int(10) NOT NULL default '1',
-  img_dir varchar(200) default '1',
-  tbl_width varchar(250) default NULL,
-  tbl_border varchar(250) default NULL,
-  hidden tinyint(1) NOT NULL default '0',
-  default_set tinyint(1) NOT NULL default '0',
-  css_method varchar(100) default 'inline',
-  PRIMARY KEY  (uid),
-  KEY tmpl_id (tmpl_id),
-  KEY css_id (css_id)
-);
-
-CREATE TABLE ibf_spider_logs (
-  sid int(10) NOT NULL auto_increment,
-  bot varchar(255) NOT NULL default '',
-  query_string text NOT NULL,
-  entry_date int(10) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '',
-  PRIMARY KEY  (sid)
-);
-
-CREATE TABLE ibf_stats (
-  TOTAL_REPLIES int(10) NOT NULL default '0',
-  TOTAL_TOPICS int(10) NOT NULL default '0',
-  LAST_MEM_NAME varchar(32) default NULL,
-  LAST_MEM_ID mediumint(8) NOT NULL default '0',
-  MOST_DATE int(10) default NULL,
-  MOST_COUNT int(10) default '0',
-  MEM_COUNT mediumint(8) NOT NULL default '0'
-);
-
-CREATE TABLE ibf_subscriptions (
- sub_id smallint(5) NOT NULL auto_increment,
- sub_title varchar(250) NOT NULL default '',
- sub_desc text,
- sub_new_group mediumint(8) NOT NULL default 0,
- sub_length smallint(5) NOT NULL default '1',
- sub_unit varchar(2) NOT NULL default 'm',
- sub_cost decimal(10,2) NOT NULL default '0.00',
- sub_run_module varchar(250) NOT NULL default '',
- PRIMARY KEY (sub_id)
-) TYPE=MyISAM;
-
-CREATE TABLE ibf_subscription_extra (
- subextra_id smallint(5) NOT NULL auto_increment,
- subextra_sub_id smallint(5) NOT NULL default '0',
- subextra_method_id smallint(5) NOT NULL default '0',
- subextra_product_id varchar(250) NOT NULL default '0',
- subextra_can_upgrade tinyint(1) NOT NULL default '0',
- subextra_recurring tinyint(1) NOT NULL default '0',
- subextra_custom_1 text,
- subextra_custom_2 text,
- subextra_custom_3 text,
- subextra_custom_4 text,
- subextra_custom_5 text,
- PRIMARY KEY(subextra_id)
-) TYPE=MyISAM;
-
-
-CREATE TABLE ibf_subscription_trans (
- subtrans_id int(10) NOT NULL auto_increment,
- subtrans_sub_id smallint(5) NOT NULL default '0',
- subtrans_member_id mediumint(8) NOT NULL default '0',
- subtrans_old_group smallint(5) NOT NULL default '0',
- subtrans_paid decimal(10,2) NOT NULL default '0.00',
- subtrans_cumulative decimal(10,2) NOT NULL default '0.00',
- subtrans_method varchar(20) NOT NULL default '',
- subtrans_start_date int(11) NOT NULL default '0',
- subtrans_end_date int(11) NOT NULL default '0',
- subtrans_state varchar(200) NOT NULL default '',
- subtrans_trxid varchar(200) NOT NULL default '',
- subtrans_subscrid varchar(200) NOT NULL default '',
- subtrans_currency varchar(10) NOT NULL default 'USD',
- PRIMARY KEY (subtrans_id)
-) TYPE=MyISAM;
-
-CREATE TABLE ibf_subscription_logs (
- sublog_id int(10) NOT NULL auto_increment,
- sublog_date int(10) NOT NULL default '',
- sublog_member_id mediumint(8) NOT NULL default '0',
- sublog_transid int(10) NOT NULL default '',
- sublog_ipaddress varchar(16) NOT NULL default '',
- sublog_data text,
- sublog_postdata text,
- PRIMARY KEY (sublog_id)
-) TYPE=MyISAM;
-
-CREATE TABLE ibf_subscription_methods (
- submethod_id smallint(5) NOT NULL auto_increment,
- submethod_title varchar(250) NOT NULL default '',
- submethod_name varchar(20) NOT NULL default '',
- submethod_email varchar(250) NOT NULL default '',
- submethod_sid text,
- submethod_custom_1 text,
- submethod_custom_2 text,
- submethod_custom_3 text,
- subemthod_custom_4 text,
- submethod_custom_5 text,
- submethod_is_cc tinyint(1) NOT NULL default '0',
- submethod_is_auto tinyint(1) NOT NULL default '0',
- submethod_desc text,
- submethod_logo text,
- submethod_active tinyint(1) NOT NULL default '',
- submethod_use_currency varchar(10) NOT NULL default 'USD',
- PRIMARY KEY (submethod_id)
-) TYPE=MyISAM;
-
-CREATE TABLE ibf_subscription_currency (
- subcurrency_code varchar(10) NOT NULL,
- subcurrency_desc varchar(250) NOT NULL default '',
- subcurrency_exchange decimal(10, 8) NOT NULL,
- subcurrency_default tinyint(1) NOT NULL default '0',
- PRIMARY KEY(subcurrency_code)
-) TYPE=MyISAM;
-	
-	
-	
-CREATE TABLE ibf_templates (
-  tmid int(10) NOT NULL auto_increment,
-  template mediumtext,
-  name varchar(128) default NULL,
-  PRIMARY KEY  (tmid)
-);
-
-CREATE TABLE ibf_titles (
-  id smallint(5) NOT NULL auto_increment,
-  posts int(10) default NULL,
-  title varchar(128) default NULL,
-  pips varchar(128) default NULL,
-  PRIMARY KEY  (id)
-);
-
-CREATE TABLE ibf_tmpl_names (
-  skid int(10) NOT NULL auto_increment,
-  skname varchar(60) NOT NULL default 'Invision Board',
-  author varchar(250) default '',
-  email varchar(250) default '',
-  url varchar(250) default '',
-  PRIMARY KEY  (skid)
-);
-
-CREATE TABLE ibf_topic_mmod (
-  mm_id smallint(5) NOT NULL auto_increment,
-  mm_title varchar(250) NOT NULL default '',
-  mm_enabled tinyint(1) NOT NULL default '0',
-  topic_state varchar(10) NOT NULL default 'leave',
-  topic_pin varchar(10) NOT NULL default 'leave',
-  topic_move smallint(5) NOT NULL default '0',
-  topic_move_link tinyint(1) NOT NULL default '0',
-  topic_title_st varchar(250) NOT NULL default '',
-  topic_title_end varchar(250) NOT NULL default '',
-  topic_reply tinyint(1) NOT NULL default '0',
-  topic_reply_content text NOT NULL,
-  topic_reply_postcount tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (mm_id)
-);
-
-CREATE TABLE ibf_topics (
-  tid int(10) NOT NULL auto_increment,
-  title varchar(250) NOT NULL default '',
-  description varchar(70) default NULL,
-  state varchar(8) default NULL,
-  posts int(10) default NULL,
-  starter_id mediumint(8) NOT NULL default '0',
-  start_date int(10) default NULL,
-  last_poster_id mediumint(8) NOT NULL default '0',
-  last_post int(10) default NULL,
-  icon_id tinyint(2) default NULL,
-  starter_name varchar(32) default NULL,
-  last_poster_name varchar(32) default NULL,
-  poll_state varchar(8) default NULL,
-  last_vote int(10) default NULL,
-  views int(10) default NULL,
-  forum_id smallint(5) NOT NULL default '0',
-  approved tinyint(1) default NULL,
-  author_mode tinyint(1) default NULL,
-  pinned tinyint(1) default NULL,
-  moved_to varchar(64) default NULL,
-  rating text,
-  total_votes int(5) NOT NULL default '0',
-  PRIMARY KEY  (tid),
-  KEY last_post (last_post),
-  KEY forum_id (forum_id,approved,pinned),
-  FULLTEXT KEY title (title)
-);
-
-CREATE TABLE ibf_tracker (
-  trid mediumint(8) NOT NULL auto_increment,
-  member_id mediumint(8) NOT NULL default '0',
-  topic_id bigint(20) NOT NULL default '0',
-  start_date int(10) default NULL,
-  last_sent int(10) NOT NULL default '0',
-  PRIMARY KEY  (trid)
-);
-
-CREATE TABLE ibf_validating (
-  vid varchar(32) NOT NULL default '',
-  member_id mediumint(8) NOT NULL default '0',
-  real_group smallint(3) NOT NULL default '0',
-  temp_group smallint(3) NOT NULL default '0',
-  entry_date int(10) NOT NULL default '0',
-  coppa_user tinyint(1) NOT NULL default '0',
-  lost_pass tinyint(1) NOT NULL default '0',
-  new_reg tinyint(1) NOT NULL default '0',
-  email_chg tinyint(1) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '0',
-  PRIMARY KEY  (vid),
-  KEY new_reg (new_reg)
-);
-
-CREATE TABLE ibf_voters (
-  vid int(10) NOT NULL auto_increment,
-  ip_address varchar(16) NOT NULL default '',
-  vote_date int(10) NOT NULL default '0',
-  tid int(10) NOT NULL default '0',
-  member_id varchar(32) default NULL,
-  forum_id smallint(5) NOT NULL default '0',
-  PRIMARY KEY  (vid)
-);
-
-CREATE TABLE ibf_warn_logs (
-  wlog_id int(10) NOT NULL auto_increment,
-  wlog_mid mediumint(8) NOT NULL default '0',
-  wlog_notes text NOT NULL,
-  wlog_contact varchar(250) NOT NULL default 'none',
-  wlog_contact_content text NOT NULL,
-  wlog_date int(10) NOT NULL default '0',
-  wlog_type varchar(6) NOT NULL default 'pos',
-  wlog_addedby mediumint(8) NOT NULL default '0',
-  PRIMARY KEY  (wlog_id)
-);
\ No newline at end of file
diff --git a/Tools_and_Scripts/hivemail/hivemail.html b/Tools_and_Scripts/hivemail/hivemail.html
deleted file mode 100644
index 9509a745..00000000
--- a/Tools_and_Scripts/hivemail/hivemail.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!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" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title>Hivemail -&gt; IPB Set Up</title>
-	
-	<style type='text/css'>
-	body
-	{
-		background-color:#FFF;
-		background-image: url(http://www.invisionboard.com/tutorial/hivemail/img/bg.jpg);
-		background-repeat: repeat-y;
-		padding: 0px;
-		margin: 10px;
-		font-family: verdana;
-		font-size:12px;
-		text-align:center;
-	}
-	table
-	{
-		font-family: verdana;
-		font-size:11px;
-	}
-	img { border:0px }
-	.headline { font-family:"Trebuchet MS", verdana, arial, sans-serif; font-size:40px;font-weight:bold }
-	.subline { font-family:"Trebuchet MS", verdana, arial, sans-serif; font-size:18px;color:#009 }
-	#wrapper { text-align:left; margin-left:auto;margin-right:auto;width:90% }
-	</style>
-</head>
-<body>
-<div id="wrapper">
-<span class="headline">Integrating HiveMail with IPB 1.2</span>
-<br />
-An Invision Power Board Guide detailing how to set up your HiveMail installation with IPB.
-<br />
-<br />
-<span class="subline">Required Components</span>
-<br /><br />
-You should have already installed HiveMail (1.2+) into a directory called "mail" on your server, in the same root folder as the one
-that contains your IPB forums folder.
-<br /><br />
-<b>An example structure</b>
-<br />
-/home/domain/public_html/mail/
-<br />/home/domain/public_html/forums/
-
-<br /><br />
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align="left" width="95%" style="padding-right:6px" valign="top">
- <span class="subline">Configuring the files</span>
- <br /><br />
- Before you go any further, you may need to edit one of the included IPB files.
- <br /><br />If you are using HiveMail 1.2.1, they you <b>do not</b> need to edit any files.
- <br /><br />If you are using any version previous to 1.2.1, then you'll need to open "invision_plugin.php" and change the arrowed line in the picture to: <kbd>define( 'HIVE_TBL', '' )</kbd> or you will receive errors!
- </td>
- <td align="center" width="5%" valign="top"><a href="http://www.invisionboard.com/tutorial/hivemail/img/hive_code.jpg" target="_blank"><img src="http://www.invisionboard.com/tutorial/hivemail/img/hive_code_thumb.jpg" alt="IMG" /></a><br />Click picture to enlarge</td>
-</tr>
-</table>
-
-<br /><br />
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align="left" width="95%" style="padding-right:6px" valign="top">
- <span class="subline">Uploading the files</span>
- <br /><br />
- <b>Upload the following files</b>
- <br /><br />Where "forums" is shown, this is your IPB installation, it does not have to be forums.
- <br /><br />
- <kbd>/forums/modules/ipb_member_sync.php
- <br /><br />/forums/modules/mod_hivemail.php
- <br /><br />/forums/register.php
- <br /><br />/mail/includes/invision_plugin.php</kdb>
- </td>
- <td align="center" width="5%" valign="top"><a href="http://www.invisionboard.com/tutorial/hivemail/img/hive_dir.jpg" target="_blank"><img src="http://www.invisionboard.com/tutorial/hivemail/img/hive_dir_thumb.jpg" alt="IMG" /></a><br />Click picture to enlarge</td>
-</tr>
-</table>
-
-<br /><br />
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align="left" width="95%" style="padding-right:6px" valign="top">
- <span class="subline">Configuring HiveMail</span>
- <br /><br />
- <b>Log into the HiveMail admin center</b>
- <br />
- <ul>
- 	<li>Under "HiveMail" click on "Options" in the menu.
- 	<li>When the options menu has loaded, click option 13 "vBulletin Integration"
- 	<li>Complete the form in a similar way show by the screenshot, mentally substituting "vBulletin" for "IPB"
- </ul>
- <br />
- If you enabled "Allow regular registration", your members can register for HiveMail outside of the board, if not enabled, clicking on the "Sign Up" button on the HiveMail index page
- will take your visitor to the IPB registration page (with the option of HiveMail email). If you visitor is already registered and logged into IPB, they will be taken to a dedicated HiveMail signup page.
- <br /><br />
- <a href="http://www.invisionboard.com/tutorial/hivemail/img/hive_ipb_reg.jpg" target="_blank">Show IPB Reg Form Screen Shot</a> &middot; <a href="http://www.invisionboard.com/tutorial/hivemail/img/hive_ipb_cp.jpg" target="_blank">Show IPB HiveMail Sign Up Page</a>
- </td>
- <td align="center" width="5%" valign="top"><a href="http://www.invisionboard.com/tutorial/hivemail/img/hive_options.jpg" target="_blank"><img src="http://www.invisionboard.com/tutorial/hivemail/img/hive_options_thumb.jpg" alt="IMG" /></a><br />Click picture to enlarge</td>
-</tr>
-</table>
-
-<br /><br />
-<span class="subline">That's it! You're all done!</span>
-<br /><br />
-<br />
-~Matt for IPS, Inc. Aug 03
-
-</div>
-</body>
-</html>
diff --git a/Tools_and_Scripts/hivemail/ipb_modules/ipb_member_sync.php b/Tools_and_Scripts/hivemail/ipb_modules/ipb_member_sync.php
deleted file mode 100644
index cf46138e..00000000
--- a/Tools_and_Scripts/hivemail/ipb_modules/ipb_member_sync.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.2 Module File
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Member Sync Module File
-|   > Module written by Matt Mecham
-|   > Date started: 7th July 2003
-|
-+--------------------------------------------------------------------------
-|
-| USAGE:
-| ------
-|
-| This module is designed to hold any module modifications to with registration
-| It doesn't do much in itself, but custom code can be added to handle
-| synchronization, etc.
-|
-| - on_create_account: Is called upon successful account creation
-| - on_register_form: Is called when the form is displayed
-| - on_login: Is called when logged in succcessfully
-| - on_delete: Is called when member deleted (single, multiple)
-| - on_email_change: When email address change is confirmed
-| - on_profile_update: When profile is updated (msn, sig, etc)
-| - on_pass_change: When password is updated
-| - on_group_change: When the member's membergroup has changed
-| - on_name_change: When the member's name has been changed
-+--------------------------------------------------------------------------
-*/
-
-class ipb_member_sync
-{
-	var $class  = "";
-	var $hiveid = 0;
-	var $html   = "";
-	var $hive   = "";
-	
-	function ipb_member_sync()
-	{
-		global $DB, $ibforums;
-		
-		if ( $ibforums->member['id'] )
-		{
-			$DB->query("SELECT id, hiveuserid FROM ibf_member_extra WHERE id={$ibforums->member['id']}");
-			
-			$r = $DB->fetch_row();
-			
-			$this->hiveid = intval($r['hiveuserid']);
-		}
-	}
-	
-	//-----------------------------------------------
-	// register_class($class)
-	//
-	// Register a $this-> with this class 
-	//
-	//-----------------------------------------------
-
-	function register_class($class)
-	{
-		$this->class = &$class;
-		$this->error = "";
-	}
-
-	//-----------------------------------------------
-	// on_create_account($member)
-	//
-	// $member = array( 'id', 'name', 'email',
-	// 'password', 'mgroup'...etc)
-	//
-	//-----------------------------------------------
-	
-	function on_create_account($member)
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		//-------------------------------------------
-		// Add hivemail account?
-		//-------------------------------------------
-		
-		$ibforums->input['hive_username'] = trim($ibforums->input['hive_username']);
-		
-		if ( $ibforums->input['hive_username'] != "" )
-		{
-			
-			define('IPB_PLUGIN', true);
-			require_once('../mail/includes/invision_plugin.php');
-			
-			$this->hive = new invision_plugin();
-			
-			$this->hive->hivemail_register_user($member, true);
-			
-			if ( $this->hive->hive_error != "" )
-			{
-				$ibforums->lang['thing_name_taken']     = sprintf( $ibforums->lang['thing_name_taken']    , 'Board Email Address' );
-				$ibforums->lang['incorrect_thing_name'] = sprintf( $ibforums->lang['incorrect_thing_name'], 'Board Email Address' );
-		
-				$this->class->show_reg_form($this->hive->hive_error);
-				$this->error = 1;
-				$this->hive->destructor();
-				return;
-			}
-			
-			$this->hive->destructor();
-		}
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_register_form()
-	//
-	//
-	//-----------------------------------------------
-	
-	function on_register_form()
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		//-------------------------------------------
-		// HiveMail integration
-		// As register_form is defualt action, we can
-		// either show the hivemail entry in the reg
-		// form if they are not a member, or we can
-		// show the hive mail only sign up form
-		//-------------------------------------------
-		
-		if ( $this->hive == "" )
-		{
-			define('IPB_PLUGIN', true);
-			require_once('../mail/includes/invision_plugin.php');
-			
-			$this->hive = new invision_plugin();
-		}
-		
-		if ( $ibforums->member['id'] )
-		{
-			//-------------------------------------------
-			// They are a member, are they a hivemail member?
-			//-------------------------------------------
-			
-			if ( $this->hiveid AND $hiveuser = $this->hive->DB_Hive->query_first("SELECT userid FROM ".HIVE_TBL."user WHERE userid = {$this->hiveid}"))
-			{
-				//-------------------------------------------
-				// yeah, chuck 'em to ucp then
-				//-------------------------------------------
-				
-				if ( $ibforums->input['mailsignup'] )
-				{
-					$this->hive->destructor();
-					$std->boink_it( $ibforums->base_url.'act=UserCP' );
-				}
-			}
-			else
-			{
-				//-------------------------------------------
-				// Forward them to the IPB module to show
-				// mail only sign-up
-				//-------------------------------------------
-				
-				if ( $ibforums->input['mailsignup'] )
-				{
-					$this->hive->destructor();
-					$std->boink_it( $ibforums->base_url.'act=module&module=hivemail&show=forumform' );
-				}
-			}
-		}
-		else
-		{
-			//-------------------------------------------
-			// Normal reg form! chop in hivemail option
-			//-------------------------------------------
-			
-			$extra = $this->class->html->field_entry(
-													 'Enter a username for your own board email account',
-													 'This is optional, please leave blank if you do not wish to get an email account.<br />Only letters and numbers please.',
-													 $this->class->html->field_textinput('hive_username', $ibforums->input['hive_username'])."&nbsp;<select name='hive_userdomain' class='forminput'>".$this->hive->hive_domainname_options."</select>"
-													);
-			
-			$this->class->output = str_replace( "<!--IBF.MODULES.EXTRA-->", $extra, $this->class->output );
-			
-		}
-		
-		$this->hive->destructor();
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_login()
-	//
-	// $member = array( 'id', 'name', 'email', 'pass')
-	//           ...etc
-	//-----------------------------------------------
-	
-	function on_login($member=array())
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_delete($ids)
-	//
-	// $ids = array | integer
-	// If array, will contain list of ids
-	//-----------------------------------------------
-	
-	function on_delete($ids=array())
-	{
-		global $DB, $std, $ibforums;
-		
-		$type = "";
-		
-		//---- START
-		
-		if ( is_array($ids) and count($ids) > 0 )
-		{
-			$type = arr;
-		}
-		else
-		{
-			$type = int;
-		}
-		
-		
-		
-		//---- END
-	}
-
-	//-----------------------------------------------
-	// on_email_change($id, $new_email)
-	//
-	// $id        = int member_id
-	// $new_email = string new email address
-	//-----------------------------------------------
-	
-	function on_email_change($id, $new_email)
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_pass_change($id, $new_raw)
-	//
-	// $id        = int member_id
-	// $new_raw   = string new plain text password
-	//-----------------------------------------------
-	
-	function on_pass_change($id, $new_raw)
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		//-------------------------------------------
-		// HiveMail integration
-		// Update hivemail passy
-		//-------------------------------------------
-		
-		if ( $this->hive == "" )
-		{
-			define('IPB_PLUGIN', true);
-			require_once('../mail/includes/invision_plugin.php');
-			
-			$this->hive = new invision_plugin();
-		}
-		
-		$this->hive->hivemail_update_password(md5($new_raw), $id);
-		
-		$this->hive->destructor();
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_profile_update($member)
-	// 
-	// 'website','icq_number','aim_name','yahoo','msnname','integ_msg'
-	// 'location','interests', 'title'
-	// 'id'
-	//-----------------------------------------------
-	
-	function on_profile_update( $member=array(), $custom_fields=array() )
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_group_change()
-	// 
-	// $id        = int member_id
-	// $new_group = new int() group id
-	//-----------------------------------------------
-	
-	function on_group_change( $id, $new_group )
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		
-		//---- END
-	}
-	
-	//-----------------------------------------------
-	// on_name_change()
-	// 
-	// $id        = int member_id
-	// $new_group = new name
-	//-----------------------------------------------
-	
-	function on_name_change( $id, $new_name )
-	{
-		global $DB, $std, $ibforums;
-		
-		//---- START
-		
-		
-		//---- END
-	}
-
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/hivemail/ipb_modules/mod_hivemail.php b/Tools_and_Scripts/hivemail/ipb_modules/mod_hivemail.php
deleted file mode 100644
index d5efb009..00000000
--- a/Tools_and_Scripts/hivemail/ipb_modules/mod_hivemail.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.2 Module File
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|   > Hive Mail Module
-|   > Module written by Matt Mecham
-|   > Date started: 8th July 2003
-|
-+--------------------------------------------------------------------------
-*/
-
-//=====================================
-// Define class, this must be the same
-// in all modules
-//=====================================
-
-class module extends module_loader
-{
-
-	var $class  = "";
-	var $module = "";
-	var $html   = "";
-	
-	var $result = "";
-	var $hive   = "";
-	var $hiveid = "";
-	
-	function module()
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		//-------------------------------------------
-		// Load skin / lang stuff
-		//-------------------------------------------
-			
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_register', $ibforums->lang_id);
-        $this->html     = $std->load_template('skin_register');
-        
-        //-------------------------------------------
-		// Are we a hivemail member?
-		//-------------------------------------------
-		
-        $DB->query("SELECT id, hiveuserid FROM ibf_member_extra WHERE id={$ibforums->member['id']}");
-			
-		$r = $DB->fetch_row();
-			
-		$this->hiveid = intval($r['hiveuserid']);
-			
-        //-------------------------------------------
-		// Load Hivemail plug in
-		//-------------------------------------------
-		
-        define('IPB_PLUGIN', true);
-		require_once('../mail/includes/invision_plugin.php');
-			
-		$this->hive = new invision_plugin();
-		
-		//-------------------------------------------
-		// If we're not a member...
-		//-------------------------------------------
-		
-		if ( ! $ibforums->member['id'] )
-		{
-			$std->boink_it( $ibforums->base_url );
-		}
-		
-		//-------------------------------------------
-		// Do we already have a hivemail membership?
-		//-------------------------------------------
-		
-		if ( $this->hiveid AND $hiveuser = $this->hive->DB_Hive->query_first("SELECT userid FROM ".HIVE_TBL."user WHERE userid = {$this->hiveid}"))
-		{
-			$this->hive->destructor();
-			$std->boink_it( $ibforums->base_url );
-		}
-		
-		//-------------------------------------------
-		// Whatcha doin'? Yes - you?
-		//-------------------------------------------
-		
-		switch( $ibforums->input['show'] )
-		{
-			case 'forumform':
-				$this->show_forumform();
-				break;
-			case 'addmail':
-				$this->add_mail();
-				
-			default:
-				$this->show_forumform();
-				break;
-		}
-		
-	}
-	
-	function add_mail()
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		$hive_username = trim($ibforums->input['hive_username']);
-		
-		//------------------------------------------
-		// Check for errors
-		//------------------------------------------
-		
-		if ( $hive_username == "" )
-		{
-			$this->show_forumform('js_blanks');
-		}
-
-		$this->hive->hivemail_register_user($ibforums->member, false);
-			
-		if ( $this->hive->hive_error != "" )
-		{
-			$ibforums->lang['thing_name_taken']     = sprintf( $ibforums->lang['thing_name_taken']    , 'Board Email Address' );
-			$ibforums->lang['incorrect_thing_name'] = sprintf( $ibforums->lang['incorrect_thing_name'], 'Board Email Address' );
-	
-			$this->show_forumform($this->hive->hive_error);
-			$this->error = 1;
-			$this->hive->destructor();
-			return;
-		}
-		
-		$this->hive->destructor();
-		
-		$print->redirect_screen("your email account has been created, forwarding you to the email log-in page", "/mail/index.php", 1);
-		
-	}
-	
-	//------------------------------------------
-	// Show Forum Form
-	// 
-	// Show the already reg'd member's mail form
-	//
-	//------------------------------------------
-	
-	function show_forumform($errors="")
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		$this->page_title = "Sign up for your email account";
-		
-		$hidden = "";
-		$action = $ibforums->base_url.'act=module&amp;module=hivemail&amp;show=addmail';
-		
-		$content = $this->html->field_entry('Account Name:',
-		                                    'The password for your email account will be the same as your forum account.<br />Letters and numbers only please.',
-		                                    $this->html->field_textinput('hive_username', $ibforums->input['hive_username'])."&nbsp;<select name='hive_userdomain' class='forminput'>".$this->hive->hive_domainname_options."</select>"
-		                                   );
-		                                   
-		if ($errors != "")
-    	{
-    		$this->output .= $this->html->errors( $ibforums->lang[$errors] );
-    	}
-		                                   
-		$this->output .= $this->html->tmpl_form($action, $hidden, $this->page_title, $content );
-		
-		$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-		
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/hivemail/ipb_root/register.php b/Tools_and_Scripts/hivemail/ipb_root/register.php
deleted file mode 100644
index 74c63b61..00000000
--- a/Tools_and_Scripts/hivemail/ipb_root/register.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.2 HiveMail register.php file
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-*/
-
-// This file allows Hive Mail to integrate to IPB without restructuring too much
-
-// Simply direct to IPB's register.
-
-require "./conf_global.php";
-
-$url = $INFO['board_url'].'/index.'.$INFO['php_ext'].'?act=Reg&mailsignup=1&coppa_pass=1';
-
-@header("Location: $url");
-
-exit();
-
-
-?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/hivemail/mail_includes/invision_plugin.php b/Tools_and_Scripts/hivemail/mail_includes/invision_plugin.php
deleted file mode 100644
index d0c25fcf..00000000
--- a/Tools_and_Scripts/hivemail/mail_includes/invision_plugin.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-//
-// +-------------------------------------------------------------+
-// | HiveMail version 1.2 (English)
-// | Copyright ©2002-2003 Chen Avinadav <chen@hivemail.com>
-// +-------------------------------------------------------------+
-// | HIVEMAIL IS NOT FREE SOFTWARE
-// | If you have downloaded this software from a website other
-// | than www.hivemail.com or if you have otherwise received
-// | this software from someone who is not a representative of
-// | this organization you are involved in an illegal activity.
-// | License agreement: http://www.hivemail.com/license.html
-// +-------------------------------------------------------------+
-// |
-// | INVISION POWER BOARD v1.2 (RC2+) INTEGRATION
-// | 
-// +-------------------------------------------------------------+
-
-error_reporting(E_ALL & ~E_NOTICE);
-
-//-------------------------------------------------------
-// Stop people from calling this file directly
-//-------------------------------------------------------
-
-if ( ! defined('IPB_PLUGIN') )
-{
-	return;
-}
-
-class invision_plugin
-{
-	var $hive_error   = "";
-	var $hive_options = array();
-	var $this_folder  = "";
-	var $DB_Hive      = "";
-
-
-	function invision_plugin()
-	{
-	
-		//=========================================
-		// EDIT THIS IF NEEDED
-		//=========================================
-		
-		define( 'HIVE_TBL', 'hive_' );
-		
-		
-		
-		//-------------------------------------------------------
-		// Change to right directory
-		//-------------------------------------------------------
-		
-		$this->this_folder = getcwd();
-		
-		chdir(dirname(__FILE__));
-		
-		//-------------------------------------------------------
-		// We are outside the admin CP
-		//-------------------------------------------------------
-		
-		define('INADMIN', false);
-		
-		define('VB_PLUGIN', 1 );
-		
-		//-------------------------------------------------------
-		// Start database connection
-		//-------------------------------------------------------
-		
-		require('../includes/config.php');
-		require('../includes/db_mysql.php');
-		
-		if ( ! function_exists('version_compare') or version_compare(phpversion(), '4.2.0') < 0 )
-		{
-			$config['server'] .= ':3306';
-		}
-		
-		$this->DB_Hive = new DB_MySQL($config, true, true);
-		
-		//-------------------------------------------------------
-		// Get all common functions
-		//-------------------------------------------------------
-
-		require('../includes/init.php');
-		
-		//-------------------------------------------------------
-		// Get options
-		//-------------------------------------------------------
-		
-		while ( $setting = $this->DB_Hive->fetch_array($settings, 'SELECT * FROM '.HIVE_TBL.'setting') )
-		{
-			$this->hive_options["$setting[variable]"] = $setting['value'];
-		}
-		
-		//-------------------------------------------------------
-		// The domain names array
-		//-------------------------------------------------------
-		
-		$this->hive_options['domainnames'] = preg_split("#\r?\n#", $this->hive_options['domainname']);
-		$this->hive_options['domainname']  = $this->hive_options['domainnames'][0];
-		
-		//-------------------------------------------------------
-		// Create the option list of domain names
-		//-------------------------------------------------------
-		
-		$this->hive_domainname_options = '';
-		
-		if ( is_array($this->hive_options['domainnames']) and count($this->hive_options['domainnames']) > 0 )
-		{
-			foreach ( $this->hive_options['domainnames'] as $curdomainname )
-			{
-				$this->hive_domainname_options .= "<option value=\"$curdomainname\"".iif($userdomain == $curdomainname, ' selected="selected"', '').">$curdomainname</option>\n";
-			}
-		}
-	}
-	
-	//-------------------------------------------------------
-	// Creates a user
-	//-------------------------------------------------------
-	
-	function hivemail_register_user($member, $onreg = true)
-	{
-		global $ibforums, $DB, $std;
-		
-		if ( ! $this->hive_options['regopen'] )
-		{
-			return;
-		}
-		
-		$hive_username   = trim($ibforums->input['hive_username']);
-		$hive_userdomain = trim($ibforums->input['hive_userdomain']);
-		
-		//-------------------------------------------------------
-		// Domain name
-		//-------------------------------------------------------
-		
-		if ( ! in_array( $hive_userdomain, $this->hive_options['domainnames'] ) )
-		{
-			$hive_userdomain = $hive_options['domainname'];
-		}
-		
-		//-------------------------------------------------------
-		// Some error checking
-		//-------------------------------------------------------
-		
-		if ($this->DB_Hive->query_first("SELECT username FROM ".HIVE_TBL."user WHERE username = '$hive_username'"))
-		{
-			if ($onreg)
-			{
-				$this->delete_reg_user($member['id']);
-			}
-			
-			$this->hive_error = 'thing_name_taken';
-			
-			return;
-			
-		}
-		elseif ( preg_match('#[^a-z0-9_.]#i', $hive_username) or preg_match('#^[^a-z]#i', $hive_username) or strlen($hive_username) < 2 )
-		{
-			if ($onreg)
-			{
-				$this->delete_reg_user($member['id']);
-			}
-			
-			$this->hive_error = 'incorrect_thing_name';
-			
-			return;
-		}
-		
-		//-------------------------------------------------------
-		// Create user
-		//-------------------------------------------------------
-		
-		$this->DB_Hive->query("
-			INSERT INTO ".HIVE_TBL."user
-			(userid, username, password, usergroupid, skinid, realname, regdate, lastvisit, cols, birthday, options, replyto, font, timezone, soundid, domain, vbuserid, altemail)
-			VALUES
-			(NULL, '".addslashes($hive_username)."', '".addslashes($member['password'])."', ".iif($this->hive_options['moderate'], 3, 2).", ".$this->hive_options['defaultskin'].", '".addslashes($member['name'])."', ".TIMENOW.", ".TIMENOW.", '".addslashes(USER_DEFAULTCOLS)."', '".addslashes('0')."', ".USER_DEFAULTBITS.", '".addslashes($hive_username.$hive_userdomain)."', 'Verdana|10|Regular|Black|None', '".addslashes('0')."', ".intval($this->DB_Hive->get_field('SELECT soundid FROM '.HIVE_TBL.'sound WHERE userid <= 0 ORDER BY userid LIMIT 1')).", '".addslashes($ibforums->input['hive_userdomain'])."', {$member['id']}, '".addslashes($member['email'])."')
-		");
-		
-		$hive_userid = $this->DB_Hive->insert_id();
-		
-		//-------------------------------------------------------
-		// Log user in
-		//-------------------------------------------------------
-		
-		if ($onreg)
-		{
-			$userid = $member['id'];
-			ini_set('session.name', 'hivesession');
-			session_start();
-			$std->my_setcookie(session_name(), session_id(), TIMENOW + (60 * 60 * 24 * 365));
-			$_SESSION['userid']     = $hive_userid;
-			$_SESSION['password']   = md5(md5($member['password']));
-			$_SESSION['ipaddress']  = md5(IPADDRESS);
-			$_SESSION['staylogged'] = 365;
-		}
-		
-		//-------------------------------------------------------
-		// Update Invision's database
-		//-------------------------------------------------------
-		
-		if ( ! $DB->field_exists( 'hiveuserid', 'ibf_member_extra' ) )
-		{
-			$DB->query("ALTER TABLE ibf_member_extra ADD hiveuserid mediumint(8) NOT NULL DEFAULT ''");
-		}
-		
-		$DB->query("SELECT id, hiveuserid FROM ibf_member_extra WHERE id={$member['id']}");
-		
-		if ( $r = $DB->fetch_row() )
-		{
-			// User _extra exists, update...
-			
-			$DB->query("UPDATE ibf_member_extra SET hiveuserid=$hive_userid WHERE id={$member['id']}");
-		}
-		else
-		{
-			// User _extra doesn't exist...
-			
-			$DB->query("INSERT INTO ibf_member_extra SET hiveuserid=$hive_userid, id={$member['id']}");
-		}
-	
-		return $hive_userid;
-	}
-	
-	//-------------------------------------------------------
-	// Delete new reg. user if error during registration
-	//-------------------------------------------------------
-	
-	function delete_reg_user($userid)
-	{
-		global $DB;
-		
-		$DB->query("DELETE FROM ibf_members WHERE id=$userid");
-		$DB->query("DELETE FROM ibf_member_extra WHERE id=$userid");
-		$DB->query("DELETE FROM ibf_pfields_content WHERE member_id=$userid");
-	}
-	
-	//-------------------------------------------------------
-	// Updates the user's hivemail password
-	//-------------------------------------------------------
-	
-	function hivemail_update_password($password, $userid)
-	{
-		$this->DB_Hive->query("
-			UPDATE ".HIVE_TBL."user
-			SET password = '".addslashes($password)."'
-			WHERE vbuserid = $userid
-		");
-	}
-	
-	//-------------------------------------------------------
-	// Desctructor
-	//-------------------------------------------------------
-	
-	function destructor()
-	{
-		chdir($this->this_folder);
-	}
-
-}
-
-function stripslashesarray($array) {
-	if (is_array($array)) {
-		foreach($array as $key => $val) {
-			if (is_array($val)) {
-				$array["$key"] = stripslashesarray($val);
-			} elseif (is_string($val)) {
-				if (get_cfg_var('magic_quotes_sybase')) {
-					$array["$key"] = str_replace("''", "'", $val);
-				} else {
-					$array["$key"] = stripslashes($val);
-				}
-			}
-		}
-	}
-
-	return $array;
-}
-
-function iif($eval, $true, $false = '') {
-	return (($eval == true) ? ($true) : ($false));
-}
-
-?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/index.html b/Tools_and_Scripts/index.html
new file mode 100644
index 00000000..bd6aeab6
--- /dev/null
+++ b/Tools_and_Scripts/index.html
@@ -0,0 +1,11 @@
+<html>
+<head><title>Invision Power Board - Bulletin Board System</title></head>
+<body>
+<h1>403: Invision Power Board -> Forbidden</h1>
+<hr>
+You have reached this Page in error, please use
+your back button to return to Invision Board.
+<hr>
+<a href="http://www.invisionboard.com/">Invision Power Board</a>
+</body>
+</html>
diff --git a/Tools_and_Scripts/ipbportal/index_rename.php b/Tools_and_Scripts/ipbportal/index_rename.php
new file mode 100644
index 00000000..a4fd1796
--- /dev/null
+++ b/Tools_and_Scripts/ipbportal/index_rename.php
@@ -0,0 +1,420 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board IPB Portal
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB Portal Script
+|   > Written By Matthew Mecham
+|   > Date started: 1st July 2003
+|   > Updated: 1st July 2004 (What a coincidence!)
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+// Define the path to where the forums directory is
+// located. This might be "./forums/" for example.
+// Don't forget the trailing slash!
+
+//define( 'ROOT_PATH', "./" );
+define( 'ROOT_PATH', "./forums/" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+
+// Define the URL to this script. If you're happy to
+// use relative URLs - you can leave this blank.
+// You can also rename the script here.
+
+$this_script = 'index.php';
+
+// Enable module usage?
+// (Vital for some mods and IPB enhancements)
+
+define ( 'USE_MODULES', 1 );
+
+// Enable shut down features?
+// Uses PHPs register_shutdown_function to save
+// low priority tasks until end of exec
+
+define ( 'USE_SHUTDOWN', 0 );
+
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define ( 'IN_IPB', 1 );
+define ( 'IN_DEV', 0 );
+ 
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+//===========================================================================
+// DEBUG CLASS
+//===========================================================================
+
+class Debug
+{
+    function startTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $starttime = $mtime;
+    }
+    function endTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $endtime = $mtime;
+        $totaltime = round (($endtime - $starttime), 5);
+        return $totaltime;
+    }
+}
+
+
+//===========================================================================
+// INFO CLASS
+//===========================================================================
+
+class info {
+
+	var $member       = array();
+	var $input        = array();
+	var $session_id   = "";
+	var $base_url     = "";
+	var $vars         = "";
+	var $lang_id      = "en";
+	var $skin         = "";
+	var $lang         = "";
+	var $server_load  = 0;
+	var $version    = "v2.0.0 ";
+	var $lastclick    = "";
+	var $location     = "";
+	var $debug_html   = "";
+	var $perm_id      = "";
+	var $forum_read   = array();
+	var $topic_cache  = "";
+	var $session_type = "";
+	var $skin_global  = "";
+	var $loaded_templates = array();
+	var $converge     = "";
+    
+	function info()
+	{
+		global $sess, $std, $DB, $INFO;
+		
+		$this->vars = &$INFO;
+		
+		$this->vars['AVATARS_URL']     = 'style_avatars';
+		$this->vars['EMOTICONS_URL']   = 'style_emoticons/<#EMO_DIR#>';
+		$this->vars['mime_img']        = 'style_images/<#IMG_DIR#>';
+
+	}
+}
+
+//===========================================================================
+// MAIN PROGRAM
+//===========================================================================
+
+
+//--------------------------------
+// Import $INFO, now!
+//--------------------------------
+
+$INFO = array();
+require ROOT_PATH."conf_global.php";
+
+//--------------------------------
+// The clocks a' tickin'
+//--------------------------------
+		
+$Debug = new Debug;
+$Debug->startTimer();
+
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
+
+$INFO['sql_driver'] = ! $INFO['sql_driver'] ? 'mysql' : strtolower($INFO['sql_driver']);
+
+require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_queries.php';
+$DB->obj['use_shutdown']     = USE_SHUTDOWN;
+
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+//--------------------------------
+// Make CONSTANT
+//--------------------------------
+
+define( 'SQL_PREFIX', $DB->obj['sql_tbl_prefix'] );
+define( 'SQL_DRIVER', $INFO['sql_driver']        );
+
+//--------------------------------
+// Wrap it all up in a nice easy to
+// transport super class
+//--------------------------------
+
+$ibforums = new info();
+
+//--------------------------------
+// Require our global functions
+//--------------------------------
+
+require ROOT_PATH."sources/functions.php";
+require ROOT_PATH."sources/classes/class_display.php";
+require ROOT_PATH."sources/classes/class_session.php";
+require ROOT_PATH."sources/classes/class_forums.php";
+require KERNEL_PATH."class_converge.php";
+
+$std    = new FUNC;
+$print  = new display();
+$sess   = new session();
+$forums = new forum_functions();
+
+//--------------------------------
+//  Set up our vars
+//--------------------------------
+
+$ibforums->input = $std->parse_incoming();
+
+//--------------------------------
+//  Set converge
+//--------------------------------
+
+$ibforums->converge = new class_converge( $DB );
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( 'badwords', 'emoticons', 'attachtypes','bbcode', 'multimod','ranks','profilefields', 'banfilters', 'settings', 'group_cache', 'systemvars', 'skin_id_cache', 'forum_cache', 'moderators', 'stats', 'languages' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$ibforums->vars[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$ibforums->cache[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$ibforums->cache[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+if ( ! isset( $ibforums->cache['systemvars'] ) )
+{
+	$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key='systemvars'" ) );
+	$DB->do_insert( 'cache_store', array( 'cs_key' => 'systemvars', 'cs_value' => addslashes(serialize(array())), 'cs_array' => 1 ) );
+}
+
+//--------------------------------
+// Set debug mode
+//--------------------------------
+
+$DB->obj['debug'] = ($ibforums->vars['sql_debug'] == 1) ? intval($_GET['debug']) : 0;
+
+//--------------------------------
+//  Initialize the FUNC
+//--------------------------------
+
+$std->FUNC_init();
+
+
+//--------------------------------
+//  The rest :D
+//--------------------------------
+
+$ibforums->member     = $sess->authorise();
+$std->load_skin();
+$ibforums->lastclick  = $sess->last_click;
+$ibforums->location   = $sess->location;
+$ibforums->session_id = $sess->session_id; // Used in URLs
+$ibforums->my_session = $sess->session_id; // Used in code
+
+//--------------------------------
+//  Initialize the forums
+//--------------------------------
+
+//--------------------------------
+// Set up cache path
+//--------------------------------
+
+if ( $ibforums->vars['ipb_cache_path'] )
+{
+	define( 'CACHE_PATH', $ibforums->vars['ipb_cache_path'] );
+}
+else
+{
+	define( 'CACHE_PATH', ROOT_PATH );
+}
+
+$forums->strip_invisible = 1;
+$forums->forums_init();
+
+list($ppu,$tpu) = explode( "&", $ibforums->member['view_prefs'] );
+		
+$ibforums->vars['display_max_topics'] = ($tpu > 0) ? $tpu : $ibforums->vars['display_max_topics'];
+$ibforums->vars['display_max_posts']  = ($ppu > 0) ? $ppu : $ibforums->vars['display_max_posts'];
+
+//===========================================================================
+//  Set up the session ID stuff
+//===========================================================================
+
+if ( $ibforums->session_type == 'cookie' )
+{
+	$ibforums->session_id = "";
+	$ibforums->base_url   = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?';
+}
+else
+{
+	$ibforums->base_url = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?s='.$ibforums->session_id.'&amp;';
+}
+
+$ibforums->js_base_url = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?s='.$ibforums->session_id.'&';
+
+//--------------------------------
+//  Set up the forum_read cookie
+//--------------------------------
+
+$std->hdl_forum_read_cookie();
+
+//===========================================================================
+//  Set up defaults
+//===========================================================================
+
+$ibforums->skin_id = $ibforums->skin['_setid'];
+
+$ibforums->vars['img_url']   = 'style_images/' . $ibforums->skin['_imagedir'];
+
+//--------------------------------
+//  Set up our language choice
+//--------------------------------
+
+if ($ibforums->vars['default_language'] == "")
+{
+	$ibforums->vars['default_language'] = 'en';
+}
+
+//--------------------------------
+// Did we choose a language?
+//--------------------------------
+
+If ( $ibforums->input['setlanguage'] and $ibforums->input['langid'] and $ibforums->member['id'] )
+{
+	if ( is_array( $ibforums->cache['languages'] ) and count( $ibforums->cache['languages'] ) )
+	{
+		foreach( $ibforums->cache['languages'] as $idx => $data )
+		{
+			if ( $data['ldir'] == $ibforums->input['langid'] )
+			{
+				$DB->do_update( 'members', array( 'language' => $data['ldir'] ), 'id='.$ibforums->member['id'] );
+				$ibforums->member['language'] = $data['ldir'];
+			}
+		}
+	}
+}
+		
+$ibforums->lang_id = $ibforums->member['language'] ? $ibforums->member['language'] : $ibforums->vars['default_language'];
+
+if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir( ROOT_PATH."lang/".$ibforums->lang_id ) ) )
+{
+	$ibforums->lang_id = $ibforums->vars['default_language'];
+}
+		
+$ibforums->lang = $std->load_words($ibforums->lang, 'lang_global', $ibforums->lang_id);
+
+//--------------------------------
+//  Upload dir?
+//--------------------------------
+
+$ibforums->vars['upload_dir'] = $ibforums->vars['upload_dir'] ? $ibforums->vars['upload_dir'] : ROOT_PATH.'uploads';
+
+//===========================================================================
+// DECONSTRUCTOR
+//===========================================================================
+
+if ( USE_SHUTDOWN and $ibforums->input['act'] != 'task' )
+{
+	chdir( ROOT_PATH );
+	$ROOT_PATH = getcwd();
+	
+	register_shutdown_function( array( &$std, 'my_deconstructor') );
+}
+
+//--------------------------------
+// Require and run
+//--------------------------------
+
+require ROOT_PATH."sources/ipbportal.php";
+
+$run = new ipdl();
+$run->auto_run();
+
+
+//+-------------------------------------------------
+// GLOBAL ROUTINES
+//+-------------------------------------------------
+
+function fatal_error($message="", $help="") {
+	echo("$message<br><br>$help");
+	exit;
+}
+
+?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/ipdynamiclite/ipdl_readme.txt b/Tools_and_Scripts/ipbportal/ipbp_readme.txt
similarity index 51%
rename from Tools_and_Scripts/ipdynamiclite/ipdl_readme.txt
rename to Tools_and_Scripts/ipbportal/ipbp_readme.txt
index 16190e79..865e649e 100644
--- a/Tools_and_Scripts/ipdynamiclite/ipdl_readme.txt
+++ b/Tools_and_Scripts/ipbportal/ipbp_readme.txt
@@ -1,10 +1,12 @@
-Invision Power Dynamic Lite
+Invision Power Portal
 ---------------------------
 
 Installation Snyopsis
 .....................
 
-Open up index.php, edit the variables at the top save and upload to your root public_html / www folder.
+Open up index_rename.php, edit the variables at the top save and upload to your root public_html / www folder.
+If you're installing this in a different directory to your IPB, renamed 'index_rename.php' to 'index.php'. It's named as
+such by default to ensure that you do not overwrite an existing file named the same.
 
 
 INSTALLATION
@@ -14,31 +16,23 @@ This guide assumes that you have installed IPB in /forums/ and wish for the port
 
 Open up index.php and edit the path to where the forums directory is:
 
-define( 'ROOT_PATH', "./forums" );
+define( 'ROOT_PATH', "./forums/" );
 
 This is set to "forums" by default. If you had your IPB installed at http://www.domain.com/chat/ you'd need to make sure you have:
 
-define( 'ROOT_PATH', "./chat" );
+define( 'ROOT_PATH', "./chat/" );
 
 Save the file and upload it to your root web directory folder, often called "public_html" or "www".
 
-UPLOADING IPB COMPONENTS
-------------------------
-
-If you've already got a version previous to RC2 set up, you should make sure you upload the following files found in the "upload" folder
-of this zip file.
-
-/skin/s1/skin_csite.php
-/lang/en/lang_csite.php
-/sources/ipdynamiclite/*.*
 
 SETTING UP
 ----------
 
-Before you can use Dynamic lite, you'll need to make sure you've switched it on from the ACP. If you don't do this, you may
+Before you can use IPB Portal, you'll need to make sure you've switched it on from the ACP. If you don't do this, you may
 receive PHP errors from index.php.
 
-Simply log into your forums ACP and expand the "System Settings" sub-menu and click on "IPDynamic Lite Set-up".
+Simply log into your forums ACP and expand the "System Settings" sub-menu and click on "View all general settings" and then
+find "IPB Portal".
 
 That's it, you're all done!
 
diff --git a/Tools_and_Scripts/ipchat.php b/Tools_and_Scripts/ipchat.php
new file mode 100644
index 00000000..eb4b10cf
--- /dev/null
+++ b/Tools_and_Scripts/ipchat.php
@@ -0,0 +1,320 @@
+<?
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2004 Invision Power Services, Inc
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionpower.com
++---------------------------------------------------------------------------
+|
+|   > IP Chat => IPB Bridge Script
+|   > Script written by Matt Mecham
+|   > Date started: 17th February 2003 (Updated: 1 July 2004)
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+// Root path
+
+define( 'ROOT_PATH'  , "./" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+
+$CACHE     = array();
+
+//----------------------------------------------
+// END OF USER EDITABLE COMPONENTS
+//---------------------------------------------
+
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+require ROOT_PATH."conf_global.php";
+
+define( 'DENIED', 0 );
+define( 'ACCESS', 1 );
+define( 'ADMIN' , 2 );
+
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
+
+$INFO['sql_driver'] = ! $INFO['sql_driver'] ? 'mysql' : strtolower($INFO['sql_driver']);
+
+require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['use_shutdown']     = 0;
+
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+//--------------------------------
+// Make CONSTANT
+//--------------------------------
+
+define( 'SQL_PREFIX', $DB->obj['sql_tbl_prefix'] );
+define( 'SQL_DRIVER', $INFO['sql_driver']        );
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( 'settings', 'group_cache', 'systemvars' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$INFO[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$CACHE[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$CACHE[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+$allowed_groups        = $INFO['chat_admin_groups'];
+$access_groups         = $INFO['chat_access_groups'];
+$autologin             = 0;
+$allow_guest_access    = $INFO['chat_allow_guest'] == 1 ? ACCESS : DENIED;
+
+// Stupid PHP changing it's mind on HTTP args
+
+$username  = $_GET['username']  != "" ? $_GET['username'] : $HTTP_GET_VARS['username'];
+$password  = $_GET['password']  != "" ? $_GET['password'] : $HTTP_GET_VARS['password'];
+$ip        = $_GET['ip']        != "" ? $_GET['ip']       : $HTTP_GET_VARS['ip'];
+
+//----------------------------------------------
+// Test for autologin.
+//----------------------------------------------
+
+if ( preg_match( "/^(?:[0-9a-z]){32}$/", $password ) )
+{
+	$autologin = 1;
+}
+
+
+// Remove URL encoding (%20, etc)
+
+$username = clean_value(urldecode(trim($username)));
+$password = clean_value(urldecode(trim($password)));
+$ip       = clean_value(urldecode(trim($ip)));
+
+//----------------------------------------------
+// Main code
+//----------------------------------------------
+
+// Start off with the lowest accessibility
+
+$output_int  = $allow_guest_access;
+$output_name = "";
+
+
+//------------------------------
+// Attempt to find the user
+//------------------------------
+
+$DB->query( "SELECT m.mgroup, m.name, m.id, c.*  FROM ".SQL_PREFIX."members m
+			 LEFT JOIN ".SQL_PREFIX."members_converge c ON (m.id=c.converge_id)
+			 WHERE m.name='".$DB->add_slashes($username)."'" );
+
+						
+if ( ! $member = $DB->fetch_row() )
+{
+	die_nice();
+	
+	//-- script exits --//
+}
+
+
+if ( ! $member['id'] )
+{
+	// No member found - allow guest access?
+	
+	die_nice($allow_guest_access);
+	
+	//-- script exits --//
+}
+
+
+//------------------------------
+// Update passy
+//------------------------------
+
+if ( ! $autologin )
+{
+	$md5_password = md5( md5( $member['converge_pass_salt'] ) . md5($password) );
+}
+else
+{
+	$md5_password = $password;
+}
+
+//------------------------------
+// Check password - member exists
+//------------------------------
+
+if ( $password != "" )
+{
+	// Password was entered..
+	
+	if ( $md5_password != $member['converge_pass_hash'] )
+	{
+		// Password incorrect..
+		
+		die_nice();
+		
+		//-- script exits --//
+	}
+	else
+	{
+		$output_int = ACCESS;
+	}
+}
+else
+{
+	// No password entered - die!
+	// Do not allow guest access on reg. name
+	
+	die_nice();
+		
+	//-- script exits --//
+}
+
+
+//------------------------------
+// Do we have any access?
+//------------------------------
+
+
+if ( ! preg_match( "/(^|,)".$member['mgroup']."(,|$)/", $access_groups ) )
+{
+	die_nice();
+}
+
+//------------------------------
+// Do we have admin access?
+//------------------------------
+
+if ( preg_match( "/(^|,)".$member['mgroup']."(,|$)/", $allowed_groups ) )
+{
+	$output_int = ADMIN;
+}
+
+
+//------------------------------
+// Spill the beans
+//------------------------------
+
+print $output_int;
+
+exit();
+	 
+	 
+function die_nice( $access=0 )
+{
+	// Simply error out silently, showing guest access only for the user
+	@mysql_close();
+	print $access;
+	exit();
+}
+
+//------------------------------
+// Var cleaner
+//------------------------------
+
+function clean_value($val)
+{
+    global $INFO;
+    
+	if ($val == "")
+	{
+		return "";
+	}
+	
+	$val = str_replace( "&#032;", " ", $val );
+	
+	if ( $INFO['strip_space_chr'] )
+	{
+		$val = str_replace( chr(0xCA), "", $val );  //Remove sneaky spaces
+	}
+	
+	$val = str_replace( "&"            , "&amp;"         , $val );
+	$val = str_replace( "<!--"         , "&#60;&#33;--"  , $val );
+	$val = str_replace( "-->"          , "--&#62;"       , $val );
+	$val = preg_replace( "/<script/i"  , "&#60;script"   , $val );
+	$val = str_replace( ">"            , "&gt;"          , $val );
+	$val = str_replace( "<"            , "&lt;"          , $val );
+	$val = str_replace( "\""           , "&quot;"        , $val );
+	$val = preg_replace( "/\n/"        , "<br>"          , $val ); // Convert literal newlines
+	$val = preg_replace( "/\\\$/"      , "&#036;"        , $val );
+	$val = preg_replace( "/\r/"        , ""              , $val ); // Remove literal carriage returns
+	$val = str_replace( "!"            , "&#33;"         , $val );
+	$val = str_replace( "'"            , "&#39;"         , $val ); // IMPORTANT: It helps to increase sql query safety.
+	
+	// Ensure unicode chars are OK
+	
+	$val = preg_replace("/&amp;#([0-9]+);/s", "&#\\1;", $val );
+	
+	// Strip slashes if not already done so.
+	
+	if ( get_magic_quotes_gpc() )
+	{
+		$val = stripslashes($val);
+	}
+	
+	// Swop user inputted backslashes
+	
+	$val = preg_replace( "/\\\(?!&amp;#|\?#)/", "&#092;", $val ); 
+	
+	return $val;
+}
+	 
+?>
\ No newline at end of file
diff --git a/Tools_and_Scripts/ipdynamiclite/index.php b/Tools_and_Scripts/ipdynamiclite/index.php
deleted file mode 100644
index e3d64c7a..00000000
--- a/Tools_and_Scripts/ipdynamiclite/index.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board IPB Click Site
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > IPB Portal Script
-|   > Written By Matthew Mecham
-|   > Date started: 1st July 2003
-|
-+--------------------------------------------------------------------------
-*/
-
-//-----------------------------------------------
-// USER CONFIGURABLE ELEMENTS
-//-----------------------------------------------
-
-// Define the path to where the forums directory is
-// located. This might be "./forums/" for example.
-// Don't forget the trailing slash!
-
-define( 'ROOT_PATH', "./forums/" );
-
-// Define the URL to this script. If you're happy to
-// use relative URLs - you can leave this blank.
-// You can also rename the script here.
-
-$this_script = 'index.php';
-
-//-----------------------------------------------
-// NO USER EDITABLE SECTIONS BELOW
-//-----------------------------------------------
- 
-error_reporting  (E_ERROR | E_WARNING | E_PARSE);
-set_magic_quotes_runtime(0);
-
-class Debug {
-    function startTimer() {
-        global $starttime;
-        $mtime = microtime ();
-        $mtime = explode (' ', $mtime);
-        $mtime = $mtime[1] + $mtime[0];
-        $starttime = $mtime;
-    }
-    function endTimer() {
-        global $starttime;
-        $mtime = microtime ();
-        $mtime = explode (' ', $mtime);
-        $mtime = $mtime[1] + $mtime[0];
-        $endtime = $mtime;
-        $totaltime = round (($endtime - $starttime), 5);
-        return $totaltime;
-    }
-}
-
-class info {
-
-	var $member     = array();
-	var $input      = array();
-	var $session_id = "";
-	var $base_url   = "";
-	var $vars       = "";
-	var $skin_id    = "0";     // Skin Dir name
-	var $skin_rid   = "";      // Real skin id (numerical only)
-	var $lang_id    = "en";
-	var $skin       = "";
-	var $lang       = "";
-	var $server_load = 0;
-	var $version    = "v1.0";
-	var $lastclick  = "";
-	var $location   = "";
-	var $debug_html = "";
-	var $perm_id    = "";
-	var $forum_read = array();
-	var $topic_cache = "";
-	var $session_type = "";
-
-	function info() {
-		global $sess, $std, $DB, $INFO, $this_script;
-		
-		$this->vars = &$INFO;
-		
-		$this->vars['TEAM_ICON_URL']   = $INFO['html_url'] . '/team_icons';
-		$this->vars['AVATARS_URL']     = $INFO['html_url'] . '/avatars';
-		$this->vars['EMOTICONS_URL']   = $INFO['html_url'] . '/emoticons';
-		$this->vars['mime_img']        = $INFO['html_url'] . '/mime_types';
-		$this->vars['dynamiclite']     = $this_script.'?';
-	}
-}
-
-//--------------------------------
-// Import $INFO, now!
-//--------------------------------
-
-require ROOT_PATH."conf_global.php";
-
-//--------------------------------
-// The clocks a' tickin'
-//--------------------------------
-		
-$Debug = new Debug;
-$Debug->startTimer();
-
-//--------------------------------
-// Require our global functions
-//--------------------------------
-
-require ROOT_PATH."sources/functions.php";
-
-$std   = new FUNC;
-$print = new display();
-$sess  = new session();
-
-//--------------------------------
-// Load the DB driver and such
-//--------------------------------
-
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
-
-$to_require = ROOT_PATH."sources/Drivers/".$INFO['sql_driver'].".php";
-require ($to_require);
-
-$DB = new db_driver;
-
-$DB->obj['sql_database']     = $INFO['sql_database'];
-$DB->obj['sql_user']         = $INFO['sql_user'];
-$DB->obj['sql_pass']         = $INFO['sql_pass'];
-$DB->obj['sql_host']         = $INFO['sql_host'];
-$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
-
-$DB->obj['debug']            = ($INFO['sql_debug'] == 1) ? $_GET['debug'] : 0;
-
-// Get a DB connection
-
-$DB->connect();
-
-//--------------------------------
-// Wrap it all up in a nice easy to
-// transport super class
-//--------------------------------
-
-$ibforums             = new info();
-
-//--------------------------------
-//  Set up our vars
-//--------------------------------
-
-$ibforums->input      = $std->parse_incoming();
-
-//--------------------------------
-//  The rest :D
-//--------------------------------
-
-$ibforums->member     = $sess->authorise();
-$ibforums->skin       = $std->load_skin();
-$ibforums->lastclick  = $sess->last_click;
-$ibforums->location   = $sess->location;
-$ibforums->session_id = $sess->session_id;
-
-//--------------------------------
-//  Set up the session ID stuff
-//--------------------------------
-
-if ( $ibforums->session_type == 'cookie' )
-{
-	$ibforums->session_id = "";
-	$ibforums->base_url   = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?';
-}
-else
-{
-	$ibforums->base_url = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?s='.$ibforums->session_id.'&amp;';
-}
-
-$ibforums->js_base_url = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?s='.$ibforums->session_id.'&';
-
-//--------------------------------
-//  Set up the forum_read cookie
-//--------------------------------
-
-$std->hdl_forum_read_cookie();
-
-//--------------------------------
-//  Set up the skin stuff
-//--------------------------------
-
-$ibforums->skin_rid   = $ibforums->skin['set_id'];
-$ibforums->skin_id    = 's'.$ibforums->skin['set_id'];
-
-$ibforums->vars['img_url']   = $ibforums->vars['board_url'].'/style_images/' . $ibforums->skin['img_dir'];
-
-//--------------------------------
-//  Set up our language choice
-//--------------------------------
-
-if ($ibforums->vars['default_language'] == "")
-{
-	$ibforums->vars['default_language'] = 'en';
-}
-
-$ibforums->lang_id = $ibforums->member['language'] ? $ibforums->member['language'] : $ibforums->vars['default_language'];
-
-if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir( ROOT_PATH."lang/".$ibforums->lang_id ) ) )
-{
-	$ibforums->lang_id = $ibforums->vars['default_language'];
-}
-		
-$ibforums->lang = $std->load_words($ibforums->lang, 'lang_global', $ibforums->lang_id);
-
-//--------------------------------
-// Require and run
-//--------------------------------
-
-require ROOT_PATH."sources/dynamiclite/csite.php";
-
-$run = new click_site();
-
-
-//+-------------------------------------------------
-// GLOBAL ROUTINES
-//+-------------------------------------------------
-
-function fatal_error($message="", $help="") {
-	echo("$message<br><br>$help");
-	exit;
-}
-
-?>
\ No newline at end of file
diff --git a/upload/ssi.php b/Tools_and_Scripts/ssi.php
similarity index 55%
rename from upload/ssi.php
rename to Tools_and_Scripts/ssi.php
index 943b9390..2dc81305 100644
--- a/upload/ssi.php
+++ b/Tools_and_Scripts/ssi.php
@@ -2,65 +2,86 @@
 
 /*
 +--------------------------------------------------------------------------
-|   IBFORUMS v1.2
+|   Invision Power Board v2.0.0 
 |   ========================================
 |   by Matthew Mecham
-|   (c) 2001,2002 IBForums
-|   http://www.ibforums.com
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://www.ibforums.com
-|   Email: phpboards@ibforums.com
-|   Licence Info: phpib-licence@ibforums.com
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > SSI script
 |   > Script written by Matt Mecham
 |   > Date started: 29th April 2002
+|   > UPDATED: 1st July 2004
 |
 +--------------------------------------------------------------------------
-*/
 
-/* USAGE:
-   ------
-   
-   Simply call this script via PHP includes, or SSI .shtml tags to generate content
-   on the fly, streamed into your own webpage.
-   
-   To show the last 10 topics and posts in the news forums...
-   
-   include("http://domain.com/forums/ssi.php?a=news&show=10");
-   
-   You can adjust the "show" attribute to display a different amount of topics.
-   
-   To show the board statistics
-   
-   include("http://domain.com/forums/ssi.php?a=stats");
-   
-   To show the active users stats (x Members, X Guests, etc)
-   
-   include("http://domain.com/forums/ssi.php?a=active");
-   
-   Syndication..
-   
-   RSS:
-   
-   http://domain.com/forums/ssi.php?a=out&f=1,2,3,4,5&show=10&type=rss
-   http://domain.com/forums/ssi.php?a=out&f=1,2,3,4,5&show=10&type=xml
-   
-   Will show last 10 topics in reverse chronological last post date order from
-   all the forums in the comma separated list
++--------------------------------------------------------------------------
+|   USAGE:
++--------------------------------------------------------------------------
+
+Simply call this script via PHP includes, or SSI .shtml tags to generate content
+on the fly, streamed into your own webpage.
+
++--------------------------------------------------------------------------
+|   To show the last 10 topics and posts in the news forums...
++--------------------------------------------------------------------------
+
+include("http://domain.com/forums/ssi.php?a=news&show=10");
+
+You can adjust the "show" attribute to display a different amount of topics.
+
++--------------------------------------------------------------------------
+|   To show the board statistics
++--------------------------------------------------------------------------
+
+include("http://domain.com/forums/ssi.php?a=stats");
+
++--------------------------------------------------------------------------
+|   To show the active users stats (x Members, X Guests, etc)
++--------------------------------------------------------------------------
+
+include("http://domain.com/forums/ssi.php?a=active");
+
++--------------------------------------------------------------------------
+|   RSS / XML Syndication..
++--------------------------------------------------------------------------
+
+RSS: http://domain.com/forums/ssi.php?a=out&f=1,2,3,4,5&show=10&type=rss
+XML: http://domain.com/forums/ssi.php?a=out&f=1,2,3,4,5&show=10&type=xml
+
+Will show last 10 topics in reverse chronological last post date order from
+all the forums in the comma separated list
    
 */
 
 //-----------------------------------------------
 // USER CONFIGURABLE ELEMENTS
 //-----------------------------------------------
- 
+
 // Root path
 
-$root_path = "./";
+define( 'ROOT_PATH'  , "./" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
 
-$templates_dir = "./ssi_templates";
+// Enable module usage?
+// (Vital for some mods and IPB enhancements)
+
+define ( 'USE_MODULES', 1 );
+
+// Enable shut down features?
+// Uses PHPs register_shutdown_function to save
+// low priority tasks until end of exec
+
+define ( 'USE_SHUTDOWN', 1 );
+
+$templates_dir = ROOT_PATH."ssi_templates";
 
 $max_show  = 100;  // Maximum number of topics possible to show...
 
@@ -69,7 +90,10 @@ $allow_syndication = 1;  // To turn off, use $allow_syndication = 0;
 //-----------------------------------------------
 // NO USER EDITABLE SECTIONS BELOW
 //-----------------------------------------------
- 
+
+define ( 'IN_IPB', 1 );
+define ( 'IN_DEV', 0 );
+
 error_reporting  (E_ERROR | E_WARNING | E_PARSE);
 set_magic_quotes_runtime(0);
 
@@ -78,11 +102,12 @@ class info {
 	var $input      = array();
 	var $base_url   = "";
 	var $vars       = "";
-	function info() {
-		global $sess, $std, $DB, $root_path, $INFO;
+	
+	function info()
+	{
+		global $sess, $std, $DB, $INFO;
 		
 		$this->vars = &$INFO;
-		
 	}
 }
 
@@ -90,13 +115,13 @@ class info {
 // Import $INFO, now!
 //--------------------------------
 
-require $root_path."conf_global.php";
+require ROOT_PATH."conf_global.php";
 
 //--------------------------------
 // Require our global functions
 //--------------------------------
 
-require $root_path."sources/functions.php";
+require ROOT_PATH."sources/functions.php";
 
 $std   = new FUNC;
 
@@ -104,10 +129,9 @@ $std   = new FUNC;
 // Load the DB driver and such
 //--------------------------------
 
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
+$INFO['sql_driver'] = ! $INFO['sql_driver'] ? 'mysql' : strtolower($INFO['sql_driver']);
 
-$to_require = $root_path."sources/Drivers/".$INFO['sql_driver'].".php";
-require ($to_require);
+require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php" );
 
 $DB = new db_driver;
 
@@ -116,11 +140,34 @@ $DB->obj['sql_user']         = $INFO['sql_user'];
 $DB->obj['sql_pass']         = $INFO['sql_pass'];
 $DB->obj['sql_host']         = $INFO['sql_host'];
 $DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_queries.php';
+$DB->obj['use_shutdown']     = USE_SHUTDOWN;
 
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
 // Get a DB connection
+//--------------------------------
 
 $DB->connect();
 
+//--------------------------------
+// Make CONSTANT
+//--------------------------------
+
+define( 'SQL_PREFIX', $DB->obj['sql_tbl_prefix'] );
+define( 'SQL_DRIVER', $INFO['sql_driver']        );
+
 //--------------------------------
 // Wrap it all up in a nice easy to
 // transport super class
@@ -135,6 +182,50 @@ $ibforums             = new info();
 $ibforums->input      = $std->parse_incoming();
 $ibforums->base_url   = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'];
 
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( 'banfilters', 'settings', 'group_cache', 'systemvars', 'skin_id_cache', 'forum_cache', 'moderators', 'stats', 'languages' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$ibforums->vars[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$ibforums->cache[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$ibforums->cache[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+//--------------------------------
+//  Initialize the FUNC
+//--------------------------------
+
+$std->FUNC_init();
+
+$std->load_skin();
+
 //--------------------------------
 // What to do?
 //--------------------------------
@@ -176,7 +267,7 @@ switch ($ibforums->input['a'])
 
 function do_syndication()
 {
-	global $DB, $ibforums, $root_path, $templates_dir, $std, $max_show;
+	global $DB, $ibforums, $templates_dir, $std, $max_show;
 	
 	//----------------------------------------
 	// Sort out the forum ids
@@ -267,9 +358,7 @@ function do_syndication()
 											  'board_name' => $ibforums->vars['board_name'],
 							  )     	    );
 	
-	$DB->query("SELECT g_id, g_perm_id FROM ibf_groups WHERE g_id={$ibforums->vars['guest_group']}");
-	
-	$group = $DB->fetch_row();
+	$group = $ibforums->cache['group_cache'][ $ibforums->vars['guest_group'] ];
 	
 	$ibforums->perm_id_array = explode( ",", $group['g_perm_id'] );
 	
@@ -277,11 +366,13 @@ function do_syndication()
 	// Get the topics, member info and other stuff
 	//----------------------------------------
 	
-	$DB->query("SELECT t.*, f.name as forum_name, f.read_perms, f.password
-				 FROM ibf_topics t
-				  LEFT JOIN ibf_forums f ON ( f.id=t.forum_id )
-				WHERE t.forum_id IN ($sql_fields)
-			    AND t.approved=1 ORDER BY t.last_post DESC LIMIT 0, $perpage");
+	$DB->simple_construct( array( 'select' => '*',
+								  'from'   => 'topics',
+								  'where'  => "forum_id IN ($sql_fields) AND approved=1",
+								  'order'  => 'last_post DESC',
+								  'limit'  => array( 0, $perpage ) ) );
+	
+	$DB->simple_exec();
 			   
 	if ( ! $DB->get_num_rows() )
 	{
@@ -290,12 +381,14 @@ function do_syndication()
 
 	while ( $i = $DB->fetch_row() )
 	{
-		if ( $std->check_perms( $i['read_perms'] ) != TRUE )
+		$forum = $ibforums->cache['forum_cache'][ $i['forum_id'] ];
+		
+		if ( $std->check_perms( $forum['read_perms'] ) != TRUE )
 		{
 			continue;
 		}
 		
-		if ($i['password'] != "" )
+		if ($forum['password'] != "" )
 		{
 			continue;
 		}
@@ -331,7 +424,7 @@ function do_syndication()
 
 function do_stats()
 {
-	global $DB, $ibforums, $root_path, $templates_dir, $std;
+	global $DB, $ibforums, $templates_dir, $std;
 	
 	// Load the template...
 	
@@ -342,17 +435,24 @@ function do_stats()
 	// Get the topics, member info and other stuff
 	$time = time() - 900;
 			
-	$DB->query("SELECT * FROM ibf_stats");
-	$stats = $DB->fetch_row();
+	if ( ! is_array( $ibforums->cache['stats'] ) )
+	{
+		$ibforums->cache['stats'] = array();
+		
+		$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key='stats'" ) );
+		$DB->do_insert( 'cache_store', array( 'cs_array' => 1, 'cs_key' => 'stats', 'cs_value' => addslashes(serialize($ibforums->cache['stats'])) ) );
+	}
 	
-	$total_posts = $stats['TOTAL_REPLIES']+$stats['TOTAL_TOPICS'];
+	$stats = $ibforums->cache['stats'];
+	
+	$total_posts = $stats['total_replies']+$stats['total_topics'];
 	
 	$to_echo  = parse_template( $template,
 								array (
 										 'total_posts'  => $total_posts,
-										 'topics'       => $stats['TOTAL_TOPICS'],
-										 'replies'      => $stats['TOTAL_REPLIES'],
-										 'members'      => $stats['MEM_COUNT']
+										 'topics'       => $stats['total_topics'],
+										 'replies'      => $stats['total_replies'],
+										 'members'      => $stats['mem_count']
 									  )
 								);
 	
@@ -366,14 +466,14 @@ function do_stats()
 
 function do_news()
 {
-	global $DB, $ibforums, $root_path, $templates_dir, $std, $max_show;
+	global $DB, $ibforums, $templates_dir, $std, $max_show;
 	
 	if ( (! $ibforums->vars['news_forum_id']) or ($ibforums->vars['news_forum_id'] == "" ) )
 	{
 		fatal_error("No news forum assigned");
 	}
 	
-	require $root_path."sources/lib/post_parser.php";
+	require ROOT_PATH."sources/lib/post_parser.php";
         
 	$parser = new post_parser();
         
@@ -381,20 +481,22 @@ function do_news()
 	
 	$perpage = ( $perpage > $max_show ) ? $max_show : $perpage;
 	
+	//-----------------------------------------
 	// Load the template...
+	//-----------------------------------------
 	
 	$template = load_template("news.html");
 	
 	$to_echo = "";
 	
+	//-----------------------------------------
 	// Get the topics, member info and other stuff
+	//-----------------------------------------
 	
-	$DB->query("SELECT m.name as member_name, m.id as member_id,m.title as member_title, m.avatar, m.avatar_size, m.posts, t.*, p.*, g.g_dohtml, f.use_html
-	            FROM ibf_topics t
-	            	LEFT JOIN ibf_posts p ON (p.new_topic=1 AND p.topic_id=t.tid)
-	            	LEFT JOIN ibf_members m ON (m.id=t.starter_id)
-	            	LEFT JOIN ibf_groups g ON (g.g_id=m.mgroup)
-	            	LEFT JOIN ibf_forums f ON (t.forum_id=f.id)
+	$DB->query("SELECT m.name as member_name, m.mgroup, m.id as member_id,m.title as member_title, t.*, p.*
+	            FROM ".SQL_PREFIX."topics t
+	            	LEFT JOIN ".SQL_PREFIX."posts p ON (p.new_topic=1 AND p.topic_id=t.tid)
+	            	LEFT JOIN ".SQL_PREFIX."members m ON (m.id=t.starter_id)
 			    WHERE t.forum_id={$ibforums->vars['news_forum_id']} AND t.approved=1 ORDER BY t.tid DESC LIMIT 0, $perpage");
 			   
 	if ( ! $DB->get_num_rows() )
@@ -406,19 +508,28 @@ function do_news()
 	{
 		$row['post'] = str_replace( '<br>', '<br />', $row['post'] );
 		
+		$parser->pp_do_html  = ( $ibforums->cache['forum_cache'][ $row['forum_id'] ]['use_html'] and $ibforums->cache['group_cache'][ $row['mgroup'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+		$parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+		$parser->pp_nl2br    = $row['post_htmlstate'] == 2 ? 1 : 0;
+		
+		$row['post'] = $parser->post_db_parse( $row['post'] );
+		
 		$to_echo .= parse_template( $template,
 								    array (
 								    		 'profile_link'   => $ibforums->base_url."?act=Profile&CODE=03&MID=".$row['member_id'],
 								    		 'member_name'    => $row['member_name'],
-								    		 'post_date'      => $std->get_date( $row['start_date'], 'LONG' ),
+								    		 'post_date'      => $std->get_date( $row['post_date'], 'LONG', 1 ),
 								    		 'topic_title'    => $row['title'],
-								    		 'post'           => $parser->post_db_parse($row['post'], ($row['use_html'] AND $row['g_dohtml']) ? 1 : 0 ),
+								    		 'post'           => $row['post'],
 								    		 'comments'       => $row['posts'],
 								    		 'view_all_link'  => $ibforums->base_url."?act=ST&f={$row['forum_id']}&t={$row['tid']}"
 								    	  )
 								    );
 	}
 	
+	$to_echo = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $to_echo );
+	$to_echo = str_replace( "<#EMO_DIR#>", $ibforums->skin['_emodir']  , $to_echo );
+		
 	echo $to_echo;
 	
 	exit();
@@ -428,7 +539,7 @@ function do_news()
 
 function do_active()
 {
-	global $DB, $ibforums, $root_path, $templates_dir, $std;
+	global $DB, $ibforums, $templates_dir, $std;
 	
 	// Load the template...
 	
@@ -436,17 +547,50 @@ function do_active()
 	
 	$to_echo = "";
 	
-	// Get the topics, member info and other stuff
-	$time = time() - 900;
-			
-	$DB->query("SELECT s.member_id, s.member_name, s.login_type, g.suffix, g.prefix FROM ibf_sessions s, ibf_groups g WHERE running_time > '$time' AND g.g_id=s.member_group ORDER BY running_time DESC");
+	if ($ibforums->vars['au_cutoff'] == "")
+	{
+		$ibforums->vars['au_cutoff'] = 15;
+	}
 	
-	// cache all printed members so we don't double print them
+	//--------------------------------
+	// Get the users from the DB
+	//--------------------------------
+	
+	$cut_off = $ibforums->vars['au_cutoff'] * 60;
+	$time    = time() - $cut_off;
+	$rows    = array( 0 => array( 'login_type'   => substr($ibforums->member['login_anonymous'],0, 1),
+								  'running_time' => time(),
+								  'member_id'    => $ibforums->member['id'],
+								  'member_name'  => $ibforums->member['name'],
+								  'member_group' => $ibforums->member['mgroup'] ) );
+	
+	$DB->simple_construct( array( 'select' => 'id, member_id, member_name, login_type, running_time, member_group',
+								  'from'   => 'sessions',
+								  'where'  => "running_time > $time",
+								  'order'  => "running_time DESC"
+						 )      );
+	
+	
+	$DB->simple_exec();
+	
+	//-----------------------------------------
+	// FETCH...
+	//-----------------------------------------
+	
+	while ($r = $DB->fetch_row() )
+	{
+		$rows[] = $r;
+	}
+	
+	//--------------------------------
+	// cache all printed members so we
+	// don't double print them
+	//--------------------------------
+				
 	$cached = array();
-	
 	$active = array();
 	
-	while ($result = $DB->fetch_row() )
+	foreach( $rows as $result )
 	{
 		if ($result['member_id'] == 0)
 		{
@@ -457,6 +601,7 @@ function do_active()
 			if (empty( $cached[ $result['member_id'] ] ) )
 			{
 				$cached[ $result['member_id'] ] = 1;
+				
 				if ($result['login_type'] == 1)
 				{
 					$active['ANON']++;
diff --git a/upload/ssi_templates/active.html b/Tools_and_Scripts/ssi_templates/active.html
similarity index 100%
rename from upload/ssi_templates/active.html
rename to Tools_and_Scripts/ssi_templates/active.html
diff --git a/upload/archive_in/index.html b/Tools_and_Scripts/ssi_templates/index.html
similarity index 100%
rename from upload/archive_in/index.html
rename to Tools_and_Scripts/ssi_templates/index.html
diff --git a/upload/ssi_templates/news.html b/Tools_and_Scripts/ssi_templates/news.html
similarity index 100%
rename from upload/ssi_templates/news.html
rename to Tools_and_Scripts/ssi_templates/news.html
diff --git a/upload/ssi_templates/stats.html b/Tools_and_Scripts/ssi_templates/stats.html
similarity index 100%
rename from upload/ssi_templates/stats.html
rename to Tools_and_Scripts/ssi_templates/stats.html
diff --git a/upload/ssi_templates/syndicate_rss.html b/Tools_and_Scripts/ssi_templates/syndicate_rss.html
similarity index 73%
rename from upload/ssi_templates/syndicate_rss.html
rename to Tools_and_Scripts/ssi_templates/syndicate_rss.html
index c31af964..c6c49180 100644
--- a/upload/ssi_templates/syndicate_rss.html
+++ b/Tools_and_Scripts/ssi_templates/syndicate_rss.html
@@ -16,7 +16,7 @@
 		<link>{topic_link}</link>
 		<comments>{topic_link}</comments>
 		<category>{forum_title}</category>
-		<description><![CDATA[Forum: <a href="{board_url}?showforum={forum_id}" target="_blank">{forum_title}</a><br />Last Poster: <a href="{board_url}?showuser={last_poster_id}" target="_blank">{last_post_name}</a><br />Last Post: {last_post_time}]]></description>
+		<description><![CDATA[Forum: <a href="{board_url}?showforum={forum_id}">{forum_title}</a><br />Last Poster: <a href="{board_url}?showuser={last_poster_id}" target="_blank">{last_post_name}</a><br />Last Post: {last_post_time}]]></description>
 		<pubDate>{rfc_date}</pubDate>
 	</item>
 [/ROW]
diff --git a/Tools_and_Scripts/ssi_templates/syndicate_xml.html b/Tools_and_Scripts/ssi_templates/syndicate_xml.html
new file mode 100644
index 00000000..7b9cbc43
--- /dev/null
+++ b/Tools_and_Scripts/ssi_templates/syndicate_xml.html
@@ -0,0 +1,39 @@
+[TOP]
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE ipbsource
+[
+	<!-- CUSTOM IPB INLINE DOCTYPE -->
+	<!ELEMENT ipbsource (topic+) >
+	<!ELEMENT topic     (title,lastposter,starter,forum,date) >
+	<!ATTLIST topic id	     CDATA #REQUIRED >
+	
+	<!ELEMENT title		   (#PCDATA) >
+	
+	<!ELEMENT lastposter   (#PCDATA) >
+	<!ATTLIST lastposter id  CDATA #REQUIRED >
+	
+	<!ELEMENT starter      (#PCDATA) >
+	<!ATTLIST starter    id  CDATA #REQUIRED >
+	
+	<!ELEMENT forum		   (#PCDATA) >
+	<!ATTLIST forum id  	 CDATA #REQUIRED >
+	
+	<!ELEMENT date		   (#PCDATA) >
+	<!ATTLIST date timestamp CDATA #REQUIRED >
+]>
+<ipbsource>
+[/TOP]
+
+[ROW]
+	<topic id="{topic_id}">
+		<title>{topic_title}</title>
+		<lastposter id="{last_poster_id}">{last_post_name}</lastposter>
+		<starter id="{starter_id}">{starter_name}</starter>
+		<forum id="{forum_id}">{forum_title}</forum>
+		<date timestamp="{timestamp}">{last_post_time}</date>
+	</topic>
+[/ROW]
+
+[BOTTOM]
+</ipbsource>
+[/BOTTOM]
\ No newline at end of file
diff --git a/Tools_and_Scripts/upgrade6.php b/Tools_and_Scripts/upgrade6.php
deleted file mode 100644
index a1fe69d4..00000000
--- a/Tools_and_Scripts/upgrade6.php
+++ /dev/null
@@ -1,1367 +0,0 @@
-<?php
-
-
-
-/*
-
-+--------------------------------------------------------------------------
-
-|   IBFORUMS v1 UPGRADE FROM 1.2 to v1.3
-
-|   ========================================
-
-|   by Matthew Mecham
-
-|   (c) 2001,2002 IBForums
-
-|   http://www.ibforums.com
-
-|   ========================================
-
-|   Web: http://www.ibforums.com
-
-|   Email: phpboards@ibforums.com
-
-|   Licence Info: phpib-licence@ibforums.com
-
-+---------------------------------------------------------------------------
-
-|
-
-|   > Upgrade Script #5
-
-|   > Script written by Matt Mecham
-
-|   > Date started: 24th September 2003 on a chilly but sunny day
-
-|
-
-+--------------------------------------------------------------------------
-
-*/
-
-
-
-//-----------------------------------------------
-
-// USER CONFIGURABLE ELEMENTS
-
-//-----------------------------------------------
-
- 
-
-// Root path
-
-
-
-$root_path = "./";
-
-
-
-//-----------------------------------------------
-
-// NO USER EDITABLE SECTIONS BELOW
-
-//-----------------------------------------------
-
- 
-
-error_reporting  (E_ERROR | E_WARNING | E_PARSE);
-
-set_magic_quotes_runtime(0);
-
-
-
-$template = new template;
-
-$std      = new installer;
-
-
-
-$VARS = $std->parse_incoming();
-
-
-
-//--------------------------------
-
-// Import $INFO, now!
-
-//--------------------------------
-
-
-
-require $root_path."conf_global.php";
-
-
-
-//--------------------------------
-
-// Load the DB driver and such
-
-//--------------------------------
-
-
-
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
-
-
-
-$to_require = $root_path."sources/Drivers/".$INFO['sql_driver'].".php";
-
-require ($to_require);
-
-
-
-$DB = new db_driver;
-
-
-
-$DB->obj['sql_database']     = $INFO['sql_database'];
-
-$DB->obj['sql_user']         = $INFO['sql_user'];
-
-$DB->obj['sql_pass']         = $INFO['sql_pass'];
-
-$DB->obj['sql_host']         = $INFO['sql_host'];
-
-$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
-
-
-
-// Get a DB connection
-
-
-
-$DB->connect();
-
-
-
-// Switch off auto_error
-
-
-
-$DB->return_die = 1;
-
-
-
-//---------------------------------------
-
-// Sort out what to do..
-
-//---------------------------------------
-
-
-
-switch($VARS['a'])
-
-{
-
-	case 'tables':
-
-		do_tables();
-
-		break;
-
-		
-
-	case 'alter':
-
-		do_alter();
-
-		break;
-
-		
-
-	case 'insert':
-
-		do_insert();
-
-		break;
-
-		
-
-		
-
-	default:
-
-		do_intro();
-
-		break;
-
-}
-
-
-
-//+---------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-
-//+---------------------------------------
-
-
-
-
-
-
-
-
-
-function do_insert()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('insert');
-
-	
-
-	$template->print_top('Step 4 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.2 to v1.3</div>
-
-							  <div class='pformstrip'>The new data has been inserted<!--sideways into a place where the sun don't shine :o (Yes, Iceland) --></div>
-
-							  <div class='tablepad'>
-
-							   The upgrade is now complete and you may go to your board!
-
-							   <br /><br />
-
-							   <b>PLEASE REMOVE THIS UPGRADE SCRIPT AS SOON AS POSSIBLE</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-
-
-function do_index()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('index');
-
-	
-
-	$template->print_top('Step 3 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.2 to v1.3</div>
-
-							  <div class='pformstrip'>The indexes have been adjusted</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade6.php?a=insert'>Proceed to Step 4: Insert New Data</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-function do_alter()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('alter');
-
-	
-
-	$template->print_top('Step 2 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.2 to v1.3</div>
-
-							  <div class='pformstrip'>The tables have been altered</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade6.php?a=insert'>Proceed to Step 3: Insert New Data</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-function do_tables()
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	run_sql('tables');
-
-	
-
-	$template->print_top('Step 1 Complete');
-
-	
-
-	$template->contents .= "<div class='centerbox'>
-
-							 <div class='tableborder'>
-
-							  <div class='maintitle'>Upgrade from v1.2 to v1.3</div>
-
-							  <div class='pformstrip'>The new tables have been created</div>
-
-							  <div class='tablepad'>
-
-							   You may now proceed to the next step.
-
-							   <br /><br />
-
-							   <b><a href='upgrade6.php?a=alter'>Proceed to Step 2: Alter Existing Tables</a> &gt;&gt;</b>
-
-							  </div>
-
-							 </div>
-
-							 <div class='fade'>&nbsp;</div>
-
-							</div>";
-
-						 	
-
-	$template->output();
-
-}
-
-
-
-
-
-//+---------------------------------------
-
-
-
-function do_intro()
-
-{
-
-	global $std, $template, $root;
-
-	
-
-	$template->print_top('Welcome');
-
-	
-
-	$template->contents .= "<table width='80%' border='0' cellpadding='0' cellspacing='0' align='center'>
-
-							<tr>
-
-							 <td valign='top'><img src='html/sys-img/install_face.jpg' border='0' alt='Intro'></td>
-
-							 <td><img src='html/sys-img/install_text.gif' border='0' alt='Welcome to IPB'>
-
-							  <br /><br />
-
-							   <b style='font-size:14px'>Welcome to the Invision Board Upgrade Utility</b>
-
-							   <br /><b>Invision Power Board 1.2 -> Invision Power Board 1.3</b>
-
-							   <br><br>
-
-							   Before you run this upgrade tool, please ensure that ALL of the source, language and skin files
-
-							   have been uploaded into the corresponding directories on your server as noted in the documentation
-
-							   included with the download package.
-
-							   <br><br>
-
-							   This script should be in the root forum directory (the same directory that index.php is in).
-
-							   <br><br>
-
-							   Once you have used this script, you can use the new 'Skin Version Control' to update your skins.
-
-							   ";
-
-						 
-
-	
-
-	$template->contents .= "<br /><br /><div align='center'><b><a href='upgrade6.php?a=tables'>Proceed to Step 1: Create New Tables</a> &gt;&gt;</b></div>";
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-
-
-function install_error($msg="")
-
-{
-
-	global $std, $template, $root;
-
-	
-
-	$template->print_top('Warning!');
-
-	
-
-
-
-	
-
-	$template->contents .= "<tr>
-
-						  <td id='warning'>&#149;&nbsp;WARNING!</td>
-
-						<tr>
-
-						<td>
-
-						  <table cellpadding='8' cellspacing='0' width='100%' align='center' border='0' id='tablewrap'>
-
-						  <tr>
-
-							<td>
-
-						  <table width='100%' cellspacing='1' cellpadding='0' align='center' border='0' id='table1'>
-
-						   <tr>
-
-							<td>
-
-							 <table width='100%' cellspacing='2' cellpadding='3' align='center' border='0'>
-
-							 <tr>
-
-							   <td>
-
-									<b>The following errors must be rectified before continuing!</b><br>Please go back and try again!
-
-									<br><br>
-
-									$msg
-
-								</td>
-
-							 </tr>
-
-							</table>
-
-						  </td>
-
-						 </tr>
-
-						</table>
-
-					   </td>
-
-					  </tr>
-
-					 </table>";
-
-	
-
-	
-
-	
-
-	$template->output();
-
-}
-
-
-
-
-
-
-
-
-
-//+-------------------------------------------------
-
-// GLOBAL ROUTINES
-
-//+-------------------------------------------------
-
-
-
-function fatal_error($message="", $help="") {
-
-	echo("$message<br><br>$help");
-
-	exit;
-
-}
-
-
-
-
-
-//+--------------------------------------------------------------------------
-
-// CLASSES
-
-//+--------------------------------------------------------------------------
-
-
-
-
-
-
-
-class template
-
-{
-
-	var $contents = "";
-
-	
-
-	function output()
-
-	{
-
-		echo $this->contents;
-
-		echo "   
-
-				 </table>
-
-				 <br><br><center><span id='copy'>&copy 2002 Invision Board (www.invisionboard.com)</span></center>
-
-				 
-
-				 </body>
-
-				 </html>";
-
-		exit();
-
-	}
-
-	
-
-	//--------------------------------------
-
-
-
-	function print_top($title="")
-
-	{
-
-	
-
-		$this->contents = "<html>
-
-		          <head><title>Invision Power Board Set Up :: $title </title>
-
-		          <style type='text/css'>
-
-		          	
-
-		          	BODY		          	
-
-		          	{
-
-		          		font-size: 11px;
-
-		          		font-family: Verdana, Arial;
-
-		          		color: #000;
-
-		          		margin: 0px;
-
-		          		padding: 0px;
-
-		          		background-image: url(html/sys-img/fadebg.jpg);
-
-		          		background-repeat: no-repeat;
-
-		          		background-position: right bottom;
-
-		          	}
-
-		          	
-
-		          	TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 11px; color:#000 }
-
-					
-
-					a:link, a:visited, a:active  { color:#000055 }
-
-					a:hover                      { color:#333377;text-decoration:underline }
-
-					
-
-					.centerbox { margin-right:10%;margin-left:10%;text-align:left }
-
-					
-
-					.warnbox {
-
-							   border:1px solid #F00;
-
-							   background: #FFE0E0;
-
-							   padding:6px;
-
-							   margin-right:10%;margin-left:10%;text-align:left;
-
-							 }
-
-					
-
-					.tablepad    { background-color:#F5F9FD;padding:6px }
-
-
-
-					.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px;text-align:left }
-
-					.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-
-					.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
-
-
-
-					.tableborder { border:1px solid #345487;background-color:#FFF; padding:0px; margin:0px; width:100% }
-
-
-
-					.maintitle { text-align:left;vertical-align:middle;font-weight:bold; color:#FFF; letter-spacing:1px; padding:8px 0px 8px 5px; background-image: url(html/sys-img/tile_back.gif) }
-
-					.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-
-					.maintitle a:hover { text-decoration: underline }
-
-					
-
-					#copy { font-size:10px }
-
-										
-
-					#button   { background-color: #4C77B6; color: #FFFFFF; font-family:Verdana, Arial; font-size:11px }
-
-					
-
-					#textinput { background-color: #EEEEEE; color: #000000; font-family:Verdana, Arial; font-size:10px; width:100% }
-
-					
-
-					#dropdown { background-color: #EEEEEE; color: #000000; font-family:Verdana, Arial; font-size:10px }
-
-					
-
-					#multitext { background-color: #EEEEEE; color: #000000; font-family:Courier, Verdana, Arial; font-size:10px }
-
-					
-
-					#logostrip {
-
-								 padding: 0px;
-
-								 margin: 0px;
-
-								 background: #7AA3D0;
-
-							   }
-
-							   
-
-					.fade					
-
-					{
-
-						background-image: url(html/sys-img/fade.jpg);
-
-						background-repeat: repeat-x;
-
-					}
-
-					
-
-				  </style>
-
-				  </head>
-
-				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>
-
-				 
-
-				 <div id='logostrip'><img src='html/sys-img/title.gif' border='0' alt='Invision Power Board Installer' /></div>
-
-				 <div class='fade'>&nbsp;</div>
-
-				 <br />
-
-				 ";
-
-				  	   
-
-	}
-
-
-
-
-
-}
-
-
-
-
-
-class installer
-
-{
-
-
-
-	function parse_incoming()
-
-    {
-
-    	global $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_CLIENT_IP, $REQUEST_METHOD, $REMOTE_ADDR, $HTTP_PROXY_USER, $HTTP_X_FORWARDED_FOR;
-
-    	$return = array();
-
-    	
-
-		if( is_array($HTTP_GET_VARS) )
-
-		{
-
-			while( list($k, $v) = each($HTTP_GET_VARS) )
-
-			{
-
-				//$k = $this->clean_key($k);
-
-				if( is_array($HTTP_GET_VARS[$k]) )
-
-				{
-
-					while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
-
-					{
-
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
-
-					}
-
-				}
-
-				else
-
-				{
-
-					$return[$k] = $this->clean_value($v);
-
-				}
-
-			}
-
-		}
-
-		
-
-		// Overwrite GET data with post data
-
-		
-
-		if( is_array($HTTP_POST_VARS) )
-
-		{
-
-			while( list($k, $v) = each($HTTP_POST_VARS) )
-
-			{
-
-				//$k = $this->clean_key($k);
-
-				if ( is_array($HTTP_POST_VARS[$k]) )
-
-				{
-
-					while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
-
-					{
-
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
-
-					}
-
-				}
-
-				else
-
-				{
-
-					$return[$k] = $this->clean_value($v);
-
-				}
-
-			}
-
-		}
-
-		
-
-		return $return;
-
-	}
-
-    
-
-    function clean_key($key) {
-
-    
-
-    	if ($key == "")
-
-    	{
-
-    		return "";
-
-    	}
-
-    	
-
-    	$key = preg_replace( "/\.\./"           , ""  , $key );
-
-    	$key = preg_replace( "/\_\_(.+?)\_\_/"  , ""  , $key );
-
-    	$key = preg_replace( "/^([\w\.\-\_]+)$/", "$1", $key );
-
-    	return $key;
-
-    }
-
-    
-
-    function clean_value($val) {
-
-    
-
-    	if ($val == "")
-
-    	{
-
-    		return "";
-
-    	}
-
-    	
-
-    	$val = preg_replace( "/&/"         , "&amp;"         , $val );
-
-    	$val = preg_replace( "/<!--/"      , "&#60;&#33;--"  , $val );
-
-    	$val = preg_replace( "/-->/"       , "--&#62;"       , $val );
-
-    	$val = preg_replace( "/<script/i"  , "&#60;script"   , $val );
-
-    	$val = preg_replace( "/>/"         , "&gt;"          , $val );
-
-    	$val = preg_replace( "/</"         , "&lt;"          , $val );
-
-    	$val = preg_replace( "/\"/"        , "&quot;"        , $val );
-
-    	$val = preg_replace( "/\|/"        , "&#124;"        , $val );
-
-    	$val = preg_replace( "/\n/"        , "<br>"          , $val ); // Convert literal newlines
-
-    	$val = preg_replace( "/\\\$/"      , "&#036;"        , $val );
-
-    	$val = preg_replace( "/\r/"        , ""              , $val ); // Remove literal carriage returns
-
-    	$val = preg_replace( "/!/"         , "&#33;"         , $val );
-
-    	$val = preg_replace( "/'/"         , "&#39;"         , $val ); // IMPORTANT: It helps to increase sql query safety.
-
-    	$val = stripslashes($val);                                     // Swop PHP added backslashes
-
-    	$val = preg_replace( "/\\\/"       , "&#092;"        , $val ); // Swop user inputted backslashes
-
-    	return $val;
-
-    }
-
-   
-
-}
-
-
-
-// Sql stuff
-
-
-
-
-
-function run_sql($type)
-
-{
-
-	global $std, $template, $root, $DB;
-
-	
-
-	$DB->error = "";
-
-	
-
-	if ($type == 'tables')
-
-	{
-
-		$SQL = sql_tables();
-
-	}
-
-	else if ($type == 'alter')
-
-	{
-
-		$SQL = sql_alter();
-
-	}
-
-	else if ($type == 'index')
-
-	{
-
-		$SQL = sql_index();
-
-	}
-
-	else if ($type == 'insert')
-
-	{
-
-		$SQL = sql_insert();
-
-	}
-
-	else if ($type == 'optimize')
-
-	{
-
-		$SQL = sql_optimize();
-
-	}
-
-	
-
-	//--------------------------------
-
-		
-
-	foreach( $SQL as $q )
-
-	{
-
-		$DB->query($q);
-
-		
-
-		if ( $DB->error != "" )
-
-		{
-
-			install_error($DB->error);
-
-		}
-
-	}
-
-	
-
-	return TRUE;
-
-}
-
-
-
-
-
-function sql_optimize()
-
-{
-
-	$SQL = array();
-
-	
-
-	
-
-
-
-	return $SQL;
-
-}
-
-
-
-
-
-function sql_tables()
-
-{
-
-	$SQL = array();
-
-	
-
-$SQL[] = "CREATE TABLE ibf_subscriptions (
-
- sub_id smallint(5) NOT NULL auto_increment,
-
- sub_title varchar(250) NOT NULL default '',
-
- sub_desc text,
-
- sub_new_group mediumint(8) NOT NULL default 0,
-
- sub_length smallint(5) NOT NULL default '1',
-
- sub_unit varchar(2) NOT NULL default 'm',
-
- sub_cost decimal(10,2) NOT NULL default '0.00',
-
- sub_run_module varchar(250) NOT NULL default '',
-
- PRIMARY KEY (sub_id)
-
-) TYPE=MyISAM;";
-
-
-
-$SQL[] = "CREATE TABLE ibf_subscription_extra (
-
- subextra_id smallint(5) NOT NULL auto_increment,
-
- subextra_sub_id smallint(5) NOT NULL default '0',
-
- subextra_method_id smallint(5) NOT NULL default '0',
-
- subextra_product_id varchar(250) NOT NULL default '0',
-
- subextra_can_upgrade tinyint(1) NOT NULL default '0',
-
- subextra_recurring tinyint(1) NOT NULL default '0',
-
- subextra_custom_1 text,
-
- subextra_custom_2 text,
-
- subextra_custom_3 text,
-
- subextra_custom_4 text,
-
- subextra_custom_5 text,
-
- PRIMARY KEY(subextra_id)
-
-) TYPE=MyISAM;";
-
-
-
-
-
-$SQL[] = "CREATE TABLE ibf_subscription_trans (
-
- subtrans_id int(10) NOT NULL auto_increment,
-
- subtrans_sub_id smallint(5) NOT NULL default '0',
-
- subtrans_member_id mediumint(8) NOT NULL default '0',
-
- subtrans_old_group smallint(5) NOT NULL default '0',
-
- subtrans_paid decimal(10,2) NOT NULL default '0.00',
-
- subtrans_cumulative decimal(10,2) NOT NULL default '0.00',
-
- subtrans_method varchar(20) NOT NULL default '',
-
- subtrans_start_date int(11) NOT NULL default '0',
-
- subtrans_end_date int(11) NOT NULL default '0',
-
- subtrans_state varchar(200) NOT NULL default '',
-
- subtrans_trxid varchar(200) NOT NULL default '',
-
- subtrans_subscrid varchar(200) NOT NULL default '',
-
- subtrans_currency varchar(10) NOT NULL default 'USD',
-
- PRIMARY KEY (subtrans_id)
-
-) TYPE=MyISAM;";
-
-
-
-$SQL[] = "CREATE TABLE ibf_subscription_logs (
-
- sublog_id int(10) NOT NULL auto_increment,
-
- sublog_date int(10) NOT NULL default '',
-
- sublog_member_id mediumint(8) NOT NULL default '0',
-
- sublog_transid int(10) NOT NULL default '',
-
- sublog_ipaddress varchar(16) NOT NULL default '',
-
- sublog_data text,
-
- sublog_postdata text,
-
- PRIMARY KEY (sublog_id)
-
-) TYPE=MyISAM;";
-
-
-
-$SQL[] = "CREATE TABLE ibf_subscription_methods (
-
- submethod_id smallint(5) NOT NULL auto_increment,
-
- submethod_title varchar(250) NOT NULL default '',
-
- submethod_name varchar(20) NOT NULL default '',
-
- submethod_email varchar(250) NOT NULL default '',
-
- submethod_sid text,
-
- submethod_custom_1 text,
-
- submethod_custom_2 text,
-
- submethod_custom_3 text,
-
- submethod_custom_4 text,
-
- submethod_custom_5 text,
-
- submethod_is_cc tinyint(1) NOT NULL default '0',
-
- submethod_is_auto tinyint(1) NOT NULL default '0',
-
- submethod_desc text,
-
- submethod_logo text,
-
- submethod_active tinyint(1) NOT NULL default '',
-
- submethod_use_currency varchar(10) NOT NULL default 'USD',
-
- PRIMARY KEY (submethod_id)
-
-) TYPE=MyISAM;";
-
-
-
-$SQL[] = "CREATE TABLE ibf_subscription_currency (
-
- subcurrency_code varchar(10) NOT NULL,
-
- subcurrency_desc varchar(250) NOT NULL default '',
-
- subcurrency_exchange decimal(10, 8) NOT NULL,
-
- subcurrency_default tinyint(1) NOT NULL default '0',
-
- PRIMARY KEY(subcurrency_code)
-
-) TYPE=MyISAM;";
-
-
-
-
-
-	return $SQL;
-
-}
-
-
-
-function sql_alter()
-
-{
-
-	$SQL = array();
-
-	
-
-	
-
-	$SQL[] = "alter table ibf_members add sub_end int(10) NOT NULL default '0';";
-
-	$SQL[] = "alter table ibf_forums add notify_modq_emails text default '';";
-
-	
-
-
-
-
-
-	
-
-
-
-	return $SQL;
-
-}
-
-
-
-function sql_index()
-
-{
-
-	$SQL = array();
-
-	
-
-	return $SQL;
-
-}
-
-
-
-function sql_insert()
-
-{
-
-	$SQL = array();
-
-	
-
-	$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='USD', subcurrency_desc='United States Dollars', subcurrency_exchange='1.00', subcurrency_default=1;";
-
-	$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='GBP', subcurrency_desc='United Kingdom Pounds', subcurrency_exchange=' 0.630776', subcurrency_default=0;";
-
-	$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='CAD', subcurrency_desc='Canada Dollars', subcurrency_exchange='1.37080', subcurrency_default=0;";
-
-	$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='EUR', subcurrency_desc='Euro', subcurrency_exchange='0.901517', subcurrency_default=0;";
-
-	$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (1, 'PayPal', 'paypal', '', '', '', '', '', '', '', 0, 1, 'All major credit cards accepted. See <a href=\"https://www.paypal.com/affil/pal=9DJEWQQKVB6WL\" target=\"_blank\">PayPal</a> for more information.', '', 1, 'USD');";
-
-	$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (2, 'NOCHEX', 'nochex', '', '', '', '', '', '', '', 0, 1, 'UK debit and credit cards, such as Switch, Solo and VISA Delta. All prices will be convereted into GBP (UK Pounds) upon ordering.', NULL, 1, 'GBP');";
-
-	$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (3, 'Post Service', 'manual', '', '', '', '', '', '', '', 0, 0, 'You can use this method if you wish to send us a check, postal order or international money order.', NULL, 1, 'USD');";
-
-	$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (4, '2CheckOut', '2checkout', '', '', '', '', '', '', '', 1, 1, 'All major credit cards accepted. See <a href=\'http://www.2checkout.com/cgi-bin/aff.2c?affid=28376\' target=\'_blank\'>2CheckOut</a> for more information.', NULL, 1, 'USD');";
-
-
-
-	return $SQL;
-
-}
-
-
-
-
-
-?>
\ No newline at end of file
diff --git a/helpfulGuide.htm b/helpfulGuide.htm
new file mode 100644
index 00000000..fe3ca129
--- /dev/null
+++ b/helpfulGuide.htm
@@ -0,0 +1,262 @@
+<!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" xml:lang="en" lang="en">
+
+<head>
+
+  <title>Installation Questions: Unofficial Guide</title>
+
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+  <meta name="robots" content="no-index" />
+
+  <script type="text/javascript">
+    <!--
+      if (window != top) top.location.href = location.href;
+    // -->
+  </script>
+
+  <script type="text/javascript">
+    <!--
+      /* Copyright Peter Crouch 2000. All rights reserved.
+         Visit http://www.perlbay.com for other thing written by me
+         Visit http://javascriptkit.com for this script and more
+      */
+      function calculator(user, number) {
+        // Owner
+        if (user == "owner" && number == "4"){var box = eval("document.chmod.owner4")}
+        if (user == "owner" && number == "2"){var box = eval("document.chmod.owner2")}
+        if (user == "owner" && number == "1"){var box = eval("document.chmod.owner1")}
+
+        // Group
+        if (user == "group" && number == "4"){var box = eval("document.chmod.group4")}
+        if (user == "group" && number == "2"){var box = eval("document.chmod.group2")}
+        if (user == "group" && number == "1"){var box = eval("document.chmod.group1")}
+
+        // Other
+        if (user == "other" && number == "4"){var box = eval("document.chmod.other4")}
+        if (user == "other" && number == "2"){var box = eval("document.chmod.other2")}
+        if (user == "other" && number == "1"){var box = eval("document.chmod.other1")}
+
+        if (box.checked == true) {
+          if (user == "owner") {
+            document.chmod.h_owner.value += ("+number")
+            var a= (document.chmod.h_owner.value)
+            var b= eval(a)
+            document.chmod.h_owner.value=b
+            document.chmod.t_owner.value=b
+          }
+          if (user == "group") {
+            document.chmod.h_group.value += ("+number")
+            var a= (document.chmod.h_group.value)
+            var b= eval(a)
+            document.chmod.h_group.value=b
+            document.chmod.t_group.value=b
+          }
+          if (user == "other") {
+            document.chmod.h_other.value += ("+number")
+            var a= (document.chmod.h_other.value)
+            var b= eval(a)
+            document.chmod.h_other.value=b
+            document.chmod.t_other.value=b
+          }
+        }
+        if (box.checked == false) {
+          if (user == "owner") {
+            if (document.chmod.h_owner.value == "") {
+              document.chmod.t_owner.value=""
+            } else {
+              var a=(document.chmod.h_owner.value);
+              b=a-(number);
+              c=eval(b);
+              document.chmod.h_owner.value=c
+              document.chmod.t_owner.value=c
+            }
+          }
+          if (user == "group") {
+            if (document.chmod.h_group.value == "") {
+              document.chmod.t_group.value=""
+            } else {
+              var a=(document.chmod.h_group.value);
+              b=a-(number);
+              c=eval(b);
+              document.chmod.h_group.value=c
+              document.chmod.t_group.value=c
+            }
+          }
+          if (user == "other") {
+            if (document.chmod.h_other.value == "") {
+              document.chmod.t_other.value=""
+            } else {
+              var a=(document.chmod.h_other.value);
+              b=a-(number);
+              c=eval(b);
+              document.chmod.h_other.value=c
+              document.chmod.t_other.value=c
+            }
+          }
+        }
+      }
+    // -->
+  </script>
+
+  <style type="text/css">
+    table {
+      font-family: Verdana, Arial, Times, Times New Roman, Sans-Serif;
+      font-size: 8pt;
+      color: #000000;
+      line-height: 17px;
+    }
+  </style>
+
+</head>
+
+<body>
+
+<table width="600" align="center" style="border: 1px solid black" border="0" cellspacing="0" cellpadding="2">
+  <tr>
+    <td valign="top">
+      <b>Installation Questions: Unofficial Guide</b><br />
+      written by: daniel EDWARDS<br /><br />
+
+      Thank you for choosing Invision Power Board, the greatest Forum software on the Internet. Many of you may have questions installing it and putting things into motion, but this page will give you a general idea of how to install and setup your Forum.<br /><br />
+
+      This is not for the newbie, but I will write this in newbie terms, so that everyone can understand.<br /><br />
+
+      <b>DOWNLOAD IT</b> <hr>
+      If you're reading this file right now, you've probably got this covered. You also know how to extract files, so we'll move on.<br /><br />
+
+      <b>GENERAL GUIDE</b> <hr>
+      <b>Creating The Directory</b><br />
+      The first thing you want to do is create a new directory in your root site for your Forum. This basically means making a new folder where you will contain your Forum files. You can do this best through FTP (file transfer protocol), although I'm aware that you can use a file manager as well.<br /><br />
+
+      FTP is the easiest way to do it, so ensure from your host that you have FTP enabled for editing and managing files through your site. You can access FTP through a number of FTP programs, but seeing as how you've downloaded this free version of Invision Power Board, you're not in the interest of paying for professional programs. Try SmartFTP or CoreFTP Lite for starters. You can type in those words into the Google.com search engine to obtain the url, download it, and get it moving.<br /><br />
+
+      Log in to your FTP account (which requires a username, a password, and a domain name). Your FTP account should be something like:<br />
+      <b>Address:</b> ftp://yoursite.com<br />
+      <b>Username:</b> moocher@yoursite.com<br />
+      <b>Password:</b> ******<br /><br />
+
+      Once you have logged in, create a new directory in your root directory. Basically, your root directory would normally have the following url in the FTP address bar: /var/www/html/public_html/. Your root directory is where all your site files are stored, including your index.html page. So create a new folder or make a new directory in this spot and name it something simple like "forum".<br /><br />
+
+      <b>Uploading The Files</b><br />
+      Now, go into that folder and upload all the contents necessary for your Invision Power Board. You should only upload the contents you find in the "upload" folder that you unzipped to your Desktop. Most FTP programs support "drag-and-drop", a system where you can drag programs from a source folder into your FTP client and have it manually copy all directories and files. If you are running an older version, you may have to manually create each directory in your Forum directory, and then upload the corresponding files. Since this is going to take a while, you can start focusing on database information.<br /><br />
+
+      <b>Creating A MySQL Database</b><br />
+      IPB runs directly on PHP and MySQL. You will need MySQL access in order to create an Invision Power Board forum. Most Web hosts will provide you with MySQL access, but if you're not sure you have it, contact your web host immediately.<br /><br />
+
+      MySQL operates through a series of confusing code and what we call "datbases". Databases store more detailed information than a cookie (a file stored on your computer that remembers login information, page details, etc.). You will automatically write information to your database while installing Invision Power Board. It will record user registrations, your installation information, general configurations, etc. So MySQL is really handy, even though you have no clue what it means. Don't worry, I don't either.<br /><br />
+
+      So what you want to do now is Create a Database for installing IPB. Login to your MySQL control panel (only your host can give you this information). A database requires only three pieces of information to be created: a name, your username, and a password. As simple as that.<br /><br />
+
+      So create a database named "iAm_moocher" or whatever you want to call it, then supply a username and password. Record this information, because if you lose it, you will be screwed. Write it on a piece of paper and tape it to your monitor if you have to, just don't lose that login information.<br /><br />
+
+      Now that you have created your database, you can check on the contents being uploaded to your site. Everything should have completed now, but if it didn't, you'll have to wait. Once everything has finished uploading, you'll have to do some CHMOD'ing.<br /><br />
+
+      <b>Changing And Modifying (CHMOD) File Permissions</b><br />
+      Don't panic, young squire. CHMOD means "change/modify directory permissions", or something like that. And what I mean by permissions is basically who can access your files. You can change permissions of files so that only you can read, write, and execute specific files, or so that everyone can read, write, or execute files.<br /><br />
+
+      CHMOD'ing is defined using three octal number components that specify access limitations for the owner, the owner's user group, and to the general public not currently in the owner's user group. Each component can be calculated by adding up the required permissions for each target user base. The number 1 allows you to execute, the number 2 allows you to write, and the number 4 allows you to read. Adding up these number values reveal the allowed rights. For example, to allow a sort of "administration" perspective on a file, you want to enable the file to be readable, writeable, and executable. By adding up the numbers 4, 2, and 1 respectively, you are given the number 7. If you allow the owner, user group, and public "administration" rights, you are given the three-digit of "777". The table below is an example of how this system of file permissions is set up:<br /><br />
+
+      <form name="chmod">
+        <input name="h_owner" type="hidden" value="" />
+        <input name="h_group" type="hidden" value="" />
+        <input name="h_other" type="hidden" value="" />
+
+      <table width="90%" align="center" border="1" cellspacing="0" cellpadding="2">
+        <tr align="center">
+          <td>
+            <b>Permission</b>
+          </td>
+            <td>
+              Owner
+            </td>
+              <td>
+                Group
+              </td>
+                <td>
+                  Public
+                </td>
+        </tr>
+        <tr align="center">
+          <td>
+            Read
+          </td>
+            <td>
+              <input type="checkbox" name="owner4" value="4" onclick="calculator('owner',4)" />
+            </td>
+              <td>
+                <input type="checkbox" name="group4" value="4" onclick="calculator('group', 4)" />
+              </td>
+                <td>
+                  <input type="checkbox" name="other4" value="4" onclick="calculator('other', 4)" />
+                </td>
+        </tr>
+        <tr align="center">
+          <td>
+            Write
+          </td>
+            <td>
+              <input type="checkbox" name="owner2" value="2" onclick="calculator('owner', 2)" />
+            </td>
+              <td>
+                <input type="checkbox" name="group2" value="2" onclick="calculator('group', 2)" />
+              </td>
+                <td>
+                  <input type="checkbox" name="other2" value="2" onclick="calculator('other', 2)" />
+                </td>
+        </tr>
+        <tr align="center">
+          <td>
+            Execute
+          </td>
+            <td>
+              <input type="checkbox" name="owner1" value="1" onclick="calculator('owner', 1)" />
+            </td>
+              <td>
+                <input type="checkbox" name="group1" value="1" onclick="calculator('group', 1)" />
+              </td>
+                <td>
+                  <input type="checkbox" name="other1" value="1" onclick="calculator('other', 1)" />
+                </td>
+        </tr>
+        <tr align="center">
+          <td colspan="4">
+            <b>Numerical Code:</b>
+            <input type="text" name="t_owner" value="" size="1" />
+            <input type="text" name="t_group" value="" size="1" />
+            <input type="text" name="t_other" value="" size="1" />
+          </td>
+        </tr>
+      </table>
+      </form>
+
+      So IPB will require you to change some file permissions on several files and folders in order to allow the automatic installer to write to all files and enable administration and user-level access. In order to install IPB using the self-installer, you will need to change file permissions for several files. View the Installation Guide provided by Invision Power for the permissions you need to set on the files. After all, this is only a guide to Invision Power's guide, so I'm not going to waste time entering more information that you can already find in their guide.<br /><br />
+
+      So after you've changed those necessary file permissions, refer to this checklist and ensure that you completed each task:<br />
+      - Uploaded all files in the "upload" folder<br />
+      - Created a MySQL database<br />
+      - CHMOD'ing of specific files<br /><br />
+
+      Once this is all out of the way, it's time to begin the installation.<br /><br />
+
+      <b>Automatic Installer</b><br />
+      You can access IPB's built-in installer that will build your configuration file and all tables in your database automatically. You must, however, ensure that all information you enter in the fields are correct.<br /><br />
+
+      Begin by running the installer directly from your Web browser. Type in <b>http://www.yoursite.com/forum/install/index.php</b>, but ensure that you replace the "www.yoursite.com" with your own URL.<br /><br />
+
+      The installer will present you with critical information, and it will also verify that specific files are correctly CHMOD'ed. Click the "Proceed" button to reach the next step.<br /><br />
+
+      This page will ask you for your MySQL database information. Enter all required information in the fields using the MySQL database you just created. For the "host" field, enter "localhost". For the "database name" field, enter the name of the database you just created. For the "username" and "password" fields, enter your username and password for your MySQL database. Scroll down further and enter your administration username and password for your Forum. Ensure that you do not forget your login information, or else you'll have to start over from scratch, as you cannot get into the Administration Control Panel. Once you have entered all information correctly, click next to reach the self-install pages.<br /><br />
+
+      These next pages that you cycle through will automatically create IPB and write information into your database. After you have reached the last step, you will receive a warning to delete the install directory you used to install IPB. It is highly recommended that you do, because people can write over all your information through it. Go back into your FTP client and delete the installer files, and then go back to your Web browser and click the "proceed" button to launch your board. DO NOT REFRESH THE PAGE.<br /><br />
+
+      <b>Administration Control Panel</b><br />
+      You can now login to your Forum using that login information you just created in the Forum installer. Once you are logged in as the administrator, click the "Admin CP" link found in the navigation bar to login and edit your board's configuration.<br /><br />
+
+      Play around and have some fun with your new IPB board!
+    </td>
+  </tr>
+</table>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/readme.html b/readme.html
index 901668d2..fd75c1cd 100644
--- a/readme.html
+++ b/readme.html
@@ -1,5 +1,5 @@
 <html>
-<head><title>Invision Power Board Welcome</title>
+<head><title>Invision Power Board Welcome v2</title>
 <style type='text/css'>
 
 BODY		          	
@@ -63,8 +63,8 @@ a:hover                      { color:#333377;text-decoration:underline }
 <table align="center" width="750" cellpadding="15" cellspacing="0" bgcolor='#FFFFF' style='border:1px solid #000'>
 <tr>
  <td align='left'>
-   <h1>Welcome to Invision Power Board 1.3.1</h1>
-   Welcome to Invision Power Board, a fast, efficient, scalable community solution written in PHP and using MySQL for database storage.
+   <h1>Welcome to Invision Power Board 2.0.0 Final</h1>
+   Welcome to Invision Power Board, a fast, efficient, scalable community solution.
    <br />Please follow the relevant section below to get started.
    <h2>New Installations</h2>
    If you're installing Invision Power Board for the first time, then you simply need to follow the directions in our
@@ -73,20 +73,13 @@ a:hover                      { color:#333377;text-decoration:underline }
    <h2>Updating your IPB</h2>
    If you're updating your IPB, then please do the following:
    <ul>
+    <li><strong>UPGRADING FROM IPB 1.1, 1.2 or 1.3(.1)? <a href='Documentation/upgradefromipb_1x.html'>READ ME INSTEAD!</a></strong></li>
     <li><a href='readme.html#changes'>Read the changed files section</a> and update the specified files.</li>
-    <!--run_updater-->
-	<li>Update your skin files by doing the following.
-	  <ul>
-	   <li>Log into your Admin CP</li>
-	   <li>Click on the Skins & Templates Menu and then "HTML Templates"</li>
-	   <li>If you want to back up the templates first, click on the "Export" link underneath each HTML template set name.</li>
-	   <li>Resynchronise the HTML template database by using the resynchronise tool at the bottom of the page.</li>
-	   <li>Repeat the resynchronization for each skin you have to make sure that your database is fully up-to-date.</li>
-	   <li>Click on "Skin Version Controller" in the left hand menu</li>
-	   <li>Follow the instructions to update your skins to the latest versions</li>
-	  </ul>
-    </li>
-    <li>Remove any sm_install.php and upgrade.php files you may have used.
+    <li>Make sure your "upgrade" folder is up to date by uploading any "upg_*" folders from the zip that are missing in your
+    installation. For example, if you had the folders "upg_20001" and "upg_20002" and the zip had those folders plus: "upg_20003"
+    and "upg_20004" - upload "upg_20003" and "upg_20004" from the zip archive to your "upgrade" folder in your IPB installation.
+	<li>Run the upgrade system by accessing "upgrade/index.php" on your system (for example: www.domain.com/forum/upgrade/index.php)
+	this will determine which upgrade modules need to be run and will rebuild your templates for you.
    </ul>
   </td>
  </tr>
@@ -104,9 +97,10 @@ a:hover                      { color:#333377;text-decoration:underline }
    <br /><br />
    <b>Source Files</b>
    <ul>
+     <li><b>ipb_templates.xml</b>  (very important)</li>
      <li><b>index.php</b>  (very important)</li>
      <li><b>admin.php</b>  (very important)</li>
-     <li>sources/calendar.php </li><li>sources/online.php </li><li>sources/search.php </li>
+     <li>sources/<span style="color:blue">admin</span>/ad_skintools.php </li><li>sources/<span style="color:blue">admin</span>/ad_stylesets.php </li><li>sources/<span style="color:blue">admin</span>/ad_stylesheets.php </li><li>sources/calendar.php </li><li>sources/<span style="color:blue">classes</span>/class_display.php </li><li>sources/functions.php </li><li>sources/<span style="color:blue">lib</span>/boardstats_functions.php </li><li>sources/<span style="color:blue">lib</span>/msg_functions.php </li><li>sources/<span style="color:blue">lib</span>/usercp_functions.php </li><li>sources/<span style="color:blue">misc</span>/print_page.php </li><li>sources/<span style="color:blue">misc</span>/warn.php </li><li>sources/moderate.php </li><li>sources/<span style="color:blue">sql</span>/mysql_queries.php </li><li>sources/topics.php </li><li>sources/usercp.php </li>
    </ul>
    <b>Language Files</b>
    <ul>
@@ -114,7 +108,7 @@ a:hover                      { color:#333377;text-decoration:underline }
    </ul>
    <b>Other Files</b>
    <ul>
-    
+    <li>upgrade/upg_20002/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20003/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20004/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20005/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20006/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20007/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20008/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20009/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li><li>upgrade/upg_20010/* <span style='color:gray;font-size:10px'>(Folder and contents: if folder is not already installed)</span> </li>
    </ul>
    <br />
    <span style='font-size:10px'>* Denotes a new file</span>
@@ -131,7 +125,7 @@ a:hover                      { color:#333377;text-decoration:underline }
    Please note that these bug fixes are only relevant to update from the last release.
    <br /><br />
    <ul>
-   
+   <li><a href='http://forums.invisionpower.com/index.php?showtopic=145494'>#145494</a> [ACP] Backslashes removed from style sheets when re-editing</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=145693'>#145693</a> [MSG] Member&#39;s of multiple groups don&#39;t get correct PM quota</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146457'>#146457</a> [IPB Portal] Cosmetic bugs</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146497'>#146497</a> Incomplete CACHE_PATH usage</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146561'>#146561</a> Printable Version: various bugs</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146639'>#146639</a> Card button missing for guest browsers</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146642'>#146642</a> Downloadable members card doesn&#39;t have correct CSS</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146705'>#146705</a> [CALENDAR] Weird behaviour with year dropdown box</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146821'>#146821</a> BBCode SIZE and COLOUR not giving accurate results due to overriding CSS class</li><li><a href='http://forums.invisionpower.com/index.php?showtopic=146931'>#146931</a> Un-approving last posted in topic doesn&#39;t remove it from forum view</li>
    </ul>
   </td>
  </tr>
diff --git a/upload/Skin/s1/skin_boards.php b/upload/Skin/s1/skin_boards.php
deleted file mode 100644
index 4d14817b..00000000
--- a/upload/Skin/s1/skin_boards.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-
-class skin_boards {
-
-function whoschatting_show($total, $names, $link, $txt) {
-global $ibforums;
-return <<<EOF
-        <tr>
-           <td class='pformstrip' colspan='2'>{$total} {$ibforums->lang['whoschatting_total']} <a href='$link'>{$ibforums->lang['whoschatting_loadchat']}</a></td>
-    	</tr>
-    	<tr>
-          <td width="5%" class='row2'><{F_ACTIVE}></td>
-          <td class='row4' width='95%'>
-            {$names}<div class='desc' style='margin-top:5px'>$txt</div>
-          </td>
-        </tr>
-EOF;
-}
-
-function whoschatting_empty($link) {
-global $ibforums;
-return <<<EOF
-        <tr>
-           <td class='pformstrip' colspan='2'>{$ibforums->lang['whoschatting_total']} <a href='$link'>{$ibforums->lang['whoschatting_loadchat']}</a></td>
-    	</tr>
-    	<tr>
-          <td width="5%" class='row2'><{F_ACTIVE}></td>
-          <td class='row4' width='95%'>
-            <i>{$ibforums->lang['whoschatting_none']}</i>
-          </td>
-        </tr>
-EOF;
-}
-
-function whoschatting_inline_link() {
-global $ibforums;
-return <<<EOF
-{$ibforums->base_url}act=chat
-EOF;
-}
-
-function whoschatting_popup_link() {
-global $ibforums;
-return <<<EOF
-javascript:chat_pop({$ibforums->vars['chat_width']}, {$ibforums->vars['chat_height']});
-EOF;
-}
-
-function active_list_sep() {
-global $ibforums;
-return <<<EOF
-,
-EOF;
-}
-
-
-function stats_header() {
-global $ibforums;
-return <<<EOF
-<!-- Board Stats -->
-	<!--IBF.QUICK_LOG_IN-->
-    <br />
-	<div align='center'>
-		<a href='{$ibforums->base_url}act=Stats&amp;CODE=leaders'>{$ibforums->lang['sm_forum_leaders']}</a> |
-		<a href='{$ibforums->base_url}act=Search&amp;CODE=getactive'>{$ibforums->lang['sm_todays_posts']}</a> |
-		<a href='{$ibforums->base_url}act=Stats'>{$ibforums->lang['sm_today_posters']}</a> |
-		<a href='{$ibforums->base_url}act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc'>{$ibforums->lang['sm_all_posters']}</a>
-	</div>
-    <br />
-	<div class="tableborder">
-		<div class="maintitle">{$ibforums->lang['board_stats']}</div>
-		<table cellpadding='4' cellspacing='1' border='0' width='100%'>
-EOF;
-}
-
-function ActiveUsers($active) {
-global $ibforums;
-return <<<EOF
-        <tr>
-           <td class='pformstrip' colspan='2'>$active[TOTAL] {$ibforums->lang['active_users']}</td>
-    	</tr>
-    	<tr>
-          <td width="5%" class='row2'><{F_ACTIVE}></td>
-          <td class='row4' width='95%'>
-            <b>{$active[GUESTS]}</b> {$ibforums->lang['guests']}, <b>$active[MEMBERS]</b> {$ibforums->lang['public_members']} <b>$active[ANON]</b> {$ibforums->lang['anon_members']}
-            <div class='thin'>{$active[NAMES]}</div>
-            {$active['links']}
-          </td>
-        </tr>
-        <!--IBF.WHOSCHATTING-->
-EOF;
-}
-
-function active_user_links() {
-global $ibforums;
-return <<<EOF
-{$ibforums->lang['oul_show_more']} <a href='{$ibforums->base_url}act=Online&amp;CODE=listall&amp;sort_key=click'>{$ibforums->lang['oul_click']}</a>, <a href='{$ibforums->base_url}act=Online&amp;CODE=listall&amp;sort_key=name&amp;sort_order=asc&amp;show_mem=reg'>{$ibforums->lang['oul_name']}</a>
-EOF;
-}
-
-function ShowStats($text) {
-global $ibforums;
-return <<<EOF
-		   <tr>
-		     <td class='pformstrip' colspan='2'>{$ibforums->lang['board_stats']}</td>
-		   </tr>
-		   <tr>
-			 <td class='row2' width='5%' valign='middle'><{F_STATS}></td>
-			 <td class='row4' width="95%" align='left'>$text<br />{$ibforums->lang['most_online']}</td>
-		   </tr>
-EOF;
-}
-
-function birthdays($birthusers="", $total="", $birth_lang="") {
-global $ibforums;
-return <<<EOF
-        <tr>
-           <td class='pformstrip' colspan='2'>{$ibforums->lang['birthday_header']}</td>
-    	</tr>
-    	<tr>
-          <td class='row2' width='5%' valign='middle'><{F_ACTIVE}></td>
-          <td class='row4' width='95%'><b>$total</b> $birth_lang<br />$birthusers</td>
-        </tr>
-EOF;
-}
-
-
-
-function calendar_events($events = "") {
-global $ibforums;
-return <<<EOF
-        <tr>
-           <td class='pformstrip' colspan='2'>{$ibforums->lang['calender_f_title']}</td>
-    	</tr>
-    	<tr>
-          <td class='row2' width='5%' valign='middle'><{F_ACTIVE}></td>
-          <td class='row4' width='95%'>$events</td>
-        </tr>
-EOF;
-}
-
-function stats_footer() {
-global $ibforums;
-return <<<EOF
-         </table>
-	 </div>
-    <!-- Board Stats -->
-EOF;
-}
-
-function bottom_links() {
-global $ibforums;
-return <<<EOF
-   <br />
-   <div align='right'><a href="{$ibforums->base_url}act=Login&amp;CODE=06">{$ibforums->lang['d_delete_cookies']}</a> &middot; <a href="{$ibforums->base_url}act=Login&amp;CODE=05">{$ibforums->lang['d_post_read']}</a></div>
-EOF;
-}
-
-          
-function CatHeader_Expanded($Data) {
-global $ibforums;
-return <<<EOF
-	<div class="tableborder">
-	  <div class='maintitle' align='left'><{CAT_IMG}>&nbsp;<a href="{$ibforums->base_url}c={$Data['id']}">{$Data['name']}</a></div>
-      <table width="100%" border="0" cellspacing="1" cellpadding="4">
-        <tr> 
-          <th align="center" width="2%" class='titlemedium'><img src="{$ibforums->vars['img_url']}/spacer.gif" alt="" width="28" height="1" /></th>
-          <th align="left" width="59%" class='titlemedium'>{$ibforums->lang['cat_name']}</th>
-          <th align="center" width="7%" class='titlemedium'>{$ibforums->lang['topics']}</th>
-          <th align="center" width="7%" class='titlemedium'>{$ibforums->lang['replies']}</th>
-          <th align="left" width="25%" class='titlemedium'>{$ibforums->lang['last_post_info']}</th>
-        </tr>
-EOF;
-}
-
-
-
-function subheader() {
-global $ibforums;
-return <<<EOF
-    <br />
-	<div class="tableborder">
-	  <table width="100%" border="0" cellspacing="1" cellpadding="4">
-	  <tr> 
-		<td align="center" class='titlemedium'><img src="{$ibforums->vars['img_url']}/spacer.gif" alt="" width="28" height="1" /></td>
-		<th align='left' width="59%" class='titlemedium'>{$ibforums->lang['cat_name']}</th>
-		<th align="center" width="7%" class='titlemedium'>{$ibforums->lang['topics']}</th>
-		<th align="center" width="7%" class='titlemedium'>{$ibforums->lang['replies']}</th>
-		<th align='left' width="27%" class='titlemedium'>{$ibforums->lang['last_post_info']}</th>
-	  </tr>
-EOF;
-}
-
-function end_this_cat() {
-global $ibforums;
-return <<<EOF
-         <tr> 
-          <td class='darkrow2' colspan="5">&nbsp;</td>
-        </tr>
-      </table>
-    </div>
-    <br />
-EOF;
-}
-
-function end_all_cats() {
-global $ibforums;
-return <<<EOF
-	
-EOF;
-}
-
-function newslink( $fid="", $title="", $tid="" ) {
-global $ibforums;
-return <<<EOF
-<b>{$ibforums->vars['board_name']} {$ibforums->lang['newslink']} <a href='{$ibforums->base_url}showtopic=$tid'>$title</a></b><br />
-EOF;
-}
-
-function PageTop($lastvisit) {
-global $ibforums;
-return <<<EOF
-	<div align='left' style='text-align:left;padding-bottom:4px'>
-		<!-- IBF.NEWSLINK -->{$ibforums->lang['welcome_back_text']} $lastvisit
-	</div>
-EOF;
-}
-
-function quick_log_in() {
-global $ibforums;
-return <<<EOF
-<form style='display:inline' action="{$ibforums->base_url}act=Login&amp;CODE=01&amp;CookieDate=1" method="post">
-<div align='right'><strong>{$ibforums->lang['qli_title']}</strong>
-<input type="text" class="forminput" size="10" name="UserName" onfocus="this.value=''" value="{$ibforums->lang['qli_name']}" />
-<input type='password' class='forminput' size='10' name='PassWord' onfocus="this.value=''" value='ibfrules' />
-<input type='submit' class='forminput' value='{$ibforums->lang['qli_go']}' />
-</div>
-</form>
-EOF;
-}
-
-function forum_img_with_link($img, $id) {
-global $ibforums;
-return <<<EOF
-<a href='{$ibforums->base_url}act=Login&amp;CODE=04&amp;f={$id}' title='{$ibforums->lang['bi_markread']}'>{$img}</a>
-EOF;
-}
-
-function subforum_img_with_link($img, $id) {
-global $ibforums;
-return <<<EOF
-<a href='{$ibforums->base_url}act=Login&amp;CODE=04&amp;f={$id}&amp;i=1' title='{$ibforums->lang['bi_markallread']}'>{$img}</a>
-EOF;
-}
-
-
-function ForumRow($info) {
-global $ibforums;
-return <<<EOF
-        <tr> 
-          <td class="row4" align="center">{$info['img_new_post']}</td>
-          <td class="row4"><b><a href="{$ibforums->base_url}showforum={$info['id']}">{$info['name']}</a></b><br /><span class='desc'>{$info['description']}<br />{$info['moderator']}</span></td>
-          <td class="row2" align="center">{$info['topics']}</td>
-          <td class="row2" align="center">{$info['posts']}</td>
-          <td class="row2" nowrap="nowrap">{$info['last_post']}<br />{$ibforums->lang['in']}:&nbsp;{$info['last_unread']}{$info['last_topic']}<br />{$ibforums->lang['by']}: {$info['last_poster']}</td>
-        </tr>
-EOF;
-}
-
-function forum_redirect_row($info) {
-global $ibforums;
-return <<<EOF
-    <!-- Forum {$info['id']} entry -->
-        <tr> 
-          <td class="row4" align="center"><{BR_REDIRECT}></td>
-          <td class="row4"><b><a href="{$ibforums->base_url}showforum={$info['id']}" {$info['redirect_target']}>{$info['name']}</a></b><br /><span class='desc'>{$info['description']}</span></td>
-          <td class="row2" align="center">-</td>
-          <td class="row2" align="center">-</td>
-          <td class="row2">{$ibforums->lang['rd_hits']}: {$info['redirect_hits']}</td>
-        </tr>
-    <!-- End of Forum {$info['id']} entry -->
-EOF;
-}
-
-function forumrow_lastunread_link($fid, $tid) {
-global $ibforums;
-return <<<EOF
-<a href='{$ibforums->base_url}showtopic=$tid&amp;view=getlastpost' title='{$ibforums->lang['tt_golast']}'><{LAST_POST}></a>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_buddy.php b/upload/Skin/s1/skin_buddy.php
deleted file mode 100644
index da1a5249..00000000
--- a/upload/Skin/s1/skin_buddy.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-class skin_buddy {
-
-
-function buddy_js() {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
- function redirect_to(where, closewin)
- {
- 	opener.location= '$ibforums->base_url' + where;
- 	
- 	if (closewin == 1)
- 	{
- 		self.close();
- 	}
- }
- 
- function check_form(helpform)
- {
- 	opener.name = "ibfmain";
- 
- 	if (helpform == 1) {
- 		document.theForm2.target = 'ibfmain';
- 	} else {
- 		document.theForm.target = 'ibfmain';
- 	}
- 	
- 	return true;
- }
- 
- function shrink()
- {
- 	window.resizeTo('200','75');
- }
- 
- function expand()
- {
- 	window.resizeTo('200','450');
- }
- 
- 
- //-->
- </script>
- 
-EOF;
-}
-
-
-function build_away_msg() {
-global $ibforums;
-return <<<EOF
-
-	{$ibforums->lang['new_posts']}
-	<br />
-	{$ibforums->lang['my_replies']}
- 
-EOF;
-}
-
-function append_view($url="") {
-global $ibforums;
-return <<<EOF
-	( <b><a href='javascript:redirect_to("$url", 0)'>{$ibforums->lang['view_link']}</a></b> )
-EOF;
-}
-
-
-function main($away_text="") {
-global $ibforums;
-return <<<EOF
-<div id="ucpcontent">
- <div class="titlemedium" align="center">{$ibforums->lang['page_title']}&nbsp;&nbsp;&nbsp;[ <a href='javascript:shrink()' style='text-decoration:none'>-</a>&nbsp;&nbsp;<a href='javascript:expand()' style='text-decoration:none'>+</a> ]</div>
- <div class="pformstrip" align="center">{$ibforums->lang['while_away']}</div>
- <p>{$away_text}</p>
- <div class="pformstrip" align="center">{$ibforums->lang['show_me']}</div>
- <p>
-	&middot;&nbsp;<a href='javascript:redirect_to("&amp;act=Stats&amp;CODE=leaders",0)'>{$ibforums->lang['sm_forum_leaders']}</a>
-	<br />&middot;&nbsp;<a href='javascript:redirect_to("&amp;act=Search&amp;CODE=getactive",0)'>{$ibforums->lang['sm_todays_posts']}</a>
-	<br />&middot;&nbsp;<a href='javascript:redirect_to("&amp;act=Stats",0)'>{$ibforums->lang['sm_today_posters']}</a>
-	<br />&middot;&nbsp;<a href='javascript:redirect_to("&amp;act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc",0)'>{$ibforums->lang['sm_all_posters']}</a>
-	<br />&middot;&nbsp;<a href='javascript:redirect_to("&amp;act=Search&amp;CODE=lastten",0)'>{$ibforums->lang['sm_my_last_posts']}</a>
- </p>
- <div class="pformstrip" align="center">{$ibforums->lang['search_forums']}</div>
- <div align="center">
- <p>
- <form action="{$ibforums->base_url}act=Search&amp;CODE=01&amp;forums=all&amp;cat_forum=forum&amp;joinname=1&amp;search_in=posts&amp;result_type=topics" method="post" name='theForm' onsubmit='return check_form();'>
-  <input type='text' size='17' name='keywords' class='forminput' />&nbsp;<input type='submit' value='{$ibforums->lang['go']}' />
- </form>
- </p>
- </div>
- 
- <div class="pformstrip" align="center">{$ibforums->lang['search_help']}</div>
- <div align="center">
- <p>
- <form action="{$ibforums->base_url}act=Help&amp;CODE=02" method="post" name='theForm2' onsubmit='return check_form(1);'>
-  <input type='text' size='17' name='search_q' class='forminput' />&nbsp;<input type='submit' value='{$ibforums->lang['go']}' />
- </form>
- </p>
- </div>
-</div>
-<div align="center"><!--CLOSE.LINK--></div>
-EOF;
-}
-
-
-
-function login() {
-global $ibforums;
-return <<<EOF
-
-<form action="{$ibforums->base_url}act=Login&amp;CODE=01&amp;CookieDate=1&amp;buddy=1" method="post" name='theForm' onSubmit='return check_form();'>
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['page_title']}</div>
- <div class='pformstrip'>{$ibforums->lang['log_in_needed']}</div>
- <div class='tablepad'>
-  {$ibforums->lang['no_guests']}
-  <br /><br />
-  <center>
-  <b>{$ibforums->lang['log_in']}</b>
-  <br /><br />
-  {$ibforums->lang['lin_name']}<br /><input type='text' name='UserName' class='forminput'>
-  <br />
-  {$ibforums->lang['lin_pass']}<br /><input type='password' name='PassWord' class='forminput'>
-  <br />
-  <input type='submit' value='{$ibforums->lang['log_in']}' class='forminput'>
-  </center>
-  <br /><br />
-  {$ibforums->lang['reg_text']}
-  <br /><br />
-  <center><a href='javascript:redirect_to("&amp;act=Reg", 1);'>{$ibforums->lang['reg_link']}</a></center>
- </div>
-</div>
-<!--CLOSE.LINK-->
-</form>
-
-EOF;
-}
-
-
-function closelink() {
-global $ibforums;
-return <<<EOF
-
-<div align="center">
- [ <a href="javascript:window.location=window.location;">{$ibforums->lang['refresh']}</a> ] | [ <a href='javascript:self.close();'>{$ibforums->lang['close_win']}</a> ]
-</div>
-EOF;
-}
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_calendar.php b/upload/Skin/s1/skin_calendar.php
deleted file mode 100644
index 23d44dd9..00000000
--- a/upload/Skin/s1/skin_calendar.php
+++ /dev/null
@@ -1,444 +0,0 @@
-<?php
-
-class skin_calendar {
-
-function table_top($data) {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type='text/javascript'>
-	<!--
-	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-		if (posleft != 0) { x = posleft }
-		if (postop  != 0) { y = postop  }
-	
-		if (!scroll) { scroll = 1 }
-		if (!resize) { resize = 1 }
-	
-		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-		  X = (screen.width  - width ) / 2;
-		  Y = (screen.height - height) / 2;
-		}
-		if (scroll != 0) { scroll = 1 }
-	
-		var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
-	 }
-
-	function changeDiv(id, method)
-	{
-		var itm = null;
-		if (document.getElementById) {
-			itm = document.getElementById(id);
-		} else if (document.all)     {
-			itm = document.all[id];
-		} else if (document.layers)   {
-			itm = document.layers[id];
-		}
-		
-		if (itm.style)
-		{
-			if ( method == 'show' )
-			{
-				itm.style.display = "";
-			}
-			else
-			{
-				itm.style.display = "none";
-			}
-		}
-		else
-		{
-			itm.visibility = "show";
-		}
-	}
-	
-	function selecttype()
-	{
-		
-		if ( document.REPLIER.eventtype[1].checked == true )
-		{
-			// Ranged date...
-			
-			changeDiv( 'rangeshow', 'show' );
-			changeDiv( 'rangehide', 'none' );
-			changeDiv( 'recurshow', 'none' );
-			changeDiv( 'recurhide', 'show' );
-		}
-		else if ( document.REPLIER.eventtype[2].checked == true )
-		{
-			// Repeating event
-			
-			changeDiv( 'rangeshow', 'none' );
-			changeDiv( 'rangehide', 'show' );
-			changeDiv( 'recurshow', 'show' );
-			changeDiv( 'recurhide', 'none' );
-		}
-		else
-		{
-			changeDiv( 'rangeshow', 'none' );
-			changeDiv( 'rangehide', 'show' );
-			changeDiv( 'recurshow', 'none' );
-			changeDiv( 'recurhide', 'show' );
-		}
-	}
-	
-	function changeColour(BOXid, val)
-	{
-		document.all.BOXid.style.backgroundColor = val;
-	}
-	//-->
-</script>
-
-<table class='tableborder' cellpadding="0" cellspacing="0" width="100%">
-<tr>
- <td class='maintitle' colspan="2">&nbsp;&nbsp;$data</td>
-</tr>
-      
-EOF;
-}
-
-function calendar_end_form($data) {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformstrip' align='center' style='text-align:center' colspan="2"><input type="submit" name="submit" value="$data" tabindex='4' class='forminput'></td>
-</tr>
-</table>
-</form>
-<br />
-<br clear="all" />
-EOF;
-}
-
-function calendar_start_form() {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->base_url}act=calendar&amp;code=addnewevent' method='post' name='REPLIER' onSubmit='return ValidateForm()'>
-EOF;
-}
-
-
-function calendar_start_edit_form($eventid) {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->base_url}act=calendar&amp;code=doedit&amp;eventid=$eventid' method='post' name='REPLIER' onsubmit='return ValidateForm()'>
-EOF;
-}
-
-
-function calendar_event_title($data="") {
-global $ibforums;
-return <<<EOF
-  
-<tr> 
-          <td class="pformleft"><strong>{$ibforums->lang['calendar_title']}</strong></td>
-          <td class="pformright"><input type='text' size='40' maxlength='40' name='event_title' class='forminput' value='$data' /></td>
-        </tr>
-EOF;
-}
-
-
-function calendar_delete_box() {
-global $ibforums;
-return <<<EOF
-<tr> 
-          <td class="row1" width="100%" colspan='2' style='height:40px;border:1px solid black'><input type='checkbox' name='event_delete' value='1'>&nbsp;{$ibforums->lang['calendar_delete_box']}</td>
-        </tr>
-EOF;
-}
-
-
-function calendar_choose_date($days, $months, $years, $end_days, $end_months, $end_years, $recur_days, $recur_unit, $div, $checked, $cols, $recend) {
-global $ibforums;
-return <<<EOF
-<tr> 
-          <td class="pformleft" valign='top'><strong>{$ibforums->lang['calendar_event_date']}</strong></td>
-          <td class="pformright">
-          	<table cellpadding='3'>
-          	<tr>
-          	 <td><input type='radio' name='eventtype' id='single' onclick='selecttype();' class='radiobutton' value='single' {$checked['normal']}><strong><label for='single'>{$ibforums->lang['fv_single']}</label></strong></td>
-          	 <td><select name='e_day' class='forminput'>$days</select>&nbsp;&nbsp;<select name='e_month' class='forminput'>$months</select>&nbsp;&nbsp;<select name='e_year' class='forminput'>$years</select></td>
-          	</tr>
-          	<tr>
-          	 <td><input type='radio' name='eventtype' id='range' onclick='selecttype();' class='radiobutton' value='range'{$checked['range']}><strong><label for='range'>{$ibforums->lang['fv_range']}</label></strong></td>
-          	 <td>
-          	    <div id='rangeshow' style='display:{$div['range_on']}'>
-          	      <table cellpadding='3'>
-          	       <tr>
-          	        <td><strong>{$ibforums->lang['fv_range_ends']}</strong></td>
-          	        <td><select name='end_day' class='forminput'>$end_days</select>&nbsp;&nbsp;<select name='end_month' class='forminput'>$end_months</select>&nbsp;&nbsp;<select name='end_year' class='forminput'>$end_years</select></td>
-          	       </tr>
-          	       <tr>
-          	       	<td><strong>{$ibforums->lang['fv_bgcolor']}</strong></td>
-          	       	<td>{$cols['bg']} <input type='text' name='style' size='5' readonly='readonly' id='stylebg' style='border:2px inset black;' /></td>
-          	       </tr>
-          	       <tr>
-          	       	<td><strong>{$ibforums->lang['fv_font']}</strong></td>
-          	       	<td>{$cols['ft']} <input type='text' name='style2' size='5' readonly='readonly' id='styleft' style='border:2px inset black;' /></td>
-          	       </tr>
-          	      </table>
-          	    </div>
-          	    <div id='rangehide' style='display:{$div['range_off']}'>{$ibforums->lang['fv_hidden']}</div>
-          	 </td>
-          	</tr>
-          	<tr>
-          	 <td><input type='radio' name='eventtype' id='recur'  onclick='selecttype();' class='radiobutton' value='recur' {$checked['recur']}><strong><label for='recur'>{$ibforums->lang['fv_recur']}</label></strong></td>
-          	 <td>
-          	     <div id='recurshow' style='display:{$div['recur_on']}'>
-          	     	<strong>{$ibforums->lang['fv_recur_every']}</strong> <select name='recur_unit' class='forminput'>$recur_unit</select>
-          	     	<strong>{$ibforums->lang['fv_until']}</strong> <select name='recend_day' class='forminput'>{$recend['d']}</select><select name='recend_month' class='forminput'>{$recend['m']}</select>&nbsp;&nbsp;<select name='recend_year' class='forminput'>{$recend['y']}</select>
-          	     </div>
-          	     <div id='recurhide' style='display:{$div['recur_off']}'>{$ibforums->lang['fv_hidden']}</div>
-          	 </td>
-			</tr>
-			</table>
-          </td>
-        </tr>
-EOF;
-}
-
-
-function calendar_event_type($pub_select="", $priv_select="") {
-global $ibforums;
-return <<<EOF
-<tr> 
-          <td class="pformleft"><strong>{$ibforums->lang['calendar_event_type']}</strong></td>
-          <td class="pformright"><select name='e_type' class='forminput'><option value='public'$pub_select>{$ibforums->lang['calendar_type_public']}</option><option value='private'$priv_select>{$ibforums->lang['calendar_type_private']}</option></select></td>
-        </tr>
-EOF;
-}
-
-
-function calendar_admin_group_box($groups) {
-global $ibforums;
-return <<<EOF
-<tr> 
-          <td class="pformleft">{$ibforums->lang['calendar_group_filter']}</td>
-          <td class="pformright"><select name='e_groups[]' class='forminput' size='5' multiple>$groups</select></td>
-        </tr>
-EOF;
-}
-
-
-
-function cal_edit_del_button($id) {
-global $ibforums;
-
-return <<<HTML
-	<div align='right'><a href='javascript:deleteEvent($id)'><{P_DELETE}></a>&nbsp;<a href='{$ibforums->base_url}act=calendar&amp;code=edit&amp;eventid=$id'><{P_EDIT}></a></div>
-HTML;
-}
-
-
-function cal_show_event($event, $member, $event_type, $edit_button="", $type, $date_ends="") {
-global $ibforums;
-
-return <<<HTML
-  <div class='pformstrip'>{$event['title']} ($event_type)</div>
-  <table width="100%" border="0" cellspacing="1" cellpadding="3">
-  <tr>
-   <td class='row4' width='1%' valign='middle' nowrap='nowrap'><span class='normalname'><a href='{$ibforums->base_url}showuser={$member['id']}'>{$member['name']}</a></span></td>
-   <td class='row4' width='99%'><div align='left' style='float:left;width:auto;padding-top:4px;padding-bottom:4px;'><strong>{$ibforums->lang['event_date']} {$event['mday']} {$event['month_text']} {$event['year']}</strong> $date_ends ($type)</div>$edit_button</td>
-  </tr>
-  <tr>
-   <td valign='top' class='row1' nowrap='nowrap'>{$member['avatar']}<span class='postdetails'><br />{$ibforums->lang['group']} {$member['g_title']}<br />{$ibforums->lang['posts']} {$member['posts']}<br />{$ibforums->lang['joined']} {$member['joined']}</span></td>
-   <td valign='top' class='row1'><span class='postcolor'>{$event['event_text']}</span></td>
-  </tr>
-  </table>
-HTML;
-}
-
-function cal_page_events_start() {
-global $ibforums;
-
-return <<<HTML
-<script type='text/javascript'>
-	function deleteEvent(id) {
-		if (confirm('{$ibforums->lang['js_del_1']}')) {
-			 window.location.href = "{$ibforums->base_url}act=calendar&code=delete&e=" + id;
-		 }
-		 else {
-			alert ('{$ibforums->lang['js_del_2']}');
-		} 
-	}
-</script>
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cal_title_events']}</div>
-HTML;
-}
-
-function cal_page_events_end() {
-global $ibforums;
-
-return <<<HTML
-  <div align='center' class='pformstrip'>&lt;&lt; <a href='{$ibforums->base_url}act=calendar&amp;d={$ibforums->input['d']}&amp;m={$ibforums->input['m']}&amp;y={$ibforums->input['y']}'>{$ibforums->lang['back']}</a></div>
-</div>
-HTML;
-}
-
-function cal_birthday_start() {
-global $ibforums;
-
-return <<<HTML
-  <div class='pformstrip'>{$ibforums->lang['cal_birthdays']}</div>
-  <div class='tablepad'>
-   <ul>	
-HTML;
-}
-
-function cal_birthday_entry($uid, $uname, $age="") {
-global $ibforums;
-
-return <<<HTML
-		<li><a href='{$ibforums->base_url}showuser=$uid'>$uname</a> ($age)</li>
-HTML;
-}
-
-
-function cal_birthday_end() {
-global $ibforums;
-
-return <<<HTML
-   </ul>
-  </div>
-HTML;
-}
-
-
-
-function cal_main_content($month, $year, $prev, $next) {
-global $ibforums;
-
-return <<<HTML
-
-<form action='{$ibforums->base_url}act=calendar' method='post'>
-<div align='left' id='calendarname'><a href='{$ibforums->base_url}act=calendar&amp;code=newevent' title='{$ibforums->lang['post_new_event']}'><{CAL_NEWEVENT}></a> <span style='position:relative;top:3px'>$month $year</span></div>
-<br />
-<div class='tableborder'>
-  <div class='maintitle'>
-    <div align='center'>
-      &lt; <a href='{$ibforums->base_url}act=calendar&amp;m={$prev['month_id']}&amp;y={$prev['year_id']}'>{$prev['month_name']} {$prev['year_id']}</a>
-      &middot; {$ibforums->lang['table_title']} &middot;
-	   <a href='{$ibforums->base_url}act=calendar&amp;m={$next['month_id']}&amp;y={$next['year_id']}'>{$next['month_name']} {$next['year_id']}</a> &gt;
-	</div>
-  </div>
-  <table width="100%" border="0" cellspacing="1" cellpadding="0">
-   <tr>
-	 <!--IBF.DAYS_TITLE_ROW-->
-   
-	 <!--IBF.DAYS_CONTENT-->
-	</tr>
-  </table>
-</div>
-<br />
-<div class='tableborder'>
-  <div class='pformstrip'>
-     <div align='left' style='float:left;width:40%'><a href='{$ibforums->base_url}act=calendar&amp;code=newevent'>{$ibforums->lang['post_new_event']}</a></div>
-  	 <div align='right'><strong>{$ibforums->lang['month_jump']}</strong>&nbsp;<select name='m' class='forminput'><!--IBF.MONTH_BOX--></select>&nbsp;<select name='y' class='forminput'><!--IBF.YEAR_BOX--></select>&nbsp;&nbsp;<input type='submit' value='{$ibforums->lang['form_submit_show']}' class='forminput' /></div>
-  </div>
-</div>
-</form>
-HTML;
-}
-
-function cal_day_bit($day) {
-global $ibforums;
-
-return <<<HTML
-
-	<td width='14%' class='pformstrip'>$day</td>
-HTML;
-}
-
-
-function cal_new_row() {
-global $ibforums;
-
-return <<<HTML
-
-	</tr>
-	<!-- NEW ROW-->
-	<tr>
-	
-HTML;
-}
-
-function cal_blank_cell() {
-global $ibforums;
-
-return <<<HTML
-
-	<td style='height:100px' class='darkrow1'><br /></td>
-	
-HTML;
-}
-
-
-function cal_date_cell($month_day, $events="") {
-global $ibforums;
-
-return <<<HTML
-
-	<td style='height:100px' valign='top' class='row3'>
-	<div class='caldate'>$month_day</div>$events
-	</td>
-	
-HTML;
-}
-
-function cal_date_cell_today($month_day, $events="") {
-global $ibforums;
-
-return <<<HTML
-
-	<td style='height:100px;border:2px;border-style:outset' valign='top' class='row1'>
-	<div class='caldate'>$month_day</div>
-	$events
-	</td>
-	
-HTML;
-}
-
-
-function cal_events_start() {
-global $ibforums;
-
-return <<<HTML
-<div style='padding:2px'>
-	
-HTML;
-}
-
-function cal_events_wrap($link, $text) {
-global $ibforums;
-
-return <<<HTML
-&middot;<strong><a href='{$ibforums->base_url}act=calendar&amp;$link'>$text</a></strong><br />
-HTML;
-}
-
-function cal_events_wrap_range($link, $text, $ft="", $bg="") {
-global $ibforums;
-
-return <<<HTML
-<div style='background-color:$bg;color:$ft;padding:3px;border-top:3px outset $bg;border-bottom:3px outset $bg;'><a href='{$ibforums->base_url}act=calendar&amp;$link' style='color:$ft'>$text</a></div>
-HTML;
-}
-
-function cal_events_wrap_recurring($link, $text) {
-global $ibforums;
-
-return <<<HTML
-&middot; <a href='{$ibforums->base_url}act=calendar&amp;$link' title='{$ibforums->lang['tbt_recur']}'>$text</a><br />
-HTML;
-}
-
-function cal_events_end() {
-global $ibforums;
-
-return <<<HTML
-</div>
-HTML;
-}
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_csite.php b/upload/Skin/s1/skin_csite.php
deleted file mode 100644
index dcd4730a..00000000
--- a/upload/Skin/s1/skin_csite.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-
-class skin_csite {
-
-function rules_link($url="", $title="")
-{
-global $ibforums;
-return <<<EOF
-&nbsp;&middot; <a href="$url">$title</a>
-EOF;
-}
-
-function show_chat_link_inline()
-{
-global $ibforums;
-return <<<EOF
-&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=chat'>{$ibforums->lang['live_chat']}</a>
-EOF;
-}
-
-function show_chat_link_popup()
-{
-global $ibforums;
-return <<<EOF
-&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href="javascript:chat_pop();">{$ibforums->lang['live_chat']}</a>
-EOF;
-}
-
-
-function csite_javascript() {
-global $ibforums;
-return <<<EOF
-<script type="text/javascript">
-<!--
-function buddy_pop() { window.open('{$ibforums->js_base_url}act=buddy','BrowserBuddy','width=200,height=500,resizable=yes,scrollbars=yes'); }
-function chat_pop()  { window.open('{$ibforums->js_base_url}act=chat&pop=1','Chat','width={$ibforums->vars['chat_width']},height={$ibforums->vars['chat_height']},resizable=yes,scrollbars=yes'); }
-//-->
-</script>
-EOF;
-}
-
-function csite_css_inline($css="") {
-global $ibforums;
-return <<<EOF
-<style type='text/css'>
-{$css}
-</style>
-EOF;
-}
-
-function csite_sep_char() {
-global $ibforums;
-return <<<EOF
-,
-EOF;
-}
-
-function csite_css_external($css, $img) {
-global $ibforums;
-return <<<EOF
-<style type='text/css' media="all">
-@import url({$ibforums->vars['board_url']}/css.php?d={$css}_{$img}.css);
-</style>
-EOF;
-}
-
-
-function tmpl_links_wrap($link="", $name="") {
-global $ibforums;
-return <<<EOF
-&middot; <a href='$link' style='text-decoration:none'>$name</a><br />
-EOF;
-}
-
-function tmpl_welcomebox_member($pm_string="",$last_visit="", $name="", $return="") {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['wbox_welcome']}, $name</div>
- <div class='tablepad'>
-  <span class='desc'>$last_visit</span>
-  <br />&middot; <a href="{$ibforums->base_url}act=Search&amp;CODE=getnew" style='text-decoration:none'>{$ibforums->lang['wbox_getnewposts']}</a>
-  <br />&middot; <a href="{$ibforums->base_url}act=UserCP" style='text-decoration:none'>{$ibforums->lang['wbox_mycontrols']}</a>
-  <br />&middot; <a href="javascript:buddy_pop();" style='text-decoration:none'>{$ibforums->lang['wbox_myassistant']}</a>
-  <br />&middot; <a href="{$ibforums->base_url}act=Login&amp;CODE=03&amp;return=$return" style='text-decoration:none'>{$ibforums->lang['wbox_logout']}</a>
- </div>
-</div>
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> <a href='{$ibforums->base_url}&act=Msg'>{$ibforums->lang['pm_title']}</a></div>
- <div class='tablepad'><span class='desc'>$pm_string</span></div>
-</div>
-EOF;
-}
-
-function tmpl_welcomebox_guest($top_string, $return) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}act=Login&amp;CODE=01&amp;CookieDate=1&amp;return=$return" method="post">
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['wbox_welcome']}, {$ibforums->lang['wbox_guest_name']}</div>
- <div class='tablepad'>
- 	<span class='desc'>$top_string</span>
- 	<br /><br />&middot; <strong><a href="{$ibforums->base_url}act=Search&amp;CODE=getactive" style='text-decoration:none'>{$ibforums->lang['wbox_getnewposts']}</a></strong>
- 	<br /><br /><span class='desc'>{$ibforums->lang['wbox_g_username']}</span>
- 	<br /><input type='text' class='textinput' size='15' name='UserName' />
- 	<br /><span class='desc'>{$ibforums->lang['wbox_g_password']}</span>
- 	<br /><input type='password' class='textinput' size='15' name='PassWord' />
- 	<br /><input type='submit' class='textinput' value='{$ibforums->lang['wbox_g_login']}' />
- </div>
-</div>
-</form>
-EOF;
-}
-
-
-function tmpl_search() {
-global $ibforums;
-return <<<EOF
-<br />
-<form action='{$ibforums->base_url}act=Search&amp;CODE=01&amp;forums=all' method='post' name='search'>
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['search_title']}</div>
- <div class='tablepad' align='center'>
-  <input type='text' name='keywords' value='' size='10' class='textinput' /><input type='submit' value='{$ibforums->lang['search_go']}' />
-  <br /><a href='{$ibforums->base_url}act=Search&amp;mode=adv'>{$ibforums->lang['search_advanced']}</a>
- </div>
-</div>
-</form>
-EOF;
-}
-
-function tmpl_sitenav($links) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['links_title']}</div>
- <div class='tablepad'>
-  $links
- </div>
-</div>
-EOF;
-}
-
-function tmpl_affiliates($links) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['aff_title']}</div>
- <div class='tablepad'>
-  $links
- </div>
-</div>
-EOF;
-}
-
-function tmpl_changeskin($select) {
-global $ibforums;
-return <<<EOF
-<br />
-<form action="{$ibforums->vars['dynamiclite']}&amp;s={$ibforums->session_id}&amp;setskin=1" method="post">
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['cskin_title']}</div>
- <div class='tablepad' align="center">
-  <span class='desc'>{$ibforums->lang['cskin_text']}</span>
-  <br />
-  $select
-  <br />
-  <input type='submit' value='{$ibforums->lang['cskin_go']}' />
- </div>
-</div>
-</form>
-EOF;
-}
-
-function tmpl_onlineusers($breakdown, $split, $names) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> <a href="{$ibforums->base_url}act=Online">{$ibforums->lang['online_title']}</a></div>
- <div class='tablepad'>
-  <span class='desc'>$breakdown<br />$split<br />$names</span>
- </div>
-</div>
-EOF;
-}
-
-function tmpl_poll_header($question,$tid) {
-global $ibforums;
-return <<<EOF
-<br />
-<form action="{$ibforums->base_url}act=Poll&amp;t=$tid" method="post">
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> <a href="{$ibforums->base_url}showtopic=$tid">{$ibforums->lang['poll_title']}</a></div>
- <div class='pformstrip'>$question</div>
- <div class='tablepad'>
-EOF;
-}
-
-function tmpl_poll_result_row($votes, $id, $choice, $percent, $width) {
-global $ibforums;
-return <<<EOF
-  $choice
-  <br /><img src='{$ibforums->vars['img_url']}/bar_left.gif' border='0' width='4' height='11' align='middle' alt='' /><img src='{$ibforums->vars['img_url']}/bar.gif' border='0' width='$width' height='11' align='middle' alt='' /><img src='{$ibforums->vars['img_url']}/bar_right.gif' border='0' width='4' height='11' align='middle' alt='' />
-  <br />
-EOF;
-}
-
-function tmpl_poll_choice_row($id, $choice) {
-global $ibforums;
-return <<<EOF
-  <input type='radio' name='poll_vote' value='$id' class='radiobutton' />&nbsp;<strong>$choice</strong>
-  <br />
-EOF;
-}
-
-function tmpl_poll_footer($vote, $total, $tid) {
-global $ibforums;
-return <<<EOF
-  <span class='desc'>
-   &middot; <strong>$total</strong>
-   <br />&middot; $vote
-   <br />&middot; <a href="{$ibforums->base_url}showtopic=$tid">{$ibforums->lang['poll_discuss']}</a>
-  </span>
-  </div>
-</div>
-</form>
-EOF;
-}
-
-function tmpl_poll_vote() {
-global $ibforums;
-return <<<EOF
-<input type='submit' value='{$ibforums->lang['poll_vote']}' class='codebuttons' />
-EOF;
-}
-
-function tmpl_latestposts($posts) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['discuss_title']}</div>
- $posts
-</div>
-EOF;
-}
-
-function tmpl_topic_row($tid, $title, $posts, $views, $mid, $mname, $date) {
-global $ibforums;
-return <<<EOF
-<div class='row2' style='padding:3px'><strong><a href='{$ibforums->base_url}showtopic=$tid' style='text-decoration:none;font-size:10px'>$title</a></strong></div>
-<div class='desc' style='padding:3px'>
- <a href='{$ibforums->base_url}showuser=$mid' style='text-decoration:none'>$mname</a> &#064; $date
- <br />{$ibforums->lang['recent_read']}: $views &nbsp; {$ibforums->lang['recent_comments']}: $posts
-</div>
-EOF;
-}
-
-function tmpl_recentarticles($articles) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}> {$ibforums->lang['recent_title']}</div>
- $articles
-</div>
-EOF;
-}
-
-function tmpl_comment_link($tid) {
-global $ibforums;
-return <<<EOF
-<a href="{$ibforums->base_url}showtopic=$tid&amp;view=getlastpost">{$ibforums->lang['article_comment']}</a>
-EOF;
-}
-
-function tmpl_readmore_link($tid) {
-global $ibforums;
-return <<<EOF
-...<a href="{$ibforums->base_url}showtopic=$tid">{$ibforums->lang['article_readmore']}</a>
-EOF;
-}
-
-function tmpl_articles($articles) {
-global $ibforums;
-return <<<EOF
-$articles
-EOF;
-}
-
-function tmpl_skin_select_top() {
-global $ibforums;
-return <<<EOF
-<select name="skinid" class="forminput" onchange="window.location='{$ibforums->vars['dynamiclite']}&s={$ibforums->session_id}&setskin=1&skinid=' + this.value">
-EOF;
-}
-
-function tmpl_skin_select_row($sid, $name, $used) {
-global $ibforums;
-return <<<EOF
-<option value="$sid" $used>$name</option>
-EOF;
-}
-
-function tmpl_skin_select_bottom() {
-global $ibforums;
-return <<<EOF
-</select>
-EOF;
-}
-
-function tmpl_articles_row($entry, $bottom_string, $read_more, $top_string) {
-global $ibforums;
-return <<<EOF
-<table cellspacing="0" width="100%" class='tableborder'>
-<tr>
- <td class='maintitle' colspan="2"><img src="{$ibforums->vars['img_url']}/cs_page.gif" alt="" border="0" />&nbsp;<a href="{$ibforums->base_url}showtopic={$entry['tid']}">{$entry['title']}</a></td>
-</tr>
-<tr>
- <td class='row2' colspan="2" style='padding:5px'>$top_string</td>
-</tr>
-<tr>
- <td class="post1" width="5%" valign="top" style="padding:5px">{$entry['avatar']}</td>
- <td class="post1" width="95%" valign="top" style="padding:5px">{$entry['post']} $read_more</td>
-</tr>
-<tr>
- <td class='row2' colspan="2" style='padding:5px' align='right'>
-   $bottom_string
-   &nbsp;&nbsp;<a href="{$ibforums->base_url}act=Print&amp;client=printer&amp;f={$entry['forum_id']}&amp;t={$entry['tid']}"><img src="{$ibforums->vars['img_url']}/cs_print.gif" alt="Print" border="0" /></a>
-   <a href="{$ibforums->base_url}act=Forward&amp;f={$entry['forum_id']}&amp;t={$entry['tid']}"><img src="{$ibforums->vars['img_url']}/cs_email.gif" alt="email" border="0" /></a>
- </td>
-</tr>
-</table>
-<br />
-EOF;
-}
-
-function tmpl_wrap_avatar($avatar) {
-global $ibforums;
-return <<<EOF
-$avatar
-EOF;
-}
-
-function tmpl_debug($queries, $time) {
-global $ibforums;
-return <<<EOF
-  <div class='desc'>[ DB Queries: $queries ] [ Execution Time: $time ]</div>
-EOF;
-}
-
-function csite_skeleton_template() {
-global $ibforums;
-return <<<EOF
-<!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" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<meta name="generator" content="IPDynamic Lite">
-	<meta http-equiv="Pragma" content="no-cache">
-	<meta http-equiv="no-cache">
-	<meta http-equiv="Cache-Control" content="no-cache">
-	<title><!--CS.TEMPLATE.TITLE--></title>
-	<!--CS.TEMPLATE.JAVASCRIPT-->
-	<!--CS.TEMPLATE.CSS-->
-</head>
-<body>
-<div id='ipbwrapper'>
-<!--Header-->
-<div id='logostrip'>
-  <a href='{$ibforums->base_url}' title='Board Home'><img src='{$ibforums->vars['img_url']}/logo4.gif' alt='Powered by Invision Power Board' border="0" /></a>
-</div>
-<table width="100%" cellspacing="6" id="submenu">
-<tr>
- <td><a href='{$ibforums->vars['home_url']}'>{$ibforums->vars['home_name']}</a><!--IBF.RULES--></td>
- <td align="right">
-   <img src="{$ibforums->vars['img_url']}/atb_help.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=Help'>{$ibforums->lang['tb_help']}</a>
-   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_search.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=Search&amp;f={$ibforums->input['f']}'>{$ibforums->lang['tb_search']}</a>
-   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_members.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=Members'>{$ibforums->lang['tb_mlist']}</a>
-   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_calendar.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=calendar'>{$ibforums->lang['tb_calendar']}</a>
-   <!--IBF.CHATLINK-->
- </td>
-</tr>
-</table>
-<!--CS.TEMPLATE.LINKS-->
-<!--End Header-->
-<!--Main Content-->
-<table width="100%" class='tableborder' cellspacing="0" cellpadding="6">
-<tr>
- <td width="200" class='row3' valign="top">
-   <!-- LEFT -->
-    <!--CS.TEMPLATE.WELCOMEBOX-->
-    <!--CS.TEMPLATE.SEARCH-->
-    <!--CS.TEMPLATE.SITENAV-->
-    <!--CS.TEMPLATE.CHANGESKIN-->
-    <!--CS.TEMPLATE.ONLINEUSERS-->
-    <!--CS.TEMPLATE.POLL-->
-    <!--CS.TEMPLATE.LATESTPOSTS-->
-    <!--CS.TEMPLATE.RECENTARTICLES-->
-    <!--CS.TEMPLATE.AFFILIATES-->
-   <!--END LEFT-->
-   <br /><img src='{$ibforums->vars['img_url']}/spacer.gif' alt='' width='200' height='1' />
- </td>
- <!--SPACER-->
- <td width="5" class='row3'>&nbsp;</td>
- <td width="90%" class='row3' valign="top">
-   <!--MAIN-->
-    
-    <!--CS.TEMPLATE.ARTICLES-->
-   
-   <!--END MAIN-->
- </td>
-</tr>
-<!--End Main Content-->
-<tr>
- <td colspan='3'  class='row3' align='center'>
- <!--CS.TEMPLATE.COPYRIGHT-->
- <!--CS.TEMPLATE.DEBUG-->
- </td>
-</tr>
-</table>
-<div class='titlemedium'>&nbsp;</div>
-</div>
-</body>
-</html>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_emails.php b/upload/Skin/s1/skin_emails.php
deleted file mode 100644
index 0c36a231..00000000
--- a/upload/Skin/s1/skin_emails.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-class skin_emails {
-
-function board_rules( $title="", $body="") {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
- <div class="pformstrip">$title</div>
- <div class="tablepad">$body</div>
-</div>
-EOF;
-}
-
-
-function errors($data) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['errors_found']}</div>
-  <div class="tablepad"><span class='postcolor'>$data</span></div>
-</div>
-<br />
-EOF;
-}
-
-function chat_inline($acc_no, $lang, $w, $h, $user="",$pass="") {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['chat_title']}</div>
- <div class='tablepad' align='center'>
-  <applet
-	 codebase="http://client.invisionchat.com/current/"
-	 code="Client.class" archive="scclient_$lang.zip"
-	 width=$w height=$h
-	 style='border: 1px solid #000'>
-	 <param name="room" value="$acc_no">
-	 <param name="cabbase" value="scclient_$lang.cab">
-	 <param name="username" value="$user">
-	 <param name="password" value="$pass">
-	 <param name="autologin" value="yes">
-  </applet>
- </div>
-</div>
-<br />
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['chat_help']}</div>
- <div class='tablepad'>
-   {$ibforums->lang['chat_help_text']}
- </div>
-</div>
-EOF;
-}
-
-function chat_pop($acc_no, $lang, $w, $h, $user="",$pass="") {
-global $ibforums;
-return <<<EOF
-<div align='center'>
- <applet
-	codebase="http://client.invisionchat.com/current/"
-	code="Client.class" archive="scclient_$lang.zip"
-	width=$w height=$h
-	style='border: 1px solid <{tbl_border}>'>
-	<param name="room" value="$acc_no">
-	<param name="cabbase" value="scclient_$lang.cab">
-	<param name="username" value="$user">
-	<param name="password" value="$pass">
-	<param name="autologin" value="yes">
- </applet>
-</div>
-EOF;
-}
-
-function report_form($fid, $tid, $pid, $st, $topic_title) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}act=report&amp;send=1&amp;f=$fid&amp;t=$tid&amp;p=$pid&amp;st=$st" method="post" name='REPLIER'>
-<div class='tableborder'>
-  <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['report_title']}</div>
-  <div class='pformstrip'>&nbsp;</div>
-  <table cellpadding='4' cellspacing='1' border='0' width='100%'>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'><b>{$ibforums->lang['report_topic']}</b></td>
-   <td class='row1' width='80%'><a href='{$ibforums->base_url}showtopic=$tid&amp;st=$st&amp;&#35;entry$pid'>$topic_title</a>
-   </td>
-   </tr>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'>{$ibforums->lang['report_message']}</td>
-   <td class='row1' width='80%'><textarea cols='60' rows='12' wrap='soft' name='message' class='textinput'></textarea>
-   </td>
-   </tr>
-  </table>
-  <div align='center' class='pformstrip'><input type="submit" value="{$ibforums->lang['report_submit']}" class='forminput' /></div>
- </div>
-</form>
-EOF;
-}
-
-
-function msn_body($msnname) {
-global $ibforums;
-return <<<EOF
-				
-			  <object classid='clsid:F3A614DC-ABE0-11d2-A441-00C04F795683' codebase='#Version=2,0,0,83' codetype='application/x-oleobject' id='MsgrObj' name='MsgrApp' width='0' height='0'></object>
-			  <object classid='clsid:FB7199AB-79BF-11d2-8D94-0000F875C541' codetype='application/x-oleobject' id='MsgrApp' name='MsgrApp' width='0' height='0'></object>
-              <tr>
-                <td class='row2' align='left'><b>{$ibforums->lang['msn_name']}</b></td>
-                <td class='row2' align='left'><input type='text' name='msnname' value='$msnname' size='40' class='forminput' onMouseOver="this.focus()" onFocus="this.select()"></td>
-              </tr>
-              <tr>
-                <td class='row2' align='center' colspan='2'><a href="javascript:MsgrApp.LaunchIMUI('$msnname');">{$ibforums->lang['msn_send_msg']}</a></td>
-              </tr>
-              <tr>
-                <td class='row2' align='center' colspan='2'><a href="javascript:MsgrApp.LaunchAddContactUI('$msnname');">{$ibforums->lang['msn_add_contact']}</a></td>
-              </tr>
-              
-EOF;
-}
-
-function yahoo_body($yahoo) {
-global $ibforums;
-return <<<EOF
-				
-			  <tr>
-                <td class='row2' align='left'><b>{$ibforums->lang['yahoo_name']}</b></td>
-                <td class='row2' align='left'><input type='text' name='msnname' value='$yahoo' size='40' class='forminput' onMouseOver="this.focus()" onFocus="this.select()"></td>
-              </tr>
-               <tr>
-                <td class='row2' align='left'><b>{$ibforums->lang['yahoo_status']}</b></td>
-                <td class='row2' align='left'><img border=0 src="http://opi.yahoo.com/online?u=$yahoo&amp;m=g&amp;t=2"></td>
-              </tr>
-              <tr>
-                <td class='row2' align='center' colspan='2'><a href="http://edit.yahoo.com/config/send_webmesg?.target=$yahoo&amp;.src=pg">{$ibforums->lang['yahoo_send_msg']}</a></td>
-              </tr>
-              <tr>
-                <td class='row2' align='center' colspan='2'><a href="http://members.yahoo.com/interests?.oc=t&amp;.kw=$yahoo&amp;.sb=1">{$ibforums->lang['yahoo_view_profile']}</a></td>
-              </tr>
-              
-EOF;
-}
-
-
-function icq_body($data) {
-global $ibforums;
-return <<<EOF
-              <form action="http://msg.mirabilis.com/scripts/WWPMsg.dll" METHOD="POST" name="frmPager">
-			      <INPUT TYPE="hidden" NAME="subject" VALUE="From WebPager Panel">
-              <input type="hidden" name="to" value="{$data[UIN]}">
-              <tr>
-                <td class='row2' align='left'><b>{$ibforums->lang['name']}</b></td>
-                <td class='row2' align='left'><input type='text' name='from' value='{$ibforums->member['name']}' size='40' class='forminput' onMouseOver="this.focus()" onFocus="this.select()"></td>
-              </tr>
-              <tr>
-                <td class='row2' align='left'><b>{$ibforums->lang['email']}</b></td>
-                <td class='row2' align='left'><input type='text' name='fromemail' value='{$ibforums->member['email']}' size='40' class='forminput' onMouseOver="this.focus()" onFocus="this.select()"></td>
-              </tr>
-              <tr>
-                <td class='row2' align='left' valign='top'><b>{$ibforums->lang['msg']}</b></td>
-                <td class='row2' align='left'><textarea wrap='virtual' cols='50' rows='12' wrap='soft' name='body' class='textinput' onMouseOver="this.focus()" onFocus="this.select()"></textarea></td>
-              </tr>
-              <tr>
-                <td class='row2' align='center' colspan='2'><input type='submit' value='{$ibforums->lang['submit']}' class='forminput'></td>
-              </tr>
-              </form>
-EOF;
-}
-
-function end_table() {
-global $ibforums;
-return <<<EOF
-            <!-- End content Table -->
-            </table>
-            </td>
-            </tr>
-            <tr>
-            <td class='darkrow1' colspan='2'>&nbsp;</td>
-            </tr>
-            </table>
-EOF;
-}
-
-function pager_header($data) {
-global $ibforums;
-return <<<EOF
-       <table cellpadding='0' cellspacing='0' border='0' width='100%' bgcolor='<{tbl_border}>' align='center'>
-        <tr>
-            <td>
-              <table cellpadding='4' cellspacing='0' border='0' width='100%'>
-                <tr>
-                   <td colspan='2' align='center' class='titlemedium'>{$data[TITLE]}</td>
-EOF;
-}
-
-function aol_body($data) {
-global $ibforums;
-return <<<EOF
-<!-- Begin AIM Remote -->
-<table width='140' align='center'>
-<tr align='right'><td><a href="http://www.aol.co.uk/aim/index.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_man.gif" width=44 height=55 border=0 alt="Download AIM"></a><img src="http://www.aol.co.uk/aim/remote/gr/aimver_topsm.gif" width=73 height=55 border=0 alt="AIM Remote"><br /><a href="aim:goim?screenname={$data['AOLNAME']}&amp;message=Hi.+Are+you+there?"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_im.gif" width=117 height=39 border=0 alt="Send me an Instant Message"></a><br /><a href="aim:addbuddy?screenname={$data['AOLNAME']}"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_bud.gif" width=117 height=39 border=0 alt="Add me to Your Buddy List"></a><br /><a href="http://www.aol.co.uk/aim/remote.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_botadd.gif" width=117 height=23 border=0 alt="Add Remote to Your Page"></a><br /><a href="http://www.aol.co.uk/aim/index.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_botdow.gif" width=117 height=29 border=0 alt="Download AOL Instant Messenger"></a><br /><br /></td></tr></table>
-<!-- End AIM Remote -->
-EOF;
-}
-
-function forward_form($title, $text, $lang) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post" name='REPLIER'>
-<input type='hidden' name='act'  value='Forward'>
-<input type='hidden' name='CODE' value='01'>
-<input type='hidden' name='s'    value='{$ibforums->session_id}'>
-<input type='hidden' name='st'   value='{$ibforums->input['st']}'>
-<input type='hidden' name='f'    value='{$ibforums->input['f']}'>
-<input type='hidden' name='t'    value='{$ibforums->input['t']}'>
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['title']}</div>
- <table cellpadding='4' cellspacing='0' border='0' width='100%'>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'><b>{$ibforums->lang['send_lang']}</b></td>
-   <td class='row1' width='80%'>$lang</td>
-   </tr>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'><b>{$ibforums->lang['to_name']}</b></td>
-   <td class='row1' width='80%'><input type='text' class='forminput' name='to_name' value='' size='30' maxlength='100'></td>
-   </tr>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'><b>{$ibforums->lang['to_email']}</b></td>
-   <td class='row1' width='80%'><input type='text' class='forminput' name='to_email' value='' size='30' maxlength='100'></td>
-   </tr>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'><b>{$ibforums->lang['subject']}</b></td>
-   <td class='row1' width='80%'><input type='text' class='forminput' name='subject' value='{$title}' size='30' maxlength='120'></td>
-   </tr>
-   <tr>
-   <td class='row1' align='left'  width='30%' valign='top'><b>{$ibforums->lang['message']}</b></td>
-   <td class='row1' width='80%'><textarea cols='60' rows='12' wrap='soft' name='message' class='textinput'>{$text}</textarea>
-   </td>
-   </tr>
-  </table>
-  <div align='center' class='pformstrip'><input type="submit" value="{$ibforums->lang['submit_send']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function show_address($data) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['send_email_to']} {$data[NAME]}</div>
-  <div class='tablepad'>{$ibforums->lang['show_address_text']}
-  <br />
-  &gt;&gt;<b><a href="mailto:{$data[ADDRESS]}" class='misc'>{$ibforums->lang['send_email_to']} {$data[NAME]}</a></b>
- </div>
-</div>
-EOF;
-}
-
-function send_form($data) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post" name='REPLIER'>
-<input type='hidden' name='act' value='Mail'>
-<input type='hidden' name='CODE' value='01'>
-<input type='hidden' name='to' value='{$data['TO']}'>
-<div><strong>{$ibforums->lang['imp_text']}</strong></div>
-<br />
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['send_title']}</div>
-  <div class='pformstrip'>{$ibforums->lang['send_email_to']} {$data['NAME']}</div>
-  <table width='100%' cellspacing='1'>
-	<tr>
-	  <td class='pformleftw' valign='top'><b>{$ibforums->lang['subject']}</b></td>
-	  <td class='pformright'><input type='text' name='subject' value='{$data['subject']}' size='50' maxlength='50' class='forminput' /></td>
-	</tr>
-	<tr>
-	  <td class='pformleftw' valign='top'><b>{$ibforums->lang['message']}</b><br /><br />{$ibforums->lang['msg_txt']}</td>
-	  <td class='pformright'><textarea cols='60' rows='12' wrap='soft' name='message' class='textinput'>{$data['content']}</textarea></td>
-	</tr>
-   </table>
-   <div class='pformstrip' align='center'><input type="submit" value="{$ibforums->lang['submit_send']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function sent_screen($member_name) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['email_sent']}</div>
-  <div class='tablepad'>{$ibforums->lang['email_sent_txt']} $member_name</div>
-</div>
-
-EOF;
-}
-
-function forum_jump($data) {
-global $ibforums;
-return <<<EOF
-      <table cellpadding='0' cellspacing='1' border='0' width='<{tbl_width}>' align='center'>
-        <tr>
-            <td align='right'>$data</td>
-        </tr>
-       </table>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_forum.php b/upload/Skin/s1/skin_forum.php
deleted file mode 100644
index 890a0019..00000000
--- a/upload/Skin/s1/skin_forum.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-class skin_forum {
-
-function show_page_jump($total, $pp, $qe) {
-global $ibforums;
-return <<<EOF
-<a href="javascript:multi_page_jump( $total, $pp, '$qe' )" title="{$ibforums->lang['tpl_jump']}">{$ibforums->lang['multi_page_forum']}</a>
-EOF;
-}
-
-
-function Forum_log_in($data) {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->base_url};act=SF&amp;f=$data' method='post'>
-<input type='hidden' name='act' value='SF'>
-<input type='hidden' name='f' value='$data'>
-<input type='hidden' name='L' value='1'>
-<input type='hidden' name='s' value='{$ibforums->session_id}'>
-<div class='tableborder'>
-  <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['need_password']}</div>
-  <div class='tablepad'>{$ibforums->lang['need_password_txt']}</div>
-  <div class='tablepad' style='text-align:center'>
-    <strong>{$ibforums->lang['enter_pass']}</strong>
-    <br />
-    <input type='password' size='20' name='f_password' />
-  </div>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['f_pass_submit']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-function show_sub_link($fid) {
-global $ibforums;
-return <<<EOF
-		&#0124; <a href='{$ibforums->base_url}act=Track&amp;f=$fid&amp;type=forum'>{$ibforums->lang['ft_title']}</a>
-EOF;
-}
-
-function show_mod_link($fid) {
-global $ibforums;
-return <<<EOF
-<br />
-<strong>{$ibforums->lang['post_modq']} <a href='{$ibforums->base_url}act=modcp'>{$ibforums->lang['post_click']}</a></strong>
-EOF;
-}
-
-function PageTop($data) {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
-	function who_posted(tid)
-	{
-		window.open("{$ibforums->js_base_url}act=Stats&CODE=who&t="+tid, "WhoPosted", "toolbar=no,scrollbars=yes,resizable=yes,width=230,height=300");
-	}
-//-->
-</script>
-
-<!--IBF.SUBFORUMS-->
-<!--IBF.MODLINK-->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align='left' width="20%" nowrap="nowrap">{$data['SHOW_PAGES']}</td>
- <td align='right' width="80%"><a href='{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data['id']}'><{A_POST}></a>{$data[POLL_BUTTON]}</td>
-</tr>
-</table>
-<br />
-
-	<form action='{$ibforums->base_url}act=SF&amp;f={$data['id']}&amp;st={$ibforums->input['st']}' method='post'>
-      <div class="tableborder">
-        <div class='maintitle'><{CAT_IMG}>&nbsp;{$data['name']}</div>
-		<table width='100%' border='0' cellspacing='1' cellpadding='4'>
-		  <tr> 
-			<td align='center' class='titlemedium'><img src='{$ibforums->vars['img_url']}/spacer.gif' alt='' width='20' height='1' /></td>
-			<td align='center' class='titlemedium'><img src='{$ibforums->vars['img_url']}/spacer.gif' alt='' width='20' height='1' /></td>
-			<th width='45%' align='left' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_topic_title']}</th>
-			<th width='14%' align='center' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_topic_starter']}</th>
-			<th width='7%' align='center' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_replies']}</th>
-			<th width='7%' align='center' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_hits']}</th>
-			<th width='27%' align='left' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_last_action']}</th>
-		  </tr>
-        <!-- Forum page unique top -->
-EOF;
-}
-
-function TableEnd($data) {
-global $ibforums;
-return <<<EOF
-      </table>
-    
-      <!--IBF.FORUM_ACTIVE-->
-      
-      <div align='center' class='darkrow2' style='padding:4px'>{$ibforums->lang['showing_text']}{$ibforums->lang['sort_text']}&nbsp;<input type='submit' value='{$ibforums->lang['sort_submit']}' class='forminput' /></div>
-	</div>
-</form>
-
-<br />
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align='left' width="20%" nowrap="nowrap">{$data['SHOW_PAGES']}</td>
- <td align='right' width="80%"><a href='{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data['id']}'><{A_POST}></a>{$data[POLL_BUTTON]}</td>
-</tr>
-</table>
-
-<br />
-
-<div align='left' class="wrapmini">
-	<{B_NEW}>&nbsp;&nbsp;{$ibforums->lang['pm_open_new']}
-	<br /><{B_NORM}>&nbsp;&nbsp;{$ibforums->lang['pm_open_no']}
-	<br /><{B_HOT}>&nbsp;&nbsp;{$ibforums->lang['pm_hot_new']}
-	<br /><{B_HOT_NN}>&nbsp;&nbsp;{$ibforums->lang['pm_hot_no']}
-</div>
-
-<div align='left' class="wrapmini">
-	<{B_POLL}>&nbsp;&nbsp;{$ibforums->lang['pm_poll']}
-	<br /><{B_POLL_NN}>&nbsp;&nbsp;{$ibforums->lang['pm_poll_no']}
-	<br /><{B_LOCKED}>&nbsp;&nbsp;{$ibforums->lang['pm_locked']}
-	<br /><{B_MOVED}>&nbsp;&nbsp;{$ibforums->lang['pm_moved']}
-</div>
-
-<div align='right'>
-    <form action='{$ibforums->base_url}' method='post' name='search'>
-	<input type='hidden' name='forums' value='{$data['id']}' />
-	<input type='hidden' name='cat_forum' value='forum' />
-	<input type='hidden' name='act' value='Search' />
-	<input type='hidden' name='joinname' value='1' />
-	<input type='hidden' name='CODE' value='01' />
-	{$ibforums->lang['search_forum']}&nbsp;
-	<input type='text' size='30' name='keywords' class='forminput' value='{$ibforums->lang['enter_keywords']}' onfocus='this.value = "";' /><input type='submit' value='{$ibforums->lang['search_go']}' class='forminput' />
-   </form>
-   <br />
-   <br />
-   {$data[FORUM_JUMP]}
-</div>
-<br />
-<br />
-<div align='center'><a href='{$ibforums->base_url}act=Login&amp;CODE=04&amp;f={$data['id']}'>{$ibforums->lang['mark_as_read']}</a> <!--IBF.SUB_FORUM_LINK--></div>
-<br clear="all" />
-
-
-EOF;
-}
-
-function show_rules($rules) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>{$rules['title']}</div>
-  <div class='tablepad'>{$rules['body']}</div>
-  <div class='pformstrip' align='center'>&gt;&gt;<a href='{$ibforums->base_url}act=SF&amp;f={$rules['fid']}'>{$ibforums->lang['back_to_forum']}</a></div>
-</div>
-EOF;
-}
-
-function page_title($title="", $pages="") {
-global $ibforums;
-return <<<EOF
-<div><span class='pagetitle'>$title</span>$pages</div>
-EOF;
-}
-
-
-
-
-function forum_active_users($active=array()) {
-global $ibforums;
-return <<<EOF
-	  <div class='darkrow2' style='padding:6px'>{$ibforums->lang['active_users_title']} ({$ibforums->lang['active_users_detail']})</div>
-	  <div class='row2' style='padding:6px'>{$ibforums->lang['active_users_members']} {$active['names']}</div>
-EOF;
-}
-
-
-
-function show_no_matches() {
-global $ibforums;
-return <<<EOF
-				<tr> 
-					<td class='row4' colspan='7' align='center'>
-						<br />
-                         <b>{$ibforums->lang['no_topics']}</b>
-						<br /><br />
-					</td>
-        </tr>
-EOF;
-}
-
-
-function who_link($tid, $posts) {
-global $ibforums;
-return <<<EOF
-    <a href='javascript:who_posted($tid);'>$posts</a>
-EOF;
-}
-
-function RenderRow($data) {
-global $ibforums;
-return <<<EOF
-    <!-- Begin Topic Entry {$data['tid']} -->
-    <tr> 
-	  <td align='center' class='row4'>{$data['folder_img']}</td>
-      <td align='center' class='row2'>{$data['topic_icon']}</td>
-      <td class='row4'>
-        {$data['go_new_post']}{$data['prefix']} <a href="{$ibforums->base_url}showtopic={$data['tid']}" title="{$ibforums->lang['topic_started_on']} {$data['start_date']}">{$data['title']}</a>  {$data[PAGES]}
-        <br /><span class='desc'>{$data['description']}</span></td>
-      <td align='center' class='row2'>{$data['starter']}</td>
-      <td align='center' class='row4'>{$data['posts']}</td>
-      <td align='center' class='row2'>{$data['views']}</td>
-      <td class='row2'><span class='desc'>{$data['last_post']}<br /><a href='{$ibforums->base_url}showtopic={$data['tid']}&amp;view=getlastpost'>{$data['last_text']}</a> <b>{$data['last_poster']}</b></span></td>
-    </tr>
-    <!-- End Topic Entry {$data['tid']} -->
-EOF;
-}
-
-function render_pinned_start() {
-global $ibforums;
-return <<<EOF
-    <!-- START PINNED -->
-    <tr>
-      <td align='center' class='darkrow1'>&nbsp;</td>
-      <td align='center' class='darkrow1'>&nbsp;</td>
-	  <td align='left' class='darkrow1' colspan='5' style='padding:6px'><b>{$ibforums->lang['pinned_start']}</b></td>
-    </tr>
-EOF;
-}
-
-function render_pinned_end() {
-global $ibforums;
-return <<<EOF
-    <!-- END PINNED -->
-    <tr>
-      <td align='center' class='darkrow1'>&nbsp;</td>
-      <td align='center' class='darkrow1'>&nbsp;</td>
-	  <td align='left' class='darkrow1' colspan='5' style='padding:6px'><b>{$ibforums->lang['regular_topics']}</b></td>
-    </tr>
-EOF;
-}
-
-
-function render_pinned_row($data) {
-global $ibforums;
-return <<<EOF
-    <!-- Begin Pinned Topic Entry {$data['tid']} -->
-    <tr> 
-	  <td align='center' class='row4'>{$data['folder_img']}</td>
-      <td align='center' class='row2'>{$data['topic_icon']}</td>
-      <td class='row4'>
-       {$data['go_new_post']}<b>{$data['prefix']} <a href='{$ibforums->base_url}showtopic={$data['tid']}' class='linkthru' title='{$ibforums->lang['topic_started_on']} {$data['start_date']}'>{$data['title']}</a></b>  {$data[PAGES]}
-        <br /><span class='desc'>{$data['description']}</span></td>
-      <td align='center' class='row4'>{$data['starter']}</td>
-      <td align='center' class='row4'>{$data['posts']}</td>
-      <td align='center' class='row4'>{$data['views']}</td>
-      <td class='row4'><span class='desc'>{$data['last_post']}<br /><a href='{$ibforums->base_url}showtopic={$data['tid']}&amp;view=getlastpost'>{$data['last_text']}</a> <b>{$data['last_poster']}</b></span></td>
-    </tr>
-    <!-- End Pinned Topic Entry {$data['tid']} -->
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_global.php b/upload/Skin/s1/skin_global.php
deleted file mode 100644
index f39c2d6a..00000000
--- a/upload/Skin/s1/skin_global.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-
-class skin_global {
-
-function pop_up_window($title, $css, $text) {
-global $ibforums;
-return <<<EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
- <head> 
-  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
-  <title>$title</title>
-  $css
- </head>
- <script language='JavaScript' type="text/javascript">
- <!--
- function buddy_pop() { window.open('index.{$ibforums->vars['php_ext']}?act=buddy&s={$ibforums->session_id}','BrowserBuddy','width=250,height=500,resizable=yes,scrollbars=yes'); }
- function chat_pop(cw,ch)  { window.open('index.{$ibforums->vars['php_ext']}?s={$ibforums->session_id}&act=chat&pop=1','Chat','width='+cw+',height='+ch+',resizable=yes,scrollbars=yes'); }
- function multi_page_jump( url_bit, total_posts, per_page )
- {
- pages = 1; cur_st = parseInt("{$ibforums->input['st']}"); cur_page  = 1;
- if ( total_posts % per_page == 0 ) { pages = total_posts / per_page; }
-  else { pages = Math.ceil( total_posts / per_page ); }
- msg = "{$ibforums->lang['tpl_q1']}" + " " + pages;
- if ( cur_st > 0 ) { cur_page = cur_st / per_page; cur_page = cur_page -1; }
- show_page = 1;
- if ( cur_page < pages )  { show_page = cur_page + 1; }
- if ( cur_page >= pages ) { show_page = cur_page - 1; }
-  else { show_page = cur_page + 1; }
- userPage = prompt( msg, show_page );
- if ( userPage > 0  ) {
-	 if ( userPage < 1 )     {    userPage = 1;  }
-	 if ( userPage > pages ) { userPage = pages; }
-	 if ( userPage == 1 )    {     start = 0;    }
-	 else { start = (userPage - 1) * per_page; }
-	 window.location = url_bit + "&st=" + start;
- }
- }
- //-->
- </script>
- <body>
- <div style='text-align:left'>
- $text
- </div>
- </body>
-</html>
-EOF;
-}
-
-
-function make_page_jump($tp="", $pp="", $ub="" ) {
-global $ibforums;
-return <<<EOF
-<a title="{$ibforums->lang['tpl_jump']}" href="javascript:multi_page_jump('$ub',$tp,$pp);">{$ibforums->lang['tpl_pages']}</a>
-EOF;
-}
-
-function signature_separator($sig="") {
-global $ibforums;
-return <<<EOF
-<br /><br />--------------------<br />
-<div class='signature'>$sig</div>
-EOF;
-}
-
-function forum_show_rules_full($rules) {
-global $ibforums;
-return <<<EOF
-    <!-- Show FAQ/Forum Rules -->
-    <div align='left'><{F_RULES}>&nbsp;<b>{$rules['title']}</b><br /><br />{$rules['body']}</div>
-	<br />
-   <!-- End FAQ/Forum Rules -->
-EOF;
-}
-
-function forum_show_rules_link($rules) {
-global $ibforums;
-return <<<EOF
-	<!-- Show FAQ/Forum Rules -->
-	
-    <div align='left'><{F_RULES}>&nbsp;<b><a href='{$ibforums->base_url}act=SR&amp;f={$rules['fid']}'>{$rules['title']}</a></b></div>
-	
-    <!-- End FAQ/Forum Rules -->
-EOF;
-}
-
-function css_inline($css="") {
-global $ibforums;
-return <<<EOF
-<style type='text/css'>
-{$css}
-</style>
-EOF;
-}
-
-function css_external($css, $img) {
-global $ibforums;
-return <<<EOF
-<style type='text/css' media="all">
-@import url(css.php?d={$css}_{$img}.css);
-</style>
-EOF;
-}
-
-function Member_bar($msg, $ad_link, $mod_link, $val_link) {
-global $ibforums;
-return <<<EOF
-  <table width="100%" id="userlinks" cellspacing="6">
-   <tr>
-    <td><strong>{$ibforums->lang['logged_in_as']} <a href='{$ibforums->base_url}showuser={$ibforums->member['id']}'>{$ibforums->member['name']}</a></strong> ( <a href='{$ibforums->base_url}act=Login&amp;CODE=03'>{$ibforums->lang['log_out']}</a>$ad_link $mod_link $val_link )</td>
-    <td align='right'>
-      <b><a href='{$ibforums->base_url}act=UserCP&amp;CODE=00' title='{$ibforums->lang['cp_tool_tip']}'>{$ibforums->lang['your_cp']}</a></b> &middot; <a href='{$ibforums->base_url}act=Msg&amp;CODE=01'>{$msg[TEXT]}</a>
-      &middot; <a href='{$ibforums->base_url}act=Search&amp;CODE=getnew'>{$ibforums->lang['view_new_posts']}</a> &middot; <a href='javascript:buddy_pop();' title='{$ibforums->lang['bb_tool_tip']}'>{$ibforums->lang['l_qb']}</a></td>
-   </tr>
-  </table>
-EOF;
-}
-
-function Guest_bar() {
-global $ibforums;
-return <<<EOF
-  <table width="100%" id="userlinks" cellspacing="6">
-   <tr>
-    <td>{$ibforums->lang['guest_stuff']} ( <a href='{$ibforums->base_url}act=Login&amp;CODE=00'>{$ibforums->lang['log_in']}</a> | <a href='{$ibforums->base_url}act=Reg&amp;CODE=00'>{$ibforums->lang['register']}</a> )</td>
-    <td align='right'><a href='{$ibforums->base_url}act=Reg&amp;CODE=reval'>{$ibforums->lang['ml_revalidate']}</a></td>
-   </tr>
-  </table>
-EOF;
-}
-
-function member_bar_disabled() {
-global $ibforums;
-return <<<EOF
-  <table width="100%" id="userlinks" cellspacing="6">
-   <tr>
-    <td><strong>{$ibforums->lang['mb_disabled']} </strong></td>
-   </tr>
-  </table>
-EOF;
-}
-
-function Member_no_usepm_bar($ad_link, $mod_link, $val_link) {
-global $ibforums;
-return <<<EOF
-  <table width="100%" id="userlinks" cellspacing="6">
-   <tr>
-    <td><b>{$ibforums->lang['logged_in_as']} {$ibforums->member['name']}</b> ( <a href='{$ibforums->base_url}act=Login&amp;CODE=03'>{$ibforums->lang['log_out']}</a>$ad_link $mod_link $val_link )</td>
-    <td align='right'>
-   <b><a href='{$ibforums->base_url}act=UserCP&amp;CODE=00' title='{$ibforums->lang['cp_tool_tip']}'>{$ibforums->lang['your_cp']}</a></b>
-    &middot;  <a href='{$ibforums->base_url}act=Search&amp;CODE=getnew'>{$ibforums->lang['view_new_posts']}</a>  &middot;  <a href='javascript:buddy_pop();' title='{$ibforums->lang['bb_tool_tip']}'>{$ibforums->lang['l_qb']}</a></td>
-   </tr>
-  </table>
-EOF;
-}
-
-
-function BoardHeader($time="") {
-global $ibforums;
-return <<<EOF
-<script language='JavaScript' type="text/javascript">
-<!--
-function buddy_pop() { window.open('index.{$ibforums->vars['php_ext']}?act=buddy&s={$ibforums->session_id}','BrowserBuddy','width=250,height=500,resizable=yes,scrollbars=yes'); }
-function chat_pop(cw,ch)  { window.open('index.{$ibforums->vars['php_ext']}?s={$ibforums->session_id}&act=chat&pop=1','Chat','width='+cw+',height='+ch+',resizable=yes,scrollbars=yes'); }
-function multi_page_jump( url_bit, total_posts, per_page )
-{
-pages = 1; cur_st = parseInt("{$ibforums->input['st']}"); cur_page  = 1;
-if ( total_posts % per_page == 0 ) { pages = total_posts / per_page; }
- else { pages = Math.ceil( total_posts / per_page ); }
-msg = "{$ibforums->lang['tpl_q1']}" + " " + pages;
-if ( cur_st > 0 ) { cur_page = cur_st / per_page; cur_page = cur_page -1; }
-show_page = 1;
-if ( cur_page < pages )  { show_page = cur_page + 1; }
-if ( cur_page >= pages ) { show_page = cur_page - 1; }
- else { show_page = cur_page + 1; }
-userPage = prompt( msg, show_page );
-if ( userPage > 0  ) {
-	if ( userPage < 1 )     {    userPage = 1;  }
-	if ( userPage > pages ) { userPage = pages; }
-	if ( userPage == 1 )    {     start = 0;    }
-	else { start = (userPage - 1) * per_page; }
-	window.location = url_bit + "&st=" + start;
-}
-}
-//-->
-</script>
- 
-<!--IBF.BANNER-->
-<div id='logostrip'>
-  <a href='{$ibforums->base_url}' title='Board Home'><img src='{$ibforums->vars['img_url']}/logo4.gif' alt='Powered by Invision Power Board' border="0" /></a>
-</div>
-
-<!-- IE6/Win TABLE FIX -->
-<table  width="100%" cellspacing="6" id="submenu">
-<tr>
- <td><a href='{$ibforums->vars['home_url']}'>{$ibforums->vars['home_name']}</a><!--IBF.RULES--></td>
- <td align="right">
-   <img src="{$ibforums->vars['img_url']}/atb_help.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=Help'>{$ibforums->lang['tb_help']}</a>
-   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_search.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=Search&amp;f={$ibforums->input['f']}'>{$ibforums->lang['tb_search']}</a>
-   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_members.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=Members'>{$ibforums->lang['tb_mlist']}</a>
-   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_calendar.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=calendar'>{$ibforums->lang['tb_calendar']}</a>
-   <!--IBF.CHATLINK-->
-   <!--IBF.TSLLINK-->
- </td>
-</tr>
-</table>
-<% MEMBER BAR %>
-<br />
-
-EOF;
-}
-
-function rules_link($url="", $title="")
-{
-global $ibforums;
-return <<<EOF
-&nbsp;&middot; <a href="$url">$title</a>
-EOF;
-}
-
-function show_tsl_link_inline()
-{
-global $ibforums;
-return <<<EOF
-&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_toplist.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=module&amp;module=toplist'>{$ibforums->lang['tb_toplist']}</a>
-EOF;
-}
-
-function show_chat_link_inline()
-{
-global $ibforums;
-return <<<EOF
-&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href='{$ibforums->base_url}act=chat'>{$ibforums->lang['live_chat']}</a>
-EOF;
-}
-
-function show_chat_link_popup()
-{
-global $ibforums;
-return <<<EOF
-&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href="javascript:chat_pop({$ibforums->vars['chat_width']}, {$ibforums->vars['chat_height']});">{$ibforums->lang['live_chat']}</a>
-EOF;
-}
-
-
-function start_nav() {
-global $ibforums;
-return <<<EOF
-<div id='navstrip' align='left'><{F_NAV}>&nbsp;
-EOF;
-}
-
-function end_nav() {
-global $ibforums;
-return <<<EOF
-</div>
-<br />
-EOF;
-}
-
-
-
-
-
-function Redirect($Text, $Url, $css) {
-global $ibforums;
-return <<<EOF
-<html>
-<head>
-<title>{$ibforums->lang['stand_by']}</title>
-<meta http-equiv='refresh' content='2; url=$Url' />
-<script type="text/javascript"> </script>
-$css
-</head>
-<body>
-<table width='100%' height='85%' align='center'>
-<tr>
-  <td valign='middle'>
-	  <table align='center' cellpadding="4" class="tablefill">
-	  <tr> 
-		<td width="100%" align="center">
-		  {$ibforums->lang['thanks']}, 
-		  $Text<br /><br />
-		  {$ibforums->lang['transfer_you']}<br /><br />
-	      (<a href='$Url'>{$ibforums->lang['dont_wait']}</a>)
-	    </td>
-	  </tr>
-	</table>
-  </td>
-</tr>
-</table>
-</body>
-</html>
-EOF;
-}
-
-function PM_popup() {
-global $ibforums;
-return <<<EOF
-     <script language='JavaScript' type="text/javascript">
-     <!--
-       window.open('index.{$ibforums->vars['php_ext']}?act=Msg&CODE=99&s={$ibforums->session_id}','NewPM','width=500,height=250,resizable=yes,scrollbars=yes'); 
-     //-->
-     </script>
-EOF;
-}
-
-function admin_link() {
-global $ibforums;
-return <<<EOF
-&nbsp;&middot; <b><a href='{$ibforums->vars['board_url']}/admin.{$ibforums->vars['php_ext']}' target='_blank'>{$ibforums->lang['admin_cp']}</a></b>
-EOF;
-}
-
-function mod_link() {
-global $ibforums;
-return <<<EOF
-&middot; <b><a href='{$ibforums->base_url}act=modcp&amp;forum={$ibforums->input['f']}'>{$ibforums->lang['mod_cp']}</a></b>
-EOF;
-}
-
-function validating_link() {
-global $ibforums;
-return <<<EOF
-&nbsp;&middot; <a href='{$ibforums->base_url}act=Reg&amp;CODE=reval'>{$ibforums->lang['ml_revalidate']}</a>
-EOF;
-}
-
-function error_log_in($q_string) {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}' method='post'>
-<input type='hidden' name='act' value='Login' />
-<input type='hidden' name='CODE' value='01' />
-<input type='hidden' name='s' value='{$ibforums->session_id}' />
-<input type='hidden' name='referer' value='$q_string' />
-<input type='hidden' name='CookieDate' value='1' />
-<div class="tableborder">
-  <div class="titlemedium">{$ibforums->lang['er_log_in_title']}</div>
-  <table>
-   <tr>
-	<td class="pformleft">{$ibforums->lang['erl_enter_name']}</td>
-	<td class="pformright"><input type='text' size='20' maxlength='64' name='UserName' class='forminput' /></td>
-   </tr>
-   <tr>
-	<td class="pformleft">{$ibforums->lang['erl_enter_pass']}</td>
-	<td class="pformright"><input type='password' size='20' name='PassWord' class='forminput' /></td>
-   </tr>
-  </table>
-  <div class="pformstrip" align="center"><input type='submit' name='submit' value='{$ibforums->lang['erl_log_in_submit']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function board_offline($message = "") {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}' method='post'>
-<input type='hidden' name='act' value='Login' />
-<input type='hidden' name='CODE' value='01' />
-<input type='hidden' name='s' value='{$ibforums->session_id}' />
-<input type='hidden' name='referer' value='' />
-<input type='hidden' name='CookieDate' value='1' />
-<div class='tableborder'>
-  <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['offline_title']}</div>
-  <div class='tablepad'>$message</div>
-  <table width='100%' cellpadding='0' cellspacing='0'>
-  <tr>
-   <td class='pformleftw'>{$ibforums->lang['erl_enter_name']}</td>
-   <td class='pformright'><input type='text' size='20' maxlength='64' name='UserName' class='forminput' /></td>
-  </tr>
-  <tr>
-   <td class='pformleftw'>{$ibforums->lang['erl_enter_pass']}</td>
-   <td class='pformright'><input type='password' size='20' name='PassWord' class='forminput' /></td>
-  </tr>
-  </table>
-  <div class='pformstrip' align='center'><input type='submit' name='submit' value='{$ibforums->lang['erl_log_in_submit']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function Error($message, $ad_email_one="", $ad_email_two="") {
-global $ibforums;
-return <<<EOF
-<script language='JavaScript' type="text/javascript">
-<!--
-function contact_admin() {
-
-  // Very basic spam bot stopper
-	  
-  admin_email_one = '$ad_email_one';
-  admin_email_two = '$ad_email_two';
-  
-  window.location = 'mailto:'+admin_email_one+'@'+admin_email_two+'?subject=Error on the forums';
-  
-}
-
-//-->
-</script>
-<div class="tableborder">
- <div class="maintitle"><img src='{$ibforums->vars['img_url']}/nav_m.gif' alt='' width='8' height='8' />&nbsp;{$ibforums->lang['error_title']}</div>
-</div>
-<div class="tablefill">
-  {$ibforums->lang['exp_text']}<br /><br />
-  <b>{$ibforums->lang['msg_head']}</b>
-  <br /><br />
-  <span class='postcolor' style='padding:10px'>$message</span>
-  <br /><br />
-  <!--IBF.LOG_IN_TABLE-->
-  <!--IBF.POST_TEXTAREA-->
-  <br /><br />
-  <b>{$ibforums->lang['er_links']}</b>
-  <br /><br />
-  &middot; <a href='{$ibforums->base_url}act=Reg&amp;CODE=10'>{$ibforums->lang['er_lost_pass']}</a><br />
-  &middot; <a href='{$ibforums->base_url}act=Reg&amp;CODE=00'>{$ibforums->lang['er_register']}</a><br />
-  &middot; <a href='{$ibforums->base_url}act=Help&amp;CODE=00'>{$ibforums->lang['er_help_files']}</a><br />
-  &middot; <a href='javascript:contact_admin();'>{$ibforums->lang['er_contact_admin']}</a>
-</div>
-<div class="tableborder">
- <div class="pformstrip" align="center">&lt; <a href='javascript:history.go(-1)'>{$ibforums->lang['error_back']}</a></div>
-</div>
-EOF;
-}
-
-function error_post_textarea($post="") {
-global $ibforums;
-return <<<EOF
-<br />
-<div>
-<strong>{$ibforums->lang['err_title']}</strong>
-<br /><br />
-{$ibforums->lang['err_expl']}
-</div>
-<br />
-<br />
-<div align='center'>
-<input type='button' tabindex='1' value='{$ibforums->lang['err_select']}' onclick='document.mehform.saved.select()'><br />
-<form name='mehform'>
-<textarea cols='70' rows='5' name='saved' tabindex='2'>$post</textarea>
-</form>
-</div>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_help.php b/upload/Skin/s1/skin_help.php
deleted file mode 100644
index 031332e5..00000000
--- a/upload/Skin/s1/skin_help.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-class skin_help {
-
-
-
-function row($entry) {
-global $ibforums;
-return <<<EOF
-<li class="helprow"><a href='{$ibforums->base_url}act=Help&amp;CODE=01&amp;HID={$entry['id']}'><b>{$entry['title']}</b></a><br />{$entry['description']}</li>
-
-EOF;
-}
-
-function display($text) {
-global $ibforums;
-return <<<EOF
-</div>
-<div style='padding:4px'>$text</div>
-</div>
-EOF;
-}
-
-function end() {
-global $ibforums;
-return <<<EOF
-  </ul>
- </div>
-</div>
-EOF;
-}
-
-function no_results() {
-global $ibforums;
-return <<<EOF
-                <tr>
-                   <td class='row1' colspan='2'><b>{$ibforums->lang['no_results']}</b></td>
-                 </tr>
-EOF;
-}
-
-function start($one_text, $two_text, $three_text) {
-global $ibforums;
-return <<<EOF
-<div>$two_text</div>
-<br />
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Help' />
-<input type='hidden' name='CODE' value='02' />
-<div class="tableborder">
-  <div class="maintitle">$one_text</div>
-  <div class="tablepad">{$ibforums->lang['search_txt']}&nbsp;&nbsp;<input type='text' maxlength='60' size='30' class='forminput' name='search_q' />&nbsp;<input type='submit' value='{$ibforums->lang['submit']}' class='forminput' /></div>
-</div>
-</form>
-<br />
-<div class="tableborder">
-  <div class="maintitle">$three_text</div>
-  <div class="tablepad">
-  <ul id="help">
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_legends.php b/upload/Skin/s1/skin_legends.php
deleted file mode 100644
index c0ea17c7..00000000
--- a/upload/Skin/s1/skin_legends.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-class skin_legends {
-
-
-function find_user_one($entry="", $name="", $sep="comma") {
-global $ibforums;
-return <<<EOF
-
-<form name='finduser' method='post' action='{$ibforums->base_url}act=legends&amp;entry=$entry&amp;name=$name&amp;sep=$sep&amp;CODE=finduser_two'>
-<table cellspacing='1' cellpadding='10' width='100%' height='100%' align='center' class='row1'>
-<tr>
-   <td class='pagetitle' align='left'>{$ibforums->lang['fu_title']}<hr noshade></td>
-</tr>
-<tr>
-   <td align='center' valign='middle'><b>{$ibforums->lang['fu_enter_name']}</b><br /><br /><input type='text' size='40' name='username' class='forminput'><br /><br /><input type='submit' value='{$ibforums->lang['fu_search_but']}'></td>
-</tr>
-<tr>
-   <td align='center' style='font-size:12px;font-weight:bold'><a href='javascript:window.close();'>{$ibforums->lang['fu_close_win']}</a></td>
-</tr>
-</table>
-</form>
-
-EOF;
-}
-
-
-function find_user_error($msg) {
-global $ibforums;
-return <<<EOF
-
-<form name='finduser' method='post' action='{$ibforums->base_url}entry=$entry&amp;name=$name&amp;sep=$sep&amp;CODE=finduser_two'>
-<table cellspacing='1' cellpadding='10' width='100%' height='100%' align='center' class='row1'>
-<tr>
-   <td class='pagetitle' align='left'>{$ibforums->lang['fu_error']}<hr noshade></td>
-</tr>
-<tr>
-   <td align='center' valign='middle'>$msg</td>
-</tr>
-<tr>
-   <td align='center' style='font-size:12px;font-weight:bold'><a href='javascript:history.go(-1);'>{$ibforums->lang['fu_back']}</a> :: <a href='javascript:window.close();'>{$ibforums->lang['fu_close_win']}</a></td>
-</tr>
-</table>
-</form>
-
-EOF;
-}
-
-
-function find_user_final($names="",$entry="", $name="", $sep="line") {
-global $ibforums;
-return <<<EOF
-
-<script language='javascript'>
-<!--
-	function add_to_form()
-	{
-		
-		var separator = '$sep';
-		var entry     = '$entry';
-		
-		var name = document.finduser.username.options[document.finduser.username.selectedIndex].value;
-		
-		if (separator == 'line')
-		{
-			separator = '\\n';
-		}
-		
-		if (entry == 'textarea')
-		{
-			// Where shall we put the separator?
-			
-			var tbox     = opener.document.REPLIER.$name.value;
-			var tboxSize = opener.document.REPLIER.$name.value.length;
-			
-			// Remove leading spaces...
-			
-			while ( opener.document.REPLIER.$name.value.slice(0,1) == " " )
-			{
-				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(1, opener.document.REPLIER.$name.value.length - 1);
-				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;
-			}
-			
-			// Remove trailing spaces...
-			
-			while ( opener.document.REPLIER.$name.value.slice(opener.document.REPLIER.$name.value.length - 1, opener.document.REPLIER.$name.value.length) == " " )
-			{
-				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(0, opener.document.REPLIER.$name.value.length - 1);
-				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;
-			}
-			
-			// Do we have a leading comma?
-			
-			while ( opener.document.REPLIER.$name.value.slice(0,1) == "\\n" )
-			{
-				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(1, opener.document.REPLIER.$name.value.length - 1);
-				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;
-			}
-			
-			// Do we have a trailing comma?...
-			
-			while ( opener.document.REPLIER.$name.value.slice(opener.document.REPLIER.$name.value.length - 1, opener.document.REPLIER.$name.value.length) == "\\n" )
-			{
-				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(0, opener.document.REPLIER.$name.value.length - 1);
-				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;
-			}
-			
-			// First in box?
-			
-			if ( opener.document.REPLIER.$name.value.length == 0)
-			{
-				opener.document.REPLIER.$name.value += name;
-			}
-			else
-			{
-				opener.document.REPLIER.$name.value += separator + name;
-			}
-		}
-		
-	}
-//-->
-</script>
-
-<form name='finduser'>
-<table cellspacing='1' cellpadding='10' width='100%' height='100%' align='center' class='row1'>
-<tr>
-   <td class='pagetitle' align='left'>{$ibforums->lang['fu_title']}<hr noshade></td>
-</tr>
-<tr>
-   <td align='center' valign='middle'>{$ibforums->lang['fu_add_desc']}<br /><br /><select name='username' class='forminput'>$names</select><br /><br /><input type='button' name='add' onClick='add_to_form()' value='{$ibforums->lang['fu_add_mem']}'></td>
-</tr>
-<tr>
-   <td align='center' style='font-size:12px;font-weight:bold'><a href='javascript:history.go(-1);'>{$ibforums->lang['fu_back']}</a> :: <a href='javascript:window.close();'>{$ibforums->lang['fu_close_win']}</a></td>
-</tr>
-</table>
-</form>
-
-EOF;
-}
-
-
-
-function emoticon_javascript()
-{
-return <<<EOF
-<script language='javascript'>
-<!--
-	function add_smilie(code)
-	{
-		opener.document.REPLIER.Post.value += ' ' + code + ' ';
-		//return true;
-	}
-//-->
-</script>
-EOF;
-}
-
-function bbcode_header() {
-global $ibforums;
-return <<<EOF
-<div style='padding:6px'>{$ibforums->lang['bbc_intro']}</div>
-<br />
-EOF;
-}
-
-function wrap_tag($tag) {
-global $ibforums;
-return <<<EOF
-<span style='color:#F00;font-weight:bold;'>$tag</span>
-EOF;
-}
-
-function page_header( $title, $row1, $row2 ) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>$title</div>
-  <table class='tablebasic' cellspacing='1' cellpadding='4'>
-  <tr>
-	 <td width='50%' align='center' class='pformstrip' valign='middle'>$row1</td>
-	 <td width='50%' align='center' class='pformstrip' valign='middle'>$row2</td>
-  </tr>
-EOF;
-}
-
-function emoticons_row($code, $image, $in="'", $out="'") {
-global $ibforums;
-return <<<EOF
-   <tr>
-	  <td align='center' class='row1' valign='middle'><a href={$out}javascript:add_smilie({$in}$code{$in}){$out}>$code</a></td>
-	  <td align='center' class='row2' valign='middle'><a href={$out}javascript:add_smilie({$in}$code{$in}){$out}><img src='{$ibforums->vars['EMOTICONS_URL']}/$image' border='0' valign='absmiddle' alt='$image'></a></td>
-   </tr>
-EOF;
-}
-
-function bbcode_row($before, $after) {
-global $ibforums;
-return <<<EOF
-   <tr>
-	  <td align='left' class='row1' valign='middle'>$before</td>
-	  <td align='left' class='row2' valign='middle'>$after</td>
-   </tr>
-EOF;
-
-}
-
-function page_footer() {
-
-return <<<EOF
-  </table>
-</div>
-
-EOF;
-
-}
-
-	
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_login.php b/upload/Skin/s1/skin_login.php
deleted file mode 100644
index d0660b13..00000000
--- a/upload/Skin/s1/skin_login.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-class skin_login {
-
-
-function errors($data) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['errors_found']}</div>
-  <div class="tablepad"><span class='postcolor'>$data</span></div>
-</div>
-<br />
-EOF;
-}
-
-function ShowForm($message, $referer="") {
-global $ibforums;
-return <<<EOF
-<script language='JavaScript' type="text/javascript">
-<!--
-function ValidateForm() {
-	var Check = 0;
-	if (document.LOGIN.UserName.value == '') { Check = 1; }
-	if (document.LOGIN.PassWord.value == '') { Check = 1; }
-
-	if (Check == 1) {
-		alert("{$ibforums->lang['blank_fields']}");
-		return false;
-	} else {
-		document.LOGIN.submit.disabled = true;
-		return true;
-	}
-}
-//-->
-</script>     
-{$ibforums->lang['login_text']}
-<br />
-<br />
-<b>{$ibforums->lang['forgot_pass']} <a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?act=Reg&amp;CODE=10'>{$ibforums->lang['pass_link']}</a></b>
-<br />
-<br />
-<form action="{$ibforums->base_url}act=Login&amp;CODE=01" method="post" name='LOGIN' onsubmit='return ValidateForm()'>
-<input type='hidden' name='referer' value="$referer" />
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['log_in']}</div>
-  <div class='pformstrip'>$message</div>
-  <table class="tablebasic" cellspacing="1">
-  <tr>
-    <td class='pformleftw'>{$ibforums->lang['enter_name']}</td>
-    <td class='pformright'><input type='text' size='20' maxlength='64' name='UserName' class='forminput' /></td>
-  </tr>
-  <tr>
-    <td class='pformleftw'>{$ibforums->lang['enter_pass']}</td>
-    <td class='pformright'><input type='password' size='20' name='PassWord' class='forminput' /></td>
-  </tr>
-  </table>
-  <div class="pformstrip">{$ibforums->lang['options']}</div>		
-  <table class="tablebasic" cellspacing="1">
-  <tr>
-    <td class='pformleftw'>{$ibforums->lang['cookies']}</td>
-    <td class='pformright'><input type="radio" name="CookieDate" value="1" checked="checked" />{$ibforums->lang['cookie_yes']}<br /><input type="radio" name="CookieDate" value="0" />{$ibforums->lang['cookie_no']}</td>
-  </tr>
-  <tr>
-    <td class='pformleftw'>{$ibforums->lang['privacy']}</td>
-    <td class='pformright'><input type="checkbox" name="Privacy" value="1" />{$ibforums->lang['anon_name']}</td>
-  </tr>
-  </table>		
-  <div class="pformstrip" align="center"><input type="submit" name='submit' value="{$ibforums->lang['log_in_submit']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_mlist.php b/upload/Skin/s1/skin_mlist.php
deleted file mode 100644
index 9d10008e..00000000
--- a/upload/Skin/s1/skin_mlist.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-class skin_mlist {
-
-
-
-function Page_header($links) {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type='text/javascript'>
-<!--
-function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-	if (posleft != 0) { x = posleft }
-	if (postop  != 0) { y = postop  }
-
-	if (!scroll) { scroll = 1 }
-	if (!resize) { resize = 1 }
-
-	if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-	  X = (screen.width  - width ) / 2;
-	  Y = (screen.height - height) / 2;
-	}
-	if (scroll != 0) { scroll = 1 }
-
-	var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
- }
-//-->
-</script>
-<form action='{$ibforums->base_url}' method='post'>
-<input type='hidden' name='act' value='Members' />
-<input type='hidden' name='s'   value='{$ibforums->session_id}' />
-<div align="left">{$links[SHOW_PAGES]}</div>
-<br />
-<div class='tableborder'>
- <div class="maintitle">{$ibforums->lang['page_title']}</div>
- <table width="100%" border="0" cellspacing="1" cellpadding="4">
-  <tr>
-	<th class='pformstrip' width="30%">{$ibforums->lang['member_name']}</th>
-	<th class='pformstrip' align="center" width="10%">{$ibforums->lang['member_level']}</th>
-	<th class='pformstrip' align="center" width="10%">{$ibforums->lang['member_group']}</th>
-	<th class='pformstrip' align="center" width="20%">{$ibforums->lang['member_joined']}</th>
-	<th class='pformstrip' align="center" width="10%">{$ibforums->lang['member_posts']}</th>
-	<th class='pformstrip' align="center">{$ibforums->lang['member_email']}</th>
-	<th class='pformstrip' align="center">{$ibforums->lang['member_aol']}</th>
-	<th class='pformstrip' align="center">{$ibforums->lang['member_icq']}</th>
-	<th class='pformstrip' width="5%" align="center">{$ibforums->lang['member_photo']}</th>
-	
-  </tr>
-EOF;
-}
-
-function end($links) {
-global $ibforums;
-return <<<EOF
-<br />
-<div align="left">{$links[SHOW_PAGES]}</div>
-EOF;
-}
-
-function no_results() {
-global $ibforums;
-return <<<EOF
-No results
-EOF;
-}
-
-function start() {
-global $ibforums;
-return <<<EOF
-<!-- nothing here -->
-EOF;
-}
-
-function Page_end($checked="") {
-global $ibforums;
-return <<<EOF
-  <!-- End content Table -->
-  <tr> 
-    <td class='row3' colspan="9" align='center' valign='middle'>
-      <strong>{$ibforums->lang['photo_only']}&nbsp;<input type="checkbox" value="1" name="photoonly" class="forminput" $checked /></strong>
-    </td>
-  </tr>
-  <tr> 
-    <td class='pformstrip' colspan="9" align='center' valign='middle'>
-      <select class='forminput' name='name_box'>
-	 <option value='begins'>{$ibforums->lang['ch_begins']}</option>
-	 <option value='contains'>{$ibforums->lang['ch_contains']}</option>
-	 <option value='all' selected="selected">{$ibforums->lang['ch_all']}</option>
-	 </select>&nbsp;&nbsp;<input class='forminput' type='text' size='25' name='name' value='{$ibforums->input['name']}' />
-    </td>
-  </tr>
-  <tr>
-   <td class='darkrow1' colspan="9" align='center' valign='middle'>
-     {$ibforums->lang['sorting_text']}&nbsp;<input type='submit' value='{$ibforums->lang['sort_submit']}' class='forminput' />
-   </td>
- </tr>
-</table>
-</div>
-</form>
-EOF;
-}
-
-function show_row($member) {
-global $ibforums;
-return <<<EOF
-  <!-- Entry for {$member[MEMBER_NAME]} -->
-  <tr>
-	 <td class='row4'><strong><a href="{$ibforums->base_url}showuser={$member['id']}">{$member['name']}</a></strong></td>
-	 <td class='row4'>{$member['pips']}</td>
-	 <td class='row2' align="center" width="20%">{$member['group']}</td>
-	 <td class='row4' align="center" width="20%">{$member['joined']}</td>
-	 <td class='row4' align="center" width="10%">{$member['posts']}</td>
-	 <td class='row2' align="center">{$member['member_email']}</td>
-	 <td class='row2' align="center">{$member['aim_name']}</td>
-	 <td class='row2' align="center">{$member['icq_number']}</td>
-	 <td class='row2' align="center">{$member['camera']}</td>
-  </tr>
-  <!-- End of Entry -->
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_mod.php b/upload/Skin/s1/skin_mod.php
deleted file mode 100644
index d5a53322..00000000
--- a/upload/Skin/s1/skin_mod.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-
-class skin_mod {
-
-function warn_view_header($id, $name, $links) {
-global $ibforums;
-return <<<EOF
-<table cellspacing='0' cellpadding='0' width='100%' border='0'>
-<tr>
- <td align='left'><span id='phototitle'>$name</span></td>
- <td align='right'>$links</td>
-</tr>
-</table>
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['w_v_title']}: <a href='{$ibforums->base_url}showuser=$id'>$name</a></div>
-</div>
- <table cellspacing='1' width='100%' cellpadding='6' class='plainborder'>
- <tr>
-  <th class='pformstrip' width='30%'>{$ibforums->lang['w_v_warnby']}</th>
-  <th class='pformstrip' width='70%'>{$ibforums->lang['w_v_notes']}</th>
- </tr>
-EOF;
-}
-
-
-function warn_view_positive_row($date, $content, $puni_name) {
-global $ibforums;
-return <<<EOF
-  <tr>
-    <td class='row4' valign='top'><strong>$puni_name</strong></td>
-    <td class='row4' valign='top'>{$ibforums->lang['w_v_warned_on']} <strong>$date</strong></td>
-  </tr>
-  <tr>
-    <td class='row1' valign='middle'><span class='warngood'>{$ibforums->lang['w_v_minus']}</span></td>
-    <td class='row1' valign='top'><span class='postcolor'>$content</span></td>
-  </tr>
-EOF;
-}
-
-function warn_view_negative_row($date, $content, $puni_name) {
-global $ibforums;
-return <<<EOF
-  <tr>
-    <td class='row4' valign='top'><strong>$puni_name</strong></td>
-    <td class='row4' valign='top'>{$ibforums->lang['w_v_warned_on']} <strong>$date</strong></td>
-  </tr>
-  <tr>
-    <td class='row1' valign='middle'><span class='warnbad'>{$ibforums->lang['w_v_add']}</span></td>
-    <td class='row1' valign='top'><span class='postcolor'>$content</span></td>
-  </tr>
-EOF;
-}
-
-
-function warn_view_none() {
-global $ibforums;
-return <<<EOF
-  <tr>
-    <td class='row1' colspan='2' align='center'><strong>{$ibforums->lang['w_v_none']}</strong></td>
-  </tr>
-EOF;
-}
-
-function warn_view_footer() {
-global $ibforums;
-return <<<EOF
-</table>
-EOF;
-}
-
-
-function warn_success() {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['w_done_t']}</div>
- <div class='pformstrip'>&nbsp;</div>
- <div class='tablepad'>
-  {$ibforums->lang['w_done_te']}
-  <ul>
-   <li><a href='{$ibforums->base_url}'>{$ibforums->lang['w_done_home']}</a></li>
-   <!--IBF.FORUM_TOPIC-->
-  </ul>
- </div>
-</div>
- 	
-EOF;
-}
-
-function warn_success_forum($fid, $fname, $tid, $tname, $st=0) {
-global $ibforums;
-return <<<EOF
-   <li><a href='{$ibforums->base_url}showforum=$fid'>{$ibforums->lang['w_done_forum']} <strong>$fname</strong></a></li>
-   <li><a href='{$ibforums->base_url}showtopic=$tid&amp;st=$st'>{$ibforums->lang['w_done_topic']} <strong>$tname</strong></a></li>
-EOF;
-}
-
-function warn_errors($data) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['errors_found']}</div>
-  <div class="tablepad"><span class='postcolor'>$data</span></div>
-</div>
-<br />
-EOF;
-}
-
-function warn_header($mid, $name, $cur=0, $min = 0, $max=10, $key, $tid='',$st='', $type) {
-global $ibforums;
-return <<<EOF
-<form method='post' action='{$ibforums->base_url}&amp;act=warn&amp;CODE=dowarn&amp;mid=$mid&amp;t=$tid&amp;st=$st&amp;type={$ibforums->input['type']}'>
-<input type='hidden' name='key' value='$key'>
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['w_warnfor']} <a href='{$ibforums->base_url}showuser=$mid'>$name</a> ( $min &lt; $cur &gt; $max )</div>
- <div class='pformstrip'>{$ibforums->lang['w_complete']}</div>
- <table width='100%' cellpadding='0' border='0' cellspacing='0'>
- <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang['w_adjust_level']}</strong></td>
-  <td class='pformright'>
-    <input type='radio' name='level' id='add' class='radiobutton' value='add' {$type['add']} /><label for='add' class='warnbad'><strong>{$ibforums->lang['w_add']}</strong></label>
-    <br />
-    <input type='radio' name='level' id='minus' class='radiobutton' value='remove' {$type['minus']} /><label for='minus' class='warngood'><strong>{$ibforums->lang['w_remove']}</strong></label>
- </tr>
-EOF;
-}
-
-function warn_mod_posts($mod_tick, $mod_array, $mod_extra) {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang['w_modq']}</strong></td>
-  <td class='pformright'>
-    <input type='checkbox' name='mod_indef' class='forminput' value='1' $mod_tick> {$ibforums->lang['w_modq_i']}
-    <br /><strong>{$ibforums->lang['w_orfor']}</strong>
-    <input type='input' name='mod_value' class='forminput' value='{$mod_array['timespan']}' size='5'> <select name='mod_unit' class='forminput'><option value='d' {$mod_array['days']}>{$ibforums->lang['w_day']}</option><option value='h' {$mod_array['hours']}>{$ibforums->lang['w_hour']}</option></select>
- 	$mod_extra
- </tr>
-EOF;
-}
-
-
-function warn_rem_posts($post_tick, $post_array, $post_extra) {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang['w_resposts']}</strong></td>
-  <td class='pformright'>
-    <input type='checkbox' name='post_indef' class='forminput' value='1' $post_tick> {$ibforums->lang['w_resposts_i']}
-    <br /><strong>{$ibforums->lang['w_orfor']}</strong>
-    <input type='input' name='post_value' class='forminput' value='{$post_array['timespan']}' size='5'> <select name='post_unit' class='forminput'><option value='d' {$post_array['days']}>{$ibforums->lang['w_day']}</option><option value='h' {$post_array['hours']}>{$ibforums->lang['w_hour']}</option></select>
- 	$post_extra
- </tr>
-EOF;
-}
-
-function warn_suspend($susp_array, $susp_extra) {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang['w_suspend']}</strong></td>
-  <td class='pformright'>
-     {$ibforums->lang['w_susfor']}  <input type='input' name='susp_value' class='forminput' value='{$susp_array['timespan']}' size='5'> <select name='susp_unit' class='forminput'><option value='d' {$susp_array['days']}>{$ibforums->lang['w_day']}</option><option value='h' {$susp_array['hours']}>{$ibforums->lang['w_hour']}</option></select>
- 	  $susp_extra
- </tr>
-EOF;
-}
-
-function warn_footer() {
-global $ibforums;
-return <<<EOF
-  <tr>
-   <td class='pformleftw' valign='top'><strong>{$ibforums->lang['w_reason']}</strong><br />{$ibforums->lang['w_reason2']}</td>
-   <td class='pformright'><textarea rows='6' cols='70' class='textinput' name='reason'>{$ibforums->input['reason']}</textarea></td>
-  </tr>
-  <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang['w_c_subj']}</strong></td>
-  <td class='pformright'><input type='input' name='subject' class='forminput' value='{$ibforums->input['subject']}' size='30'></td>
- </tr>
-  <tr>
-   <td class='pformleftw' valign='top'><strong>{$ibforums->lang['w_contact']}</strong><br />{$ibforums->lang['w_contact2']}</td>
-   <td class='pformright'>
-   	  {$ibforums->lang['w_c']}&nbsp;<select name='contactmethod' class='forminput'><option value='pm'>{$ibforums->lang['w_c_p']}</option><option value='email'>{$ibforums->lang['w_c_e']}</option></select>
-     <br /><textarea rows='6' cols='70' class='textinput' name='contact'>{$ibforums->input['contact']}</textarea>
-   </td>
-  </tr>
-  </table>
-  <div align='center' class='pformstrip'><input type='submit' class='forminput' value='{$ibforums->lang['w_submit']}' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-function warn_restricition_in_place() {
-global $ibforums;
-return <<<EOF
-<br /><strong>{$ibforums->lang['w_restricted']}</strong>
-EOF;
-}
-
-function mod_exp($words) {
-global $ibforums;
-return <<<EOF
-<div class='pformstrip'>$words</div>
-EOF;
-}
-
-function end_form($action) {
-global $ibforums;
-return <<<EOF
-  <div class='pformstrip' align='center'><input type="submit" name="submit" value="$action" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function move_form($jhtml, $forum_name) {
-global $ibforums;
-return <<<EOF
-  <table width='100%' cellspacing='1'>
-  <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang[move_from]} <b>$forum_name</b> {$ibforums->lang[to]}</strong></td>
-  <td class='pformright'><select name='move_id' class='forminput'>$jhtml</select></td>
-  </tr>
-  <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang['leave_link']}</strong></td>
-  <td class='pformright'><select name='leave' class='forminput'><option value='y' selected="selected">{$ibforums->lang['yes']}</option><option value='n'>{$ibforums->lang['no']}</option></select></td>
-  </tr>
-  </table>
-EOF;
-}
-
-function delete_js() {
-global $ibforums;
-return <<<EOF
-
-  <script language='JavaScript' type='text/javascript'>
-  <!--
-  function ValidateForm() {
-	 document.REPLIER.submit.disabled = true;
-	 return true;
-  }
-  //-->
-  </script>
-          
-EOF;
-}
-
-function topictitle_fields($title, $desc) {
-global $ibforums;
-return <<<EOF
-  <table width='100%' cellspacing='1'>
-  <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang[edit_f_title]}</strong></td>
-  <td class='pformright'><input type='text' size='40' maxlength='50' name='TopicTitle' value='$title' /></td>
-  </tr>
-  <tr>
-  <td class='pformleftw'><strong>{$ibforums->lang[edit_f_desc]}</strong></td>
-  <td class='pformright'><input type='text' size='40' maxlength='40' name='TopicDesc' value='$desc' /></td>
-  </tr>
-  </table>
-EOF;
-}
-
-function poll_edit_top() {
-global $ibforums;
-
-return <<<EOF
-<table width='100%' cellpadding='6' border='0' cellspacing='0'>
-EOF;
-
-}
-
-
-function poll_entry($id, $entry) {
-global $ibforums;
-
-return <<<EOF
-
-				<tr>
-				<td class='row1'><b>{$ibforums->lang['pe_option']} $id</b></td>
-                <td class='row1'><input type='text' size='60' maxlength='250' name='POLL_$id' value='$entry'></td>
-                </tr>
-                
-EOF;
-
-}
-
-function poll_edit_new_entry($id) {
-global $ibforums;
-
-return <<<EOF
-
-				<tr>
-				<td class='row1'><b>{$ibforums->lang['pe_option']} $id</b> <em>( {$ibforums->lang['pe_unused']} )</em></td>
-                <td class='row1'><input type='text' size='60' maxlength='250' name='POLL_$id' value=''></td>
-                </tr>
-                
-EOF;
-
-}
-
-function poll_select_form($poll_question="") {
-global $ibforums;
-
-return <<<EOF
-	   <tr>
-	   <td class='row1'><b>{$ibforums->lang['pe_question']}</b></td>
-	   <td class='row1'><input type='text' size='60' maxlength='250' name='poll_question' value='$poll_question'></td>
-	   </tr>
-	   <tr>
-	   <td class='row1'><b>{$ibforums->lang['pe_pollonly']}</b></td>
-	   <td class='row1'><select name='pollonly' class='forminput'><option value='0'>{$ibforums->lang['pe_no']}</option><option value='1'>{$ibforums->lang['pe_yes']}</option></select></td>
-	   </tr>
-	   </table>
-                
-EOF;
-
-}
-
-
-function table_top($posting_title) {
-global $ibforums;
-return <<<EOF
-
-<div class='tableborder'>
- <div class='maintitle'>$posting_title</div>
-
-EOF;
-}
-
-
-function topic_history($data) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['th_title']}</div>
-   <table cellspacing='1' width='100%'>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_topic']}</b></td>
-	<td class='pformright'>{$data['th_topic']}</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_desc']}</b></td>
-	<td class='pformright'>{$data['th_desc']}&nbsp;</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_start_date']}</b></td>
-	<td class='pformright'>{$data['th_start_date']}</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_start_name']}</b></td>
-	<td class='pformright'>{$data['th_start_name']}</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_last_date']}</b></td>
-	<td class='pformright'>{$data['th_last_date']}</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_last_name']}</b></td>
-	<td class='pformright'>{$data['th_last_name']}</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['th_avg_post']}</b></td>
-	<td class='pformright'>{$data['th_avg_post']}</td>
-   </tr>
-   </table>
-</div>
-           
-EOF;
-}
-
-function mod_log_start() {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['ml_title']}</div>
-  <table cellspacing='1' width='100%'>
-  <tr>
-   <td class='pformstrip' width='30%'><b>{$ibforums->lang['ml_name']}</b></td>
-   <td class='pformstrip' width='50%'><b>{$ibforums->lang['ml_desc']}</b></td>
-   <td class='pformstrip' width='20%'><b>{$ibforums->lang['ml_date']}</b></td>
-  </tr>
-
-EOF;
-
-}
-
-function mod_log_none() {
-global $ibforums;
-return <<<EOF
-   <tr>
-	<td class='pformright' colspan='3' align='center'><i>{$ibforums->lang['ml_none']}</i></td>
-   </tr>
-
-EOF;
-
-}
-
-function mod_log_row($data) {
-global $ibforums;
-return <<<EOF
-   <tr>
-	<td class='pformright'>{$data['member']}</td>
-	<td class='pformright'>{$data['action']}</td>
-	<td class='pformright'>{$data['date']}</td>
-   </tr>
-
-EOF;
-
-}
-
-function mod_log_end() {
-global $ibforums;
-return <<<EOF
-	 </table>
-</div>
-EOF;
-
-}
-
-function forum_jump($data, $menu_extra="") {
-
-global $ibforums;
-return <<<EOF
-
-<br />
-<div align='right'>{$data}</div>
-<br />
-EOF;
-
-}
-
-
-
-function split_body($jump="") {
-global $ibforums;
-return <<<EOF
-
-  <table cellspacing='1' width='100%'>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['mt_new_title']}</b></td>
-	<td class='pformright'><input type='text' size='40'  class='forminput' maxlength='100' name='title' value='' /></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['mt_new_desc']}</b></td>
-	<td class='pformright'><input type='text' size='40'  class='forminput' maxlength='100' name='desc' value='' /></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['st_forum']}</b></td>
-	<td class='pformright'><select name='fid' class='forminput'>$jump</select></td>
-   </tr>
-  </table>
-</div>
-<br />
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['st_post']}</div>
-
-EOF;
-}
-
-function split_row($row) {
-global $ibforums;
-return <<<EOF
-  <div class='pformstrip'>{$row['st_top_bit']}</div>
-  <div class='tablepad'>
-   {$row['post']}
-   <div align='right'><b>{$ibforums->lang['st_split']}</b>&nbsp;&nbsp;<input type='checkbox' name='post_{$row['pid']}' value='1' /></div>
- </div>
-EOF;
-}
-
-
-function split_end_form($action) {
-global $ibforums;
-return <<<EOF
-<div class='pformstrip' align='center'> <input type="submit" name="submit" value="$action" class='forminput' /></div>
-</div>
-</form>
-
-EOF;
-}
-
-function merge_body($title="", $desc="") {
-global $ibforums;
-return <<<EOF
-  <table cellspacing='1' width='100%'>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['mt_new_title']}</b></td>
-	<td class='pformright'><input type='text' size='40' maxlength='50' name='title' value='$title' /></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['mt_new_desc']}</b></td>
-	<td class='pformright'><input type='text' size='40' maxlength='40' name='desc' value='$desc' /></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><b>{$ibforums->lang['mt_tid']}</b></td>
-	<td class='pformright'><input type='text' size='50' name='topic_url' value='' /></td>
-   </tr>
-  </table>
-
-EOF;
-}
-
-
-	} // end class
-
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_modcp.php b/upload/Skin/s1/skin_modcp.php
deleted file mode 100644
index 2670e2ce..00000000
--- a/upload/Skin/s1/skin_modcp.php
+++ /dev/null
@@ -1,754 +0,0 @@
-<?php
-
-class skin_modcp {
-
-function mm_start() {
-global $ibforums;
-return <<<EOF
-<option value='-1'>------------------------------</option>
-<option value='-1'>{$ibforums->lang['mm_title']}</option>
-<option value='-1'>------------------------------</option>
-EOF;
-}
-
-
-function mm_entry($id, $title) {
-global $ibforums;
-return <<<EOF
-<option value='t_{$id}'>--  $title</option>
-EOF;
-}
-
-function mm_end() {
-global $ibforums;
-return <<<EOF
-
-EOF;
-}
-
-
-function mod_cp_start() {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div align='center' class='pformstrip'>
-  <a href='{$ibforums->base_url}act=modcp&amp;CODE=showforums'>{$ibforums->lang['menu_forums']}</a> &middot;
-  <a href='{$ibforums->base_url}act=modcp&amp;CODE=members'>{$ibforums->lang['menu_users']}</a> &middot;
-  <a href='{$ibforums->base_url}act=modcp&amp;CODE=ip'>{$ibforums->lang['menu_ip']}</a>
- </div>
-</div>
-<br />
-EOF;
-}
-
-
-function modtopicview_start($tid,$forumname, $fid, $title) {
-global $ibforums;
-return <<<EOF
-
-<form name='ibform' action='{$ibforums->base_url}' method='POST'>
-<input type='hidden' name='s' value='{$ibforums->session_id}'>
-<input type='hidden' name='act' value='modcp'>
-<input type='hidden' name='CODE' value='domodposts'>
-<input type='hidden' name='f' value='{$fid}'>
-<input type='hidden' name='tid' value='{$tid}'>
-<strong>{$ibforums->lang['cp_mod_posts_title2']} $forumname</strong>
-<br />$pages
-
-
-<div class='tableborder'>
-  <div class='maintitle'>$title</div>
-
-                
-EOF;
-}
-
-
-function modpost_topicstart($forumname, $fid) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cp_mod_posts_title2']} $forumname</div>
-  <table width='100%' cellpadding='4' cellspacing='1'>
-  <tr>
-	<th class='pformstrip' width='40%' align='left'>{$ibforums->lang['cp_3_title']}</th>
-	<th class='pformstrip' width='20%' align='center'>{$ibforums->lang['cp_3_replies']}</th>
-	<th class='pformstrip' width='20%' align='center'>{$ibforums->lang['cp_3_approveall']}</th>
-	<th class='pformstrip' width='20%' align='center'>{$ibforums->lang['cp_3_viewall']}</th>
-  </tr>
-	 
-EOF;
-}
-
-function modpost_topicentry($title, $tid, $replies, $fid) {
-global $ibforums;
-return <<<EOF
-
-   <tr>
-	 <td class='row1' width='40%' align='left'><b><a href='{$ibforums->base_url}act=ST&amp;f=$fid&amp;t=$tid' target='_blank'>$title</a></b></td>
-	 <td class='row1' width='20%' align='center'>$replies</td>
-	 <td class='row1' width='20%' align='center'><a href='{$ibforums->base_url}act=modcp&amp;f=$fid&amp;tid=$tid&amp;CODE=modtopicapprove'>{$ibforums->lang['cp_3_approveall']}</a></td>
-	 <td class='row1' width='20%' align='center'><a href='{$ibforums->base_url}act=modcp&amp;f=$fid&amp;tid=$tid&amp;CODE=modtopicview'>{$ibforums->lang['cp_3_viewall']}</a></td>
-   </tr>
-	 
-EOF;
-}
-
-function modpost_topicend() {
-global $ibforums;
-return <<<EOF
-
-   </table>
-</div>
-	 
-EOF;
-}
-
-
-
-function modtopics_start($pages,$forumname, $fid) {
-global $ibforums;
-return <<<EOF
-
-<form name='ibform' action='{$ibforums->base_url}' method='POST'>
-<input type='hidden' name='s' value='{$ibforums->session_id}'>
-<input type='hidden' name='act' value='modcp'>
-<input type='hidden' name='CODE' value='domodtopics'>
-<input type='hidden' name='f' value='{$fid}'>
-<strong>{$ibforums->lang['cp_mod_topics_title2']} $forumname</strong>
-<br />$pages	 
-EOF;
-}
-
-function modtopics_end() {
-global $ibforums;
-return <<<EOF
-
-<div class='tableborder'>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['cp_1_go']}' class='forminput' /></div>
-</div>
-</form>
-	 
-EOF;
-}
-
-
-function mod_topic_title($title, $topic_id) {
-global $ibforums;
-return <<<EOF
-
-<div class='tableborder'>
-  <div class='titlemedium'><select name='TID_$topic_id' class='forminput'><option value='approve'>{$ibforums->lang['cp_1_approve']}</option><option value='remove'>{$ibforums->lang['cp_1_remove']}</option><option value='leave'>{$ibforums->lang['cp_1_leave']}</option></select>&nbsp;&nbsp; $title</div>
-                
-EOF;
-}
-
-
-function mod_postentry($data) {
-global $ibforums;
-return <<<EOF
-   <table width='100%' cellspacing='1'>	
-   <tr>
-	   <td valign='top' class='row1' nowrap="nowrap"><span class='normalname'>{$data['member']['name']}</span><br /><br />{$data['member']['avatar']}<span class='postdetails'><br />{$data['member']['MEMBER_GROUP']}<br />{$data['member']['MEMBER_POSTS']}<br />{$data['member']['MEMBER_JOINED']}</span></td>
-	   <td valign='top' class='row1' width='100%'>
-		   <b>{$ibforums->lang['posted_on']} {$data['msg']['post_date']}</b><br /><br />
-		   <span class='postcolor'>
-			{$data['msg']['post']}
-		   </span>
-	   </td>
-	</tr>
-	</table>		  
-
-EOF;
-}
-
-function mod_postentry_checkbox($pid) {
-global $ibforums;
-return <<<EOF
- <div class='pformstrip' align='right'><select name='PID_$pid' class='forminput'><option value='approve'>{$ibforums->lang['cp_1_approve']}</option><option value='remove'>{$ibforums->lang['cp_1_remove']}</option><option value='leave'>{$ibforums->lang['cp_1_leave']}</option></select>&nbsp;&nbsp;{$ibforums->lang['cp_3_postno']}&nbsp;$pid</div>
-EOF;
-}
-
-
-function mod_topic_spacer() {
-global $ibforums;
-return <<<EOF
-
-</div>
-<br />
-
-EOF;
-}
-
-function results($text) {
-global $ibforums;
-return <<<EOF
-
-<tr>
-  <td colspan='2'>
-    <table cellpadding='2' cellspacing='1' border='0' width='100%' class='fancyborder' align='center'>
-     <tr>
-       <td><span class='pagetitle'>{$ibforums->lang['cp_results']}</span>
-       </td>
-     </tr>
-	  <tr>
-	    <td colspan='2'><b>$text</b></td>
-	  </tr>
-	 </table>
-   </td>
-  </tr>
-
-EOF;
-}
-
-
-function prune_confirm($tcount, $count, $link, $link_text, $key) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['mpt_confirm']}</div>
-  <div class='pformstrip'>{$ibforums->lang['cp_check_result']}</div>
-  <table width='100%' cellspacing='0'>
-   <tr>
-	<td class='pformleftw'><strong>{$ibforums->lang['cp_total_topics']}</strong></td>
-	<td class='pformright'>$tcount</td>
-   </tr>
-   <tr>
-	<td class='pformleftw'><span style='color:red;font-weight:bold;'>{$ibforums->lang['cp_total_match']}</span></td>
-	<td class='pformright'><span style='color:red;font-weight:bold;'>$count</span></td>
-   </tr>
-   </table>
-   <form action='{$ibforums->base_url}$link' method='post'>
-   <input type='hidden' name='key' value='$key' />
-   <div class='pformstrip' align='center'><input type='submit' class='forminput' value='$link_text' /></div>
-   </form>
-</div>
-<br />
-
-EOF;
-}
-
-function prune_splash($forum, $forums, $select) {
-global $ibforums;
-return <<<EOF
-
-<!-- IBF.CONFIRM -->
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cp_prune']} {$forum['name']}</div>
-  <div class='pformstrip'>{$ibforums->lang['mpt_help']}</div>
-  <div class='tablepad'>{$ibforums->lang['cp_prune_text']}</div>
-  <form name='ibform' action='{$ibforums->base_url}' method='POST'>
-  <input type='hidden' name='s' value='{$ibforums->session_id}'>
-  <input type='hidden' name='act' value='modcp'>
-  <input type='hidden' name='CODE' value='prune'>
-  <input type='hidden' name='f' value='{$forum['id']}'>
-  <input type='hidden' name='check' value='1'>
-  <div class='pformstrip'>{$ibforums->lang['mpt_title']}</div>
-   <table width='100%' cellspacing='0'>
-   <tr>
-	<td class='pformleftw'>{$ibforums->lang['cp_action']}</td>
-	<td class='pformright'><select name='df' class='forminput'>$forums</select></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'>{$ibforums->lang['cp_prune_days']}</td>
-	<td class='pformright'><input type='text' size='40' name='dateline' value='{$ibforums->input['dateline']}' class='forminput' /></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'>{$ibforums->lang['cp_prune_type']}</td>
-	<td class='pformright'>$select &nbsp; <input type='checkbox' id='cbox' name='ignore_pin' value='1' checked='checked' class='checkbox' />&nbsp;<label for='cbox'>{$ibforums->lang['mps_ignorepin']}</label></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'>{$ibforums->lang['cp_prune_replies']}</td>
-	<td class='pformright'><input type='text' size='40' name='posts' value='{$ibforums->input['posts']}' class='forminput' /></td>
-   </tr>
-   <tr>
-	<td class='pformleftw'>{$ibforums->lang['cp_prune_member']}</td>
-	<td class='pformright'><input type='text' size='40' name='member' value='{$ibforums->input['member']}' class='forminput' /></td>
-   </tr>
-   </table>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['cp_prune_sub1']}' class='forminput' /></div>
-  </form>
-</div>
-
-EOF;
-}
-
-
-
-
-function edit_user_form($profile) {
-global $ibforums;
-return <<<EOF
-
-<form name='ibform' action='{$ibforums->base_url}act=modcp&amp;CODE=compedit&amp;memberid={$profile['id']}' method='post'>
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cp_edit_user']}: {$profile['name']}</div>
-  <table class='tablebasic'>
-  <tr>
-   <td class='pformleft'>{$ibforums->lang['cp_remove_av']}</td>
-   <td class='pformright'><select name='avatar' class='forminput'><option value='0'>{$ibforums->lang['no']}</option><option value='1'>{$ibforums->lang['yes']}</option></select></td>
-  </tr>
-  <tr>
-   <td class='pformleft'>{$ibforums->lang['cp_remove_photo']}</td>
-   <td class='pformright'><select name='photo' class='forminput'><option value='0'>{$ibforums->lang['no']}</option><option value='1'>{$ibforums->lang['yes']}</option></select></td>
-  </tr>
-  <tr>
-   <td class='pformleft'>{$ibforums->lang['cp_edit_website']}</td>
-   <td class='pformright'><input type='text' size='40' name='website' value='{$profile['website']}' class='forminput' /></td>
-  </tr>
-  <tr>
-   <td class='pformleft'>{$ibforums->lang['cp_edit_location']}</td>
-   <td class='pformright'><input type='text' size='40' name='location' value='{$profile['location']}' class='forminput' /></td>
-  </tr>
-  <tr>
-   <td class='pformleft'>{$ibforums->lang['cp_edit_interests']}</td>
-   <td class='pformright'><textarea cols='50' rows='3' name='interests' class='forminput'>{$profile['interests']}</textarea></td>
-  </tr>
-   <tr>
-   <td class='pformleft'>{$ibforums->lang['cp_edit_signature']}</td>
-   <td class='pformright'><textarea cols='50' rows='5' name='signature' class='forminput'>{$profile['signature']}</textarea></td>
-  </tr>
-  </table>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['cp_find_2_submit']}' class='forminput' /></div>
-</div>
-</form>
-
-EOF;
-}
-
-
-function find_two($select) {
-global $ibforums;
-return <<<EOF
-<form name='ibform' action='{$ibforums->base_url}act=modcp&amp;CODE=doedituser' method='post'>
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cp_edit_user']}</div>
-  <table class='tablebasic' cellspacing="1" cellpadding="3">
-  <tr>
-   <td width='40%' class='row1'>{$ibforums->lang['cp_find_2_user']}</td>
-   <td class='row1'>$select</td>
-  </tr>
-  </table>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['cp_find_2_submit']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-function find_user() {
-global $ibforums;
-return <<<EOF
-
-<form name='ibform' action='{$ibforums->base_url}act=modcp&amp;CODE=dofinduser' method='post'>
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cp_edit_user']}</div>
-  <table class='tablebasic' cellspacing="1" cellpadding="3">
-  <tr>
-   <td width='40%' class='row1'>{$ibforums->lang['cp_find_user']}</td>
-   <td class='row1'><input type='text' size='40' name='name' value='' class='forminput' /></td>
-  </tr>
-  </table>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['cp_find_submit']}' class='forminput' /></div>
-</div>
-</form>
-
-EOF;
-}
-
-function ip_start_form($ip="") {
-global $ibforums;
-return <<<EOF
-
-<form name='ibform' action='{$ibforums->base_url}' method='post'>
-<input type='hidden' name='s' value='{$ibforums->session_id}'>
-<input type='hidden' name='act' value='modcp'>
-<input type='hidden' name='CODE' value='doip'>
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['menu_ip']}</div>
- <table class='tablebasic'>
- <tr>
-   <td width='40%' class='row1'>{$ibforums->lang['ip_enter']}</td>
-   <td class='row1'>
-	 <input type='text' size='20' maxlength='24' name='ip' value='{$ip}' class='forminput' />
-	 <select name='iptool' class='forminput'>
-		 <option value='resolve'>{$ibforums->lang['ip_resolve']}</option>
-		 <option value='posts'>{$ibforums->lang['ip_posts']}</option>
-		 <option value='members'>{$ibforums->lang['ip_members']}</option>
-	 </select>
-   </td>
-  </tr>
-  </table>
-  <div class='pformstrip' align='center'><input type='submit' value='{$ibforums->lang['ip_submit']}' class='forminput' /></div>
-</div>
-</form>
-<br />
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['iph_title']}</div>
- <div class='tablepad' style='line-height:150%'>{$ibforums->lang['ip_desc_text']}<br /><br />{$ibforums->lang['ip_warn_text']}</div>
-</div>
-EOF;
-}
-
-function ip_member_start($pages) {
-global $ibforums;
-return <<<EOF
-
-<div align='left'>$pages</div>
-<br />
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['ipm_title']}</div>
- <table cellpadding='6' class='tablebasic'>
- <tr>
-  <th class='pformstrip' width='20%'>{$ibforums->lang['ipm_name']}</th>
-  <th class='pformstrip' width='20%'>{$ibforums->lang['ipm_ip']}</th>
-  <th class='pformstrip' width='10%'>{$ibforums->lang['ipm_posts']}</th>
-  <th class='pformstrip' width='20%'>{$ibforums->lang['ipm_reg']}</th>
-  <th class='pformstrip' width='30%'>{$ibforums->lang['ipm_options']}</th>
- </tr>
-
-EOF;
-}
-
-function ip_member_row($row) {
-global $ibforums;
-return <<<EOF
-
-	 <tr>
-	  <td class='row2'>{$row['name']}</td>
-	  <td class='row2'>{$row['ip_address']}</td>
-	  <td class='row2'>{$row['posts']}</td>
-	  <td class='row2'>{$row['joined']}</td>
-	  <td class='row2' align='center'><a href='{$ibforums->base_url}showuser={$row['id']}' target='_blank'>{$ibforums->lang['ipm_view']}</a>
-	  | <a href='{$ibforums->base_url}act=modcp&amp;CODE=doedituser&amp;memberid={$row['id']}'>{$ibforums->lang['ipm_edit']}</a></td>
-	 </tr>
-
-EOF;
-}
-
-function ip_member_end($pages) {
-global $ibforums;
-return <<<EOF
-
-	 </table>
-</div>
-<br />
-<div align='left'>$pages</div>
-EOF;
-}
-
-function splash($tcount, $pcount, $forum) {
-global $ibforums;
-return <<<EOF
-
- <tr>
-  <td class='pagetitle'>{$ibforums->lang['cp_welcome']}</td>
- </tr>
- <tr>
-  <td>{$ibforums->lang['cp_welcome_text']}</td>
- </tr>
- <tr>
-  <td>
-    <table cellpadding='2' cellspacing='1' border='0' width='75%' class='fancyborder' align='center'>
-	  <tr>
-	    <td><b>{$ibforums->lang['cp_mod_in']}</b></td>
-	    <td>$forum</td>
-	  </tr>
-	  <tr>
-	    <td><b>{$ibforums->lang['cp_topics_wait']}</b></td>
-	    <td>$tcount</td>
-	  </tr>
-	  <tr>
-	    <td><b>{$ibforums->lang['cp_posts_wait']}</b></td>
-	    <td>$pcount</td>
-	  </tr>
-	 </table>
-   </td>
-  </tr>
-
-EOF;
-}
-
-
-
-
-
-
-
-function mod_exp($words) {
-global $ibforums;
-return <<<EOF
-
-
-
-                <tr>
-                <td class='row1' colspan='2'>$words</td>
-                </tr>
-
-
-EOF;
-}
-
-function end_form($action) {
-global $ibforums;
-return <<<EOF
-
-
-                <tr>
-                <td class='row2' align='center' colspan='2'>
-                <input type="submit" name="submit" value="$action" class='forminput'>
-                </td></tr></table>
-                </td></tr></table>
-                </form>
-
-
-EOF;
-}
-
-function forum_row($info) {
-global $ibforums;
-return <<<EOF
-<!-- Forum {$info['id']} entry -->
-  <tr>
-	<td class='row4' align='center' width='5%'>{$info['folder_icon']}</td>
-	<td class="row4" colspan=2><b><a href="{$ibforums->base_url}act=modcp&amp;CODE=showtopics&amp;f={$info['id']}">{$info['name']}</a></b><br /><span class='desc'>{$info['description']}</span><br />{$info['moderator']}</td>
-	<td class="row2" align="center">{$info['q_topics']}</td>
-	<td class="row2" align="center">{$info['q_posts']}</td>
-	<td class="row2">{$info['last_post']}<br />{$ibforums->lang['in']}: {$info['last_topic']}<br />{$ibforums->lang['by']}: {$info['last_poster']}</td>
-	<td class="row2" align="center">{$info['select_button']}</td>        
-  </tr>
-<!-- End of Forum {$info['id']} entry -->
-EOF;
-}
-
-
-function subforum_row($info) {
-global $ibforums;
-return <<<EOF
-<!-- Forum {$info['id']} entry -->
-  <tr>
-	<td class='row4' align='center' width='5%'>&nbsp;</td>
-	<td class='row4' align='center' width='5%'>{$info['folder_icon']}</td>
-	<td class="row2"><b><a href="{$ibforums->base_url}act=modcp&amp;CODE=showtopics&amp;f={$info['id']}">{$info['name']}</a></b><br /><span class='desc'>{$info['description']}</span><br />{$info['moderator']}</td>
-	<td class="row2" align="center">{$info['q_topics']}</td>
-	<td class="row2" align="center">{$info['q_posts']}</td>
-	<td class="row2">{$info['last_post']}<br />{$ibforums->lang['in']}: {$info['last_topic']}<br />{$ibforums->lang['by']}: {$info['last_poster']}</td>
-	<td class="row2" align="center"><input type='radio' name='f' value='{$info['id']}' /></td>        
-  </tr>
-<!-- End of Forum {$info['id']} entry -->
-EOF;
-}
-
-function forum_page_start() {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->base_url}act=modcp&amp;CODE=fchoice' method='post'>
-<div class='tableborder'>
-  <table class='tablebasic' cellspacing="1" cellpadding="3">
-EOF;
-}
-
-
-function cat_row($cat_name) {
-global $ibforums;
-return <<<EOF
-  <tr>
-	<td colspan='7' class='maintitle'>$cat_name</td>
-  </tr>
-  <tr> 
-	<th class='titlemedium' align='left' width='5%'>&nbsp;</th>
-	<th width="35%" class='titlemedium' colspan='2'>{$ibforums->lang['cat_name']}</th>
-	<th width="15%" class='titlemedium'>{$ibforums->lang['f_q_topics']}</th>
-	<th width="15%" class='titlemedium'>{$ibforums->lang['f_q_posts']}</th>
-	<th width="25%" class='titlemedium'>{$ibforums->lang['last_post_info']}</th>
-	<th width="5%"  class='titlemedium'>{$ibforums->lang['f_select']}</th>
-  </tr>
-EOF;
-}
-
-function forum_page_end() {
-global $ibforums;
-return <<<EOF
-  <tr>
-   <td colspan='7' class='row2' align='right'><b>{$ibforums->lang['f_w_selected']}</b>
-   <select class='forminput' name='fact'>
-   <option value='mod_topic'>{$ibforums->lang['cp_mod_topics']}</option>
-   <option value='mod_post'>{$ibforums->lang['cp_mod_posts']}</option>
-   <option value='prune_move'>{$ibforums->lang['cp_prune_posts']}</option>
-   </select>&nbsp;<input type='submit' value='{$ibforums->lang['f_go']}' class='forminput' />
-   </td>
-  </tr>
-  </table>
-</div>
-</form>
-EOF;
-}
-
-function mod_simple_page($title="",$msg="") {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>$title</div>
-  <div class='tablepad'>$msg</div>
-</div>
-
-EOF;
-}
-
-function ip_post_results($uid="",$count="") {
-global $ibforums;
-return <<<EOF
-{$ibforums->lang['ipp_found']} $count
-<br />
-<br />
-<a target='_blank' href='{$ibforums->base_url}act=Search&amp;CODE=show&amp;searchid=$uid&amp;search_in=posts&amp;result_type=posts'>{$ibforums->lang['ipp_click']}</a>
-
-EOF;
-}
-
-function start_topics($pages,$info) {
-global $ibforums;
-return <<<EOF
-
-<script language='javascript'>
-<!--
- function checkdelete() {
- 
-   isDelete = document.topic.tact.options[document.topic.tact.selectedIndex].value;
-   
-   msg = '';
-   
-   if (isDelete == 'delete')
-   {
-	   msg = "{$ibforums->lang['cp_js_delete']}";
-	   
-	   formCheck = confirm(msg);
-	   
-	   if (formCheck == true)
-	   {
-		   return true;
-	   }
-	   else
-	   {
-		   return false;
-	   }
-   }
- }
-//-->
-</script>
-<form action='{$ibforums->base_url}act=modcp&amp;f={$info['id']}&amp;CODE=topicchoice' method='post' name='topic' onsubmit='return checkdelete();'>
-<div class='pagelinks'>$pages</div>
-<div align='right'>
-  <a href='{$ibforums->base_url}act=modcp&amp;fact=mod_topic&amp;CODE=fchoice&amp;f={$info['id']}'>{$ibforums->lang['cp_mod_topics']}</a> &middot;
-  <a href='{$ibforums->base_url}act=modcp&amp;fact=mod_post&amp;CODE=fchoice&amp;f={$info['id']}'>{$ibforums->lang['cp_mod_posts']}</a> &middot;
-  <a href='{$ibforums->base_url}act=modcp&amp;fact=prune_move&amp;CODE=fchoice&amp;f={$info['id']}'>{$ibforums->lang['cp_prune_posts']}</a>
-</div>
-<br />
-<div class='tableborder'>
-  <div class='maintitle'>{$info['name']} [ <a target='_blank' href='{$ibforums->base_url}showforum={$info['id']}'>{$ibforums->lang['new_show_forum']}</a> ]</div>
-  <table width='100%' border='0' cellspacing='1' cellpadding='4'>
-  <tr> 
-	<td class='titlemedium' style='width:5px'>&nbsp;</td>
-	<td class='titlemedium' style='width:5px'>&nbsp;</td>
-	<td width='40%' class='titlemedium'>{$ibforums->lang['h_topic_title']}</td>
-	<td width='15%' align='center' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_topic_starter']}</td>
-	<td width='7%' align='center' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_replies']}</td>
-	<td width='8%' align='center' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_hits']}</td>
-	<td width='25%' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['h_last_action']}</td>
-	<td width='5%' nowrap="nowrap" class='titlemedium'>{$ibforums->lang['f_select']}</td>
-  </tr>
-
-EOF;
-}
-
-function show_no_topics() {
-global $ibforums;
-return <<<EOF
-  <tr> 
-	<td class='row4' colspan='8' align='center'>
-		<br />
-		 <b>{$ibforums->lang['fv_no_topics']}</b>
-		<br /><br />
-	</td>
-  </tr>
-EOF;
-}
-
-function topic_row($data) {
-global $ibforums;
-return <<<EOF
-    <!-- Begin Topic Entry {$data['tid']} -->
-    <tr> 
-	  <td align='center' class='row4'>{$data['folder_img']}</td>
-      <td align='center' class='row2'>{$data['topic_icon']}</td>
-      <td class='row4'>{$data['prefix']} <a target='_blank' href='{$ibforums->base_url}showtopic={$data['tid']}' title='{$ibforums->lang['topic_started_on']} {$data['start_date']}'>{$data['title']}</a><br /><span class='desc'>{$data['description']}</span></td>
-      <td align='center' class='row2'>{$data['starter']}</td>
-      <td align='center' class='row4'>{$data['posts']}</td>
-      <td align='center' class='row2'>{$data['views']}</td>
-      <td class='row2'>{$data['last_post']}<br />{$data['last_text']} <b>{$data['last_poster']}</b></td>
-      <td align='center' class='row2'><input type='checkbox' name='TID_{$data['real_tid']}' value='1' /></td>
-    </tr>
-    <!-- End Topic Entry {$data['tid']} -->
-EOF;
-}
-
-function topics_end($data) {
-global $ibforums;
-return <<<EOF
-  </table>
-  <div class='pformstrip' align='center'>
-     {$ibforums->lang['t_w_selected']}
-	 <select class='forminput' name='tact'>
-	 <option value='close'>{$ibforums->lang['cpt_close']}</option>
-	 <option value='open'>{$ibforums->lang['cpt_open']}</option>
-	 <option value='pin'>{$ibforums->lang['cpt_pin']}</option>
-	 <option value='unpin'>{$ibforums->lang['cpt_unpin']}</option>
-	 <option value='move'>{$ibforums->lang['cpt_move']}</option>
-	 <option value='delete'>{$ibforums->lang['cpt_delete']}</option>
-	 <!--IBF.MMOD-->
-	 </select> &nbsp;<input type='submit' value='{$ibforums->lang['f_go']}' class='forminput' />
-  </div>
-</div>
-</form>
-
-EOF;
-}
-
-
-
-
-function move_checked_form_start($forum_name, $fid) {
-global $ibforums;
-return <<<EOF
-<form action='{$ibforums->base_url}act=modcp&amp;CODE=topicchoice&amp;tact=domove&amp;f=$fid' method='post'>
-<div class='tableborder'>
- <div class='maintitle'>{$ibforums->lang['cp_tmove_start']} $forum_name</div>
- <table class='tablebasic'>
-EOF;
-}
-
-function move_checked_form_entry($tid, $title) {
-global $ibforums;
-return <<<EOF
-  <tr>
-   <td class='row1' width='10%' align='center'><input type='checkbox' name='TID_$tid' value='1' checked="checked" /></td>
-   <td class='row1' width='90%' align='left'><strong>$title</strong></td>
-  </tr>
-EOF;
-}
-
-function move_checked_form_end($jump_html) {
-global $ibforums;
-return <<<EOF
-
-   </table>
-   <div align='center' class='tablepad'>{$ibforums->lang['cp_tmove_to']}&nbsp;&nbsp;<select class='forminput' name='df'>$jump_html</select></div>
-   <div align='center' class='pformstrip'><input type='submit' value='{$ibforums->lang['cp_tmove_end']}' class='forminput' /></div>
- </div>
-</form>
-EOF;
-}
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_msg.php b/upload/Skin/s1/skin_msg.php
deleted file mode 100644
index eba39047..00000000
--- a/upload/Skin/s1/skin_msg.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?php
-
-class skin_msg {
-
-
-function preview($data) {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['pm_preview']}</div>
-<p>$data</p>
-EOF;
-}
-
-
-function pm_errors($data) {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['err_errors']}</div>
-<span class='postcolor'><p>$data<br /><br />{$ibforums->lang['pme_none_sent']}</p></span>
-EOF;
-}
-
-
-
-function pm_popup($text, $mid) {
-global $ibforums;
-return <<<EOF
-<script language='javascript'>
-<!--
- function goto_inbox() {
- 	opener.document.location.href = '{$ibforums->base_url}act=Msg&amp;CODE=01';
- 	window.close();
- }
- 
- function goto_this_inbox() {
- 	window.resizeTo('700','500');
- 	document.location.href = '{$ibforums->base_url}&act=Msg&CODE=01';
- }
- 
- function go_read_msg() {
- 	window.resizeTo('700','500');
- 	document.location.href = '{$ibforums->base_url}&act=Msg&CODE=03&VID=in&MSID=$mid';
- }
- 
-//-->
-</script>
-
-<table cellspacing='1' cellpadding='10' width='100%' height='100%' align='center' class='row1'>
-<tr>
-   <td id='phototitle' align='center'>{$ibforums->lang['pmp_title']}</td>
-</tr>
-<tr>
-   <td align='center'>$text</td>
-</tr>
-<tr>
-   <td align='center' style='font-size:12px;font-weight:bold'>
-   <a href='javascript:go_read_msg();'>{$ibforums->lang['pmp_get_last']}</a>
-   <br /><br />
-   <a href='javascript:goto_inbox();'>{$ibforums->lang['pmp_go_inbox']}</a> ( <a href='javascript:goto_this_inbox();'>{$ibforums->lang['pmp_thiswindow']}</a> )<br /><br /><a href='javascript:window.close();'>{$ibforums->lang['pmp_ignore']}</a></td>
-</tr>
-</table>
-EOF;
-}
-
-function archive_html_header() {
-global $ibforums;
-return <<<EOF
-<html>
- <head>
-  <title>Private Message Archive</title>
- </head>
- <style type='text/css'>
-	 BODY { font-family: Verdana, Tahoma, Arial, sans-serif;
-			font-size: 11px;
-			color: #000;
-			margin:0px;
-			padding:0px;
-			background-color:#FFF;
-			text-align:center
-		   }
-		   
-	#ipbwrapper { text-align:left; width:95%; margin-left:auto;margin-right:auto }
-	
-	html { overflow-x: auto; } 
-	
-	a:link, a:visited, a:active { text-decoration: underline; color: #000 }
-	a:hover { color: #465584; text-decoration:underline }
-	img        { vertical-align:middle; border:0px }
-	
-	.post1 { background-color: #F5F9FD }
-	.post2 { background-color: #EEF2F7 }
-	
-	/* Common elements */
-	.row1 { background-color: #F5F9FD }
-	.row2 { background-color: #DFE6EF }
-	.row3 { background-color: #EEF2F7 }
-	.row4 { background-color: #E4EAF2 }
-	
-	/* tableborders gives the white column / row lines effect */
-	.plainborder { border:1px solid #345487;background-color:#F5F9FD }
-	.tableborder { border:1px solid #345487;background-color:#FFF; padding:0; margin:0 }
-	.tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px;  }
-	.tablepad    { background-color:#F5F9FD;padding:6px }
-	.tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }
-	
-	.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px }
-	#QUOTE { font-family: Verdana, Arial; font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-	#CODE  { font-family: Courier, Courier New, Verdana, Arial;  font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-
-	
-	/* Main table top (dark blue gradient by default) */
-	.maintitle { vertical-align:middle;font-weight:bold; color:#FFF; background-color:D1DCEB;padding:8px 0px 8px 5px; background-image: url({$ibforums->vars['board_url']}/style_images/<#IMG_DIR#>/tile_back.gif) }
-	.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-	.maintitle a:hover { text-decoration: underline }
-    
-    /* Topic View elements */
-	.signature   { font-size: 10px; color: #339; line-height:150% }
-	.postdetails { font-size: 10px }
-	.postcolor   { font-size: 12px; line-height: 160% }
- </style>
- <body>
- <div id='ipbwrapper'>
-EOF;
-}
-
-function archive_html_entry($info) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><img src="{$ibforums->vars['board_url']}/style_images/<#IMG_DIR#>/f_norm.gif" alt='PM' />&nbsp;PM: {$info['msg_title']}</div>
- <div class='tablefill'><div class='postcolor'>{$info['msg_content']}</div></div>
- <div class='pformstrip'>Sent by <b>{$info['msg_sender']}</b> on {$info['msg_date']}</div>
-</div>
-<br />
-EOF;
-}
-
-function archive_html_entry_sent($info) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><img src="{$ibforums->vars['board_url']}/style_images/<#IMG_DIR#>/f_moved.gif" alt='PM' />&nbsp;PM: {$info['msg_title']}</div>
- <div class='tablefill'><div class='postcolor'>{$info['msg_content']}</div></div>
- <div class='pformstrip'>Sent to <b>{$info['msg_sender']}</b> on {$info['msg_date']}</div>
-</div>
-<br />
-EOF;
-}
-
-function archive_html_footer() {
-global $ibforums;
-return <<<EOF
-  </div>
- </body>
-</html>
-EOF;
-}
-
-function archive_complete() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['arc_comp_title']}</div>
-<p>{$ibforums->lang['arc_complete']}</p>
-EOF;
-}
-
-function archive_form($jump_html="") {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Msg' />
-<input type='hidden' name='CODE' value='15' />
-<div class="pformstrip">{$ibforums->lang['archive_title']}</div>
-<p>{$ibforums->lang['archive_text']}</p>
-<table width="100%" style="padding:6px">
-<tr>
-   <td><b>{$ibforums->lang['arc_folders']}</b></td>
-   <td>$jump_html</td>
-</tr>
-<tr>
-   <td><b>{$ibforums->lang['arc_dateline']}</b></td>
-   <td valign='middle'><select name='dateline' class='forminput'>
-	 <option value='1'>1</option>
-	 <option value='7'>7</option>
-	 <option value='30' selected='selected'>30</option>
-	 <option value='90'>90</option>
-	 <option value='365'>365</option>
-	 <option value='all'>{$ibforums->lang['arc_alldays']}</option>
-	 </select>&nbsp;&nbsp;{$ibforums->lang['arc_days']}
-	 <select name='oldnew' class='forminput'>
-	  <option value='newer' selected='selected'>{$ibforums->lang['arch_new']}</option>
-	  <option value='older'>{$ibforums->lang['arch_old']}</option>
-	 </select>
-   </td>
-</tr>
-<tr>
-   <td><b>{$ibforums->lang['arc_max']}</b></td>
-   <td valign='middle'><select name='number' class='forminput'><option value='5'>5</option><option value='10'>10</option><option value='20' selected>20</option><option value='30'>30</option><option value='40'>40</option><option value='50'>50</option></select></td>
-</tr>
-<tr>
-   <td><b>{$ibforums->lang['arc_delete']}</b></td>
-   <td valign='middle'><select name='delete' class='forminput'><option value='yes'>{$ibforums->lang['arc_yes']}</option><option value='no' selected='selected'>{$ibforums->lang['arc_no']}</option></select></td>
-</tr>
-<tr>
-   <td><b>{$ibforums->lang['arc_type']}</b></td>
-   <td valign='middle'><select name='type' class='forminput'><option value='xls' selected>{$ibforums->lang['arc_xls']}</option><option value='html'>{$ibforums->lang['arc_html']}</option></select></td>
-</tr>
-</table>
-<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['arc_submit']}" class='forminput' /></div>
-</form>
-EOF;
-}
-
-function No_msg_inbox() {
-global $ibforums;
-return <<<EOF
-      <tr>
-      <td class='row1' colspan='5' align='center'><b>{$ibforums->lang['inbox_no_msg']}</b></td>                
-      </tr>
-EOF;
-}
-
-function empty_folder_header() {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Msg' />
-<input type='hidden' name='CODE' value='dofolderdelete' />
-<div class="pformstrip">{$ibforums->lang['mi_prune_msg']}</div>
-<p>{$ibforums->lang['fd_text']}</p>
-<div class="tableborder">
-<table cellpadding='4' cellspacing='1' width="100%">
-<tr>
-  <th class="titlemedium">{$ibforums->lang['fd_name']}</th>
-  <th class="titlemedium">{$ibforums->lang['fd_count']}</th>
-  <th class="titlemedium">{$ibforums->lang['fd_empty']}</th>
-</tr>
-EOF;
-}
-
-function empty_folder_row($real, $id, $cnt) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class="row1"><strong>$real</strong></td>
-  <td class="row1" align="center">$cnt</td>
-  <td class="row1" align="center"><input type="checkbox" class="checkbox" name="its_$id" value="1" /></td>
-</tr>
-EOF;
-}
-
-function empty_folder_save_unread() {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class="row2" colspan='3' align='center'><input type="checkbox" class="checkbox" name="save_unread" value="1" checked="checked"/> <strong>{$ibforums->lang['fd_save_unread']}</strong></td>
-</tr>
-EOF;
-}
-
-function empty_folder_footer() {
-global $ibforums;
-return <<<EOF
-</table>
-<div class="pformstrip" align="center"><input type='submit' value='{$ibforums->lang['fd_continue']}' class='forminput'></div>
-</div>
-</form>
-EOF;
-}
-
-function prefs_header() {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Msg' />
-<input type='hidden' name='CODE' value='08' />
-<div class="pformstrip">{$ibforums->lang['prefs_current']}</div>
-<p>{$ibforums->lang['prefs_text_a']}</p>
-EOF;
-}
-
-
-function prefs_row($data) {
-global $ibforums;
-return <<<EOF
-<p><input type='text' name='{$data[ID]}' value='{$data[REAL]}' class='forminput' />{$data[EXTRA]}</p>
-EOF;
-}
-
-function prefs_add_dirs() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['prefs_new']}</div>
-<p>{$ibforums->lang['prefs_text_b']}</p>
-
-EOF;
-}
-
-function prefs_footer() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip" align="center"><input type='submit' value='{$ibforums->lang['prefs_submit']}' class='forminput'></div>
-</form>
-EOF;
-}
-
-
-
-function Address_header() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['address_current']}</div>
-EOF;
-}
-
-function Address_table_header() {
-global $ibforums;
-return <<<EOF
-<br />
-<div class="tableborder">
-<table cellpadding='4' cellspacing='1' width="100%">
-<tr>
-  <td class="titlemedium"><b>{$ibforums->lang['member_name']}</b></td>
-  <td width="60%" class="titlemedium"><b>{$ibforums->lang['enter_block']}</b></td>
-</tr>
-EOF;
-}
-
-
-function render_address_row($entry) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='row1 align='left' valign='middle'><a href='{$ibforums->base_url}act=Profile&amp;CODE=03&amp;MID={$entry['contact_id']}'><b>{$entry['contact_name']}</b></a> &nbsp; &nbsp;[ {$entry['contact_desc']} ]</td>
-  <td class='row1 align='left' valign='middle'>
-	   [ <a href='{$ibforums->base_url}act=Msg&amp;CODE=11&amp;MID={$entry['contact_id']}'>{$ibforums->lang['edit']}</a> ] :: [ <a href='{$ibforums->base_url}act=Msg&amp;CODE=10&amp;MID={$entry['contact_id']}'>{$ibforums->lang['delete']}</a> ]
-		&nbsp;&nbsp;( {$entry['text']} )
-  </td>
-</tr>
-EOF;
-}
-
-
-function Address_none() {
-global $ibforums;
-return <<<EOF
-<p style="text-align:center">{$ibforums->lang['address_none']}</p>
-EOF;
-}
-
-function end_address_table() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-<br />
-EOF;
-}
-
-function address_edit($data) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Msg'>
-<input type='hidden' name='CODE' value='12'>
-<input type='hidden' name='MID' value='{$data[MEMBER]['contact_id']}'>
-<div class="pformstrip">{$ibforums->lang['member_edit']}</div>
-<table width="100%">
-<tr>
- <td valign='middle' align='left'><b>{$data[MEMBER]['contact_name']}</b></td>
- <td valign='middle' align='left'>{$ibforums->lang['enter_desc']}<br /><input type='text' name='mem_desc' size='30' maxlength='60' value='{$data[MEMBER]['contact_desc']}' class='forminput' /></td>
- <td valign='middle' align='left'>{$ibforums->lang['allow_msg']}<br />{$data[SELECT]}</td>
-</tr>
-</table>
-<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['submit_address_edit']}" class='forminput' /></div>
-</form>
-EOF;
-}
-
-
-
-function address_add($mem_to_add) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Msg' />
-<input type='hidden' name='CODE' value='09' />
-<div class="pformstrip">{$ibforums->lang['member_add']}</div>
-<table style="padding:6px">
-<tr>
- <td valign='middle'>{$ibforums->lang['enter_a_name']}<br /><input type='text' name='mem_name' size='20' maxlength='40' value='$mem_to_add' class='forminput' /></td>
- <td valign='middle'>{$ibforums->lang['enter_desc']}<br /><input type='text' name='mem_desc' size='30' maxlength='60' value='' class='forminput' /></td>
- <td valign='middle'>{$ibforums->lang['allow_msg']}<br /><select name='allow_msg' class='forminput'><option value='yes' selected="selected">{$ibforums->lang['yes']}<option value='no'>{$ibforums->lang['no']}</select></td>
-</tr>
-</table>
-<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['submit_address']}" class='forminput' /></div>
-</form>
-EOF;
-}
-
-
-
-
-
-function Render_msg($data) {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
-function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-if (posleft != 0) { x = posleft }
-if (postop  != 0) { y = postop  }
-
-if (!scroll) { scroll = 1 }
-if (!resize) { resize = 1 }
-
-if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-  X = (screen.width  - width ) / 2;
-  Y = (screen.height - height) / 2;
-}
-if (scroll != 0) { scroll = 1 }
-
-var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
-}
-//-->
-</script>
-<div class="pformstrip">{$data['msg']['title']}</div>
-<div align="right" style="padding:6px;font-weight:bold">
-  [ <a href='{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MSID={$data['msg']['msg_id']}&amp;MID={$data['member']['id']}&amp;fwd=1'>{$ibforums->lang['vm_forward_pm']}</a> | <a href='{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MID={$data['member']['id']}&amp;MSID={$data['msg']['msg_id']}'>{$ibforums->lang['pm_reply_link']}</a> ]
-</div>
-<div class="tableborder">
- <div class="titlemedium">&nbsp;&nbsp;{$ibforums->lang['m_pmessage']}</div>
- <table width='100%' cellpadding='3' cellspacing='1'>
-  <tr>
-      <td valign='middle' class='row4'><span class='normalname'><a href="{$ibforums->base_url}showuser={$data['member']['id']}">{$data['member']['name']}</a></span></td>
-        <td class='row4' valign='top'>
-        
-        <!-- POSTED DATE DIV -->
-        
-        <div align='left' class='row4' style='float:left;padding-top:4px;padding-bottom:4px'>
-        {$data[POST]['post_icon']}<span class='postdetails'><b>{$data['msg']['title']}</b>, {$data['msg']['msg_date']}</span>
-        </div>
-        
-        <!-- DELETE  DIV -->
-        
-        <div align='right'>
-          <a href='{$ibforums->base_url}CODE=05&amp;act=Msg&amp;MSID={$data['msg']['msg_id']}&amp;VID={$data['member']['VID']}'><{P_DELETE}></a>
-          &nbsp;<a href='{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MID={$data['member']['id']}&amp;MSID={$data['msg']['msg_id']}'><{P_QUOTE}></a>
-        </div>
-      
-      </td>
-    </tr>
-    <tr>
-      <td valign='top' class='post1'>
-        <span class='postdetails'>
-        {$data['member']['avatar']}
-        <br />{$data['member']['title']}
-        <br />{$data['member']['member_rank_img']}<br />
-        <br />{$data['member']['member_group']}
-        <br />{$data['member']['member_posts']}
-        <br />{$data['member']['member_joined']}
-        <br />
-        </span>
-        <img src='{$ibforums->vars['img_url']}/spacer.gif' alt='' width='160' height='1' /><br /> 
-      </td>
-      <td width='100%' valign='top' class='post1'><span class='postcolor'>{$data['msg']['message']}</span><span class="signature">{$data['member']['signature']}</span></td>
-    </tr>
-    <tr>
-      <td class='darkrow3' align='left'>[ <a href='{$ibforums->base_url}CODE=02&amp;act=Msg&amp;MID={$data['member']['id']}'>{$ibforums->lang['add_to_book']}</a> ]</td>
-      <td class='darkrow3' nowrap="nowrap" align='left'>
-      
-        <!-- EMAIL / WWW / MSGR -->
-      
-        <div align='left' class='darkrow3' style='float:left;'>
-        {$data['member']['addresscard']}{$data['member']['message_icon']}{$data['member']['email_icon']}{$data['member']['website_icon']}{$data['member']['integ_icon']}{$data['member']['icq_icon']}{$data['member']['aol_icon']}{$data['member']['yahoo_icon']}{$data['member']['msn_icon']}
-      </div>
-        
-        <!-- UP -->
-         
-        <div align='right'><a href='javascript:scroll(0,0);'><img src='{$ibforums->vars['img_url']}/p_up.gif' alt='Top' border='0' /></a></div>
-      </td>
-    </tr>
-</table>
-</div>
-<div style="float:left;width:auto;padding:6px">
-<form action="{$ibforums->base_url}" name='jump' method="post">
-<input type='hidden' name='act' value='Msg'>
-<input type='hidden' name='CODE' value='01'>
-{$ibforums->lang[goto_folder]}:</b>&nbsp; {$data['jump']}
-<input type='submit' name='submit' value='{$ibforums->lang[goto_submit]}' class='forminput' />
-</form>
-</div>
-<div align="right" style="padding:6px;font-weight:bold">
-  [ <a href='{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MSID={$data['msg']['msg_id']}&amp;MID={$data['member']['id']}&amp;fwd=1'>{$ibforums->lang['vm_forward_pm']}</a> | <a href='{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MID={$data['member']['id']}&amp;MSID={$data['msg']['msg_id']}'>{$ibforums->lang['pm_reply_link']}</a> ]
-</div>
-
-EOF;
-}
-
-function trackread_table_header() {
-global $ibforums;
-return <<<EOF
-<script language='JavaScript' type="text/javascript">
-<!--
-function CheckAll(fmobj) {
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled)) {
-			e.checked = fmobj.allbox.checked;
-		}
-	}
-}
-function CheckCheckAll(fmobj) {	
-	var TotalBoxes = 0;
-	var TotalOn = 0;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.name != 'allbox') && (e.type=='checkbox')) {
-			TotalBoxes++;
-			if (e.checked) {
-				TotalOn++;
-			}
-		}
-	}
-	if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}
-	else {fmobj.allbox.checked=false;}
-}
-//-->
-</script>
-<form action="{$ibforums->base_url}CODE=31&amp;act=Msg" name='trackread' method="post">
-<div class='pformstrip'>{$ibforums->lang['tk_read_messages']}</div>
-<p>{$ibforums->lang['tk_read_desc']}</p>
-<div class="tableborder">
-<table cellpadding='4' cellspacing='1' align='center' width='100%'>
-<tr>
-  <th align='left' width='5%' class='titlemedium'>&nbsp;</th>
-  <th align='left' width='30%' class='titlemedium'><b>{$ibforums->lang['message_title']}</b></th>
-  <th align='left' width='30%' class='titlemedium'><b>{$ibforums->lang['pms_message_to']}</b></th>
-  <th align='left' width='20%' class='titlemedium'><b>{$ibforums->lang['tk_read_date']}</b></th>
-  <th align='left' width='5%' class='titlemedium'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll(document.trackread);" /></th>
-</tr>
-EOF;
-}
-
-function trackread_row($data) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='row2' align='left' valign='middle'>{$data['icon']}</td>
-  <td class='row2' align='left'>{$data['title']}</td>
-  <td class='row2' align='left'><a href='{$ibforums->base_url}showuser={$data['memid']}'>{$data['to_name']}</a></td>
-  <td class='row2' align='left'>{$data['date']}</td>
-  <td class='row2' align='left'><input type='checkbox' name='msgid_{$data['msg_id']}' value='yes' class='forminput' onclick="CheckCheckAll(document.trackread);" /></td>
-</tr>
-EOF;
-}
-
-function trackread_end() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td align='right' class='titlemedium' colspan='5'><input type='submit' name='endtrack' value='{$ibforums->lang['tk_untrack_button']}' class='forminput' /> {$ibforums->lang['selected_msg']}</td>
-</tr>
-</table>
-</div>
-</form>
-<br />
-EOF;
-}
-
-
-
-
-
-
-
-function trackUNread_table_header() {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}CODE=32&amp;act=Msg" name='trackunread' method="post">
-<div class='pformstrip'>{$ibforums->lang['tk_unread_messages']}</div>
-<p>{$ibforums->lang['tk_unread_desc']}</p>
-<div class="tableborder">
-<table cellpadding='4' cellspacing='1' align='center' width='100%'>
-<tr>
-  <th align='left' width='5%' class='titlemedium'>&nbsp;</td>
-  <th align='left' width='30%' class='titlemedium'><b>{$ibforums->lang['message_title']}</b></th>
-  <th align='left' width='30%' class='titlemedium'><b>{$ibforums->lang['pms_message_to']}</b></th>
-  <th align='left' width='20%' class='titlemedium'><b>{$ibforums->lang['tk_unread_date']}</b></th>
-  <th align='left' width='5%' class='titlemedium'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll(document.trackunread);" /></th>
-</tr>
-EOF;
-}
-
-function trackUNread_row($data) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='row2' align='left' valign='middle'>{$data['icon']}</td>
-  <td class='row2' align='left'>{$data['title']}</td>
-  <td class='row2' align='left'><a href='{$ibforums->base_url}showuser={$data['memid']}'>{$data['to_name']}</a></td>
-  <td class='row2' align='left'>{$data['date']}</td>
-  <td class='row2' align='left'><input type='checkbox' name='msgid_{$data['msg_id']}' value='yes' class='forminput' onclick="CheckCheckAll(document.trackunread);" /></td>
-</tr>
-EOF;
-}
-
-function trackUNread_end() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td align='right' class='titlemedium' colspan='5'><input type='submit' name='delete' value='{$ibforums->lang['delete_button']}' class='forminput' /> {$ibforums->lang['selected_msg']}</td>
-</tr>
-</table>
-</div>
-</form>
-                  
-EOF;
-}
-
-
-
-
-function unsent_table_header() {
-global $ibforums;
-return <<<EOF
-<script language='JavaScript' type="text/javascript">
-<!--
-function CheckAll(cb) {
-	var fmobj = document.mutliact;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled)) {
-			e.checked = fmobj.allbox.checked;
-		}
-	}
-}
-function CheckCheckAll(cb) {	
-	var fmobj = document.mutliact;
-	var TotalBoxes = 0;
-	var TotalOn = 0;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.name != 'allbox') && (e.type=='checkbox')) {
-			TotalBoxes++;
-			if (e.checked) {
-				TotalOn++;
-			}
-		}
-	}
-	if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}
-	else {fmobj.allbox.checked=false;}
-}
-//-->
-</script>
-
-<form action="{$ibforums->base_url}CODE=06&amp;act=Msg&amp;saved=1" name='mutliact' method="post">
-<div class="pformstrip">{$ibforums->lang['pms_saved_title']}</div>
-<br />
-<div class="tableborder">
-<table cellpadding='4' cellspacing='1' align='center' width='100%'>
-<tr>
-  <th align='left' width='5%' class='titlemedium'>&nbsp;</td>
-  <th align='left' width='30%' class='titlemedium'><b>{$ibforums->lang['message_title']}</b></th>
-  <th align='left' width='30%' class='titlemedium'><b>{$ibforums->lang['pms_message_to']}</b></th>
-  <th align='left' width='20%' class='titlemedium'><b>{$ibforums->lang['pms_saved_date']}</b></th>
-  <th align='left' width='10%' class='titlemedium'><b>{$ibforums->lang['pms_cc_users']}</b></th>
-  <th align='left' width='5%' class='titlemedium'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll();" /></th>
-</tr>
-EOF;
-}
-
-
-function unsent_row($data) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='row2' align='left' valign='middle'>{$data['msg']['icon']}</td>
-  <td class='row2' align='left'><a href='{$ibforums->base_url}act=Msg&amp;CODE=21&amp;MSID={$data['msg']['msg_id']}'>{$data['msg']['title']}</a></td>
-  <td class='row2' align='left'><a href='{$ibforums->base_url}showuser={$data['msg']['recipient_id']}'>{$data['msg']['to_name']}</a></td>
-  <td class='row2' align='left'>{$data['msg']['date']}</td>
-  <td class='row2' align='center'>{$data['msg']['cc_users']}</td>
-  <td class='row2' align='left'><input type='checkbox' name='msgid_{$data['msg']['msg_id']}' value='yes' class='forminput' /></td>
-</tr>
-EOF;
-}
-
-function unsent_end() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td align='center' nowrap class='titlemedium' colspan='6'><input type='submit' name='delete' value='{$ibforums->lang['delete_button']}' class='forminput' /> {$ibforums->lang['selected_msg']}</td>
-</tr>
-</table>
-</div>
-</form>
-                  
-EOF;
-}
-
-function inbox_table_header($dirname, $info, $vdi_html="", $pages="") {
-global $ibforums;
-return <<<EOF
-<!-- inbox folder -->
-<script language='JavaScript' type="text/javascript">
-<!--
-
-var ie  = document.all  ? 1 : 0;
-//var ns4 = document.layers ? 1 : 0;
-
-function hl(cb)
-{
-   if (ie)
-   {
-	   while (cb.tagName != "TR")
-	   {
-		   cb = cb.parentElement;
-	   }
-   }
-   else
-   {
-	   while (cb.tagName != "TR")
-	   {
-		   cb = cb.parentNode;
-	   }
-   }
-   cb.className = 'hlight';
-}
-
-function dl(cb) {
-   if (ie)
-   {
-	   while (cb.tagName != "TR")
-	   {
-		   cb = cb.parentElement;
-	   }
-   }
-   else
-   {
-	   while (cb.tagName != "TR")
-	   {
-		   cb = cb.parentNode;
-	   }
-   }
-   cb.className = 'dlight';
-}
-
-function cca(cb) {
-   if (cb.checked)
-   {
-	   hl(cb);
-   }
-   else
-   {
-	   dl(cb);
-   }
-}
-	   
-function CheckAll(cb) {
-	var fmobj = document.mutliact;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled)) {
-			e.checked = fmobj.allbox.checked;
-			if (fmobj.allbox.checked)
-			{
-			   hl(e);
-			}
-			else
-			{
-			   dl(e);
-			}
-		}
-	}
-}
-function CheckCheckAll(cb) {	
-	var fmobj = document.mutliact;
-	var TotalBoxes = 0;
-	var TotalOn = 0;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.name != 'allbox') && (e.type=='checkbox')) {
-			TotalBoxes++;
-			if (e.checked) {
-				TotalOn++;
-			}
-		}
-	}
-	if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}
-	else {fmobj.allbox.checked=false;}
-}
-
-function select_read() {	
-	var fmobj = document.mutliact;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if ((e.type=='hidden') && (e.value == 1) && (! isNaN(e.name) ))
-		{
-			eval("fmobj.msgid_" + e.name + ".checked=true;");
-			hl(e);
-		}
-	}
-}
-
-function unselect_all() {	
-	var fmobj = document.mutliact;
-	for (var i=0;i<fmobj.elements.length;i++) {
-		var e = fmobj.elements[i];
-		if (e.type=='checkbox') {
-			e.checked=false;
-			dl(e);
-		}
-	}
-}
-
-//-->
-</script>
-<div class="pformstrip">$dirname</div>
-<table width="100%" style="padding:6px">
-<tr>
- <td valign="middle">
-  <!-- LEFT -->
-  <table style="width:250px" cellspacing="1" class="tableborder">
-   <tr>
-	<td class='row1' align='left' colspan='3'>{$info['full_messenger']}</td>
-   </tr>
-   <tr>
-	<td align='left' valign='middle' class='row2' colspan='3'><img src='{$ibforums->vars['img_url']}/bar_left.gif' border='0' width='4' height='11' align='middle' alt='' /><img src='{$ibforums->vars['img_url']}/bar.gif' border='0' width='{$info['img_width']}' height='11' align='middle' alt='' /><img src='{$ibforums->vars['img_url']}/bar_right.gif' border='0' width='4' height='11' align='middle' alt='' /></td>
-   </tr>
-   <tr>
-	 <td class='row1' width='33%' align='left' valign='middle'>0%</td>
-	 <td class='row1' width='33%' align='center' valign='middle'>50%</td>
-	 <td class='row1' width='33%' align='right' valign='middle'>100%</td>
-   </tr>
-  </table>
- </td>
- <!-- RIGHT -->
- <td align="right" valign="bottom" style="line-height:100%;">
-  $pages<br /><br />
-  <a href='javascript:select_read()'>{$ibforums->lang['pmpc_mark_read']}</a> :: <a href='javascript:unselect_all()'>{$ibforums->lang['pmpc_unmark_all']}</a><br /><br />
-  <form action="{$ibforums->base_url}CODE=01&amp;act=Msg" name='jump' method="post">
-  <b>{$ibforums->lang['goto_folder']}: </b>&nbsp; $vdi_html <input type='submit' name='submit' value='{$ibforums->lang['goto_submit']}' class='forminput' />
-  </form>
- </td>
-</tr>
-</table>
-
-<!-- INBOX TABLE -->
-  
-<form action="{$ibforums->base_url}CODE=06&amp;act=Msg" name='mutliact' method="post">
-<div class="tableborder">
-  <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	<th width='5%'  class='titlemedium'>&nbsp;</th>
-	<th width='35%' class='titlemedium'><a href='{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID={$info['vid']}&amp;sort=title&amp;st={$ibforums->input['st']}'><b>{$ibforums->lang['message_title']}</b></a></th>
-	<th width='30%' class='titlemedium'><a href='{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID={$info['vid']}&amp;sort=name&amp;st={$ibforums->input['st']}'><b>{$ibforums->lang['message_from']}</b></a></th>
-	<th width='25%' class='titlemedium'><a href='{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID={$info['vid']}&amp;sort={$info['date_order']}&amp;st={$ibforums->input['st']}'><b>{$ibforums->lang['message_date']}</b></a></th>
-	<th width='5%'  class='titlemedium'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll();" /></th>
-  </tr>
-EOF;
-}
-
-function inbox_row($data) {
-global $ibforums;
-return <<<EOF
-  <tr class="dlight">
-	<td align="center" valign='middle'>{$data['msg']['icon']}</td>
-	<td><a href='{$ibforums->base_url}act=Msg&amp;CODE=03&amp;VID={$data['stat']['current_id']}&amp;MSID={$data['msg']['msg_id']}'>{$data['msg']['title']}</a></td>
-	<td><a href='{$ibforums->base_url}showuser={$data['msg']['from_id']}'>{$data['msg']['from_name']}</a> {$data['msg']['add_to_contacts']}</td>
-	<td>{$data['msg']['date']}</td>
-	<td align="center"><input type='hidden' name='{$data['msg']['msg_id']}' value='{$data['msg']['read_state']}' /><input type='checkbox' name='msgid_{$data['msg']['msg_id']}' value='yes' class='forminput' onclick="cca(this);" /></td>
-  </tr>
-EOF;
-}
-
-function end_inbox($vdi_html, $amount_info="", $pages="") {
-global $ibforums;
-return <<<EOF
-  <tr>
-   <td align='right' class='titlemedium' colspan='5'>
-	 <input type='submit' name='move' value='{$ibforums->lang['move_button']}' class='forminput' /> $vdi_html {$ibforums->lang['move_or_delete']} <input type='submit' name='delete' value='{$ibforums->lang['delete_button']}' class='forminput' /> {$ibforums->lang['selected_msg']}
-  </td>
-</tr>
-</table>
-</div>
-</form>
-<div class="wrapmini" style="padding:6px"><{M_READ}>&nbsp;{$ibforums->lang['icon_read']}<br /><{M_UNREAD}>&nbsp;{$ibforums->lang['icon_unread']}</div>
-<div align="right" style="padding:6px">$pages<br /><i>$amount_info</i></div>
-EOF;
-}
-
-function send_form_footer() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td colspan='2' class='pformstrip'>{$ibforums->lang['msg_options']}</td>
-</tr>
-<tr>
- <td class="pformleft">&nbsp;</td>
- <td class="pformright">
-	<input type='checkbox' name='add_sent' value='yes' checked="checked" />&nbsp;<b>{$ibforums->lang['auto_sent_add']}</b>
-	<br /><input type='checkbox' name='add_tracking' value='1' />&nbsp;<b>{$ibforums->lang['vm_track_msg']}</b>
- </td>
-</tr>
-<tr>
- <td class='pformstrip' align='center' colspan='2'>
-  <input type="submit" value="{$ibforums->lang['submit_send']}" tabindex="4" accesskey="s" class='forminput' name='submit' />
-  <input type="submit" value="{$ibforums->lang['pm_pre_button']}" tabindex="5" class='forminput' name='preview' />
-  <input type="submit" value="{$ibforums->lang['pms_send_later']}" tabindex="6" class='forminput' name='save' />
- </td>
-</tr>
-</table>
-</form>
-EOF;
-}
-
-function Send_form($data) {
-global $ibforums;
-return <<<EOF
-
-<script language='javascript' type="text/javascript">
-<!--
-function find_users()
-{
-  url = "index.{$ibforums->vars['php_ext']}?act=legends&CODE=finduser_one&s={$ibforums->session_id}&entry=textarea&name=carbon_copy&sep=line";
-  window.open(url,'FindUsers','width=400,height=250,resizable=yes,scrollbars=yes'); 
-}
-//-->
-</script>
-<form action="{$ibforums->base_url}" method="post" name='REPLIER' onsubmit='return ValidateForm(1)'>
-<input type='hidden' name='act' value='Msg' />
-<input type='hidden' name='CODE' value='04' />
-<input type='hidden' name='MODE' value='01' />
-<input type='hidden' name='OID'  value='{$data['OID']}' />
-<table width="100%" cellspacing="0">
-<tr>
-  <td colspan='2' class='pformstrip'>{$ibforums->lang['to_whom']}</td>
-</tr>
-<tr>
-  <td class="pformleft">{$ibforums->lang['address_list']}</td>
-  <td class="pformright">{$data[CONTACTS]}&nbsp;</td>
-</tr>  
-<tr>
-  <td class="pformleft">{$ibforums->lang['enter_name']}</td>
-  <td class="pformright"><input type='text' name='entered_name' size='50' value='{$data[N_ENTER]}' tabindex="1" class='forminput' /></td>
-</tr>
-<!--IBF.MASS_PM_BOX-->
-<tr>
-  <td colspan='2' class='pformstrip'>{$ibforums->lang['enter_message']}</td>
-</tr>
-<tr>
-  <td class="pformleft">{$ibforums->lang['msg_title']}</td>
-  <td class="pformright"><input type='text' name='msg_title' size='40' tabindex="2" maxlength='40' value='{$data[O_TITLE]}' class='forminput' /></td>
-</tr>
-EOF;
-}
-
-
-
-function mass_pm_box($names="") {
-global $ibforums;
-return <<<EOF
-     
-<tr>
-<td colspan='2' class='pformstrip'>{$ibforums->lang['carbon_copy_title']}</td>
-</tr>
-<tr>
-<td class="pformleft">{$ibforums->lang['carbon_copy_desc']}</td>
-<td class='pformright'>
- <textarea name='carbon_copy' rows='5' cols='40'>$names</textarea><br />
- <input type='button' class='forminput' name='findusers' onclick='find_users()' value='{$ibforums->lang['find_user_names']}' />
-</td>
-</tr>
-EOF;
-}
-
-
-
-
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_online.php b/upload/Skin/s1/skin_online.php
deleted file mode 100644
index 2945e266..00000000
--- a/upload/Skin/s1/skin_online.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-class skin_online {
-
-
-
-function show_row($session) {
-global $ibforums;
-return <<<EOF
-              <!-- Entry for {$session['member_id']} -->
-              <tr>
-                <td class='row1'>{$session['member_name']}</td>
-                <td class='row1'>{$session['where_line']}</td>
-                <td class='row1' align='center'>{$session['running_time']}</td>
-                <td class='row1' align='center'>{$session['msg_icon']}</td>
-              </tr>
-              <!-- End of Entry -->
-EOF;
-}
-
-function Page_end($show_mem, $sort_order, $sort_key, $links) {
-global $ibforums;
-return <<<EOF
-            <!-- End content Table -->
-            <tr>
-            <td colspan='4' class='darkrow1' align='center' valign='middle'>
-             <form method='post' action='{$ibforums->base_url}act=Online&amp;CODE=listall'>
-             <b>{$ibforums->lang['s_by']}&nbsp;</b>
-             <select class='forminput' name='sort_key'>{$sort_key}</select>
-             <select class='forminput' name='show_mem'>&nbsp;{$show_mem}</select>
-             <select class='forminput' name='sort_order'>&nbsp;{$sort_order}</select>
-             <input type='submit' value='{$ibforums->lang['s_go']}' class='forminput'>
-             <form>
-            </td>
-            </tr>
-            </table>
-           </div>
-          <br />
-          <div align='left'>$links</div>
-EOF;
-}
-
-function Page_header($links) {
-global $ibforums;
-return <<<EOF
-	<script language='Javascript' type='text/javascript'>
-		<!--
-		function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-			if (posleft != 0) { x = posleft }
-			if (postop  != 0) { y = postop  }
-		
-			if (!scroll) { scroll = 1 }
-			if (!resize) { resize = 1 }
-		
-			if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-			  X = (screen.width  - width ) / 2;
-			  Y = (screen.height - height) / 2;
-			}
-			if (scroll != 0) { scroll = 1 }
-		
-			var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
-	     }
-		//-->
-	</script>
-	
-    <div align='left'>$links</div>
-    <br />
-    <div class="tableborder">
-      <div class='maintitle'>&nbsp;&nbsp;{$ibforums->lang['page_title']}</div>
-	  <table cellpadding='4' cellspacing='1' border='0' width='100%'>
-		<tr>
-		   <th align='left' width='30%' class='titlemedium'>{$ibforums->lang['member_name']}</th>
-		   <th align='left' width='30%' class='titlemedium'>{$ibforums->lang['where']}</th>
-		   <th align='center' width='20%' class='titlemedium'>{$ibforums->lang['time']}</th>
-		   <th align='left' width='10%' class='titlemedium'>&nbsp;</th>
-		</tr>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_poll.php b/upload/Skin/s1/skin_poll.php
deleted file mode 100644
index 4117d57f..00000000
--- a/upload/Skin/s1/skin_poll.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-class skin_poll {
-
-function poll_javascript($tid,$fid) {
-global $ibforums;
-return <<<EOF
-<script type="text/javascript">
-function go_gadget_show()
-{
-	window.location = "{$ibforums->base_url}&act=ST&f=$fid&t=$tid&mode=show&st={$ibforums->input['start']}";
-}
-function go_gadget_vote()
-{
-	window.location = "{$ibforums->base_url}&act=ST&f=$fid&t=$tid&st={$ibforums->input['start']}";
-}
-</script>
-EOF;
-}
-
-function button_vote() {
-global $ibforums;
-return <<<EOF
-<input type='submit' name='submit' value='{$ibforums->lang['poll_add_vote']}' title="{$ibforums->lang['tt_poll_vote']}" class='forminput' />
-EOF;
-}
-
-function button_null_vote() {
-global $ibforums;
-return <<<EOF
-<input type='submit' name='nullvote' value='{$ibforums->lang['poll_null_vote']}' title="{$ibforums->lang['tt_poll_null']}" class='forminput' />
-EOF;
-}
-
-function button_show_results() {
-global $ibforums;
-return <<<EOF
-<input type='button' value='{$ibforums->lang['pl_show_results']}' class='forminput' title="{$ibforums->lang['tt_poll_show']}" onclick='go_gadget_show()' />
-EOF;
-}
-
-function button_show_voteable() {
-global $ibforums;
-return <<<EOF
-<input type='button' name='viewresult' value='{$ibforums->lang['pl_show_vote']}'  title="{$ibforums->lang['tt_poll_svote']}" class='forminput' onclick='go_gadget_vote()' />
-EOF;
-}
-
-function edit_link($tid, $fid, $key="") {
-global $ibforums;
-return <<<EOF
-[ <a href="{$ibforums->base_url}act=Mod&amp;CODE=20&amp;f=$fid&amp;t=$tid&amp;auth_key=$key">{$ibforums->lang['ba_edit']}</a> ]
-EOF;
-}
-
-function delete_link($tid, $fid, $key="") {
-global $ibforums;
-return <<<EOF
-[ <a href="{$ibforums->base_url}act=Mod&amp;CODE=22&amp;f=$fid&amp;t=$tid&amp;auth_key=$key">{$ibforums->lang['ba_delete']}</a> ]
-EOF;
-}
-
-function Render_row_form($votes, $id, $answer) {
-global $ibforums;
-return <<<EOF
-    <tr>
-    <td class='row1' colspan='3'><input type="radio" name="poll_vote" value="$id" class="radiobutton" />&nbsp;<strong>$answer</strong></td>
-    </tr>
-EOF;
-}
-
-
-function poll_header($tid, $poll_q, $edit, $delete) {
-global $ibforums;
-return <<<EOF
-<!--IBF.POLL_JS-->
-<form action="{$ibforums->base_url}act=Poll&amp;t=$tid" method="post">
-<div align="right" class="pformstrip">$edit &nbsp; $delete</div>
-<div class="tablepad" align="center">
-<table cellpadding="5" align="center">
-<tr>
- <td colspan='3' align='center'><b>$poll_q</b></td>
-</tr>
-EOF;
-}
-
-function ShowPoll_footer() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-<div align="center" class="pformstrip"><!--IBF.VOTE-->&nbsp;<!--IBF.SHOW--></div>
-</form>
-                
-EOF;
-}
-
-function Render_row_results($votes, $id, $answer, $percentage, $width) {
-global $ibforums;
-return <<<EOF
-    <tr>
-    <td class='row1'>$answer</td>
-    <td class='row1'> [ <b>$votes</b> ] </td>
-    <td class='row1' align='left'><img src='{$ibforums->vars['img_url']}/bar_left.gif' border='0' width='4' height='11' align='middle' alt='' /><img src='{$ibforums->vars['img_url']}/bar.gif' border='0' width='$width' height='11' align='middle' alt='' /><img src='{$ibforums->vars['img_url']}/bar_right.gif' border='0' width='4' height='11' align='middle' alt='' />&nbsp;[$percentage%]</td>
-    </tr>
-EOF;
-}
-
-function show_total_votes($total_votes) {
-global $ibforums;
-return <<<EOF
-    <tr>
-    <td class='row1' colspan='3' align='center'><strong>{$ibforums->lang['pv_total_votes']}: $total_votes</strong></td>
-    </tr>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_post.php b/upload/Skin/s1/skin_post.php
deleted file mode 100644
index 30fa01ee..00000000
--- a/upload/Skin/s1/skin_post.php
+++ /dev/null
@@ -1,623 +0,0 @@
-<?php
-
-class skin_post {
-
-
-
-function nameField_unreg($data) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td colspan="2" class='pformstrip'>{$ibforums->lang['unreg_namestuff']}</td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['guest_name']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='40' name='UserName' value='$data' class='textinput' /></td>
-</tr>
-
-EOF;
-}
-
-
-function poll_box($data, $extra="") {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td colspan="2" class='pformstrip'>{$ibforums->lang['tt_poll_settings']}</td>
-</tr>
-<tr>
-  <td class='pformleft'><strong>{$ibforums->lang['poll_question']}</strong></td>
-  <td class='pformright'><input type='text' size='40' maxlength='250' name='pollq' value='{$ibforums->input['pollq']}' class='textinput' /></td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['poll_choices']}<br /><br />$extra</td>
-  <td class='pformright'><textarea cols='60' rows='12' name='PollAnswers' class='textinput'>$data</textarea><!--IBF.POLL_OPTIONS--></td>
-</tr>
-
-EOF;
-}
-
-function poll_options() {
-global $ibforums;
-return <<<EOF
-<br /><input type='checkbox' size='40' value='1' name='allow_disc' class='forminput' />&nbsp;{$ibforums->lang['poll_only']}
-EOF;
-}
-
-function poll_end_form($data) {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformstrip' align='center' style='text-align:center' colspan="2">
-	<input type="submit" name="submit" value="$data" tabindex='4' class='forminput' accesskey='s' />&nbsp;
-  </td>
-</tr>
-</table>
-</form>
-<br />
-<br clear="all" />
-EOF;
-}
-
-
-function pm_postbox_buttons($data) {
-global $ibforums;
-return <<<EOF
- <tr>
- <td class='pformstrip' colspan="2">{$ibforums->lang['ib_code_buttons']}</td>
- </tr>
- <tr>
-   <td class='pformleft'>
-	   <input type='radio' name='bbmode' class='radiobutton' value='ezmode' onclick='setmode(this.value)' />&nbsp;<b>{$ibforums->lang['bbcode_guided']}</b><br />
-	   <input type='radio' name='bbmode' class='radiobutton' value='normal' onclick='setmode(this.value)' checked="checked" />&nbsp;<b>{$ibforums->lang['bbcode_normal']}</b>
-	   <script type='text/javascript' src='html/ibfcode.js'></script>
-   </td>
-   <td class='pformright'>
-	   <input type='button' accesskey='b' value=' B '       onclick='simpletag("B")' class='codebuttons' name='B' style="font-weight:bold" onmouseover="hstat('bold')" />
-	   <input type='button' accesskey='i' value=' I '       onclick='simpletag("I")' class='codebuttons' name='I' style="font-style:italic" onmouseover="hstat('italic')" />
-	   <input type='button' accesskey='u' value=' U '       onclick='simpletag("U")' class='codebuttons' name='U' style="text-decoration:underline" onmouseover="hstat('under')" />
-	   
-	   <select name='ffont' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'FONT')"  onmouseover="hstat('font')">
-	   <option value='0'>{$ibforums->lang['ct_font']}</option>
-	   <option value='Arial' style='font-family:Arial'>{$ibforums->lang['ct_arial']}</option>
-	   <option value='Times' style='font-family:Times'>{$ibforums->lang['ct_times']}</option>
-	   <option value='Courier' style='font-family:Courier'>{$ibforums->lang['ct_courier']}</option>
-	   <option value='Impact' style='font-family:Impact'>{$ibforums->lang['ct_impact']}</option>
-	   <option value='Geneva' style='font-family:Geneva'>{$ibforums->lang['ct_geneva']}</option>
-	   <option value='Optima' style='font-family:Optima'>Optima</option>
-	   </select><select name='fsize' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'SIZE')" onmouseover="hstat('size')">
-	   <option value='0'>{$ibforums->lang['ct_size']}</option>
-	   <option value='1'>{$ibforums->lang['ct_sml']}</option>
-	   <option value='7'>{$ibforums->lang['ct_lrg']}</option>
-	   <option value='14'>{$ibforums->lang['ct_lest']}</option>
-	   </select><select name='fcolor' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'COLOR')" onmouseover="hstat('color')">
-	   <option value='0'>{$ibforums->lang['ct_color']}</option>
-	   <option value='blue' style='color:blue'>{$ibforums->lang['ct_blue']}</option>
-	   <option value='red' style='color:red'>{$ibforums->lang['ct_red']}</option>
-	   <option value='purple' style='color:purple'>{$ibforums->lang['ct_purple']}</option>
-	   <option value='orange' style='color:orange'>{$ibforums->lang['ct_orange']}</option>
-	   <option value='yellow' style='color:yellow'>{$ibforums->lang['ct_yellow']}</option>
-	   <option value='gray' style='color:gray'>{$ibforums->lang['ct_grey']}</option>
-	   <option value='green' style='color:green'>{$ibforums->lang['ct_green']}</option>
-	   </select>
-	   &nbsp; <a href='javascript:closeall();' onmouseover="hstat('close')">{$ibforums->lang['js_close_all_tags']}</a>
-	   <br />
-	   <input type='button' accesskey='h' value=' http:// ' onclick='tag_url()'            class='codebuttons' name='url' onmouseover="hstat('url')" />
-	   <input type='button' accesskey='g' value=' IMG '     onclick='tag_image()'          class='codebuttons' name='img' onmouseover="hstat('img')" />
-	   <input type='button' accesskey='e' value='  @  '     onclick='tag_email()'          class='codebuttons' name='email' onmouseover="hstat('email')" />
-	   <input type='button' accesskey='q' value=' QUOTE '   onclick='simpletag("QUOTE")'   class='codebuttons' name='QUOTE' onmouseover="hstat('quote')" />
-	   <input type='button' accesskey='p' value=' CODE '    onclick='simpletag("CODE")'    class='codebuttons' name='CODE' onmouseover="hstat('code')" />
-	   <input type='button' accesskey='l' value=' LIST '     onclick='tag_list()'          class='codebuttons' name="LIST" onmouseover="hstat('list')" />
-	   <!--<input type='button' accesskey='l' value=' SQL '     onclick='simpletag("SQL")'     class='codebuttons' name='SQL'>
-	   <input type='button' accesskey='t' value=' HTML '    onclick='simpletag("HTML")'    class='codebuttons' name='HTML'>-->
-	   <br />
-	   {$ibforums->lang['hb_open_tags']}:&nbsp;<input type='text' name='tagcount' size='3' maxlength='3' style='font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;' readonly="readonly" class='row1' value="0" />
-	   &nbsp;<input type='text' name='helpbox' size='50' maxlength='120' style='width:auto;font-size:10px;font-family:verdana,arial;border:0px' readonly="readonly" class='row1' value="{$ibforums->lang['hb_start']}" />
-	</td>
-   </tr>
-   <tr>
-     <td colspan="2" class='pformstrip'>{$ibforums->lang['post']}</td>
-   </tr>
-   <tr>
-     <td class='pformleft'>
-	   <!--SMILIE TABLE-->
-	   <br />
-	   (<a href='javascript:CheckLength()'>{$ibforums->lang['check_length']}</a>)
-     </td>
-     <td class="pformright" valign='top'><textarea cols='70' rows='15' name='Post' tabindex='3' class='textinput'>$data</textarea></td>
-   </tr>
-EOF;
-}
-
-
-function postbox_buttons($data) {
-global $ibforums;
-return <<<EOF
- <tr>
-   <td class='pformstrip' colspan="2">{$ibforums->lang['ib_code_buttons']}</td>
- </tr>
- <tr>
-   <td class='pformleft'>
-	   <input type='radio' class='radiobutton' name='bbmode' value='ezmode' onclick='setmode(this.value)' />&nbsp;<b>{$ibforums->lang['bbcode_guided']}</b><br />
-	   <input type='radio' class='radiobutton' name='bbmode' value='normal' onclick='setmode(this.value)' checked="checked" />&nbsp;<b>{$ibforums->lang['bbcode_normal']}</b>
-	   <script type='text/javascript' src='html/ibfcode.js'></script>
-   </td>
-   <td class='pformright'>
-	   <input type='button' accesskey='b' value=' B '       onclick='simpletag("B")' class='codebuttons' name='B' style="font-weight:bold" onmouseover="hstat('bold')" />
-	   <input type='button' accesskey='i' value=' I '       onclick='simpletag("I")' class='codebuttons' name='I' style="font-style:italic" onmouseover="hstat('italic')" />
-	   <input type='button' accesskey='u' value=' U '       onclick='simpletag("U")' class='codebuttons' name='U' style="text-decoration:underline" onmouseover="hstat('under')" />
-	   
-	   <select name='ffont' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'FONT')"  onmouseover="hstat('font')">
-	   <option value='0'>{$ibforums->lang['ct_font']}</option>
-	   <option value='Arial' style='font-family:Arial'>{$ibforums->lang['ct_arial']}</option>
-	   <option value='Times' style='font-family:Times'>{$ibforums->lang['ct_times']}</option>
-	   <option value='Courier' style='font-family:Courier'>{$ibforums->lang['ct_courier']}</option>
-	   <option value='Impact' style='font-family:Impact'>{$ibforums->lang['ct_impact']}</option>
-	   <option value='Geneva' style='font-family:Geneva'>{$ibforums->lang['ct_geneva']}</option>
-	   <option value='Optima' style='font-family:Optima'>Optima</option>
-	   </select><select name='fsize' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'SIZE')" onmouseover="hstat('size')">
-	   <option value='0'>{$ibforums->lang['ct_size']}</option>
-	   <option value='1'>{$ibforums->lang['ct_sml']}</option>
-	   <option value='7'>{$ibforums->lang['ct_lrg']}</option>
-	   <option value='14'>{$ibforums->lang['ct_lest']}</option>
-	   </select><select name='fcolor' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'COLOR')" onmouseover="hstat('color')">
-	   <option value='0'>{$ibforums->lang['ct_color']}</option>
-	   <option value='blue' style='color:blue'>{$ibforums->lang['ct_blue']}</option>
-	   <option value='red' style='color:red'>{$ibforums->lang['ct_red']}</option>
-	   <option value='purple' style='color:purple'>{$ibforums->lang['ct_purple']}</option>
-	   <option value='orange' style='color:orange'>{$ibforums->lang['ct_orange']}</option>
-	   <option value='yellow' style='color:yellow'>{$ibforums->lang['ct_yellow']}</option>
-	   <option value='gray' style='color:gray'>{$ibforums->lang['ct_grey']}</option>
-	   <option value='green' style='color:green'>{$ibforums->lang['ct_green']}</option>
-	   </select>
-	   &nbsp; <a href='javascript:closeall();' onmouseover="hstat('close')">{$ibforums->lang['js_close_all_tags']}</a>
-	   <br />
-	   <input type='button' accesskey='h' value=' http:// ' onclick='tag_url()'            class='codebuttons' name='url' onmouseover="hstat('url')" />
-	   <input type='button' accesskey='g' value=' IMG '     onclick='tag_image()'          class='codebuttons' name='img' onmouseover="hstat('img')" />
-	   <input type='button' accesskey='e' value='  @  '     onclick='tag_email()'          class='codebuttons' name='email' onmouseover="hstat('email')" />
-	   <input type='button' accesskey='q' value=' QUOTE '   onclick='simpletag("QUOTE")'   class='codebuttons' name='QUOTE' onmouseover="hstat('quote')" />
-	   <input type='button' accesskey='p' value=' CODE '    onclick='simpletag("CODE")'    class='codebuttons' name='CODE' onmouseover="hstat('code')" />
-	   <input type='button' accesskey='l' value=' LIST '     onclick='tag_list()'          class='codebuttons' name="LIST" onmouseover="hstat('list')" />
-	   <!--<input type='button' accesskey='l' value=' SQL '     onclick='simpletag("SQL")'     class='codebuttons' name='SQL'>
-	   <input type='button' accesskey='t' value=' HTML '    onclick='simpletag("HTML")'    class='codebuttons' name='HTML'>-->
-	   <br />
-	   {$ibforums->lang['hb_open_tags']}:&nbsp;<input type='text' name='tagcount' size='3' maxlength='3' style='font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;' readonly="readonly" class='row1' value="0" />
-	   &nbsp;<input type='text' name='helpbox' size='50' maxlength='120' style='width:auto;font-size:10px;font-family:verdana,arial;border:0px' readonly="readonly" class='row1' value="{$ibforums->lang['hb_start']}" />
-	</td>
-   </tr>
-   <tr>
-     <td colspan="2" class='pformstrip'>{$ibforums->lang['post']}</td>
-   </tr>
-   <tr>
-     <td class='pformleft' align='center'>
-	   <!--SMILIE TABLE-->
-	   <br /><div class='desc'><strong><a href='javascript:CheckLength()'>{$ibforums->lang['check_length']}</a> &middot; <a href='javascript:bbc_pop()'>{$ibforums->lang['bbc_help']}</a></strong></div>
-     </td>
-     <td class="pformright" valign='top'>
-     	<textarea cols='80' rows='20' name='Post' tabindex='3' class='textinput'>$data</textarea></td>
-   </tr>
-   <tr>
-	<td class='pformleft'><b>{$ibforums->lang['po_options']}</b></td>
-	<td class='pformright'>
-	 <!--IBF.EMO-->
-	 <!--IBF.SIG-->
-	 <!--IBF.TRACK-->
-	</td>
-   </tr>
-EOF;
-}
-
-
-function get_box_enableemo($checked) {
-global $ibforums;
-return <<<EOF
-<input type='checkbox' name='enableemo' class='checkbox' value='yes' $checked />&nbsp;{$ibforums->lang['enable_emo']}
-EOF;
-}
-
-function get_box_enablesig($checked) {
-global $ibforums;
-return <<<EOF
-<br /><input type='checkbox' name='enablesig' class='checkbox' value='yes' $checked />&nbsp;{$ibforums->lang['enable_sig']}
-EOF;
-}
-
-function get_box_enabletrack($checked) {
-global $ibforums;
-return <<<EOF
-<br /><input type='checkbox' name='enabletrack' class='checkbox' value='1' $checked />&nbsp;{$ibforums->lang['enable_track']}
-EOF;
-}
-
-function get_box_alreadytrack() {
-global $ibforums;
-return <<<EOF
-<br />{$ibforums->lang['already_sub']}
-EOF;
-}
-
-
-function get_javascript() {
-global $ibforums;
-return <<<EOF
-<script language="javascript1.2" type="text/javascript">
-<!--
-var MessageMax  = "{$ibforums->lang['the_max_length']}";
-var Override    = "{$ibforums->lang['override']}";
-MessageMax      = parseInt(MessageMax);
-
-if ( MessageMax < 0 )
-{
-	MessageMax = 0;
-}
-	
-function emo_pop()
-{
-  window.open('index.{$ibforums->vars['php_ext']}?act=legends&CODE=emoticons&s={$ibforums->session_id}','Legends','width=250,height=500,resizable=yes,scrollbars=yes'); 
-}
-function bbc_pop()
-{
-  window.open('index.{$ibforums->vars['php_ext']}?act=legends&CODE=bbcode&s={$ibforums->session_id}','Legends','width=700,height=500,resizable=yes,scrollbars=yes'); 
-}	
-function CheckLength() {
-	MessageLength  = document.REPLIER.Post.value.length;
-	message  = "";
-		if (MessageMax > 0) {
-			message = "{$ibforums->lang['js_post']}: {$ibforums->lang['js_max_length']} " + MessageMax + " {$ibforums->lang['js_characters']}.";
-		} else {
-			message = "";
-		}
-		alert(message + "      {$ibforums->lang['js_used']} " + MessageLength + " {$ibforums->lang['js_characters']}.");
-}
-	
-	function ValidateForm(isMsg) {
-		MessageLength  = document.REPLIER.Post.value.length;
-		errors = "";
-		
-		if (isMsg == 1)
-		{
-			if (document.REPLIER.msg_title.value.length < 2)
-			{
-				errors = "{$ibforums->lang['msg_no_title']}";
-			}
-		}
-	
-		if (MessageLength < 2) {
-			 errors = "{$ibforums->lang['js_no_message']}";
-		}
-		if (MessageMax !=0) {
-			if (MessageLength > MessageMax) {
-				errors = "{$ibforums->lang['js_max_length']} " + MessageMax + " {$ibforums->lang['js_characters']}. {$ibforums->lang['js_current']}: " + MessageLength;
-			}
-		}
-		if (errors != "" && Override == "") {
-			alert(errors);
-			return false;
-		} else {
-			document.REPLIER.submit.disabled = true;
-			return true;
-		}
-	}
-	
-	// IBC Code stuff
-	var text_enter_url      = "{$ibforums->lang['jscode_text_enter_url']}";
-	var text_enter_url_name = "{$ibforums->lang['jscode_text_enter_url_name']}";
-	var text_enter_image    = "{$ibforums->lang['jscode_text_enter_image']}";
-	var text_enter_email    = "{$ibforums->lang['jscode_text_enter_email']}";
-	var text_enter_flash    = "{$ibforums->lang['jscode_text_enter_flash']}";
-	var text_code           = "{$ibforums->lang['jscode_text_code']}";
-	var text_quote          = "{$ibforums->lang['jscode_text_quote']}";
-	var error_no_url        = "{$ibforums->lang['jscode_error_no_url']}";
-	var error_no_title      = "{$ibforums->lang['jscode_error_no_title']}";
-	var error_no_email      = "{$ibforums->lang['jscode_error_no_email']}";
-	var error_no_width      = "{$ibforums->lang['jscode_error_no_width']}";
-	var error_no_height     = "{$ibforums->lang['jscode_error_no_height']}";
-	var prompt_start        = "{$ibforums->lang['js_text_to_format']}";
-	
-	var help_bold           = "{$ibforums->lang['hb_bold']}";
-	var help_italic         = "{$ibforums->lang['hb_italic']}";
-	var help_under          = "{$ibforums->lang['hb_under']}";
-	var help_font           = "{$ibforums->lang['hb_font']}";
-	var help_size           = "{$ibforums->lang['hb_size']}";
-	var help_color          = "{$ibforums->lang['hb_color']}";
-	var help_close          = "{$ibforums->lang['hb_close']}";
-	var help_url            = "{$ibforums->lang['hb_url']}";
-	var help_img            = "{$ibforums->lang['hb_img']}";
-	var help_email          = "{$ibforums->lang['hb_email']}";
-	var help_quote          = "{$ibforums->lang['hb_quote']}";
-	var help_list           = "{$ibforums->lang['hb_list']}";
-	var help_code           = "{$ibforums->lang['hb_code']}";
-	var help_click_close    = "{$ibforums->lang['hb_click_close']}";
-	var list_prompt         = "{$ibforums->lang['js_tag_list']}";
-	
-	
-	//-->
-</script>
-
-
-EOF;
-}
-
-
-function nameField_reg() {
-global $ibforums;
-return <<<EOF
-<!-- REG NAME -->
-EOF;
-}
-
-
-function mod_options($jump) {
-global $ibforums;
-return <<<EOF
-  <tr>
-   <td class='pformstrip' colspan="2">{$ibforums->lang['tt_options']}</td>
-  </tr>
-  <tr>
-    <td class='pformleft'>{$ibforums->lang['mod_options']}</td>
-    <td class='pformright'>$jump</select></td>
-  </tr>
-
-EOF;
-}
-
-
-function quote_box($data) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td colspan="2" class='pformstrip'>{$ibforums->lang['post_to_quote']}</td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['post_to_quote_txt']}</td>
-  <td class='pformright'><textarea cols='60' rows='12' wrap='soft' name='QPost' class='textinput'>{$data['post']}</textarea><input type='hidden' name='QAuthor' value='{$data['author_id']}' /><input type='hidden' name='QAuthorN' value='{$data['author_name']}' /><input type='hidden' name='QDate'   value='{$data['post_date']}' /></td>
-</tr>
-
-EOF;
-}
-
-
-function TopicSummary_top() {
-global $ibforums;
-return <<<EOF
-<br />
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['last_posts']}</div>
-  <table cellpadding='6' cellspacing='1' border='0' width='100%'>
-EOF;
-}
-
-function TopicSummary_body($data) {
-global $ibforums;
-return <<<EOF
-  <tr>
-    <td class='row4' valign='top' width='20%'><b>{$data['author']}</b></td>
-    <td class='row4' valign='top' width='80%'>{$ibforums->lang['posted_on']} {$data['date']}</td>
-  </tr>
-  <tr>
-    <td class='row1' valign='top' width='20%'>&nbsp;</td>
-    <td class='row1' valign='top' width='80%'><span class='postcolor'>{$data['post']}</span></td>
-  </tr>
-EOF;
-}
-
-
-function TopicSummary_bottom() {
-global $ibforums;
-return <<<EOF
-
-  </table>
-  <div class="pformstrip"><a href="javascript:PopUp('index.{$ibforums->vars['php_ext']}?act=ST&amp;f={$ibforums->input['f']}&amp;t={$ibforums->input['t']}','TopicSummary',700,450,1,1)">{$ibforums->lang['review_topic']}</a></div>
-</div>
-
-EOF;
-}
-
-
-
-function preview($data) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['post_preview']}</div>
-  <div class="row1" style="padding:6px"><div class='postcolor'>$data</div></div>
-</div>
-<br />
-EOF;
-}
-
-
-
-
-
-function edit_upload_field($data, $file_name="") {
-global $ibforums;
-return <<<EOF
-<tr> 
-          <td class="pformstrip" colspan="2">{$ibforums->lang['upload_title']}</td>
-        </tr>
-        <tr> 
-          <td class='pformleft'>{$ibforums->lang['upload_text']} $data</td>
-          <td class='pformright' width="100%">
-           <table cellpadding='4' cellspacing='0' width='100%' border='0'>
-            <tr>
-             <td><input type='radio' name='editupload' value='keep' checked></td>
-             <td width='100%'><b>{$ibforums->lang['eu_keep']}</b> ( $file_name )</td>
-            </tr>
-            <tr>
-             <td><input type='radio' name='editupload' value='delete'></td>
-             <td width='100%'><b>{$ibforums->lang['eu_delete']}</b></td>
-            </tr>
-            <tr>
-             <td valign='middle'><input type='radio' name='editupload' value='new'></td>
-             <td><b>{$ibforums->lang['eu_new']}</b><br /><input class='textinput' type='file' size='30' name='FILE_UPLOAD' onclick='document.REPLIER.editupload[2].checked=true;' /></td>
-            </tr>
-           </table>
-          </td>
-        </tr>
-EOF;
-}
-
-
-function Upload_field($data) {
-global $ibforums;
-return <<<EOF
-  <tr>
-    <td colspan="2" class='pformstrip'>{$ibforums->lang['upload_title']}</td>
-  </tr>
-  <tr>
-    <td class='pformleft'>{$ibforums->lang['upload_text']} $data</td>
-    <td class='pformright'><input class='textinput' type='file' size='30' name='FILE_UPLOAD' /></td>
-  </tr>
-  
-EOF;
-}
-
-
-function errors($data) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['errors_found']}</div>
-  <div class="tablepad"><span class='postcolor'>$data</span></div>
-</div>
-<br />
-EOF;
-}
-
-
-
-
-function EndForm($data) {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformstrip' align='center' style='text-align:center' colspan="2">
-	<input type="submit" name="submit" value="$data" tabindex='4' class='forminput' accesskey='s' />&nbsp;
-	<input type="submit" name="preview" value="{$ibforums->lang['button_preview']}" tabindex='5' class='forminput' />
-  </td>
-</tr>
-</table>
-</form>
-<br />
-<br clear="all" />
-EOF;
-}
-
-
-function smilie_table() {
-global $ibforums;
-return <<<EOF
-<table class='tablefill' cellpadding='4' align='center'>
-<tr>
-<td align="center" colspan="{$ibforums->vars['emo_per_row']}"><b>{$ibforums->lang['click_smilie']}</b></td>
-</tr>
-<!--THE SMILIES-->
-<tr>
-<td align="center" colspan="{$ibforums->vars['emo_per_row']}"><b><a href='javascript:emo_pop()'>{$ibforums->lang['all_emoticons']}</a></b></td>
-</tr>
-</table>
-EOF;
-}
-
-
-
-
-function PostIcons() {
-global $ibforums;
-return <<<EOF
- <tr>
-  <td class='pformleft'>{$ibforums->lang['post_icon']}</td>
-  <td class='pformright'>
-	<input type="radio" class="radiobutton" name="iconid" value="1" />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon1.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="2"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon2.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="3"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon3.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="4"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon4.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="5"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon5.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="6"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon6.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="7"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon7.gif"  align='middle' alt='' /><br />
-	<input type="radio" class="radiobutton" name="iconid" value="8" />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon8.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="9"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon9.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="10"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon10.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="11"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon11.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="12"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon12.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="13"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon13.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="14"  />&nbsp;&nbsp;<img src="{$ibforums->vars['img_url']}/icon14.gif"  align='middle' alt='' /><br />
-    <input type="radio" class="radiobutton" name="iconid" value="0" checked="checked" />&nbsp;&nbsp;[ Use None ]
-  </td>
- </tr>
-EOF;
-}
-
-
-function table_top($data) {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type='text/javascript'>
-	<!--
-	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-		if (posleft != 0) { x = posleft }
-		if (postop  != 0) { y = postop  }
-	
-		if (!scroll) { scroll = 1 }
-		if (!resize) { resize = 1 }
-	
-		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-		  X = (screen.width  - width ) / 2;
-		  Y = (screen.height - height) / 2;
-		}
-		if (scroll != 0) { scroll = 1 }
-	
-		var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
-	 }
-	//-->
-</script>
-
-<table class='tableborder' cellpadding="0" cellspacing="0" width="100%">
-<tr>
- <td class='maintitle' colspan="2">&nbsp;&nbsp;$data</td>
-</tr>
-      
-EOF;
-}
-
-
-
-
-function table_structure() {
-global $ibforums;
-return <<<EOF
-<!--FORUM RULES--><br />
-<!--START TABLE-->
-<!--NAME FIELDS-->
-<!--TOPIC TITLE-->
-<!--POLL BOX-->
-<!--POST BOX-->
-<!--QUOTE BOX-->
-<!--POST ICONS-->
-<!--UPLOAD FIELD-->
-<!--MOD OPTIONS-->
-<!--END TABLE-->
-EOF;
-}
-
-
-function add_edit_box($checked="") {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='pformleft'><b>{$ibforums->lang['edit_ops']}</b></td>
-  <td class='pformright'><input type='checkbox' name='add_edit' value='1' $checked class='forminput' />&nbsp;{$ibforums->lang['append_edit']}</td>
-</tr>
-EOF;
-}
-
-
-function topictitle_fields($data) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td colspan="2" class='pformstrip'>{$ibforums->lang['tt_topic_settings']}</td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['topic_title']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='50' name='TopicTitle' value='{$data[TITLE]}' tabindex='1' class='forminput' /></td>
-</tr>
-<tr>
-   <td class='pformleft'>{$ibforums->lang['topic_desc']}</td>
-   <td class='pformright'><input type='text' size='40' maxlength='40' name='TopicDesc' value='{$data[DESC]}' tabindex='2' class='forminput' /></td>
-</tr>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_printpage.php b/upload/Skin/s1/skin_printpage.php
deleted file mode 100644
index e2b53c09..00000000
--- a/upload/Skin/s1/skin_printpage.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-class skin_printpage {
-
-function choose_form($fid, $tid, $title) {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['tvo_title']}&nbsp;$title</div>
- <div class='tablepad'>
-  <b><a href='{$ibforums->base_url}act=Print&amp;client=printer&amp;f=$fid&amp;t=$tid'>{$ibforums->lang['o_print_title']}</a></b>
-  <br />
-  {$ibforums->lang['o_print_desc']}
-  <br /><br />
-  <b><a href='{$ibforums->base_url}act=Print&amp;client=html&amp;f=$fid&amp;t=$tid'>{$ibforums->lang['o_html_title']}</a></b>
-  <br />
-  {$ibforums->lang['o_html_desc']}
-  <br /><br />
-  <b><a href='{$ibforums->base_url}act=Print&amp;client=wordr&amp;f=$fid&amp;t=$tid'>{$ibforums->lang['o_word_title']}</a></b>
-  <br />
-  {$ibforums->lang['o_word_desc']}
- </div>
- <div align='center' class='pformstrip'>&lt;&lt;<a href='{$ibforums->base_url}showtopic=$tid'>{$ibforums->lang['back_topic']}</a></div>
-</div>
-<br />
-EOF;
-}
-
-
-
-function pp_postentry($poster, $entry ) {
-global $ibforums;
-return <<<EOF
-	<table width='90%' align='center' cellpadding='6' border='1'>
-	<tr>
-	 <td bgcolor='#EEEEEE'><font face='arial' size='2' color='#000000'><b>{$ibforums->lang['by']}: {$entry['author_name']}</b> {$ibforums->lang['on']} {$entry['post_date']}</b></font></td>
-	</tr>
-	<tr>
-	 <td><font face='arial' size='3' color='#000000'>{$entry['post']}</font></td>
-	</tr>
-	</table>
-	<br />
-EOF;
-}
-
-function pp_end() {
-global $ibforums;
-return <<<EOF
-    <center><font face='arial' size='1' color='#000000'>Powered by Invision Power Board (http://www.invisionboard.com)<br />&copy; Invision Power Services (http://www.invisionpower.com)</font></center>
-EOF;
-}
-
-function pp_header($forum_name, $topic_title, $topic_starter,$fid, $tid) {
-global $ibforums;
-return <<<EOF
-    <html>
-    <head>
-      <title>{$ibforums->vars['board_name']} [Powered by Invision Power Board]</title>
-    </head>
-    <body bgcolor='#FFFFFF' alink='#000000' vlink='#000000' link='#000000'>
-     <table width='90%' border='0' align='center' cellpadding='6'>
-      <tr>
-       <td><b><font face='arial' size='5' color='#4C77B6'><b>{$ibforums->lang['title']}</font></b>
-       	   <br /><font face='arial' size='2' color='#000000'><b><a href='{$ibforums->base_url}act=ST&amp;f=$fid&amp;t=$tid'>{$ibforums->lang['topic_here']}</a></b></font>
-       </td>
-      </tr>
-      <tr>
-       <td><font face='arial' size='2' color='#000000'><b>{$ibforums->vars['board_name']} &gt; $forum_name &gt; <font color='red'>$topic_title</font></b></font></td>
-      </tr>
-     </table>
-     <br />
-     <br />
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_profile.php b/upload/Skin/s1/skin_profile.php
deleted file mode 100644
index 747bbef4..00000000
--- a/upload/Skin/s1/skin_profile.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-
-class skin_profile {
-
-function warn_level($mid, $img, $percent) {
-global $ibforums;
-return <<<EOF
-  <tr>
-	<td class="row3" valign='top'><b>{$ibforums->lang['warn_level']}</b></td>
-	<td align='left' class='row1'><a href="javascript:PopUp('{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$percent}</a>%: <a href='{$ibforums->base_url}act=warn&amp;type=minus&amp;mid={$mid}' title='{$ibforums->lang['tt_warn_minus']}'><{WARN_MINUS}></a>{$img}<a href='{$ibforums->base_url}act=warn&amp;type=add&amp;mid={$mid}' title='{$ibforums->lang['tt_warn_add']}'><{WARN_ADD}></a>
-</td>
-  </tr>
-EOF;
-}
-
-function warn_level_no_mod($mid, $img, $percent) {
-global $ibforums;
-return <<<EOF
-  <tr>
-	<td class="row3" valign='top'><b>{$ibforums->lang['warn_level']}</b></td>
-	<td align='left' class='row1'><a href="javascript:PopUp('{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$percent}</a>%: {$img}</td>
-  </tr>
-EOF;
-}
-
-function warn_level_rating($mid, $level,$min=0,$max=10) {
-global $ibforums;
-return <<<EOF
- <tr>
-	<td class="row3" valign='top'><b>{$ibforums->lang['rating_level']}</b></td>
-	<td align='left' class='row1'><a href='{$ibforums->base_url}act=warn&amp;type=minus&amp;mid={$mid}' title='{$ibforums->lang['tt_warn_minus']}'><{WARN_MINUS}></a> &lt;&nbsp;$min ( <a href="javascript:PopUp('{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$level}</a> ) $max&nbsp;&gt; <a href='{$ibforums->base_url}act=warn&amp;type=add&amp;mid={$mid}' title='{$ibforums->lang['tt_warn_add']}'><{WARN_ADD}></a></td>
-  </tr>
-EOF;
-}
-
-function warn_level_rating_no_mod($mid, $level,$min=0,$max=10) {
-global $ibforums;
-return <<<EOF
- <tr>
-	<td class="row3" valign='top'><b>{$ibforums->lang['rating_level']}</b></td>
-	<td align='left' class='row1'>&lt;&nbsp;$min ( <a href="javascript:PopUp('{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$level}</a> ) $max&nbsp;&gt;</td>
-  </tr>
-EOF;
-}
-
-function get_photo($show_photo, $show_width, $show_height) {
-global $ibforums;
-return <<<EOF
-<img src="$show_photo" border="0" alt="User Photo" $show_width $show_height />
-EOF;
-}
-
-function show_photo($name, $photo) {
-global $ibforums;
-return <<<EOF
-<div id="photowrap">
- <div id="phototitle">$name</div>
- <div id="photoimg">$photo</div>
-</div>
-EOF;
-}
-
-function show_card_download($name, $photo, $info) {
-global $ibforums;
-return <<<EOF
-<html>
- <head>
-  <title>$name</title>
-  <style type="text/css">
-	 form { display:inline; }
-	 img  { vertical-align:middle }
-	 BODY { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; margin-left:5%;margin-right:5%;margin-top:5px;  }
-	 TABLE, TR, TD { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; }
-	 a:link, a:visited, a:active { text-decoration: underline; color: #000 }
-	 a:hover { color: #465584; text-decoration:underline }
-	 #profilename { font-size:28px; font-weight:bold; }
-	 #photowrap { padding:6px; }
-	 #phototitle { font-size:24px; border-bottom:1px solid black }
-	 #photoimg   { text-align:center; margin-top:15px } 
-	 .plainborder { border:1px solid #345487;background-color:#F5F9FD }
-	 .tableborder { border:1px solid #345487;background-color:#FFF }
-	 .tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px }
-	 .tablepad    { background-color:#F5F9FD;padding:6px }
-	 .tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }
-	 .row1 { background-color: #F5F9FD }
-	 .row2 { background-color: #DFE6EF }
-	 .row3 { background-color: #EEF2F7 }
-	 .row4 { background-color: #E4EAF2 }
-  </style>
-  <script language='javascript' type="text/javascript">
-  <!--
-   function redirect_to(where, closewin)
-   {
-	  document.location= '$ibforums->base_url' + where;
-	  
-	  if (closewin == 1)
-	  {
-		  self.close();
-	  }
-   }
-  //-->
-  </script>
- </head>
-<body>
-<table width="100%" height="100%">
-<tr>
- <td valign="middle" align="center" width="400">
-	<div id="phototitle">$name</div>
-	<br />
-	<table class="tablebasic" cellspacing="6">
-	<tr>
-	 <td valign="middle" class="row1">$photo</td>
-	 <td width="100%" class="row1" valign="bottom">
-	   <table class="tablebasic" cellpadding="5">
-		 <tr>
-		   <td nowrap="nowrap">{$ibforums->lang['email']}</td>
-		   <td width="100%">{$info['email']}</td>
-		 </tr>
-		 <tr>
-		  <td nowrap="nowrap">{$ibforums->lang['integ_msg']}</td>
-		  <td width="100%">{$info['integ_msg']}</td>
-	     </tr>
-		 <tr>
-		   <td nowrap="nowrap">{$ibforums->lang['aim']}</td>
-		   <td width="100%">{$info['aim_name']}</td>
-		 </tr>
-		 <tr>
-		   <td nowrap="nowrap">{$ibforums->lang['icq']}</td>
-		   <td width="100%">{$info['icq_number']}</td>
-		 </tr>
-		 <tr>
-		   <td nowrap="nowrap">{$ibforums->lang['yahoo']}</td>
-		   <td width="100%">{$info['yahoo']}</td>
-		 </tr>
-		 <tr>
-		   <td nowrap="nowrap">{$ibforums->lang['msn']}</td>
-		   <td width="100%">{$info['msn_name']}</td>
-		 </tr>
-		 <tr>
-		   <td nowrap="nowrap">{$ibforums->lang['pm']}</b></td>
-		   <td><a href='javascript:redirect_to("&act=Msg&;CODE=4&MID={$info['mid']}", 1);'>{$ibforums->lang['click_here']}</a></td>
-		 </tr>
-		</td>
-	   </tr>
-	  </table>
-	 </td>
-	</tr>
-	</table>
-  </td>
- </tr>
-</table>
-</body>
-</html>
-EOF;
-}
-
-function show_card($name, $photo, $info) {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
- function redirect_to(where, closewin)
- {
- 	opener.location= '$ibforums->base_url' + where;
- 	
- 	if (closewin == 1)
- 	{
- 		self.close();
- 	}
- }
-//-->
-</script>
-<div id="photowrap">
- <div id="phototitle">$name</div>
- <br />
- <table class="tablebasic" cellspacing="6">
- <tr>
-  <td valign="middle" class="row1">$photo</td>
-  <td width="100%" class="row1" valign="bottom">
-    <table class="tablebasic" cellpadding="5">
-      <tr>
-        <td nowrap="nowrap">{$ibforums->lang['email']}</td>
-		<td width="100%">{$info['email']}</td>
-	  </tr>
-	  <tr>
-		<td nowrap="nowrap">{$ibforums->lang['integ_msg']}</td>
-		<td width="100%">{$info['integ_msg']}</td>
-	  </tr>
-	  <tr>
-		<td nowrap="nowrap">{$ibforums->lang['aim']}</td>
-		<td width="100%">{$info['aim_name']}</td>
-	  </tr>
-	  <tr>
-		<td nowrap="nowrap">{$ibforums->lang['icq']}</td>
-		<td width="100%">{$info['icq_number']}</td>
-	  </tr>
-	  <tr>
-		<td nowrap="nowrap">{$ibforums->lang['yahoo']}</td>
-		<td width="100%">{$info['yahoo']}</td>
-	  </tr>
-	  <tr>
-		<td nowrap="nowrap">{$ibforums->lang['msn']}</td>
-		<td width="100%">{$info['msn_name']}</td>
-	  </tr>
-	  <tr>
-		<td nowrap="nowrap">{$ibforums->lang['pm']}</b></td>
-		<td><a href='javascript:redirect_to("&amp;act=Msg&amp;CODE=4&amp;MID={$info['mid']}", 1);'>{$ibforums->lang['click_here']}</a></td>
-	  </tr>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
- </table>
-</div>
-<div align="center">
-  <a href="{$ibforums->base_url}act=Profile&amp;CODE=showcard&amp;MID={$info['mid']}&amp;download=1">{$ibforums->lang['ac_download']}</a>
-  &middot; <a href="javascript:self.close();">{$ibforums->lang['ac_close']}</a>
-</div>
-EOF;
-}
-
-
-
-function user_edit($info) {
-global $ibforums;
-return <<<EOF
-&middot; <a href='{$info['base_url']}act=UserCP&amp;CODE=22'>{$ibforums->lang['edit_my_sig']}</a> &middot;
-<a href='{$info['base_url']}act=UserCP&amp;CODE=24'>{$ibforums->lang['edit_avatar']}</a> &middot;
-<a href='{$info['base_url']}act=UserCP&amp;CODE=01'>{$ibforums->lang['edit_profile']}</a>
-EOF;
-}
-
-function show_profile($info) {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type='text/javascript'>
-	<!--
-	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-		if (posleft != 0) { x = posleft }
-		if (postop  != 0) { y = postop  }
-	
-		if (!scroll) { scroll = 1 }
-		if (!resize) { resize = 1 }
-	
-		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-		  X = (screen.width  - width ) / 2;
-		  Y = (screen.height - height) / 2;
-		}
-		if (scroll != 0) { scroll = 1 }
-	
-		var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
-	 }
-	//-->
-</script>
-<table class="tablebasic" cellspacing="0" cellpadding="2">
-<tr>
- <td>{$info['photo']}</td>
- <td width="100%" valign="bottom">
-   <div id="profilename">{$info['name']}</div>
-   <div>
-	 <a href='{$info['base_url']}act=Search&amp;CODE=getalluser&amp;mid={$info['mid']}'>{$ibforums->lang['find_posts']}</a> &middot;
-	 <a href='{$info['base_url']}act=Msg&amp;CODE=02&amp;MID={$info['mid']}'>{$ibforums->lang['add_to_contact']}</a>
-	 <!--MEM OPTIONS-->
-   </div>
- </td>
-</tr>
-</table>
-<br />
-<table cellpadding='0' align='center' cellspacing='2' border='0' width="100%">
-  <tr>
-	<td width='50%' valign='top' class="plainborder">
-	 <table cellspacing="1" cellpadding='6' width='100%'>
-	  <tr>
-		<td align='center' colspan='2' class='maintitle'>{$ibforums->lang['active_stats']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" width='30%' valign='top'><b>{$ibforums->lang['total_posts']}</b></td>
-		<td align='left' width='70%' class='row1'><b>{$info['posts']}</b><br />( {$info['total_pct']}% {$ibforums->lang['total_percent']} )</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['posts_per_day']}</b></td>
-		<td align='left' class='row1'><b>{$info['posts_day']}</b></td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['joined']}</b></td>
-		<td align='left' class='row1'><b>{$info['joined']}</b></td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['fav_forum']}</b></td>
-		<td align='left' class='row1'><a href='{$info['base_url']}act=SF&amp;f={$info['fav_id']}'>{$info['fav_forum']}</a><br />{$info['fav_posts']} {$ibforums->lang['fav_posts']}<br />( {$info['percent']}% {$ibforums->lang['fav_percent']} )</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['user_local_time']}</b></td>
-		<td align='left' class='row1'>{$info['local_time']}</td>
-	  </tr>
-	  </table>
-	</td>
-	
-	<!-- Communication -->
-	
-   <td width='50%' valign='top' class="plainborder">
-	 <table cellspacing="1" cellpadding='6' width='100%'>
-	  <tr>
-		<td align='center' colspan='2' class='maintitle'>{$ibforums->lang['communicate']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" width='30%' valign='top'><b>{$ibforums->lang['email']}</b></td>
-		<td align='left' width='70%' class='row1'>{$info['email']}</td>
-	  </tr>
-	   <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['integ_msg']}</b></td>
-		<td align='left' class='row1'>{$info['integ_msg']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['aim']}</b></td>
-		<td align='left' class='row1'>{$info['aim_name']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['icq']}</b></td>
-		<td align='left' class='row1'>{$info['icq_number']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['yahoo']}</b></td>
-		<td align='left' class='row1'>{$info['yahoo']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['msn']}</b></td>
-		<td align='left' class='row1'>{$info['msn_name']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['pm']}</b></td>
-		<td align='left' class='row1'><a href='{$info['base_url']}act=Msg&amp;CODE=4&amp;MID={$info['mid']}'>{$ibforums->lang['click_here']}</a></td>
-	  </tr>
-	  </table>
-	</td>
-	
-	<!-- END CONTENT ROW 1 -->
-	<!-- information -->
-	
-  </tr>
-  <tr>
-	<td width='50%' valign='top' class="plainborder">
-	 <table cellspacing="1" cellpadding='6' width='100%'>
-	  <tr>
-		<td align='center' colspan='2' class='maintitle'>{$ibforums->lang['info']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" width='30%' valign='top'><b>{$ibforums->lang['homepage']}</b></td>
-		<td align='left' width='70%' class='row1'>{$info['homepage']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['birthday']}</b></td>
-		<td align='left' class='row1'>{$info['birthday']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['location']}</b></td>
-		<td align='left' class='row1'>{$info['location']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['interests']}</b></td>
-		<td align='left' class='row1'>{$info['interests']}</td>
-	  </tr>
-	  <!--{CUSTOM.FIELDS}-->
-	  </table>
-	</td>
-	
-	<!-- Profile -->
-	
-   <td width='50%' valign='top' class="plainborder">
-	 <table cellspacing="1" cellpadding='6' width='100%'>
-	  <tr>
-		<td align='center' colspan='2' class='maintitle'>{$ibforums->lang['post_detail']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" width='30%' valign='top'><b>{$ibforums->lang['mgroup']}</b></td>
-		<td align='left' width='70%'  class='row1'>{$info['group_title']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['mtitle']}</b></td>
-		<td align='left' class='row1'>{$info['member_title']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['avatar']}</b></td>
-		<td align='left' class='row1'>{$info['avatar']}</td>
-	  </tr>
-	  <tr>
-		<td class="row3" valign='top'><b>{$ibforums->lang['siggie']}</b></td>
-		<td align='left' class='row1'>{$info['signature']}</td>
-	  </tr>
-	  <!--{WARN_LEVEL}-->
-	  </table>
-	</td>
-	</tr>
-</table>
-<div class='tableborder'>
- <div class='pformstrip' align='center'>&lt;( <a href='javascript:history.go(-1)'>{$ibforums->lang['back']}</a> )</div>
-</div>
-	
-EOF;
-}
-
-function custom_field($title, $value="") {
-global $ibforums;
-return <<<EOF
-			<tr>
-              <td class="row3" valign='top'><b>$title</b></td>
-              <td align='left' class='row1'>$value</td>
-            </tr>
-EOF;
-}
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_register.php b/upload/Skin/s1/skin_register.php
deleted file mode 100644
index a7c7e44c..00000000
--- a/upload/Skin/s1/skin_register.php
+++ /dev/null
@@ -1,534 +0,0 @@
-<?php
-
-class skin_register {
-
-
-function coppa_form() {
-global $ibforums;
-return <<<EOF
-     <html>
-      <head>
-       <title>{$ibforums->lang['cpf_title']}</title>
-       <!--<link rel='stylesheet' href='style_sheets/stylesheet_<{css_id}>.css' type='text/css'>-->
-      </head>
-     <body bgcolor='white'>
-     <table cellpadding='0' cellspacing='4' border='0' width='95%' align='center'>
-     <tr>
-        <td valign='middle' align='left'>
-        	<span class='pagetitle'>{$ibforums->vars['board_name']}: {$ibforums->lang['cpf_title']}</span>
-        	<br /><br />
-        	<b><span style='font-size:12px'>{$ibforums->lang['cpf_perm_parent']}</span></b>
-        	<br /><br />
-        	{$ibforums->lang['cpf_fax']} {$ibforums->vars['coppa_fax']}
-        	<br /><br />
-        	{$ibforums->lang['cpf_address']}
-        	<br />
-        	{$ibforums->vars['coppa_address']}
-        
-        </td>
-     </tr>
-     </table>
-     <br />
-     <table cellpadding='4' cellspacing='2' border='1' width='95%' align='center'>
-      <tr>
-		<td width='40%'>{$ibforums->lang['user_name']}</td>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td width='40%'>{$ibforums->lang['pass_word']}</td>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td width='40%'>{$ibforums->lang['email_address']}</td>
-		<td>&nbsp;</td>
-	  </tr>
-     </table>
-     <br />
-     <table cellpadding='0' cellspacing='4' border='0' width='95%' align='center'>
-     <tr>
-        <td valign='middle' align='left'>
-        	<b><span style='font-size:12px'>{$ibforums->lang['cpf_sign']}</span></b>
-        </td>
-     </tr>
-     </table>
-     <br />
-     <table cellpadding='10' cellspacing='2' border='1' width='95%' align='center'>
-      <tr>
-		<td width='40%'>{$ibforums->lang['cpf_name']}</td>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td width='40%'>{$ibforums->lang['cpf_relation']}</td>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td width='40%'>{$ibforums->lang['cpf_signature']}</td>
-		<td>&nbsp;</td>
-	    </tr>
-	    <tr>
-		<td width='40%'>{$ibforums->lang['cpf_email']}</td>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td width='40%'>{$ibforums->lang['cpf_phone']}</td>
-		<td>&nbsp;</td>
-		</tr>
-		<tr>
-		<td width='40%'>{$ibforums->lang['cpf_date']}</td>
-		<td>&nbsp;</td>
-		</tr>
-     </table>
-    </body>
-  </html>
-EOF;
-}
-
-function coppa_two() {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
-  <div class='maintitle'>{$ibforums->lang['cp2_title']}</div>
-   <table cellpadding='3' cellspacing='1' border='0' width='100%'>
-   <tr>
-   <td class='row1' align='left'>
-	   {$ibforums->lang['cp2_text']}
-	   <br /><br />
-	   <center><span style='font-weight:bold;font-size:12px'>
-		&lt;&lt; <a href='{$ibforums->base_url}'>{$ibforums->lang['cp2_cancel']}</a>
-	   - <a href='{$ibforums->base_url}act=Reg&amp;coppa_pass=1&amp;coppa_user=1'>{$ibforums->lang['cp2_continue']}</a> &gt;&gt;
-	   </span></center>
-   </td>
-   </tr>
-   <tr>
-   <td valign='left' class='titlemedium'>{$ibforums->lang['coppa_form']}</td>
-   </tr>
-   <tr>
-	<td class='row1' align='left'>{$ibforums->lang['coppa_form_text']} <a href='mailto:{$ibforums->vars['email_in']}'>{$ibforums->vars['email_in']}</a></td>
-   </tr>
-   </table>
-</div>
-EOF;
-}
-
-function coppa_start($coppadate) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['registration_form']}</div>
-  <div class="pformstrip">{$ibforums->lang['coppa_info']}</div>
-  <div class="tablepad"  align="center">
-	<span class="postcolor">
-	  <strong>
-	  {$ibforums->lang['coppa_link']}
-	  <br /><br />
-	  &lt; <a href='{$ibforums->base_url}act=Reg&amp;coppa_pass=1'>{$ibforums->lang['coppa_date_before']} $coppadate</a>
-	  - <a href='{$ibforums->base_url}act=Reg&amp;CODE=coppa_two'>{$ibforums->lang['coppa_date_after']} $coppadate</a> &gt;
-	  </strong>
-	</span>
-  </div>
-  <div class="pformstrip">{$ibforums->lang['coppa_form']}</div>
-  <div class="tablepad">{$ibforums->lang['coppa_form_text']} <a href='mailto:{$ibforums->vars['email_in']}'>{$ibforums->vars['email_in']}</a></div>
-</div>
-
-EOF;
-}
-
-
-
-function lost_pass_form($lasid="") {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post">
-<input type='hidden' name='act' value='Reg' />
-<input type='hidden' name='CODE' value='11' />
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['lost_pass_form']}</div>
-  <div class="pformstrip">{$ibforums->lang['lp_header']}</div>
-  <div class="tablepad"><span style="line-height:140%">{$ibforums->lang['lp_text']}</span></div>
-  <div class="pformstrip">{$ibforums->lang['complete_form']}</div>
-  <table class="tablebasic">
-  <tr>
-   <td class="pformleft"><strong>{$ibforums->lang['lp_user_name']}</strong></td>
-   <td class="pformright"><input type='text' size='32' maxlength='32' name='member_name' class='forminput' /></td>
-  </tr>
-  </table>
-</div>
-<!--{REG.ANTISPAM}-->
-<br />
-<div class="tableborder">
-   <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['lp_send']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function show_authorise($member) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="maintitle"><!-- --></div>
-  <div class="pformstrip">{$ibforums->lang['registration_process']}</div>
-  <div class="tablepad">{$ibforums->lang['thank_you']} {$member['name']}. {$ibforums->lang['auth_text']} {$member['email']}</div>
-</div>
-EOF;
-}
-
-
-function show_revalidated() {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['rv_title']}</div>
-  <div class="pformstrip">{$ibforums->lang['rv_process']}</div>
-  <div class="tablepad">{$ibforums->lang['rv_done']}</div>
-</div>
-EOF;
-}
-
-function show_lostpasswait($member) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['lpf_title']}</div>
-  <div class="pformstrip">{$ibforums->lang['registration_process']}</div>
-  <div class="tablepad">{$ibforums->lang['lpass_text']}</div>
-</div>
-EOF;
-}
-
-function show_preview($member) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="maintitle"><!-- --></div>
-  <div class="pformstrip">{$ibforums->lang['registration_process']}</div>
-  <div class="tablepad">{$ibforums->lang['thank_you']} {$member['name']}. {$ibforums->lang['preview_reg_text']}</div>
-</div>
-EOF;
-}
-
-function show_revalidate_form($name="") {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post" name='REG'>
-<input type='hidden' name='act' value='Reg' />
-<input type='hidden' name='CODE' value='reval2' />
-<div>{$ibforums->lang['rv_ins']}</div>
-<br />
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['rv_title']}</div>
-  <table class="tablebasic">
-   <tr>
-	<td class="pformleft"><strong>{$ibforums->lang['rv_name']}</strong></td>
-	<td class="pformright"><input type='text' size='32' maxlength='64' name='username' value='$name' class='forminput' /></td>
-   </tr>
-  </table>
-  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['rv_go']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-function show_lostpass_form() {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
-function Validate() {
-	// Check for Empty fields
-	if (document.REG.uid.value == "" || document.REG.aid.value == "") {
-		alert ("{$ibforums->lang['js_blanks']}");
-		return false;
-	}
-}
-//-->
-</script>
-<form action="{$ibforums->base_url}" method="post" name='REG' onsubmit='return Validate()'>
-<input type='hidden' name='act' value='Reg' />
-<input type='hidden' name='CODE' value='03' />
-<input type='hidden' name='type' value='lostpass' />
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['dumb_header']}</div>
-  <div class="pformstrip">{$ibforums->lang['lpf_title']}</div>
-   <!--IBF.INPUT_TYPE-->
-   <tr>
-	<td class="pformleft"><strong>{$ibforums->lang['lpf_pass1']}</strong><br><em>{$ibforums->lang['lpf_pass11']}</em></td>
-	<td class="pformright"><input type='password' size='32' maxlength='32' name='pass1' class='forminput' /></td>
-   </tr>
-   <tr>
-	<td class="pformleft"><strong>{$ibforums->lang['lpf_pass2']}</strong><br><em>{$ibforums->lang['lpf_pass22']}</em></td>
-	<td class="pformright"><input type='password' size='32' maxlength='32' name='pass2' class='forminput' /></td>
-   </tr>
-  </table>
- 
-  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['dumb_submit']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function show_lostpass_form_manual() {
-global $ibforums;
-return <<<EOF
-  <div class="tablepad">{$ibforums->lang['dumb_text']}</div>
-  <div class="pformstrip">{$ibforums->lang['complete_form']}</div>
-  <table class="tablebasic">
-   <tr>
-	<td class="pformleft"><strong>{$ibforums->lang['user_id']}</strong></td>
-	<td class="pformright"><input type='text' size='32' maxlength='32' name='uid' class='forminput' /></td>
-   </tr>
-   <tr>
-	<td class="pformleft"><strong>{$ibforums->lang['val_key']}</strong></td>
-	<td class="pformright"><input type='text' size='32' maxlength='50' name='aid' class='forminput' /></td>
-   </tr>
-  
-EOF;
-}
-
-function show_lostpass_form_auto($aid,$uid) {
-global $ibforums;
-return <<<EOF
-  <input type='hidden' name='uid' value='$uid'  />
-  <input type='hidden' name='aid' value='$aid'  />
-  <table class="tablebasic">
-EOF;
-}
-
-function show_dumb_form($type="reg") {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
-function Validate() {
-	// Check for Empty fields
-	if (document.REG.uid.value == "" || document.REG.aid.value == "") {
-		alert ("{$ibforums->lang['js_blanks']}");
-		return false;
-	}
-}
-//-->
-</script>
-<form action="{$ibforums->base_url}" method="post" name='REG' onsubmit='return Validate()'>
-<input type='hidden' name='act' value='Reg' />
-<input type='hidden' name='CODE' value='03' />
-<input type='hidden' name='type' value='$type' />
-<div class="tableborder">
-  <div class="titlemedium">{$ibforums->lang['dumb_header']}</div>
-  <div class="tablepad">{$ibforums->lang['dumb_text']}</div>
-  <div class="pformstrip">{$ibforums->lang['complete_form']}</div>
-  <table class="tablebasic">
-   <tr>
-	<td class="pformleft">{$ibforums->lang['user_id']}</td>
-	<td class="pformright"><input type='text' size='32' maxlength='32' name='uid' class='forminput' /></td>
-   </tr>
-   <tr>
-	<td class="pformleft">{$ibforums->lang['val_key']}</td>
-	<td class="pformright"><input type='text' size='32' maxlength='50' name='aid' class='forminput' /></td>
-   </tr>
-  </table>
-  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['dumb_submit']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function ShowForm($data) {
-global $ibforums;
-return <<<EOF
-<script language='javascript' type="text/javascript">
-<!--
-function Validate() {
-	// Check for Empty fields
-	if (document.REG.UserName.value == "" || document.REG.PassWord.value == "" || document.REG.PassWord_Check.value == "" || document.REG.EmailAddress.value == "") {
-		alert ("{$ibforums->lang['js_blanks']}");
-		return false;
-	}
-
-	// Have we checked the checkbox?
-
-	if (document.REG.agree.checked == true) {
-		return true;
-	} else {
-		alert ("{$ibforums->lang['js_no_check']}");
-		return false;
-	}
-}
-//-->
-</script>
-<form action="{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}" method="post" name='REG' onsubmit='return Validate()'>
-<input type='hidden' name='act' value='Reg' />
-<input type='hidden' name='CODE' value='02' />
-<input type='hidden' name='coppa_user' value='{$data['coppa_user']}' />
-<b>{$ibforums->lang['reg_header']}</b><br /><br />{$data['TEXT']}
-<br />
-<br />
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['registration_form']}</div>
-  <div class="pformstrip">{$ibforums->lang['complete_form']}</div>
-  <table class="tablebasic">
-  <tr>
-    <td class="pformleft">{$ibforums->lang['user_name']}</td>
-    <td class="pformright"><input type='text' size='32' maxlength='64' value='{$ibforums->input['UserName']}' name='UserName' class='forminput' /></td>
-  </tr>
-  <tr>
-    <td class="pformleft">{$ibforums->lang['pass_word']}</td>
-    <td class="pformright"><input type='password' size='32' maxlength='32' value='{$ibforums->input['PassWord']}' name='PassWord' class='forminput' /></td>
-  </tr>
-  <tr>
-    <td class="pformleft">{$ibforums->lang['re_enter_pass']}</td>
-    <td class="pformright"><input type='password' size='32' maxlength='32' value='{$ibforums->input['PassWord_Check']}'  name='PassWord_Check' class='forminput' /></td>
-  </tr>
-  <tr>
-    <td class="pformleft">{$ibforums->lang['email_address']}</td>
-    <td class="pformright"><input type='text' size='32' maxlength='50' value='{$ibforums->input['EmailAddress']}'  name='EmailAddress' class='forminput' /></td>
-  </tr>
-  <tr>
-    <td class="pformleft">{$ibforums->lang['email_address_two']}</td>
-    <td class="pformright"><input type='text' size='32' maxlength='50'  value='{$ibforums->input['EmailAddress_two']}' name='EmailAddress_two' class='forminput' /></td>
-  </tr>
-  <!--{REQUIRED.FIELDS}-->
-  <!--{OPTIONAL.FIELDS}-->
-  <!--IBF.MODULES.EXTRA-->
-  </table>
-</div>
-<br />
-<!--{REG.ANTISPAM}-->
-<br />
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['terms_service']}</div>
-  <div class="tablepad" align="center">
-   <strong>{$ibforums->lang['terms_service_text']}</strong>
-   <br />
-   <br />
-   <textarea cols='75' rows='9' readonly="readonly" name='Post' class='textinput'>{$data[RULES]}</textarea>
-   <br /><br /><b>{$ibforums->lang['agree_submit']}</b>&nbsp;<input type='checkbox' name='agree' value='1' />
-  </div>
-  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['submit_form']}" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function errors($data) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['errors_found']}</div>
-  <div class="tablepad"><span class='postcolor'>$data</span></div>
-</div>
-<br />
-EOF;
-}
-
-function bot_antispam($regid) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['las_title']}</div>
-  <table class="tablebasic">
-	 <td class='row1' width='40%'>{$ibforums->lang['las_numbers']}</td>
-	 <td class='row1'>
-	   <input type='hidden' name='regid' value='$regid' />
-	   <img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=1' border='0' alt='Code Bit' />
-	   &nbsp;<img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=2' border='0' alt='Code Bit' />
-	   &nbsp;<img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=3' border='0' alt='Code Bit' />
-	   &nbsp;<img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=4' border='0' alt='Code Bit' />
-	   &nbsp;<img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=5' border='0' alt='Code Bit' />
-	   &nbsp;<img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=6' border='0' alt='Code Bit' />
-	 </td>
-	 </tr>
-	 <tr>
-	 <td class='row1' width='40%'>{$ibforums->lang['las_text']}</td>
-	 <td class='row1'><input type='text' size='32' maxlength='32' name='reg_code' class='forminput' /></td>
-	 </tr>
-  </table>
-</div>
-EOF;
-}
-
-function bot_antispam_gd($regid) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class="tableborder">
-  <div class="pformstrip">{$ibforums->lang['las_title']}</div>
-  <table class="tablebasic">
-   <tr>
-	 <td class='row1' width='40%'>{$ibforums->lang['las_numbers']}</td>
-	 <td class='row1'>
-	   <input type='hidden' name='regid' value='$regid' />
-	   <img src='{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}' border='0' alt='Loading Image' />
-	 </td>
-	 </tr>
-	 <tr>
-	 <td class='row1' width='40%'>{$ibforums->lang['las_text']}</td>
-	 <td class='row1'><input type='text' size='32' maxlength='32' name='reg_code' class='forminput' /></td>
-	 </tr>
-  </table>
-</div>
-EOF;
-}
-
-
-function tmpl_form($action, $hidden, $title, $content ) {
-global $ibforums;
-return <<<EOF
-<form method="post" action="$action">
-$hidden
-<div class="tableborder">
-  <div class="maintitle">$title</div>
-  <table class="tablebasic">
-  $content
-  </table>
-  <div class="pformstrip" align="center"><input type="submit" class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-
-function optional_title() {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td colspan='2' class='pformstrip'>{$ibforums->lang['cf_optional']}</td>
-</tr>
-EOF;
-}
-
-function field_entry($title, $desc="", $content) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='pformleft' valign='top'><b>$title</b><br />$desc</td>
-  <td class='pformright'>$content</td>
-</tr>
-EOF;
-}
-
-function field_textinput($name, $value="") {
-global $ibforums;
-return <<<EOF
-<input type='text' size='30' name='$name' value='$value' class='forminput' />
-EOF;
-}
-
-function field_dropdown($name, $options) {
-global $ibforums;
-return <<<EOF
-<select name='$name' class='forminput'>$options</select>
-EOF;
-}
-
-function field_textarea($name, $value) {
-global $ibforums;
-return <<<EOF
-<textarea cols='60' rows='5' name='$name' class='forminput'>$value</textarea>
-EOF;
-}
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_search.php b/upload/Skin/s1/skin_search.php
deleted file mode 100644
index 3217049f..00000000
--- a/upload/Skin/s1/skin_search.php
+++ /dev/null
@@ -1,489 +0,0 @@
-<?php
-
-class skin_search {
-
-
-  
-function RenderRow($Data) {
-global $ibforums;
-return <<<EOF
-    <!-- Begin Topic Entry {$Data['tid']} -->
-    <tr> 
-	  <td align='center' class='row4'>{$Data['folder_img']}</td>
-      <td align='center' width='3%' class='row2'>{$Data['topic_icon']}</td>
-      <td class='row4'>
-	  <table width='100%' border='0' cellspacing='0' cellpadding='0'>
-		  <tr> 
-			<td valign='middle'>{$Data['go_new_post']}</td>
-            <td width='100%'>{$Data['prefix']} <a href='{$ibforums->base_url}showtopic={$Data['tid']}&amp;hl={$Data['keywords']}'>{$Data['title']}</a>  {$Data[PAGES]}</td>
-          </tr>
-        </table>
-        <span class='desc'>{$Data['description']}</span></td>
-      <td class='row4' width='20%' align='center'><a href="{$ibforums->base_url}showforum={$Data['forum_id']}">{$Data['forum_name']}</a></td>
-      <td align='center' class='row2'>{$Data['starter']}</td>
-      <td align='center' class='row4'>{$Data['posts']}</td>
-      <td align='center' class='row2'>{$Data['views']}</td>
-      <td class='row2'>{$Data['last_post']}<br /><a href='{$ibforums->base_url}showtopic={$Data['tid']}&amp;view=getlastpost'>{$Data['last_text']}</a> <b>{$Data['last_poster']}</b></td>
-    </tr>
-    <!-- End Topic Entry {$Data['tid']} -->
-EOF;
-}
-
-function RenderPostRow($Data) {
-global $ibforums;
-return <<<EOF
-<br />
-<div class="tableborder">
-  <div class="maintitle">{$Data['folder_img']}&nbsp;{$Data['prefix']} <a href='{$ibforums->base_url}showtopic={$Data['tid']}&amp;hl={$Data['keywords']}' class='linkthru'>{$Data['title']}</a></span></b>  {$Data[PAGES]}</div>
-  <table class="tablebasic" cellpadding="6" cellspacing="1" width='100%'>
-  <tr>
-	<td width='150' align='left' class='row4'><span class='normalname'>{$Data['author_name']}</span></td>
-	<td class='row4' width="100%"><strong>{$ibforums->lang['rp_postedon']} {$Data['post_date']}</strong></td>
-  </tr>
-  <tr>
-	<td class='post1' align='left'>
-	  <img src='{$ibforums->vars['img_url']}/spacer.gif' alt='' width='150' height='15' />
-	  <br />
-	  <span class='postdetails'>{$ibforums->lang['rp_replies']} <b>{$Data['posts']}</b><br />{$ibforums->lang['rp_hits']} <b>{$Data['views']}</b></span>
-	</td>
-	<td class='post1' align='left' width="100%">{$Data['post']}</td>
-  </tr>
-   <tr>
-	<td class='row4'>&nbsp;</td>
-	<td class='row4'>{$ibforums->lang['rp_forum']} <a href="{$ibforums->base_url}showforum={$Data['forum_id']}">{$Data['forum_name']}</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;{$ibforums->lang['rp_post']} <a href='{$ibforums->base_url}act=ST&amp;f={$Data['forum_id']}&amp;t={$Data['tid']}&amp;hl={$Data['keywords']}&amp;view=findpost&amp;p={$Data['pid']}' class='linkthru'>#{$Data['pid']}</a></td>
-  </tr>
-  </table>
-</div>
-EOF;
-}
-
-function start_as_post($Data) {
-global $ibforums;
-return <<<EOF
-<div>{$Data[SHOW_PAGES]}</div>
-
-EOF;
-}
-
-function end_as_post($Data) {
-global $ibforums;
-return <<<EOF
-<br />
-<div>{$Data[SHOW_PAGES]}</div>
-<div align='left' class="wrapmini">
-	<{B_NEW}>&nbsp;&nbsp;{$ibforums->lang['pm_open_new']}
-	<br /><{B_NORM}>&nbsp;&nbsp;{$ibforums->lang['pm_open_no']}
-	<br /><{B_HOT}>&nbsp;&nbsp;{$ibforums->lang['pm_hot_new']}
-	<br /><{B_HOT_NN}>&nbsp;&nbsp;{$ibforums->lang['pm_hot_no']}
-</div>
-
-<div align='left' class="wrapmini">
-	<{B_POLL}>&nbsp;&nbsp;{$ibforums->lang['pm_poll']}
-	<br /><{B_POLL_NN}>&nbsp;&nbsp;{$ibforums->lang['pm_poll_no']}
-	<br /><{B_LOCKED}>&nbsp;&nbsp;{$ibforums->lang['pm_locked']}
-	<br /><{B_MOVED}>&nbsp;&nbsp;{$ibforums->lang['pm_moved']}
-</div>
-EOF;
-}
-
-
-function end($Data) {
-global $ibforums;
-return <<<EOF
-</table>
-<div class="titlemedium">&nbsp;</div>
-</div>
-<br />
-<div>{$Data[SHOW_PAGES]}</div>
-<br />
-<div align='left' class="wrapmini">
-	<{B_NEW}>&nbsp;&nbsp;{$ibforums->lang['pm_open_new']}
-	<br /><{B_NORM}>&nbsp;&nbsp;{$ibforums->lang['pm_open_no']}
-	<br /><{B_HOT}>&nbsp;&nbsp;{$ibforums->lang['pm_hot_new']}
-	<br /><{B_HOT_NN}>&nbsp;&nbsp;{$ibforums->lang['pm_hot_no']}
-</div>
-
-<div align='left' class="wrapmini">
-	<{B_POLL}>&nbsp;&nbsp;{$ibforums->lang['pm_poll']}
-	<br /><{B_POLL_NN}>&nbsp;&nbsp;{$ibforums->lang['pm_poll_no']}
-	<br /><{B_LOCKED}>&nbsp;&nbsp;{$ibforums->lang['pm_locked']}
-	<br /><{B_MOVED}>&nbsp;&nbsp;{$ibforums->lang['pm_moved']}
-</div>
-<br />
-<br clear="all" />
-EOF;
-}
-
-
-function boolean_explain_page() {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['be_link']}</div>
- <table width='100%' cellpadding='0' cellspacing='1'>
- <tr>
-  <th width='30%' class='pformstrip'>{$ibforums->lang['be_use']}</th>
-  <th width='70%' class='pformstrip'>{$ibforums->lang['be_means']}</th>
- </tr>
- <tr>
-  <td class='pformleft'>{$ibforums->lang['be_u1']}</td>
-  <td class='pformleft'>{$ibforums->lang['be_m1']}</td>
- </tr>
- <tr>
-  <td class='pformleft'>{$ibforums->lang['be_u2']}</td>
-  <td class='pformleft'>{$ibforums->lang['be_m2']}</td>
- </tr>
- <tr>
-  <td class='pformleft'>{$ibforums->lang['be_u3']}</td>
-  <td class='pformleft'>{$ibforums->lang['be_m3']}</td>
- </tr>
- <tr>
-  <td class='pformleft'>{$ibforums->lang['be_u4']}</td>
-  <td class='pformleft'>{$ibforums->lang['be_m4']}</td>
- </tr>
- <tr>
-  <td class='pformleft'>{$ibforums->lang['be_u5']}</td>
-  <td class='pformleft'>{$ibforums->lang['be_m5']}</td>
- </tr>
- </table>
-</div> 
-EOF;
-}
-
-function boolean_explain_link() {
-global $ibforums;
-return <<<EOF
-&#091; <a href='#' title='{$ibforums->lang['be_ttip']}' onclick='win_pop()'>{$ibforums->lang['be_link']}</a> &#093;
-EOF;
-}
-
-function simple_form($forums) {
-global $ibforums;
-return <<<EOF
-<script type="text/javascript">
-<!--
-function go_gadget_advanced()
-{
-	window.location = "{$ibforums->js_base_url}act=Search&mode=adv&f={$ibforums->input['f']}";
-}
-function win_pop()
-{
-    window.open('{$ibforums->js_base_url}act=Search&CODE=explain','WIN','width=400,height=300,resizable=yes,scrollbars=yes'); 
-}
--->
-</script>
-<form action="{$ibforums->base_url}act=Search&amp;CODE=simpleresults&amp;mode=simple" method="post" name='sForm'>
-$hidden_fields
-<div class="tableborder">
-  <div class="maintitle"  align='center'>{$ibforums->lang['search_options']}</div>
-  <div class="pformstrip" align="center">{$ibforums->lang['key_search']}</div>
-  <div class="tablepad" align="center">
-    <input type='text' maxlength='100' size='40' id="keywords" name='keywords' class='forminput' />
-	<br />
-	<label for="keywords">{$ibforums->lang['keysearch_text']}</label> <!--IBF.BOOLEAN_EXPLAIN-->
-  </div>
-  <div class="pformstrip" align="center">{$ibforums->lang['search_where']}</div>
-   <div class="tablepad" align="center">
-    $forums
-    <br /><br />
-    <strong>{$ibforums->lang['sf_show_me']}</strong>
-      <input type="radio" name="sortby" value="relevant" id="sortby_one" checked="checked" class="radiobutton" />
-      <label for="sortby_one">{$ibforums->lang['sf_most_r_f']}</label>
-      &nbsp;
-      <input type="radio" name="sortby" value="date" id="sortby_two" class="radiobutton" />
-      <label for="sortby_two">{$ibforums->lang['sf_most_date']}</label>
-   </div>
-  <div class="pformstrip" align="center">
-    <input type='submit' value='{$ibforums->lang['do_search']}' class='forminput' />
-    &nbsp;
-    <input type='button' value='{$ibforums->lang['so_more_opts']}' onclick="go_gadget_advanced()" class='forminput' />
-  </div>
-</div>
-</form>
-    
-EOF;
-}
-
-function result_simple_header($data) {
-global $ibforums;
-return <<<EOF
-<div class="plainborder">
-  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['search_results']}</div>
-  <div class="pformstrip">
-	<div class="pagelinks">{$ibforums->lang['g_searched_for']} <strong>{$data['keyword']}</strong></div>
-	<div align="right">
-	   {$ibforums->lang['g_results']} <strong>{$data['start']} - {$data['end']}</strong> {$ibforums->lang['g_of_about']} <strong>{$data['matches']}</strong>.
-	   {$ibforums->lang['g_search_took']} <strong>{$data['ex_time']}</strong> {$ibforums->lang['g_seconds']}
-	</div>
-  </div>
-  <br />
-EOF;
-}
-
-function result_simple_footer($data) {
-global $ibforums;
-return <<<EOF
-  <div class="pformstrip" align="left">{$ibforums->lang['search_pages']} &nbsp;  &nbsp; &nbsp;<span class="googlepagelinks">{$data['links']}</span></div>
-</div>
-EOF;
-}
-
-function result_simple_entry($data) {
-global $ibforums;
-return <<<EOF
-  <div class="{$data['css_class']}">
-  <span class="googlish"><a href='{$ibforums->base_url}act=ST&amp;t={$data['tid']}&amp;f={$data['id']}&amp;view=findpost&amp;p={$data['pid']}'>{$data['title']}</span></a>
-  <br />
-  {$data['post']}
-  <br />
-  <span class='googlesmall'>
-  {$ibforums->lang['location_g']}: <a href='{$ibforums->base_url}act=idx'>{$ibforums->lang['g_b_home']}</a>
-  &gt; <a href='{$ibforums->base_url}act=SC&amp;c={$data['cat_id']}'>{$data['cat_name']}</a>
-  &gt; <a href='{$ibforums->base_url}act=SF&amp;f={$data['id']}'>{$data['name']}</a>
-  </span>
-  <br />
-  <span class="googlebottom"><strong>{$ibforums->lang['g_relevance']}: {$data['relevance']}% &middot; Author: {$data['author_name']} &middot; Posted on: {$data['post_date']}</strong></span>
-  <span class="googlesmall"> - <a href='{$ibforums->base_url}act=ST&amp;t={$data['tid']}&amp;f={$data['id']}&amp;view=findpost&amp;p={$data['pid']}' target='_blank'>{$ibforums->lang['g_new_window']}</a></span>
-  </div>
-  <br />
-EOF;
-}
-
-
-
-function Form($forums) {
-global $ibforums;
-return <<<EOF
-<script type="text/javascript">
-<!--
-function go_gadget_simple()
-{
-	window.location = "{$ibforums->js_base_url}act=Search&mode=simple&f={$ibforums->input['f']}";
-}
-function win_pop()
-{
-    window.open('{$ibforums->js_base_url}act=Search&CODE=explain','WIN','width=400,height=300,resizable=yes,scrollbars=yes'); 
-}
--->
-</script>
-<form action="{$ibforums->base_url}act=Search&amp;CODE=01" method="post" name='sForm'>
-$hidden_fields
-<div class="tableborder">
-<table cellpadding='4' cellspacing='0' border='0' width='100%'>
-<tr>
-	<td colspan='2' class="maintitle"  align='center'>{$ibforums->lang['keywords_title']}</td>
-</tr>
-<tr>
-	<td class='pformstrip' width='50%'>{$ibforums->lang['key_search']}</td>
-	<td class='pformstrip' width='50%'>{$ibforums->lang['mem_search']}</td>
-</tr>
-<tr>
-	<td class='row1' valign='top'>
-	  <input type='text' maxlength='100' size='40' name='keywords' id="keywords" class='forminput' />
-	  <br /><br />
-	  <label for="keywords">{$ibforums->lang['keysearch_text']}</label> <!--IBF.BOOLEAN_EXPLAIN-->
-	</td>
-	<td class='row1' valign='top'>
-	<table width='100%' cellpadding='4' cellspacing='0' border='0' align='center'>
-	<tr>
-	 <td><input type='text' maxlength='100' size='50' name='namesearch' class='forminput' /></td>
-	</tr>
-	<tr>
-	<td width='40%'><input type='checkbox' name='exactname' id='matchexact' value='1' class="checkbox" /><label for="matchexact">{$ibforums->lang['match_name_ex']}</label></td>
-   </tr>
-</table>
-</td>
-</tr>
-</table>
-</div>
-<br />
-<div class="tableborder">
-<table cellpadding='4' cellspacing='0' border='0' width='100%'>         
-<tr>
-	<td colspan='2' class="maintitle"  align='center'>{$ibforums->lang['search_options']}</td>
-</tr>
-
-<tr>
-	<td class='pformstrip' width='50%' valign='middle'>{$ibforums->lang['search_where']}</td>
-	<td class='pformstrip' width='50%' valign='middle'>{$ibforums->lang['search_refine']}</td>
-</tr>
-
-<tr>
-	<td class='row1' valign='middle'>
-	  $forums
-	  <br />
-	  <input type='checkbox' name='searchsubs' value='1' id="searchsubs" checked="checked" />&nbsp;<label for="searchsubs">{$ibforums->lang['search_in_subs']}</label>
-	</td>
-	<td class='row1' valign='top'>
-		<table cellspacing='4' cellpadding='0' width='100%' align='center' border='0'>
-		<tr>
-		 <td valign='top'>
-		   <fieldset class="search">
-		     <legend><strong>{$ibforums->lang['search_from']}</strong></legend>
-			 <select name='prune' class='forminput'>
-			 <option value='1'>{$ibforums->lang['today']}</option>
-			 <option value='7'>{$ibforums->lang['this_week']}</option>
-			 <option value='30' selected="selected">{$ibforums->lang['this_month']}</option>
-			 <option value='60'>{$ibforums->lang['this_60']}</option>
-			 <option value='90'>{$ibforums->lang['this_90']}</option>
-			 <option value='180'>{$ibforums->lang['this_180']}</option>
-			 <option value='365'>{$ibforums->lang['this_year']}</option>
-			 <option value='0'>{$ibforums->lang['ever']}</option>
-			 </select>
-			 <br />
-			 <input type='radio' name='prune_type' id="prune_older" value='older' class='radiobutton' />&nbsp;<label for="prune_older">{$ibforums->lang['older']}</label>
-			 <br />
-			 <input type='radio' name='prune_type' id="prune_newer" value='newer' class='radiobutton' checked="checked" />&nbsp;<label for="prune_newer">{$ibforums->lang['newer']}</label>
-		  </fieldset>
-		</td>
-		<td valign='top'>
-		  <fieldset class="search">
-		     <legend><strong>{$ibforums->lang['sort_results']}</strong></legend>
-			 <select name='sort_key' class='forminput'>
-			 <option value='last_post'>{$ibforums->lang['last_date']}</option>
-			 <option value='posts'>{$ibforums->lang['number_topics']}</option>
-			 <option value='starter_name'>{$ibforums->lang['poster_name']}</option>
-			 <option value='forum_id'>{$ibforums->lang['forum_name']}</option>
-			 </select>
-			 <br /><input type='radio' name='sort_order' id="sort_desc" class="radiobutton" value='desc' checked="checked" /><label for="sort_desc">{$ibforums->lang['descending']}</label>
-			 <br /><input type='radio' name='sort_order' id="sort_asc" class="radiobutton" value='asc' /><label for="sort_asc">{$ibforums->lang['ascending']}</label>
-		  </fieldset>
-		</td>
-		</tr>
-		<tr>
-		 <td nowrap="nowrap">
-		   <fieldset class="search">
-		     <legend><strong>{$ibforums->lang['search_where']}</strong></legend>
-			 <input type='radio' name='search_in' class="radiobutton" id="search_in_posts" value='posts' checked="checked" /><label for="search_in_posts">{$ibforums->lang['in_posts']}</label>
-			 <br />
-			 <input type='radio' name='search_in' class="radiobutton" id="search_in_titles" value='titles' /><label for="search_in_titles">{$ibforums->lang['in_topics']}</label>
-		   </fieldset>
-		 </td>
-		 <td>
-		    <fieldset class="search">
-		     <legend><strong>{$ibforums->lang['result_type']}</strong></legend>
-		     <input type='radio' name='result_type' class="radiobutton" value='topics' id="result_topics" checked="checked" /><label for="result_topics">{$ibforums->lang['results_topics']}</label>
-		     <br />
-		     <input type='radio' name='result_type' class="radiobutton" value='posts' id="result_posts" /><label for="result_posts">{$ibforums->lang['results_post']}</label>
-		   </fieldset>
-		 </td>
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr>
-	<td class='pformstrip' colspan='2' align='center'><input type='submit' value='{$ibforums->lang['do_search']}' class='forminput' /><!--IBF.SIMPLE_BUTTON--></td>
-</tr>
-</table>
-</div>
-</form>
-    
-EOF;
-}
-function form_simple_button() {
-global $ibforums;
-return <<<EOF
-&nbsp;<input type='button' value='{$ibforums->lang['so_less_opts']}' onclick="go_gadget_simple()" class='forminput' />
-EOF;
-}
-
-
-function active_start($data) {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type="text/javascript">
-<!--
-function checkvalues() {
-   f = document.dateline;
-   if (f.st_day.value < f.end_day.value) {
-	   alert("{$ibforums->lang['active_js_error']}");
-	   return false;
-   }
-   if (f.st_day.value == f.end_day.value) {
-	   alert("{$ibforums->lang['active_js_error']}");
-	   return false;
-   }
-}
--->
-</script>
-<br />
-<form action='{$ibforums->base_url}act=Search&amp;CODE=getactive' method='post' name='dateline' onsubmit='return checkvalues();'>
-<div class="pagelinks">{$data['SHOW_PAGES']}</div>
-<div align="right" style="width:35%;text-align:center;margin-right:0;margin-left:auto">
- <fieldset class="search">
-   <legend><strong>{$ibforums->lang['active_st_text']}</strong></legend>
-   <label for='st_day'>{$ibforums->lang['active_mid_text']}</label>&nbsp;
-   <select name='st_day' id='st_day' class='forminput'>
-	<option value='s1'>{$ibforums->lang['active_yesterday']}</option>
-	<option value='s2'>2 {$ibforums->lang['active_days']}</option>
-	<option value='s3'>3 {$ibforums->lang['active_days']}</option>
-	<option value='s4'>4 {$ibforums->lang['active_days']}</option>
-	<option value='s5'>5 {$ibforums->lang['active_days']}</option>
-	<option value='s6'>6 {$ibforums->lang['active_days']}</option>
-	<option value='s7'>{$ibforums->lang['active_week']}</option>
-	<option value='s30'>{$ibforums->lang['active_month']}</option>
-   </select>
-   &nbsp;
-   <label for='end_day'>{$ibforums->lang['active_end_text']}</label>&nbsp;
-   <select name='end_day' id='end_day' class='forminput'>
-	<option value='e0'>{$ibforums->lang['active_today']}</option>
-	<option value='e1'>{$ibforums->lang['active_yesterday']}</option>
-	<option value='e2'>2 {$ibforums->lang['active_days']}</option>
-	<option value='e3'>3 {$ibforums->lang['active_days']}</option>
-	<option value='e4'>4 {$ibforums->lang['active_days']}</option>
-	<option value='e5'>5 {$ibforums->lang['active_days']}</option>
-	<option value='e6'>6 {$ibforums->lang['active_days']}</option>
-	<option value='e7'>{$ibforums->lang['active_week']}</option>
-   </select>
-   &nbsp;
-   <input type='submit' value='&gt;&gt;' title="{$ibforums->lang['active_label']}" class='forminput'>
- </fieldset>
-</div>
-</form>
-<br />
-<div class="tableborder">
-  <div class="maintitle"><{CAT_IMG}>{$ibforums->lang['active_topics']}</div>
-  <table class="tablebasic" cellspacing="1" cellpadding="4">
-	<tr>
-	   <td class='titlemedium' colspan='2' >&nbsp;</td>
-	   <th align='left' class='titlemedium'>{$ibforums->lang['h_topic_title']}</th>
-	   <th align='center' class='titlemedium'>{$ibforums->lang['h_forum_name']}</th>
-	   <th align='center' class='titlemedium'>{$ibforums->lang['h_topic_starter']}</th>
-	   <th align='center' class='titlemedium'>{$ibforums->lang['h_replies']}</th>
-	   <th align='center' class='titlemedium'>{$ibforums->lang['h_hits']}</th>
-	   <th class='titlemedium'>{$ibforums->lang['h_last_action']}</th>
-	</tr>
-EOF;
-}
-
-
-function start($Data) {
-global $ibforums;
-return <<<EOF
-<div>{$Data[SHOW_PAGES]}</div>
-<br />
-<div class="tableborder">
-<div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang['your_results']} &middot; <a style="text-decoration:underline" href="{$ibforums->base_url}act=Login&amp;CODE=05">{$ibforums->lang['mark_search_as_read']}</a></div>
-<table class="tablebasic" cellpadding="2" cellspacing="1" width='100%'>
-  <tr>
-	 <td class='titlemedium' colspan='2'>&nbsp;</td>
-	 <td align='left' class='titlemedium'>{$ibforums->lang['h_topic_title']}</td>
-	 <td align='center' class='titlemedium'>{$ibforums->lang['h_forum_name']}</td>
-	 <td align='center' class='titlemedium'>{$ibforums->lang['h_topic_starter']}</td>
-	 <td align='center' class='titlemedium'>{$ibforums->lang['h_replies']}</td>
-	 <td align='center' class='titlemedium'>{$ibforums->lang['h_hits']}</td>
-	 <td class='titlemedium'>{$ibforums->lang['h_last_action']}</td>
-  </tr>
-EOF;
-}
-
-function active_none() {
-global $ibforums;
-return <<<EOF
-<tr><td colspan='8' class='row1' align='center'><strong>{$ibforums->lang['active_no_topics']}</strong></td></tr>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_stats.php b/upload/Skin/s1/skin_stats.php
deleted file mode 100644
index 2d50ff04..00000000
--- a/upload/Skin/s1/skin_stats.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-class skin_stats {
-
-
-function who_header($fid, $tid, $title) {
-global $ibforums;
-return <<<EOF
-
-<script language='javascript'>
-<!--
- function bog_off()
- {
- 	var tid = '$tid';
- 	var fid = '$fid';
- 	
- 	opener.location= '$ibforums->base_url' + 'showtopic=' + tid;
- 	self.close();
- }
- //-->
- </script>
-<div class="tableborder">
-  <div class="titlemedium" align="center">{$ibforums->lang['who_farted']} $title</div>
-  <table cellpadding='5' cellspacing='1' border='0' width='100%'>
-  <tr>
-	 <td width='70%' align='left'   class='pformstrip'   valign='middle'>{$ibforums->lang['who_poster']}</td>
-	 <td width='30%' align='center' class='pformstrip' valign='middle'>{$ibforums->lang['who_posts']}</td>
-  </tr>
-EOF;
-}
-
-
-function who_row($row) {
-global $ibforums;
-return <<<EOF
-   <tr>
-	  <td align='left' class='row1' valign='middle'>{$row['author_name']}</td>
-	  <td align='center' class='row1' valign='middle'>{$row['pcount']}</td>
-   </tr>
-EOF;
-}
-
-function who_name_link($id, $name) {
-global $ibforums;
-return <<<EOF
-<a href='{$ibforums->base_url}showuser=$id' target='_blank'>$name</a>
-EOF;
-}
-
-
-function who_end() {
-global $ibforums;
-return <<<EOF
-  </table>
-  <div class='titlemedium' align='center'><a href='javascript:bog_off();'>{$ibforums->lang['who_go']}</a></div>
-</div>
-EOF;
-}
-
-
-
-function page_title($title) {
-global $ibforums;
-return <<<EOF
-    <table cellpadding='0' cellspacing='0' border='0' width='<{tbl_width}>' align='center'>
-      <tr>
-         <td valign='middle' align='left'><span class='pagetitle'>{$title}</td>
-      </tr>
-     </table>
-EOF;
-}
-
-function group_strip( $group ) {
-global $ibforums;
-return <<<EOF
-<div class="tableborder">
- <div class="maintitle"><{CAT_IMG}>&nbsp;$group</div>
- <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	 <td width='30%' align='left'   class='pformstrip' valign='middle'>{$ibforums->lang['leader_name']}</td>
-	 <td width='40%' align='center' class='pformstrip' valign='middle'>{$ibforums->lang['leader_forums']}</td>
-	 <td align='center' width='25%' class='pformstrip' valign='middle'>{$ibforums->lang['leader_location']}</td>
-	 <td align='center' width='5%'  class='pformstrip' valign='middle'>&nbsp;</td>
-  </tr>
-EOF;
-}
-
-function leader_row($info, $forums) {
-global $ibforums;
-return <<<EOF
-  <tr>
-	 <td align='left'   class='row1' valign='middle'><a href='{$ibforums->base_url}showuser={$info['id']}'>{$info['name']}</a></td>
-	 <td align='center' class='row1' valign='middle'>$forums</td>
-	 <td align='center' class='row1' valign='middle'>{$info['location']}</td>
-	 <td align='center' class='row1' valign='middle'>{$info['msg_icon']}</td>
-  </tr>
-EOF;
-}
-
-function leader_row_forum_start($id, $count_string) {
-global $ibforums;
-return <<<EOF
-<form method="post" onsubmit="if(document.jmenu$id.f.value == -1){return false;}" action="{$ibforums->base_url}act=SF" name="jmenu$id">
-<select class='forminput' name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.jmenu$id.submit() }" style='width:95%'>
-<option value="-1">$count_string</option>
-<option value="-1">--------------------------------------------------------</option>
-EOF;
-}
-
-function leader_row_forum_entry($id, $name) {
-global $ibforums;
-return <<<EOF
-<option value='$id'>$name</option>
-EOF;
-}
-
-function leader_row_forum_end() {
-global $ibforums;
-return <<<EOF
-</select></form>
-EOF;
-}
-
-function close_strip() {
-global $ibforums;
-return <<<EOF
-  </table>
-</div>
-<br />
-EOF;
-}
-
-function top_poster_header() {
-global $ibforums;
-return <<<EOF
-<div class='tableborder'>
- <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['todays_posters']}</div>
- <table cellpadding='5' cellspacing='1' border='0' width='100%'>
- <tr>
-	<th width='30%' align='left' class='pformstrip'   valign='middle'>{$ibforums->lang['member']}</th>
-	<th width='20%' align='center' class='pformstrip' valign='middle'>{$ibforums->lang['member_joined']}</th>
-	<th align='center' width='15%' class='pformstrip' valign='middle'>{$ibforums->lang['member_posts']}</th>
-	<th align='center' width='15%' class='pformstrip' valign='middle'>{$ibforums->lang['member_today']}</th>
-	<th align='center' width='20%' class='pformstrip' valign='middle'>{$ibforums->lang['member_percent']}</th>
- </tr>
-EOF;
-}
-
-function top_poster_row($info) {
-global $ibforums;
-return <<<EOF
-   <tr>
-	  <td align='left' class='row1' valign='middle'><a href='{$ibforums->base_url}showuser={$info['id']}'>{$info['name']}</a></td>
-	  <td align='center' class='row1' valign='middle'>{$info['joined']}</td>
-	  <td align='center' class='row1' valign='middle'>{$info['posts']}</td>
-	  <td align='center' class='row1' valign='middle'>{$info['tpost']}</td>
-	  <td align='center' class='row1' valign='middle'>{$info['today_pct']}%</td>
-   </tr>
-EOF;
-}
-
-function top_poster_footer($info) {
-global $ibforums;
-return <<<EOF
-  </table>
-  <div class='pformstrip' align='center'>{$ibforums->lang['total_today']} $info</div>
-</div>
-EOF;
-}
-
-function top_poster_no_info() {
-global $ibforums;
-return <<<EOF
-   <tr>
-	  <td colspan='5' align='center' class='row1' valign='middle'>{$ibforums->lang['no_info']}</td>
-   </tr>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_subscriptions.php b/upload/Skin/s1/skin_subscriptions.php
deleted file mode 100644
index c63c6da8..00000000
--- a/upload/Skin/s1/skin_subscriptions.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-
-class skin_subscriptions {
-
-function do_nochex_upgrade_screen($ccode, $member_id, $new_sub_id, $to_pay, $nochex_email, $sub_title, $cur_tran_id, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />$desc_string
-
-<br /><br /><b>{$ibforums->lang['gw_nochex']}</b>
-</p>
-<form action='https://www.nochex.com/nochex.dll/checkout' method='post'>
-<input type="hidden" name="email" value="$nochex_email" />
-<input type="hidden" name="amount" value="$to_pay" />
-<input type="hidden" name="ordernumber" value="{$new_sub_id}x{$member_id}x$cur_tran_id" />
-<input type="hidden" name="returnurl" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=nochex">
-<br /><br />
-<center>
-<input type="image" src="http://www.nochex.com/web/images/payme4.gif" border="0" name="submit" alt="Pay with NOCHEX now"></center>
-</form>
-EOF;
-}
-
-function do_nochex_normal_screen($ccode, $member_id, $new_sub_id, $to_pay, $nochex_email, $sub_title, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />$desc_string
-<br /><br /><b>{$ibforums->lang['gw_nochex']}</b>
-</p>
-<form action='https://www.nochex.com/nochex.dll/checkout' method='post'>
-<input type="hidden" name="email" value="$nochex_email" />
-<input type="hidden" name="amount" value="$to_pay" />
-<input type="hidden" name="ordernumber" value="{$new_sub_id}x{$member_id}x0" />
-<input type="hidden" name="returnurl" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=nochex">
-<br /><br />
-<center>
-<input type="image" src="http://www.nochex.com/web/images/payme4.gif" border="0" name="submit" alt="Pay with NOCHEX now"></center>
-</form>
-EOF;
-}
-
-function show_ticket($sub, $id, $paid, $extra="") {
-global $ibforums;
-return <<<EOF
-<h2>{$ibforums->lang['man_title']}</h2>
-<br />
-<table cellpadding='0' cellspacing='1' border='0' width='245' align='center' bgcolor='#000000'>
-<tr>
- <td>
-  <table cellpadding='4'  cellspacing='1' border='0' width='100%' align='center'>
-  <tr>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->lang['man_mem']}</td>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->member['name']}</td>
-  </tr>
-  <tr>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->lang['man_mem_id']}</td>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->member['id']}</td>
-  </tr>
-  <tr>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->lang['man_email']}</td>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->member['email']}</td>
-  </tr>
-  <tr>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->lang['man_trans_id']}</td>
-   <td width='50%' bgcolor='#FFFFFF'>{$id}</td>
-  </tr>
-  <tr>
-   <td width='50%' bgcolor='#FFFFFF'>{$ibforums->lang['man_sub']}</td>
-   <td width='50%' bgcolor='#FFFFFF'>{$sub['sub_title']} $extra</td>
-  </tr>
-  <tr>
-   <td width='50%' bgcolor='#FFFFFFF'>{$ibforums->lang['man_pay']}</td>
-   <td width='50%' bgcolor='#FFFFFF'>{$paid}</td>
-  </tr>
- </table>
-</td>
-</tr>
-</table>
-EOF;
-}
-
-
-
-function do_manual_normal_screen($new_sub_id, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<script type="text/javascript">
-<!--
-function pop_ticket()
-{
-	window.open('{$ibforums->js_base_url}act=module&module=subscription&type=manual&CODE=custom&mode=ticket&tickid=0&upgrade=0&sid=$new_sub_id','TICKET','width=250,height=350,resizable=yes,scrollbars=yes');
-}
-
-//-->
-</script>
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-$desc_string
-<br /><br />
-{$ibforums->lang['post_manual']}
-<br /><br />
-{$ibforums->lang['post_manual_more']}
-</p>
-<br /><br />
-<center>
-<input type="button" value="{$ibforums->lang['gw_manual']}" onclick="pop_ticket()" />
-</center>
-EOF;
-}
-
-function do_manual_upgrade_screen($new_sub_id, $cur_id, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<script type="text/javascript">
-<!--
-function pop_ticket()
-{
-	window.open('{$ibforums->js_base_url}act=module&module=subscription&type=manual&CODE=custom&mode=ticket&tickid={$cur_id}&upgrade=1&sid=$new_sub_id','TICKET','width=250,height=350,resizable=yes,scrollbars=yes');
-}
-
-//-->
-</script>
-<div class="pformstrip">{$ibforums->lang['sc_upgrade_title']}</div>
-<p>
-$desc_string
-<br /><br />
-{$ibforums->lang['post_manual']}
-<br /><br />
-{$ibforums->lang['post_manual_more']}
-</p>
-<br /><br />
-<center>
-<input type="button" value="{$ibforums->lang['gw_manual']}" onclick="pop_ticket()" />
-</center>
-EOF;
-}
-
-function do_paypal_normal_recurring_screen($ccode, $member_id, $new_sub_id, $unit, $length, $cost, $paypal_email, $sub_title, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />$desc_string
-<br /><br /><b>{$ibforums->lang['gw_paypal']}</b>
-</p>
-<form action='https://www.paypal.com/cgi-bin/webscr' method='post'>
-<input type="hidden" name="cmd" value="_xclick-subscriptions" />
-<input type="hidden" name="business" value="$paypal_email" />
-<input type="hidden" name="item_name" value="$sub_title" />
-<input type="hidden" name="item_number" value="$new_sub_id" />
-<input type="hidden" name="no_shipping" value="1" />
-<input type="hidden" name="src" value="1" />
-<input type="hidden" name="a3" value="$cost" />
-<input type="hidden" name="p3" value="$length" />
-<input type="hidden" name="t3" value="$unit" />
-<input type="hidden" name="custom" value="$member_id" />
-<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />
-<input type="hidden" name="currency_code" value="$ccode">
-<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<br /><br />
-<center>
-<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"></center>
-</form>
-EOF;
-}
-
-function do_paypal_upgrade_recurring_screen($ccode, $member_id, $new_sub_id, $to_pay, $time_left_to_run, $time_left_unit, $unit, $length, $cost, $paypal_email, $sub_title, $cur_tran_id, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />$desc_string
-<br /><br /><b>{$ibforums->lang['gw_paypal']}</b>
-</p>
-<form action='https://www.paypal.com/cgi-bin/webscr' method='post'>
-<input type="hidden" name="cmd" value="_xclick-subscriptions" />
-<input type="hidden" name="business" value="$paypal_email" />
-<input type="hidden" name="item_name" value="$sub_title" />
-<input type="hidden" name="item_number" value="$new_sub_id" />
-<input type="hidden" name="no_shipping" value="1" />
-<input type="hidden" name="src" value="1" />
-<input type="hidden" name="a1" value="$to_pay" />
-<input type="hidden" name="p1" value="$time_left_to_run" />
-<input type="hidden" name="t1" value="$time_left_unit" />
-<input type="hidden" name="a3" value="$cost" />
-<input type="hidden" name="p3" value="$length" />
-<input type="hidden" name="t3" value="$unit" />
-<input type="hidden" name="invoice" value="{$cur_tran_id}x{$new_sub_id}x{$member_id}" />
-<input type="hidden" name="custom" value="$member_id" />
-<input type="hidden" name="memo" value="upgrade" />
-<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />
-<input type="hidden" name="currency_code" value="$ccode">
-<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<br /><br />
-<center>
-<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"></center>
-</form>
-EOF;
-}
-
-function do_paypal_normal_screen($ccode, $member_id, $new_sub_id, $to_pay, $paypal_email, $sub_title, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />$desc_string
-<br /><br /><b>{$ibforums->lang['gw_paypal']}</b>
-</p>
-<form action='https://www.paypal.com/cgi-bin/webscr' method='post'>
-<input type="hidden" name="cmd" value="_xclick" />
-<input type="hidden" name="business" value="$paypal_email" />
-<input type="hidden" name="amount" value="$to_pay">
-<input type="hidden" name="item_name" value="$sub_title" />
-<input type="hidden" name="item_number" value="$new_sub_id" />
-<input type="hidden" name="no_shipping" value="1" />
-<input type="hidden" name="custom" value="$member_id" />
-<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />
-<input type="hidden" name="currency_code" value="$ccode">
-<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<br /><br />
-<center>
-<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"></center>
-</form>
-EOF;
-}
-
-function do_paypal_upgrade_screen($ccode, $member_id, $new_sub_id, $to_pay, $paypal_email, $sub_title, $cur_tran_id, $desc_string="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_complete']}</div>
-<p>
-{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />$desc_string
-<br /><br /><b>{$ibforums->lang['gw_paypal']}</b>
-</p>
-<form action='https://www.paypal.com/cgi-bin/webscr' method='post'>
-<input type="hidden" name="cmd" value="_xclick" />
-<input type="hidden" name="business" value="$paypal_email" />
-<input type="hidden" name="amount" value="$to_pay">
-<input type="hidden" name="item_name" value="$sub_title" />
-<input type="hidden" name="item_number" value="$new_sub_id" />
-<input type="hidden" name="no_shipping" value="1" />
-<input type="hidden" name="invoice" value="{$cur_tran_id}x{$new_sub_id}x{$member_id}" />
-<input type="hidden" name="custom" value="$member_id" />
-<input type="hidden" name="memo" value="upgrade" />
-<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />
-<input type="hidden" name="currency_code" value="$ccode">
-<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">
-<br /><br />
-<center>
-<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"></center>
-</form>
-EOF;
-}
-
-
-
-
-
-
-
-function sub_two_upgrade_summary() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_upgrade_title']}</div>
-<p>{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />{$ibforums->lang['sc_upgrade_string']}
-</p>             
-EOF;
-}
-
-function sub_two_normal_summary() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_normal_title']}</div>
-<p>{$ibforums->lang['sc_upgrade_explain']}
-<br /><br />{$ibforums->lang['sc_normal_string']}
-</p>             
-EOF;
-}
-
-
-function sub_two_methods_top($sub_chosen, $upgrade="", $curid="", $currency="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['sc_available_methods']}</div>
-<form action='{$ibforums->base_url}act=module&amp;module=subscription&amp;upgrade=$upgrade&amp;CODE=paymentscreen&amp;curid=$curid&amp;sub=$sub_chosen&amp;currency=$currency' method='post'>             
-<div class="tableborder">
-  <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	<th width='5%'  class='titlemedium' align="center">&nbsp;</th>
-	<th width='95%' class='titlemedium'>{$ibforums->lang['sc_method']}</th>
-  </tr>
-EOF;
-}
-
-function sub_two_methods_row($mid, $name, $desc="") {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class="row3" align="center"><input type='radio' name='methodid' value="$mid" /></td>
- <td class="row3"><b>$name</b><br /><i>$desc</i></td>
-</tr>
-EOF;
-}
-
-function sub_two_methods_bottom() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-EOF;
-}
-
-function sub_two_methods_continue_button() {
-global $ibforums;
-return <<<EOF
-<br />
-<div class='tableborder'>
- <div class='pformstrip' align="center"><input type='submit' value='{$ibforums->lang['s_continue_button2']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-function sub_choose_current_top() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['s_current_subs']}</div>
-<p>{$ibforums->lang['s_current_explain']}</p>             
-<div class="tableborder">
-  <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	<th width='5%'  class='titlemedium' align="center">{$ibforums->lang['s_transid']}</th>
-	<th width='35%' class='titlemedium'>{$ibforums->lang['s_detail']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_started']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_end']}</th>
-	<th width='10%' class='titlemedium' align="center">{$ibforums->lang['s_paid']}</th>
-	<th width='10%' class='titlemedium' align="center">{$ibforums->lang['s_status']}</th>
-   </tr>
-EOF;
-}
-
-function sub_choose_current_row($id, $name, $start, $end, $paid, $state ) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class="row3" align="center">$id</td>
- <td class="row3"><b>$name</b></td>
- <td class="row3" align="center">$start</td>
- <td class="row3" align="center">$end</td>
- <td class="row3" align="center">{$paid}</td>
- <td class="row3" align="center">$state</td>
-</tr>
-EOF;
-}
-
-function sub_choose_current_bottom() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-EOF;
-}
-
-function sub_page_bottom() {
-global $ibforums;
-return <<<EOF
-<p>{$ibforums->lang['s_current_bottom']}</p>
-EOF;
-}
-
-
-function sub_choose_dead_top() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['s_dead_subs']}</div>
-<p>{$ibforums->lang['s_dead_explain']}</p>             
-<div class="tableborder">
-  <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	<th width='5%'  class='titlemedium' align="center">{$ibforums->lang['s_transid']}</th>
-	<th width='35%' class='titlemedium'>{$ibforums->lang['s_detail']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_started']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_end']}</th>
-	<th width='10%' class='titlemedium' align="center">{$ibforums->lang['s_paid']}</th>
-	<th width='10%' class='titlemedium' align="center">{$ibforums->lang['s_status']}</th>
-   </tr>
-EOF;
-}
-
-function sub_choose_dead_row($id, $name, $start, $end, $paid, $state ) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class="row3" align="center">$id</td>
- <td class="row3"><b>$name</b></td>
- <td class="row3" align="center">$start</td>
- <td class="row3" align="center">$end</td>
- <td class="row3" align="center">{$paid}</td>
- <td class="row3" align="center">$state</td>
-</tr>
-EOF;
-}
-
-function sub_choose_dead_bottom() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-<br />
-EOF;
-}
-
-
-function sub_choose_upgrade_top($cur_id="", $currency="") {
-global $ibforums;
-return <<<EOF
-<br />
-<div class="pformstrip">{$ibforums->lang['s_upgrade_subs']}</div>
-<p>{$ibforums->lang['s_upgrade_explain']}</p>
-<br /> 
-<form action='{$ibforums->base_url}act=module&amp;module=subscription&amp;upgrade=1&amp;CODE=paymentmethod&amp;curid=$cur_id&amp;currency=$currency' method='post'>             
-<div class="tableborder">
-  <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	<th width='5%'  class='titlemedium'>&nbsp;</th>
-	<th width='55%' class='titlemedium'>{$ibforums->lang['s_detail']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_end']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_balance_cost']}</th>
-   </tr>
-EOF;
-}
-
-
-function sub_choose_upgrade_row($id, $name, $desc, $cost, $duration ) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class="row3" align="center"><input type='radio' name='sub' value="$id" /></td>
- <td class="row3"><b>$name</b><br /><i>$desc</i></td>
- <td class="row3" align="center">$duration</td>
- <td class="row3" align="center">{$cost}</td>
-</tr>
-EOF;
-}
-
-function sub_choose_upgrade_bottom() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-<div class='tableborder'>
- <div class='pformstrip' align="center"><input type='submit' value='{$ibforums->lang['s_continue_button']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-
-function sub_choose_new_top($currency) {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['s_available_subs']}</div>
-<p>{$ibforums->lang['s_explain']}</p>
-<br />
-<form action='{$ibforums->base_url}act=module&amp;module=subscription&amp;CODE=paymentmethod&amp;currency=$currency' method='post'>             
-<div class="tableborder">
-  <table cellpadding='4' cellspacing='1' width="100%">
-  <tr>
-	<th width='5%'  class='titlemedium'>&nbsp;</th>
-	<th width='55%' class='titlemedium'>{$ibforums->lang['s_detail']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_duration']}</th>
-	<th width='20%' class='titlemedium' align="center">{$ibforums->lang['s_cost']}</th>
-   </tr>
-EOF;
-}
-
-
-function sub_choose_new_row($id, $name, $desc, $cost, $duration ) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class="row3" align="center"><input type='radio' name='sub' value="$id" /></td>
- <td class="row3"><b>$name</b><br /><i>$desc</i></td>
- <td class="row3" align="center">$duration</td>
- <td class="row3" align="center">{$cost}</td>
-</tr>
-EOF;
-}
-
-function sub_choose_new_bottom() {
-global $ibforums;
-return <<<EOF
-</table>
-</div>
-<div class='tableborder'>
- <div class='pformstrip' align="center"><input type='submit' value='{$ibforums->lang['s_continue_button']}' class='forminput' /></div>
-</div>
-</form>
-EOF;
-}
-
-
-function sub_currency_change_form($select, $url) {
-global $ibforums;
-return <<<EOF
-<div align='right'><form action="$url" method="post">{$ibforums->lang['cc_currency_in']} $select <input type='submit' value='{$ibforums->lang['cc_change']}' class='forminput' /></form></div>
-EOF;
-}
-
-function sub_currency_change_top() {
-global $ibforums;
-return <<<EOF
-<select name='currency' class='forminput'>
-EOF;
-}
-
-function sub_currency_change_row($id, $name, $default="") {
-global $ibforums;
-return <<<EOF
-<option value='$id' $default>$id $name</option>
-EOF;
-}
-
-function sub_currency_change_bottom() {
-global $ibforums;
-return <<<EOF
-</select>
-EOF;
-}
-
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_topic.php b/upload/Skin/s1/skin_topic.php
deleted file mode 100644
index 3ed8445c..00000000
--- a/upload/Skin/s1/skin_topic.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-
-class skin_topic {
-
-function warn_level_warn($id, $percent) {
-global $ibforums;
-return <<<EOF
-{$ibforums->lang['tt_warn']} (<a href="javascript:PopUp('{$ibforums->base_url}act=warn&amp;mid={$id}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$percent}</a>%)
-EOF;
-}
-
-function warn_level_rating($id, $level,$min=0,$max=10) {
-global $ibforums;
-return <<<EOF
-&lt;&nbsp;$min ( <a href="javascript:PopUp('{$ibforums->base_url}act=warn&amp;mid={$id}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$level}</a> ) $max&nbsp;&gt;
-EOF;
-}
-
-
-function report_link($data) {
-global $ibforums;
-return <<<EOF
-<a href='{$ibforums->base_url}act=report&amp;f={$data['forum_id']}&amp;t={$data['topic_id']}&amp;p={$data['pid']}&amp;st={$ibforums->input['st']}'><{P_REPORT}></a>
-EOF;
-}
-
-function ip_show($data) {
-global $ibforums;
-return <<<EOF
-<span class='desc'>{$ibforums->lang['ip']}: $data</span>
-EOF;
-}
-
-function golastpost_link($fid, $tid) {
-global $ibforums;
-return <<<EOF
-( <a href='{$ibforums->base_url}act=ST&amp;f=$fid&amp;t=$tid&amp;view=getnewpost'>{$ibforums->lang['go_new_post']}</a> )
-EOF;
-}
-
-function mm_start($tid) {
-global $ibforums;
-return <<<EOF
-<br />
-<form action='{$ibforums->base_url}act=mmod&amp;t=$tid' method='post'>
-<input type='hidden' name='check' value='1'>
-<select name='mm_id' class='forminput'>
-<option value='-1'>{$ibforums->lang['mm_title']}</option>
-EOF;
-}
-
-function mm_entry($id, $name) {
-global $ibforums;
-return <<<EOF
-<option value='$id'>$name</option>
-EOF;
-}
-
-function mm_end() {
-global $ibforums;
-return <<<EOF
-</select>&nbsp;<input type='submit' value='{$ibforums->lang['mm_submit']}' class='forminput' /></form>
-EOF;
-}
-
-function Mod_Panel($data, $fid, $tid, $key="") {
-global $ibforums;
-return <<<EOF
-  <div align='left' style='float:left;width:auto'>
-	<form method='POST' style='display:inline' name='modform' action='{$ibforums->base_url}'>
-	<input type='hidden' name='t' value='$tid' />
-	<input type='hidden' name='f' value='$fid' />
-	<input type='hidden' name='st' value='{$ibforums->input['st']}' />
-	<input type='hidden' name='auth_key' value='$key' />
-	<input type='hidden' name='act' value='Mod' />
-	<select name='CODE' class='forminput' style="font-weight:bold;color:red">
-	<option value='-1' style='color:black'>{$ibforums->lang['moderation_ops']}</option>
-	$data
-	</select>&nbsp;<input type='submit' value='{$ibforums->lang['jmp_go']}' class='forminput' /></form>
-  </div>
-        
-EOF;
-}
-
-function mod_wrapper($id="", $text="") {
-global $ibforums;
-return <<<EOF
-<option value='$id'>$text</option>
-EOF;
-}
-
-
-
-
-function quick_reply_box_open($fid="",$tid="",$show="hide", $key="") {
-global $ibforums;
-return <<<EOF
-	<script type="text/javascript">
-	<!--
-	function emo_pop()
-	{
-	  window.open('index.{$ibforums->vars['php_ext']}?act=legends&amp;CODE=emoticons&amp;s={$ibforums->session_id}','Legends','width=250,height=500,resizable=yes,scrollbars=yes'); 
-	}
-	//-->
-	</script>
-	<br />
-	<div align='left' id='qr_open' style="display:$show;position:relative;">
-	   <form name='REPLIER' action="{$ibforums->base_url}" method='post'>
-	   <input type='hidden' name='act' value='Post' />
-	   <input type='hidden' name='CODE' value='03' />
-	   <input type='hidden' name='f' value='$fid' />
-	   <input type='hidden' name='t' value='$tid' />
-	   <input type='hidden' name='st' value='{$ibforums->input['st']}' />
-	   <input type='hidden' name='enabletrack' value='{$ibforums->member['auto_track']}' />
-	   <input type='hidden' name='auth_key' value='$key' />
-	   <!-- TITLE DIV -->
-	   <div class="tableborder">
-	     <div class='maintitle'><{CAT_IMG}>&nbsp;{$ibforums->lang['qr_title']}</div>
-		 <div class="tablepad" align="center">
-			 <textarea cols='70' rows='8' name='Post' class='textinput' tabindex="1"></textarea>
-			 <br /><br />
-			 <a href='javascript:emo_pop();'>{$ibforums->lang['show_emo']}</a> &#124;
-			 <input type='checkbox' name='enableemo' value='yes' class="checkbox" checked="checked" />&nbsp;{$ibforums->lang['qr_add_smilie']} &#124;
-			 <input type='checkbox' name='enablesig' value='yes' class="checkbox" checked="checked" />&nbsp;{$ibforums->lang['qr_add_sig']}
-			 <br /><br />
-			 <input type='submit' name='submit' value='{$ibforums->lang['qr_submit']}' class='forminput' tabindex="2" accesskey="s" />&nbsp;
-			 <input type='submit' name='preview' value='{$ibforums->lang['qr_more_opts']}' class='forminput' />
-			 &nbsp;&nbsp; <input type='button' name='qrc' onclick="ShowHide('qr_open','qr_closed');" value='{$ibforums->lang['qr_closeit']}' class='forminput' />
-		 </div>
-	  </div>
-	   </form>
-	</div>
-EOF;
-}
-
-function quick_reply_box_closed() {
-global $ibforums;
-return <<<EOF
-	<!-- DEFAULT DIV -->
-	<a href="javascript:ShowHide('qr_open','qr_closed');" title="{$ibforums->lang['qr_open']}" accesskey="f"><{T_QREPLY}></a>
-EOF;
-}
-
-function start_poll_link($fid, $tid) {
-global $ibforums;
-return <<<EOF
-	<a href="{$ibforums->base_url}act=Post&amp;CODE=14&amp;f=$fid&amp;t=$tid">{$ibforums->lang['new_poll_link']}</a> &#124;&nbsp;
-EOF;
-}
-
-
-
-function PageTop($data) {
-global $ibforums;
-return <<<EOF
-    <script language='javascript' type='text/javascript'>
-    <!--
-    
-    function link_to_post(pid)
-    {
-    	temp = prompt( "{$ibforums->lang['tt_prompt']}", "{$ibforums->base_url}showtopic={$ibforums->input['t']}&view=findpost&p=" + pid );
-    	return false;
-    }
-    
-    function delete_post(theURL) {
-       if (confirm('{$ibforums->lang['js_del_1']}')) {
-          window.location.href=theURL;
-       }
-       else {
-          alert ('{$ibforums->lang['js_del_2']}');
-       } 
-    }
-    
-    function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
-    if (posleft != 0) { x = posleft }
-    if (postop  != 0) { y = postop  }
-
-    if (!scroll) { scroll = 1 }
-    if (!resize) { resize = 1 }
-
-    if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
-      X = (screen.width  - width ) / 2;
-      Y = (screen.height - height) / 2;
-    }
-    if (scroll != 0) { scroll = 1 }
-
-    var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
-	}
-	
-	function ShowHide(id1, id2) {
-	  if (id1 != '') expMenu(id1);
-	  if (id2 != '') expMenu(id2);
-	}
-	
-	function expMenu(id) {
-	  var itm = null;
-	  if (document.getElementById) {
-		itm = document.getElementById(id);
-	  } else if (document.all){
-		itm = document.all[id];
-	  } else if (document.layers){
-		itm = document.layers[id];
-	  }
-	
-	  if (!itm) {
-	   // do nothing
-	  }
-	  else if (itm.style) {
-		if (itm.style.display == "none") { itm.style.display = ""; }
-		else { itm.style.display = "none"; }
-	  }
-	  else { itm.visibility = "show"; }
-	}
-    //-->
-    </script>
-    
-<a name='top'></a>
-<!--IBF.FORUM_RULES-->
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align='left' width="20%" nowrap="nowrap">{$data['TOPIC']['SHOW_PAGES']}&nbsp;{$data['TOPIC']['go_new']}</td>
- <td align='right' width="80%">{$data[TOPIC][REPLY_BUTTON]}<a href='{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data[FORUM]['id']}' title='{$ibforums->lang['start_new_topic']}'><{A_POST}></a>{$data[TOPIC][POLL_BUTTON]}</td>
-</tr>
-</table>
-<br />
-<div class="tableborder">
-    <div class='maintitle'><{CAT_IMG}>&nbsp;<b>{$data['TOPIC']['title']}</b>{$data['TOPIC']['description']}</div>
-	<!--{IBF.POLL}-->
-	<div align='right' class='postlinksbar'>
-	  <strong><!--{IBF.START_NEW_POLL}--><a href='{$ibforums->base_url}act=Track&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}'>{$ibforums->lang['track_topic']}</a> |
-	  <a href='{$ibforums->base_url}act=Forward&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}'>{$ibforums->lang['forward']}</a> |
-	  <a href='{$ibforums->base_url}act=Print&amp;client=printer&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}'>{$ibforums->lang['print']}</a></strong>
-	</div>
-	
-EOF;
-}
-
-
-function RenderRow($post, $author) {
-global $ibforums;
-return <<<EOF
-
-	<!--Begin Msg Number {$post['pid']}-->
-    <table width='100%' border='0' cellspacing='1' cellpadding='3'>
-    <tr>
-      <td valign='middle' class='row4' width="1%"><a name='entry{$post['pid']}'></a><span class='{$post['name_css']}'>{$author['name']}</span></td>
-        <td class='row4' valign='top' width="99%">
-        
-        <!-- POSTED DATE DIV -->
-        
-        <div align='left' class='row4' style='float:left;padding-top:4px;padding-bottom:4px'>
-        {$post['post_icon']}<span class='postdetails'><b><a title="{$ibforums->lang['tt_link']}" href="#" onclick="link_to_post({$post['pid']}); return false;" style="text-decoration:underline">{$ibforums->lang['posted_on']}</a></b> {$post['post_date']}</span>
-        </div>
-        
-        <!-- REPORT / DELETE / EDIT / QUOTE DIV -->
-        
-        <div align='right'>
-        {$post['report_link']}{$post['delete_button']}{$post['edit_button']}<a href='{$ibforums->base_url}act=Post&amp;CODE=06&amp;f={$ibforums->input[f]}&amp;t={$ibforums->input[t]}&amp;p={$post['pid']}'><{P_QUOTE}></a>
-      </div>
-      
-      </td>
-    </tr>
-    <tr>
-      <td valign='top' class='{$post['post_css']}'>
-        <span class='postdetails'>{$author['avatar']}<br /><br />
-        {$author['title']}<br />
-        {$author['member_rank_img']}<br /><br />
-        {$author['member_group']}<br />
-        {$author['member_posts']}<br />
-        {$author['member_number']}<br />
-        {$author['member_joined']}<br /><br />
-        {$author['warn_text']} {$author['warn_minus']}{$author['warn_img']}{$author['warn_add']}</span><br />
-        <!--$ author[field_1]-->
-        <img src='{$ibforums->vars['img_url']}/spacer.gif' alt='' width='160' height='1' /><br /> 
-      </td>
-      <td width='100%' valign='top' class='{$post['post_css']}'>
-        <!-- THE POST {$post['pid']} -->
-        <div class='postcolor'>{$post['post']} {$post['attachment']}</div>
-        {$post['signature']}
-        <!-- THE POST -->
-      </td>
-    </tr>
-    <tr>
-      <td class='darkrow3' align='left'><b>{$post['ip_address']}</b></td>
-      <td class='darkrow3' nowrap="nowrap" align='left'>
-      
-        <!-- PM / EMAIL / WWW / MSGR -->
-      
-        <div align='left' class='darkrow3' style='float:left;width:auto'>
-        {$author['addresscard']}{$author['message_icon']}{$author['email_icon']}{$author['website_icon']}{$author['integ_icon']}{$author['icq_icon']}{$author['aol_icon']}{$author['yahoo_icon']}{$author['msn_icon']}
-        </div>
-        
-        <!-- REPORT / UP -->
-         
-        <div align='right'>
-         <a href='javascript:scroll(0,0);'><img src='{$ibforums->vars['img_url']}/p_up.gif' alt='Top' border='0' /></a>
-        </div>
-      </td>
-    </tr>
-    </table>
-    <div class='darkrow1' style='height:5px'><!-- --></div>
-    
-EOF;
-}
-
-function TableFooter($data) {
-global $ibforums;
-return <<<EOF
-      
-      <!--IBF.TOPIC_ACTIVE-->
-      <div class="activeuserstrip" align="center">&laquo; <a href='{$ibforums->base_url}showtopic={$data[TOPIC]['tid']}&amp;view=old'>{$ibforums->lang['t_old']}</a> &#0124; <strong><a href='{$ibforums->base_url}showforum={$data['FORUM']['id']}'>{$data['FORUM']['name']}</a></strong> &#0124; <a href='{$ibforums->base_url}showtopic={$data[TOPIC]['tid']}&amp;view=new'>{$ibforums->lang['t_new']}</a> &raquo;</div>
-</div>
- 
-<br />
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-<tr>
- <td align='left' width="20%" nowrap="nowrap"><!--IBF.TOPIC_OPTIONS_CLOSED-->{$data[TOPIC][SHOW_PAGES]}</td>
- <td align='right' width="80%">{$data[TOPIC][REPLY_BUTTON]}<!--IBF.QUICK_REPLY_CLOSED--><a href='{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data[FORUM]['id']}' title='{$ibforums->lang['start_new_topic']}'><{A_POST}></a>{$data[TOPIC][POLL_BUTTON]}</td>
-</tr>
-</table>
-
-<!--IBF.QUICK_REPLY_OPEN-->
-<!--IBF.TOPIC_OPTIONS_OPEN-->
-
-<br />
-<!--IBF.MOD_PANEL-->
-<div align='right'>{$data[FORUM]['JUMP']}</div>
-<!--IBF.MULTIMOD-->
-<br />
-EOF;
-}
-
-function topic_opts_open($fid, $tid) {
-global $ibforums;
-return <<<EOF
-<div id='topic_open' style='display:none;z-index:2;'>
-    <div class="tableborder">
-	  <div class='maintitle'><{CAT_IMG}>&nbsp;<a href="javascript:ShowHide('topic_open','topic_closed')">{$ibforums->lang['to_close']}</a></div>
-	  <div class='tablepad'>
-	   <b><a href='{$ibforums->base_url}act=Track&amp;f={$fid}&amp;t={$tid}'>{$ibforums->lang['tt_title']}</a></b>
-	   <br />
-	   <span class='desc'>{$ibforums->lang['tt_desc']}</span>
-	   <br /><br />
-	   <b><a href='{$ibforums->base_url}act=Track&amp;f={$fid}&amp;type=forum'>{$ibforums->lang['ft_title']}</a></b>
-	   <br />
-	   <span class='desc'>{$ibforums->lang['ft_desc']}</span>
-	   <br /><br />
-	   <b><a href='{$ibforums->base_url}act=Print&amp;client=choose&amp;f={$fid}&amp;t={$tid}'>{$ibforums->lang['av_title']}</a></b>
-	   <br />
-	   <span class='desc'>{$ibforums->lang['av_desc']}</span>
-	 </div>
-   </div>
-</div>
-EOF;
-}
-
-function topic_opts_closed() {
-global $ibforums;
-return <<<EOF
-<a href="javascript:ShowHide('topic_open','topic_closed')" title="{$ibforums->lang['to_open']}"><{T_OPTS}></a>
-EOF;
-}
-
-
-function topic_active_users($active=array()) {
-global $ibforums;
-return <<<EOF
-	  <div class="activeuserstrip">{$ibforums->lang['active_users_title']} ({$ibforums->lang['active_users_detail']})</div>
-	  <div class='row2' style='padding:6px'>{$ibforums->lang['active_users_members']} {$active['names']}</div>
-EOF;
-}
-
-function Show_attachments_img($file_name) {
-global $ibforums;
-return <<<EOF
-<br />
-<br />
-<strong><span class='edit'>{$ibforums->lang['pic_attach']}</span></strong>
-<br />
-<img src='{$ibforums->vars['upload_url']}/$file_name' class='attach' alt='{$ibforums->lang['pic_attach']}' />
-EOF;
-}
-
-function Show_attachments_img_thumb($file_name, $width, $height, $aid) {
-global $ibforums;
-return <<<EOF
-<br />
-<br />
-<strong><span class='edit'>{$ibforums->lang['pic_attach_thumb']}</span></strong>
-<br />
-<a href='{$ibforums->base_url}act=Attach&amp;type=post&amp;id=$aid' title='{$ibforums->lang['pic_attach_thumb']}' target='_blank'><img src='{$ibforums->vars['upload_url']}/$file_name' width='$width' height='$height' class='attach' alt='{$ibforums->lang['pic_attach']}' /></a>
-EOF;
-}
-
-function Show_attachments($data) {
-global $ibforums;
-return <<<EOF
-<br />
-<br />
-<strong><span class='edit'>{$ibforums->lang['attached_file']} ( {$ibforums->lang['attach_hits']}: {$data['hits']} )</span></strong>
-<br />
-<a href='{$ibforums->base_url}act=Attach&amp;type=post&amp;id={$data['pid']}' title='{$ibforums->lang['attach_dl']}' target='_blank'><img src='{$ibforums->vars['mime_img']}/{$data['image']}' border='0' alt='{$ibforums->lang['attached_file']}' /></a>
-&nbsp;<a href='{$ibforums->base_url}act=Attach&amp;type=post&amp;id={$data['pid']}' title='{$ibforums->lang['attach_dl']}' target='_blank'>{$data['name']}</a>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/Skin/s1/skin_ucp.php b/upload/Skin/s1/skin_ucp.php
deleted file mode 100644
index 5d463ed5..00000000
--- a/upload/Skin/s1/skin_ucp.php
+++ /dev/null
@@ -1,1253 +0,0 @@
-<?php
-
-class skin_ucp {
-
-
-
-function photo_page($cur_photo, $cur_type, $url_photo, $show_size, $key="") {
-global $ibforums;
-return <<<EOF
-<script language="javascript" type="text/javascript">
-<!--
-	var url_input      = "$url_photo";
-	var remove_pressed = 0;
-	
-	function clear_it()
-	{
-		if ( document.bob.url_photo.value != "" )
-		{
-			url_input = document.bob.url_photo.value;
-		}
-      
-		document.bob.url_photo.value = "";
-	}
-   
-	function restore_it()
-	{
-		if (url_input != "")
-		{
-			document.bob.url_photo.value = url_input;
-		}
-	}
-   
-	function checkform()
-	{
-   		if ( remove_pressed != 1 )
-   		{
-   			return true;
-   		}
-   		else
-   		{
-   			fcheck = confirm("{$ibforums->lang['pp_confirm']}");
-   			if ( fcheck == true )
-   			{
-   				return true;
-   			}
-   			else
-   			{
-   				return false;
-   			}
-   		}
-	}
-//-->
-</script>
-
-<form action="{$ibforums->base_url}auth_key=$key" enctype='multipart/form-data' method="post" name="bob" onsubmit="return checkform();">
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='dophoto' />
-<div class="pformstrip">{$ibforums->lang['pph_title']}</div>
-<p>{$ibforums->lang['pph_desc']}<br />{$ibforums->lang['pph_max']}</p>
-<div class="pformstrip">{$ibforums->lang['pph_current']}</div>
-<div align="center">
- <p>$cur_photo<br />$cur_type $show_size</p>
-</div>
-<div class="pformstrip">{$ibforums->lang['pph_change']}</div>
-<table class='tablebasic' cellpadding='4'>
-<tr>
- <td class='pformleft'>{$ibforums->lang['pph_url']}</td>
- <td class='pformright'><input type='text' onfocus="restore_it()" name='url_photo' value='$url_photo' size='40' class='forminput' />&nbsp;&nbsp;(<a href='javascript:restore_it()'>{$ibforums->lang['pp_restore']}</a>)</td>
-</tr>
-<!--IPB.UPLOAD-->
-<!--IPB.SIZE-->
-</table>
-<div align="center" class="pformstrip">
-  <input type="submit" name='submit' value="{$ibforums->lang['pph_submit']}" class='forminput' />
-  &nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" onclick="remove_pressed=1;" name='remove' value="{$ibforums->lang['pph_remove']}" class='forminput' />
-</div>
-</form>
-EOF;
-}
-
-function photo_page_autosize() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class='pformleft'>&nbsp;</td>
- <td class='pformright'><strong>{$ibforums->lang['pph_autosize']}</strong><br />({$ibforums->lang['pph_as_desc']})</td>
-</tr>
-EOF;
-}
-
-function photo_page_mansize() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class='pformleft'>&nbsp;</td>
- <td class='pformright'><strong>{$ibforums->lang['width']}</strong>&nbsp;<input type='text' size='3' name='man_width' />&nbsp;&nbsp;<strong>{$ibforums->lang['height']}</strong>&nbsp;<input type='text' size='3' name='man_height' /></td>
-</tr>
-EOF;
-}
-
-function photo_page_upload($max_filesize) {
-global $ibforums;
-return <<<EOF
-<tr>
- <td class='pformleft'>{$ibforums->lang['pph_upload']}</td>
- <td class='pformright'><input type='hidden' name='MAX_FILE_SIZE' value='$max_filesize' /><input type='file' name='upload_photo' value='' size='40' class='forminput' onclick="clear_it()"/></td>
-</tr>
-EOF;
-}
-
-
-
-function email_change($txt="", $msg="") {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type="text/javascript">
-   var msg = "$msg";
-   if ( msg != "")
-   {
-	   alert(msg);
-   }
-</script>
-
-<form action="{$ibforums->base_url}" method="post" name='form1'>
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='09' />
-<div class="pformstrip">{$ibforums->lang['change_email_title']}</div>
-<p>$txt</p>
-<table width="100%" style="padding:6px">
-<tr>
-  <td width='40%'><strong>{$ibforums->lang['ce_new_email']}</strong></td>
-  <td align='left'><input type='text' name='in_email_1' value='' class='forminput' /></td>
-</tr>
-<tr>
-  <td><strong>{$ibforums->lang['ce_new_email2']}</strong></td>
-  <td align='left'><input type='text' name='in_email_2' value='' class='forminput' /></td>
-</tr>
-<tr>
-  <td><strong>{$ibforums->lang['ec_passy']}</strong></td>
-  <td align='left'><input type='password' name='password' value='' class='forminput' /></td>
-</tr>
-</table>
-<!--ANTIBOT-->
-<div align="center" class="pformstrip"><input type="submit" name='change_email' value="{$ibforums->lang['account_email_submit']}" class='forminput' /></div>
-</form>
-EOF;
-}
-
-function email_change_img($regid="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['ras_title']}</div>
-<table width="100%" style="padding:6px">
-<tr>
-  <td width='40%'>{$ibforums->lang['ras_numbers']}</td>
-  <td>
-	 <input type='hidden' name='regid' value='$regid' />
-	 <img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=1' border='0' alt='Code Bit' />
-	 &nbsp;<img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=2' border='0' alt='Code Bit' />
-	 &nbsp;<img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=3' border='0' alt='Code Bit' />
-	 &nbsp;<img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=4' border='0' alt='Code Bit' />
-	 &nbsp;<img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=5' border='0' alt='Code Bit' />
-	 &nbsp;<img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=6' border='0' alt='Code Bit' />
-  </td>
-</tr>
-<tr>
-  <td width='40%'>{$ibforums->lang['ras_text']}</td>
-  <td><input type='text' size='32' maxlength='32' name='reg_code' class='forminput' /></td>
-</tr>
-</table>
-EOF;
-}
-
-function email_change_gd($regid="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['ras_title']}</div>
-<table width="100%" style="padding:6px">
-<tr>
-  <td width='40%'>{$ibforums->lang['ras_numbers']}</td>
-  <td>
-	 <input type='hidden' name='regid' value='$regid' />
-	 <img src='{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}' border='0' alt='Code Bit' />
-  </td>
-</tr>
-<tr>
-  <td width='40%'>{$ibforums->lang['ras_text']}</td>
-  <td><input type='text' size='32' maxlength='32' name='reg_code' class='forminput' /></td>
-</tr>
-</table>
-EOF;
-}
-
-function pass_change() {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}" method="post" name='form1'>
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='29' />
-<div class="pformstrip">{$ibforums->lang['account_pass_title']}</div>
-<p>{$ibforums->lang['pass_change_text']}</p>
-<table width="100%" style="padding:6px">
-<tr>
-  <td><b>{$ibforums->lang['account_pass_old']}</b></td>
-  <td><input type='password' name='current_pass' value='' class='forminput' /></td>
-</tr>
-<tr>
-  <td><b>{$ibforums->lang['account_pass_new']}</b></td>
-  <td><input type='password' name='new_pass_1' value='' class='forminput' /></td>
-</tr>
-<tr>
-  <td><b>{$ibforums->lang['account_pass_new2']}</b></td>
-  <td><input type='password' name='new_pass_2' value='' class='forminput' /></td>
-</tr>
-</table>
-<div align="center" class="pformstrip"><input type="submit" name='s_pass' value="{$ibforums->lang['account_pass_submit']}" class='forminput' /></div>
-</form>
-EOF;
-}
-
-
-function avatar_main($data, $formextra="", $hidden_field="", $key="") {
-global $ibforums;
-return <<<EOF
-<script langauge='javascript' type="text/javascript">
-<!--
-var url_input      = "{$data['current_url_avatar']}";
-var remove_pressed = 0;
-
-
-function select_url() {
-  restore_it();
-}
-
-function select_upload() {
-  
-  try
-  {
-	  if ( document.creator.url_avatar.value != "" ) {
-		  url_input = document.creator.url_avatar.value;
-	  }
-	
-	  document.creator.url_avatar.value = "";
-  }
-  catch(nourl)
-  {
-  	  return true;
-  }
-}
-
-
-function restore_it()
-{
-	if (url_input != "")
-	{
-		document.creator.url_avatar.value = url_input;
-	}
-}
-
-function checkform()
-{
-	if ( remove_pressed != 1 )
-	{
-		return true;
-	}
-	else
-	{
-		fcheck = confirm("{$ibforums->lang['av_confirm']}");
-		if ( fcheck == true )
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
-  
-//-->
-</script>
-<!--IBF.LIMITS_AVATAR-->
-<div class="pformstrip">{$ibforums->lang['av_current']}</div>
-<div class="tablepad" align="center">{$data['current_avatar_image']}<br />{$data['current_avatar_type']} {$data['current_avatar_dims']}</div>
-<div class="pformstrip">{$ibforums->lang['avatar_pre_title']}</div>
-
-<form action='{$ibforums->base_url}act=UserCP&amp;CODE=getgallery' method='post'>
-<table class='tablebasic' cellpadding='4'>
-<tr>
- <td class='pformleft'>{$ibforums->lang['av_go_gal']}</td>
- <td class='pformright'>{$data['avatar_galleries']}&nbsp;&nbsp;<input type="submit" value="{$ibforums->lang['av_go_go']}" name="submit" class="forminput" /></td>
-</tr>
-</table>
-</form>
-
-<form action='{$ibforums->base_url}auth_key=$key' method='post' $formextra name='creator' onsubmit="return checkform();">
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='25' />
-$hidden_field
-<!--IBF.EXTERNAL_TITLE-->
-<!--IBF.URL_AVATAR-->
-<!--IBF.UPLOAD_AVATAR-->
-<!--IPB.SIZE-->
-<div align="center" class="pformstrip">
-  <input type="submit" name="submit" value="{$ibforums->lang['av_update']}" class='forminput' />
-  &nbsp;&nbsp;&nbsp;<input type="submit" name="remove" onclick="remove_pressed=1;" value="{$ibforums->lang['av_remove']}" class='forminput' />
-</div>
-</form>
-EOF;
-}
-
-
-function avatar_gallery_start_table($title="", $av_gals="", $current_folder, $key="") {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['av_gallery_title']} $title</div>
-<form action='{$ibforums->base_url}act=UserCP&amp;CODE=getgallery' method='post'>
-<div id="padandcenter"><strong>{$ibforums->lang['av_gall_jump']}</strong>&nbsp;$av_gals&nbsp;&nbsp;<input type="submit" value="{$ibforums->lang['av_go_go']}" name="submit" class="forminput" /></div>
-</form>
-<form action='{$ibforums->base_url}auth_key=$key' method='post'>
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='setinternalavatar' />
-<input type='hidden' name='current_folder' value='$current_folder' />
-<table class='tablebasic' cellpadding='4'>
-EOF;
-}
-
-
-function avatar_gallery_end_table() {
-global $ibforums;
-return <<<EOF
-</table>
-<div align="center" class="pformstrip">
-  <input type="submit" name="submit" value="{$ibforums->lang['av_gall_submit']}" class='forminput' />
-  &nbsp;&nbsp;&nbsp;<input type="button" name="remove" onclick="self.location='{$ibforums->base_url}act=UserCP&amp;CODE=24';" value="{$ibforums->lang['av_gall_cancel']}" class='forminput' />
-</div>
-</form>
-EOF;
-}
-
-function avatar_gallery_start_row() {
-global $ibforums;
-return <<<EOF
-
-<tr>
-
-EOF;
-}
-
-function avatar_gallery_end_row() {
-global $ibforums;
-return <<<EOF
-
-</tr>
-
-EOF;
-}
-
-function avatar_gallery_cell_row($img, $txt, $form) {
-global $ibforums;
-return <<<EOF
-
-<td align="center"><img src="html/avatars{$img}" border="0" alt="txt"><br /><input type="radio" class="radiobutton" name="avatar" value="$form" id="$form" />&nbsp;<strong><label for="$form">$txt</label></strong></td>
-
-EOF;
-}
-function avatar_gallery_blank_row() {
-global $ibforums;
-return <<<EOF
-
-<td>&nbsp;</td>
-
-EOF;
-}
-
-
-function avatar_autosize() {
-global $ibforums;
-return <<<EOF
-<table class='tablebasic' cellpadding='4'>
-<tr>
- <td class='pformleft'>&nbsp;</td>
- <td class='pformright'><strong>{$ibforums->lang['av_autosize']}</strong><br />({$ibforums->lang['av_as_desc']})</td>
-</tr>
-</table>
-EOF;
-}
-
-function avatar_mansize() {
-global $ibforums;
-return <<<EOF
-<table class='tablebasic' cellpadding='4'>
-<tr>
- <td class='pformleft'>&nbsp;</td>
- <td class='pformright'><strong>{$ibforums->lang['width']}</strong>&nbsp;<input type='text' size='3' name='man_width' />&nbsp;&nbsp;<strong>{$ibforums->lang['height']}</strong>&nbsp;<input type='text' size='3' name='man_height' /></td>
-</tr>
-</table>
-EOF;
-}
-
-function avatar_external_title() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['avatar_url_title']}</div>
-EOF;
-}
-
-function avatar_limits() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['av_settings']}</div>
-<p>{$ibforums->lang['av_text_url']} {$ibforums->lang['av_text_upload']}<br />{$ibforums->lang['av_allowed_files']}</p>
-EOF;
-}
-
-
-function avatar_upload_field() {
-global $ibforums;
-return <<<EOF
-<table class='tablebasic' cellpadding='4'>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['av_upload']}</td>
-  <td class='pformright'><input type='file' size='30' name='upload_avatar' class='forminput' onfocus='select_upload()' onclick='select_upload()' /></td>
-</tr>
-</table>
-EOF;
-}
-
-function avatar_url_field($avatar) {
-global $ibforums;
-return <<<EOF
-<table class='tablebasic' cellpadding='4'>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['av_url']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='80' name='url_avatar' value='$avatar' class='forminput' onfocus='select_url()' />&nbsp;&nbsp;(<a href='javascript:restore_it()'>{$ibforums->lang['pp_restore']}</a>)</td>
-</tr>
-</table>
-EOF;
-}
-
-
-
-function signature($sig, $t_sig, $key) {
-global $ibforums;
-return <<<EOF
-<script language="javascript1.2" type="text/javascript">
-<!--
-
-var MessageMax  = "{$ibforums->lang['the_max_length']}";
-var Override    = "{$ibforums->lang['override']}";
-
-function CheckLength() {
-    MessageLength  = document.REPLIER.Post.value.length;
-    message  = "";
-
-        if (MessageMax > 0) {
-            message = "{$ibforums->lang['js_max_length']} " + MessageMax + " {$ibforums->lang['js_characters']}.";
-        } else {
-            message = "";
-        }
-        alert(message + " {$ibforums->lang['js_used']} " + MessageLength + " {$ibforums->lang['js_characters']}.");
-}
-
-function ValidateForm() {
-    MessageLength  = document.REPLIER.Post.value.length;
-    errors = "";
-
-    if (MessageMax !=0) {
-        if (MessageLength > MessageMax) {
-            errors = "{$ibforums->lang['js_max_length']} " + MessageMax + " {$ibforums->lang['js_characters']}. {$ibforums->lang['js_current']}: " + MessageLength;
-        }
-    }
-    if (errors != "" && Override == "") {
-        alert(errors);
-        return false;
-    } else {
-        document.REPLIER.submit.disabled = true;
-        return true;
-    }
-}
-
-
-
-// IBC Code stuff
-	var text_enter_url      = "{$ibforums->lang['jscode_text_enter_url']}";
-	var text_enter_url_name = "{$ibforums->lang['jscode_text_enter_url_name']}";
-	var text_enter_image    = "{$ibforums->lang['jscode_text_enter_image']}";
-	var text_enter_email    = "{$ibforums->lang['jscode_text_enter_email']}";
-	var text_enter_flash    = "{$ibforums->lang['jscode_text_enter_flash']}";
-	var text_code           = "{$ibforums->lang['jscode_text_code']}";
-	var text_quote          = "{$ibforums->lang['jscode_text_quote']}";
-	var error_no_url        = "{$ibforums->lang['jscode_error_no_url']}";
-	var error_no_title      = "{$ibforums->lang['jscode_error_no_title']}";
-	var error_no_email      = "{$ibforums->lang['jscode_error_no_email']}";
-	var error_no_width      = "{$ibforums->lang['jscode_error_no_width']}";
-	var error_no_height     = "{$ibforums->lang['jscode_error_no_height']}";
-	var prompt_start        = "{$ibforums->lang['js_text_to_format']}";
-	
-	var help_bold           = "{$ibforums->lang['hb_bold']}";
-	var help_italic         = "{$ibforums->lang['hb_italic']}";
-	var help_under          = "{$ibforums->lang['hb_under']}";
-	var help_font           = "{$ibforums->lang['hb_font']}";
-	var help_size           = "{$ibforums->lang['hb_size']}";
-	var help_color          = "{$ibforums->lang['hb_color']}";
-	var help_close          = "{$ibforums->lang['hb_close']}";
-	var help_url            = "{$ibforums->lang['hb_url']}";
-	var help_img            = "{$ibforums->lang['hb_img']}";
-	var help_email          = "{$ibforums->lang['hb_email']}";
-	var help_quote          = "{$ibforums->lang['hb_quote']}";
-	var help_list           = "{$ibforums->lang['hb_list']}";
-	var help_code           = "{$ibforums->lang['hb_code']}";
-	var help_click_close    = "{$ibforums->lang['hb_click_close']}";
-	var list_prompt         = "{$ibforums->lang['js_tag_list']}";
-//-->
-</script>
-
-<form action="{$ibforums->base_url}" method="post" name='REPLIER'>
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='23' />
-<input type='hidden' name='key' value='$key' />
-<div class='pformstrip'>{$ibforums->lang['cp_current_sig']}</div>
-<div class='signature' style="width:75%;margin-right:auto;margin-left:auto;padding:6px">$sig</div>
-<div class='pformstrip'>{$ibforums->lang['cp_edit_sig']}</div>
-<table width="100%">
-<tr> 
-  <td class="pformleft">
-	<input type='radio' name='bbmode' value='ezmode' onclick='setmode(this.value)' />&nbsp;<b>{$ibforums->lang['bbcode_guided']}</b><br />
-	<input type='radio' name='bbmode' value='normal' onclick='setmode(this.value)' checked="checked" />&nbsp;<b>{$ibforums->lang['bbcode_normal']}</b>
-    <script language='javascript' type="text/javascript" src='html/ibfcode.js'></script>
-  </td>
-  <td class="pformright" valign="top">
-	<input type='button' accesskey='b' value=' B '       onclick='simpletag("B")' class='codebuttons' name='B' style="font-weight:bold" onmouseover="hstat('bold')" />
-	<input type='button' accesskey='i' value=' I '       onclick='simpletag("I")' class='codebuttons' name='I' style="font-style:italic" onmouseover="hstat('italic')" />
-	<input type='button' accesskey='u' value=' U '       onclick='simpletag("U")' class='codebuttons' name='U' style="text-decoration:underline" onmouseover="hstat('under')" />
-	
-	<select name='ffont' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'FONT')"  onmouseover="hstat('font')">
-	<option value='0'>{$ibforums->lang['ct_font']}</option>
-	<option value='Arial' style='font-family:Arial'>{$ibforums->lang['ct_arial']}</option>
-	<option value='Times' style='font-family:Times'>{$ibforums->lang['ct_times']}</option>
-	<option value='Courier' style='font-family:Courier'>{$ibforums->lang['ct_courier']}</option>
-	<option value='Impact' style='font-family:Impact'>{$ibforums->lang['ct_impact']}</option>
-	<option value='Geneva' style='font-family:Geneva'>{$ibforums->lang['ct_geneva']}</option>
-	<option value='Optima' style='font-family:Optima'>Optima</option>
-	</select><select name='fsize' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'SIZE')" onmouseover="hstat('size')">
-	<option value='0'>{$ibforums->lang['ct_size']}</option>
-	<option value='1'>{$ibforums->lang['ct_sml']}</option>
-	<option value='7'>{$ibforums->lang['ct_lrg']}</option>
-	<option value='14'>{$ibforums->lang['ct_lest']}</option>
-	</select><select name='fcolor' class='codebuttons' onchange="alterfont(this.options[this.selectedIndex].value, 'COLOR')" onmouseover="hstat('color')">
-	<option value='0'>{$ibforums->lang['ct_color']}</option>
-	<option value='blue' style='color:blue'>{$ibforums->lang['ct_blue']}</option>
-	<option value='red' style='color:red'>{$ibforums->lang['ct_red']}</option>
-	<option value='purple' style='color:purple'>{$ibforums->lang['ct_purple']}</option>
-	<option value='orange' style='color:orange'>{$ibforums->lang['ct_orange']}</option>
-	<option value='yellow' style='color:yellow'>{$ibforums->lang['ct_yellow']}</option>
-	<option value='gray' style='color:gray'>{$ibforums->lang['ct_grey']}</option>
-	<option value='green' style='color:green'>{$ibforums->lang['ct_green']}</option>
-	</select>
-	&nbsp; <a href='javascript:closeall();' onmouseover="hstat('close')">{$ibforums->lang['js_close_all_tags']}</a>
-	<br />
-	<input type='button' accesskey='h' value=' http:// ' onclick='tag_url()'            class='codebuttons' name='url' onmouseover="hstat('url')">
-	<input type='button' accesskey='g' value=' IMG '     onclick='tag_image()'          class='codebuttons' name='img' onmouseover="hstat('img')">
-	<input type='button' accesskey='e' value='  @  '     onclick='tag_email()'          class='codebuttons' name='email' onmouseover="hstat('email')">
-	<input type='button' accesskey='q' value=' QUOTE '   onclick='simpletag("QUOTE")'   class='codebuttons' name='QUOTE' onmouseover="hstat('quote')">
-	<input type='button' accesskey='p' value=' CODE '    onclick='simpletag("CODE")'    class='codebuttons' name='CODE' onmouseover="hstat('code')">
-	<input type='hidden' accesskey='l' value=' LIST '     onclick='tag_list()'          class='codebuttons' name="LIST" onmouseover="hstat('list')">
-	<!--<input type='button' accesskey='l' value=' SQL '     onclick='simpletag("SQL")'     class='codebuttons' name='SQL'>
-	<input type='button' accesskey='t' value=' HTML '    onclick='simpletag("HTML")'    class='codebuttons' name='HTML'>-->
-	<br />
-	<input type='text' name='helpbox' size='50' maxlength='120' style='width:450px;font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;' readonly="readonly" class='row1' value="{$ibforums->lang['hb_start']}" />
-	<br />
-	<b>{$ibforums->lang['hb_open_tags']}:</b>&nbsp;<input type='text' name='tagcount' size='3' maxlength='3' style='font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;' readonly="readonly" class='row1' value="0" />
-  </td>
-</tr>
-</table>
-<div align="center"><p><textarea cols='60' rows='12' name='Post' tabindex='3' class='textinput'>$t_sig</textarea><br />(<a href='javascript:CheckLength()'>{$ibforums->lang['check_length']}</a>)</p></div>
-<div class='pformstrip' align="center"><input type='submit' value='{$ibforums->lang['cp_submit_sig']}' class="forminput" /></div>
-</form>
-EOF;
-}
-
-function personal_panel($Profile) {
-global $ibforums;
-return <<<EOF
-<script language="javascript" type='text/javascript'>
-<!--
-
-var LocationMax  = "{$ibforums->vars['max_location_length']}";
-var InterestMax  = "{$ibforums->vars['max_interest_length']}";
-
-function CheckLength(Type) {
-    LocationLength  = document.theForm.Location.value.length;
-    InterestLength  = document.theForm.Interests.value.length;
-    message  = "";
-
-    if (Type == "location") {
-        if (LocationMax !=0) {
-            message = "{$ibforums->lang['js_location']}: {$ibforums->lang['js_max']} " + LocationMax + " {$ibforums->lang['js_characters']}.";
-        } else {
-            message = "";
-        }
-        alert(message + "  {$ibforums->lang['js_used']} " + LocationLength + " {$ibforums->lang['js_so_far']}.");
-    }
-    if (Type == "interest") {
-        if (InterestMax !=0) {
-            message = "{$ibforums->lang['js_interests']}: {$ibforums->lang['js_max']} " + InterestMax + " {$ibforums->lang['js_characters']}.";
-        } else {
-            message = "";
-        }
-        alert(message + "  {$ibforums->lang['js_used']} " + InterestLength + " {$ibforums->lang['js_so_far']}.");
-    }
-    
-}
-
-function ValidateProfile() {
-
-    LocationLength  = document.theForm.Location.value.length;
-    InterestLength  = document.theForm.Interests.value.length;
-
-    errors = "";
-
-    if (LocationMax !=0) {
-        if (LocationLength > LocationMax) {
-            errors = "{$ibforums->lang['js_location']}:  {$ibforums->lang['js_max']} " + LocationMax + " {$ibforums->lang['js_characters']}.  {$ibforums->lang['js_used']}: " + LocationLength;
-        }
-    }
-    if (InterestMax !=0) {
-        if (InterestLength > InterestMax) {
-            errors = errors + "  {$ibforums->lang['js_interests']}:  {$ibforums->lang['js_max']} " + InterestMax + " {$ibforums->lang['js_characters']}.  {$ibforums->lang['js_used']}: " + InterestLength;
-        }
-    } 
-    
-    if (errors != "") {
-        alert(errors);
-        return false;
-    } else {
-        return true;
-    }
-}
-//-->
-</script>
-<form action="{$ibforums->base_url}auth_key={$Profile['key']}" method="post" name='theForm' onsubmit='return ValidateProfile()'>
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='21' />
-
-<!--{REQUIRED.FIELDS}-->
-<div class='pformstrip'>{$ibforums->lang['profile_title']}</div>
-<table width='100%'>
-<!--{MEMBERTITLE}-->
-<!--{BIRTHDAY}-->
-<tr>
-  <td class='pformleft'>{$ibforums->lang['website']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='1200' name='WebSite' value='{$Profile['website']}' class='forminput' /></td>
-</tr>  
-<tr>
-  <td class='pformleft'>{$ibforums->lang['icq']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='20' name='ICQNumber' value='{$Profile['icq_number']}' class='forminput' /></td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['aol']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='30' name='AOLName' value='{$Profile['aim_name']}' class='forminput' /></td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['yahoo']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='30' name='YahooName' value='{$Profile['yahoo']}' class='forminput' /></td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['msn']}</td>
-  <td class='pformright'><input type='text' size='40' maxlength='30' name='MSNName' value='{$Profile['msnname']}' class='forminput' /></td>
-</tr>
-<tr>
-  <td class='pformleft'><a href='http://www.integritymessenger.com/' target='_blank'>{$ibforums->lang['integ_msg']}</a></td>
-  <td class='pformright'><input type='text' size='40' maxlength='30' name='integ_msg' value='{$Profile['integ_msg']}' class='forminput' /></td>
-</tr>
-<tr>
-  <td class='pformleft'>{$ibforums->lang['location']}<br />(<a href='javascript:CheckLength("location");'>{$ibforums->lang['check_length']}</a>)</td>
-  <td class='pformright'><input type='text' size='40' name='Location' value='{$Profile['location']}' class='forminput' /></td>
-</tr>
-<tr>
-  <td class='pformleft' valign='top'>{$ibforums->lang['interests']}<br />(<a href='javascript:CheckLength("interest");'>{$ibforums->lang['check_length']}</a>)</td>
-  <td class='pformright'><textarea cols='60' rows='10' wrap='soft' name='Interests' class='forminput'>{$Profile['interests']}</textarea></td>
-</tr>
-<!--{OPTIONAL.FIELDS}-->
-<tr>
-  <td class='pformstrip' align='center' colspan='2'><input type="submit" value="{$ibforums->lang['submit_profile']}" class='forminput' /></td>
-</tr>
-</table>
-</form>
-EOF;
-}
-
-function birthday($day,$month,$year) {
-global $ibforums;
-return <<<EOF
-  <tr>
-  <td class='pformleft'><b>{$ibforums->lang['birthday']}</b></td>
-  <td class='pformright'>
-  <select name='day' class='forminput'>{$day}</select> 
-  <select name='month' class='forminput'>{$month}</select> 
-  <select name='year' class='forminput'>{$year}</select>
-  </td>
-  </tr>
-EOF;
-}
-
-function member_title($title) {
-global $ibforums;
-return <<<EOF
-   <tr>
-   <td class='pformleft'><b>{$ibforums->lang['member_title']}</b></td>
-   <td class='pformright'><input type='text' size='40' maxlength='120' name='member_title' value='$title' class='forminput'></td>
-   </tr>
-EOF;
-}
-
-function required_title() {
-global $ibforums;
-return <<<EOF
- <div class='pformstrip'>{$ibforums->lang['cf_required']}</div>
- <table width='100%'>
-EOF;
-}
-
-function required_end() {
-global $ibforums;
-return <<<EOF
- </table>
-EOF;
-}
-
-function field_entry($title, $desc="", $content) {
-global $ibforums;
-return <<<EOF
-  <tr>
-  <td class='pformleft' valign='top'><b>$title</b><br />$desc</td>
-  <td class='pformright'>$content</td>
-  </tr>
-EOF;
-}
-
-function field_textinput($name, $value="") {
-global $ibforums;
-return <<<EOF
-            <input type='text' size='50' name='$name' value='$value' class='forminput' />
-EOF;
-}
-
-function field_dropdown($name, $options) {
-global $ibforums;
-return <<<EOF
-            <select name='$name' class='forminput'>$options</select>
-EOF;
-}
-
-function field_textarea($name, $value) {
-global $ibforums;
-return <<<EOF
-            <textarea cols='60' rows='5' wrap='soft' name='$name' class='forminput'>$value</textarea>
-EOF;
-}
-
-
-function Menu_bar($base_url) {
-global $ibforums;
-return <<<EOF
-
-<!--
-TABLE TO FIX IE/6 ISSUE
-The one where 23% margin + 100% table = 123% in IE6 o_O
--->
-<table cellspacing="0" cellpadding="0" width='100%'>
-<tr>
- <td id="ucpmenu" valign="top">
-    <div class='maintitle'>{$ibforums->lang['tt_menu']}</div>
-     <!--IBF.TSLLINKS-->
-	 <!-- Messenger -->
-	 <div class='pformstrip'>{$ibforums->lang['m_messenger']}</div>
-	 <p>
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=04'><strong>{$ibforums->lang['mess_new']}</strong></a><br />
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=01'><strong>{$ibforums->lang['mess_inbox']}</strong></a><br />
-	 <!--IBF.FOLDER_LINKS-->
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=delete'>{$ibforums->lang['mi_prune_msg']}</a><br />
-	  &middot; <a href='{$base_url}act=Msg&amp;CODE=07'>{$ibforums->lang['mess_folders']}</a><br />
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=02'>{$ibforums->lang['mess_contact']}</a><br />
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=14'>{$ibforums->lang['mess_archive']}</a><br />
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=20'>{$ibforums->lang['mess_saved']}</a><br />
-	 &middot; <a href='{$base_url}act=Msg&amp;CODE=30'>{$ibforums->lang['mess_tracker']}</a><br />
-	 </p>
-	 <!-- End Messenger -->
-	 <!-- Topic Tracker -->
-	 <div class='pformstrip'>{$ibforums->lang['m_tracker']}</div>
-	 <p>
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=26'>{$ibforums->lang['m_view_subs']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=50'>{$ibforums->lang['m_view_forum']}</a><br />
-	 </p>
-	 <!-- Profile -->
-	 <div class='pformstrip'>{$ibforums->lang['m_personal']}</div>
-	 <p>
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=01'>{$ibforums->lang['m_contact_info']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=22'>{$ibforums->lang['m_sig_info']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=24'>{$ibforums->lang['m_avatar_info']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=photo'>{$ibforums->lang['m_change_photo']}</a><br />
-	 </p>
-	 <!-- Options -->
-	 <div class='pformstrip'>{$ibforums->lang['m_options']}</div>
-	 <p>
-	 <!--IBF.OPTION_LINKS-->
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=02'>{$ibforums->lang['m_email_opt']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=04'>{$ibforums->lang['m_board_opt']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=06'>{$ibforums->lang['m_skin_lang']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=08'>{$ibforums->lang['m_email_change']}</a><br />
-	 &middot; <a href='{$base_url}act=UserCP&amp;CODE=28'>{$ibforums->lang['m_passy_opt']}</a>
-	 </p>
- </td>
- <td style='padding:2px'><!-- --></td>
-<!-- Start main CP area -->
- <td id="ucpcontent" valign="top">
-  <div class='maintitle'>{$ibforums->lang['welcome']}</div>            
-			     
-EOF;
-}
-
-function tsl_links() {
-global $ibforums;
-return <<<EOF
-     <!-- Top Site List -->
-	 <div class='pformstrip'>{$ibforums->lang['m_top_list']}</div>
-	 <p>
-	 &middot; <a href='{$ibforums->base_url}act=module&module=toplist'><strong>{$ibforums->lang['tsl_home']}</strong></a><br />
-	 &middot; <a href='{$ibforums->base_url}act=module&module=toplist&amp;CODE=01'><strong>{$ibforums->lang['tsl_your_sites']}</strong></a><br />
-	 </p>
-EOF;
-}
-
-
-function menu_bar_new_link($url, $name) {
-global $ibforums;
-return <<<EOF
-&middot; <a href='$url'>$name</a><br />
-EOF;
-}
-
-
-function menu_bar_msg_folder_link($id, $real) {
-global $ibforums;
-return <<<EOF
-&nbsp; &#039;-- <a href='{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID=$id'>$real</a><br />
-EOF;
-}
-
-function CP_end() {
-global $ibforums;
-return <<<EOF
- </td>
-</tr>
-</table>
-<!-- end main CP area -->
-<br clear="all" />
-EOF;
-}
-
-function splash($member) {
-global $ibforums;
-return <<<EOF
-     <div class='pformstrip'>{$ibforums->lang['stats_header']}</div>
-	  <table width='100%' border="0" cellspacing="0" cellpadding="4">
-		<tr> 
-		  <td width="40%">{$ibforums->lang['email_address']}</td>
-		  <td width="60%">{$member[MEMBER_EMAIL]}</td>
-		</tr>
-		<tr> 
-		  <td width="40%">{$ibforums->lang['number_posts']}</td>
-		  <td width="60%">{$member[MEMBER_POSTS]}</td>
-		</tr>
-		<tr> 
-		  <td width="40%">{$ibforums->lang['registered']}</td>
-		  <td width="60%">{$member[DATE_REGISTERED]}</td>
-		</tr>
-		<tr> 
-		  <td width="40%">{$ibforums->lang['daily_average']}</td>
-		  <td width="60%">{$member[DAILY_AVERAGE]}</td>
-		</tr>
-	  </table>
-	  <!-- MSG -->
-	  <div class='pformstrip'>{$ibforums->lang['messenger_summary']}</div>
-	  <table width="100%" border="0" cellspacing="0" cellpadding="4">
-		<tr> 
-		  <td width="40%">{$ibforums->lang['total_messages']}</td>
-		  <td width="60%">{$member['total_messages']} {$member['full_percent']}</td>
-		</tr>
-		<tr> 
-		  <td width="40%">{$ibforums->lang['messages_left']}</td>
-		  <td width="60%">{$member['space_free']} {$member['full_messenger']}</td>
-		</tr>
-	  </table>
-	  <!-- END MSG -->
-	  <div class='pformstrip'>{$ibforums->lang['note_pad']}</div>
-	  <div align='center'>
-	  <p>
-		<form name='notepad' action="{$ibforums->base_url}" method="post">
-		<input type='hidden' name='act' value='UserCP' />
-		<input type='hidden' name='s' value='{$ibforums->session_id}' />
-		<input type='hidden' name='CODE' value='20' />
-        <textarea cols='65' rows='{$member['SIZE']}' name='notes' class='forminput'>{$member['NOTES']}</textarea>
-        <br />
-	    {$ibforums->lang['ta_size']}&nbsp;<select name='ta_size' class='forminput'>{$member['SIZE_CHOICE']}</select>
-        <input type='submit' value='{$ibforums->lang['submit_notepad']}' class='forminput' />
-        </form>
-      </p>
-     </div>
-     
-EOF;
-}
-
-function dead_section() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip">{$ibforums->lang['dead_section_title']}</div>
-<p>
-{$ibforums->lang['dead_section_text']}
-</p>
-EOF;
-}
-
-
-function settings_header($Profile, $time_select, $time, $dst_check, $key="") {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}auth_key=$key" method="post">
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='05' />
-<div class="pformstrip">{$ibforums->lang['settings_time']}</div>
-<p>
-{$ibforums->lang['settings_time_txt']}&nbsp;$time
-<br />
-$time_select
-<br /><br />
-<input type='checkbox' class='forminput' name='DST' value='1' $dst_check /> &nbsp;{$ibforums->lang['dst_box']}
-</p>
-EOF;
-}
-
-function skin_lang_header($lang_select, $key="") {
-global $ibforums;
-return <<<EOF
-<script language='Javascript' type="text/javascript">
-  <!--
-	function do_preview() {
-		
-		var f = document.prefs.u_skin;
-		
-		if (f.options[f.selectedIndex].value == -1) {
-			return false;
-		}
-		
-		window.open( "$ibforums->js_base_url" + 'skinid='+f.options[f.selectedIndex].value, 'Preview', 'width=800,height=600,top=0,left=0,resizable=1,scrollbars=1,location=no,directories=no,status=no,menubar=no,toolbar=no');
-		
-	}
-  -->
-</script>
-
-<form action="{$ibforums->base_url}auth_key=$key" method="post" name='prefs'>
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='07' />
-<div class="pformstrip">{$ibforums->lang['settings_title']}</div>                
-<table width="100%">
-<tr>
-  <td width="50%">{$ibforums->lang['settings_lang_txt']}</td>
-  <td align='left'>$lang_select</td>
-</tr>
-</table>
-EOF;
-}
-
-function settings_skin($skin) {
-global $ibforums;
-return <<<EOF
-
-<div class="pformstrip">{$ibforums->lang['settings_skin']}</div>                
-<table width="100%">
-<tr>
-  <td width="50%">{$ibforums->lang['settings_skin_txt']}</td>
-  <td align='left'>$skin &nbsp;&nbsp; <input type='button' value='{$ibforums->lang['cp_skin_preview']}' class='forminput' onclick='do_preview()' /></td>
-</tr>
-</table>
-
-EOF;
-}
-
-function skin_lang_end() {
-global $ibforums;
-return <<<EOF
-<div class="pformstrip" align="center"><input type='submit' name='submit' value='{$ibforums->lang['settings_submit']}' class='forminput' /></div>
-</form>
-EOF;
-}
-
-function settings_end($data) {
-global $ibforums;
-return <<<EOF
-<div class='pformstrip'>{$ibforums->lang['settings_display']}</div>
-<table width="100%" cellpadding="4">
-<tr>
-  <td width='70%'>{$ibforums->lang['settings_viewsig']}</td>
-  <td align='left'>{$data[SIG]}</td>
-</tr>
-<tr>
-  <td>{$ibforums->lang['settings_viewimg']}</td>
-  <td align='left'>{$data[IMG]}</td>
-</tr>
-<tr>
-  <td>{$ibforums->lang['settings_viewava']}</td>
-  <td align='left'>{$data[AVA]}</td>
-</tr>
-<tr>
-  <td>{$ibforums->lang['settings_dopopup']}</td>
-  <td align='left'>{$data[POP]}</td>
-</tr>
-<!--<tr>
-  <td>{$ibforums->lang['hide_session_txt']}<br/ ><span class='desc'>{$ibforums->lang['hs_exp']}</span></td>
-  <td align='left'>{$data[SESS]}</td>
-</tr>-->
-<tr>
-  <td>{$ibforums->lang['open_qr']}<br/ ></td>
-  <td align='left'>{$data[QR]}</td>
-</tr>
-<tr>
-  <td>{$ibforums->lang['pp_number_posts']}</td>
-  <td align='left'><select name='postpage' class='forminput'>{$data['PPS']}</select></td>
-</tr>
-<tr>
-  <td>{$ibforums->lang['pp_number_topics']}</td>
-  <td align='left'><select name='topicpage' class='forminput'>{$data['TPS']}</select></td>
-</tr>
-</table>
-&nbsp;<span class='desc'>{$ibforums->lang['need_cookie_yum_yum']}</span>
-<div class="pformstrip" align='center'><input type='submit' name='submit' value='{$ibforums->lang['settings_submit']}' class='forminput' /></div>
-</form>
-EOF;
-}
-
-function email($Profile) {
-global $ibforums;
-return <<<EOF
-<form action="{$ibforums->base_url}auth_key={$Profile['key']}" method="post">
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='03' />
-<div class="pformstrip">{$ibforums->lang['privacy_settings']}</div>
-<br />
-<table width="100%">
-<tr>
-  <td align='right' valign='top'><input type='checkbox' name='hide_email' value='1' {$Profile['hide_email']} /></td>
-  <td align='left' width='100%'>{$ibforums->lang['hide_email']}</td>
-</tr>  
-<tr>
-  <td align='right' valign='top'><input type='checkbox' name='admin_send' value='1' {$Profile['allow_admin_mails']} /></td>
-  <td align='left'  width='100%'>{$ibforums->lang['admin_send']}</td>
-</tr>
-</table>
-<br />
-<div class="pformstrip">{$ibforums->lang['board_prefs']}</div>
-<br />
-<table width="100%">
-<tr>
-  <td align='right' valign='top'><input type='checkbox' name='send_full_msg' value='1' {$Profile['email_full']} /></td>
-  <td align='left'  width='100%'>{$ibforums->lang['send_full_msg']}</td>
-</tr>
-<tr>
-  <td align='right' valign='top'><input type='checkbox' name='pm_reminder' value='1' {$Profile['email_pm']} /></td>
-  <td align='left'  width='100%'>{$ibforums->lang['pm_reminder']}</td>
-</tr>
-<tr>
-  <td align='right' valign='top'><input type='checkbox' name='auto_track' value='1' {$Profile['auto_track']} /></td>
-  <td align='left'  width='100%'>{$ibforums->lang['auto_track']}</td>
-</tr>
-</table>
-<br />
-<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang['submit_email']}" class='forminput' /></div>
-</form>
-EOF;
-}
-
-function forum_subs_header() {
-global $ibforums;
-return <<<EOF
-
-<div class='pformstrip'>{$ibforums->lang['forum_subs_header']}</div>
-<br />
-<div class='tableborder'>
-  <table cellpadding='4' cellspacing='1' align='center' width='100%'>
-  <tr>
-    <td class='titlemedium' align='left' width='5%'>&nbsp;</td>
-    <th class='titlemedium' align='left' width='50%'>{$ibforums->lang['ft_forum']}</th>
-    <th class='titlemedium' align='center' width='5%'>{$ibforums->lang['ft_topics']}</th>
-    <th class='titlemedium' align='center' width='5%'>{$ibforums->lang['ft_posts']}</th>
-    <th class='titlemedium' align='center' width='35%'>{$ibforums->lang['ft_last_post']}</th>
-  </tr>
-EOF;
-}
-
-function forum_subs_row($data) {
-global $ibforums;
-return <<<EOF
-   <tr>
-	 <td class='row1' align='center' width='5%'>{$data['folder_icon']}</td>
-	 <td class='row1' align='left'>
-		 <b><a href='{$ibforums->base_url}act=SF&amp;f={$data['id']}'>{$data['name']}</a></b>
-		 <br /><span class='desc'>{$data['description']}</span>
-		 <br /><br /><b>[ <a href='{$ibforums->base_url}act=UserCP&amp;CODE=51&amp;f={$data['id']}'>{$ibforums->lang['ft_unsub']}</a> ]</b>
-	 </td>
-	 <td class='row1' align='center'>{$data['topics']}</td>
-	 <td class='row1' align='center'>{$data['posts']}</td>
-	 <td class='row1' align='left'>{$data['last_post']}<br />{$ibforums->lang['in']} {$data['last_topic']}<br />{$ibforums->lang['by']} {$data['last_poster']}</td>
-   </tr>
-EOF;
-}
-
-function forum_subs_none() {
-global $ibforums;
-return <<<EOF
-	<tr>
-	  <td class='row1' align='center' colspan='5'>{$ibforums->lang['forum_subs_none']}</td>
-	</tr>
-EOF;
-}
-
-function forum_subs_end() {
-global $ibforums;
-return <<<EOF
-<tr>
- <td align='right' class='titlemedium' valign='middle' colspan='5'><a href='{$ibforums->base_url}act=UserCP&amp;CODE=51&amp;f=all'>{$ibforums->lang['ft_unsub_all']}</a></td>
-</tr>
-</table>
-</div>
-EOF;
-}
-
-function subs_header() {
-global $ibforums;
-return <<<EOF
-<!-- inbox folder -->
-  <script language='JavaScript' type='text/javascript'>
-  <!--
-  function CheckAll(cb) {
-	  var fmobj = document.mutliact;
-	  for (var i=0;i<fmobj.elements.length;i++) {
-		  var e = fmobj.elements[i];
-		  if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled)) {
-			  e.checked = fmobj.allbox.checked;
-		  }
-	  }
-  }
-  function CheckCheckAll(cb) {	
-	  var fmobj = document.mutliact;
-	  var TotalBoxes = 0;
-	  var TotalOn = 0;
-	  for (var i=0;i<fmobj.elements.length;i++) {
-		  var e = fmobj.elements[i];
-		  if ((e.name != 'allbox') && (e.type=='checkbox')) {
-			  TotalBoxes++;
-			  if (e.checked) {
-				  TotalOn++;
-			  }
-		  }
-	  }
-	  if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}
-	  else {fmobj.allbox.checked=false;}
-  }
-  //-->
-  </script>
-
-<div class='pformstrip'>{$ibforums->lang['subs_header']}</div>
-<form action="{$ibforums->base_url}" name='mutliact' method="post">
-<input type='hidden' name='act' value='UserCP' />
-<input type='hidden' name='CODE' value='27' />
-
-<br />
-<div align="center" class="tableborder">
-<table width="100%" cellspacing="1" cellpadding="4">
-<tr>
-  <td class='titlemedium' align='left' width='5%'>&nbsp;</td>
-  <th class='titlemedium' align='left' width='55%'>{$ibforums->lang['subs_topic']}</th>
-  <th class='titlemedium' align='center' width='5%'>{$ibforums->lang['subs_replies']}</th>
-  <th class='titlemedium' align='center' width='5%'>{$ibforums->lang['subs_view']}</th>
-  <th class='titlemedium' align='left' width='25%'>{$ibforums->lang['subs_last_post']}</th>
-  <td align='center' width='5%' class='titlemedium'><input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();"></td>
-</tr>
-EOF;
-}
-
-function subs_row($data) {
-global $ibforums;
-return <<<EOF
-<tr>
-  <td class='row3' align='center' width='5%'>{$data['folder_icon']}</td>
-  <td class='row3' align='left'><a href='{$ibforums->base_url}act=ST&amp;f={$data['forum_id']}&amp;t={$data['tid']}'>{$data['title']}</a> ( <a href='{$ibforums->base_url}act=ST&amp;f={$data['forum_id']}&amp;t={$data['tid']}' target='_blank'>{$ibforums->lang['new_window']}</a> )<br /><span class='desc'>{$data['description']}{$ibforums->lang['subs_start']} {$data['start_date']}</span></td>
-  <td class='row3' align='center'>{$data['posts']}</td>
-  <td class='row3' align='center'>{$data['views']}</td>
-  <td class='row3' align='left'>{$data['last_post_date']}<br />{$ibforums->lang['subs_by']} {$data['last_poster']}</td>
-  <td class='row2' align='center'><input type='checkbox' name='id-{$data['trid']}' value='yes' class='forminput' /></td>
-</tr>
-EOF;
-}
-
-
-function subs_none() {
-global $ibforums;
-return <<<EOF
-                 <tr>
-                   <td class='row3' align='center' colspan='6'>{$ibforums->lang['subs_none']}</td>
-                 </tr>
-EOF;
-}
-
-function subs_forum_row($fid, $fname) {
-global $ibforums;
-return <<<EOF
-                 <tr>
-                   <td colspan='6' class='darkrow3' align='left'><b>$fname</b></td>
-                 </tr>
-EOF;
-}
-
-function subs_end($text="", $days="") {
-global $ibforums;
-return <<<EOF
-<tr>
- <td align='center' class='titlemedium' valign='middle' colspan='6'><input type='submit' class='forminput' value='{$ibforums->lang['subs_delete']}'>&nbsp;&nbsp;{$ibforums->lang['with_selected']}</td>
-</tr>
-</table>
-</div>
-</form>
-
-<div align="right" style="padding:5px"><i>$text</i></div>
-<div align="right" style="padding:5px">
- 	<form action='{$ibforums->base_url}act=UserCP&amp;CODE=26' method='post'>
- 	{$ibforums->lang['show_topics_from']} <select class='forminput' name='datecut'>$days</select>
- 	<input type='submit' class='forminput' value='{$ibforums->lang['jmp_go']}'>
- 	</form>
-</div>
-EOF;
-}
-
-function forum_jump($data, $menu_extra="") {
-global $ibforums;
-return <<<EOF
-<div align='right'>{$data}</div>
-EOF;
-}
-
-
-}
-?>
\ No newline at end of file
diff --git a/upload/admin.php b/upload/admin.php
index 937fa41a..aec7aff7 100644
--- a/upload/admin.php
+++ b/upload/admin.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
+|   Invision Power Board v2.0.0 
 |   ========================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services
 |   http://www.invisionpower.com
 |   ========================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Email: matt@invisionpower.com
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
@@ -22,9 +22,9 @@
 +--------------------------------------------------------------------------
 */
 
-/*-----------------------------------------------
-  USER CONFIGURABLE ELEMENTS
- ------------------------------------------------*/
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
  
 // Are we running this on a lycos / tripod server?
 // If so, change the following to a 1.
@@ -34,6 +34,7 @@ $is_on_tripod = 0;
 // Root path
 
 define( 'ROOT_PATH', './' );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
 
 // Check IP address to see if they match?
 // this may cause problems for users on proxies
@@ -51,15 +52,26 @@ $use_gzip = 1;
 
 define ( 'USE_MODULES', 1 );
 
+// Enable custom error handling?
+// Useful to trap skin errors, etc
+
+define( 'CUSTOM_ERROR', 1 );
+
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define ( 'IN_ACP', 1 );
+define ( 'IN_IPB', 1 );
+define ( 'IN_DEV', 0 );
 
-/*-----------------------------------------------
-  NO USER EDITABLE SECTIONS BELOW
- ------------------------------------------------*/
- 
 error_reporting  (E_ERROR | E_WARNING | E_PARSE);
 set_magic_quotes_runtime(0);
 
-define ( 'IN_ACP', 1 );
+if ( CUSTOM_ERROR )
+{
+	set_error_handler("my_error_handler");
+}
 
 if ( $is_on_tripod != 1 )
 {
@@ -85,15 +97,18 @@ if (function_exists("set_time_limit") == 1 and SAFE_MODE_ON == 0)
 }
 
 
-class Debug {
-    function startTimer() {
+class Debug
+{
+    function startTimer()
+    {
         global $starttime;
         $mtime = microtime ();
         $mtime = explode (' ', $mtime);
         $mtime = $mtime[1] + $mtime[0];
         $starttime = $mtime;
     }
-    function endTimer() {
+    function endTimer()
+    {
         global $starttime;
         $mtime = microtime ();
         $mtime = explode (' ', $mtime);
@@ -107,103 +122,56 @@ class Debug {
 class info {
 
 	var $vars       = "";
-	var $version    = '1.3';
-	var $acpversion = '13007';
+	var $version    = 'v2.0.0 ';
+	var $acpversion = '20010';
 	var $base_url   = '';
+	var $main_error = "";
+	var $main_msg   = "";
+	var $skin       = array();
+	var $member     = array();
+	var $loaded_templates = array();
 	
 	function info($INFO)
 	{
-		//global $INFO;
 		$this->vars = $INFO;
 		
-		$this->vars['TEAM_ICON_URL']   = $INFO['html_url'] . '/team_icons';
-		$this->vars['AVATARS_URL']     = $INFO['html_url'] . '/avatars';
-		$this->vars['EMOTICONS_URL']   = $INFO['html_url'] . '/emoticons';
-		$this->vars['mime_img']        = $INFO['html_url'] . '/mime_types';
+		if ( defined($ibforums->vars['safe_mode_skins']) )
+		{
+			define( 'SAFE_MODE_SKINS', $ibforums->vars['safe_mode_skins'] );
+		}
+		else
+		{
+			define( 'SAFE_MODE_SKINS', SAFE_MODE_ON );
+		}
 		
-		$this->base_url = $INFO['board_url']."/index.".$INFO['php_ext'].'?';
+		$this->vars['AVATARS_URL']     = 'style_avatars';
+		$this->vars['EMOTICONS_URL']   = 'style_emoticons/<#EMO_DIR#>';
+		$this->vars['mime_img']        = 'style_images/<#IMG_DIR#>/folder_mime_types';
 	}
 }
 		
-
-
-/*-----------------------------------------------
-  Import $INFO
- ------------------------------------------------*/
+//--------------------------------
+// Import $INFO, now!
+//--------------------------------
  
 require ROOT_PATH."conf_global.php";
 
 $ibforums = new info($INFO);
 
+//--------------------------------
+// The clocks a' tickin'
+//--------------------------------
+
 $Debug = new Debug;
 $Debug->startTimer();
 
-/*-----------------------------------------------
-  Make sure our data is reset on each invocation
- ------------------------------------------------*/
-$MEMBER          = array();
-$SESSION_ID      = "";
-$SKIN            = "";
-
-// Put an end to insane thoughs before they begin
-$MEMBER_NAME     = "";
-$MEMBER_PASSWORD = "";
-$MEMBER_EMAIL    = "";
-$UserName        = "";
-$PassWord        = "";
-
-
-/*-----------------------------------------------
-  Load up our classes (compiled into one package)
- ------------------------------------------------*/
+//--------------------------------
+// Load up our database library
+//--------------------------------
  
-require ROOT_PATH."sources/functions.php";
+$INFO['sql_driver'] = ! $INFO['sql_driver'] ? 'mysql' : strtolower($INFO['sql_driver']);
 
-$std     = new FUNC;
-
-/*-----------------------------------------------
-  Steralize our FORM and GET input
- ------------------------------------------------*/
-
-$IN = $std->parse_incoming();
-
-$IN['AD_SESS'] = $HTTP_POST_VARS['adsess'] ? $HTTP_POST_VARS['adsess'] : $HTTP_GET_VARS['adsess'];
-
-$IN['AD_SESS'] = $std->clean_value( $IN['AD_SESS'] );
-
-/*-----------------------------------------------
-  Import $PAGES and $CATS
- ------------------------------------------------*/
- 
-require ROOT_PATH."sources/Admin/admin_pages.php";
-
-
-/*-----------------------------------------------
-  Import Skinable elements
- ------------------------------------------------*/
- 
-require ROOT_PATH."sources/Admin/admin_skin.php";
-
-$SKIN = new admin_skin();
-
-$skin_universal = &$SKIN; //To keep functions.php happy
-
-/*-----------------------------------------------
-  Import Admin Functions
- ------------------------------------------------*/
- 
-require ROOT_PATH."sources/Admin/admin_functions.php";
-
-$ADMIN = new admin_functions();
-
-/*-----------------------------------------------
-  Load up our database library
- ------------------------------------------------*/
- 
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
-
-$to_require = ROOT_PATH."sources/Drivers/".$INFO['sql_driver'].".php";
-require ($to_require);
+require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php" );
 
 $DB = new db_driver;
 
@@ -212,64 +180,175 @@ $DB->obj['sql_user']         = $INFO['sql_user'];
 $DB->obj['sql_pass']         = $INFO['sql_pass'];
 $DB->obj['sql_host']         = $INFO['sql_host'];
 $DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_admin_queries.php';
+$DB->obj['use_shutdown']     = 0;
 
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
 // Get a DB connection
+//--------------------------------
+
 $DB->connect();
 
-//------------------------------------------------
-// Fix up the "show" ID's for the menu tree...
-//
-// show=1,4,5 holds the current ID's, clicking on a
-// collapse link creates out=4 - "4" is then removed
-// from the show link.
-//
-// Good eh?
-//------------------------------------------------
+//--------------------------------
+// Make CONSTANT
+//--------------------------------
 
+define( 'SQL_PREFIX', $DB->obj['sql_tbl_prefix'] );
+define( 'SQL_DRIVER', $INFO['sql_driver']        );
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( 'settings', 'group_cache', 'systemvars', 'skin_id_cache', 'forum_cache', 'moderators', 'stats' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' and $r['cs_value'] )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$ibforums->vars[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$ibforums->cache[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$ibforums->cache[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+//--------------------------------
+// Load up our classes (compiled into one package)
+//--------------------------------
+ 
+require ROOT_PATH."sources/functions.php";
+require ROOT_PATH."sources/classes/class_session.php";
+require ROOT_PATH."sources/classes/class_forums.php";
+require KERNEL_PATH."class_converge.php";
+
+$std     = new FUNC;
+$forums  = new forum_functions();
+$sess    = new session();
+
+//--------------------------------
+// Set up our vars $HTTP_POST_VARS['adsess']
+//--------------------------------
+
+$ibforums->input = $std->parse_incoming();
+
+//--------------------------------
+//  Initialize the FUNC
+//--------------------------------
+
+$std->FUNC_init();
+
+//--------------------------------
+//  Set converge
+//--------------------------------
+
+$ibforums->converge = new class_converge( $DB );
+
+//--------------------------------
+// Message in a bottle?
+//--------------------------------
+
+if ( $ibforums->input['messageinabottleacp'] )
+{
+	$ibforums->input['messageinabottleacp'] = $std->clean_evil_tags( $std->txt_UNhtmlspecialchars( urldecode($ibforums->input['messageinabottleacp']) ) );
+	$ibforums->main_msg = $ibforums->input['messageinabottleacp'];
+}
+
+//--------------------------------
+// Fix up base URLs
+//--------------------------------
+
+$ibforums->base_url = $ibforums->vars['board_url']."/admin.".$ibforums->vars['php_ext'].'?adsess='.$ibforums->input['adsess'];
+$ibforums->skin_url = $ibforums->vars['board_url']."/skin_acp/IPB2_Standard";
+
+//--------------------------------
+// Set up cache path
+//--------------------------------
+
+if ( $ibforums->vars['ipb_cache_path'] )
+{
+	define( 'CACHE_PATH', $ibforums->vars['ipb_cache_path'] );
+}
+else
+{
+	define( 'CACHE_PATH', ROOT_PATH );
+}
+
+
+//--------------------------------
+//  Upload dir?
+//--------------------------------
+
+$ibforums->vars['upload_dir'] = $ibforums->vars['upload_dir'] ? $ibforums->vars['upload_dir'] : ROOT_PATH.'uploads';
+
+//--------------------------------
+// Import $PAGES and $CATS
+//--------------------------------
+ 
+require ROOT_PATH."sources/admin/admin_pages.php";
+
+//--------------------------------
+// Import Admin Functions
+//--------------------------------
+ 
+require ROOT_PATH."sources/admin/admin_functions.php";
+
+$ibforums->admin = new admin_functions();
 
 //------------------------------------------------
 // Sort out settings cookie
 //------------------------------------------------
 
-$INFO['menu']    = 0;
-$INFO['tx']      = 80;
-$INFO['ty']      = 40;
-$INFO['preview'] = "";
-
-if ( $cookie = $std->my_getcookie('acpprefs') )
-{
-	list( $INFO['menu'], $INFO['tx'], $INFO['ty'], $INFO['preview'] ) = explode( ",", $cookie );
-}
+$ibforums->vars['menu']    = 0;
+$ibforums->vars['tx']      = 80;
+$ibforums->vars['ty']      = 40;
+$ibforums->vars['preview'] = "";
 
 //------------------------------------------------
-// ME 'N U!
+// Load skin
 //------------------------------------------------
 
-if ( ! isset($IN['show']) )
-{
-	$IN['show'] = $std->my_getcookie('acpmenu');
-}
+$std->load_skin();
+$std->load_template( 'skin_global' );
 
-if ($IN['show'] == 'none')
-{
-	$IN['show'] = "";
-}
-else if ($IN['show'] == 'all')
-{
-	$IN['show']     = "";
-	
-	foreach($CATS as $cid => $name)
-	{
-		$IN['show'] .= $cid.',';
-	}
-}
-else
-{
-	$IN['show'] = preg_replace( "/(?:^|,)".$IN['out']."(?:,|$)/", ",", $IN['show'] );
-	$IN['show'] = preg_replace( "/,,/" , "" , $IN['show'] );
-	$IN['show'] = preg_replace( "/,$/" , "" , $IN['show'] );
-	$IN['show'] = preg_replace( "/^,/" , "" , $IN['show'] );
-}
+//--------------------------------
+// Import Skinable elements
+//--------------------------------
+ 
+require ROOT_PATH."sources/admin/admin_skin.php";
+
+$ibforums->adskin = new admin_skin();
 
 
 //------------------------------------------------
@@ -300,9 +379,10 @@ $this_session      = array();
 
 $validate_login = 0;
 
-if ($IN['login'] != 'yes') {
+if ($ibforums->input['login'] != 'yes')
+{
 
-	if ( (!$IN['adsess']) or (empty($IN['adsess'])) or (!isset($IN['adsess'])) or ($IN['adsess'] == "") )
+	if ( ! $ibforums->input['adsess'] )
 	{
 		//----------------------------------
 		// No URL adsess found, lets log in.
@@ -316,10 +396,11 @@ if ($IN['login'] != 'yes') {
 		// We have a URL adsess, lets verify...
 		//----------------------------------
 		
-		$DB->query("SELECT * FROM ibf_admin_sessions WHERE ID='".$IN['adsess']."'");
+		$DB->query("SELECT * FROM ibf_admin_sessions WHERE session_id='".$ibforums->input['adsess']."'");
+		
 		$row = $DB->fetch_row();
 		
-		if ($row['ID'] == "")
+		if ($row['session_id'] == "")
 		{
 			//----------------------------------
 			// Fail-safe, no DB record found, lets log in..
@@ -327,7 +408,7 @@ if ($IN['login'] != 'yes') {
 			
 			do_login("Could not retrieve session record");
 		}
-		else if ($row['MEMBER_ID'] == "")
+		else if ($row['session_member_id'] == "")
 		{
 		
 			//----------------------------------
@@ -343,12 +424,20 @@ if ($IN['login'] != 'yes') {
 			// Key is good, check the member details
 			//----------------------------------
 			
-			$DB->query("SELECT * FROM ibf_members WHERE id='".$row['MEMBER_ID']."'");
-			$MEMBER = $DB->fetch_row();
+			$DB->query("SELECT m.*, g.* FROM ibf_members m, ibf_groups g WHERE id=".intval($row['session_member_id'])." and m.mgroup=g.g_id");
 			
-			if ($MEMBER['id'] == "")
+			$ibforums->member = $DB->fetch_row();
+			
+			//----------------------------------
+			// Get perms
+			//----------------------------------
+			
+			$sess->member     = $ibforums->member;
+			$sess->build_group_permissions();
+			$ibforums->member = $sess->member;
+			
+			if ($ibforums->member['id'] == "")
 			{
-			
 				//----------------------------------
 				// Ut-oh, no such member, log in!
 				//----------------------------------
@@ -362,7 +451,7 @@ if ($IN['login'] != 'yes') {
 				// Member found, check passy
 				//----------------------------------
 				
-				if ($row['SESSION_KEY'] != $MEMBER['password'])
+				if ($row['session_member_login_key'] != $ibforums->member['member_login_key'])
 				{
 					//----------------------------------
 					// Passys don't match..
@@ -377,11 +466,7 @@ if ($IN['login'] != 'yes') {
 					// Do we have admin access?
 					//----------------------------------
 					
-					$DB->query("SELECT * FROM ibf_groups WHERE g_id='".$MEMBER['mgroup']."'");
-					
-					$GROUP = $DB->fetch_row();
-					
-					if ($GROUP['g_access_cp'] != 1)
+					if ($ibforums->member['g_access_cp'] != 1)
 					{
 						do_login("You do not have access to the administrative CP");
 					}
@@ -402,12 +487,14 @@ else
 	// time to check some details.
 	//----------------------------------
 	
-	if ( empty($IN['username']) )
+	$ibforums->input['username'] = str_replace( '|', '&#124;', $ibforums->input['username'] );
+	
+	if ( empty($ibforums->input['username']) )
 	{
 		do_login("You must enter a username before proceeding");
 	}
 	
-	if ( empty($IN['password']) )
+	if ( empty($ibforums->input['password']) )
 	{
 		do_login("You must enter a password before proceeding");
 	}
@@ -417,35 +504,74 @@ else
 	// DB
 	//----------------------------------
 	
-	$username    = strtolower(str_replace( '|', '&#124;', $IN['username']) );
-	
-	$DB->query("SELECT name, password, id, mgroup FROM ibf_members WHERE LOWER(name)='".$username."'");
+	$DB->cache_add_query( 'login_getmember', array( 'username' => strtolower($ibforums->input['username']) ) );
+	$DB->cache_exec_query();
+		
 	$mem = $DB->fetch_row();
 	
+	//----------------------------------
+	// Get perms
+	//----------------------------------
+	
+	$sess->member = $mem;
+	$sess->build_group_permissions();
+	$mem          = $sess->member;
+	
 	if ( empty($mem['id']) )
 	{
 		do_login("Could not find a record matching that username, please check the spelling");
 	}
 	
-	$pass    = md5( $IN['password'] );
+	//----------------------------------
+	// Load converge member
+	//----------------------------------
 	
-	if ($pass != $mem['password'])
+	$ibforums->converge->converge_load_member($mem['email']);
+		
+	if ( ! $ibforums->converge->member['converge_id'] )
 	{
-		do_login("The password entered did not match the one in our records");
+		do_login("Could not find a record matching that username, please check the spelling");
+	}
+	
+	//----------------------------------
+	// Check converge pass
+	//----------------------------------
+	
+	$pass = md5( $ibforums->input['password'] );
+	
+	//------------------------------
+	// Check password...
+	//------------------------------
+	
+	if ( $ibforums->converge->converge_authenticate_member( $pass ) != TRUE )
+	{
+		do_login("The password you entered is not correct");
 	}
 	else
 	{
-		$DB->query("SELECT * FROM ibf_groups WHERE g_id='".$mem['mgroup']."'");
-					
-		$GROUP = $DB->fetch_row();
-		
-		if ($GROUP['g_access_cp'] != 1)
+		if ($mem['g_access_cp'] != 1)
 		{
 			do_login("You do not have access to the administrative CP");
 		}
 		else
 		{
-		
+			
+			//----------------------------------
+			// Fix up query string...
+			//----------------------------------
+			
+			$extra_query = "";
+			
+			if ( $_POST['qstring'] )
+			{
+				$extra_query = $_POST['qstring'];
+				$extra_query = str_replace( "{$ibforums->vars['board_url']}"           , "" , $extra_query );
+				$extra_query = preg_replace( "!/?admin\.{$ibforums->vars['php_ext']}!i", "" , $extra_query );
+				$extra_query = preg_replace( "!^\?!"                                   , "" , $extra_query );
+				$extra_query = preg_replace( "!adsess=(\w){32}!"                       , "" , $extra_query );
+				$extra_query = preg_replace( "!s=(\w){32}!"                            , "" , $extra_query );
+			}
+			
 			//----------------------------------
 			// All is good, rejoice as we set a
 			// session for this user
@@ -454,33 +580,33 @@ else
 			$sess_id = md5( uniqid( microtime() ) );
 			
 			$db_string = $DB->compile_db_insert_string( array (
-																'ID'           => $sess_id,
-																'IP_ADDRESS'   => $IN['IP_ADDRESS'],
-																'MEMBER_NAME'  => $mem['name'],
-																'MEMBER_ID'    => $mem['id'],
-																'SESSION_KEY'  => $pass,
-																'LOCATION'     => 'index',
-																'LOG_IN_TIME'  => time(),
-																'RUNNING_TIME' => time(),
+																'session_id'                => $sess_id,
+																'session_ip_address'        => $ibforums->input['IP_ADDRESS'],
+																'session_member_name'       => $mem['name'],
+																'session_member_id'         => $mem['id'],
+																'session_member_login_key'  => $mem['member_login_key'],
+																'session_location'          => 'index',
+																'session_log_in_time'       => time(),
+																'session_running_time'      => time(),
 													  )        );
 													  
 			$DB->query("INSERT INTO ibf_admin_sessions (".$db_string['FIELD_NAMES'].") VALUES (".$db_string['FIELD_VALUES'].")");
 		
-			$IN['AD_SESS'] = $sess_id;
+			$ibforums->input['AD_SESS'] = $sess_id;
 			
 			// Print the "well done page"
 			
-			$ADMIN->page_title = "Log in successful";
+			$ibforums->admin->page_title = "Log in successful";
 			
-			$ADMIN->page_detail = "Taking you to the administrative control panel";
+			$ibforums->admin->page_detail = "Taking you to the administrative control panel";
 			
-			$ADMIN->html .= $SKIN->start_table("Proceed");
+			$ibforums->html .= $ibforums->adskin->start_table("Proceed");
 			
-			$ADMIN->html .= "<tr><td id='tdrow1'><meta http-equiv='refresh' content='2; url=".$INFO['board_url']."/admin.".$INFO['php_ext']."?adsess=".$IN['AD_SESS']."'><a href='".$INFO['board_url']."/admin.".$INFO['php_ext']."?adsess=".$IN['AD_SESS']."'>( Click here if you do not wish to wait )</a></td></tr>";
+			$ibforums->html .= "<tr><td id='tdrow1'><meta http-equiv='refresh' content='2; url=".$ibforums->vars['board_url']."/admin.".$ibforums->vars['php_ext']."?printframes=1&adsess=".$ibforums->input['AD_SESS']."&{$extra_query}'><a href='".$ibforums->vars['board_url']."/admin.".$ibforums->vars['php_ext']."?printframes=1&adsess=".$ibforums->input['AD_SESS']."&{$extra_query}'>( Click here if you do not wish to wait )</a></td></tr>";
 			
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_table();
 			
-			$ADMIN->output();
+			$ibforums->admin->output();
 		
 		}
 		
@@ -499,7 +625,7 @@ else
 
 if ($session_validated == 1)
 {
-	if ($this_session['RUNNING_TIME'] < ( time() - 60*60*2) )
+	if ( $this_session['session_running_time'] < ( time() - 60*60*2) )
 	{
 		$session_validated = 0;
 		do_login("This administration session has expired");
@@ -511,7 +637,7 @@ if ($session_validated == 1)
 	
 	else if ($check_ip == 1)
 	{
-		if ($this_session['IP_ADDRESS'] != $IN['IP_ADDRESS'])
+		if ($this_session['session_ip_address'] != $ibforums->input['IP_ADDRESS'])
 		{
 			$session_validated = 0;
 			do_login("Your current IP address does not match the one in our records");
@@ -525,14 +651,18 @@ if ($session_validated == 1 )
 	// If we get this far, we're good to go..
 	//------------------------------
 	
-	$IN['AD_SESS'] = $IN['adsess'];
+	$ibforums->input['AD_SESS'] = $ibforums->input['adsess'];
 	
 	//------------------------------
 	// Lets update the sessions table:
 	//------------------------------
 	
-	$DB->query("UPDATE ibf_admin_sessions SET RUNNING_TIME='".time()."', LOCATION='".$IN['act']."' WHERE MEMBER_ID='".$MEMBER['id']."' AND ID='".$IN['AD_SESS']."'");
-	
+	$DB->do_update( 'admin_sessions',
+					array( 'session_running_time' => time(),
+						   'session_location'     => $ibforums->input['act']
+						 ),
+					       'session_member_id='.intval($ibforums->member['id'])." and session_id='".$ibforums->input['AD_SESS']."'" );
+		
 	do_admin_stuff();
 	
 }
@@ -548,8 +678,9 @@ else
 
 
 
-function do_login($message="") {
-	global $IN, $DB, $ADMIN, $SKIN, $std;
+function do_login($message="")
+{
+	global $ibforums, $DB, $ADMIN, $SKIN, $std;
 	
 	//-------------------------------------------------------
 	// Remove all out of date sessions, like a good boy. Woof.
@@ -557,18 +688,18 @@ function do_login($message="") {
 	
 	$cut_off_stamp = time() - 60*60*2;
 	
-	$DB->query("DELETE FROM ibf_admin_sessions WHERE RUNNING_TIME < $cut_off_stamp");
+	$DB->query("DELETE FROM ibf_admin_sessions WHERE session_log_in_time < $cut_off_stamp");
 	
 	//+------------------------------------------------------
 	
-	$ADMIN->page_detail = "You must have administrative access to successfully log into the Invision Board Admin CP.<br>Please enter your forums username and password below";
+	$ibforums->admin->page_detail = "You must have administrative access to successfully log into the Invision Board Admin CP.<br>Please enter your forums username and password below";
 	
 	if ($message != "")
 	{
-		$ADMIN->page_detail .= "<br><br><span style='color:red;font-weight:bold'>$message</span>";
+		$ibforums->admin->page_detail .= "<br><br><span style='color:red;font-weight:bold'>$message</span>";
 	}
 	
-	$ADMIN->html .= "<script language='javascript'>
+	$ibforums->html .= "<script language='javascript'>
 					  <!--
 					  	if (top.location != self.location) { top.location = self.location }
 					  //-->
@@ -598,131 +729,248 @@ function do_login($message="") {
 	//| SHW DA FRM (txt msg stylee)
 	//+------------------------------------------------------
 	
-	$ADMIN->html .= $SKIN->start_form( array( 1 => array('login', 'yes') ) );
+	$qs = str_replace( '&amp;', '&', $std->clean_value(urldecode($_SERVER['QUERY_STRING'])) );
+	$qs = str_replace( 'adsess=', 'old_adsess=', $qs );
+	$qs = str_replace( 'act=menu', '', $qs );
 	
-	$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-	$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
+	$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array('login'  , 'yes'),
+															 2 => array('qstring', $qs  )
+													)      );
 	
-	$ADMIN->html .= $SKIN->start_table( "Verification Required" );
+	$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+	$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
 	
-	$ADMIN->html .= $SKIN->add_td_row( array( "Your Forums Username:",
-											  "<input type='text' style='width:100%' name='username' value='$name'>",
-									 )      );
+	$ibforums->html .= $ibforums->adskin->start_table( "Verification Required" );
+	
+	$ibforums->html .= $ibforums->adskin->add_td_row( array( "Your Forums Username:",
+																  "<input type='text' style='width:100%' name='username' value='$name'>",
+														 )      );
 		
-	$ADMIN->html .= $SKIN->add_td_row( array( "Your Forums Password:",
-											  "<input type='password' style='width:100%' name='password' value=''>",
-									 )      );
+	$ibforums->html .= $ibforums->adskin->add_td_row( array( "Your Forums Password:",
+																  "<input type='password' style='width:100%' name='password' value=''>",
+														 )      );
 									 
-	$ADMIN->html .= $SKIN->end_form("Log in");
+	$ibforums->html .= $ibforums->adskin->end_form("Log in");
 	
-	$ADMIN->html .= $SKIN->end_table();
+	$ibforums->html .= $ibforums->adskin->end_table();
 	
-	$SKIN->top_extra = $extra;
+	$ibforums->adskin->top_extra = $extra;
 	
-	$ADMIN->no_jump = 1;
+	$ibforums->admin->no_jump = 1;
 		
-	$ADMIN->output();
+	$ibforums->admin->output();
 
 }
 
+//------------------------------------------------------
+// Core admin look-up
+//------------------------------------------------------
 
-
-
-
-function do_admin_stuff() {
-	global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums;
+function do_admin_stuff()
+{
+	global $ibforums, $DB, $std, $forums;
 	
-	if ( $INFO['ipb_reg_number'] )
+	//------------------------------------------------------
+	// Require global words.
+	//------------------------------------------------------
+	
+	 if ($ibforums->vars['default_language'] == "")
+	 {
+		 $ibforums->vars['default_language'] = 'en';
+	 }
+	 
+	 $ibforums->lang_id = $ibforums->member['language'] ? $ibforums->member['language'] : $ibforums->vars['default_language'];
+	 
+	 if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir( ROOT_PATH."lang/".$ibforums->lang_id ) ) )
+	 {
+		 $ibforums->lang_id = $ibforums->vars['default_language'];
+	 }
+			 
+	 $ibforums->lang = $std->load_words($ibforums->lang, 'lang_global', $ibforums->lang_id);
+
+	//------------------------------------------------------
+	// Require..
+	//------------------------------------------------------
+	
+	require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+	$ibforums->cache_func = new admin_cache_functions();
+	
+	//------------------------------------------------------
+	// Reg'd?
+	//------------------------------------------------------
+	
+	if ( $ibforums->vars['ipb_reg_number'] )
 	{
-		list( $a, $b, $c, $d, $e ) = explode( '-', $INFO['ipb_reg_number'] );
+		list( $a, $b, $c, $d, $e ) = explode( '-', $ibforums->vars['ipb_reg_number'] );
 		
 		if ( strlen($e) > 9 )
 		{
 			if ( time() > $e )
 			{
-				$ADMIN->rebuild_config( array( 'ipb_reg_number' => '' ) );
+				require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+				$settings = new ad_settings();
+				$DB->do_update( 'conf_settings', array( 'conf_value' => '' ), 'conf_key="ipb_reg_number"' );
+				$settings->setting_rebuildcache();
 			}
 		}
 	}
 
-
-	/*----------------------------------
-	  What do you want to require today?
-	------------------------------------*/
+	//------------------------------------------------------
+	//  What do you want to require today?
+	//------------------------------------------------------
 	
 	$choice = array(
-					 "idx"      => "doframes",
-					 "menu"     => "menu",
-					 "index"    => "index",
-					 "cat"      => "categories",
-					 "forum"    => "forums",
-					 "mem"      => "member",
-					 'group'    => "groups",
-					 'mod'      => 'moderator',
-					 'op'       => 'settings',
-					 'help'     => 'help',
-					 'skin'     => 'skins',
-					 'wrap'     => 'wrappers',
-					 'style'    => 'stylesheets',
-					 'image'    => 'imagemacros',
-					 'sets'     => 'stylesets',
-					 'templ'    => 'templates',
-					 'rtempl'   => 'remote_template',
-					 'lang'     => 'languages',
-					 'import'   => 'skin_import',
-					 'modlog'   => 'modlogs',
-					 'field'   => 'profilefields',
-					 'stats'   => "statistics",
-					 'quickhelp' => "quickhelp",
-					 'adminlog'  => "adminlogs",
-					 'ips'       => 'ips',
-					 'mysql'     => 'mysql',
-					 'pin'       => 'plugins',
-					 'emaillog'  => 'emaillogs',
-					 'multimod'  => 'multi_moderate',
-					 'prefs'     => "prefs",
-					 'spiderlog' => "spiderlogs",
-					 'warnlog'      => "warnlogs",
-					 'csite'     => 'ad_dynamiclite',
-					 'msubs'     => 'subsmanager',
-					 'mtools'    => 'member_tools',
-					 'skinfix'   => 'skinfix',
+					 "idx"       => array( "doframes"        , 'doframes' ),
+					 "menu"      => array( "menu"            , 'menu' ),
+					 "index"     => array( "index"           , 'index' ),
+					 "cat"       => array( "categories"      , 'categories' ),
+					 "forum"     => array( "forums"          , 'forums' ),
+					 "mem"       => array( "member"          , 'member' ),
+					 'group'     => array( "groups"          , 'groups' ),
+					 'mod'       => array( 'moderator'       , 'moderator' ),
+					 'op'        => array( 'settings'        , 'settings' ),
+					 'help'      => array( 'help'            , 'help' ),
+					 'skin'      => array( 'skins'           , 'skins' ),
+					 'wrap'      => array( 'wrappers'        , 'wrappers' ),
+					 'style'     => array( 'stylesheets'     , 'stylesheets' ),
+					 'image'     => array( 'imagemacros'     , 'imagemacros' ),
+					 'sets'      => array( 'stylesets'       , 'stylesets' ),
+					 'templ'     => array( 'templates'       , 'templates' ),
+					 'rtempl'    => array( 'remote_template' , 'remote_template' ),
+					 'lang'      => array( 'languages'       , 'languages' ),
+					 'import'    => array( 'skin_import'     , 'skin_import' ),
+					 'modlog'    => array( 'modlogs'         , 'modlogs' ),
+					 'field'     => array( 'profilefields'   , 'profilefields' ),
+					 'stats'     => array( "statistics"      , 'statistics' ),
+					 'quickhelp' => array( "quickhelp"       , 'quickhelp' ),
+					 'adminlog'  => array( "adminlogs"       , 'adminlogs' ),
+					 'ips'       => array( 'ips'             , 'ips' ),
+					 'mysql'     => array( 'mysql'           , 'mysql' ),
+					 'pin'       => array( 'plugins'         , 'plugins' ),
+					 'emaillog'  => array( 'emaillogs'       , 'emaillogs' ),
+					 'multimod'  => array( 'multi_moderate'  , 'multi_moderate' ),
+					 'prefs'     => array( "prefs"           , 'prefs' ),
+					 'spiderlog' => array( "spiderlogs"      , 'spiderlogs' ),
+					 'warnlog'   => array( "warnlogs"        , 'warnlogs' ),
+					 'csite'     => array( 'ad_dynamiclite'  , 'ad_dynamiclite' ),
+					 'msubs'     => array( 'subsmanager'     , 'subsmanager' ),
+					 'mtools'    => array( 'member_tools'    , 'member_tools' ),
+					 'skinfix'   => array( 'skinfix'         , 'skinfix' ),
+					 'skintools' => array( 'skintools'       , 'skintools'),
+					 'task'      => array( 'task_manager'    , 'task_manager' ),
+					 'admin'     => array( 'administration'  , 'administration' ),
+					 'rebuild'   => array( 'rebuild'         , 'rebuild'        ),
+					 'attach'    => array( 'attachments'     , 'attachments'    ),
+					 'postoffice'=> array( 'postoffice'      , 'postoffice'     ),
+					 'emailerror'=> array( 'emailerror'      , 'emailerror'     ),
+					 'gallery'   => array( 'gallery'         , 'gallery' ),
 				   );
 	
 					
-	/***************************************************/
-	
-	$IN['act'] = $IN['act'] == '' ? "idx" : $IN['act'];
-	
+	//---------------------------------------------------
 	// Check to make sure the array key exits..
-	if (! isset($choice[$IN['act']]) )
+	//---------------------------------------------------
+	
+	if (! isset($choice[ $ibforums->input['act'] ][0]) )
 	{
-		$IN['act'] = 'idx';
+		$ibforums->input['act'] = 'idx';
 	}
 	
 	// Require and run
 	
-	if ($IN['act'] == 'idx')
+	if ($ibforums->input['act'] == 'idx' or $ibforums->input['printframes'] == 1)
 	{
-		print $SKIN->frame_set();
+		print $ibforums->adskin->frame_set();
 		exit;
 	}
-	else if ($IN['act'] == 'menu')
+	else if ($ibforums->input['act'] == 'menu')
 	{
-		$ADMIN->menu();
+		$ibforums->admin->menu();
 	}
-	else if ($IN['act'] == 'csite')
+	else if ($ibforums->input['act'] == 'csite')
 	{
 		require ROOT_PATH."sources/dynamiclite/ad_dynamiclite.php";
 	}
 	else
 	{
-		require ROOT_PATH."sources/Admin/ad_".$choice[$IN['act']].".php";
+		require ROOT_PATH."sources/admin/ad_".$choice[ $ibforums->input['act'] ][0].".php";
+		
+		$choice[ $ibforums->input['act'] ][1] = 'ad_'.$choice[ $ibforums->input['act'] ][1];
+		
+		$runme = new $choice[ $ibforums->input['act'] ][1];
+		$runme->auto_run();
 	}
 	
 }
 
+//+-------------------------------------------------
+// Skin emergency mode...
+//+-------------------------------------------------
 
+function skin_emergency()
+{
+	global $DB, $ibforums, $std;
+	
+	if ( $_GET['skinrebuild'] == 1 )
+	{
+		print "Attempted to rebuild the skins and failed.<br />Please contact technical support for more assistance.";
+		exit();
+	}
+	
+	//-----------------------------------------
+	// Rebuild ID cache..
+	//-----------------------------------------
+	
+	require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+    $adcache = new admin_cache_functions();
+	$ibforums->cache['skin_id_cache'] = $adcache->_rebuild_skin_id_cache();
+	
+	//-----------------------------------------
+	// Attempt to recache the default skin
+	//-----------------------------------------
+	
+	foreach( $ibforums->cache['skin_id_cache'] as $sid => $data )
+	{
+		if ( $data['set_default'] )
+		{
+			$default_skin = $data['set_skin_set_id'];
+		}
+	}
+	
+	//-----------------------------------------
+	// Load library
+	//-----------------------------------------
+	
+	require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+	$ibforums->cache_func = new admin_cache_functions();
+	
+	$ibforums->cache_func->_rebuild_all_caches( array($default_skin) );
+	
+	//-----------------------------------------
+	// Try to turn on safe mode
+	//-----------------------------------------
+	
+	if ( ! @file_exists( CACHE_PATH.'skin_cache/cacheid_'.$default_skin.'/skin_global.php' ) )
+	{
+		if ( $ibforums->vars['safe_mode_skins'] != 1 )
+		{
+			$DB->do_update( "conf_settings", array( 'conf_value' => 1 ), "conf_key='safe_mode_skins'" );
+			
+			require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+			$adsettings = new ad_settings();
+			$adsettings->setting_rebuildcache();
+		}
+	}
+	
+	//-----------------------------------------
+	// Update panic message
+	//-----------------------------------------
+	
+	$DB->simple_exec_query( array( "delete" => "cache_store", "where" => "cs_key='skinpanic'" ) );
+	$DB->do_insert( 'cache_store', array( 'cs_value' => 'rebuildemergency', 'cs_key' => 'skinpanic' ) );
+	
+	$std->boink_it( $ibforums->base_url.'&skinrebuild=1' );	
+}
 
 //+-------------------------------------------------
 // GLOBAL ROUTINES
@@ -732,4 +980,45 @@ function fatal_error($message="", $help="") {
 	echo("$message<br><br>$help");
 	exit;
 }
-?>
+
+//+-------------------------------------------------
+// Custom error handler
+//+-------------------------------------------------
+
+function my_error_handler( $errno, $errstr, $errfile, $errline )
+{
+	// Did we turn off errors with @?
+	
+	if ( ! error_reporting() )
+	{
+		return;
+	}
+	
+	$errfile = str_replace( @getcwd(), "", $errfile );
+	
+	switch ($errno)
+	{
+  		case E_ERROR:
+   			echo "<b>FATAL</b> [$errno] $errstr<br />\n";
+   			echo "  Fatal error in line $errline of file $errfile";
+   			echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")<br />\n";
+   			echo "Aborting...<br />\n";
+   			exit(1);
+   		break;
+  		case E_WARNING:
+  			if ( strstr( $errstr, 'load_template(./skin_cache/cacheid_' ) )
+  			{
+  				skin_emergency();
+  			}
+  			else
+  			{
+   				echo "<b>IPB WARNING</b> [$errno] $errstr (Line: $errline of $errfile)<br />\n";
+   			}
+   		break;
+ 		default:
+   			//echo "Unkown error type: [$errno] $errstr<br />\n";
+   		break;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/cache/css_1.css b/upload/cache/css_1.css
deleted file mode 100644
index f3bf1190..00000000
--- a/upload/cache/css_1.css
+++ /dev/null
@@ -1,133 +0,0 @@
-/* FIX IE6 Scrollbars bug - Leave this in! */
-html { overflow-x: auto; } 
-
-/* Body entry, change forum page background colour, default font, font size, etc. Leave text-align:center to center board content
-   #ipwrapper will set text-align back to left for the forum. Any other tables / divs you use must use text-align:left to re-align
-   the content properly. This is a work around to a known Internet Explorer bug */
-BODY { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; margin:0px;padding:0px;background-color:#FFF; text-align:center }
-TABLE, TR, TD { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; }
-
-/* MAIN WRAPPER: Adjust forum width here. Leave margins alone to auto-center content */
-#ipbwrapper { text-align:left; width:95%; margin-left:auto;margin-right:auto }
-#ipbwrapper img { vertical-align:middle; border: 0px }
-
-a:link, a:visited, a:active { text-decoration: underline; color: #000 }
-a:hover { color: #465584; text-decoration:underline }
-
-fieldset.search { padding:6px; line-height:150% }
-label      { cursor:pointer; }
-form       { display:inline; }
-img.attach { border:2px outset #EEF2F7;padding:2px }
-
-.googleroot  { padding:6px; line-height:130% }
-.googlechild { padding:6px; margin-left:30px; line-height:130% }
-.googlebottom, .googlebottom a:link, .googlebottom a:visited, .googlebottom a:active { font-size:11px; color: #3A4F6C; }
-.googlish, .googlish a:link, .googlish a:visited, .googlish a:active { font-size:14px; font-weight:bold; color:#00D; }
-.googlepagelinks { font-size:1.1em; letter-spacing:1px }
-.googlesmall, .googlesmall a:link, .googlesmall a:active, .googlesmall a:visited { font-size:10px; color:#434951 }
-
-li.helprow { padding:0px; margin:0px 0px 10px 0px }
-ul#help    { padding:0px 0px 0px 15px }
-
-option.cat { font-weight:bold; }
-option.sub { font-weight:bold;color:#555 }
-.caldate   { text-align:right;font-weight:bold;font-size:11px;color:#777;background-color:#DFE6EF;padding:4px;margin:0px }
-
-.warngood { color:green }
-.warnbad  { color:red }
-
-#padandcenter { margin-left:auto;margin-right:auto;text-align:center;padding:14px 0px 14px 0px }
-
-#profilename { font-size:28px; font-weight:bold; }
-#calendarname { font-size:22px; font-weight:bold; }
-
-#photowrap { padding:6px; }
-#phototitle { font-size:24px; border-bottom:1px solid black }
-#photoimg   { text-align:center; margin-top:15px } 
-
-#ucpmenu    { line-height:150%;width:22%; border:1px solid #345487;background-color: #F5F9FD }
-#ucpmenu p  { padding:2px 5px 6px 9px;margin:0px; }
-#ucpcontent { background-color: #F5F9FD; border:1px solid #345487;line-height:150%; width:auto }
-#ucpcontent p  { padding:10px;margin:0px; }
-
-#ipsbanner { position:absolute;top:1px;right:5%; }
-#logostrip { border:1px solid #345487;background-color: #3860BB;background-image:url(style_images/<#IMG_DIR#>/tile_back.gif);padding:0px;margin:0px; }
-#submenu   { border:1px solid #BCD0ED;background-color: #DFE6EF;font-size:10px;margin:3px 0px 3px 0px;color:#3A4F6C;font-weight:bold;}
-#submenu a:link, #submenu  a:visited, #submenu a:active { font-weight:bold;font-size:10px;text-decoration: none; color: #3A4F6C; }
-#userlinks { border:1px solid #C2CFDF; background-color: #F0F5FA }
-
-#navstrip  { font-weight:bold;padding:6px 0px 6px 0px; }
-
-.activeuserstrip { background-color:#BCD0ED; padding:6px }
-
-/* Form stuff (post / profile / etc) */
-.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px }
-.pformleft  { background-color: #F5F9FD; padding:6px; margin-top:1px;width:25%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
-
-/* Topic View elements */
-.signature   { font-size: 10px; color: #339; line-height:150% }
-.postdetails { font-size: 10px }
-.postcolor   { font-size: 12px; line-height: 160% }
-
-.normalname { font-size: 12px; font-weight: bold; color: #003 }
-.normalname a:link, .normalname a:visited, .normalname a:active { font-size: 12px }
-.unreg { font-size: 11px; font-weight: bold; color: #900 }
-
-.post1 { background-color: #F5F9FD }
-.post2 { background-color: #EEF2F7 }
-.postlinksbar { background-color:#D1DCEB;padding:7px;margin-top:1px;font-size:10px; background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif) }
-
-/* Common elements */
-.row1 { background-color: #F5F9FD }
-.row2 { background-color: #DFE6EF }
-.row3 { background-color: #EEF2F7 }
-.row4 { background-color: #E4EAF2 }
-
-.darkrow1 { background-color: #C2CFDF; color:#4C77B6; }
-.darkrow2 { background-color: #BCD0ED; color:#3A4F6C; }
-.darkrow3 { background-color: #D1DCEB; color:#3A4F6C; }
-
-.hlight { background-color: #DFE6EF }
-.dlight { background-color: #EEF2F7 }
-
-.titlemedium { font-weight:bold; color:#3A4F6C; padding:7px; margin:0px; background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif) }
-.titlemedium  a:link, .titlemedium  a:visited, .titlemedium  a:active  { text-decoration: underline; color: #3A4F6C }
-
-/* Main table top (dark blue gradient by default) */
-.maintitle { vertical-align:middle;font-weight:bold; color:#FFF; padding:8px 0px 8px 5px; background-image: url(style_images/<#IMG_DIR#>/tile_back.gif) }
-.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-.maintitle a:hover { text-decoration: underline }
-
-/* tableborders gives the white column / row lines effect */
-.plainborder { border:1px solid #345487;background-color:#F5F9FD }
-.tableborder { border:1px solid #345487;background-color:#FFF; padding:0; margin:0 }
-.tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px;  }
-.tablepad    { background-color:#F5F9FD;padding:6px }
-.tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }
-
-.wrapmini    { float:left;line-height:1.5em;width:25% }
-.pagelinks   { float:left;line-height:1.2em;width:35% }
-
-.desc { font-size:10px; color:#434951 }
-.edit { font-size: 9px }
-
-
-.searchlite { font-weight:bold; color:#F00; background-color:#FF0 }
-
-#QUOTE { white-space:normal; font-family: Verdana, Arial; font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-#CODE  { white-space:normal; font-family: Courier, Courier New, Verdana, Arial;  font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-
-.copyright { font-family: Verdana, Tahoma, Arial, Sans-Serif; font-size: 9px; line-height: 12px }
-
-.codebuttons  { font-size: 10px; font-family: verdana, helvetica, sans-serif; vertical-align: middle }
-.forminput, .textinput, .radiobutton, .checkbox  { font-size: 11px; font-family: verdana, helvetica, sans-serif; vertical-align: middle }
-
-.thin { padding:6px 0px 6px 0px;line-height:140%;margin:2px 0px 2px 0px;border-top:1px solid #FFF;border-bottom:1px solid #FFF }
-
-.purple { color:purple;font-weight:bold }
-.red    { color:red;font-weight:bold }
-.green  { color:green;font-weight:bold }
-.blue   { color:blue;font-weight:bold }
-.orange { color:#F90;font-weight:bold } 
\ No newline at end of file
diff --git a/upload/conf_global.php b/upload/conf_global.php
index eb97449f..dc10d563 100644
--- a/upload/conf_global.php
+++ b/upload/conf_global.php
@@ -1,102 +1,4 @@
 <?php
-$INFO['sig_allow_ibc']			=	'1';
-$INFO['show_user_posted']			=	'1';
-$INFO['avatar_ext']			=	'gif|jpeg|jpg|swf|png';
-$INFO['avatar_url']			=	'1';
-$INFO['avup_size_max']			=	'20';
-$INFO['avatars_on']			=	'1';
-$INFO['avatar_dims']			=	'64x64';
-$INFO['avatar_def']			=	'64x64';
-$INFO['email_in']			=	'';
-$INFO['email_out']			=	'';
-$INFO['allow_images']			=	'1';
-$INFO['max_emos']			=	'20';
-$INFO['allow_creator_vote']			=	'1';
-$INFO['allow_dynamic_img']			=	'0';
-$INFO['allow_flash']			=	'1';
-$INFO['allow_online_list']			=	'1';
-$INFO['allow_skins']			=	'1';
-$INFO['ban_ip']			=	'';
-$INFO['ban_email']			=	'';
-$INFO['ban_names']			=	'';
-$INFO['board_start']			=	'1020214590';
-$INFO['news_forum_id']			=	'1';
-$INFO['index_news_link']			=	'1';
-$INFO['allow_dup_email']			=	'1';
-$INFO['admin_group']			=	'4';
-$INFO['auth_group']			=	'1';
-$INFO['member_group']			=	'3';
-$INFO['guest_group']			=	'2';
-$INFO['boardname']			=	'IBForums';
-$INFO['board_desc']			=	'Website forums';
-$INFO['board_name']			=	'Invision Power Board';
-$INFO['php_ext']			=	'php';
-$INFO['board_url']			=	'';
-$INFO['match_browser']			=	'0';
-$INFO['clock_long']			=	'M j Y, h:i A';
-$INFO['clock_short']			=	'jS F Y - h:i A';
-$INFO['clock_joined']			=	'j-F y';
-$INFO['load_limit']			=	'';
-$INFO['cookie_domain']			=	'';
-$INFO['cookie_id']			=	'';
-$INFO['cookie_path']			=	'';
-$INFO['email_header']			=	'This email generated via IBForums';
-$INFO['email_footer']			=	'';
-$INFO['show_active']			=	'1';
-$INFO['show_birthdays']			=	'1';
-$INFO['show_totals']			=	'1';
-$INFO['sql_driver']			=	'mySQL';
-$INFO['sql_host']			=	'localhost';
-$INFO['sql_database']		=	'';
-$INFO['sql_pass']			=	'';
-$INFO['sql_port']			=	'';
-$INFO['sql_tbl_prefix']			=	'ibf_';
-$INFO['sql_user']			=	'root';
-$INFO['display_max_posts']			=	'15';
-$INFO['display_max_topics']			=	'15';
-$INFO['emo_per_row']			=	'3';
-$INFO['etfilter_punct']			=	'0';
-$INFO['etfilter_shout']			=	'0';
-$INFO['flood_control']			=	'30';
-$INFO['force_login']			=	'0';
-$INFO['show_img_upload']			=	'1';
-$INFO['home_name']			=	'Site Home';
-$INFO['home_url']			=	'http://localhost';
-$INFO['hot_topic']			=	'15';
-$INFO['html_dir']			=	'';
-$INFO['base_dir']			=	'';
-$INFO['html_url']			=	'';
-$INFO['upload_dir']			=	'';
-$INFO['upload_url']			=	'';
-$INFO['img_ext']			=	'gif|jpeg|jpg|png';
-$INFO['max_h_flash']			=	'200';
-$INFO['max_images']			=	'10';
-$INFO['max_post_length']			=	'1000';
-$INFO['max_w_flash']			=	'200';
-$INFO['max_messages']			=	'50';
-$INFO['pre_moved']			=	'Moved: ';
-$INFO['pre_pinned']			=	'Pinned: ';
-$INFO['pre_polls']			=	'Poll: ';
-$INFO['session_expiration']			=	'3600';
-$INFO['reg_auth_type']			=	'0';
-$INFO['time_offset']			=	'0';
-$INFO['new_reg_notify']			=	'0';
-$INFO['use_mail_form']			=	'1';
-$INFO['msg_allow_code']			=	'1';
-$INFO['msg_allow_html']			=	'0';
-$INFO['allow_search']			=	'1';
-$INFO['print_headers']			=	'1';
-$INFO['nocache']			=	'1';
-$INFO['debug_level']			=	'1';
-$INFO['forum_skin_1']			=	'';
-$INFO['forum_skin_8']			=	'';
-$INFO['board_offline']			=	'0';
-$INFO['offline_msg']			=	'';
-$INFO['no_reg']			=	'0';
-$INFO['max_sig_length']			=	'50000';
-$INFO['sig_allow_html']			=	'0';
-$INFO['max_location_length']			=	'50000';
-$INFO['max_interest_length']			=	'50000';
-$INFO['post_titlechange']			=	'50000';
+
 
 ?>
\ No newline at end of file
diff --git a/upload/conf_mime_types.php b/upload/conf_mime_types.php
deleted file mode 100644
index 5a4c7b23..00000000
--- a/upload/conf_mime_types.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-$mime_types = array(
-
-
-	// mime         					 allow post  img           type           allow avatar
-
-    "application/pdf"			   => array( 1, 'pdf.gif'       , 'PDF Document'   ) ,
-    "image/x-png" 				   => array( 1, 'quicktime.gif' , 'PNG Image'  , 1    ) ,
-    "image/png" 				   => array( 1, 'quicktime.gif' , 'PNG Image'  , 1    ) ,
-    "video/vivo"				   => array( 1, 'win_player.gif', 'VIVO Movie'     ) ,
-    "application/x-compress" 	   => array( 1, 'zip.gif'       , 'Compressed File') ,
-    "video/x-msvideo" 			   => array( 1, 'win_player.gif', 'MS Video'       ) ,
-    "text/html" 				   => array( 1, 'html.gif'      , 'HTML Page'      ) ,
-    "audio/x-pn-realaudio"		   => array( 1, 'real_audio.gif', 'Real Audio File') ,
-    "image/gif" 			       => array( 1, 'gif.gif'       , 'GIF Image'      ,1 ) ,
-    "video/mpeg"				   => array( 1, 'quicktime.gif' , 'MPEG Video'     ) ,
-    "image/ico"					   => array( 1, 'gif.gif'       , 'Icon File'      ) ,
-    "application/x-tar"			   => array( 1, 'zip.gif'       , 'TAR Ball'       ) ,
-    "image/x-MS-bmp"			   => array( 1, 'bmp.gif'       , 'BMP Image'      ) ,
-    "image/tiff" 				   => array( 1, 'quicktime.gif' , 'TIFF Image'     ) ,
-    "text/richtext" 			   => array( 1, 'txt.gif'       , 'Rich Text'      ) ,
-    "audio/x-realaudio"			   => array( 1, 'realaudio.gif' , 'Real Audio'     ) ,
-    "application/mac-binhex40"     => array( 1, 'stuffit.gif'   , 'Mac Binary'     ) ,
-    "audio/x-aiff" 				   => array( 1, 'quicktime.gif' , 'AIFF File'      ) ,
-    "application/x-gzip" 		   => array( 1, 'zip.gif'       , 'GZIP File'      ) ,
-    "application/zip" 		       => array( 1, 'zip.gif'       , 'ZIP File'       ) ,
-    "application/postscript" 	   => array( 1, 'postscript.gif', 'Postscript'     ) ,
-    "application/msword" 		   => array( 1, 'word.gif'      , 'MS Word doc'    ) ,
-    "video/quicktime" 		       => array( 1, 'quicktime.gif' , 'QuickTime Movie') ,
-    "application/powerpoint"       => array( 1, 'apps.gif'      , 'PowerPoint Doc' ) ,
-    "audio/x-wav" 				   => array( 1, 'sound.gif'     , 'WAV File'       ) ,
-    "audio/x-mpeg"				   => array( 1, 'mp3.gif'       , 'MPEG Audio'     ) ,
-    "image/jpeg" 				   => array( 1, 'jpeg.gif'      , 'JPEG Image'     ,1) ,
-    "application/x-zip-compressed" => array( 1, 'zip.gif'       , 'ZIP File'         ) ,
-    "application/octet-stream" 	   => array( 1, 'quicktime.gif' , 'OCTET Stream'     ) ,
-    "text/plain" 				   => array( 1, 'text.gif'      , 'Text File'        ) ,
-    "image/pjpeg" 				   => array( 1, 'jpeg.gif'      , 'JPEG Image'     ,1) ,
-    "application/x-shockwave-flash"=> array( 0, 'quicktime.gif' , 'Flash'          ,0) ,
-     
-);
-
-
-?>
\ No newline at end of file
diff --git a/upload/css.php b/upload/css.php
deleted file mode 100644
index 0a498439..00000000
--- a/upload/css.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?
-
-//-------------------------------------------------------------------
-// Pretend we're a css sheet but process a saved cache file and convert
-// over the img_dir stuff.
-//
-// Sneaky!
-//-------------------------------------------------------------------
-
-
-$root_path = './';
-
-$in     = explode( "_", $_GET['d'], 2 );
-
-$css_id = intval($in[0]);
-$img_id = preg_replace( "/.css$/", "", $in[1] );
-$data   = "";
-
-if ( $css_id && $img_id )
-{
-	if ( $FH = @fopen( $root_path."cache/css_{$css_id}.css", 'r' ) )
-	{
-		$data = @fread( $FH, @filesize($root_path."cache/css_{$css_id}.css") );
-		@fclose( $FH );
-	}
-}
-
-$data = str_replace( "<#IMG_DIR#>", $img_id, $data );
-
-@header( "Content-type: text/css" );
-print $data;
-exit();
-	 
-?>
\ No newline at end of file
diff --git a/upload/fonts/font_license.txt b/upload/fonts/font_license.txt
deleted file mode 100644
index 6ff78f96..00000000
--- a/upload/fonts/font_license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Fonts by Tom Murphy 7
----------------------
-
-http://fonts.tom7.com/
-
-This is the official version of the license for all the fonts (except where noted). It supercedes any other licenses circulating. 
-
-I am employing a very generous license with these fonts (the way I think most software should be) for a number of reasons. Mainly though, it is because I would be making fonts regardless of whether I was distributing them or not, and because I know that people benefit from the fact that I give them away. I take enough stuff for free and it makes me feel good to know that I am 'giving back'. 
-
-Here is the license. You are free to download and use these fonts without my explicit permission for anything you want, except for the following: 
-You may NOT * resell the actual font files (without my written permission and without having to give me something in return). This includes but is not limited to selling it on a Font CD (even when the fee involved is a nominal "distribution" or "handling" fee, or some similar thing), or distributing it on a site which charges a fee per font download. (In contrast, a pay-per-hour service such as America Online is free to distribute the fonts.) 
-You may not misrepresent the creator of the font (pretend you made them) 
-You may not adapt them to different fonts without my permission. 
-You may not modify the font files for subsequent redistribution. 
-
-However, you have permission to do the following: 
-Use them to make graphics for your home page, non-profit web page, or commerical web site. 
-Give them to your friends for free. 
-Make them available (for free) on your web page, as long as you don't pretend you made them. It'd be nice of you to include this README file, too. 
-Use them in design work that you get paid for. 
-Use them in any smalltime publications or fliers or other non mass-produced literature. 
-Make commercial products like T-shirts or Mugs or Books using the fonts and sell them. In this case, since you are indirectly profiting off of my work, I ask that you send me one of the T-shirts or Mugs or Books free, where reasonable . Obviously some discretion on your part is due; but try to be fair. If it is inappropriate for you to send me one of your product, at least make an attempt to write me an e-mail at imightbetm@aol.com and let me know where the font is being used. 
-
-Exception to the above: The fonts (or converted versions of them) may be included on any recognized distribution of the Linux and (Open/Net/Free)BSD operating systems, even if the CD is sold. Please include the readme .
-
-* "Not", as in, "Not without my permission". I regularly give permission for this sort of thing, so if you want to redistribute the fonts for a fee, let me know and we can probably work something out. Generally I simply request a copy of the CD or magazine or whatever. 
-
-For your information, here is my address: 
-Permanent address: 
-Tom Murphy 7
-339 Still Hill Rd
-Hamden CT 06518.1830
-USA 
\ No newline at end of file
diff --git a/upload/fonts/geodesic.ttf b/upload/fonts/geodesic.ttf
deleted file mode 100644
index 72f3ca60d28ea06b9f1f9ea495a646362e77bde7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36880
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

diff --git a/upload/fonts/progbot.ttf b/upload/fonts/progbot.ttf
deleted file mode 100644
index c98d1221ea8177cd9417cf633e03b6822fbc85ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86956
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
T+yS)j1<<~g`bWJJY5M;G%^iYd

diff --git a/upload/fonts/scandal.ttf b/upload/fonts/scandal.ttf
deleted file mode 100644
index 22e3a7e226357a789ebf7b270f08a197635d087a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41320
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

diff --git a/upload/fonts/xsuni.ttf b/upload/fonts/xsuni.ttf
deleted file mode 100644
index 89c78d6b28ec2053e71cf1ef9c7ed05ffb71f31b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 97128
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
TdPGQi0;@b&dd{q+h?xHa$hl5n

diff --git a/upload/html/ibfcode_old.js b/upload/html/ibfcode_old.js
deleted file mode 100644
index 6fdb95fc..00000000
--- a/upload/html/ibfcode_old.js
+++ /dev/null
@@ -1 +0,0 @@
-//--------------------------------------------
// Set up our simple tag open values
//--------------------------------------------

var B_open = 0;
var I_open = 0;
var U_open = 0;
var QUOTE_open = 0;
var CODE_open = 0;
var SQL_open = 0;
var HTML_open = 0;

var bbtags   = new Array();

// Set the initial radio button status based on cookies

var allcookies = document.cookie;
var pos = allcookies.indexOf("bbmode=");

prep_mode();

function prep_mode()
{
	if (pos != 1) {
		var cstart = pos + 7;
		var cend   = allcookies.indexOf(";", cstart);
		if (cend == -1) { cend = allcookies.length; }
		cvalue = allcookies.substring(cstart, cend);
		
		if (cvalue == 'ezmode') {
			document.REPLIER.bbmode[0].checked = true;
		} else {
			document.REPLIER.bbmode[1].checked = true;
		}
	} else {
		// default to normal mode.
		document.REPLIER.bbmode[1].checked = true;
	}
}

function setmode(mVal)
{
	document.cookie = "bbmode="+mVal+"; path=/; expires=Wed, 1 Jan 2020 00:00:00 GMT;";
}

function get_easy_mode_state()
{
	// Returns true if we've chosen easy mode
	
	if (document.REPLIER.bbmode[0].checked)
	{
		return true;
	}
	else
	{
		return false;
	}
}

//--------------------------------------------
// Set the help bar status
//--------------------------------------------

function hstat(msg)
{
	document.REPLIER.helpbox.value = eval( "help_" + msg );
}

// Set the number of tags open box

function cstat()
{
	var c = stacksize(bbtags);
	
	if ( (c < 1) || (c == null) )
	{
		c = 0;
	}
	
	if ( ! bbtags[0] )
	{
		c = 0;
	}
	
	document.REPLIER.tagcount.value = c;
}

//--------------------------------------------
// Get stack size
//--------------------------------------------

function stacksize(thearray)
{
	for (i = 0 ; i < thearray.length; i++ )
	{
		if ( (thearray[i] == "") || (thearray[i] == null) || (thearray == 'undefined') )
		{
			return i;
		}
	}
	
	return thearray.length;
}

//--------------------------------------------
// Push stack
//--------------------------------------------

function pushstack(thearray, newval)
{
	arraysize = stacksize(thearray);
	thearray[arraysize] = newval;
}

//--------------------------------------------
// Pop stack
//--------------------------------------------

function popstack(thearray)
{
	arraysize = stacksize(thearray);
	theval = thearray[arraysize - 1];
	delete thearray[arraysize - 1];
	return theval;
}


//--------------------------------------------
// Close all tags
//--------------------------------------------

function closeall()
{
	//var c=bbtags.length;
	
	//alert('Stack: ' + c);
	
	if (bbtags[0])
	{
		while (bbtags[0])
		{
			tagRemove = popstack(bbtags)
			document.REPLIER.Post.value += "[/" + tagRemove + "]";
			
			// Change the button status
			eval("document.REPLIER." + tagRemove + ".value = ' " + tagRemove + " '");
			eval(tagRemove + "_open = 0");
		}
		
	}
	
	// Ensure we got them all
	
	document.REPLIER.tagcount.value = 0;
	bbtags = new Array();
	document.REPLIER.Post.focus();
}

//--------------------------------------------
// EMOTICONS
//--------------------------------------------

function emoticon(theSmilie)
	{
	if (document.REPLIER.Post.caretPos && document.REPLIER.Post.createTextRange)
	{
		var caretPos = document.REPLIER.Post.caretPos;
		caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? theSmilie + ' ' : theSmilie;
	}
	else
	{
    	document.REPLIER.Post.value += ' ' + theSmilie + ' ';
    }
    
    document.REPLIER.Post.focus();
}

//--------------------------------------------
// ADD CODE
//--------------------------------------------

function add_code(NewCode)
{
    document.REPLIER.Post.value += NewCode;
    document.REPLIER.Post.focus();
    return;
}

//--------------------------------------------
// ALTER FONT
//--------------------------------------------

function alterfont(theval, thetag)
{
    if (theval == 0)
    {
    	return;
    }
    else
    {
    	document.REPLIER.Post.value += "[" + thetag + "=" + theval + "] [/" + thetag + "]";
    }
    
    document.REPLIER.ffont.selectedIndex  = 0;
    document.REPLIER.fsize.selectedIndex  = 0;
    document.REPLIER.fcolor.selectedIndex = 0;
    
    document.REPLIER.Post.focus();
}


//--------------------------------------------
// SIMPLE TAGS (such as B, I U, etc)
//--------------------------------------------

function simpletag(thetag)
{

	var tagOpen = eval(thetag + "_open");
	
	if ( get_easy_mode_state() )
	{
		inserttext = prompt(prompt_start + "\n[" + thetag + "]xxx[/" + thetag + "]");
		if ( (inserttext != null) && (inserttext != "") )
		{
			document.REPLIER.Post.value += "[" + thetag + "]" + inserttext + "[/" + thetag + "] ";
		}
	}
	else
	{
	
		if (tagOpen == 0)
		{
			document.REPLIER.Post.value += "[" + thetag + "]";
			
			eval(thetag + "_open = 1");
			
			// Change the button status
			
			eval("document.REPLIER." + thetag + ".value += '*'");
			
			pushstack(bbtags, thetag);
			cstat();
			hstat('click_close');
		}
		else
		{
			// Find the last occurance of the opened tag
			
			lastindex = 0;
			
			for (i = 0 ; i < bbtags.length; i++ )
			{
				if ( bbtags[i] == thetag )
				{
					lastindex = i;
				}
			}
			
			// Close all tags opened up to that tag was opened
			
			while (bbtags[lastindex])
			{
				tagRemove = popstack(bbtags);
				document.REPLIER.Post.value += "[/" + tagRemove + "]";
				
				// Change the button status
				eval("document.REPLIER." + tagRemove + ".value = ' " + tagRemove + " '");
				eval(tagRemove + "_open = 0");
			}
			
			cstat();
			
		}
	}
	
	document.REPLIER.Post.focus();
}


function tag_list()
{
	listvalue = "init";
	
	thelist = "[LIST]\n";
	
	while ( (listvalue != "") && (listvalue != null) )
	{
		listvalue = prompt(list_prompt, "");
		
		if ( (listvalue != "") && (listvalue != null) )
		{
			thelist = thelist+"[*]"+listvalue+"\n";
		}
	}
	document.REPLIER.Post.value += thelist + "[/LIST]\n";
	document.REPLIER.Post.focus();
}

function tag_url()
{
    var FoundErrors = '';
    var enterURL   = prompt(text_enter_url, "http://");
    var enterTITLE = prompt(text_enter_url_name, "My Webpage");
    if (!enterURL)
    {
        FoundErrors += " " + error_no_url;
    }
    if (!enterTITLE)
    {
        FoundErrors += " " + error_no_title;
    }
    if (FoundErrors)
    {
        alert("Error!"+FoundErrors);
        return;
    }
    var ToAdd = "[URL="+enterURL+"]"+enterTITLE+"[/URL]";
    document.REPLIER.Post.value+=ToAdd;
	document.REPLIER.Post.focus();
}

function tag_image()
{
    var FoundErrors = '';
    var enterURL   = prompt(text_enter_image, "http://");
    if (!enterURL) {
        FoundErrors += " " + error_no_url;
    }
    if (FoundErrors) {
        alert("Error!"+FoundErrors);
        return;
    }
    var ToAdd = "[IMG]"+enterURL+"[/IMG]";
    document.REPLIER.Post.value+=ToAdd;
	document.REPLIER.Post.focus();
}

function tag_email()
{
    var emailAddress = prompt(text_enter_email,"");
    if (!emailAddress) { alert(error_no_email); return; }
    var ToAdd = "[EMAIL]"+emailAddress+"[/EMAIL]";
    document.REPLIER.Post.value+=ToAdd;
	document.REPLIER.Post.focus();
}
\ No newline at end of file
diff --git a/upload/html/mime_types/apps.gif b/upload/html/mime_types/apps.gif
deleted file mode 100644
index 036af52e60654b1e12b1780e6d0df10bce0bd01e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 245
zcmZ?wbhEHb6krfwIKlt|XJ)3AmzOi7rM-Lij=|XY?%lgH(~Q&7&in^T7z2gVcJJP8
zY@B8c<QW^!oC%`-|NsAwkqNAu0HOGkg;j(>m_Y}m4rC_-YtaG~hLp@nLAMxMChii-
zVG!Cht0(aZo6GG64<$j3k2PDT7Fg&oNp#Pj<f*IF*mXF-@sgEluk?clI)a%y3JcA(
zmu2L94Q`*rP}cM3$ISkH$u>MH?j~goR*hC3W&Hfiz5RU?S{eA5S*OjIKC`t<eZHn5
GgEatP_D-Du

diff --git a/upload/html/mime_types/bmp.gif b/upload/html/mime_types/bmp.gif
deleted file mode 100644
index 38da29d3083327722f841146509ad11d1e2c9fc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 183
zcmZ?wbhEHb6krfw*v!N5|33p5H!y%8!+`?_8X6iHfP!FAFa_ekf#OdVMg|5R1|5(H
z$P5OSlnW<3d3Rr5bGCBhjBBMwnT(X&*R(v+;+Zr{c%vwnQn}~+8{JKQ3Q{~Gb`J!$
zN-*#ppO<@5MrOf@BS{>q<N9YaI5nKkiIZ-25_og2itWzXy%X1o$XR8ZoEQ1m&{!X<
M-`b`pF34aF0LTVD$p8QV

diff --git a/upload/html/mime_types/gif.gif b/upload/html/mime_types/gif.gif
deleted file mode 100644
index 38da29d3083327722f841146509ad11d1e2c9fc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 183
zcmZ?wbhEHb6krfw*v!N5|33p5H!y%8!+`?_8X6iHfP!FAFa_ekf#OdVMg|5R1|5(H
z$P5OSlnW<3d3Rr5bGCBhjBBMwnT(X&*R(v+;+Zr{c%vwnQn}~+8{JKQ3Q{~Gb`J!$
zN-*#ppO<@5MrOf@BS{>q<N9YaI5nKkiIZ-25_og2itWzXy%X1o$XR8ZoEQ1m&{!X<
M-`b`pF34aF0LTVD$p8QV

diff --git a/upload/html/mime_types/html.gif b/upload/html/mime_types/html.gif
deleted file mode 100644
index 419604df642e40b25c6896fc5bf0ef6f860b71fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 123
zcmZ?wbhEHb6krfwSi}GV#ti>~;LMr-{}`FT0w6;1Cku-R!+!=H5C^1|f!RT0!<kP3
zy`IOr_<7b;U6GkkD}AjavXixmwb5T;bK~q|o9`?VdUt#8ot*DdPYfJ*y$e*9wRy<(
QJf0G=?&M^#sSFI(07D%s=l}o!

diff --git a/upload/html/mime_types/jpeg.gif b/upload/html/mime_types/jpeg.gif
deleted file mode 100644
index 38da29d3083327722f841146509ad11d1e2c9fc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 183
zcmZ?wbhEHb6krfw*v!N5|33p5H!y%8!+`?_8X6iHfP!FAFa_ekf#OdVMg|5R1|5(H
z$P5OSlnW<3d3Rr5bGCBhjBBMwnT(X&*R(v+;+Zr{c%vwnQn}~+8{JKQ3Q{~Gb`J!$
zN-*#ppO<@5MrOf@BS{>q<N9YaI5nKkiIZ-25_og2itWzXy%X1o$XR8ZoEQ1m&{!X<
M-`b`pF34aF0LTVD$p8QV

diff --git a/upload/html/mime_types/jpg.gif b/upload/html/mime_types/jpg.gif
deleted file mode 100644
index 38da29d3083327722f841146509ad11d1e2c9fc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 183
zcmZ?wbhEHb6krfw*v!N5|33p5H!y%8!+`?_8X6iHfP!FAFa_ekf#OdVMg|5R1|5(H
z$P5OSlnW<3d3Rr5bGCBhjBBMwnT(X&*R(v+;+Zr{c%vwnQn}~+8{JKQ3Q{~Gb`J!$
zN-*#ppO<@5MrOf@BS{>q<N9YaI5nKkiIZ-25_og2itWzXy%X1o$XR8ZoEQ1m&{!X<
M-`b`pF34aF0LTVD$p8QV

diff --git a/upload/html/mime_types/mp3.gif b/upload/html/mime_types/mp3.gif
deleted file mode 100644
index c32292334a4a00b48ae7efbd28802b2169066b59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmZ?wbhEHb6krfwIKlt||I>`i%gbF{T>hU)TeWJHl9EzrXz2f$#=Cd#o;h=7M@Ps1
z|No7RjnjZAElp5R@XVPr{}`FTS_u=1KUr8s7=##fKuSS&GO*SvF!ZKGb{$=`ZjDvX
zX@&D!?i?t!yAxnz)8(>cfq+cThGwUaH~xmW-D}ERVaCVgy70pUEvc){uRbW~E$QE^
zxc3DY%iW6y3L*~lKXJcYu<KR7wSbZ`4@(;xZ$c;|2MdRC9|s3tt~Fl|2jhfEllVfX
V&zL1JlX2;?<xAC8tx{yL1^@&+RD1vc

diff --git a/upload/html/mime_types/parent.gif b/upload/html/mime_types/parent.gif
deleted file mode 100644
index a694ae1ec3f0636cddbf195dd151abff150af69f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmZ?wbhEHb6k!l!IK;s4|Ns9p|NqaNIWsLS&DhwO0R|NR`GsU;7Aqtcl_&tI%shpX
zj8uh!(xjZsWQCOc+{Da0Jq7R7GN6P<X?jL#v5rDEh?n7znpvWkoS&<s5S&_2lA4>8
zTBKlTX=%!!_>+Z^fq{`h2V@1vb_Ql|iCuU8DGPkc5-<+lz3AMXubFeq{lv<eCX}$T
znrper<VED_|DN>P)Ggp6^Q($uOC~PM5!3Knu5hd8zzVA-2Z^g;lkQyz{qtht`EC{l
FYXAcbPG|rC

diff --git a/upload/html/mime_types/pdf.gif b/upload/html/mime_types/pdf.gif
deleted file mode 100644
index 62854cd923a199b7827762e75f66819c2a61eded..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 616
zcmZ?wbhEHb6krfwc*ekB%)oHw%$e%GzO@VtUNJE*0|O%&7`}b`wr<_JJI2P=*4D*w
zaWfehJ}+1h=Hzt$=~H84<9RDrUQ||oR#Q`3Tl<88A<x!!?bfYUN=o+`80wvz?%lf=
z9TPKi=FC)0%`*%PMOj(9ckgy`a?%zPyJu(j{{8#ciHYAfZCbi?si%fUT3T9TV<S+p
ziJM!0T-^Wv|DV~|T)TFyIV&q5D9DR};VM7BkB`rX_Vz7%_wHZ6zQW3?ySuwFDe1kJ
z*J?JlBS($^O$hSxa%N!oq^IX<Xy~P+6rG&xYh*N`sp;9XXTI_A<))^krKR&XZF-xV
zyLIc<?=3Cc85piHFuXH2{}2}Tf9A|+JG%^Z^?!^^3<Ciaf3mQOFhnrufGh{a2?P7l
z2K^>qT`!jQb{S=lCO#=CIXNpU@5y3<dUlrjPNKn~!2z}*0nUML+&pX+CX#Br27avS
z=AwZzj7)B34Dv#zLBcAWK|##Ms_YzG3Pv_z60Vw>?(QxMo}L<9P5K;y{QQQp7W~rE
zx9&7)Xx#L)W_<SI_T4w0FRbl9z5M!C+R*yX+2HSo=513~w3_pH`#RYJ4E`ExZU_dt
z*s|QR`t#%C`;)?IV$w<ufs0bMrJR0sli_0HTyGH$hqBuaj*T3w7R9$%1UVS20cY;N
AvH$=8

diff --git a/upload/html/mime_types/png.gif b/upload/html/mime_types/png.gif
deleted file mode 100644
index 4190f9ae085f885ed877a5430dc388e888e161a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmZ?wbhEHb6krfwSj5h7;J|@~h6aZJ3=9naK?H~b0mYvzj0_Cy3_2hokXi=jIEh^{
z-}PsBY8C`s<KnTCaurEV6gw_Z#cjxVbU~Pl?Y>WECVf*`Jc+?U;DIR5&JM=|I@cyJ
xPu_IFMlaQ1=|dAuxy=evjv1`kIV!6U=1A-`%NF5qSbzKFr^$8twkiw^)&PobHZlMJ

diff --git a/upload/html/mime_types/postscript.gif b/upload/html/mime_types/postscript.gif
deleted file mode 100644
index cfb05b8d019d18efd49a5f5ead45c16c29c890cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmZ?wbhEHb6krfwSi}GVXU_azwQ5yIN5}vF|L@+t`;U<cD5&_8g;j)sjX?*b0;HCK
z+1+CoYn-;x0;Z{(`?_bd1(dVi7IWisU^=YOAhi3W<Hva{*%M10atxi;Kj7YDFlF9_
e6ONqI-FuWyPVtis)qX8{l}pEW?crGr4AuZbhb|!i

diff --git a/upload/html/mime_types/quicktime.gif b/upload/html/mime_types/quicktime.gif
deleted file mode 100644
index 8afa427fcebdb87712749c9bdf7bce5a8ae36f73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmZ?wbhEHb6krfwxXQpFC@47d%$b=pXBsn{NlQyJ26F!Y@95~*y?gh}nP*&FT<+ez
zYn*l_4Jdx*jB(n3V`Jl0t5%(v`TyO!ccG!7#>QvL%gfVd{x_ca9|&g7{GXO~=0DKD
zGe8DV@&7bqV<jb}e~e5Fv;m4gSy)9Flo)hC#)JICz_#Lm4~J5R1gnR4+Q}_4YG<A@
zNs4NTo$f3XjFee)?x@Oz3>6us)<?T}Vwq>0P2C(Rz;J4*Yr_nE0Zw^NPoKO3Zf;%<
zX*n^)O37*tRw3aeR%v#o3C`S7qUpRmob3I+Ofqb8qWrAPOJ@5p2=Gng<gAxvSvHYf
zY(I+_3zrC&!bZuOSPqVwOfG>v>~0+#d~Qbt1X;Y<IovPrzbSC*y1<1C7oRvEW#V&W
Gum%9_N^wvC

diff --git a/upload/html/mime_types/text.gif b/upload/html/mime_types/text.gif
deleted file mode 100644
index aa0b11e95e7d99f3dc286e478c2ca13ae41dcf8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 111
zcmZ?wbhEHb6krfwSi}GV@7}#TbLPzd|Ns9nGJyp^gyK&Y77>R33_2hVNG$`iiN%IH
zp9NYxpEvo3aj_h@C1x>mNA1#+uGchl#a187e0=FtPj<on*UC3}rd}3wUX`4DvO<M{
G!5RSAVJGJR

diff --git a/upload/html/mime_types/txt.gif b/upload/html/mime_types/txt.gif
deleted file mode 100644
index b57b1e8f47183f7681669016aca708a2596a88aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 135
zcmZ?wbhEHb6krfwSj5IqU0uz<P`!8WUIvE$3_uJ9K!)N^7DfgJHU=Fa8>mu%fq~g4
z!|T{Rt!+#z);fd*?RXy>BAOD()x*T2lP$J_gWoCln3kuwqx=EQ!x`TXar)cH2YlPb
hs_k|EyhYZe6(?VO$+Wf2eo&x$Lt)1G7amLu)&PbrFdF~>

diff --git a/upload/html/mime_types/win_player.gif b/upload/html/mime_types/win_player.gif
deleted file mode 100644
index 2d08f6a6da6a4ed55e36dbe606b9998e52a45b66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmZ?wbhEHb6krfw*vtR||Nk>|baXH<bO2eqckgDHITOeP690h`4FCTzGJ#b=3B{i*
ztRf8D3_2h_$P5OSI0Mzjz6loIj$M`w(>Ps=G}?r^mSrluVmPz9q~bUyk7I*^Y2(5L
zw;7$cwj?RsR!!@4FiK3|o42GPVb;Rjop)Ut-NYD~{J%{8>f&)V{aRVHhR5O}{eXhR
M&nFXdI0YH30SzEK=Kufz

diff --git a/upload/html/mime_types/word.gif b/upload/html/mime_types/word.gif
deleted file mode 100644
index 09d9b91bf9928f3939e20525168122ca80cb58fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 170
zcmZ?wbhEHb6krfw*vtR|ckkXco|(pwmS)UgynFZV|NsBboH>)h*f<R+Vr=}6kqN8{
zN+|whVHIKEX3zogL1r+pgkO+wSiQ99)P~)h4I*r=4zp4VT5i2uw%S9?#8;r?P+w-D
z@UjT)Qf`LO-81>0pMGn1`hK8=mQb_j%C}(`Iv1=k`1D&SShR~VYHr+n7G{<hx%r#b
LrteW<Vz34PqVhSG

diff --git a/upload/html/mime_types/zip.gif b/upload/html/mime_types/zip.gif
deleted file mode 100644
index 68a22d6d412a97377c3540e224db562cb7409a3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmZ?wbhEHb6krfw*v!wMdG6f*|L^~wn{sXn!~g&17z{Q4|DVDz<=p>s$v}c3dCLED
zK#~9d8K6M%CkrD313!Zfhz~M@fhGCF$(O5iKX3gz$BLang?*VMQ&7a3NeR(9#eR=6
zc!UKsHtB4?wRWNMhnoEhd^cMwHO@^<PIs_b=)|l4^*8U7!*S(?Kit~alpIYxRpFo%
dWPRE5{L6RD^WGK8{Nk$S=c=u5;TL4E1^|~3OlSZA

diff --git a/upload/html/sys-img/acp_check.gif b/upload/html/sys-img/acp_check.gif
deleted file mode 100644
index 807ebce1fc588bb327968bce251665b7bdf07474..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmZ?wbhEHb6krfwc*ekR|JnO{Pv4!sbo=g;x3?a?+P?4j)jLnG-+O-h(d(NJUfy~9
z=EC&{8@3-<H+Sio%Xc0zFg$j3yL{{Mnz>6aFf$)Jd+ov6&3pLxA8pvSIyn4;w9NDV
zDF=Ed-+%P_VE3eV#>THqP2ZMRU1wm}#KLm7d%`tl=6lm-T{Jb@E3a_w>b=+X&1bLN
zJ=oH<b<fcqEG&m7PJiI!bm-)zy9^9FJ11Pb`|PH=`XL5}lOm$)T6@l%ymT)sXUFa%
zXBimIU%P)vQ1Hh67yIQD?i@Mu;K9p#SMOf*^f}DJvS#U8h9LzMf3kqxs{<lIal*h}
z(!kKv+|t_C-qGf$$-&&&tRSgn*Uum&$FIlD*e25?E^laN#KhGqs?6dfplC0|s<EtD
zRo}$IQbpaBm5FmslY_Ihu$rwHFDoBQE2FWji>a=;4%6u~9D>?P5<DXNIvCldtqj=q
UKVY|E>zm5R{Cw)iPmK)L0KkW(2mk;8

diff --git a/upload/html/sys-img/ad-logo.jpg b/upload/html/sys-img/ad-logo.jpg
deleted file mode 100644
index 67ea52d8180fea39f465a073118525321d22c487..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8948
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

diff --git a/upload/html/sys-img/colours.html b/upload/html/sys-img/colours.html
deleted file mode 100644
index 60c146d8..00000000
--- a/upload/html/sys-img/colours.html
+++ /dev/null
@@ -1 +0,0 @@
-<head>
<title>Invision Power Board Colour Picker</title>
<script language="JavaScript" type='text/javascript'>

var theColour = "";

function showColor(val) {
    document.colorform.hexval.value = val;
    theColour = val;
    document.all.HEX.style.backgroundColor = val;
    
}
function keepColor() {
    document.colorform.keepcolour.value = theColour;
}

</script>
</head>

<body bgcolor='#FFFFFF'>
<font face='arial' size='2' color='#000000'>
<center>
<form name="colorform">
<b>Invision Power Board Color Picker<br><br>Simply roll your mouse over the desired colour to get the Hex value and a colour preview
<br>
<map name="colmap">
<area shape="rect" coords="1,1,7,10" onMouseOut="javascript:showColor('')"  onMouseOver="javascript:showColor('#00FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,1,15,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,1,23,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,1,31,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,1,39,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,1,47,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,1,55,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,1,63,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,1,71,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,1,79,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,1,87,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,1,95,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,1,103,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,1,111,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,1,119,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,1,127,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,1,135,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,1,143,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,1,151,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,1,159,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,1,167,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,1,175,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,1,183,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,1,191,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,1,199,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,1,207,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,1,215,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,1,223,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,1,231,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,1,239,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,1,247,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,1,255,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,1,263,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,1,271,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,1,279,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,1,287,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,12,7,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,12,15,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,12,23,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,12,31,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,12,39,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,12,47,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,12,55,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,12,63,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,12,71,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,12,79,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,12,87,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,12,95,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,12,103,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,12,111,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,12,119,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,12,127,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,12,135,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,12,143,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,12,151,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,12,159,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,12,167,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,12,175,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,12,183,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,12,191,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,12,199,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,12,207,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,12,215,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,12,223,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,12,231,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,12,239,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,12,247,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,12,255,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,12,263,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,12,271,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,12,279,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,12,287,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,23,7,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009900')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,23,15,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009933')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,23,23,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009966')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,23,31,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009999')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,23,39,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0099CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,23,47,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0099FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,23,55,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339900')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,23,63,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339933')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,23,71,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339966')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,23,79,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339999')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,23,87,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3399CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,23,95,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3399FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,23,103,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669900')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,23,111,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669933')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,23,119,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669966')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,23,127,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669999')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,23,135,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6699CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,23,143,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6699FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,23,151,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999900')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,23,159,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999933')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,23,167,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999966')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,23,175,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999999')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,23,183,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9999CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,23,191,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9999FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,23,199,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9900')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,23,207,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9933')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,23,215,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9966')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,23,223,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9999')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,23,231,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC99CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,23,239,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC99FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,23,247,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9900')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,23,255,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9933')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,23,263,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9966')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,23,271,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9999')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,23,279,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF99CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,23,287,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF99FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,34,7,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006600')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,34,15,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006633')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,34,23,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006666')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,34,31,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006699')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,34,39,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0066CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,34,47,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0066FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,34,55,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336600')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,34,63,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336633')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,34,71,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336666')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,34,79,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336699')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,34,87,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3366CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,34,95,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3366FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,34,103,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666600')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,34,111,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666633')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,34,119,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666666')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,34,127,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666699')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,34,135,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6666CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,34,143,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6666FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,34,151,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996600')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,34,159,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996633')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,34,167,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996666')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,34,175,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996699')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,34,183,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9966CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,34,191,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9966FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,34,199,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6600')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,34,207,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6633')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,34,215,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6666')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,34,223,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6699')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,34,231,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC66CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,34,239,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC66FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,34,247,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6600')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,34,255,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6633')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,34,263,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6666')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,34,271,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6699')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,34,279,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF66CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,34,287,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF66FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,45,7,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003300')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,45,15,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003333')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,45,23,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003366')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,45,31,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003399')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,45,39,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0033CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,45,47,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0033FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,45,55,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333300')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,45,63,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333333')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,45,71,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333366')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,45,79,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333399')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,45,87,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3333CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,45,95,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3333FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,45,103,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663300')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,45,111,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663333')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,45,119,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663366')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,45,127,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663399')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,45,135,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6633CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,45,143,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6633FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,45,151,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993300')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,45,159,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993333')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,45,167,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993366')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,45,175,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993399')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,45,183,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9933CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,45,191,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9933FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,45,199,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3300')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,45,207,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3333')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,45,215,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3366')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,45,223,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3399')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,45,231,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC33CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,45,239,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC33FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,45,247,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3300')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,45,255,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3333')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,45,263,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3366')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,45,271,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3399')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,45,279,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF33CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,45,287,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF33FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,56,7,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000000')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,56,15,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000033')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,56,23,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000066')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,56,31,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000099')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,56,39,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0000CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,56,47,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0000FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,56,55,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330000')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,56,63,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330033')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,56,71,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330066')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,56,79,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330099')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,56,87,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3300CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,56,95,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3300FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,56,103,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660000')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,56,111,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660033')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,56,119,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660066')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,56,127,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660099')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,56,135,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6600CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,56,143,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6600FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,56,151,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990000')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,56,159,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990033')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,56,167,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990066')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,56,175,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990099')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,56,183,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9900CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,56,191,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9900FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,56,199,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0000')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,56,207,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0033')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,56,215,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0066')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,56,223,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0099')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,56,231,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC00CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,56,239,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC00FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,56,247,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0000')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,56,255,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0033')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,56,263,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0066')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,56,271,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0099')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,56,279,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF00CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,56,287,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF00FF')" onClick="javascript:keepColor()">
</map><br><br>
<a><img usemap="#colmap" src="colours.gif" border=0 width=289 height=67></a>
<br>
<br>
The Hexidecimal Value<br><br>
<input type='text' name='hexval' size=15 readonly='readonly' style='border:0px;font-family:verdana;font-size:12pt;font-weight:bold'>
<br><br>
Colour Preview
<br>
<input type='text' name='style' size=30 readonly id='HEX' style='border:0px;font-size:20pt'>
<br><br><br>
Clicking on any of the colour segments enters the Hex value here
<br><br>
<input type='text' name='keepcolour' size=15 readonly>
</form>
</center>
</body>
</html>
\ No newline at end of file
diff --git a/upload/html/sys-img/ipshosting.gif b/upload/html/sys-img/ipshosting.gif
deleted file mode 100644
index 510239976ce6f0f6c6532965a6cf33f04a5fa183..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16358
zcmWk!by$;c7k*c4^ayEWQj#*H)6s~aqmdll2m(r}?}CsLm6ULFiU^2=vC-|2RKgJ=
zD*gm95K%tA=Z|w;&!6W$=RD7K?)$blYp$*1{Q#l|`~(19hXjL*X;$I)tRqX^Q=gYM
zy>Pttcw%Oyr2c6W^_)jqznTB-#nr8MTidDm4Gy6h5tMRQO2^l4KjO#{W&v4~vv0!_
zLT%$}${!8jJa0zVe{Ag;?x0VeJ{$UVRNB}((<~r2j96M;gpbZ_EU0L;49++9zFFBm
zVjh&|kksTtY&E!;Ty*z>@15}rG39=DXEKT(U5Ks5d6K*Pr=~jf3@(Dc(HTaBl%}rH
z*DLSzU6Oi7=jz(}Gj4~)XH@wnl~_ko>wBiO?XM)X{d`P+scsV)l~#kl(j0fU-RVZl
z-O4VH=)0C7h30Mv=7BjO#mjiV_>k*GQ*SoTxTiQ>f9OMMD6HxrWDZ+~-m?fQbdO4n
zO)0&0=K*73t#9J>`%gPpb6W6MYOKOa@Uc~uO<i{Jb$j3U?W67m#NACPdUTQ0o>~6X
z349otQh6b^;zCTNeL}<e=nBWkobgwS9tjni_?X~(vuDHdC)+jb66&lkm0hab&~+lJ
znE8(}7J?G<4c&<6qwk;fA)SjTODgI)7g0>Q*XfYdU>%edp3&lv&|n!{M9gam0I7Cy
zEmr<%XTz#&E?0!5H990cwNGdxT(2CPdTs2JW9WV}A-mr1O1A5jqLInDU`kzVcJsa3
zF563YErRcQ#Fq{-R_;ISwTY^4cruh*_TWnMPJTVj)Gx#4a@osy=9SdzwpTjd^qlG$
zd4032(>k(P-}#1#-|hLu)idsyq0yej4@YiQ(``a-*~Zm9eE!Pudb8v8CKI2VTDDhf
z%013S6jeW&@V;8;cB3KkMxH}rW6u5d=Z!cM-|X{Yw``)yqjDZA84(impS)V!oL+iw
zA4E3w%jzDQ&!avx@y#*uO$TpPDV}j(qn|oDI&!>H=5>jJ56{<kPC0rdZlBnw=S;S}
zT5F%!pzo4=KDzR3Xt6Wc9au1B9#|Gu_BOEawNDOX^yR$m)hfqp4;-&GJKbouiK3p1
zq;^yr4YiwH^m8$^zkD{d(8@pO;gde+_)6N)^up5m`Ov#3e!+qNAEp0?|IY+~Is#Hr
zVx7%YItk9J;6B_^-j|A&vMRBBR56etq!zL?{HSv17RDr9jCCq+<nBki2J2rBs>cej
zzM~~)+iE6?wWB{SjkMLiypJQZiCeYTO;xI2sBo`84NlkME3Hbc9yiQ3y0nEXk3Mdk
ze@N&{7eCk0^tvsm@x1Gpz@5b>5#b}H=bkjXTL<s4(E1BPyq?*rP7JWSsCe}TBHm6k
zE(ol(Bnb-6CG3A%A4&Y&8qWUn!Sc)4(tJ^ygAZ)4-Z|mSN?qHv4U_uwq8r|P`?Szz
z_Jm7G3)i*S>I@5fkdVAPT{W<rt^E7v4iK}OPgd^PzqBx(=lk%yp2DZv`KX?w6~hDd
z$l2)NTEhsj$5%Eh-y$!Cjs1-OK3Sl6>*3qrtyj!<HKI4xrrzgX?@AUdx%M*l$(yVD
zzupTuv9VcrTwb6Ly$Qn42E0vXyiT4>lg{^9yD58}x|Xigu}^eA=0Jl1NU;`JSieIg
zAT>O*4~D7o(k-&|X(>3aMN7s@SkgwPl*Bu98yUX10Rn){$21@;xZiS|E&YSbIz%6<
z;|j4<=z;^Nnc*Q7jT9P^Ta!y?vk+kD1e_T@v^(#6fS#gha_&UJBr=ySN=e;Zxe44I
z-rD!oF?w@Ry24VEae=?3sA3CpZfCU*vKST()Sf8gk&;UKCMT_`ad5=gD$P_X4=P%t
zYzf^vdrG)CTYupo_`&_Jm~0=Fk5Zc|YfX%I5X1g}^z8VR5m+r@QscqnM_H~PA?7g&
zC-2K*8l+U$He4W$zO4$`wSHfD*0>ur7yS|a{ezA7IzNAEEK7Gv1Zmdke7?6o{I{dr
zc;n409}~HXxRHK-=dfKF3BuQK@#=^@R;+FA!H7V$B#g#e{gw8po)*T4s^=X>f7L{R
zhnMT47u-Ke&@gy~T6;h0?gVes*^d)9X!wu3H`3gZd4HOcqQxy<EOARH`t2C8cr7L2
zUTP&Co?YMt)=frE);_&F>HAg;k>zbcw_Li&9zLjPE8&4WeeTK8pRXrv_>@iN-1tst
z1KP;zYD{kl8d6r+y2MCC+?VVR!D>M=SE4Cd91=#CJc#pQDSx77#ec$nXkJQX#(azg
zaPKsA<~fb(oxiTCeJW1<g9K7uh^c)PxAzDUFP-M%z`p%>_?6|Bh36yajPs5D?+acR
z#(pea{bHb8;0Hz{RnCCs^-eKBERWTtN;4kqz6(JTgD$6s1c+|7{Zw9k261eWHu%eG
z7D#gO4g^qd7>C|4WG)+QL2i~scLz|=U_z>U2O&?qS&eepSibsFIn{|NlF~0(G<PiO
zL0hf|kBvyzFvLH{r!<jNG$(0+%K6i_fw%eLwJ&`|$fGB#+({^sl@89c9&gzzEB%nw
zW``_ec!KMJKhB#I<5jP|dYYBrC{>H!l=;IO#=9LR;3SRtv;73IIdv-4NoYpXl7LXp
z+)cS`$wbnwnl0otJN&_V*Xt5)%82-0Nvo^a$`6962d(l{D@YnTbaEP%V3VsAj2Hjn
zQ;R-)@fXLJ$fV;3IF=$r4;oDt8EAUAbqk4d#|t(Wcji<Q6ueHY#5^$?&L(272fu<F
zvUO!4{XX+9H<o>GO*KGk?-emJWl^V8lkF~6aH}*Xb6S~^3}YU_{$L!C?Qu3%njpuk
zEgTPvCF#WZ7TA9?{bR#~!Eh=>=wjoh<{|TlLwOQRT@32ghAhApZUa=#g-y*@XK5i0
zm8Cr~DQd$xRg%<QSlX70vKWS;k{=?$Jz$R141xs;RXT9X^=kDMnJFKvhC#$mY8vjc
z%0%>)OUs?$CUkK7ek(@-!yrBn-yj<^j=a7w$YFjkmD9Xexl9d$fx5{LR6%gd;r*ym
z`J^Pe?Y<eRL{BUvS(nOFR4`m;cP^RR@%gyW*=2KywKu7T?Yu0k{2#YERx=Ij+VUhn
z;}mbZD%`YlfLcEebm_WjV;o+Ynf;w?mYguk;?m1|xgCN-9K5Kwr`BjzXCltx!ujIA
z%gy3<LEE2QZ#ZWh(Ke=)8Uj1k{zrDViY9VvB1+Fr*zMj0t1nyBTP40q&QIr9|EByW
z;JsT?i+#EDR>P%Z3KpvoCVa8OZ`cT%Tspd7^GE3q9389Ku3==pMeQc9KBwM|uD)(A
zIjBTaXHWKtt7LJ}cPyc+TnfsMQPOG=33q#5hA7!Kj<p33jUJ$Mcy}NP<A7>*;>x%D
zQHbi(*K)}H)@w1C-Xg*&<nD<xXJRzsuRkEKrE9UfQS&ZCCa4zTijcjpv)$M8PAcrm
ztFHxL&iE+(AogwIDu>t4`slE2>M+4`uY0{ON6&wuo4CFsV%LA2LH`PM=6oRgQg}{$
zCZ{}ferysVdaDPn9^MEnd0skt((^dQ@J8Z_{nMuQk8YogGw?nyH0h9agXZkBn5^}N
z=*MdKEqTVGs;Hk9>|i@m0&24+xgAr^Rb{8l)j0E=_ai^|vHnx<SsfI=8gWUt>}qD(
zUdXuvh^k#Ll2G{k*6u9%<?~pkuSpLDZA!19PSyv-f?3zbCnfeBrr7FCW$sLzDiw{<
zXc}6`0(@aYjuSMt<B*`=ciLdF086^BmfBUYyXoTM3bOfQYFOdC#7#4DTAS^=HC^VE
z@J`h4%<@S<kJi1X-YTn0n;f)jAKAKg8E<oz_H*=+Xzu1-b@f#08DxTJ6-G-d1K{Y~
z)o5Oh6FzBNwqnSfXJb8b*i(B*`<kz}_6~a^ULfH7-n~VA_IC7J!%`mit5=)G6h6BM
z=tN9-Ptw`Wl%Dccwp{!1y2YVZE~rxC!AsYeK9;;I2|V{`FAU{kM1P}pY-V3ax4fAV
zHbbdXqypjMzuG&c>jJe7Lf#GO_R$v8E{#!|&ubk(*sAXt1^o(~4*Qn3Zdzz^=77l|
z8u$~o+9+Zuwmr`|`KLDHS+FMXV!h!n`4|${eb^adlg%BRLn}=Fr2h7$-=!}c-t2Wt
z8Ey?>3`cZs63`(yGJhWm^N+I+)D{f!Xh*t=fXBk>lNbvj3xyn8dD}^6B1c0k`M)eP
zVw1Ycs=Qq*iYveDAAS6e1TTtB2uDq@n4KHA8HRlZ>+XOW&RXx~KPlnee|hHbrO6xj
z$hi0ORqn|hQ8dgIKfoca&qy4UHr?<b&p|#<0~{`<<T+&b6^|Yyczrgi4FkKZj%<^%
z`+E0k$yGnQz0;bG@qzq0#gSTK-@?9s(+c;6U8DMbMFQA7PgIai-7F|mNf75l6wCp+
z{2Gca780P&*)<MgfX|r@ZN)j&AhZKtw4-6+)eU|<jYxIeW2oJnDl(F?XyPEYfsA?w
zd^aTvre61MgWMfRJmYx1jf!>Na%Da?x`#F8C9t+hp<GR&3n$$x9bl*WZPrcg?xw1p
z=mc*|TVRiJ64nb66kD7P7LYeBJ<VkyxfCm7ETRB}eh<9iOucb1f8!4lDuFfJRrCF-
z#omV1>(*jlG}Cj_N;=Ey0n4?zPjipPg#79Y98pWYT^Susi=v={Tkg1G+Vw5eBE|cn
zShY1q`T{?<Ap&Dr&(J_h@1^}&RrOgDGb%z}Dz!!K<}R5V$d#6u){EG);H`qmYuVJs
z*oc~5|Nbt^c8hzE;3SM=p94`bh0-6S&gj^~>|2~^gdDGZWk<N7^Q>L`Cby`Au`X8c
z8qWGQ+!$zq4u69r4n)Q7p~QAh3*mgGhYhP+5x}53C-sh^FGBaq?NNKj0s{Peo36}J
z6=LMB^uNF2G$Df*cimI&v}k+|Ipz+m-!VVmbv^lVA%RolWO}7#`u-D?Q+%FFQC<cJ
zy{yR&VBiE+;N8i5WBhe{EJ6bSXc%}9JlIn{6+k1t*dzVr^Dl4Z+3p~1&=HaH`JTf0
zjtE10W?mcKk-Y_2Rb%JgLAufkSc>wE(Gj;th(WACEG;l8xZrAVzC>i91c3694vG1d
zS1=MdR+%rhmHsX;C$B3%T&M7!JS<b^Uc<$EtDEVbBkJV{Kw}4j0io<W5YH}s;}-pT
zXBdcOH>L%e;S2IdN@C)jCci<*@&)CyQCBV&MvN5Y{3sD~E-XFEE^(BTUt2_|aLjKI
zE?Sj!9e*8_!V1-~C?p1R3gcm|zmW6wMa3Tq01Rj5>ypUevWnR#iniO#*+MX<<n`<O
zZ6ibtupqj~IYNh>5=ZqC&X2rUawYzLVNp(L5yJU3m!xh53%)|uwZbK*LZQ1tDIJjk
zKu3Y#!1#P)8Hd1MkWm8XOnl`W%|e4MctnRC#8n#kn%TENn}c%B98{{mDUt&!H9|P$
z2zhdtvY-#?6te1R-O6&Zs>Qu3cM)ATDTjg<Kn`C$^NXs{0yT=x57DhsYtT@TbkJ_7
zR6Bqeh!|QQP+MK9EE;Om*@7*t%2QY?E}~1k-&DCpSBD<yRw~kJtrV&+0wpuTRbdB}
z+E(nN*qTvlgtI~wF}`N4t2$exE@QM>1E{;*2B;0?m9Rn8QtNVDt2A_Lt#u2VU8-tD
zYFtg&1Jes*bX9#_EALxrE1X8;i|G8-u8C`?*AuDj7pc2%Rd;?AuAo~XolqhBredkP
z!j1L*vWXj}1!%{)1?o1xV{5z!G{3WIR(w^T8ejNwqbWzrZBqK-&wI_7g9n@4DEU$N
zrw~pda%I3l)ke30!M)}SRu2_k)h|jluUolYq`?7pD0H#qT|+%gPgUn$^UsiGmd1y7
zMILSGwv;A39Bp~jX4Wivjvd2%DBs<T95X<NJ`z1DuAIwhRXpt`M|g0G?Y``%R%!Nh
zmfyu{$o4NGHBRzvYgWxV><`;x3;%B2(oJO5XKy<^D0X4LuXLw*_rTg~tYwtZ{<iXA
z2L93h!K0rEkKlR_WkYK$6d#&qG^?|B9A`K5U~e=mu2@j0coS0b9^FaO>!c`lT2u3!
z;yay#AEYOCq=vSv9aK%i(=VQVl!2`eWUI(Z>~INw@E$~Dg?43Rbmfk9X5gXkL)!Vr
z;B|WK_UWBvzq_m>YueqQ=Q6q;SoNqs>7<VJJWI^0I@d+Z==q({Rg~C4{@vpm+|_k1
zy4|gvIt)(<ecHR&HTtP7RrKjaLQln~&e!L<UmO*66}d$_-9(T@yWcN%zjJ+-me~D1
zp=N3E`8(0h`JS$G=Xy4~pUHqd*u-a}Ze3}5trx7ieqlSWEppv(tMF-|aV*ie4rypH
zI(rgV+ajw_4qI_fvlN3>4i9~$NXLlv`b2UCGFfA=)$cKY54D%untrl{Mf{L1H4azN
zuRg8R%kK{D5bZ=;(+M>C@gy!ueR^tRpO${VWoAGB(>ytRUk0s@LkUnS>F3z)!zJ}|
ziFFbpp)u&^M%Dw$)_vH+{u3pA=1Tnpv0f;xI~0VtW()>54e~FsmZAG1l~`1Ah7znL
zlQOxY#D?DEp_MzQwW*Se3`F8goAHrYXJf`7zxAV(p6*v;!#Vo&vKCGuW~;&CFsX;u
zmN<NGo8FWGO%1E5;26nuA1QmvV#i>8AwP0jY&f-KSfXU~w*F`+1JUdbz3M(tuRn4z
zY>e}8_^$Ohe+Kj^12IkIpeEI{EDh7$JL@yM+qN5Bltyfxa!OG-JV4m<?vV!fffDPH
z40mX?SRY@~Skoe_9h&{261`(-?1@sR3<#+<9$Qx$DNTC*Qh%f+6KdDOISoK%n6!ka
zL)Y{r$t?_yWd_$D23mZIjA8ke!?uWnYhX~$vn*?UY#@W>d_!L#b9B<39*BM}heJv+
z2E<EVl@dmc$Kg_7l<SdNhZNANyG^InbI5{~D=qY&x|~JbfRsU3yWXpSQ8>H%%S8fQ
z0?TP?^XjR7Z`Jk`CVW%|Kl9>dcPSPch-?0_J;P3&d7s1GR6JeRI4fQ<&7aYILHCs$
zb6AF>H86c<;|*ew(BRtxlt#V^jGTVKI`oS<_wrm%DPw@0Htw`sWdC`@<In7dNTv94
zW5v!ZagHJ4(!5+2G}2>E&!(lgsW0$gVO@8+idjVroeTOrR|Za->yKWVpa*b5<FZO*
zv79lqS1%i1?<CH>w?e8s1HfxF3d;lQ>GMyrpgs%+vUG^`0fSe3`PCnW4+!NTu(VNO
zZ5U(~g9SWl;q=1E1nj^@nVg<@g#a4DcMNrE3voo{&}OKrG3wtx;|yS+p6f2Cc>o%~
z%GKz%N0GzRICd`@P(RFO55P_h14ofeVJiFg(v?x{w9_z?ok=fnS3rX(o=L=WD>^%{
zvSzcgnYHrqGiTf%BNYdQa4Ltv82cM*_D3z8nfSFI4_4H&AiY^5<A;a<20}1mPT-G`
z1mW(nX7(zEs%{G>s%*pAA8zuT^AU3m@vi}!IRXeQ5;TO}bJk<os9F9Mt%w?8A`8Sr
z;n5D{2L~k45dxxD_r>R>!cd?8to-HN(4E*2&e_lke<=m7iSx0`GE@=FVi{mv>Ik#0
zexCh@yFzXFUEQ*EgTL#D;<ZI8><oT2i^}oia3fW}<NnHrYGb%_>{|)+TjG;?PXdc0
z0{Wh|H1TI?i;8Ub{M2#%Q)k(ye{bsSGtOgFm{oUObuS{R4`PpgYXv~&m67KNEF1vD
z)SvB43ug@#c3Tpe>&s@igYe3M2xdcnmx5gQ?Mu%&)3Bedc9xG}*(aM}C-9IWyv;E@
ztfqx?<oWiKJ%k}aJ9q~op2V`A%t69``5D1djOEl7TU*3!FA}zgo3{fnNYgx4T^w8w
zgGwQD+#*25msl4;m~hL-p@=VN6{LzOn=s*S74?GE4(zWdG={eE<>)!*<(x0SpK}K9
z0G7N6W9FweQ0Jwg_c83=Wx_;@7VI)!;WDUmi=fTL#F@5iECMh$3}pHGstaL?|I#i9
z>YM;i>$JeR`eBRLzt34AC%Hb){9XR>-&b)CsI@1ouy5+@3XADG*s&Kd4V;7N4zQ99
zJ<k2Lu?*sV9*)M|DT>sSd-zr9%MUpQ%6VW<hrm*l!#Zh*z;Q!z`q_*JHVWVFoM31S
z<F}_hKhHmZkNWS658=}`<Dgjr(jxJ@g&W@P^}FN7@6P+bySd>$z|R+kh$rGDYtcZ3
zzk)8~Kix>p;mDu5RG1D1V&SJS4+YrBz<r#;#<iN?%X`QpAb;?Jjv=VS-Li2E04ndo
z#F)Uumrt#CVG|Dzo5_GN`ZR+1S*8UzJGsZp{5!&pUi`Oh*!s{rV6h)DGu|mgE^)(-
z6YP&{dLeLb0J9)aJ&5GD#wGoFm1Ef_hL*8ga-y<O@^yvI|H4<8HiV0z!wOw^AfVjh
z_2Uap7ARu?(UHs`D!o5h2D8n@(Lv%ZF&!~6Z2;F>aN)j)rM9lciCf{9b8Wu2PjCz(
zb#qgImWl1`aPOOc@lGVxNo#bpWnCf;Y4ZZp;h59I3B^>S6+Fl5`f9T|*sU^^f>TU5
zpORuwZ#pU~&J`m3M9kfNL>ep3b?ky^`3pzxX&Iq_>ykDFU16Mk94!qwaSN?cljD=;
z?aHc(tAcquFDJmaUq8C=er5Uh)t#jQkU-dMxoIwx>4%ehYG6k-)-i_wm`?TMIvugn
zBAVMU5?;utu65~?6_QnZ*c%Br!Eh{on+soRe|D#H6RCzgl66qOLY8EN<%gio1MP8+
z{s9i@U1O?d5UoOX^EWCv2~Qg#hUd#QnU<3dMrvDu!itBy*f@nIxum5WTt%jF$n&g@
z*R&Vt(~IMl@VEs)*)KbU_TqxT>Bj5}9VZ6i69PeGvY<?k_w&||IcRHu{WLG>fYf%*
z(!X%{J(aD(k8M=Wz1=cp>@?rehe0t&9ijMuZI1`Q{1m&xDk}hnkKC`w^m)DnUFJE@
zTB?sj9e#6bNRc4m_;mkkYRd*(L#y+I-J@q?ojnu3=Ls96kF%mpg%)afewdoEsfZWl
zWzhq#X=BoLJBG*VmD8E4pv9bmHw}8FDdUky+P;q{QpA0m2<r~(ZC<4i1b~2(2Fftk
zy3==><98(otp;*GH@p?&(Z;3dG7e(uPn0Wq^JR#jNuFx*o@=k=c!apx5R*E!cVB;`
z1!PMnSIlfM%{{D;KE{KaAljPxh+_VukA-DDKgSswd~Yj|Tq*5hobo6@X%+4S=P~w{
zTkLaki+F|*e)CFm^2j=KR{%zn_uKw7OrRY5!HO;#h|~5t5rg-scyKbo36-rLuoa?;
z--6mbe2zBFQ5jy7>k=7f=+*tBg&GVgRn>E@@DPxg`}pgWiSxzAw%Iw$)ALEulX^c7
z_bkDEzK%Z~HwP%99o`7^ib9=HcJ$BadY0-Rzt<o}LY<aS)=1~r4tar{Hs#rv_3-cV
zgwrNDB7Tf4^1$SGZ+CHmipS$=fOwN%UDd<)463O>Jm=n5d8635SiTq4B56D&bz%T5
zN>oZ9=TOWh5XStz@cJR$C8ID*^|%5Z!$u?t=bn<OpE~}V`h>FxD|_0$5X!@kN_)-^
zy%Df52=m)JO8(RJFlL&adHofRmK0+gc`Mz^FC?;=4YhVvA60gr;;)y*v7?iqO`SVV
zC;?Jv*StWl?>|h^-}C##9N2SxNT`H43a1($!%&ZZqfvSuo#GRV$>0`&5k;2(<ZspU
z&hGnl%Sz@cJ)guegi2uu;2oXkJM=CDp{u_+6+JEl=d0NzL#vFqg!gI4Oa_XtkcK)l
zjAKFHW|cw1(Dp$a+_^b7Ev$KYf>F|Y?JmGsk|_sNyAP$QnyiVnyPdTUp5~|@<<0~y
z3J;q?axtmPRd?>(%9O_Vfhei4UicBJCZNS!O$y_~_EdV1pFu&W66kzs4$@NMtY^<2
z*<EI}k^{Lzs3j8Zs}dOP)Z_i=3b9!*=ZI-6Ex$FaUbPBYg_$ZCUFJ&Ig0Qm#ezI3!
z*516)d|6>IIQ|z|Ua6e38=s>1`yxy|ukBV=5Deo<VsI1^?mk)Kgr`M`l6g18ruY$B
z&-S}DF}=6Z`$V%)VJrSLZ}ji5ei^lRM&c`9G~{=U*eRWt7S{CI<s};y{%+P)&b1Or
zSCXzrFa@fgLMqNZY4G_bDcbVAuN0P!v~IZ>H%c!!hwVKRq{`{vz6UXeQ^W-B5ha>x
z?~QHviJZP!#v|>ReJ|12>raS<YmrF{StiVzGts60o)p*K);ctIY8Igc93jeaL_R$J
z;z`phA}{u7>H<v4`1y6%i=8mP8@DZA>CQDu+z~_P7QP;K{n1)3XCz0^%j2b8X}h@{
z=69{<wbP(LdqHVB&?E<t5A)lmBaK6m-iB)=r?wKu!9b}`j(iSUt?D9h-+1qo*=1ZS
z#<e-Nme_3?qQ!q_tmOFLZwoUdr;e7{rc1t|ck$YqJrlDg(wnwv*2)Bt>Ss-SrlL!T
zk{>Lxgyv|q<YljgpHF)Hu~{IN`=>};d$k8G;X8BLTiJy!o7NJ-H{yLVmx{&-^<V94
z6ef4t^+3%pU6J~<`op-OwZ`UiV3g>(=^K~Muhn0CFD$L{Zukz|KEgD4{b>N?EQCi@
zsh9H}B>5`^UL14Kw2=OW0c01XC7?p4MeI=l>g*VaLXqgA+3^6#Q{l<WPG3EXR^Mn3
z2~Rl9^kLTYQHlbRlc527h2O0M4Jy0PV41}xwj@wjrE3hwEU!S=1ev^etx|NVf5Uhv
z!xm!~m%-9@A0D}>vDiQ3m%lE$g4Q*4b7hbxEgtMGeOPafAHU46)Dlqo9_O1dzRA~C
zMMP}cnCQNIJlI}kQroX1S}>o$L}+O8tmZ8EO+V(^Ygj+@Rw292`~qU?ol8IZwdwLU
zb9vnVow;QXJLvR2|D^S$b*Ocb>q?epYF_D*v;4XEG1$rdqx`poY`wjUx_boezOKs1
z0KZeKujt3BAE4mw6XaJyTB(gaVyqq?cs4|w_w^%XqCRY`_THD;9u|Kd70{k^OW;M^
zsLJunbf^)4;Vr9Gb&s|x__Zb*czMV-a_6S6*v5EdT%YpuowU%1wL`;$A(Q5=T(80n
ztuOoZMT2j5)jZbK-*-0NejZgF7}27O<UtKC1;%^re~^9YIQ9DPMOhB$dh|o>`;O;h
z=m|^jtnVkj=jHn0akgX!J@3wZ@RV!V!jNfu+~l3|jrj3E&%NT8PaD_KY4IEcU=L*~
z4TZp`8uigpaj;E~Yw>M;&%c+{{@I)`Oq^f$+$*~U`xJF_bfCJk^0VhizfWp4aoO!J
zCo%HU9V9yK^^5ZT3JKaM@#U{i=ia`^`tRDV=(TI_PQLg-pa1h&PvZAv;?e%v$)nA6
z@V#-S=XzD3!7uv5!=Eo*zj1i|`La$pSn)mcS<P^x&+uEL!CvFD;k!>q>_KcC4wZ>x
zEy1xh(b$s6ra4e~X3BmsGKiU+#6-xWL5Rx}Qsrq@eIq3@?pRf;mYnv7MyND1^-J_)
zg+!WG9Vw7%G}qIL%p__rums6bzD%EXE=CG(u<*J+5ln({!|Coh(6d6%wD#$hWO_U^
z`GgW(+Y%l$jF8ME3pBL~ni>g+^%47MDw${aILJrGV(6!<T8~0I8NX@ROo-z6={C0}
zh9X>fo3{ALSX$`W@ux;wF~)i&NY(K^<zk$=x(Ui1HynyXw&Tt{HMPzp#)HX!(vmkv
zQ^Rwh{+-2}u8$a^1`PTBO1Gwu>(BrDea2$C`?}kJeVF>osZIz3=I~8r#!cr)1b}E0
z!*}4a*i#>iQ?DmJ_FiDY;#;Ro49voM<AqW*EL+bnzF7Y~;I0Js{zj3W9+=?+@$P`s
zE_{Ti&soph!hYyT6imt?g$FfHnUKP@A>5(rDShUiVFR%<W@geR0|^7M?p@B?1{R^(
zvKjCMeImbGua0|Xn7-MsyOvY1mhdgo5k9TbVEeht_<)mNry|Kh8)|W!WD)8&bQJwC
zV|+M1sMqV8*-cY(ef|D|7_)5sVaZI~S@%@Mt+V&HN1{+x<ziM9N>-KnR+UL)NMu_0
z4#_K$gzvNz2D7}V%I-o4&m1@eNAj*C8PgE%Xi!0jMH)*NN~1K6kJ^i-xHHT;lql}n
z5ECI|*-Y5K(ml?Fcklzx)G3eD;UPlF8bWFjXgVLh_eE6-UuUuK0!2+5A}@q6k%P-N
zLE}mwwkX6|;Bm|L!%7%5B!;AsbFOKFW{e}*(#F*4C}T0!!@1*cx`##4JW?pc=(v$f
z4m4zol2k|W#=`Mxlq37~)E?{Pp8C=KN(&A=i@7#LS`Ka^ga|=T8p~PBYg<1$oS?bG
zc&*Ldg;*5VtgeISLkcJD*GCnEfNzKAT!xc*OOOfu5V0K+eOuiGMC@(1%jJ?Bgw#6p
zA)aW^3eYgemp*5Zwc}En9bPtDThsM5BIG7}x*%*WFiz`a{0=3W4kEN+eH%D~Iw(|w
z!7Btfucvx<p6@@LV9r>Inc5zkI4_N|ZB?QiZ6M&{<nkrh@y}ED4@W#ub|=K`B$e%?
z3|>i!BL%T=B8^?AGbI>bDiX&p+?mqzffOwa$?+ckLj_8<D8?=b!8BM<=de;N319U9
zA459oQH9CNO%1H|f5no=DHgVJx730%!U<sXO$3{EL60{WER<s~K#cYVB?t&L8lWOH
zXq*NUw4|71HHPn#6d&7Iih~)4$(kAhDv_iPAp{4Od@6`?_SviGRgxD@qB;o1Hk=wS
z$D)Rry|@fFR=yR!MZpUt8)S(KN0RJe<Zw)~`a+5@dcw+P_RO<k1M!(Z%;|6!vYrsA
z`mWy!g)rnqc(<pA(}0s(gO$SO2L8Z*90uN>9jAZI8E6P_Fy>;HS;X*&MLGlzIB+$9
zqAe4_euI(UDN&#8Pcj{YmRWFUo`?a65EJ8+1HmoZvuVQ;Ju;K7Ib1KCJvvqBi0^dd
zTAPTEBn#EKxN5-gLF|eAPKoW}o`rKlLdX-JZ6*Fpm6_TVm0rBZNsedEB56E+F4);A
zi254I`x(SEGEEeCs989xSx8igo1Mx?jyUF8;V3SbXS1+RY)CS^j-Bfu&3l1DTy`W;
zEU6}!XaT5DZO9^WPN&drDmjp0mt*u1O5_^~FDE=ACi6%Y=218iPWX2<m@OJ@2jIS{
zkP;dsp9BaOW{6;%aB_3dpwhv}*(4!QL7T{v1KA>innL;3LQZ_BB@1mq9KqFl8Nx~c
zEwB*7$8{<M@THmCV}CcCoSPHil;Zo!!G$I6ore=j>S%$1kP;>aV|k?rZfvD<5bfnD
zK*a+u&RkCMPeX9zKy+L<R`#K$s73EQVt%<KK^*j#_FS*_ShOik7WY6|!R!`X2jlp~
z)0W$pQyza_`SQn6aw9ohh$y<{F1F>)1yEkfAgr@sf8Kc=9dqNrCqw8UW7g9Vl?-7_
z<;T7@0AH6W!8lh4T>lZc{}RwYnAl-gwc$JA!w|2J7x$0d){Jyp0N|2Xn9Kr^4F{@V
zNM40=*EFDlD=8u<_iqS_1%wis!_=k@y&`(@300=noji)qebZGo6X~{O2|IN_l8A&#
zK6OLo+)U1c6z<F^n@jAMz6#%$Ie8j!^yXroI#xhFojOttynB}%t(uLt%qj?CW%+uM
zR1NU{b7e8Jq$6$`Wh)#JvqBlG#`{nwIj1Kftim}E9wH#Hxkw6OWt%`A@jA^ieOc~o
zgj>oiFsaQn&vPskRPS2|+FYu|PhZnlf72Jhq*$ErXM(wM`K4#g-$7ojLBJu=w2c8v
zPVt4ZU^I{d3-E3R<pmahh+`b(h?YV~t_~*qAVGULAbcet;=h1Pe*+>`lC_4DjgGq?
z^L!g_37b1{^Vb7!^6M09ERnYpdpU&|dx~{Aj<O=O7R>OAt|NtG5x@f4CkNsY>FZNR
zoYX+1?L!|dq$t;sWz$GU@gzTd3TT14kH)d9Xm2w3%u#XWDuhy>Wa5r8TwZxy@Go&E
z3i#8RRo%HF9tWQNkmZzTaak5&RCsH8cpb`k{}PlWalV~?$9n1V7SWR=N4u?zCf#ff
zdcz>j=e_5x>Uc!}=U=n@>zu9I<Y54AADKDR2~obT;q4z(9{?hUZ!T|z++h^`tOIbJ
z#I^^JSHRoze1qw1p(BM^DFMJMCO`*spPb5c%fBDK1F5YE`t>Z-u_i_AwJX<Fu<s=D
z1Gp`dvt9OgX{}uHcRbl+As}>+sR#s48-AWX1rx*y=zu6O)#UYhqM$iN1q-taa*)}t
z{)2+tTu3>xz#|}A2G{F8FAAg`v2L0Bb1W1tsG`VTnlO7ByR)#AVgPWGE9j{lxV8_4
z6FyJMBzxfzQbk0GNEC|3BdHz0;2RX)sjrbn&@ZyEvMkLKIfXlk?*w>cK+t0MV+qJQ
z&ESUbtdXiE7RA7l9}vB=wJ%qswpVT?iGz+*i_iIhS{%HZ3A8f-BXr4s=h+M6BJJ?W
zdWET~g~%M$2;m?HF;u7unrWa6aFM{zCwAk7QnhevTLJgYH4uVG_#G5vOWr@p5rHq9
zg<=Jqun<;HgseXxd^IyYF0ug35>KUKBraP7-)#LulD?2pu0dAu`YKyMF_1wV`JP~5
zk#IT_psf}NsB7_E6NvVWVx9H=3K2p^bZiQ2MW6Yy7m127l87-@i7`3zFOq#gmJmGF
zgOL0$&r>vrs!#IH3S1=;C9|I#icc1{^m3vR8#&2Qg{f9T2pjH7b2)B%0>VBAB1TBo
zd;xl-!6FJF^wl!+!f&E@s1pczv<&f$j}_i0n)?H%I*A^)lJO{nu28a_N9+>})FTqg
zH(?ZXiQ<JPecd71<gDkrBjjmBnSkU_Dj>E6bu45NV`3KaAl8A&5<-<KmN2KS9K06M
zWs7v4;e8#naN3FO@=tatOgX<ra@kMz2RT(R&}fz2Q@NxgmmG-K)nj&b;gSoUzHg`f
zzPNjH2k|j{v^oL7PT1UYh?Lfh3Jv11pX?QMl_luAgr!4(3S3K$95sv+!wOivAo}Cu
z^Is4t$D+C7cJZ}fz!%D!>{zj#AVDGUOL}}fa>tvy(&Ca;Dw0yJ0#+0dH3`XYm*f1j
zh@n_VH9|tI*Gi9fvQtgGqxQZ=4nYuag?0JuqzMti+;qACI~;^4XOmB3VmO78dXM(b
zT!8dnNE+};8oZP=<aHP+l<J5E@tv@-7qG=v<+`vdV^5UXz|pb!B*wkD;#4x$C0Q?$
z^zv=e?2DB1M~9<c$*LfE*y7qreDcdLNxv%oQTMwtd@k46@Q5YkA3e*qH(!(Hk#pK8
zD?vH<_@yheFaJ2A$n0s5nM+sRbSEv>g7c|X47R_a%x|l24@Ya~go6Gq3LZ_&|9xY3
z%~AU*>lK)cGJNXiU#7(MMc(Ud%s=@63U}ICn`hHUute4Jc}urZIR(@!m%~T$T2=5l
z&O6k%x>V$3u&<7G%H>8?4&cj6@G)z5NQ0qrrAxwCDx);BL2l`yMu7VWUiF6XYbP9)
zl}+K|;F55(uUUbLj>0o3p3TWJ-&6fUcvAJbJi!NSfKG(-{6pJ<kc~n+T0_*T9izH&
z_0)<$!q1NnKK)c-(nyF~Vtj#)VuGjEjuyhg_;wo{lPSkU&_TNjLybP$Y+9!?{YGJu
z+-UQT)^}L{&0gW5PW(GZ;_1GBT%D*qUxP8L=rz6{TeyPd&ZyhJo`9`UgY@9=l5c*a
zjShYCe6o1o*S%8H0+=_O8)+jiZsm)w_nxA{?j+uNQ2N`Z6}Ggk(D%L5ccG<x{<+P^
z`3Q^$V@Z24%olzE)(MtkUrjir#Z^35gGR5?qKNFDmTd*DPL&I+#AzaUO*kSf1M;wj
zc~RaeJQv@wMsz3Jp<<lEQ9g;;e>(0*?k?Y66H?6QF$toX$+}~rI#siCOwVr~r-)iv
zu7=!L%@g!W9B7j%@JRS2Q|O&gbVQPj+$Q0p{WIGFghI<=H?@6-<DG>4tKQ2R56$@3
zl=!w6tq7$*+nv4`xg~soEg)s8ws@VwV=i_G8V#Aj&?2=ZH_Czo6K-YivebERS6H$Q
z6@I9z%ox3i_NZCu+ANA3{FTB^Zk2!UbMx2hpz`$Gu5&`|bKRj$k*5^uLej<d6dyKB
ze%PvIx3UVh@y&GosQuExuKsb4>2LemcCI(FcOz%2Q7vnKSwFYY2XFg{^_P8!cu>*1
z+vsg@8I~faF24{!jgtOH9z(f5y|4W;IJPO;J5U^0)RukjRN2HI5%cCtarYXV&j{Zm
z6*#ZtRp<NMOZqypvyZqn8vB9uXhC)LslJfDdxO~Ccy)s8-l*oM@iwoaT-CuazVwaO
zah1fmlE5MD@DneUYO!{uk;6+dY#Kw;UkUck&X31uJ$5Gb6ekfvV+yy_uXO21WyQWB
z8cej+$G#B^@;fo%7|muPAzYRG!=t65OjXN3ZOrZM)4lPOGaiF_?4BKtrGhSo`}6sW
zf3ii*9!h2e5z%i>ZVGs!>mpBO?q<KML#~;>&JonoxqG(Qkn45V3$;mR-mR=|_K2oz
zy`6I+4H^ZKp}1C02kj&MZ&T;a7<`{~yJ7I-b?5~HePds))8BW+Of1zDNoNcyDDd0E
zyNl;;1*uUu3S-$EnRiC@HV31Ru2s~-ZGWi#cyG8}jp3ol4W{=yu^1R}+Y0)4K*w^@
zFlZm5yb$v{+A-z$0-1##G@w8c%p`mxC?<<~b316Ua3!=HYmGa>=C9Vv?TG=Gi&r_^
z%Dd&@WR~MI{h#8}`i_T5N<;X)xXp#q&QNz^9|)~VK#6@kA0s*Rzj<T9!ZUHE7vjf5
zjd*+I237Ao$_&t#5}8_HZ?1lj6;Z{mvjx57NqHpr4D_9=k{#-tP4>UCv3}eh$ECe-
zf_viTy4XOc`Q@j+qEqN)#9HA{{%x{YJgQd{W!s@`b?3U`^!o8tqil9lUs2+)7u#37
zRZyMfop25r9c)+DFVoheThx*bkzXz&R-;qd^0W;#2f>l^y{EaKNy+fI?_`F<y%poP
zHpHqot#oT_Gk4_3nzVA8a9NyCD?^r(vdR*j2Pru-x~WOO4K#w&tRswo(@JL98u@Ca
zOqBVF1ST;ifr{)6N;aUcLToyz97<#uXL~#nWOHD@ib~ORi%JF8?C&3L(}5M$m#PW3
z<7W@$EKOW3Yy~QX8$XpUt6%L>?IfaG#!T4$T4wJbgOLQanIAuX%f3_A&XL^Yt|lGz
z>d|fthx#?7wZE&~#V`}Lt8(x&sHy4GjNIx$;jDjSRWkdGTzyK}?RcHS%)+vRfZc-m
zg;C9v8dp<+Q%6DOswv&mUmd@SGZs?pC_JdMnX!?+WJNfq@LbQ?3gPtI3JR-HBjIrs
zypGz{7gT`xl6)gx$`-}3IHYog<9(yygo&i|3H_?UZ<Wvf36OMKZg!?ou>i_U&tH|Q
z3hs$WGB!ip*t6$D__$eV$`_WfFZme)Vs8jUlqnXXvpo&tE5t=ts}fgQnWanuU7S)(
zVwdI@dr=s1=~Cq4vZqP$kj;OWi+?X|8WI3O5NTnSpZ)9A)#sAWRIU#R-BJ*v;R3Mz
z0O3)Vg0zolr4XRP@-$1O&|5UXk|H_^v?}Dj!gaX}sEIt~bQ$(J#;yrd=RM5CZTN^j
zs)HWEIQoI>9LzojbI3z^J4HWCUaZwRO0fAh8!TK(5XQ7fPE^Y94uf&@V!mqHaby`M
zEzobeAkrPjZ#ni?&;$0No&&EfVX;QXQW!gOHQQ^bf)m3HTc+uE5B(%-h5qTUgZ^T|
zC{58c5&7$pl)fm4?j^EF{zX_}Z3zKJuRyE**Nf_iBI&9BqVqLGrl;C6_><I+3l7&H
zLjcs=D=Kn&>$A##R1vLj0_cb6x*DC&!Qub$iH+0|75>Afu-AYyOd1&tV8~xW?jk?{
z&fcyAVgKfeGG^4EN?O>WlgoRG&!1!`J#!QOra9lk^6(*1d0Vd&Bj#(0=<GZ4cze)5
z{Rgd9_w<ARV%zkV&uX*qWUjHY6cV{o76wJ;S_mgCiIDSHywVkG&M1+O@I@>f5r9p{
zC#|w)(jd=Gyr~W`6?}`#0daHh6g_-j|D%6a=fBT5)4vq*G~he2E9JET((!P$1s25(
zAX+NMTeL!srYUrL$5xxplxoq2xj)Z3g$I~WZnGiZ-Cbcy?>~8;!pp%QGNpVMa>j)u
zOnUC?X_>TfCkOGG_x76R61b8{Fr72;-l39>+cK{-&;zkhrCMX=8b$2(#i<njj0)b1
zKl|sDC)pjVD%dN41MYMZv7*?8d6i~%-y&y?FKtigY|s<7wcYHam5+q^W5ly@{x-am
z(JOn_kKQZBL}uj<NwLaDLK=6Oi(Z-YQ0R#tv6qZIJ{c3CFzmcgcOz^`>&fvqPm{TP
z&isD!_W0}3l)iUk;t^4|5}y~oF#OT>kR-iv;uF@pe|Rw)CiXOmweuHZ+&_|B{`Le~
zQIbNwXq0ZF4&AK63}`;3rk8)AK)ndGzZ0N>`|CfdLI;m}HSoBKBI02<^og+DhzFS?
z%miU7j^qcBnM+Vjsse$gnMoUpqN{8fA5_0Rh!uw1fs(^}HJLP(VL&m=q^^sm7bm1R
zjGHMcQD7`W{!2;BGs2YQaU9~<FT?vaNJtTg1xKlw`q43j^eSgR_27{gCX@5_V<HFh
zK2NTg1w&L$T}Y7$^8WXhvxEMNzQkEVRfrLjJA?{`!B{B03b_!CBHJ#yNz^I?vjm#C
zn_U{g$x%!(4sP|kt7g{ynvX@;4@p>eoJt*_PxI7WB`VCUG_M|K-zqa$h49z)eyOJE
zq3+A31G?f~Uu}G3y60phi@zA%@3N8TbiDsPSVDQur^}X(P|s69BgFn13${QN{dxrp
zdo>Sf@D(Qf3X#umh5^z!2t~qvP=o-W(M$UWoJwbZw%Iaw(_2Bjl*aK&6FH`uu8`az
zW+RKnX-z<2XqxUAjSh%yB%uD$n78+crkS&>`Vn_<bDc!=g`iK!4+9*dm?zInFdQBN
z$A?vxa1-L|D#PB#<w)$P@->Yrfsj?+D|8k2KE^We*SnlwcKviS*KJ|Cu?SH>(~o0?
z##?B7PnZrF1%>bQYVb;nJa-qFlSVj{jdt>k;f;7{CUR{2{7XO_0*1)Fr!Z`cNt%AZ
zY7`nzvz2{kN9t2t>eGxRH_>6zR%?n&y~-{iALtCNdwYpUc3GQKwsbR4m$5!3qrC;n
z2KeZnxUZS~&Lv+)tGqh&SD9pqs8R(<sfH{fChH?x<8w;ZSF^_VQ~+--T`tT->X0Oe
zmt7T36Wa!-ZM;pWUV@Y(Qlba1I!NL`OTi0`5Gbf>3yIfV>cWzdjM9SO66k-AD25^l
zM$%OO8)UVlpDx)%jtV#mFQ_nm5$Hb69gwREq9_Dmi6Nds1&RiF|4{{b{0NAh^}vd9
zL1s<F*Uh{Sz1-@B3MiADPCDa{@t=4|;-=T7biT2LJdVG;dCGmKu|k%|EzOn!ZPh6P
z=Bt`jtBjknuhFkjhsL}e?-LUsf?MJk%SxLHZ(Hl2tCu&jCqSO6g~L*snmZ0%WqiEu
zf}}P2ggZmyJI?ctkBLV$a@e!hX6C^MFx^KcBLNg}mpMK|k6Sg8gZHYo7^!S{zuz4c
zFS(~HEaAj;<n{0aP2R3TX#=7kS)i%<A(qw1wc*`ef%;%fFjVe?;t~#%AmhUo;B6>-
zucrQ<LJgao@kv4vkpP;xED16(!!j7RKgITrtE%dKd9z}$VZiWUUY6fOaE20Da*QR$
z^kmS2W*ULWMwUJdz9YW~J|%-XE(iY9^wQUP0~pv6h|I<X$O<E%&~Zl!pC+mDGF>C7
z<VHA|Z+K31qk_MaLKhwu41)%Zt|BP5MI#|{)Y2QOy&7@UlP&{PVmawL22qmN@SprA
z!kv@fO4<^r%@I&JhNz;pN4bx11%34|PidK5zyCc2dH&=oomYAU-V-!0G|gy2%mm|i
zRFC@(p2PEpE#LE!m3*!Xd2d9NJmtoVr*H0lYC2`9m@DaYrH_+YhC=&Yk}sC*HxZ60
z;J`I;;2^pefyXDB+z`FJHPebQCKo(`V|BQq-nF9U`myIq#pmVE2tfxt`q@tyoz#ZN
zWdh<Z2wqEL^5M3^Q?eutCKdxdMF2+}DRNcDN+8q*q|ehQ^&B8Vk$ty@p;}Ew3TY%e
z%Ln!>q(5@X7dnA@8j*d&cs?5^g@^NgTrzVoR*?IAo&gamp<96@9%=|;803lRy>-~+
zSOS^<F=iIm%c^cHm5KXZlp%>WmQ+uxs)0(C5Y4~`qj_%k4apl$#?Nmak*pkgXYa5~
zL_imHiCaDoq(LL5RWBo-C~4WN7D>iBKzRwD#bcoF*23k&lv(tZZMM&yEFqr6r_XdW
zJ8IKq4*|H)z-iD(2HvYC<aAQsM3ui!Ervv~C028S0+@NYrAe4!0V4McT$}$_P5)1Y
zf_+!SFFT5W{yco#o1Sl^$l)djmP+RIi(BI^U&Pr_NMia00xlGUzTgva*fB8^#U&Ml
zJ^<;V2;@H8zjNs?ukz8sLlh8sp_{H+w>^6PzIY~<^%i!#3_IRHyJFy<+GX@fKQ#<~
z;eJjwbp9bbn62f{vK8a9)7c`OXB5@B^C2l)$;EspXO=VZ$lj=0>DUHQl-Z)i32^Dj
zMCtpJwcnBW3;8pFetCL?5Tyh?M6y)nzRI<AnD(1h<{0+XN9F|k0Crn$M|mzpv^XmD
zS@w>@B;UDa9==qG>6X236C4?;SDrrdaZwFa9==_b&Ea-zW0%C!Pmtp8m-onK24#yi
z0>^-IQ+JBzu~em)ui`Na?+JNPX<tuzImSQT)vKZ@d(y&`c7KTX2~k?DGB5Aw5B*C?
z=~8P{&gIC%%j8URp0Tezv#oMty-h@{4;NAGOf+jjB-~m}!?{hvOHDJdP1Cncq>dK+
z+TysFvC1%6MXdLfc<+gg+g{(GqJ@k9tkr6_$=CLe9CT|zmG-?K)wC1ixAoKPO7;14
z`^frAuk<B)-^E7ria|G8Ce@N>nK>|By>AHMo7_8S{x$kq^)c0=JwkGuj!KO52)XMK
zQH5r5R)VDZi{DhD*MQu@hN?f?2eax^GY!nr=V&*+J7M}zUAHpYqb0iQk<pnWgavoD
z#aNr|&vu#8whN!sq;`$Ts^Fxssc==aZnVvun7Xk<F9IIr_$m5$Bp2uTm=ln8ovX1s
zNso1$c`XF(*jnh`32izOB+H@4K4x5;DQ))i-(063k2Zk%kufqwv2I%Grt`5{Zy)<$
z@>IY`jWcTM7JH~mYW~h0{(;e2Z4g5#*?;)TY9Jr$GxyGgYIfJt)vrc(4SWyE=s5Qx
zCa6(KBk+e!Mn^zf2fpo!$_A0WaPU?qP5*&t@U3rQeLsS0e^|C@M%}-nRrw>RKr`g6
z=H=SrKnpOW)-C-0VtA;;*}l`4#z><38a*~zu{}R*DvR-{S7OLl;=S$%3tkOzjt*F~
zO(?h$w&;^6_#_AV{n{B#KW?Jmg&+RNPLNxhDA-Aq&<<!M>SOJW-<2nw(WY2*60b%_
XL{AD?246ncnQ}=xl{*dx0DAueleJNS

diff --git a/upload/html/sys-img/tile_back.gif b/upload/html/sys-img/tile_back.gif
deleted file mode 100644
index 1286a915b1487f14555cd16f5e89004500db80f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmZ?wbhEHbWMnX5IKlt||Ns9FDBTiLvpcfsP)x^(_@1+gedpu4PE~C9pE~tg%H%6a
z6E9}Wyqz=uVb+|x>C<my&%Kwo@NvP?=lM&XmaqR*w(dje+V>@^-xjZYU9|jV#m3J-
z1HlG^2*sZ)j0_Ai3_2hV$W8`UsRSh+mqrQp%^CrpUHV*nquOG_w!W=-|9`&#gEat5
Cct)uJ

diff --git a/upload/index.php b/upload/index.php
index a518f787..13d1616f 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -2,17 +2,19 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
+|   Invision Power Board v2.0.0 
 |   ========================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services
 |   http://www.invisionpower.com
 |   ========================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|   INVISION POWER BOARD IS NOT FREE SOFTWARE!
+|   http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > Wrapper script
@@ -28,31 +30,56 @@
 
 // Root path
 
-define( 'ROOT_PATH', "./" );
+define( 'ROOT_PATH'  , "./" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
 
 // Enable module usage?
 // (Vital for some mods and IPB enhancements)
 
 define ( 'USE_MODULES', 1 );
 
+// Enable shut down features?
+// Uses PHPs register_shutdown_function to save
+// low priority tasks until end of exec
+
+define ( 'USE_SHUTDOWN', 1 );
+
+// Enable custom error handling?
+// Useful to trap skin errors, etc
+
+define( 'CUSTOM_ERROR', 1 );
+
 //-----------------------------------------------
 // NO USER EDITABLE SECTIONS BELOW
 //-----------------------------------------------
 
 define ( 'IN_IPB', 1 );
- 
+define ( 'IN_DEV', 0 );
+
 error_reporting  (E_ERROR | E_WARNING | E_PARSE);
 set_magic_quotes_runtime(0);
 
-class Debug {
-    function startTimer() {
+if ( CUSTOM_ERROR )
+{
+	set_error_handler("my_error_handler");
+}
+
+//===========================================================================
+// DEBUG CLASS
+//===========================================================================
+
+class Debug
+{
+    function startTimer()
+    {
         global $starttime;
         $mtime = microtime ();
         $mtime = explode (' ', $mtime);
         $mtime = $mtime[1] + $mtime[0];
         $starttime = $mtime;
     }
-    function endTimer() {
+    function endTimer()
+    {
         global $starttime;
         $mtime = microtime ();
         $mtime = explode (' ', $mtime);
@@ -63,41 +90,45 @@ class Debug {
     }
 }
 
+//===========================================================================
+// INFO CLASS
+//===========================================================================
+
 class info {
 
-	var $member     = array();
-	var $input      = array();
-	var $session_id = "";
-	var $base_url   = "";
-	var $vars       = "";
-	var $skin_id    = "0";     // Skin Dir name
-	var $skin_rid   = "";      // Real skin id (numerical only)
-	var $lang_id    = "en";
-	var $skin       = "";
-	var $lang       = "";
-	var $server_load = 0;
-	var $version    = "v1.3.1 Final";
-	var $lastclick  = "";
-	var $location   = "";
-	var $debug_html = "";
-	var $perm_id    = "";
-	var $forum_read = array();
-	var $topic_cache = "";
+	var $member       = array();
+	var $input        = array();
+	var $session_id   = "";
+	var $base_url     = "";
+	var $vars         = "";
+	var $lang_id      = "en";
+	var $skin         = "";
+	var $lang         = "";
+	var $server_load  = 0;
+	var $version    = "v2.0.0 ";
+	var $lastclick    = "";
+	var $location     = "";
+	var $debug_html   = "";
+	var $perm_id      = "";
+	var $forum_read   = array();
+	var $topic_cache  = "";
 	var $session_type = "";
-
-	function info() {
+	var $skin_global  = "";
+	var $loaded_templates = array();
+	var $converge     = "";
+    
+	function info()
+	{
 		global $sess, $std, $DB, $INFO;
 		
 		$this->vars = &$INFO;
-		
-		$this->vars['TEAM_ICON_URL']   = $INFO['html_url'] . '/team_icons';
-		$this->vars['AVATARS_URL']     = $INFO['html_url'] . '/avatars';
-		$this->vars['EMOTICONS_URL']   = $INFO['html_url'] . '/emoticons';
-		$this->vars['mime_img']        = $INFO['html_url'] . '/mime_types';
-
 	}
 }
 
+//===========================================================================
+// MAIN PROGRAM
+//===========================================================================
+
 //--------------------------------
 // Import $INFO, now!
 //--------------------------------
@@ -113,24 +144,13 @@ require ROOT_PATH."conf_global.php";
 $Debug = new Debug;
 $Debug->startTimer();
 
-//--------------------------------
-// Require our global functions
-//--------------------------------
-
-require ROOT_PATH."sources/functions.php";
-
-$std   = new FUNC;
-$print = new display();
-$sess  = new session();
-
 //--------------------------------
 // Load the DB driver and such
 //--------------------------------
 
-$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mySQL' : $INFO['sql_driver'];
+$INFO['sql_driver'] = ! $INFO['sql_driver'] ? 'mysql' : strtolower($INFO['sql_driver']);
 
-$to_require = ROOT_PATH."sources/Drivers/".$INFO['sql_driver'].".php";
-require ($to_require);
+require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php" );
 
 $DB = new db_driver;
 
@@ -139,81 +159,258 @@ $DB->obj['sql_user']         = $INFO['sql_user'];
 $DB->obj['sql_pass']         = $INFO['sql_pass'];
 $DB->obj['sql_host']         = $INFO['sql_host'];
 $DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_queries.php';
+$DB->obj['use_shutdown']     = USE_SHUTDOWN;
 
-$DB->obj['debug']            = ($INFO['sql_debug'] == 1) ? $_GET['debug'] : 0;
+//-----------------------------------
+// Required vars?
+//-----------------------------------
 
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+	
+//--------------------------------
 // Get a DB connection
+//--------------------------------
 
 $DB->connect();
 
+//--------------------------------
+// Make CONSTANT
+//--------------------------------
+
+define( 'SQL_PREFIX', $DB->obj['sql_tbl_prefix'] );
+define( 'SQL_DRIVER', $INFO['sql_driver']        );
+
 //--------------------------------
 // Wrap it all up in a nice easy to
 // transport super class
 //--------------------------------
 
-$ibforums             = new info();
+$ibforums = new info();
+
+//--------------------------------
+// Require our global functions
+//--------------------------------
+
+require ROOT_PATH."sources/functions.php";
+require ROOT_PATH."sources/classes/class_display.php";
+require ROOT_PATH."sources/classes/class_session.php";
+require ROOT_PATH."sources/classes/class_forums.php";
+require KERNEL_PATH."class_converge.php";
+
+$std    = new FUNC;
+$print  = new display();
+$sess   = new session();
+$forums = new forum_functions();
 
 //--------------------------------
 //  Set up our vars
 //--------------------------------
 
-$ibforums->input      = $std->parse_incoming();
+$ibforums->input = $std->parse_incoming();
 
 //--------------------------------
-//  Short tags...
+//  Set converge
 //--------------------------------
 
+$ibforums->converge = new class_converge( $DB );
+
+//===========================================================================
+// Generate choice array
+//===========================================================================
+
+$choice = array(
+                 "idx"        => array( "boards"             , 'boards'       ,"'birthdays', 'calendar'," ),
+                 "sf"         => array( "forums"             , 'forums'       ,"'announcements', 'multimod'," ),
+                 "sr"         => array( "forums"             , 'forums'        ),
+                 "st"         => array( "topics"             , 'topics'       ,"'attachtypes','bbcode', 'multimod','ranks','profilefields'," ),
+                 "announce"   => array( "announcements"      , 'announcements',"'bbcode','badwords','emoticons','ranks','profilefields'," ),
+                 "login"      => array( "login"              , 'login'         ),
+                 "post"       => array( "post"               , 'post'         ,"'attachtypes','badwords','bbcode','emoticons'," ),
+                 "poll"       => array( "lib/add_poll"       , 'poll'          ),
+                 "reg"        => array( "register"           , 'register'      ),
+                 "online"     => array( "online"             , 'online'        ),
+                 "members"    => array( "memberlist"         , 'memberlist'   ,"'ranks','profilefields'," ),
+                 "help"       => array( "help"               , 'help'          ),
+                 "search"     => array( "search"             , 'search'       ,"'attachtypes','multimod','bbcode','ranks','profilefields'," ),
+                 "mod"        => array( "moderate"           , 'moderate'     ,"'attachtypes','multimod','bbcode','emoticons'," ),
+                 "print"      => array( "misc/print_page"    , 'printpage'    ,"'attachtypes','bbcode', 'multimod','ranks','profilefields'," ),
+                 "forward"    => array( "misc/forward_page"  , 'forwardpage'   ),
+                 "mail"       => array( "misc/contact_member", 'contactmember' ),
+                 "invite"     => array( "misc/contact_member", 'contactmember' ),
+                 "icq"        => array( "misc/contact_member", 'contactmember' ),
+                 "aol"        => array( "misc/contact_member", 'contactmember' ),
+                 "yahoo"      => array( "misc/contact_member", 'contactmember' ),
+                 "msn"        => array( "misc/contact_member", 'contactmember' ),
+                 "report"     => array( "misc/contact_member", 'contactmember' ),
+                 "chat"       => array( "misc/contact_member", 'contactmember' ),
+                 "integ"      => array( "misc/contact_member", 'contactmember' ),
+                 'boardrules' => array( "misc/contact_member", 'contactmember' ),
+                 "msg"        => array( "messenger"          , 'messenger'    ,"'profilefields','attachtypes','badwords','bbcode','emoticons'," ),
+                 "usercp"     => array( "usercp"             , 'usercp'       ,"'attachtypes','badwords','bbcode','emoticons'," ),
+                 "profile"    => array( "profile"            , 'profile'      ,"'ranks','profilefields','badwords','bbcode','emoticons',"),
+                 "track"      => array( "misc/tracker"       , 'tracker'       ),
+                 "stats"      => array( "misc/stats"         , 'stats'         ),
+                 "attach"     => array( "misc/attach"        , 'attach'       ,"'attachtypes'," ),
+                 'legends'    => array( 'misc/legends'       , 'legends'      ,"'badwords','bbcode'  ,'emoticons',"  ),
+                 'calendar'   => array( "calendar"           , 'calendar'      ),
+                 'buddy'      => array( "browsebuddy"        , 'assistant'     ),
+                 'mmod'       => array( "misc/multi_moderate", 'mmod'         ,"'multimod',"),
+                 'warn'       => array( "misc/warn"          , 'warn'         ,"'badwords','bbcode'  ,'emoticons',"  ),
+                 'home'       => array( 'ipbportal'          , 'ipdl'         ,"'attachtypes','bbcode', 'multimod','ranks','profilefields'," ),
+                 'module'     => array( 'modules'            , 'modules'       ),
+                 'toutline'   => array( 'topics_outline'     , 'toutline'      ),
+                 'task'       => array( 'taskloader'         , 'taskloader'    ),
+                 'findpost'   => array( 'findpost'           , 'findpost'      ),
+               );
+
+//---------------------------------------------------
+// Check to make sure the array key exits..
+//---------------------------------------------------
+
+$ibforums->input['_low_act'] = strtolower( $ibforums->input['act'] );
+
+if (! isset($choice[ $ibforums->input['_low_act'] ][0]) )
+{
+	$ibforums->input['act'] = 'idx';
+}
+
+//===========================================================================
+//  Short tags...
+//===========================================================================
+
 if ( $ibforums->input['showforum'] != "" )
 {
-	$ibforums->input['act'] = "SF";
+	$ibforums->input['act'] = "sf";
 	$ibforums->input['f']   = intval($ibforums->input['showforum']);
 }
 else if ( $ibforums->input['showtopic'] != "")
 {
-	$ibforums->input['act'] = "ST";
+	$ibforums->input['act'] = "st";
 	$ibforums->input['t']   = intval($ibforums->input['showtopic']);
 	
+	//---------------------------------------------------
 	// Grab and cache the topic now as we need the 'f' attr for
 	// the skins...
+	//---------------------------------------------------
 	
-	$DB->query("SELECT t.*, f.topic_mm_id, f.name as forum_name, f.quick_reply, f.id as forum_id, f.read_perms, f.reply_perms, f.parent_id, f.use_html,
-                       f.start_perms, f.allow_poll, f.password, f.posts as forum_posts, f.topics as forum_topics, f.upload_perms,
-                       f.show_rules, f.rules_text, f.rules_title,
-                       c.name as cat_name, c.id as cat_id
-                       FROM ibf_topics t, ibf_forums f , ibf_categories c
-                       WHERE t.tid=".$ibforums->input['t']." and f.id = t.forum_id and f.category=c.id");
+	$DB->simple_construct( array( 'select' => '*',
+								  'from'   => 'topics',
+								  'where'  => "tid=".$ibforums->input['t'],
+						)      );
+						
+	$DB->simple_exec();
                        
     $ibforums->topic_cache = $DB->fetch_row();
     $ibforums->input['f']  = $ibforums->topic_cache['forum_id'];
 }
 else if ( $ibforums->input['showuser'] != "")
 {
-	$ibforums->input['act'] = "Profile";
+	$ibforums->input['act'] = "profile";
 	$ibforums->input['MID'] = intval($ibforums->input['showuser']);
 }
+else if ( $ibforums->input['automodule'] != "" )
+{
+	$ibforums->input['act']    = 'module';
+	$ibforums->input['module'] = $ibforums->input['automodule'];
+}
 else
 {
 	$ibforums->input['act'] = $ibforums->input['act'] == '' ? "idx" : $ibforums->input['act'];
 }
 
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( ".$choice[ strtolower($ibforums->input['act']) ][2]."'banfilters', 'settings', 'group_cache', 'systemvars', 'skin_id_cache', 'forum_cache', 'moderators', 'stats', 'languages' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$ibforums->vars[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$ibforums->cache[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$ibforums->cache[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+if ( ! isset( $ibforums->cache['systemvars'] ) )
+{
+	$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key='systemvars'" ) );
+	$DB->do_insert( 'cache_store', array( 'cs_key' => 'systemvars', 'cs_value' => addslashes(serialize(array())), 'cs_array' => 1 ) );
+}
+
+//--------------------------------
+// Set debug mode
+//--------------------------------
+
+$DB->set_debug_mode( $ibforums->vars['sql_debug'] == 1 ? intval($_GET['debug']) : 0 );
+
+//--------------------------------
+//  Initialize the FUNC
+//--------------------------------
+
+$std->FUNC_init();
+
 //--------------------------------
 //  The rest :D
 //--------------------------------
 
 $ibforums->member     = $sess->authorise();
-$ibforums->skin       = $std->load_skin();
 $ibforums->lastclick  = $sess->last_click;
 $ibforums->location   = $sess->location;
-$ibforums->session_id = $sess->session_id;
+$ibforums->session_id = $sess->session_id; // Used in URLs
+$ibforums->my_session = $sess->session_id; // Used in code
+
+//--------------------------------
+//  Initialize the forums
+//--------------------------------
+
+$forums->strip_invisible = 1;
+$forums->forums_init();
+
+//--------------------------------
+// Load the skin
+//--------------------------------
+
+$std->load_skin();
 
 list($ppu,$tpu) = explode( "&", $ibforums->member['view_prefs'] );
 		
 $ibforums->vars['display_max_topics'] = ($tpu > 0) ? $tpu : $ibforums->vars['display_max_topics'];
 $ibforums->vars['display_max_posts']  = ($ppu > 0) ? $ppu : $ibforums->vars['display_max_posts'];
 
-//--------------------------------
+//===========================================================================
 //  Set up the session ID stuff
-//--------------------------------
+//===========================================================================
 
 if ( $ibforums->session_type == 'cookie' )
 {
@@ -233,14 +430,29 @@ $ibforums->js_base_url = $ibforums->vars['board_url'].'/index.'.$ibforums->vars[
 
 $std->hdl_forum_read_cookie();
 
+//===========================================================================
+//  Set up defaults
+//===========================================================================
+
+$ibforums->skin_id = $ibforums->skin['_setid'];
+
+$ibforums->vars['img_url']       = 'style_images/' . $ibforums->skin['_imagedir'];
+$ibforums->vars['AVATARS_URL']   = 'style_avatars';
+$ibforums->vars['EMOTICONS_URL'] = 'style_emoticons/<#EMO_DIR#>';
+$ibforums->vars['mime_img']      = 'style_images/<#IMG_DIR#>';
+
 //--------------------------------
-//  Set up the skin stuff
+// Set up cache path
 //--------------------------------
 
-$ibforums->skin_rid   = $ibforums->skin['set_id'];
-$ibforums->skin_id    = 's'.$ibforums->skin['set_id'];
-
-$ibforums->vars['img_url']   = 'style_images/' . $ibforums->skin['img_dir'];
+if ( $ibforums->vars['ipb_cache_path'] )
+{
+	define( 'CACHE_PATH', $ibforums->vars['ipb_cache_path'] );
+}
+else
+{
+	define( 'CACHE_PATH', ROOT_PATH );
+}
 
 //--------------------------------
 //  Set up our language choice
@@ -251,6 +463,26 @@ if ($ibforums->vars['default_language'] == "")
 	$ibforums->vars['default_language'] = 'en';
 }
 
+//--------------------------------
+// Did we choose a language?
+//--------------------------------
+
+If ( $ibforums->input['setlanguage'] and $ibforums->input['langid'] and $ibforums->member['id'] )
+{
+	if ( is_array( $ibforums->cache['languages'] ) and count( $ibforums->cache['languages'] ) )
+	{
+		foreach( $ibforums->cache['languages'] as $idx => $data )
+		{
+			if ( $data['ldir'] == $ibforums->input['langid'] )
+			{
+				$DB->do_update( 'members', array( 'language' => $data['ldir'] ), 'id='.$ibforums->member['id'] );
+				$ibforums->member['language'] = $data['ldir'];
+			}
+		}
+	}
+}
+
+
 $ibforums->lang_id = $ibforums->member['language'] ? $ibforums->member['language'] : $ibforums->vars['default_language'];
 
 if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir( ROOT_PATH."lang/".$ibforums->lang_id ) ) )
@@ -260,10 +492,6 @@ if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir(
 		
 $ibforums->lang = $std->load_words($ibforums->lang, 'lang_global', $ibforums->lang_id);
 
-//--------------------------------
-
-$skin_universal = $std->load_template('skin_global');
-
 //--------------------------------
 //  Expire subscription?
 //--------------------------------
@@ -273,9 +501,33 @@ if ( $ibforums->member['sub_end'] != 0 AND ( $ibforums->member['sub_end'] < time
 	$std->expire_subscription();
 }
 
+//--------------------------------
+//  Upload dir?
 //--------------------------------
 
-if ($ibforums->input['act'] != 'Login' and $ibforums->input['act'] != 'Reg' and $ibforums->input['act'] != 'Attach' and $ibforums->input['module'] != 'subscription')
+$ibforums->vars['upload_dir'] = $ibforums->vars['upload_dir'] ? $ibforums->vars['upload_dir'] : ROOT_PATH.'uploads';
+
+//===========================================================================
+// DECONSTRUCTOR
+//===========================================================================
+
+if ( USE_SHUTDOWN and $ibforums->input['act'] != 'task' )
+{
+	chdir( ROOT_PATH );
+	$ROOT_PATH = getcwd();
+	
+	register_shutdown_function( array( &$std, 'my_deconstructor') );
+}
+
+//===========================================================================
+// Force log in / board offline?
+//===========================================================================
+
+if ($ibforums->input['_low_act']   != 'login'  and
+	$ibforums->input['_low_act']   != 'reg'    and
+	$ibforums->input['_low_act']   != 'attach' and
+	$ibforums->input['_low_act']   != 'task'   and
+	( $ibforums->input['_low_act'] != 'module' && $ibforums->input['module'] != 'subscription' ) )
 {
 
 	//--------------------------------
@@ -284,7 +536,7 @@ if ($ibforums->input['act'] != 'Login' and $ibforums->input['act'] != 'Reg' and
 	//--------------------------------
 	
 	if ($ibforums->member['g_view_board'] != 1)
-	{
+	{ 
 		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_view_board') );
 	}
 	
@@ -296,6 +548,7 @@ if ($ibforums->input['act'] != 'Login' and $ibforums->input['act'] != 'Reg' and
 	{
 		if ($ibforums->member['g_access_offline'] != 1)
 		{
+			$ibforums->vars['no_reg'] == 1;
 			$std->board_offline();
 		}
 		
@@ -307,80 +560,71 @@ if ($ibforums->input['act'] != 'Login' and $ibforums->input['act'] != 'Reg' and
 	
 	if ( (! $ibforums->member['id']) and ($ibforums->vars['force_login'] == 1) )
 	{
-		require ROOT_PATH."sources/Login.php";
+		require ROOT_PATH."sources/login.php";
+		$runme = new login();
+		$runme->auto_run();
 		
 	}
-
+	
+	//--------------------------------
+	// Show PURCHASE screen?
+	// Not enforced
+	//--------------------------------
+	
+	if ( ! $ibforums->member['sub_end'] )
+	{
+		//--------------------------------
+		// 1: No enforce, chosen from reg
+		//--------------------------------
+		
+		if ( ! $ibforums->vars['subsm_enforce'] and $ibforums->member['subs_pkg_chosen'] )
+		{
+			$ibforums->input['act']     = 'module';
+			$ibforums->input['module']  = 'subscription';
+			$ibforums->input['CODE']    = 'paymentmethod';
+			$ibforums->input['sub']     = $ibforums->member['subs_pkg_chosen'];
+			$ibforums->input['nocp']    = 1;
+			$ibforums->input['msgtype'] = 'fromreg';
+		}
+	
+		//--------------------------------
+		// Show PURCHASE screen?
+		// Enforced
+		//--------------------------------
+		
+		if ( $ibforums->vars['subsm_enforce'] and $ibforums->member['mgroup'] == $ibforums->vars['subsm_nopkg_group'] )
+		{
+			$ibforums->input['act']     = 'module';
+			$ibforums->input['module']  = 'subscription';
+			$ibforums->input['nocp']    = 1;
+			$ibforums->input['msgtype'] = 'force';
+			
+			if ( $ibforums->member['subs_pkg_chosen'] )
+			{
+				$ibforums->input['CODE']    = 'paymentmethod';
+				$ibforums->input['sub']     = $ibforums->member['subs_pkg_chosen'];
+			}
+		}
+	}
 }
 
-//--------------------------------
-// Decide what to do
-//--------------------------------
-
-$choice = array(
-                 "idx"      => "Boards",
-                 "SC"       => "Boards",
-                 "SF"       => "Forums",
-                 "SR"       => "Forums",
-                 "ST"       => "Topics",
-                 "Login"    => "Login",
-                 "Post"     => "Post",
-                 "Poll"     => "lib/add_poll",
-                 "Reg"      => "Register",
-                 "Online"   => "Online",
-                 "Members"  => "Memberlist",
-                 "Help"     => "Help",
-                 "Search"   => "Search",
-                 "Mod"      => "Moderate",
-                 "Print"    => "misc/print_page",
-                 "Forward"  => "misc/forward_page",
-                 "Mail"     => "misc/contact_member",
-                 "Invite"   => "misc/contact_member",
-                 "ICQ"      => "misc/contact_member",
-                 "AOL"      => "misc/contact_member",
-                 "YAHOO"    => "misc/contact_member",
-                 "MSN"      => "misc/contact_member",
-                 "report"   => "misc/contact_member",
-                 "chat"     => "misc/contact_member",
-                 "integ"    => "misc/contact_member",
-                 "Msg"      => "Messenger",
-                 "UserCP"   => "Usercp",
-                 "Profile"  => "Profile",
-                 "Track"    => "misc/tracker",
-                 "Stats"    => "misc/stats",
-                 "Attach"   => "misc/attach",
-                 'legends'  => 'misc/legends',
-                 'modcp'    => 'mod_cp',
-                 'calendar' => "calendar",
-                 'buddy'    => "browsebuddy",
-                 'boardrules' => "misc/contact_member",
-                 'mmod'     => "misc/multi_moderate",
-                 'warn'     => "misc/warn",
-                 'home'     => 'dynamiclite/csite',
-                 'module'   => 'modules',
-               );
-
-                
-/***************************************************/
-//
-
-// Check to make sure the array key exits..
-
-if (! isset($choice[ $ibforums->input['act'] ]) )
-{
-	$ibforums->input['act'] = 'idx';
-}
+//===========================================================================
+// REQUIRE AND RUN
+//===========================================================================                
 
 if ( $ibforums->input['act'] == 'home' )
 {
 	if ( $ibforums->vars['csite_on'] )
 	{
-		require ROOT_PATH."sources/dynamiclite/csite.php";
-		$csite = new click_site();
+		require ROOT_PATH."sources/ipbportal.php";
+		$csite = new ipdl();
+		$csite->auto_run();
 	}
 	else
 	{
-		require ROOT_PATH."sources/Boards.php";
+		require ROOT_PATH."sources/boards.php";
+		$runme = new boards();
+		$runme->auto_run();
 	}
 }
 else if ( $ibforums->input['act'] == 'module' )
@@ -392,21 +636,69 @@ else if ( $ibforums->input['act'] == 'module' )
 	}
 	else
 	{
-		require ROOT_PATH."sources/Boards.php";
+		require ROOT_PATH."sources/boards.php";
 	}
 }
 else
 {
 	// Require and run
-	require ROOT_PATH."sources/".$choice[ $ibforums->input['act'] ].".php";
+	
+	require_once( ROOT_PATH."sources/".$choice[ strtolower($ibforums->input['act']) ][0].".php" );
+	
+	$runme = new $choice[ strtolower($ibforums->input['act']) ][1];
+	$runme->auto_run();
 }
 
-//+-------------------------------------------------
+/*-------------------------------------------------------------------------*/
 // GLOBAL ROUTINES
-//+-------------------------------------------------
+/*-------------------------------------------------------------------------*/
 
-function fatal_error($message="", $help="") {
+function fatal_error($message="", $help="")
+{
 	echo("$message<br><br>$help");
 	exit;
 }
-?>
+
+/*-------------------------------------------------------------------------*/
+// Custom error handler
+/*-------------------------------------------------------------------------*/
+
+function my_error_handler( $errno, $errstr, $errfile, $errline )
+{
+	// Did we turn off errors with @?
+	
+	if ( ! error_reporting() )
+	{
+		return;
+	}
+	
+	$errfile = str_replace( @getcwd(), "", $errfile );
+	
+	switch ($errno)
+	{
+  		case E_ERROR:
+   			echo "<b>IPB ERROR</b> [$errno] $errstr (Line: $errline of $errfile)<br />\n";
+   			exit(1);
+   		break;
+  		case E_WARNING:
+  			if ( strstr( $errstr, 'load_template(./skin_cache/cacheid_' ) )
+  			{
+  				echo "<div style='font-family:sans-serif'><b>IPB TEMPLATE ERROR:</b> Could not load the required template.
+  					  <br /><br />First, try and remove any custom skin settings by clicking <a href='index.php?setskin&id=0'>here</a>
+  					  <br /><br />Then, please visit your <a href='admin.php'>Admin Control Panel</a> to repair this template.
+  					  <br /><br /><span style='font-size:90%;color:gray'>Error: $errstr</span></div>";
+  			}
+  			else
+  			{
+   				echo "<b>IPB WARNING</b> [$errno] $errstr (Line: $errline of $errfile)<br />\n";
+   			}
+   		break;
+ 		default:
+   			//Do nothing
+   		break;
+	}
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/html/sys-img/fade.jpg b/upload/install/img/fade.jpg
similarity index 100%
rename from upload/html/sys-img/fade.jpg
rename to upload/install/img/fade.jpg
diff --git a/upload/html/sys-img/fadebg.jpg b/upload/install/img/fadebg.jpg
similarity index 100%
rename from upload/html/sys-img/fadebg.jpg
rename to upload/install/img/fadebg.jpg
diff --git a/upload/html/sys-img/install_face.jpg b/upload/install/img/install_face.jpg
similarity index 100%
rename from upload/html/sys-img/install_face.jpg
rename to upload/install/img/install_face.jpg
diff --git a/upload/html/sys-img/install_proceed.gif b/upload/install/img/install_proceed.gif
similarity index 100%
rename from upload/html/sys-img/install_proceed.gif
rename to upload/install/img/install_proceed.gif
diff --git a/upload/html/sys-img/install_text.gif b/upload/install/img/install_text.gif
similarity index 100%
rename from upload/html/sys-img/install_text.gif
rename to upload/install/img/install_text.gif
diff --git a/upload/install/img/tile_back.gif b/upload/install/img/tile_back.gif
new file mode 100644
index 0000000000000000000000000000000000000000..330833bbb36e28d9eab84af313264885b39be08c
GIT binary patch
literal 488
zcmZ?wbhEHb<Yq8oxXQo~Shlrk>!+5TUn`b9YT5BMqVZsC=gEdm?_)Yn1eR|rTk@cK
z&5MNIvr#RFlO|k9o^&a(|9tcIFCo>t>ejywuiqEma3H8+d(*bhRjZ#jZvGJ8bEahB
z-I%sx(XB^=Dt81|?X2JUu59uB+I6p*cYF;f+uFG0W9h=XAvL>e*1nAEIvrZOr+n$d
z$fiS;D<0Qvd|S8SP1DwoVRd_}Rz77Q4k-R)0V~u2ksv=Yu>E&vEbtH!=sTg3cqGTl
zed3A|shtt)Z+Iu1e#@5dV1q=M*6j03d#cW!lezcd2cygS+m7q@)V;6z`M*J5xVfcO
zSgE74OG%@*uU~_E(&Q=J64PhQlrWkzci#L3M!JiaEY)RRv2qo&_S$vpwYfHJ-omB0
zeaB8kwLN?HsYxF^bXc1I*zptme5cQx<rBDY@sa?~)oa&zq;B25Bc*x&!9z{9Cr_WT
zalCx>nnUK@`wud*pTB&S<^A#V7q8CWfB$v3IAlCFIJ7o%2!|~=uwkJym!Xo^90}*v
zqummrb8ej2_?VMZ!MSV7hlNW{PL{V>5p(iVbL(`2<R}k^&CAZRFciJI!`aYso^`&1
JCkrEkH2{)V;TQk_

literal 0
HcmV?d00001

diff --git a/upload/html/sys-img/title.gif b/upload/install/img/title.gif
similarity index 100%
rename from upload/html/sys-img/title.gif
rename to upload/install/img/title.gif
diff --git a/upload/install/index.php b/upload/install/index.php
new file mode 100644
index 00000000..95bc4264
--- /dev/null
+++ b/upload/install/index.php
@@ -0,0 +1,1525 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   INVISION POWER BOARD INSTALLER v2.0
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
++--------------------------------------------------------------------------
+|
+|   > Script written by Matthew Mecham
+|   > Date started: 19th March 2004
+|
++--------------------------------------------------------------------------
+*/
+
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+//+------------------------------------------------------------------------
+// ENTER YOUR PATH TO THE DIRECTORY THIS SCRIPT IS IN.
+//+------------------------------------------------------------------------
+// Tips:
+//
+// If you are using Windows and Apache, do not
+// use backslashes, use normal forward slashes.
+// You may need to remove the drive letter also
+// Example: C:\apache\htdocs\ibforums\ will need
+// to be: /apache/htdocs/ibforums/
+//
+// If you are using Windows and IIS, then you will 
+// need to enter double backslashes.
+//
+// In all cases, please enter a trailing slash (or
+// trailing backslashes...)
+//+------------------------------------------------------------------------
+
+define( 'THIS_ROOT_PATH', './' );
+
+//+------------------------------------------------------------------------
+// ROOT TO REST OF IPB (SHOULD BE ABLE TO LEAVE AS-IS
+//+------------------------------------------------------------------------
+
+define( 'ROOT_PATH', '../' );
+
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+define( 'CACHE_PATH' , ROOT_PATH );
+
+define ( 'SQL_DRIVER', 'mysql' );
+
+define ( 'IN_IPB', 1 );
+define ( 'IN_DEV', 0 );
+
+define ( 'IPBVERSION', '2.0.0' );
+
+define ( 'USE_SHUTDOWN', 0 );
+define ( 'SAFE_MODE_ON', 0 );
+
+//-----------------------------------------------
+// INIT CLASSES
+//-----------------------------------------------
+
+require_once( ROOT_PATH.'sources/functions.php' );
+
+$template = new template;
+$std      = new FUNC();
+$ibforums = new info();
+
+//-----------------------------------------------
+// PARSE INCOMING
+//-----------------------------------------------
+
+$VARS = $std->parse_incoming();
+
+//+---------------------------------------
+// What are we doing then? Eh? I'm talking to you!
+//+---------------------------------------
+
+if ( file_exists( THIS_ROOT_PATH.'install.lock') )
+{
+	install_error("This installer is locked!<br>Please (via FTP) remove the 'install/install.lock' file");
+	exit();
+}
+
+
+switch($VARS['a'])
+{
+	case '1':
+		do_setup_form();
+		break;
+		
+	case '2':
+		do_install();
+		break;
+		
+	case 'templates':
+		do_templates();
+		break;
+		
+	case '3':
+		do_finish();
+		break;
+		
+	default:
+		do_intro();
+		break;
+}
+
+
+
+function do_finish()
+{
+	global $std, $template, $root, $VARS, $DB, $ibforums;
+	
+	//-----------------------------------
+	// IMPORT $INFO!
+	//-----------------------------------
+	
+	$require = ROOT_PATH."conf_global.php";
+	
+	if ( ! file_exists($require) )
+	{
+		install_error("Could not locate '$require'. You may need to enter a value for the root path in this installer script, to do this, simply open up this script in a text editor and enter a value in \$root - remember to add a trailing slash. NT users will need to use double backslashes");
+	}
+	
+	include($require);
+	
+	$INFO['sql_driver'] = strtolower($INFO['sql_driver']);
+	
+	//-----------------------------------
+	// Get SQL engine
+	//-----------------------------------
+	
+	require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php");
+
+	$DB = new db_driver();
+	
+	$DB->obj['sql_database']     = $INFO['sql_database'];
+	$DB->obj['sql_user']         = $INFO['sql_user'];
+	$DB->obj['sql_pass']         = $INFO['sql_pass'];
+	$DB->obj['sql_host']         = $INFO['sql_host'];
+	$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+	$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_admin_queries.php';
+	$DB->obj['use_shutdown']     = 0;
+	
+	//-----------------------------------
+	// Required vars?
+	//-----------------------------------
+	
+	if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+	{
+		foreach( $DB->connect_vars as $k => $v )
+		{
+			$DB->connect_vars[ $k ] = $INFO[ $k ];
+		}
+	}
+	
+	//--------------------------------
+	// Get a DB connection
+	//--------------------------------
+	
+	$DB->connect();
+	
+	//-----------------------------------
+	// Get ACP library
+	//-----------------------------------
+
+	require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+	$acp = new admin_cache_functions();
+	
+	//-----------------------------------
+	// Cache skins and shit
+	//-----------------------------------
+	
+	$acp->_rebuild_all_caches( array(2) );
+	
+	//-------------------------------------------------------------
+	// Forum cache
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['forum_cache'] = array();
+
+	$DB->simple_construct( array( 'select' => '*',
+								  'from'   => 'forums',
+								  'order'  => 'parent_id, position'
+						 )      );
+	$DB->simple_exec();
+	
+	while( $fr = $DB->fetch_row() )
+	{
+		$perms = unserialize(stripslashes($fr['permission_array']));
+		
+		$fr['read_perms']   = $perms['read_perms'];
+		$fr['reply_perms']  = $perms['reply_perms'];
+		$fr['start_perms']  = $perms['start_perms'];
+		$fr['upload_perms'] = $perms['upload_perms'];
+		$fr['show_perms']   = $perms['show_perms'];
+		
+		unset($fr['permission_array']);
+		
+		$ibforums->cache['forum_cache'][ $fr['id'] ] = $fr;
+	}
+	
+	$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		
+	//-------------------------------------------------------------
+	// Group Cache
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['group_cache'] = array();
+
+	$DB->simple_construct( array( 'select' => "*",
+								  'from'   => 'groups'
+						 )      );
+	
+	$DB->simple_exec();
+	
+	while ( $i = $DB->fetch_row() )
+	{
+		$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+	}
+	
+	$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+	
+	//-------------------------------------------------------------
+	// Systemvars
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['systemvars'] = array();
+	
+	$result = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'mail_queue' ) );
+	
+	$ibforums->cache['systemvars']['mail_queue'] = intval( $result['cnt'] );
+	$ibforums->cache['systemvars']['task_next_run'] = time() + 3600;
+	
+	$std->update_cache( array( 'name' => 'systemvars', 'array' => 1, 'deletefirst' => 1 ) );
+		
+	//-------------------------------------------------------------
+	// Stats
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['stats'] = array();
+		
+	$ibforums->cache['stats']['total_replies'] = 0;
+	$ibforums->cache['stats']['total_topics']  = 1;
+	$ibforums->cache['stats']['mem_count']     = 1;
+	
+	$r = $DB->simple_exec_query( array( 'select' => 'id, name',
+										'from'   => 'members',
+										'order'  => 'id DESC',
+										'limit'  => '0,1'
+							   )      );
+							   
+	$ibforums->cache['stats']['last_mem_name'] = $r['name'];
+	$ibforums->cache['stats']['last_mem_id']   = $r['id'];
+	
+	$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 1 ) );
+		
+	//-------------------------------------------------------------
+	// Ranks
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['ranks'] = array();
+
+	$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+								  'from'   => 'titles',
+								  'order'  => "posts DESC",
+						)      );
+						
+	$DB->simple_exec();
+				
+	while ($i = $DB->fetch_row())
+	{
+		$ibforums->cache['ranks'][ $i['id'] ] = array(
+													  'TITLE' => $i['title'],
+													  'PIPS'  => $i['pips'],
+													  'POSTS' => $i['posts'],
+													);
+	}
+	
+	$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+		
+	
+	//-------------------------------------------------------------
+	// SETTINGS
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['settings'] = array();
+
+	$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+	$info = $DB->simple_exec();
+
+	while ( $r = $DB->fetch_row($info) )
+	{
+		$ibforums->cache['settings'][ $r['conf_key'] ] = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+	}
+	
+	$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+		
+	//-------------------------------------------------------------
+	// EMOTICONS
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['emoticons'] = array();
+			
+	$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+	$DB->simple_exec();
+
+	while ( $r = $DB->fetch_row() )
+	{
+		$ibforums->cache['emoticons'][] = $r;
+	}
+	
+	$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+	
+	//-------------------------------------------------------------
+	// LANGUAGES
+	//-------------------------------------------------------------
+	
+	$ibforums->cache['languages'] = array();
+
+	$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+	$DB->simple_exec();
+	
+	while ( $r = $DB->fetch_row() )
+	{
+		$ibforums->cache['languages'][] = $r;
+	}
+	
+	$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+		
+	//-------------------------------------------------------------
+	// ATTACHMENT TYPES
+	//-------------------------------------------------------------
+		
+	$ibforums->cache['attachtypes'] = array();
+
+	$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+	$DB->simple_exec();
+
+	while ( $r = $DB->fetch_row() )
+	{
+		$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+	}
+	
+	$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				
+	//-----------------------------------
+	// Attempt to lock the install..
+	//-----------------------------------
+	
+	if ($FH = @fopen( THIS_ROOT_PATH.'install.lock', 'w' ) )
+	{
+		@fwrite( $FH, 'bleh', 4 );
+		@fclose($FH);
+		
+		@chmod( THIS_ROOT_PATH.'install.lock', 0666 );
+		
+		$template->print_top('Success!');
+	
+		$msg="Although the installer is now locked (to re-install, remove the file 'install.lock'), for added security, please remove the index.php program before continuing.
+			 <br><br>
+			 <center><b><a href='../index.php?act=Login&CODE=00'>CLICK HERE TO LOG IN!</a></center>";
+	}
+	else
+	{
+		$template->print_top('Success!');
+		
+		$msg = "PLEASE REMOVE THE INSTALLER ('index.php') BEFORE CONTINUING!<br>Failure to do so will enable ANYONE to delete your board at any time!
+				<br><br>
+				<center><b><a href='../index.php?act=Login&CODE=00'>CLICK HERE TO LOG IN!</a></center>";
+	}
+	
+	$template->contents .= "
+	<div class='centerbox'>
+	<div class='tableborder'>
+	<div class='maintitle'>Success</div>
+	<div class='tablepad'>
+	<b>The installation is now complete!</b>
+	<br><br>
+	$msg
+	</div>
+	</div>
+	</div>";
+						 
+	$template->output();
+	
+	
+	
+}
+
+
+//+---------------------------------------
+// Install the template files, woohoo and stuff
+//+---------------------------------------
+
+
+function do_templates()
+{
+	global $std, $template, $root, $VARS, $HTTP_POST_VARS;
+	
+	//-----------------------------------
+	// IMPORT $INFO!
+	//-----------------------------------
+	
+	$require = ROOT_PATH."conf_global.php";
+	
+	if ( ! file_exists($require) )
+	{
+		install_error("Could not locate '$require'. You may need to enter a value for the root path in this installer script, to do this, simply open up this script in a text editor and enter a value in \$root - remember to add a trailing slash. NT users will need to use double backslashes");
+	}
+	
+	include($require);
+	
+	//-----------------------------------
+	// Attempt a DB connection..
+	//-----------------------------------
+	
+	require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php");
+
+	$DB = new db_driver();
+	
+	$DB->obj['sql_database']     = $INFO['sql_database'];
+	$DB->obj['sql_user']         = $INFO['sql_user'];
+	$DB->obj['sql_pass']         = $INFO['sql_pass'];
+	$DB->obj['sql_host']         = $INFO['sql_host'];
+	$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+	$DB->obj['use_shutdown']     = 0;
+    $DB->return_die				 = 1;
+	
+	//-----------------------------------
+	// Required vars?
+	//-----------------------------------
+	
+	if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+	{
+		foreach( $DB->connect_vars as $k => $v )
+		{
+			$DB->connect_vars[ $k ] = $INFO[ $k ];
+		}
+	}
+	
+	if (! $DB->connect())
+	{
+		install_error($DB->error);
+	}
+	
+	//-----------------------------------
+	// Get XML
+	//-----------------------------------
+	
+	require_once( KERNEL_PATH.'class_xml.php' );
+	
+	$xml = new class_xml();
+	
+	//-----------------------------------
+	// Get XML file (TEMPLATES)
+	//-----------------------------------
+	
+	$xmlfile = ROOT_PATH.'ipb_templates.xml';
+	
+	$setting_content = implode( "", file($xmlfile) );
+	
+	//-------------------------------
+	// Unpack the datafile (TEMPLATES)
+	//-------------------------------
+	
+	$xml->xml_parse_document( $setting_content );
+	
+	//-------------------------------
+	// (TEMPLATES)
+	//-------------------------------
+	
+	if ( ! is_array( $xml->xml_array['templateexport']['templategroup']['template'] ) )
+	{
+		install_error("Error with ipb_templates.xml - could not process XML properly");
+	}
+
+	foreach( $xml->xml_array['templateexport']['templategroup']['template'] as $id => $entry )
+	{
+		$newrow = array();
+		
+		$newrow['group_name']      = $entry[ 'group_name' ]['VALUE'];
+		$newrow['section_content'] = $entry[ 'section_content' ]['VALUE'];
+		$newrow['func_name']       = $entry[ 'func_name' ]['VALUE'];
+		$newrow['func_data']       = $entry[ 'func_data' ]['VALUE'];
+		$newrow['set_id']          = 1;
+		$newrow['updated']         = time();
+		
+		$db_string = $DB->compile_db_insert_string($newrow);
+		$query = "INSERT INTO ".$INFO['sql_tbl_prefix']."skin_templates (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+		
+		if ( ! $DB->query($query) )
+		{
+			install_error($query."<br /><br />".$DB->error);
+		}
+	}
+	
+	//-------------------------------
+	// GET MACRO
+	//-------------------------------
+	
+	$xmlfile = THIS_ROOT_PATH.'installfiles/ipb_macro.xml';
+	
+	$setting_content = implode( "", file($xmlfile) );
+	
+	//-------------------------------
+	// Unpack the datafile (MACRO)
+	//-------------------------------
+	
+	$xml->xml_parse_document( $setting_content );
+	
+	//-------------------------------
+	// (MACRO)
+	//-------------------------------
+	
+	if ( ! is_array( $xml->xml_array['macroexport']['macrogroup']['macro'] ) )
+	{
+		install_error("Error with ipb_macro.xml - could not process XML properly");
+	}
+
+	foreach( $xml->xml_array['macroexport']['macrogroup']['macro'] as $id => $entry )
+	{
+		$newrow = array();
+		
+		$newrow['macro_value']   = $entry[ 'macro_value' ]['VALUE'];
+		$newrow['macro_replace'] = $entry[ 'macro_replace' ]['VALUE'];
+		$newrow['macro_set']     = 1;
+		
+		$db_string = $DB->compile_db_insert_string($newrow);
+		$query = "INSERT INTO ".$INFO['sql_tbl_prefix']."skin_macro (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+		
+		if ( ! $DB->query($query) )
+		{
+			install_error($query."<br /><br />".$DB->error);
+		}
+	}
+	
+	//-------------------------------
+	// WRAPPER / CSS
+	//-------------------------------
+	
+	require_once( THIS_ROOT_PATH.'installfiles/components.php' );
+	
+	$wrapper_record = array( 'set_wrapper'	=>	$WRAPPER,
+							 'set_css'		=>	$CSS,
+						   );
+						   
+	$str = $DB->compile_db_update_string($wrapper_record);
+	$query = "UPDATE ".$INFO['sql_tbl_prefix']."skin_sets set ".$str." where set_skin_set_id=1";
+
+	if ( ! $DB->query($query) )
+	{
+		install_error($query."<br /><br />".$DB->error);
+	}
+		
+	//-------------------------------
+	// ARE WE DONE? REALLY? COOL!!
+	//-------------------------------
+   
+	$template->print_top('Success!');
+   
+   	$template->contents .= "
+	<div class='centerbox'>
+	<div class='tableborder'>
+	<div class='maintitle'>Success</div>
+	<div class='tablepad'>
+	<b>Template files installed!</b>
+	<br><br>
+	The installation process is now complete.
+	<br>
+	Click the link below to clean up the installer and build the required caches
+	<br><br>
+	<center><b><a href='index.php?a=3'>CLICK HERE TO FINISH</a></center>
+	</div>
+	</div>
+	</div>";
+   
+	$template->output();
+	
+}
+
+//+---------------------------------------
+
+
+function do_install()
+{
+	global $std, $template, $VARS;
+	
+	//-----------------------------------
+	// Ok, lets check for blankies...
+	//-----------------------------------
+	
+	$DB = "";
+	
+	$NEW_INFO = array();
+	
+	$need = array('board_url','sql_host','sql_database','sql_user','adminname','adminpassword','adminpassword2','email');
+	
+	foreach($need as $greed)
+	{
+		if ($VARS[ $greed ] == "")
+		{
+			install_error("You must complete all of the form with the sole exception of 'SQL Table prefix'");
+		}
+	}
+	
+	//-----------------------------------
+	// Get converge
+	//-----------------------------------
+	
+	require_once( KERNEL_PATH.'class_converge.php' );
+	
+	$converge = new class_converge( $DB );
+	
+	//-----------------------------------
+	// Get XML
+	//-----------------------------------
+	
+	require_once( KERNEL_PATH.'class_xml.php' );
+	
+	$xml = new class_xml();
+	
+	//-----------------------------------
+	// Get XML file
+	//-----------------------------------
+	
+	$xmlfile = THIS_ROOT_PATH.'installfiles/ipb_settings.xml';
+	
+	$setting_content = implode( "", file($xmlfile) );
+	
+	//-----------------------------------
+	// Fix up URL
+	//-----------------------------------
+	
+	$VARS['board_url'] = preg_replace( "#/$#", "", $VARS['board_url'] );
+	
+	if ($VARS['sql_tbl_prefix'] == "")
+	{
+		$VARS['sql_tbl_prefix'] = 'ibf_';
+	}
+	
+	$safe_mode = intval( $VARS['safe_mode'] );
+	
+	//-----------------------------------
+	// Did the admin passy and passy2 match?
+	//-----------------------------------
+	
+	if ($VARS['adminpassword2'] != $VARS['adminpassword'])
+	{
+		install_error("Your passwords did not match");
+	}
+	
+	//-----------------------------------
+	// Guess a path
+	//-----------------------------------
+	
+	$root = THIS_ROOT_PATH;
+	
+	if ( $root == './')
+	{
+		$root = str_replace( '\\', '/', getcwd() ) . '/';
+		$root = str_replace( 'install/', '', $root );
+	}
+	
+	//-----------------------------------
+	// Attempt to write the config file.
+	//-----------------------------------
+				   
+    $INFO = array( 
+				   'sql_driver'     => $VARS['sql_driver'],
+				   'sql_host'       => $VARS['sql_host'],
+				   'sql_database'   => $VARS['sql_database'],
+				   'sql_user'       => $_POST['sql_user'],
+				   'sql_pass'       => $_POST['sql_pass'],
+				   'sql_tbl_prefix' => $VARS['sql_tbl_prefix'],
+				   'sql_debug'      => 1,
+				   
+				   'board_start'    => time(),
+				   'installed'      => 1,
+				   
+				   'php_ext'        => 'php',
+				   'safe_mode'      => $safe_mode,
+				   
+				   'board_url'      => $VARS['board_url'],
+
+				   'admin_group'	=> '4',
+				   'guest_group'    => '2',
+				   'member_group'   => '3',
+				   'auth_group'		=> '1',
+				 );
+				 
+	//--------------------------------------------------
+	// Any "extra" configs required for this driver?
+	//--------------------------------------------------
+	
+	if ( file_exists( THIS_ROOT_PATH.'sql/'.$VARS['sql_driver'].'_install.php' ) )
+	{
+		require_once( THIS_ROOT_PATH.'sql/'.$VARS['sql_driver'].'_install.php' );
+		
+		$extra_install = new install_extra();
+		
+		$extra_install->install_form_process();
+		
+		if ( count( $extra_install->errors ) )
+		{
+			install_error( "The following error(s) occured when checking the SQL information:<br /><br />".implode( "<br />", $extra_install->errors ) );
+		}
+		
+		if ( is_array( $extra_install->info_extra ) and count( $extra_install->info_extra ) )
+		{
+			foreach( $extra_install->info_extra as $k => $v )
+			{
+				$INFO[ $k ] = $v;
+			}
+		}
+	}
+	
+	//-----------------------------------
+	// Attempt a DB connection..
+	//-----------------------------------
+	
+	require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php");
+
+	$DB = new db_driver();
+	
+	$DB->obj['sql_database']     = $INFO['sql_database'];
+	$DB->obj['sql_user']         = $INFO['sql_user'];
+	$DB->obj['sql_pass']         = $INFO['sql_pass'];
+	$DB->obj['sql_host']         = $INFO['sql_host'];
+	$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+	$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_admin_queries.php';
+	$DB->obj['use_shutdown']     = 0;
+    $DB->return_die				 = 1;
+	
+	//-----------------------------------
+	// Required vars?
+	//-----------------------------------
+	
+	if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+	{
+		foreach( $DB->connect_vars as $k => $v )
+		{
+			$DB->connect_vars[ $k ] = $INFO[ $k ];
+		}
+	}
+	
+	//-----------------------------------
+	// Attempt a connect
+	//-----------------------------------
+	
+	if ( ! $DB->connect() )
+	{
+		install_error( "Connection error:<br /><br />".$DB->error );
+	}
+	
+	//-----------------------------------
+	// Write to disk
+	//-----------------------------------
+	
+	$file_string = "<?php\n";
+	   
+	foreach( $INFO as $k => $v )
+	{
+		$file_string .= '$INFO['."'".$k."'".']'."\t\t\t=\t'".$v."';\n";
+	}
+	
+	$file_string .= "\n".'?>';
+	
+	if ( $fh = fopen( ROOT_PATH.'conf_global.php', 'w' ) )
+	{
+		fputs($fh, $file_string, strlen($file_string) );
+		fclose($fh);
+	}
+	else
+	{
+		install_error("Could not write to 'conf_global.php'");
+	}
+	 
+	//-----------------------------------
+	// Require insert files
+	//-----------------------------------
+	
+	require_once( THIS_ROOT_PATH.'sql/'.$INFO['sql_driver'].'_tables.php' );
+	require_once( THIS_ROOT_PATH.'sql/'.$INFO['sql_driver'].'_inserts.php' );
+	require_once( THIS_ROOT_PATH.'sql/'.$INFO['sql_driver'].'_fulltext.php' );
+	
+	//-----------------------------------
+	// Populate the database...
+	//-----------------------------------
+	 
+	foreach( $TABLE as $q )
+	{
+	   preg_match("/CREATE TABLE (\S+) \(/", $q, $match);
+	   
+	   if ($match[1])
+	   {
+		   $DB->sql_drop_table( str_replace( 'ibf_', '', $match[1] ) );
+	   }
+   
+	   if ($VARS['sql_tbl_prefix'] != "ibf_")
+	   {
+		  $q = preg_replace("/ibf_(\S+?)([\s\.,]|$)/", $VARS['sql_tbl_prefix']."\\1\\2", $q);
+	   }
+	   
+	   if ( ! $DB->query($q) )
+	   {
+		   install_error($q."<br /><br />".$DB->error);
+	   }
+	}
+	
+	//-----------------------------------
+	// Create the fulltext index...
+	//-----------------------------------
+	
+	if ( $DB->sql_can_fulltext() )
+	{
+		 foreach( $INDEX as $q )
+		 {
+		 	if ($VARS['sql_tbl_prefix'] != "ibf_")
+	        {
+	           $q = preg_replace("/ibf_(\S+?)([\s\.,]|$)/", $VARS['sql_tbl_prefix']."\\1\\2", $q);
+	        }
+	        
+	        if ( ! $DB->query($q) )
+	        {
+	        	install_error($q."<br /><br />".$DB->error);
+	        }
+		}
+	}
+	
+	//-----------------------------------
+	// Populate tables...
+	//-----------------------------------
+	
+	foreach( $INSERT as $q )
+	{
+	 	if ($VARS['sql_tbl_prefix'] != "ibf_")
+        {
+           $q = preg_replace("/ibf_(\S+?)([\s\.,]|$)/", $VARS['sql_tbl_prefix']."\\1\\2", $q);
+        }
+        
+		$q = str_replace( "<%time%>", time(), $q );
+       
+        if ( ! $DB->query($q) )
+        {
+        	install_error($q."<br /><br />".$DB->error);
+        }
+	}
+	
+	//-----------------------------------
+	// Insert the admin...
+	//-----------------------------------
+	
+	$md5_once = trim(md5($VARS['adminpassword']));
+	
+	$salt     = $converge->generate_password_salt(5);
+	
+	$key      = $converge->generate_auto_log_in_key();
+	$rpass    = $converge->generate_compiled_passhash($salt, $md5_once);
+	
+	$salt     = str_replace( '\\', "\\\\", $salt );
+	
+	$time     = time();
+	
+	//$salt     = preg_replace( "/'/", "\\'", $salt );
+	
+	//-----------------------------------
+	// Members...
+	//-----------------------------------
+
+	$member_record = array (	'id'				=>	1,
+								'name'				=>	$VARS['adminname'],
+								'mgroup'			=>	4,
+								'email'				=>	$VARS['email'],
+								'joined'			=>	$time,
+								'ip_address'		=>	'127.0.0.1',
+								'posts'				=>	0,
+								'title'				=>	'Administrator',
+								'last_visit'		=>	$time,
+								'last_activity'		=>	$time,
+								'member_login_key'	=>	$key,
+							);
+	$db_string = $DB->compile_db_insert_string($member_record);
+	$query = "INSERT INTO ".$VARS['sql_tbl_prefix']."members (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+		     
+	if ( ! $DB->query($query) )
+	{
+		install_error($query."<br /><br />".$DB->error);
+	}
+	
+	//-----------------------------------
+	// Converge...
+	//-----------------------------------
+
+	$converge_record = array	(	'converge_email'		=>	$VARS['email'],
+									'converge_joined'		=>	$time,
+									'converge_pass_hash'	=>	$rpass,
+									'converge_pass_salt'	=>	$salt,
+								);	
+	$db_string = $DB->compile_db_insert_string($converge_record);
+	$query = "INSERT INTO ".$VARS['sql_tbl_prefix']."members_converge (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+	
+	if ( ! $DB->query($query) )
+	{
+		install_error($query."<br /><br />".$DB->error);
+	}
+	
+	//-----------------------------------
+	// Member Extra...
+	//-----------------------------------
+
+	$member_extra_record = array	(	'id'		=>	1,
+										'signature'	=>	'',
+										'vdirs'		=>	'',
+									);	
+	$db_string = $DB->compile_db_insert_string($member_extra_record);
+	$query = "INSERT INTO ".$VARS['sql_tbl_prefix']."member_extra (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+	
+	if ( ! $DB->query($query) )
+	{
+		install_error($query."<br /><br />".$DB->error);
+	}
+	
+	//-------------------------------
+	// Unpack the datafile
+	//-------------------------------
+	
+	$xml->xml_parse_document( $setting_content );
+	
+	//-------------------------------
+	// pArse
+	//-------------------------------
+	
+	$fields = array( 'conf_title', 'conf_description', 'conf_group', 'conf_type', 'conf_key', 'conf_value', 'conf_default',
+					 'conf_extra', 'conf_evalphp', 'conf_protected', 'conf_position', 'conf_start_group', 'conf_end_group',
+					 'conf_help_key', 'conf_add_cache' );
+	
+	$known = array(  'email_in'       => $VARS['email'],
+					 'email_out'      => $VARS['email'],
+					 'base_dir'       => $root,
+					 'upload_dir'     => $root."uploads",
+					 'upload_url'     => $VARS['board_url']."/uploads",
+				 );
+	
+	
+	if ( ! is_array( $xml->xml_array['settingexport']['settinggroup']['setting'] ) )
+	{
+		install_error("Error with ipb_settings.xml - could not process XML properly");
+	}
+
+	foreach( $xml->xml_array['settingexport']['settinggroup']['setting'] as $id => $entry )
+	{
+		if ( ! $entry['conf_key']['VALUE'] )
+		{
+			continue;
+		}
+		
+		$newrow = array();
+		
+		$entry['conf_value']['VALUE'] = "";
+		
+		if ( in_array( $entry['conf_key']['VALUE'], array_keys( $known ) ) )
+		{
+			$entry['conf_value']['VALUE'] = $known[ $entry['conf_key']['VALUE'] ];
+		}
+		
+		//-----------------------------------
+		// Make PHP slashes safe
+		//-----------------------------------
+		
+		$entry['conf_evalphp']['VALUE'] = str_replace( '\\', '\\\\', $entry['conf_evalphp']['VALUE'] );
+		
+		foreach( $fields as $f )
+		{
+			$newrow[$f] = $entry[ $f ]['VALUE'];
+		}
+		
+		$db_string = $DB->compile_db_insert_string($newrow);
+		$query = "INSERT INTO ".$VARS['sql_tbl_prefix']."conf_settings (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+
+		if ( ! $DB->query($query) )
+		{
+			install_error($query."<br /><br />".$DB->error);
+		}
+	}
+	
+	//-----------------------------------
+	// ARE WE DONE? REALLY? COOL!!
+	//-----------------------------------
+	
+	$template->print_top('Success!');
+	
+	$template->contents .= "
+	<div class='centerbox'>
+	<div class='tableborder'>
+	<div class='maintitle'>Success</div>
+	<div class='tablepad'>
+	<b>Your board has now been installed!</b>
+	<br><br>
+	The installation process is almost complete.
+	<br>
+	The next step will install the templates into your database
+	<br><br>
+	<center><b><a href='index.php?a=templates'>CLICK HERE TO CONTINUE</a></center>
+	</div>
+	</div>
+	</div>";
+						 
+	$template->output();
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+// SET UP FORM
+/*-------------------------------------------------------------------------*/
+
+
+function do_setup_form()
+{
+	global $std, $template;
+	
+	$template->print_top('Set Up form');
+	
+	if ( ! is_dir(ROOT_PATH.'ips_kernel') )
+	{
+		install_error("Cannot locate 'ips_kernel' directory. Please make sure you uploaded all the folders and files.");
+	}
+	
+	//--------------------------------------------------
+	// DO WE HAVE A DB DRIVER SET?
+	//--------------------------------------------------
+	
+	$VARS['sql_driver'] = ( $VARS['sql_driver'] == "" ) ? $_REQUEST['sql_driver'] : $VARS['sql_driver'];
+	
+	if ( ! $VARS['sql_driver'] )
+	{
+		//----------------------------------------------
+		// Test to see how many DB driver's we've got..
+		//----------------------------------------------
+		
+		$drivers = array();
+		
+		$dh = opendir( ROOT_PATH.'ips_kernel' ) or install_error("Cannot locate 'ips_kernel' directory for reading, please check all paths and permissions");
+ 	
+		while ( $file = @readdir( $dh ) )
+		{
+			if ( preg_match( "/^class_db_([a-zA-Z0-9]*)\.php/i", $file, $driver ) )
+			{
+				$drivers[] = $driver[1];
+			}
+		}
+ 	
+ 		@closedir( $dh );
+ 		
+ 		//----------------------------------------------
+ 		// Got more than one?
+ 		//----------------------------------------------
+ 		
+ 		if ( count($drivers) > 1 )
+ 		{
+ 			//------------------------------------------
+ 			// Show choice screen first...
+ 			//------------------------------------------
+ 			
+ 			$template->contents .= "<form action='index.php' method='POST'>
+									<input type='hidden' name='a' value='1'>
+									<div class='centerbox'>
+									<div class='tableborder'>
+									<div class='maintitle'>Multiple SQL Drivers Detected</div>
+									<div class='pformstrip'>Please which SQL engine you wish to use with your Invision Power Board</div>
+									<table width='100%' cellspacing='1'>
+									<tr>
+									  <td class='pformleftw'><b>SQL Driver</b><div class='description'>(Select the database engine you are using)</div></td>
+									  <td class='pformright'><select name='sql_driver' id='textinput'>\n";
+									  
+									  foreach ($drivers as $k => $v)
+									  {
+										  $selected            = ($v == "mysql") ? " selected='selected'" : "";
+										  $template->contents .= "<option value='".$v."'".$selected.">".strtoupper($v)."</option>\n";
+									  }
+
+									  $template->contents .= "</select>
+										</td>
+									  </tr>
+									  </table>
+									  <div align='center' class='pformstrip'  style='text-align:center'><input type='image' src='img/install_proceed.gif'></div>
+									  </div>
+									  </div>
+									  </form>";
+			
+			$template->output();
+ 			
+ 			exit();
+ 			
+ 		}
+ 		else
+ 		{
+ 			//------------------------------------------
+ 			// Use only driver installed
+ 			//------------------------------------------
+ 			
+ 			$VARS['sql_driver'] = $drivers[0];
+ 		}
+ 	}
+	
+	//--------------------------------------------------
+	// If we're here, we have chosen a driver, so.......
+	//--------------------------------------------------
+	
+	$this_url = str_replace( "/install/index.php", "", $_SERVER['HTTP_REFERER']);
+	$this_url = str_replace( "/install/" , "", $this_url);
+	$this_url = str_replace( "/install"  , "", $this_url);
+	$this_url = str_replace( "index.php" , "", $this_url);
+	
+	if ( ! $this_url )
+	{
+		$this_url = substr($_SERVER['SCRIPT_NAME'],0, -17);
+		
+    	if ($this_url == '')
+    	{
+    		$this_url == '/';
+    	}
+    	
+    	$this_url = 'http://'.$_SERVER['SERVER_NAME'].$this_url; 
+    } 
+	
+	$this_url = preg_replace( "#/$#", "", str_replace( '?a=1', "", $this_url ) );
+	
+	//--------------------------------------------------
+	// Safe mode?
+	//--------------------------------------------------
+	
+	$safe_mode = 0;
+	
+	if ( get_cfg_var('safe_mode') )
+	{
+		$safe_mode = get_cfg_var('safe_mode');
+	}
+	
+	$template->contents .= "
+	<form action='index.php' method='POST'>
+	<input type='hidden' name='a' value='2'>
+	<input type='hidden' name='sql_driver' value='{$VARS['sql_driver']}'>
+	<div class='centerbox'>
+	
+	<div class='tableborder'>
+	<div class='maintitle'>Your Server Environment</div>
+	<div class='pformstrip'>This section requires you to enter the paths and URL's for the board.</div>
+	<table width='100%' cellspacing='1'>
+	<tr>
+	  <td class='pformleftw'><b>IPB 'index.php' URL</b><div class='description'>This is the URL (must start with http://) to your main IPB directory<br />An example might be: <b>http://www.domain.com/forums</b></div></td>
+	  <td class='pformright'><input type='text' id='textinput' name='board_url' value='$this_url'></td>
+	</tr>";
+	
+	if ( $safe_mode )
+	{
+		$template->contents .= "
+		<tr>
+	  	 <td class='pformleftw'><b>Safe Mode Detected</b><div class='description'>The installer has detected that your PHP is running with safe mode enabled. If you know this is not correct, please adjust the setting.</div></td>
+	  	 <td class='pformright'><select id='textinput' name='safe_mode'><option value='1' selected='selected'>Safe Mode Enabled</option><option value='0'>Safe Mode NOT Enabled</option></select></td>
+		</tr>";
+	}
+	
+	$template->contents .= "
+	</table>
+	</div>
+	<div class='fade'>&nbsp;</div>
+	
+	<br />
+	
+	<div class='tableborder'>
+	<div class='maintitle'>Your SQL Environment</div>
+	<div class='pformstrip'>This section requires you to enter your SQL information. If in doubt, please check with your webhost before asking for support. You may choose to enter an existing database name,if not - you must create a new database before continuing.</div>
+	<table width='100%' cellspacing='1'>
+	<tr>
+	  <td class='pformleftw'><b>SQL Driver</b></td>
+	  <td class='pformright'>You have chosen to use <b>".strtoupper($VARS['sql_driver'])."</b></td>
+	</tr>
+	<tr>
+	  <td class='pformleftw'><b>SQL Host</b><div class='description'>(localhost is usually sufficient)</div></td>
+	  <td class='pformright'><input type='text' id='textinput' name='sql_host' value='localhost'></td>
+	</tr>
+	
+	<tr>
+	  <td class='pformleftw'><b>SQL Database Name</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='sql_database' value=''></td>
+	</tr>
+	
+	<tr>
+	  <td class='pformleftw'><b>SQL Username</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='sql_user' value=''></td>
+	</tr>
+	
+	<tr>
+	  <td class='pformleftw'><b>SQL Password</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='sql_pass' value=''></td>
+	</tr>
+	<!--{EXTRA.SQL}-->
+	<tr>
+	  <td class='pformleftw'><b>SQL Table Prefix</b><div class='description'>(You can leave this blank and IPB will use 'ibf_' as a default)</div></td>
+	  <td class='pformright'><input type='text' id='textinput' name='sql_tbl_prefix' value=''></td>
+	</tr>
+	</table>
+	</div>
+	<div class='fade'>&nbsp;</div>
+	
+	<br />
+	
+	<div class='tableborder'>
+	<div class='maintitle'>Your Admin Account</div>
+	<div class='pformstrip'>This section requires information to create your administration account. Please enter the data carefully!</div>
+	<table width='100%' cellspacing='1'>
+	<tr>
+	  <td class='pformleftw'><b>Username</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='adminname' value=''></td>
+	</tr>
+	
+	<tr>
+	  <td class='pformleftw'><b>Password</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='adminpassword' value=''></td>
+	</tr>
+	
+	<tr>
+	  <td class='pformleftw'><b>Re-type your password</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='adminpassword2' value=''></td>
+	</tr>
+	
+	<tr>
+	  <td class='pformleftw'><b>Email Address</b></td>
+	  <td class='pformright'><input type='text' id='textinput' name='email' value=''></td>
+	</tr>
+	</table>
+	<div align='center' class='pformstrip'  style='text-align:center'><input type='image' src='img/install_proceed.gif'></div>
+	</div>
+	<div class='fade'>&nbsp;</div>
+	</div>
+	</form>";
+	
+	//--------------------------------------------------
+	// Any "extra" configs required for this driver?
+	//--------------------------------------------------
+	
+	if ( file_exists( THIS_ROOT_PATH.'sql/'.$VARS['sql_driver'].'_install.php' ) )
+	{
+		require_once( THIS_ROOT_PATH.'sql/'.$VARS['sql_driver'].'_install.php' );
+		$extra_install = new install_extra();
+		
+		$template->contents = str_replace( '<!--{EXTRA.SQL}-->', $extra_install->install_form_extra(), $template->contents );
+	}
+						 
+	$template->output();
+						 
+}
+
+//---------------------------------------
+
+function do_intro()
+{
+	global $std, $template, $root;
+	
+	$template->print_top('Welcome');
+	
+	$template->contents .= "<table width='80%' border='0' cellpadding='0' cellspacing='0' align='center'>
+							<tr>
+							 <td valign='top'><img src='img/install_face.jpg' border='0' alt='Intro'></td>
+							 <td><img src='img/install_text.gif' border='0' alt='Welcome to IPB'>
+							  <br /><br />
+							   Before we go any further, please ensure that all the files have been uploaded, and that the 
+							   file 'conf_global.php' has suitable permissions to allow this script to write to it ( 0666 should be sufficient ).
+							   <br /><br />
+							   <b>IPB ".IPBVERSION." requires PHP 4.1.0 or better and an SQL database.</b>
+							   <br /><br />
+							   You will also need the following information that your webhost can provide:
+							   <ul>
+							   <li>Your SQL database name</li>
+							   <li>Your SQL username</li>
+							   <li>Your SQL password</li>
+							   <li>Your SQL host address (usually localhost)</li>
+							   </ul>
+							   <br />
+							   Once you have clicked on proceed, you will be taken to a form to enter information the installer needs to set up your board.
+							   <br><br>
+							   <b>PLEASE NOTE: USING THIS INSTALLER WILL DELETE ANY CURRENT INVISION POWER BOARD DATABASE IF YOU ARE USING THE SAME TABLE PREFIX</b>
+							   ";
+	
+	//---------------------------------------			 
+	// Check to make sure that the config file
+	// is there and it's got suitable permissions to write to:
+	//---------------------------------------
+	
+	$file       = ROOT_PATH."conf_global.php";
+	 
+	$templates  = THIS_ROOT_PATH."installfiles/ipb_templates.xml";
+	
+	$warnings   = array();
+	
+	$checkfiles = array( ROOT_PATH     ."ipb_templates.xml",
+						 THIS_ROOT_PATH."installfiles/components.php",
+						 THIS_ROOT_PATH."installfiles/ipb_macro.xml",
+						 THIS_ROOT_PATH."installfiles/ipb_settings.xml",
+						 THIS_ROOT_PATH."sql",
+						 KERNEL_PATH   ."class_converge.php",
+						 KERNEL_PATH   ."class_xml.php",
+						 KERNEL_PATH   ."class_db_".SQL_DRIVER.".php",
+						 ROOT_PATH     ."conf_global.php",
+						 
+					  );
+					  
+	$writeable  = array( ROOT_PATH."conf_global.php",
+						 ROOT_PATH."skin_cache/"
+					   );
+	
+	foreach ( $checkfiles as $cf )
+	{
+		if ( ! file_exists($cf) )
+		{
+			$warnings[] = "Cannot locate the file '$cf'.";
+		}
+	}
+	
+	foreach ( $writeable as $cf )
+	{
+		if ( ! is_writeable($cf) )
+		{
+			$warnings[] = "Cannot write to the file '$cf'. Please CHMOD to 0777.";
+		}
+	}
+	
+	$phpversion = phpversion();
+	
+	//----------------------------------
+	// CHECK BASICS
+	//----------------------------------
+	
+	if ($phpversion < '4.1.0')
+	{
+		$warnings[] = "<b>You cannot install Invision Power Board. Invision Power Board requires PHP Version 4.1.0 or better.</b>";
+	}
+	
+	if ( ! function_exists('get_cfg_var') )
+	{
+		$warnings[] = "<b>You cannot install Invision Power Board. Your PHP installation isn't sufficient to run IPB.</b>";
+	}
+	
+	if ( ! function_exists('xml_parse_into_struct') )
+	{
+		$warnings[] = "<b>You cannot install Invision Power Board. IPB requires that the XML functions in PHP are enabled, please ask your host to enable XML.</b>";
+	}
+	
+	//----------------------------------
+	// Got error?
+	//----------------------------------
+	
+	if ( count($warnings) > 0 )
+	{
+	
+		$err_string = '&middot;'.implode( "<br /><br />&middot;", $warnings );
+	
+		$template->contents .= "<br /><br />
+							    <div class='warnbox'>
+							     <strong>Warning!</strong>
+							     <b>The following errors must be rectified before continuing!</b>
+								 <br><br>
+								 $err_string
+							    </div>";
+	}
+	else
+	{
+		$template->contents .= "<br /><br /><div align='center'><a href='index.php?a=1'><img src='img/install_proceed.gif' border='0' alt='proceed'></a></div>";
+	}
+	
+	$template->contents .= " </td>
+							  </tr>
+							 </table>";
+	
+	$template->output();
+}
+
+
+
+function install_error($msg="")
+{
+	global $std, $template, $root;
+	
+	$template->print_top('Warning!');
+	
+
+	
+	$template->contents .= "<div class='warnbox'>
+						     <strong style='font-size:16px;color:#F00'>Warning!</strong>
+						     <br /><br />
+						     <b>The following errors must be rectified before continuing!</b><br>Please go back and try again!
+						     <br><br>
+						     $msg
+						    </div>";
+	
+	
+	
+	$template->output();
+}
+
+//+--------------------------------------------------------------------------
+// CLASSES
+//+--------------------------------------------------------------------------
+
+class info
+{
+	function info()
+	{
+		global $INFO;
+		
+		$ibforums->vars = $INFO;
+	}
+}
+
+class template
+{
+	var $contents = "";
+	
+	function output()
+	{
+		echo $this->contents;
+		echo "   
+				 
+				 <br><br><br><br><center><span id='copy'><a href='http://www.invisionboard.com'>Invision Power Board</a> &copy; 2004 <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a></span></center>
+				 
+				 </body>
+				 </html>";
+		exit();
+	}
+	
+	//--------------------------------------
+
+	function print_top($title="")
+	{
+	
+		$this->contents = "<html>
+		          <head><title>Invision Power Board Set Up :: $title </title>
+		          <style type='text/css'>
+		          	
+		          	BODY		          	
+		          	{
+		          		font-size: 11px;
+		          		font-family: Verdana, Arial;
+		          		color: #000;
+		          		margin: 0px;
+		          		padding: 0px;
+		          		background-image: url(img/fadebg.jpg);
+		          		background-repeat: no-repeat;
+		          		background-position: right bottom;
+		          	}
+		          	
+		          	TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 11px; color:#000 }
+					
+					a:link, a:visited, a:active  { color:#000055 }
+					a:hover                      { color:#333377;text-decoration:underline }
+					
+					.centerbox { margin-right:10%;margin-left:10%;text-align:left }
+					
+					.warnbox {
+							   border:1px solid #F00;
+							   background: #FFE0E0;
+							   padding:6px;
+							   margin-right:10%;margin-left:10%;text-align:left;
+							 }
+					
+					.tablepad    { background-color:#F5F9FD;padding:6px }
+				    .description { color:gray;font-size:10px }
+					.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px;text-align:left }
+					.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:50%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
+					.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
+
+					.tableborder { border:1px solid #345487;background-color:#FFF; padding:0px; margin:0px; width:100% }
+
+					.maintitle { text-align:left;vertical-align:middle;font-weight:bold; color:#FFF; letter-spacing:1px; padding:8px 0px 8px 5px; background-image: url(img/tile_back.gif) }
+					.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
+					.maintitle a:hover { text-decoration: underline }
+					
+					#copy { font-size:10px }
+										
+					#button   { background-color: #4C77B6; color: #FFFFFF; font-family:Verdana, Arial; font-size:11px }
+					
+					#textinput { background-color: #EEEEEE; color:Ê#000000; font-family:Verdana, Arial; font-size:11px; width:100% }
+					
+					#dropdown { background-color: #EEEEEE; color:Ê#000000; font-family:Verdana, Arial; font-size:10px }
+					
+					#multitext { background-color: #EEEEEE; color:Ê#000000; font-family:Courier, Verdana, Arial; font-size:10px }
+					
+					#logostrip {
+								 padding: 0px;
+								 margin: 0px;
+								 background: #7AA3D0;
+							   }
+							   
+					.fade					
+					{
+						background-image: url(img/fade.jpg);
+						background-repeat: repeat-x;
+					}
+					
+				  </style>
+				  </head>
+				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>
+				 
+				 <div id='logostrip'><img src='img/title.gif' border='0' alt='Invision Power Board Installer' /></div>
+				 <div class='fade'>&nbsp;</div>
+				 <br />
+				 ";
+				  	   
+	}
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/install/installfiles/components.php b/upload/install/installfiles/components.php
new file mode 100644
index 00000000..512624b6
--- /dev/null
+++ b/upload/install/installfiles/components.php
@@ -0,0 +1,1349 @@
+<?php
+
+$WRAPPER = <<<EOF
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
+<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head> 
+<title><% TITLE %></title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
+<% GENERATOR %> 
+<% CSS %> 
+<% JAVASCRIPT %> 
+</head> 
+<body>
+<div id="ipbwrapper">
+<% BOARD HEADER %>
+<% MEMBER BAR %>
+<% NAVIGATION %>
+<!--IBF.NEWPMBOX-->
+<% BOARD %>
+<% BOARD FOOTER %>
+<% STATS %> 
+<% COPYRIGHT %>
+</div>
+</body> 
+</html>
+EOF;
+
+
+$CSS = <<<EOF
+/* 
+ * Cascading Style Sheet(CSS 467), for Invision Power Board 2.0.0
+ * Author: James A. Mathias, admin@leihu.com, http://www.1lotus.com 
+ * Copyright: 2004 Invision Power Services, all rights reserved 
+ *
+ * All style attributes in alpha-numeric order starting from 0
+ *
+ */
+
+/* 
+ * ========================================
+ * global element styles 
+ * ========================================
+ */
+
+html{
+	overflow-x: auto; /* fixes MSIE scrollbar bug DO NOT REMOVE, has no effect in Mozilla, or Opera */
+}
+
+body{ 
+	background: #FFF;
+	color: #222;
+	font-family: Verdana, Tahoma, Arial, Trebuchet MS, Sans-Serif, Georgia, Courier, Times New Roman, Serif;
+	font-size: 11px;
+	line-height: 135%;
+	margin: 0;
+	padding: 0; /* required for Opera to have 0 margin */
+	text-align: center; /* centers board in MSIE */
+}
+
+table,
+tr,
+td{ /* required for text in tables, because tables do not inherit from body */
+	background: transparent;
+	color: #222;
+	font-size: 11px;
+	line-height: 135%;
+}
+
+table{ /* makes all tables 100% wide */
+	width: 100%;
+}
+
+td,
+.divpad{ /* gives all tables faux cellpadding of 5px */
+	padding: 5px;
+}
+
+td.nopad{ /* allows some tables to have no padding on the td */
+	padding: 0;
+}
+
+form{
+	display: inline;
+	margin: 0; /* removes mystery form tag gapping */
+	padding: 0; /* removes mystery form tag gapping */
+}
+
+img{
+	border: 0; /* makes sure linked images do not have a border */
+	vertical-align: middle;
+}
+
+/* 
+ * ========================================
+ * global hyperlink styles 
+ * ========================================
+ */
+
+a:link,
+a:visited,
+a:active{
+	background: transparent;
+	color: #222;
+	text-decoration: underline;
+}
+
+a:hover{
+	background: transparent;
+	color: #34498B;
+}
+
+/* 
+ * ========================================
+ * Main wrapper, this controls the overall width of the board in you browser view window. 
+ * ========================================
+ */
+
+#ipbwrapper{ 
+	margin: 20px auto 20px auto; /* centers the box, no matter the overall width, also applies a 20px gap at the top and bottom of the board */
+	text-align: left; /* re_aligns text to left second part of two part MSIE centering workaround */
+	/* EDIT THIS TO CHANGE THE WIDTH OF THE BOARD -> 750px is a common fixed resolution size */
+	width: 98%;
+}
+
+/* 
+ * ========================================
+ * styles for pagination links 
+ * ========================================
+ */
+ 
+
+.pagelink,
+.pagelinklast,
+.pagecurrent,
+.minipagelink,
+.minipagelinklast{
+	background: #F0F5FA;
+	border: 1px solid #072A66;
+	padding: 1px 3px 1px 3px;
+}
+
+.pagelinklast,
+.minipagelinklast{
+	background: #DFE6EF;
+}
+
+
+.pagecurrent{
+	background: #FFC9A5;
+}
+
+.minipagelink,
+.minipagelinklast{
+	border: 1px solid #C2CFDF;
+	font-size: 10px;
+	margin: 0 1px 0 0;
+}
+
+.pagelink a:active,
+.pagelink a:visited,
+.pagelink a:link,
+.pagelinklast a:active,
+.pagelinklast a:visited,
+.pagelinklast a:link,
+.pagecurrent a:active,
+.pagecurrent a:visited,
+.pagecurrent a:link,
+.minipagelink a:active,
+.minipagelink a:visited,
+.minipagelink a:link,
+.minipagelinklast a:active,
+.minipagelinklast a:visited,
+.minipagelinklast a:link{
+	text-decoration: none;
+}
+
+/* fake button effect for some links */
+.fauxbutton{
+	background: #BFCDE0;
+	border: 1px solid #072A66;
+	font-size: 11px;
+	font-weight: bold;
+	padding: 4px;
+}
+
+.fauxbutton a:link,
+.fauxbutton a:visited,
+.fauxbutton a:active{
+	color: #222 !important;
+	text-decoration: none;
+}
+
+.forumdesc,
+.forumdesc a:link,
+.forumdesc a:visited,
+.forumdesc a:active{ 
+	background: transparent;
+	font-size: 10px; 
+	color: #666;
+	line-height: 135%;
+	margin: 2px 0 0 0;
+	padding: 0;
+}
+
+/* =================================================================================== */
+/* =================================================================================== */
+/* =================================================================================== */
+
+.searchlite {
+	background-color:yellow;
+	font-weight:bold;
+	color: red;
+}
+
+.activeusers{
+	background: #FFF;
+	border: 1px solid #072A66;
+	color: #000;
+	margin: 0px;
+	padding: 1px;
+}
+
+.activeuserposting a:link,
+.activeuserposting a:visited,
+.activeuserposting a:active,
+.activeuserposting
+{
+	font-style:italic;
+	text-decoration: none;
+	border-bottom:1px dotted black;
+}
+
+fieldset.search{ 
+	line-height: 150%;
+	padding: 6px; 
+}
+
+label{ 
+	cursor: pointer; 
+}
+
+img.attach{ 
+	background: #808080 url(<#IMG_DIR#>/click2enlarge.gif) no-repeat top right;
+	border: 1px solid #808080;
+	margin: 0 2px 0 0;
+	padding: 11px 2px 2px 2px;
+}
+
+.thumbwrap,
+.thumbwrapp,
+.fullimagewrap{
+	border: 1px solid #072A66;
+	margin: 2px;
+}
+
+.thumbwrapp{
+	border: 2px solid #660707;
+}
+
+.fullimagewrap{
+	background: #F5F9FD;
+	text-align: center;
+	margin: 5px 0 5px 0;
+	padding: 5px;
+}
+
+.thumbwrap h4,
+.thumbwrapp h4{	
+	background: #DDE6F2;
+	border: 0 !important;
+	border-bottom: 1px solid #5176B5 !important;
+	color: #5176B5; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.thumbwrap p,
+.thumbwrapp p{
+	background: #EEF2F7 !important;
+	border: 0 !important;
+	border-top: 1px solid #5176B5 !important;
+	margin: 0 !important;
+	padding: 5px !important;
+	text-align: left;
+}
+
+.thumbwrap p.alt,
+.thumbwrapp p.alt{
+	background: #DFE6EF !important;
+	margin: 0 !important;
+	padding: 5px !important;
+	text-align: left;
+}
+
+.thumbwrapp p.pin{
+	background: #EFDFDF !important;
+	text-align: center !important;
+}
+	
+.thumbwrap img.galattach,
+.thumbwrapp img.galattach{
+	background: #FFF url(<#IMG_DIR#>/img_larger.gif) no-repeat bottom right;
+	border: 1px solid #072A66;
+	margin: 5px;
+	padding: 2px 2px 10px 2px;
+}
+
+li.helprow{ 
+	margin: 0 0 10px 0;
+	padding: 0; 
+}
+
+ul#help{ 
+	padding: 0 0 0 15px; 
+}
+
+.warngood,
+.warnbad{ 
+	color: #0B9500;
+	font-weight: bold;
+}
+
+.warnbad{ 
+	color: #DD0000;
+}
+
+#padandcenter{ 
+	margin: 0 auto 0 auto;
+	padding: 14px 0 14px 0;
+	text-align: center;
+}
+
+#profilename{ 
+	font-size: 28px; 
+	font-weight: bold; 
+}
+
+#photowrap{ 
+	padding: 6px; 
+}
+
+#phototitle{ 
+	border-bottom: 1px solid #000; 
+	font-size: 24px; 
+}
+
+#photoimg{ 
+	margin: 15px 0 0 0;
+	text-align: center; 
+} 
+
+#ucpmenu,
+#ucpcontent{ 
+	background: #F5F9FD;
+	border: 1px solid #345487;
+	line-height: 150%;
+}
+
+#ucpmenu p{ 
+	margin: 0; 
+	padding: 2px 5px 6px 9px;
+}
+
+#ucpmenu a:link, 
+#ucpmenu a:active, 
+#ucpmenu a:visited{ 
+	text-decoration: none; 
+}
+
+#ucpcontent{ 
+	width: auto;
+}
+
+#ucpcontent p{ 
+	margin: 0;
+	padding: 10px;
+}
+
+.activeuserstrip{ 
+	background: #BCD0ED;
+	padding: 6px;
+}
+
+/* Topic View elements */
+.signature{  
+	background: transparent;
+	color: #339; 
+	font-size: 10px;
+	line-height: 150%;
+}
+
+.postdetails{ 
+	font-size: 10px;
+	line-height:140%;
+}
+
+.postcolor{ 
+	font-size: 12px; 
+	line-height: 160%;
+}
+
+.normalname{ 
+	color: #003;
+	font-size: 12px; 
+	font-weight: bold; 
+}
+
+.normalname a:link, 
+.normalname a:visited, 
+.normalname a:active{ 
+	font-size: 12px;
+}
+
+.post1,
+.bg1{ 
+	background: #F5F9FD;
+}
+
+.post2,
+.bg3{ 
+	background: #EEF2F7;
+}
+
+.row2shaded,
+.post1shaded { background-color: #DEDBE4 }
+.row4shaded,
+.post2shaded { background-color: #E3DFE7 }
+
+.row1{ 
+	background: #DFE6EF; 
+}
+
+.row2{ 
+	background: #E4EAF2; 
+}
+
+.darkrow1{ 
+	background: #BCD0ED;
+	color: #3A4F6C; 
+}
+
+.darkrow3{ 
+	background: #D1DCEB; 
+	color: #3A4F6C; 
+}
+
+/* tableborders gives the white column / row lines effect */
+.plainborder,
+.tablefill,
+.tablepad{ 
+	background: #F5F9FD;
+	border: 1px solid #345487;
+}
+
+.tablefill,
+.tablepad{ 
+	padding: 6px;  
+}
+
+.tablepad{ 
+	border: 0 !important;
+}
+
+.wrapmini{ 
+	float: left;
+	line-height: 1.5em;
+	width: 25%;
+}
+
+.pagelinks{
+	float: left;
+	line-height: 1.2em;
+	width: 35%;
+}
+
+.desc{ 
+	font-size: 11px; 
+	color: #434951;
+}
+
+.lastaction
+{
+	font-size: 10px; 
+	color: #434951;
+}
+
+.edit{ 
+	font-size: 9px;
+}
+
+.thin{ 
+	border: 1px solid #FFF;
+	border-left: 0;
+	border-right: 0;
+	line-height: 150%;
+	margin: 2px 0 2px 0;
+	padding: 6px 0 6px 0;
+}
+
+/* =================================================================================== */
+/* =================================================================================== */
+/* =================================================================================== */
+
+/* 
+ * ========================================
+ * calendar styles 
+ * ========================================
+ */
+	
+.calmonths{ 
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	font-size: 18px; 
+	font-weight: bold; 
+	margin: 5px 0 5px 0;
+	padding: 8px;
+	text-align: center;
+}
+
+.weekday{
+	font-size: 14px;
+	font-weight: bold;
+}
+
+.calmonths a{
+	text-decoration: none;
+}
+
+.calday,
+.calweekday{ 
+	background: #DFE6EF;
+	color: #666;
+	font-size: 11px;
+	font-weight: bold;
+	margin: 0;
+	padding: 4px;
+	text-align: right;
+}
+
+.calweekday{
+	border-right: 1px solid #AAA;
+	color: #222;
+	font-size: 14px;
+	padding: 6px;
+	text-align: center;
+}
+
+.cellblank,
+.celldate,
+.celltoday,
+.mcellblank,
+.mcelldate,
+.mcelltoday{
+	background: #EEF2F7;
+	height: 100px;
+	margin: 0;
+	padding: 0;
+	vertical-align: top;
+}
+
+.mcellblank,
+.mcelldate,
+.mcelltoday{
+	height: auto;
+}
+
+.cellblank,
+.mcellblank{
+	background: #C2CFDF;
+}
+
+.celltoday,
+.mcelltoday{
+	border: 2px solid #8B0000;
+}
+
+/* 
+ * ========================================
+ * form styles 
+ * ========================================
+ */
+
+input,
+textarea,
+select{
+	background: #FFF;
+	border: 1px solid #4C77B6;
+	color: #000;
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 11px;
+	margin: 5px;
+	padding: 2px;
+	vertical-align: middle;
+}
+
+select{
+	border: 0;
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 12px;
+	margin: 0;
+	padding: 0;
+}
+
+input.button{
+	margin: 0;
+	width: auto;
+}
+
+optgroup option{
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 12px;
+}
+
+.codebuttons{ 
+	font-family: Verdana, Helvetica, Sans-Serif; 
+	font-size: 10px; 
+	vertical-align: middle;
+	margin:2px;
+}
+
+.textarea,
+.searchinput,
+.button,
+.gobutton{
+	background: #FFF;
+	border: 1px solid #4C77B6;
+	color: #000;
+	font-family: Verdana, Helvetica, Sans-Serif;
+	font-size: 11px;
+	padding: 2px;
+	vertical-align: middle;
+}
+	
+.button{
+	background: #DFE6EF;
+}
+
+.gobutton{
+	background: transparent;
+	border: 0;
+	color: #072A66;
+	margin: 0;
+	vertical-align: middle;
+}
+
+.radiobutton,
+.checkbox,
+.helpbox { 
+	border: 0;
+	vertical-align: middle;
+}
+
+/* 
+ * class.formtable 
+ *
+ * used for tabled forms 
+ * technically tables should not be used for form display 
+ * but, in the case of IPB a table is easier to work with
+ * for the average webmaster, who has little to no CSS knowledge.
+ *
+ */
+
+.formtable{
+	background: transparent;
+}
+
+.formtable td,
+.pformleft,
+.pformleftw,
+.pformright{
+	background:#F5F9FD;
+	border: 1px solid #C2CFDF;
+	border-bottom: 0;
+	border-left: 0;
+	font-weight: bold;
+	margin: 1px 0 0 0;
+	padding: 6px;
+	width: 25%;
+} 
+
+.formtable td.wider,
+.pformleftw,
+.pformright{
+	width: 40%;
+}
+
+.formtable td.formright,
+.pformright{
+	border-right: 0;
+	font-weight: normal;
+	width: auto;
+} 
+
+.formtable td.formtitle,
+.formsubtitle{
+	background: #D1DCEB;
+	border: 1px solid #9FB9D4; 
+	border-bottom: 0;
+	border-left: 0;
+	border-right: 0;
+	font-weight: normal;
+}
+
+.formsubtitle{ 
+	border: 0;
+	color: #3A4F6C;
+	font-weight: bold;
+	padding: 5px;
+}
+
+.formtable td.formstrip{
+	background: #DDE8F2;
+	border: 1px solid #9FB9D4;
+	border-left: 0;
+	border-right: 0;
+	font-weight: normal;
+}
+
+/* 
+ * ========================================
+ * new style quote and code wrappers MATT's DESIGN 
+ * ========================================
+ */
+
+.quotetop{
+	background: #E4EAF2 url(<#IMG_DIR#>/css_img_quote.gif) no-repeat right;
+	border: 1px dotted #000;
+	border-bottom: 0;
+	border-left: 4px solid #8394B2;
+	color: #000;
+	font-weight: bold;
+	font-size: 10px;
+	margin: 8px auto 0 auto;
+	padding: 3px;
+}
+
+.quotemain{
+	background: #FAFCFE;
+	border: 1px dotted #000;
+	border-left: 4px solid #8394B2;
+	border-top: 0;
+	color: #465584;
+	padding: 4px;
+	margin: 0 auto 8px auto;
+}
+
+.codetop,
+.sqltop,
+.htmltop{
+	background: #FDDBCC url(<#IMG_DIR#>/css_img_code.gif) no-repeat right;
+	color: #000;
+	font-weight: bold;
+	margin: 0 auto 0 auto;
+	padding: 3px;
+	width: 98%;
+}
+
+.codemain,
+.sqlmain,
+.htmlmain{
+	background: #FAFCFE;
+	border: 1px dotted #000;
+	color: #465584;
+	font-family: Courier, Courier New, Verdana, Arial;
+	margin: 0 auto 0 auto;
+	padding: 2px;
+	width: 98%;
+}
+
+/* 
+ * ========================================
+ * old school quote and code styles - backwards compatibility 
+ * ========================================
+ */
+
+#QUOTE,
+#CODE{  
+	background: #FAFCFE; 
+	border: 1px solid #000; 
+	color: #465584; 
+	font-family: Verdana, Arial; 
+	font-size: 11px; 
+	padding: 2px; 
+	white-space: normal;
+}
+
+#CODE{ 
+	font-family: Courier, Courier New, Verdana, Arial;
+}
+
+/* 
+ * ========================================
+ * All New Styles 
+ * ========================================
+ */
+.cleared{
+	clear: both;
+}
+
+.borderwrap,
+.borderwrapm{ /* this will affect the outlining border of all the tables and boxes through-out the skin. */
+	background: #FFF; 
+	border: 1px solid #072A66;
+	padding: 0; 
+	margin: 0; 
+}
+
+.borderwrapm{
+	margin: 5px;
+}
+
+.borderwrap h3,
+.maintitle,
+.maintitlecollapse{
+	background: transparent url(<#IMG_DIR#>/tile_cat.gif);
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	color: #FFF; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 8px;
+}
+
+.maintitlecollapse{
+	border: 1px solid #FFF;
+}
+
+.maintitle p,
+.maintitlecollapse p,
+.formsubtitle p{
+	background: transparent !important;
+	border: 0 !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+.maintitle p.expand,
+.maintitle p.goto,
+.maintitlecollapse p.expand,
+.formsubtitle p.members{
+	float: right;
+	width: auto !important;
+}
+
+.maintitle a:link, 
+.maintitle a:visited,
+.maintitlecollapse a:link, 
+.maintitlecollapse a:visited{ 
+	background: transparent;
+	color: #FFF;
+	text-decoration: none; 
+}
+
+.maintitle a:hover, 
+.maintitle a:active,
+.maintitlecollapse a:hover, 
+.maintitlecollapse a:active{ 
+	background: transparent;
+	color: #F1F1F1;
+}
+
+table th,
+.borderwrap table th,
+.subtitle,
+.subtitlediv,
+.postlinksbar{ 
+	background: transparent url(<#IMG_DIR#>/tile_sub.gif);
+	border-bottom: 1px solid #5176B5;
+	color: #3A4F6C; 
+	font-size: 10px;
+	font-weight: bold; 
+	letter-spacing: 1px;
+	margin: 0; 
+	padding: 5px; 
+}
+
+.subtitlediv{
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	text-align: right;
+}
+
+.borderwrap table th a:link,
+.subtitle a:link,
+.subtitlediv a:link,
+.borderwrap table th a:visited,
+.subtitle a:visited, 
+.subtitlediv a:visited, 
+.borderwrap table th a:active,
+.subtitle a:active,
+.subtitlediv a:active,
+.borderwrap table th a:hover,
+.subtitle a:hover,
+.subtitlediv a:hover{ 
+	background: transparent;
+	color: #3A4F6C;
+	text-decoration: none; 
+}
+
+.borderwrap h4{
+	background: #DDE6F2;
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	border-top: 1px solid #5176B5;
+	color: #5176B5; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.borderwrap p{
+	background: #F9F9F9;
+	border: 1px solid #CCC;
+	margin: 5px;
+	padding: 10px;
+	text-align: left;
+}
+
+td.formbuttonrow,
+.borderwrap p.formbuttonrow,
+.borderwrap p.formbuttonrow1{
+	background: #D1DCEB !important; 
+	border: 1px solid #FFF;
+	border-top: 1px solid #5176B5;
+	margin: 0px !important;
+	padding: 5px !important;
+	text-align: center;
+}
+
+td.formbuttonrow{
+	border-bottom: 0;
+	border-left: 0;
+	border-right: 0;
+}
+
+.borderwrap p.formbuttonrow1{
+	background: #F9F9F9 !important;
+	border: 0;
+	border-top: 1px solid #CCC;
+}
+
+.bar,
+.barb,
+.barc{
+	background: #DFE6EF;
+	border: 1px solid #FFF;
+}
+
+.barc{
+	border-bottom: 0;
+}
+
+.bar p,
+.barb p,
+.barc p{
+	background: transparent;
+	border: 0;
+	color: #222;
+	font-size: 11px;
+	margin: 0;
+	padding: 5px;
+	text-align: left;
+}
+
+.barb p{
+	text-align: right;
+}
+
+.bar p.over,
+.bar p.overs,
+.barc p.over,
+.barc p.overs{
+	float: right;
+}
+
+.barb p.over,
+.barb p.overs{
+	float: left;
+}
+
+.bar p.overs,
+.barb p.overs,
+.barc p.overs{
+	position: relative;
+	top: 5px;
+}
+
+.catend{
+	background: #8394B2;
+	color: #000;
+	font-size: 1px;
+	height: 5px;
+}
+
+.newslink{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 0;
+	width: 100%;
+}
+
+.newslink td{
+	color: #222;
+	font-size: 10px;
+	padding: 5px 5px 5px 10px;
+}
+
+.newslink span{
+	background: transparent;
+	color: #072A66;
+	font-style: italic;
+	font-weight: normal;
+}
+
+.newslink input{
+	background: #FFF;
+	border: 1px solid #999;
+	color: #072A66;
+	font-size: 10px;
+	padding: 3px;
+	vertical-align: middle;
+	width: auto;
+}
+
+.newslink input.button{
+	background: transparent;
+	border: 0;
+	color: #072A66;
+	vertical-align: middle;
+}
+
+.fieldwrap{
+	background: #F9F9F9;
+	border: 1px solid #CCC;
+	border-top: 0;
+	margin: 5px;
+	padding: 0;
+	text-align: left;
+}
+
+.fieldwrap h4{
+	background: #EEE;
+	border: 1px solid #CCC;
+	border-left: 0;
+	border-right: 0;
+	color: #444; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.errorwrap,
+#pmnotewrap{
+	background: #F2DDDD;
+	border: 1px solid #992A2A;
+	border-top: 0;
+	margin: 5px;
+	padding: 0;
+}
+
+#pmnotewrap{
+	line-height: 135%;
+	margin: 0 0 5px 0;
+}
+
+.errorwrap h4,
+#pmnotewrap h4{
+	background: #E3C0C0;
+	border: 1px solid #992A2A;
+	border-left: 0;
+	border-right: 0;
+	color: #992A2A; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.errorwrap p,
+#pmnotewrap p{
+	background: transparent;
+	border: 0;
+	color: #992A2A;
+	margin: 0;
+	padding: 8px;
+}
+
+#pmnotewrap p.pmavatar{
+	float: left;
+}
+
+#pmnotewrap p.pmnotefoot{
+	background: #E3C0C0;
+	border-top: 1px solid #992A2A;
+	text-align: right;
+}
+
+#pmnotewrap a:link, 
+#pmnotewrap  a:visited{ 
+	background: transparent; 
+	color: #992A2A; 
+	text-decoration: underline;
+}
+
+#pmnotewrap a:hover, 
+#pmnotewrap a:active{
+	background: transparent; 
+	color: #992A2A; 
+	text-decoration: none;
+}
+
+.ruleswrap{
+	background: #F2DDDD;
+	border: 1px solid #992A2A;
+	color: #992A2A; 
+	margin: 5px 0 5px 0;
+	padding: 5px;
+}
+
+#redirectwrap{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 200px auto 0 auto;
+	text-align: left;
+	width: 500px;
+}
+
+#redirectwrap h4{
+	background: #D0DDEA;
+	border-bottom: 1px solid #C2CFDF;
+	color: #3A4F6C;
+	font-size: 14px;
+	margin: 0;
+	padding: 5px;
+}
+
+#redirectwrap p{
+	margin: 0;
+	padding: 5px;
+}
+
+#redirectwrap p.redirectfoot{
+	background: #E3EBF4;
+	border-top: 1px solid #C2CFDF;
+	text-align: center;
+}
+
+
+#gfooter{
+	background: #8394B2;
+	margin: 5px 0 5px 0;
+	padding: 0;
+	width: 100%;
+}
+
+#gfooter td{
+	color: #FFF;
+	font-size: 10px;
+	padding: 4px;
+}
+
+#gfooter a:link,
+#gfooter a:visited{
+	color: #FFF;
+}
+
+#logostrip{ 
+	background: #3860BB url(<#IMG_DIR#>/tile_back.gif);
+	border: 1px solid #FFF;
+	height: 68px;
+	margin: 0;
+	padding: 0;
+}
+
+#submenu{ 
+	background: transparent url(<#IMG_DIR#>/tile_sub.gif);
+	border: 1px solid #FFF;
+	border-top: 0;
+	color: #3A4F6C; 
+	margin: 0; 
+}
+
+#userlinks,
+#userlinksguest{ 
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 5px 0 5px 0;
+	padding: 0 5px 0 5px;
+}
+
+#userlinksguest{ 
+	background: #F4E7EA;
+	border: 1px solid #986265;
+}
+
+#submenu p,
+#userlinks p,
+#userlinksguest p{
+	background: transparent !important;
+	border: 0 !important;
+	font-size: 10px;
+	font-weight: bold; 
+	letter-spacing: 1px;
+	margin: 0 !important;
+	padding: 7px 0 7px 0; 
+	text-align: right;
+}
+
+#userlinks p,
+#userlinksguest p{
+	font-weight: normal;
+	letter-spacing: 0;
+}
+
+#submenu p.home,
+#userlinks p.home,
+#userlinksguest p.home{
+	float: left;
+}
+
+#userlinksguest p.pcen{
+	text-align: center;
+}
+
+#submenu a:link, 
+#submenu  a:visited{ 
+	background: transparent; 
+	color: #3A4F6C; 
+	padding: 0 6px 0 6px;
+	text-decoration: none;
+}
+
+#submenu a:hover, 
+#submenu a:active{
+	background: transparent; 
+	color: #5176B5; 
+}
+#navstrip{ 
+	background: transparent;
+	color: #999;
+	font-size: 12px;
+	font-weight: bold;
+	margin: 0 0 5px 0;
+	padding: 8px 0 8px 0px; 
+}
+
+#navstrip a:link, 
+#navstrip  a:visited{ 
+	background: transparent; 
+	color: #222; 
+	text-decoration: none;
+}
+
+#navstrip a:hover, 
+#navstrip a:active{
+	background: transparent; 
+	color: #5176B5; 
+}
+
+.toplinks{
+	background: transparent;
+	color: #000;
+	margin: 0;
+	padding: 0 0 5px 0;
+	text-align: right;
+}
+
+.toplinks span{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	border-bottom: 0;
+	color: #000;
+	font-size: 10px;
+	font-weight: bold;
+	margin: 0 10px 0 0;
+	padding: 5px;
+}
+
+.copyright{ 
+	background: #EEE;
+	font-size: 11px; 
+	margin: 0 0 5px 0;
+	padding: 8px;
+}
+
+/* 
+ * ========================================
+ * print page styles 
+ * ========================================
+ */
+
+#print{
+	margin: 20px auto 20px auto;
+	padding: 0;
+	text-align: left;
+	width: 85%;
+}
+
+#print h1,
+#print h2,
+#print h3,
+#print h4,
+#print p{
+	color: #036;
+	font-size: 18px;
+	font-weight: bold;
+	margin: 0;
+	padding: 8px;
+}
+
+#print h2,
+#print h3,
+#print p{
+	border-bottom: 1px solid #999;
+	font-size: 11px;
+	font-weight: normal;
+}
+
+#print h3{
+	background: #F5F5F5;
+	font-size: 12px;
+	font-weight: bold;
+	margin: 0 0 10px 0;
+}
+
+#print h4{
+	background: #F9F9F9;
+	font-size: 11px;
+}
+
+#print p{
+	margin: 0 0 5px 0;
+	padding: 10px;
+}
+
+#print p.printcopy{
+	border: 0;
+	color: #000;
+	text-align: center;
+}
+
+EOF;
+
+?>
\ No newline at end of file
diff --git a/upload/install/installfiles/ipb_macro.xml b/upload/install/installfiles/ipb_macro.xml
new file mode 100644
index 00000000..e2c8b26d
--- /dev/null
+++ b/upload/install/installfiles/ipb_macro.xml
@@ -0,0 +1,845 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<macroexport exported="1094727189">
+	<macrogroup>
+		<macro>
+			<macro_value>A_LOCKED_B</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_closed.gif' border='0'  alt='Closed Topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_MOVED_B</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_moved.gif' border='0'  alt='Moved Topic'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_POLLONLY_B</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_closed.gif' border='0'  alt='Poll Only' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_POST</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_new.gif' border='0'  alt='Start new topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_REPLY</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_reply.gif' border='0'  alt='Reply to this topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_POLL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_poll.gif' border='0'  alt='Start Poll' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_STAR</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/pip.gif' border='0'  alt='*' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot.gif' border='0'  alt='Hot topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT_NN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot_no.gif' border='0'  alt='No new' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_LOCKED</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_closed.gif' border='0'  alt='Closed' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_MOVED</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_moved.gif' border='0'  alt='Moved' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NEW</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm.gif' border='0'  alt='New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NORM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_no.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_PIN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_pinned.gif' border='0'  alt='Pinned' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll.gif' border='0'  alt='Poll' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL_NN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll_no.gif' border='0'  alt='No new votes' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot_dot.gif' border='0' alt='New Posts'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NEW_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_dot.gif' border='0' alt='No New Posts'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT_NN_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot_no_dot.gif' border='0' alt='No New Posts*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NORM_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_no_dot.gif' border='0' alt='No New Posts*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll_dot.gif' border='0' alt='Poll*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL_NN_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll_no_dot.gif' border='0' alt='No New Votes*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_LOCKED</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bf_readonly.gif' border='0'  alt='Read Only Forum' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_OFF</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bf_nonew.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_OFF_CAT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bc_nonew.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_OFF_RES</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/br_nonew.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_ON</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bf_new.gif' border='0'  alt='New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_ON_CAT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bc_new.gif' border='0'  alt='New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_ON_RES</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/br_new.gif' border='0'  alt='New Posts'  />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_ACTIVE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/user.gif' border='0'  alt='Active Users' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_NAV_SEP</macro_value>
+			<macro_replace><![CDATA[&nbsp;>&nbsp;]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_NAV</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nav.gif' border='0'  alt='&gt;' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_STATS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/stats.gif' border='0'  alt='Board Stats' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>NO_PHOTO</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nophoto.gif' border='0'  alt='No Photo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAMERA</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/camera.gif' border='0'  alt='Photo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>M_READ</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_no.gif' border='0'  alt='Read Msg' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>M_UNREAD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm.gif' border='0'  alt='Unread Msg' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_AOL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_aim.gif' border='0'  alt='AOL' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_DELETE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_delete.gif' border='0'  alt='Delete Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_EDIT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_edit.gif' border='0'  alt='Edit Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_EMAIL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_email.gif' border='0'  alt='Email Poster' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_ICQ</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_icq.gif' border='0'  alt='ICQ' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_MSG</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_pm.gif' border='0'  alt='PM' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_QUOTE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_quote.gif' border='0'  alt='Quote Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_WEBSITE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_www.gif' border='0'  alt='Users Website' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_YIM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_yim.gif' border='0' alt='Yahoo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_REPORT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_report.gif' border='0'  alt='Report Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_MSN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_msn.gif' border='0' alt='MSN' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAT_IMG</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nav_m.gif' border='0'  alt='&gt;' width='8' height='8' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>NEW_POST</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/newpost.gif' border='0'  alt='Goto last unread' title='Goto last unread' hspace=2>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>LAST_POST</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/lastpost.gif' border='0'  alt='Last Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>BR_REDIRECT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/br_redirect.gif' border='0'  alt='Redirect' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>INTEGRITY_MSGR</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_im.gif' border='0'  alt='Integrity Messenger IM' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ADDRESS_CARD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/addresscard.gif' border='0'  alt='Mini Profile' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>T_QREPLY</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_qr.gif' border='0'  alt='Fast Reply' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>T_OPTS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_options.gif' border='0'  alt='Topic Options' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAL_NEWEVENT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/cal_newevent.gif' border='0'  alt='Add New Event' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_RULES</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/forum_rules.gif' border='0'  alt='Forum Rules' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_0</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn0.gif' border='0'  alt='-----' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_1</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn1.gif' border='0'  alt='X----' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_2</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn2.gif' border='0'  alt='XX---' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_3</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn3.gif' border='0'  alt='XXX--' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_4</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn4.gif' border='0'  alt='XXXX-' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_5</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn5.gif' border='0'  alt='XXXXX' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_ADD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn_add.gif' border='0'  alt='+' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_MINUS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn_minus.gif' border='0'  alt='-' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PB_USER_ONLINE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_online.gif' border='0'  alt='User is online!' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PB_USER_OFFLINE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_offline.gif' border='0'  alt='User is offline' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ATTACH_ICON</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/attachicon.gif' border='0'  alt='Topic has attachments' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>MSG_FOLDER</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/msg_folder.gif' border='0'  alt='-' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ITEM_START</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nav_m_dark.gif' border='0'  alt='.' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ADDRESS_CARD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/addresscard.gif' border='0'  alt='Mini Profile' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>INTEGRITY_MSGR</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_im.gif' border='0'  alt='Integrity Messenger IM' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>BR_REDIRECT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/br_redirect.gif' border='0'  alt='Redirect' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>LAST_POST</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/lastpost.gif' border='0'  alt='Last Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>NEW_POST</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/newpost.gif' border='0'  alt='Goto last unread' title='Goto last unread' hspace=2>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAT_IMG</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nav_m.gif' border='0'  alt='&gt;' width='8' height='8' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_MSN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_msn.gif' border='0' alt='MSN' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_REPORT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_report.gif' border='0'  alt='Report Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_YIM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_yim.gif' border='0' alt='Yahoo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_WEBSITE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_www.gif' border='0'  alt='Users Website' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_QUOTE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_quote.gif' border='0'  alt='Quote Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_MSG</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_pm.gif' border='0'  alt='PM' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_ICQ</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_icq.gif' border='0'  alt='ICQ' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_EMAIL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_email.gif' border='0'  alt='Email Poster' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_EDIT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_edit.gif' border='0'  alt='Edit Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_DELETE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_delete.gif' border='0'  alt='Delete Post' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_AOL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_aim.gif' border='0'  alt='AOL' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>M_UNREAD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm.gif' border='0'  alt='Unread Msg' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>M_READ</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_no.gif' border='0'  alt='Read Msg' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAMERA</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/camera.gif' border='0'  alt='Photo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>NO_PHOTO</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nophoto.gif' border='0'  alt='No Photo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_STATS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/stats.gif' border='0'  alt='Board Stats' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_NAV</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nav.gif' border='0'  alt='&gt;' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_NAV_SEP</macro_value>
+			<macro_replace><![CDATA[&nbsp;>&nbsp;]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_ACTIVE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/user.gif' border='0'  alt='Active Users' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_ON_RES</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/br_new.gif' border='0'  alt='New Posts'  />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_ON_CAT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bc_new.gif' border='0'  alt='New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_ON</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bf_new.gif' border='0'  alt='New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_OFF_RES</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/br_nonew.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_OFF_CAT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bc_nonew.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_OFF</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bf_nonew.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>C_LOCKED</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bf_readonly.gif' border='0'  alt='Read Only Forum' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL_NN_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll_no_dot.gif' border='0' alt='No New Votes*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll_dot.gif' border='0' alt='Poll*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NORM_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_no_dot.gif' border='0' alt='No New Posts*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT_NN_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot_no_dot.gif' border='0' alt='No New Posts*'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NEW_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_dot.gif' border='0' alt='No New Posts'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT_DOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot_dot.gif' border='0' alt='New Posts'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL_NN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll_no.gif' border='0'  alt='No new votes' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_POLL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_poll.gif' border='0'  alt='Poll' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_PIN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_pinned.gif' border='0'  alt='Pinned' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NORM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm_no.gif' border='0'  alt='No New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_NEW</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_norm.gif' border='0'  alt='New Posts' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_MOVED</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_moved.gif' border='0'  alt='Moved' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_LOCKED</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_closed.gif' border='0'  alt='Closed' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT_NN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot_no.gif' border='0'  alt='No new' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>B_HOT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/f_hot.gif' border='0'  alt='Hot topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_STAR</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/pip.gif' border='0'  alt='*' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_POLL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_poll.gif' border='0'  alt='Start Poll' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_REPLY</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_reply.gif' border='0'  alt='Reply to this topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_POST</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_new.gif' border='0'  alt='Start new topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_MOVED_B</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_moved.gif' border='0'  alt='Moved Topic'>]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_POLLONLY_B</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_closed.gif' border='0'  alt='Poll Only' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ACTIVE_LIST_SEP</macro_value>
+			<macro_replace>,</macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>BC_QUEUED_POSTS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bc_queued.gif' alt='*' border='0' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_LOCKED_B</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_closed.gif' border='0'  alt='Closed Topic' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_APOLL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_addpoll.gif' border='0'  alt='Add Poll' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_CALEN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/calen.gif' border='0'  alt='calendar' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>E_PLUS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/exp_plus.gif' border='0'  alt='Expand' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>E_MINUS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/exp_minus.gif' border='0'  alt='Collapse' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>test</macro_value>
+			<macro_replace>test</macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>T_QREPLY</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_qr.gif' border='0'  alt='Fast Reply' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>T_OPTS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_options.gif' border='0'  alt='Topic Options' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAL_NEWEVENT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/cal_newevent.gif' border='0'  alt='Add New Event' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_RULES</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/forum_rules.gif' border='0'  alt='Forum Rules' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_0</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn0.gif' border='0'  alt='-----' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_1</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn1.gif' border='0'  alt='X----' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_2</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn2.gif' border='0'  alt='XX---' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_3</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn3.gif' border='0'  alt='XXX--' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_4</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn4.gif' border='0'  alt='XXXX-' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_5</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn5.gif' border='0'  alt='XXXXX' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_ADD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn_add.gif' border='0'  alt='+' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>WARN_MINUS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/warn_minus.gif' border='0'  alt='-' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PB_USER_ONLINE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_online.gif' border='0'  alt='User is online!' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PB_USER_OFFLINE</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_offline.gif' border='0'  alt='User is offline' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ATTACH_ICON</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/attachicon.gif' border='0'  alt='Topic has attachments' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>MSG_FOLDER</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/msg_folder.gif' border='0'  alt='-' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ITEM_START</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/nav_m_dark.gif' border='0'  alt='.' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>ACTIVE_LIST_SEP</macro_value>
+			<macro_replace>,</macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>BC_QUEUED_POSTS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bc_queued.gif' alt='*' border='0' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>A_APOLL</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/t_addpoll.gif' border='0'  alt='Add Poll' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>F_CALEN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/calen.gif' border='0'  alt='calendar' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>E_PLUS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/exp_plus.gif' border='0'  alt='Expand' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>E_MINUS</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/exp_minus.gif' border='0'  alt='Collapse' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>test</macro_value>
+			<macro_replace>test</macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_UP</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_up.gif' border='0'  alt='Go to the top of the page' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>POST_SNAPBACK</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/post_snapback.gif' alt='*' border='0' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>P_CARD</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/p_card.gif' border='0'  alt='Profile Card' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PRO_AIM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/profile_aim.gif' border='0'  alt='AIM' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PRO_ITEM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/profile_item.gif' border='0'  alt='Profile Item' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PRO_MSN</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/profile_msn.gif' border='0'  alt='MSN' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PRO_ICQ</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/profile_icq.gif' border='0'  alt='ICQ' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PRO_YIM</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/profile_yahoo.gif' border='0'  alt='Yahoo' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>PRO_CONTACT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/icon_msg_nonew.gif' border='0'  alt='Contact' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>BAR_LEFT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bar_left.gif' border='0'  alt='*' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>BAR_RIGHT</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/bar_right.gif' border='0'  alt='*' />]]></macro_replace>
+		</macro>
+
+		<macro>
+			<macro_value>CAL_GOTO</macro_value>
+			<macro_replace><![CDATA[<img src='style_images/<#IMG_DIR#>/cal_goto.gif' border='0'  alt='Goto Month' />]]></macro_replace>
+		</macro>
+	</macrogroup>
+
+</macroexport>
\ No newline at end of file
diff --git a/upload/install/installfiles/ipb_settings.xml b/upload/install/installfiles/ipb_settings.xml
new file mode 100644
index 00000000..112840fb
--- /dev/null
+++ b/upload/install/installfiles/ipb_settings.xml
@@ -0,0 +1,4808 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<settingexport exported="1095329345">
+	<settinggroup>
+		<setting>
+			<conf_id>174</conf_id>
+			<conf_title>Show link in header to guidelines?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>17</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>gl_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>175</conf_id>
+			<conf_title>External http:// link to guidlines page?</conf_title>
+			<conf_description>Enter the URL to a set of external guidelines or if you wish to add your guidelines below simply leave this box clear.</conf_description>
+			<conf_group>17</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>gl_link</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>176</conf_id>
+			<conf_title>Title to use in header?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>17</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>gl_title</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>177</conf_id>
+			<conf_title>If not using external link; guidelines/rules text</conf_title>
+			<conf_description>HTML Enabled</conf_description>
+			<conf_group>17</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>gl_guidelines</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>238</conf_id>
+			<conf_title><![CDATA[Registration Terms &amp; Rules]]></conf_title>
+			<conf_description><![CDATA[The content of this section will be displayed before a member can register a new account.
+<b>HTML ENABLED</b>]]></conf_description>
+			<conf_group>17</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>reg_rules</conf_key>
+			<conf_value></conf_value>
+			<conf_default><![CDATA[<b>Forum Terms & Rules</b>
+
+Please take a moment to review these rules detailed below. If you agree with them and wish to proceed with the registration, simply click the "Register" button below. To cancel this registration, simply hit the 'back' button on your browser.
+
+Please remember that we are not responsible for any messages posted. We do not vouch for or warrant the accuracy, completeness or usefulness of any message, and are not responsible for the contents of any message.
+
+The messages express the views of the author of the message, not necessarily the views of this bulletin board. Any user who feels that a posted message is objectionable is encouraged to contact us immediately by email. We have the ability to remove objectionable messages and we will make every effort to do so, within a reasonable time frame, if we determine that removal is necessary.
+
+You agree, through your use of this service, that you will not use this bulletin board to post any material which is knowingly false and/or defamatory, inaccurate, abusive, vulgar, hateful, harassing, obscene, profane, sexually oriented, threatening, invasive of a person's privacy, or otherwise violative of any law.
+
+You agree not to post any copyrighted material unless the copyright is owned by you or by this bulletin board.
+]]></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group><![CDATA[Registration Terms &amp; Rules]]></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>163</conf_id>
+			<conf_title>Turn the board offline?</conf_title>
+			<conf_description><![CDATA[The board will still be accessable by those who have permission (settable from the Users & Groups section).]]></conf_description>
+			<conf_group>15</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>board_offline</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>164</conf_id>
+			<conf_title>The offline message to display</conf_title>
+			<conf_description></conf_description>
+			<conf_group>15</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>offline_msg</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>122</conf_id>
+			<conf_title>Show birthdays on the main calendar view?</conf_title>
+			<conf_description><![CDATA[If set to "yes", the calendar will show the number of birthdays for that day.]]></conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_bday_calendar</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>123</conf_id>
+			<conf_title><![CDATA[Show Today&#39;s birthdays on the board view?]]></conf_title>
+			<conf_description><![CDATA[If set to "yes", this will show the day's birthdays on the board index view.]]></conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_birthdays</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group><![CDATA[Today&#39;s Birthdays]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>124</conf_id>
+			<conf_title>Auto hide when no birthdays to show?</conf_title>
+			<conf_description><![CDATA[If set to "yes", this will remove the "Today's Birthdays" block from the board index when there is none to show.]]></conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>autohide_bday</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>125</conf_id>
+			<conf_title>Show forthcoming calendar events?</conf_title>
+			<conf_description><![CDATA[If set to "yes", this will show single forthcoming calendar events on the board index view. It will not show recurring events or ranged events.]]></conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_calendar</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group>Forcoming Calendar Events</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>126</conf_id>
+			<conf_title>Auto hide when no events to show?</conf_title>
+			<conf_description><![CDATA[If set to "yes", this will remove the forcoming calendar events block from the board index view if there are none to show.]]></conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>autohide_calendar</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>127</conf_id>
+			<conf_title><![CDATA[Show forthcoming events from today to [x] days ahead]]></conf_title>
+			<conf_description>Controls how far into the future events are shown on the forcoming events block on board index view.</conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>calendar_limit</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>128</conf_id>
+			<conf_title><![CDATA[Starting year for calendar &#39;Year&#39; drop down box]]></conf_title>
+			<conf_description>This applies to view calendar / post event.</conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>start_year</conf_key>
+			<conf_value></conf_value>
+			<conf_default>2001</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>129</conf_id>
+			<conf_title><![CDATA[Year end limit for &#39;Year&#39; drop down box]]></conf_title>
+			<conf_description><![CDATA[This applies to view calendar / post event.<br>Example: current year is 2002, you enter 5 - last choosable year = 2007]]></conf_description>
+			<conf_group>9</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>year_limit</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>184</conf_id>
+			<conf_title>Log in with user name or email address?</conf_title>
+			<conf_description>Which identifiable piece of information do you wish to require your members to use when logging in?</conf_description>
+			<conf_group>18</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>converge_login_method</conf_key>
+			<conf_value></conf_value>
+			<conf_default>username</conf_default>
+			<conf_extra>username=User Name
+email=Email Address</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>116</conf_id>
+			<conf_title>Cookie Domain</conf_title>
+			<conf_description><![CDATA[Hint: use <b>.your-domain.com</b> for global cookie]]></conf_description>
+			<conf_group>7</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>cookie_domain</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>117</conf_id>
+			<conf_title>Cookie Name Prefix</conf_title>
+			<conf_description>Allows multiple boards on one host.</conf_description>
+			<conf_group>7</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>cookie_id</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>118</conf_id>
+			<conf_title>Cookie Path</conf_title>
+			<conf_description>Relative path from domain to root IBF dir</conf_description>
+			<conf_group>7</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>cookie_path</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>119</conf_id>
+			<conf_title>Use COPPA registration system?</conf_title>
+			<conf_description><![CDATA[Enabling <a href="http://www.ftc.gov/ogc/coppa1.htm" target="_blank">COPPA</a> on your board will require children under the age of 13 to get parental consent via a faxed or mailed form.]]></conf_description>
+			<conf_group>8</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>use_coppa</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>120</conf_id>
+			<conf_title>Fax number to receive COPPA forms</conf_title>
+			<conf_description></conf_description>
+			<conf_group>8</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>coppa_fax</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>121</conf_id>
+			<conf_title>Mail address to receive COPPA forms</conf_title>
+			<conf_description></conf_description>
+			<conf_group>8</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>coppa_address</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>24</conf_id>
+			<conf_title>Allow custom profile field info be used in TopicView?</conf_title>
+			<conf_description><![CDATA[If set to "yes", this will add a LEFT JOIN onto the custom profile field table.]]></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>custom_profile_topic</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Saving SQL Resources</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>22</conf_id>
+			<conf_title>Cache calendar and birthdays?</conf_title>
+			<conf_description><![CDATA[Not recommended if your board isn't visited daily.]]></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>cache_calendar</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>20</conf_id>
+			<conf_title><![CDATA[Cut off for active user display [in minutes]]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>au_cutoff</conf_key>
+			<conf_value></conf_value>
+			<conf_default>15</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>181</conf_id>
+			<conf_title>Storing Read Topics in the Database</conf_title>
+			<conf_description><![CDATA[Enter how many days you wish to store read topic information for. For large busy boards we recommend keeping it to around 7 days to prevent a large slow database table. The task manager will prune back this table to keep it manageable.
+Enter <b>0</b> (zero) to NOT store read topic info in the database.]]></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>db_topic_read_cutoff</conf_key>
+			<conf_value></conf_value>
+			<conf_default>7</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>25</conf_id>
+			<conf_title>Mark topics a user has posted when displaying a forum?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_user_posted</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>26</conf_id>
+			<conf_title><![CDATA[Remove &#39;Users Browsing this forum&#39; feature?]]></conf_title>
+			<conf_description>This save 1 query per forum view</conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>no_au_forum</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra>no_au_forum</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group>Turning Features Off</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>27</conf_id>
+			<conf_title><![CDATA[Remove &#39;Users Browsing this topic&#39; feature?]]></conf_title>
+			<conf_description>(This save 1 query per topic view)</conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>no_au_topic</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>19</conf_id>
+			<conf_title>Show Active Users</conf_title>
+			<conf_description></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_active</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>29</conf_id>
+			<conf_title>Allow users (where allowed) to use search?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_search</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>23</conf_id>
+			<conf_title>Show Board Totals?</conf_title>
+			<conf_description>Show the board totals at the footer of the board index page.</conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_totals</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>28</conf_id>
+			<conf_title>Server Load Limit</conf_title>
+			<conf_description><![CDATA[Will display 'busy' message when limit hit<br>Can be left blank for no limit]]></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>load_limit</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>31</conf_id>
+			<conf_title>Minimum search word length</conf_title>
+			<conf_description><![CDATA[Allowing shorter search words can return more results, such as 'if', 'at', etc. Note, this will not have any effect if you are full text search.]]></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>min_search_word</conf_key>
+			<conf_value></conf_value>
+			<conf_default>4</conf_default>
+			<conf_extra>min_search_word</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>32</conf_id>
+			<conf_title>Print HTTP no-cache headers?</conf_title>
+			<conf_description>(This will stop browsers caching pages)</conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>nocache</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group>Reducing HTML output</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>30</conf_id>
+			<conf_title><![CDATA[Cut search post to [x] characters]]></conf_title>
+			<conf_description><![CDATA[Refers to when returning search results as posts<br>Leave blank to return full post with proper formatting]]></conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>search_post_cut</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>33</conf_id>
+			<conf_title>Show short forum jump list?</conf_title>
+			<conf_description>This will remove sub-forums from the drop down list - useful if you have many</conf_description>
+			<conf_group>2</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>short_forum_jump</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra>short_forum_jump</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>34</conf_id>
+			<conf_title>Native Server Time Zone</conf_title>
+			<conf_description><![CDATA[<span style='color:red'>If you have chosen the correct timezone and the clock is an hour out, this is because of daylight savings time and your members can correct this by editing their 'Board settings' via their User Control Panel.</span>]]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>time_offset</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp><![CDATA[if ( $show == 1 )
+{
+require ROOT_PATH."lang/en/lang_ucp.php";
+		foreach( $lang as $off => $words )
+ 		{
+ 			if (preg_match("/^time_(\S+)$/", $off, $match))
+ 			{
+ 				$dropdown[] = array( $match[1], $words );
+ 			}
+ 		}
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Time Adjustments</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>35</conf_id>
+			<conf_title>Server Time Adjustment (in minutes)</conf_title>
+			<conf_description><![CDATA[You fine tune the server time. If you need to subtract minutes from the server time, start the number with a '-' (no quotes)
+<br>Board time (inc. above time zone and current adj.) is now: <-T->]]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>time_adjust</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp><![CDATA[if ( $show )
+{
+    $d_date = $std->get_date(time(), 'LONG');
+$r['conf_description'] = str_replace( '<-T->', $d_date, $r['conf_description'] );
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>36</conf_id>
+			<conf_title>Short time format</conf_title>
+			<conf_description><![CDATA[Same configuration as <a href='http://www.php.net/date' target='_blank'>PHP Date</a>]]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>clock_short</conf_key>
+			<conf_value></conf_value>
+			<conf_default>jS F Y - h:i A</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>37</conf_id>
+			<conf_title>Join date time format</conf_title>
+			<conf_description><![CDATA[Same configuration as <a href='http://www.php.net/date' target='_blank'>PHP Date]]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>clock_joined</conf_key>
+			<conf_value></conf_value>
+			<conf_default>j-F y</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>38</conf_id>
+			<conf_title>Long time format</conf_title>
+			<conf_description><![CDATA[Same configuration as <a href='http://www.php.net/date' target='_blank'>PHP Date</a>]]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>clock_long</conf_key>
+			<conf_value></conf_value>
+			<conf_default>M j Y, h:i A</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>39</conf_id>
+			<conf_title>Use relative dates?</conf_title>
+			<conf_description><![CDATA[Would use 'today' and 'yesterday' in posts / last post info]]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>time_use_relative</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group>Relative Dates</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>40</conf_id>
+			<conf_title>Relative time format</conf_title>
+			<conf_description><![CDATA[{--} Will be replaced with 'today' or 'yesterday']]></conf_description>
+			<conf_group>3</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>time_use_relative_format</conf_key>
+			<conf_value></conf_value>
+			<conf_default>{--}, h:i A</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>135</conf_id>
+			<conf_title>Board incoming email address</conf_title>
+			<conf_description>This is the email address that all incoming mail is addressed to.</conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>email_in</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Email Addresses</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>136</conf_id>
+			<conf_title>Board outgoing email address</conf_title>
+			<conf_description>This is the email address that all mail appears to come from.</conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>email_out</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>137</conf_id>
+			<conf_title>Mail Delivery Method</conf_title>
+			<conf_description><![CDATA[If PHP's mail() isn't available, choose SMTP. If you are unsure, please ask your web host.]]></conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>mail_method</conf_key>
+			<conf_value></conf_value>
+			<conf_default>mail</conf_default>
+			<conf_extra>mail=PHP Mail()
+smtp=SMTP</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>138</conf_id>
+			<conf_title>Over-ride SMTP Host?</conf_title>
+			<conf_description><![CDATA[Default is 'localhost']]></conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>smtp_host</conf_key>
+			<conf_value></conf_value>
+			<conf_default>localhost</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group>SMTP Set-up</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>139</conf_id>
+			<conf_title>Over-ride SMTP Port?</conf_title>
+			<conf_description>Default is 25</conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>smtp_port</conf_key>
+			<conf_value></conf_value>
+			<conf_default>25</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>187</conf_id>
+			<conf_title><![CDATA[Add &#39;&lt;&#39; and &#39;&gt;&#39; to &#39;to&#39; and &#39;from&#39; addresses?]]></conf_title>
+			<conf_description><![CDATA[Some SMTP mailers require that email addresses are in the following format '<' address '>' (no quotes). If you are getting errors in the mail error log, enabled this option]]></conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>mail_wrap_brackets</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>140</conf_id>
+			<conf_title>SMTP UserName</conf_title>
+			<conf_description><![CDATA[Not required in most cases when using 'localhost']]></conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>smtp_user</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>141</conf_id>
+			<conf_title>SMTP Password</conf_title>
+			<conf_description><![CDATA[Not required in most cases when using 'localhost']]></conf_description>
+			<conf_group>12</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>smtp_pass</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>185</conf_id>
+			<conf_title>Type of search to use?</conf_title>
+			<conf_description><![CDATA[Choose between "full text" searching or "manual" searching.
+<!--FULLTEXT-->
+<br />
+<!--FULLCHECK-->]]></conf_description>
+			<conf_group>19</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>search_sql_method</conf_key>
+			<conf_value></conf_value>
+			<conf_default>ftext</conf_default>
+			<conf_extra>ftext=Full Text
+man=Manual</conf_extra>
+			<conf_evalphp><![CDATA[if ( $show == 1 )
+{
+	$ibforums->admin->get_mysql_version();
+	if ( $ibforums->mysql_version < 32323 )
+	{
+		$full_text = "<span style='color:red'><b>FULL TEXT SEARCHING IS NOT AVAILABLE ON YOUR SERVER.</b></span>";
+	}
+	else
+	{
+		$full_text = "<b>Full text available</b>";
+	}
+	
+	if ( ! $ibforums->admin->get_fulltextindex_status() )
+	{
+		$index = "<span style='color:red'><b>NO FULL TEXT INDEXES FOUND</b></span>: <a href='{$ibforums->base_url}&act=op&code=dofulltext'>Build indexes now!</a>";
+	}
+	else
+	{
+		$index = "<b>Full text indexes found</b>";
+	}
+	
+	$r['conf_description'] = str_replace( "<!--FULLTEXT-->", $full_text, $r['conf_description'] );
+	$r['conf_description'] = str_replace( "<!--FULLCHECK-->", $index, $r['conf_description'] );
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>186</conf_id>
+			<conf_title>Default Search Mode?</conf_title>
+			<conf_description>This setting will only take effect if using full text searching</conf_description>
+			<conf_group>19</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>search_default_method</conf_key>
+			<conf_value></conf_value>
+			<conf_default>simple</conf_default>
+			<conf_extra>simple=Simple Search
+adv=Advanced Search</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>4</conf_id>
+			<conf_title>Board Name</conf_title>
+			<conf_description>This is the name of the board. It is used as the first link in the navigation menu, etc.</conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>board_name</conf_key>
+			<conf_value></conf_value>
+			<conf_default>Invision Power Board</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group><![CDATA[Names &amp; Addresses]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>6</conf_id>
+			<conf_title>Website Name</conf_title>
+			<conf_description><![CDATA[This is the name of your website. If this and "Website Address' is filled in, your website address and name will appear on the board above the header by default.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>home_name</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>7</conf_id>
+			<conf_title>Website Address</conf_title>
+			<conf_description><![CDATA[This is the URL to your website. If entered, it'll appear on the board above the header by default.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>home_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>9</conf_id>
+			<conf_title>Upload URL</conf_title>
+			<conf_description><![CDATA[The URL to your "uploads" folder.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>upload_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group>Other URLs and Paths</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>11</conf_id>
+			<conf_title><![CDATA[Path to &#39;upload&#39; directory]]></conf_title>
+			<conf_description>This is a path, not a URL.</conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>upload_dir</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>upload_dir</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>265</conf_id>
+			<conf_title>Caching PATH</conf_title>
+			<conf_description><![CDATA[<b>This can be left blank</b>
+<br />This is useful for specifing a PATH for the IPB written files (skin_cache, style_avatars, style_emoticons, style_images) when dealing with load balanced/clustered servers. If you enter a PATH, please ensure that it ends with a trailing slash]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_cache_path</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>264</conf_id>
+			<conf_title>Image URL</conf_title>
+			<conf_description><![CDATA[<b>This can be left blank</b>
+<br />This can be used if you wish to serve images from a different server or when using clustered servers. Please ensure that you use a trailing slash and that it starts with http(s):// if entering a URL]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_img_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>12</conf_id>
+			<conf_title>Print HTTP Headers?</conf_title>
+			<conf_description><![CDATA[Some NT installations will require this to be turned to 'no'.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>print_headers</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>14</conf_id>
+			<conf_title>Type of auto-redirect</conf_title>
+			<conf_description><![CDATA[This is for quick no-page redirects. Choose the option best suited to your server's OS.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>header_redirect</conf_key>
+			<conf_value></conf_value>
+			<conf_default>location</conf_default>
+			<conf_extra>location=Location type (*nix savvy)
+refresh=Refresh (Windows savvy)
+html=HTML META redirect (If all else fails...)</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group>Page Redirection</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>183</conf_id>
+			<conf_title><![CDATA[Remove &#39;Thanks....&#39; redirect pages?]]></conf_title>
+			<conf_description><![CDATA[If set to "yes", this will remove any "Thanks...." redirection pages used to provide feedback to the user on their last action and will simply redirect without showing this page.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>ipb_remove_redirect_pages</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>15</conf_id>
+			<conf_title>Debug level</conf_title>
+			<conf_description>This controls the debug information shown at the footer of your board.</conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>debug_level</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra><![CDATA[0=0: None - Don't show any debug information
+1=1: Show server load, page generation times and query count
+2=2: Show level 1 (above) and GET and POST information
+3=3: Show level 1 + 2 and database queries]]></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>13</conf_id>
+			<conf_title>Disable GZIP encoding?</conf_title>
+			<conf_description>GZIP enables faster page transfers and lower bandwidth use however some servers are not configured to allow it.</conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>disable_gzip</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>16</conf_id>
+			<conf_title>Enable SQL Debug Mode</conf_title>
+			<conf_description><![CDATA[If set to 'yes', add &debug=1 to any page to view the SQL information.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>sql_debug</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>17</conf_id>
+			<conf_title>Use Safe Mode Skins?</conf_title>
+			<conf_description><![CDATA[This setting is automatically set during installation but you can override the setting here if you wish. Safe mode skins doesn't cache to PHP files and uses the database exclusively.]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>safe_mode_skins</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>18</conf_id>
+			<conf_title>Number Formatting</conf_title>
+			<conf_description><![CDATA[You may choose which character to separate thousands from hundreds<br />(EG: USA & UK use a comma)]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>number_format</conf_key>
+			<conf_value></conf_value>
+			<conf_default>,</conf_default>
+			<conf_extra><![CDATA[none=Don't format
+space=Space
+,=,
+.=.]]></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>182</conf_id>
+			<conf_title>GD Version</conf_title>
+			<conf_description><![CDATA[GD is an embedded graphics library in PHP. Most recent PHP installations come with GD2 which offers improved image functions. If you get errors by setting this to "GD2", then simply choose "GD1".]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>gd_version</conf_key>
+			<conf_value></conf_value>
+			<conf_default>2</conf_default>
+			<conf_extra>1=GD1
+2=GD2</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>202</conf_id>
+			<conf_title>Chat Room Account Number (Group Name)?</conf_title>
+			<conf_description>Removing this number will remove all links / chat functionality within IPB.
+</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_account_no</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Account Specifics</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>253</conf_id>
+			<conf_title>Chat Room Type</conf_title>
+			<conf_description>This is the type of chat service you purchased</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_servicetype</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>advanced=Advanced
+premium=Premium</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>252</conf_id>
+			<conf_title>Default Chat Room</conf_title>
+			<conf_description>This is the room that your chat users will be logged into first</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_default_room</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>203</conf_id>
+			<conf_title>Chat Room URL?</conf_title>
+			<conf_description><![CDATA[<!--SERVER-->]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_whodat_server_addr</conf_key>
+			<conf_value></conf_value>
+			<conf_default>--Not currently required--</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>204</conf_id>
+			<conf_title><![CDATA[Enable &#39;Who&#39;s Chatting?&#39;]]></conf_title>
+			<conf_description><![CDATA[If enabled, this will show who's chatting in the chat room on your forums home page underneath the active users list.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_who_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group><![CDATA[Who&#39;s Chatting]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>205</conf_id>
+			<conf_title><![CDATA[Hide Who&#39;s Chatting when no members are logged into chat?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_hide_whoschatting</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>206</conf_id>
+			<conf_title>Update local list no less than every:</conf_title>
+			<conf_description>The local list is updated from the master chat server by the frequency you set and cached locally. In minutes.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_who_save</conf_key>
+			<conf_value></conf_value>
+			<conf_default>2</conf_default>
+			<conf_extra>2=2
+5=5
+10=10
+15=15
+30=30</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>209</conf_id>
+			<conf_title>Chat Room Dimensions (WIDTH)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_width</conf_key>
+			<conf_value></conf_value>
+			<conf_default>600</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Showing the chat room</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>210</conf_id>
+			<conf_title>Chat Room Dimensions (HEIGHT)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_height</conf_key>
+			<conf_value></conf_value>
+			<conf_default>350</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>254</conf_id>
+			<conf_title>Default Chat Room Language</conf_title>
+			<conf_description>This is the default language used for the chat user inteface (buttons and labels, etc)</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_default_lang</conf_key>
+			<conf_value></conf_value>
+			<conf_default>english.conf</conf_default>
+			<conf_extra>english.conf=English
+spanish.conf=Spanish
+portuguese.conf=Portuguese
+italian.conf=Italian
+french.conf=French
+german.conf=German</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>255</conf_id>
+			<conf_title><![CDATA[Enable &quot;Plain Mode&quot;?]]></conf_title>
+			<conf_description><![CDATA["Plain mode" removes the colored chat text from your Invision Power Chat Advanced room(s), and implements single-colored (non-GUI) chat text. This will disable the graphic emoticons and click-able URLs.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_plainmode</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>213</conf_id>
+			<conf_title>Load the chat room in...?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_display</conf_key>
+			<conf_value></conf_value>
+			<conf_default>self</conf_default>
+			<conf_extra>self=Normal IPB Page
+new=New Pop Up Window</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>211</conf_id>
+			<conf_title>Chat Room Pop-up Window Padding? (in px)</conf_title>
+			<conf_description>Allows window to open without scrollbars</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_poppad</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>256</conf_id>
+			<conf_title>Applet: Background Color</conf_title>
+			<conf_description>To change your chat applet background color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_applet_bg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#BCD0ED</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group>Chat Room Style Options</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>257</conf_id>
+			<conf_title>Applet: Foreground Color</conf_title>
+			<conf_description>To change your chat applet foreground color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_applet_fg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#345487</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>258</conf_id>
+			<conf_title>Chat Window: Background Color</conf_title>
+			<conf_description>To change your chat window background color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_window_bg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#F5F9FD</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>259</conf_id>
+			<conf_title>Chat Window: Foreground Color</conf_title>
+			<conf_description>To change your chat window foreground color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_window_fg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#345487</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>261</conf_id>
+			<conf_title>Additional PARAM information</conf_title>
+			<conf_description><![CDATA[Use this field to enter any custom param tags for the chat applet.
+Example:<br />
+&lt;param name="cmd.BeepEnter" value="true"&gt;
+<br />&lt;param name="cmd.BeepLeave" value="true"&gt;
+<br />Please refer to the Invision Chat documentation for more info.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>chat04_customparams</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>260</conf_id>
+			<conf_title>Chat Room Font Size</conf_title>
+			<conf_description><![CDATA[To customize your font size replace "10" to whatever numeric value you wish.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_font_size</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>214</conf_id>
+			<conf_title>Allow chat access to these groups</conf_title>
+			<conf_description>You may select more than one</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>chat04_access_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat04_access_groups']) )
+	{
+		$_POST['chat04_access_groups'] = implode(",",$_POST['chat04_access_groups']);
+	}
+	else
+	{
+		$_POST['chat04_access_groups'] = "";
+	}
+	
+	$key = 'chat04_access_groups';
+}
+if ( $show == 1 )
+{
+$key = 'chat04_access_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>25</conf_position>
+			<conf_start_group>Access Permissions</conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>188</conf_id>
+			<conf_title>Chat Room Account Number?</conf_title>
+			<conf_description>Removing this number will remove all links / chat functionality within IPB.
+</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_account_no</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Account Specifics</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>189</conf_id>
+			<conf_title>Chat Room Server?</conf_title>
+			<conf_description><![CDATA[<!--SERVER-->]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_server_addr</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>190</conf_id>
+			<conf_title><![CDATA[Enable &#39;Who&#39;s Chatting?&#39;]]></conf_title>
+			<conf_description><![CDATA[If enabled, this will show who's chatting in the chat room on your forums home page underneath the active users list.]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat_who_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group><![CDATA[Who&#39;s Chatting]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>191</conf_id>
+			<conf_title><![CDATA[Hide Who&#39;s Chatting when no members are logged into chat?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat_hide_whoschatting</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>192</conf_id>
+			<conf_title>Update local list no less than every:</conf_title>
+			<conf_description>The local list is updated from the master chat server by the frequency you set and cached locally.</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat_refresh_list</conf_key>
+			<conf_value></conf_value>
+			<conf_default>15</conf_default>
+			<conf_extra>5=5
+10=10
+15=15
+30=30</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>193</conf_id>
+			<conf_title>Changed your IPChat control panel password?</conf_title>
+			<conf_description><![CDATA[If you have changed your IPChat control panel password, please add the new password here. Leave blank if it's not changed.]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_pass_md5</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>194</conf_id>
+			<conf_title>ENTER YOUR IPCHAT CONTROL PANEL PASSWORD</conf_title>
+			<conf_description><![CDATA[You must enter your IPChat control panel password to allow retrieval of the Who's Chatting list.]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_pass_md5_new</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>195</conf_id>
+			<conf_title>Chat Room Dimensions (WIDTH)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_width</conf_key>
+			<conf_value></conf_value>
+			<conf_default>600</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Showing the chat room</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>196</conf_id>
+			<conf_title>Chat Room Dimensions (HEIGHT)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_height</conf_key>
+			<conf_value></conf_value>
+			<conf_default>350</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>199</conf_id>
+			<conf_title>Load the chat room in...?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat_display</conf_key>
+			<conf_value></conf_value>
+			<conf_default>self</conf_default>
+			<conf_extra>self=Normal IPB Page
+new=New Pop Up Window</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>197</conf_id>
+			<conf_title>Chat Room Pop-up Window Padding? (in px)</conf_title>
+			<conf_description>Allows window to open without scrollbars</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_poppad</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>198</conf_id>
+			<conf_title>Default Chat Room Interface Language?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat_language</conf_key>
+			<conf_value></conf_value>
+			<conf_default>en</conf_default>
+			<conf_extra>en=English
+ar=Arabic
+de=German
+es=Spanish
+fr=French
+hr=Croation
+it=Italian
+iw=Hebrew
+nl=Dutch
+pl=Polish
+pt=Portuguese</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>200</conf_id>
+			<conf_title>Allow chat access to these groups</conf_title>
+			<conf_description>You may select more than one</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>chat_access_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat_access_groups']) )
+	{
+		$_POST['chat_access_groups'] = implode(",",$_POST['chat_access_groups']);
+	}
+	else
+	{
+		$_POST['chat_access_groups'] = "";
+	}
+	
+	$key = 'chat_access_groups';
+}
+if ( $show == 1 )
+{
+    $key='chat_access_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group>Access Permissions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>201</conf_id>
+			<conf_title>Allow ADMIN access to these groups</conf_title>
+			<conf_description>You may select more than one - please choose carefully!</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>chat_admin_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat_admin_groups']) )
+	{
+		$_POST['chat_admin_groups'] = implode(",",$_POST['chat_admin_groups']);
+	}
+	else
+	{
+		$_POST['chat_admin_groups'] = "";
+	}
+	
+	$key = 'chat_admin_groups';
+}
+if ( $show == 1 )
+{
+    $key='chat_admin_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>246</conf_id>
+			<conf_title>IPB Copyright Removal Key</conf_title>
+			<conf_description>Your copyright removal key obtained from IPS.</conf_description>
+			<conf_group>25</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_copy_number</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>247</conf_id>
+			<conf_title>Copyright Purchased?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>25</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>ips_cp_purchase</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>216</conf_id>
+			<conf_title>ENABLE IPB Portal?</conf_title>
+			<conf_description><![CDATA[If 'yes', IPB Portal can be accessed via 'index.php?act=home' or via the special 'index.php' script (see documentation for more info).]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>217</conf_id>
+			<conf_title>IPB Portal Page Title?</conf_title>
+			<conf_description><![CDATA[This will appear inbetween the &lt;title&gt; elements on the page]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_title</conf_key>
+			<conf_value></conf_value>
+			<conf_default>IPB Portal</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>223</conf_id>
+			<conf_title>Date format for articles</conf_title>
+			<conf_description><![CDATA[<a href='http://www.php.net/date'>Same as PHP's date function]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_date</conf_key>
+			<conf_value></conf_value>
+			<conf_default>m-j-y H:i</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>218</conf_id>
+			<conf_title>Forums to export articles from</conf_title>
+			<conf_description>You may select more than one.</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>csite_article_forum</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_forums#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['csite_article_forum']) )
+	{
+		$_POST['csite_article_forum'] = implode(",",$_POST['csite_article_forum']);
+	}
+	else
+	{
+		$_POST['csite_article_forum'] = "";
+	}
+	
+	$key = 'csite_article_forum';
+}
+if ( $show == 1 )
+{
+$key = 'csite_article_forum[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>219</conf_id>
+			<conf_title>Number of Articles to display in the main section</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>15</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>220</conf_id>
+			<conf_title>Enable Recent Articles?</conf_title>
+			<conf_description>This will show a list of recent topic titles on the IPB Portal page</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_article_recent_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group>IPB Portal Recent Articles</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>221</conf_id>
+			<conf_title>Max. no recent articles to show</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_recent_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>222</conf_id>
+			<conf_title>Max. length of topic titles</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_len</conf_key>
+			<conf_value></conf_value>
+			<conf_default>30</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>224</conf_id>
+			<conf_title>Enable Recent Discussions</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_discuss_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group>IPB Portal Recent Discussions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>225</conf_id>
+			<conf_title>Max. no recent discussions to show</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_discuss_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>226</conf_id>
+			<conf_title>Max. length of topic titles</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_discuss_len</conf_key>
+			<conf_value></conf_value>
+			<conf_default>30</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>227</conf_id>
+			<conf_title>Show User / Guest Info box?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_pm_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group>IPB Portal Components</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>228</conf_id>
+			<conf_title>Show online users?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_online_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>229</conf_id>
+			<conf_title>Show search box?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_search_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>230</conf_id>
+			<conf_title>Enable skin selection choice dropdown?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_skinchange_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>232</conf_id>
+			<conf_title>Enter URL to poll topic for inclusion</conf_title>
+			<conf_description>Leave blank to not show a poll or the poll box</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_poll_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>233</conf_id>
+			<conf_title>Show Site Navigation Menu?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_nav_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>234</conf_id>
+			<conf_title>Site Navigation Menu Links</conf_title>
+			<conf_description><![CDATA[One per line in this format<br>http://www.apple.com [Apple's Website]<br><br>{board_url} will convert into your board]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>csite_nav_contents</conf_key>
+			<conf_value></conf_value>
+			<conf_default><![CDATA[{board_url} [Forums]
+{board_url}act=Search&CODE=getactive [Today's Active Topics]
+{board_url}act=Stats [Today's Top 10 Posters]
+{board_url}act=Stats&CODE=leaders [Contact Staff]]]></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp><![CDATA[if ( $show == 1)
+{
+    $value = preg_replace( "/&(middot|quot|copy|amp)/", "&\\1", $value );
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>235</conf_id>
+			<conf_title>Show Affiliates / Favoured Sites box?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_fav_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>20</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>236</conf_id>
+			<conf_title>Show Affiliates / Favoured Sites box content</conf_title>
+			<conf_description>Raw HTML enabled</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>csite_fav_contents</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp><![CDATA[if ( $show == 1)
+{
+ $value = preg_replace( "/&(middot|quot|copy|amp)/", "&\\1", $value );
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>21</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>245</conf_id>
+			<conf_title>IPB Registered Licence Key</conf_title>
+			<conf_description><![CDATA[This is the IPB registraton key NOT your customer code or client center password. To get your key, log into your client center and click on 'Invision Power Board' under 'Purchased Services'.
+<br />DO NOT REMOVE OR EDIT THIS KEY UNLESS YOU'RE SURE OF WHAT YOU'RE DOING!]]></conf_description>
+			<conf_group>24</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_reg_number</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>243</conf_id>
+			<conf_title>Display registered to line?</conf_title>
+			<conf_description><![CDATA[If enabled, you can optionally add a "registered to" line at the bottom of your board.]]></conf_description>
+			<conf_group>24</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>ipb_reg_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>244</conf_id>
+			<conf_title>Show as registered to...</conf_title>
+			<conf_description><![CDATA[Examples: <em>Matthew Mecham</em>, <em>IPS, Inc.]]></conf_description>
+			<conf_group>24</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_reg_name</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>130</conf_id>
+			<conf_title>Export news topics from which forum?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>10</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>news_forum_id</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_forums#</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>131</conf_id>
+			<conf_title><![CDATA[Show a &#39;Latest News&#39; link on the board index?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>10</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>index_news_link</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>132</conf_id>
+			<conf_title>Allow BBCode in messages?</conf_title>
+			<conf_description><![CDATA[BBCode is the [tag][/tag] format used to format text and apply other effects.]]></conf_description>
+			<conf_group>11</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>msg_allow_code</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>133</conf_id>
+			<conf_title>Allow HTML in messages?</conf_title>
+			<conf_description><![CDATA[If set to "yes", your members will be allowed to use HTML in their personal messages. We recommend that you disbale this for security reasons.]]></conf_description>
+			<conf_group>11</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>msg_allow_html</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>134</conf_id>
+			<conf_title>Max. number of messages to show per page when viewing message list</conf_title>
+			<conf_description>The default is 50.</conf_description>
+			<conf_group>11</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>show_max_msg_list</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>165</conf_id>
+			<conf_title>Enable the search engine spider recognition?</conf_title>
+			<conf_description><![CDATA[If set to "no", this feature will not be activated and all the settings below will have no effect.]]></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>spider_sense</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>166</conf_id>
+			<conf_title>Log all spider visits?</conf_title>
+			<conf_description><![CDATA[If you're under heavy attack, switch this off as it may put a little extra load on the SQL server as it attempts to insert new data rows.]]></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>spider_visit</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>167</conf_id>
+			<conf_title>Treat spider/bot as part of which group?</conf_title>
+			<conf_description><![CDATA[This is useful as you can specify group settings for a 'bot' group which can restrict access to certain areas, etc.]]></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>spider_group</conf_key>
+			<conf_value></conf_value>
+			<conf_default>2</conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>168</conf_id>
+			<conf_title>Force spider/bot to use skin</conf_title>
+			<conf_description><![CDATA[This is useful as you can create a 'lite' optimized skin for your spiders to use to reduce bandwidth and increase the depth of the bot crawling.]]></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>spider_suit</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_skins#</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>169</conf_id>
+			<conf_title>Show spider/bot in the active users list?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>spider_active</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group>Active Users List</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>171</conf_id>
+			<conf_title>Show spider as anonymous</conf_title>
+			<conf_description><![CDATA[If set to "yes", this makes all spider bots anonymous and they can only be seen by administrators.]]></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>spider_anon</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>172</conf_id>
+			<conf_title>Spider Bot User-Agent</conf_title>
+			<conf_description><![CDATA[Use this section to list which search engine user-agents you'd like to be treated as a search engine visit along with a 'human' name for the online list in a <b>bot=Human Name</b> format.(one per line)<br />Example: googlebot=Google.com]]></conf_description>
+			<conf_group>16</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>search_engine_bots</conf_key>
+			<conf_value></conf_value>
+			<conf_default>googlebot=Google.com
+slurp@inktomi=Hot Bot
+ask jeeves=Ask Jeeves
+lycos=Lycos.com
+whatuseek=What You Seek
+ia_archiver=Archive.org</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>93</conf_id>
+			<conf_title>Enable Script/Bot Flood Control?</conf_title>
+			<conf_description><![CDATA[Forces users to input a random code when registering and changing email address, etc to prevent bot's from spamming the forms.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>bot_antispam</conf_key>
+			<conf_value></conf_value>
+			<conf_default>gd</conf_default>
+			<conf_extra>0=None
+gd=Advanced (Requires GD library)
+gif=Normal (No special requirements)</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group><![CDATA[Security [Bot/Script Protection]]]></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>s_reg_antispam</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>98</conf_id>
+			<conf_title>Allow dynamic images?</conf_title>
+			<conf_description><![CDATA[If 'yes' users can post scripted image generators that are PHP/CGI scripts designed to 'look' like an image. This is used for random signature images, etc but can allow users to write malicious scripts which can interfere with the board.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_dynamic_img</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group><![CDATA[Security [General - High]]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>262</conf_id>
+			<conf_title>Enable X_FORWARDED_FOR IP matching?</conf_title>
+			<conf_description><![CDATA[If enabled, this will check the X_FORWARDED_FOR headers to match the user's IP address. This is useful in a intranet situation if the REMOTE_ADDR will be the same across the network. It will also help maintain AOL sessions but can be abused to forge incorrect headers to report an incorrect IP address. If unsure, leave off.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>xforward_matching</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>99</conf_id>
+			<conf_title>Session Expiration (in seconds)</conf_title>
+			<conf_description>Removes inactive sessions over the limit you specify. The lower the number the less chance of a session being hijacked.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>session_expiration</conf_key>
+			<conf_value></conf_value>
+			<conf_default>3600</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>100</conf_id>
+			<conf_title>Match users browsers while validating?</conf_title>
+			<conf_description>This further reduces the risk of session hijacking and tampering but it does mean that a user will have their session terminated if they use another browser at the same time.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>match_browser</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>101</conf_id>
+			<conf_title>Use secure mail form for member to member mails?</conf_title>
+			<conf_description>Hides the email address from other users and prevents email harvesting bots from gathering your members email addresses.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>use_mail_form</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group><![CDATA[Security [General - Medium]]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>102</conf_id>
+			<conf_title>Allow images to be posted?</conf_title>
+			<conf_description>Advanced programmers can force images to run as scripts. IBF limits damage by this method however. This should only be disabled as an extreme measure.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_images</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>103</conf_id>
+			<conf_title>Allow flash movies in posts and avatars?</conf_title>
+			<conf_description><![CDATA[Flash has a built in scripting language which may or may not compromise security. As flash gets more advanced the chances of it compromising your board increases. We recommend you leave this feature set to "no" unless you trust your community.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_flash</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>105</conf_id>
+			<conf_title>New registration email validation?</conf_title>
+			<conf_description>Make an administrator manually preview all new accounts or make new users validate their email address.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>reg_auth_type</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra>user=User Email Validation
+admin=Admin Validation
+0=None</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group><![CDATA[Security [Managing Members]]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>106</conf_id>
+			<conf_title><![CDATA[Remove incomplete registration validations after [x] days]]></conf_title>
+			<conf_description><![CDATA[This will automatically remove all unvalidated members after the number of days you specify. Enter "0" to not automatically remove unvalidated members.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>validate_day_prune</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>107</conf_id>
+			<conf_title>Get notified when a new user registers via email?</conf_title>
+			<conf_description>This will send an email to the root administrator when a new user successfully registers on the board.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>new_reg_notify</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>108</conf_id>
+			<conf_title>Force guests to log in before allowing access to the board?</conf_title>
+			<conf_description>If set to yes, any guest must either log in or register before they can view the board.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>force_login</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>109</conf_id>
+			<conf_title>Disable new registrations?</conf_title>
+			<conf_description><![CDATA[If set to "yes", this will not allow any guests to register an account on your board.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>no_reg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>110</conf_id>
+			<conf_title>Remove chr(0xCA) from input?</conf_title>
+			<conf_description><![CDATA[Can be used as a 'hidden' space to emulate registered names - but can cause problems in non Western character sets.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>strip_space_chr</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>111</conf_id>
+			<conf_title><![CDATA[Disable &#39;Report this post to a moderator&#39; link?]]></conf_title>
+			<conf_description>Removes the ability for your members to report a post.</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>disable_reportpost</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>242</conf_id>
+			<conf_title>Reported Post Notifications sent to</conf_title>
+			<conf_description>Where do you want reported post notifications to go?</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>reportpost_method</conf_key>
+			<conf_value></conf_value>
+			<conf_default>pm</conf_default>
+			<conf_extra>email=Email
+pm=Personal Message</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>112</conf_id>
+			<conf_title>Flood control delay (in seconds)</conf_title>
+			<conf_description><![CDATA[Make users wait before posting again<br>Can be left blank for no flood control and does not apply to members which belong to a group that can bypass flood control.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>flood_control</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>20</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>113</conf_id>
+			<conf_title>Allow users to browse the Active Users list?</conf_title>
+			<conf_description><![CDATA[If set to "yes", members and guests where allowed will be able to determine the whereabouts of each other on the online list. Topics and forums that the viewer doesn't have permission to see are not shown.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_online_list</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>21</conf_position>
+			<conf_start_group>Privacy</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>114</conf_id>
+			<conf_title>Disable root admin group viewing anonymous online users?</conf_title>
+			<conf_description>Anonymous users have an asterisk after their name</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>disable_admin_anon</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>22</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>115</conf_id>
+			<conf_title>Disable root admin group viewing online users IP address in online user list?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>disable_online_ip</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>23</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>239</conf_id>
+			<conf_title>Show subscription packages when registering?</conf_title>
+			<conf_description>If enabled, the subscription packages will be shown in the registration page and the registering member will be able to select one.</conf_description>
+			<conf_group>23</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>subsm_show_reg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Optional Purchase Upon Registration</conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>240</conf_id>
+			<conf_title>Force every member to require a subscriptions package</conf_title>
+			<conf_description>If enabled, the member must choose a package upon registration to proceed past the validating group and current members must purchase a subscription to view the board.</conf_description>
+			<conf_group>23</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>subsm_enforce</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group>Force Package Purchase</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>241</conf_id>
+			<conf_title>Member group to use after registration but before package purchase?</conf_title>
+			<conf_description><![CDATA[If you require that every member purchases a subscription, choose a group to move the member into once they have validated their registration prior to purchasing a subscriptions manager package.
+Members in this group will see the 'Purchase Subscriptions' page when logged in and if they don't already have a package.]]></conf_description>
+			<conf_group>23</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>subsm_nopkg_group</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>63</conf_id>
+			<conf_title>Number of topics per forum page</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>display_max_topics</conf_key>
+			<conf_value></conf_value>
+			<conf_default>30</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Showing Topics</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>69</conf_id>
+			<conf_title>Remove excess exclamation/question marks in topic titles?</conf_title>
+			<conf_description>Will turn: This!!!!! into This!</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>etfilter_punct</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>68</conf_id>
+			<conf_title>Stop shouting in topic titles?</conf_title>
+			<conf_description>Will turn: CLICK HERE into Click Here</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>etfilter_shout</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>64</conf_id>
+			<conf_title><![CDATA[Number of posts needed to make a &#39;hot topic&#39;?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>hot_topic</conf_key>
+			<conf_value></conf_value>
+			<conf_default>15</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>65</conf_id>
+			<conf_title>Topic prefix for PINNED topics</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>pre_pinned</conf_key>
+			<conf_value></conf_value>
+			<conf_default>Pinned: </conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group>Topic Prefixes</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>66</conf_id>
+			<conf_title>Topic prefix for MOVED topics</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>pre_moved</conf_key>
+			<conf_value></conf_value>
+			<conf_default>Moved: </conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>67</conf_id>
+			<conf_title>Topic prefix for POLLS</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>pre_polls</conf_key>
+			<conf_value></conf_value>
+			<conf_default>Poll: </conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>70</conf_id>
+			<conf_title>Number of posts per topic page</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>display_max_posts</conf_key>
+			<conf_value></conf_value>
+			<conf_default>20</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Showing Posts</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>179</conf_id>
+			<conf_title>Outline View: Number of posts per page</conf_title>
+			<conf_description>This controls how many posts are shown in the threaded tree per page. This helps to reduce server overhead on very large topics.</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>threaded_per_page</conf_key>
+			<conf_value></conf_value>
+			<conf_default>100</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>178</conf_id>
+			<conf_title>Default Topic View Mode</conf_title>
+			<conf_description><![CDATA[Selects the default topic view mode from 'Outline', 'Standard' and 'Linear Plus'.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>topicmode_default</conf_key>
+			<conf_value></conf_value>
+			<conf_default>linear</conf_default>
+			<conf_extra>linear=Standard
+threaded=Outline
+linearplus=Linear Plus</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>71</conf_id>
+			<conf_title>Order posts within a topic by</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>post_order_column</conf_key>
+			<conf_value></conf_value>
+			<conf_default>pid</conf_default>
+			<conf_extra>pid=Post ID
+post_date=Post Date</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>72</conf_id>
+			<conf_title>Order posts within a topic by</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>post_order_sort</conf_key>
+			<conf_value></conf_value>
+			<conf_default>asc</conf_default>
+			<conf_extra>asc=Ascending (0-9)
+desc=Descending (9-0)</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>74</conf_id>
+			<conf_title>Max. no. emoticons per post</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_emos</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group>Making a Post</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>75</conf_id>
+			<conf_title>Max. no. images per post</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_images</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>76</conf_id>
+			<conf_title><![CDATA[Max. size of post (in kilobytes [kb])]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_post_length</conf_key>
+			<conf_value></conf_value>
+			<conf_default>100</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>77</conf_id>
+			<conf_title>Max. width of posted Flash movies (in pixels)</conf_title>
+			<conf_description><![CDATA[When using the [flash] tags where allowed]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_w_flash</conf_key>
+			<conf_value></conf_value>
+			<conf_default>199</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>78</conf_id>
+			<conf_title>Max. height of posted Flash movies (in pixels)</conf_title>
+			<conf_description><![CDATA[When using the [flash] tags where allowed]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_h_flash</conf_key>
+			<conf_value></conf_value>
+			<conf_default>199</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>87</conf_id>
+			<conf_title>No. characters to word wrap on?</conf_title>
+			<conf_description>Prevents long unbroken words which distort tables. 80 - 100 is recommended</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>post_wordwrap</conf_key>
+			<conf_value></conf_value>
+			<conf_default>80</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>73</conf_id>
+			<conf_title>No. emoticons per clickable table row</conf_title>
+			<conf_description>The clickable emoticons box is shown in the full posting form page.</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>emo_per_row</conf_key>
+			<conf_value></conf_value>
+			<conf_default>3</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>84</conf_id>
+			<conf_title>Stop Quote Embedding?</conf_title>
+			<conf_description><![CDATA[This will remove any quoted text when quoting a post that contains quotes<br><a href='#' title='and if that made any sense, then you are far cleverer than I.'>..</a>]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>strip_quotes</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>20</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>79</conf_id>
+			<conf_title>Valid postable image extensions</conf_title>
+			<conf_description><![CDATA[Defines which images are allowed in [img][/img] tags.
+<br />Seperate with comma (gif,jpeg,jpg)]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>img_ext</conf_key>
+			<conf_value></conf_value>
+			<conf_default>gif,jpeg,jpg,png</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>21</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>80</conf_id>
+			<conf_title>Show uploaded images in post as images?</conf_title>
+			<conf_description><![CDATA[If set to "yes", any image attachments in a post will be shown as the image and not as a downloadable link. Set this to yes to allow members to position their image attachments in the post using the [attachmentid] tag.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>show_img_upload</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>22</conf_position>
+			<conf_start_group>Attached Image Options</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>81</conf_id>
+			<conf_title>Show thumbnail of attached image?</conf_title>
+			<conf_description><![CDATA[If the above option is set to "yes" to allow image attachments to show as the image select this option to show the attached image as a thumbnail which takes up less space and can be quicker to load.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>siu_thumb</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra>siu_thumb</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>23</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>180</conf_id>
+			<conf_title><![CDATA[Attachment Image Thumbnail Size [width]]]></conf_title>
+			<conf_description><![CDATA[If both options above are set to "yes", you can define the maximum width of the thumbnail. If attached images are smaller than the dimensions set here, they will not be shown as a thumbnail.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>siu_width</conf_key>
+			<conf_value></conf_value>
+			<conf_default>100</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>24</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>83</conf_id>
+			<conf_title><![CDATA[Attachment Image Thumbnail Size [height]]]></conf_title>
+			<conf_description><![CDATA[If both options above are set to "yes", you can define the maximum width of the thumbnail. If attached images are smaller than the dimensions set here, they will not be shown as a thumbnail.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>siu_height</conf_key>
+			<conf_value></conf_value>
+			<conf_default>100</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>25</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>85</conf_id>
+			<conf_title><![CDATA[Guest names [prefix]]]></conf_title>
+			<conf_description>This is for when a guest posts with a members name, it allows for a visual difference to prevent confusion</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>guest_name_pre</conf_key>
+			<conf_value></conf_value>
+			<conf_default>Guest_</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>26</conf_position>
+			<conf_start_group>Guest Username</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>86</conf_id>
+			<conf_title><![CDATA[Guest names [suffix]]]></conf_title>
+			<conf_description>This is for when a guest posts with a members name, it allows for a visual difference to prevent confusion</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>guest_name_suf</conf_key>
+			<conf_value></conf_value>
+			<conf_default>_*</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>27</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>88</conf_id>
+			<conf_title><![CDATA[Allow [IMG] and [URL] tags in polls?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>poll_tags</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>28</conf_position>
+			<conf_start_group>Poll Options</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>89</conf_id>
+			<conf_title>Maximum number of poll choices allowed?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_poll_choices</conf_key>
+			<conf_value></conf_value>
+			<conf_default>20</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>29</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>90</conf_id>
+			<conf_title>Allow members to view the results of a poll without losing their vote?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_result_view</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>30</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>237</conf_id>
+			<conf_title>Allow poll creator to vote in own poll?</conf_title>
+			<conf_description><![CDATA[If set to "yes", the poll creator will have the option of voting in their own poll.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_creator_vote</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>31</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>92</conf_id>
+			<conf_title>Number of hours to keep open the ability for topic starters to attach a poll to their topic</conf_title>
+			<conf_description>Does not affect administrators or super moderators</conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>startpoll_cutoff</conf_key>
+			<conf_value></conf_value>
+			<conf_default>24</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>31</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>91</conf_id>
+			<conf_title><![CDATA[DISABLE the ability for members to post a &#39;no-reply&#39; poll?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>poll_disable_noreply</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>32</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>157</conf_id>
+			<conf_title>Enable the trashcan?</conf_title>
+			<conf_description><![CDATA[If set to "no", this feature will not activated and the settings below will be ignored.]]></conf_description>
+			<conf_group>14</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>forum_trash_can_enable</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>158</conf_id>
+			<conf_title>Designate which forum to use as the trash can?</conf_title>
+			<conf_description>No special read/write/reply permissions are applied - please set up as if it were a normal forum.</conf_description>
+			<conf_group>14</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>forum_trash_can_id</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_forums#</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>159</conf_id>
+			<conf_title>Use trashcan for ROOT administrators?</conf_title>
+			<conf_description><![CDATA[If set to 'no', they will be able to delete as normal]]></conf_description>
+			<conf_group>14</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>forum_trash_can_use_radmin</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>160</conf_id>
+			<conf_title>Use trashcan for normal administrators?</conf_title>
+			<conf_description><![CDATA[If set to 'no', they will be able to delete as normal]]></conf_description>
+			<conf_group>14</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>forum_trash_can_use_admin</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>161</conf_id>
+			<conf_title>Use trashcan for global moderators?</conf_title>
+			<conf_description><![CDATA[If set to 'no', they will be able to delete as normal]]></conf_description>
+			<conf_group>14</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>forum_trash_can_use_smod</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>162</conf_id>
+			<conf_title>Use trashcan for forum moderators?</conf_title>
+			<conf_description><![CDATA[If set to 'no', they will be able to delete as normal]]></conf_description>
+			<conf_group>14</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>forum_trash_can_use_mod</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>41</conf_id>
+			<conf_title>Allow members to choose skins?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_skins</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Global User Profile Options</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>42</conf_id>
+			<conf_title>Number of posts a member must have over before allowing them to change their member title?</conf_title>
+			<conf_description>Enter 0 to disable completely</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>post_titlechange</conf_key>
+			<conf_value></conf_value>
+			<conf_default>500</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>43</conf_id>
+			<conf_title>Maximum length (in bytes) for the location field entry</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_location_length</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1000</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>44</conf_id>
+			<conf_title>Maximum length (in bytes) for the interests field entry</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_interest_length</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1000</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>45</conf_id>
+			<conf_title>Maximum length (in bytes) for user signatures</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>max_sig_length</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10000</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>46</conf_id>
+			<conf_title>Allow HTML in signatures?</conf_title>
+			<conf_description>This is NOT recommended unless you trust all your members who can add a signature.</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>sig_allow_html</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>47</conf_id>
+			<conf_title>Allow BBCode in signatures?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>sig_allow_ibc</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>48</conf_id>
+			<conf_title>User selectable posts per page dropdown contents</conf_title>
+			<conf_description><![CDATA[Separate with a comma, 'Use forum default' added automatically<br>Example: 5,15,20,25,30]]></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>postpage_contents</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5,10,15,20,25,30,35,40</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>49</conf_id>
+			<conf_title>User selectable topics per forum page dropdown contents</conf_title>
+			<conf_description><![CDATA[Separate with a comma, 'Use forum default' added automatically<br>Example: 5,15,20,25,30]]></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>topicpage_contents</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5,10,15,20,25,30,35,40</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>50</conf_id>
+			<conf_title><![CDATA[Auto prune all topic subscriptions if the topic has no replies over [x] days]]></conf_title>
+			<conf_description>Leave blank or enter 0 for no auto prune limit</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>subs_autoprune</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group><![CDATA[Topic &amp; Forum Subscriptions]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>263</conf_id>
+			<conf_title>Automatically subscribe to every forum</conf_title>
+			<conf_description><![CDATA[Please choose which user groups you'd like to automatically be subscribed for email notification of <b>new</b> topics (not replies) in every forum available to them. This means that members having a selected PRIMARY group will be emailed everytime there is a new topic and they are not online to view it.<br /><b>Note</b> This will only send the email to those who have chosen to 'Allow emails from the administrators'.]]></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>autoforum_sub_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['autoforum_sub_groups']) )
+	{
+		$_POST['autoforum_sub_groups'] = implode(",",$_POST['autoforum_sub_groups']);
+	}
+	else
+	{
+		$_POST['autoforum_sub_groups'] = "";
+	}
+	
+	$key = 'autoforum_sub_groups';
+}
+if ( $show == 1 )
+{
+    $key='autoforum_sub_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>53</conf_id>
+			<conf_title>Allow the use of avatars?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>avatars_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group><![CDATA[Avatars &amp; Photos]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>54</conf_id>
+			<conf_title>Allowed avatar image extensions</conf_title>
+			<conf_description>Seperate with comma (gif,png,jpeg) etc</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>avatar_ext</conf_key>
+			<conf_value></conf_value>
+			<conf_default>gif,jpg,jpeg,png</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>55</conf_id>
+			<conf_title>Allow users to use remote URL avatars?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>avatar_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>56</conf_id>
+			<conf_title>Max. file size for avatar uploads? (K)</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>avup_size_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>57</conf_id>
+			<conf_title>Maximum avatar dimensions</conf_title>
+			<conf_description><![CDATA[(WIDTH<b>x</b>HEIGHT)]]></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>avatar_dims</conf_key>
+			<conf_value></conf_value>
+			<conf_default>90x90</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>58</conf_id>
+			<conf_title>Default sizes for gallery avatars?</conf_title>
+			<conf_description><![CDATA[(WIDTH<b>x</b>HEIGHT)]]></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>avatar_def</conf_key>
+			<conf_value></conf_value>
+			<conf_default>80x80</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>59</conf_id>
+			<conf_title>Number of columns for the avatar gallery?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>av_gal_cols</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>51</conf_id>
+			<conf_title>Allowed photo URL extensions</conf_title>
+			<conf_description>Seperate with comma (gif,png,jpeg) etc</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>photo_ext</conf_key>
+			<conf_value></conf_value>
+			<conf_default>gif,jpg,jpeg,png</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>52</conf_id>
+			<conf_title>Disable IPB auto sizing large photos/avatars?</conf_title>
+			<conf_description>This will ask the member to input their dimensions</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>disable_ipbsize</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>20</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>60</conf_id>
+			<conf_title>Allow GUESTS to view signatures?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>guests_sig</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>21</conf_position>
+			<conf_start_group>Guest Default Options</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>61</conf_id>
+			<conf_title>Allow GUESTS to view posted images?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>guests_img</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>22</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>62</conf_id>
+			<conf_title>Allow GUESTS to view user avatars?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>guests_ava</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>23</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>142</conf_id>
+			<conf_title>Enable the warning system?</conf_title>
+			<conf_description><![CDATA[If set to "no", the warn system will not be used and all warn levels will be hidden from view.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>143</conf_id>
+			<conf_title>Minimum Warn Level</conf_title>
+			<conf_description><![CDATA[Minus numbers allowed. If using minus numbers, we recommend that you do not use the graphical blocks and percentage but use the 'rating' mode as 'warn mode' will not take into account a minus start number.
+<br />Members always start with a zero warn level when registered.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>warn_min</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group>Warning Levels</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>144</conf_id>
+			<conf_title>Maximum Warn Level</conf_title>
+			<conf_description></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>warn_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>145</conf_id>
+			<conf_title>Protected Groups</conf_title>
+			<conf_description><![CDATA[Groups that cannot be warned<br />You may choose more than one.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>warn_protected</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['warn_protected']) )
+	{
+		$_POST['warn_protected'] = implode(",",$_POST['warn_protected']);
+	}
+	else
+	{
+		$_POST['warn_protected'] = "";
+	}
+	
+	$key = 'warn_protected';
+}
+if ( $show == 1 )
+{
+    $key='warn_protected[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>146</conf_id>
+			<conf_title>Allow all other non-protected groups to see their own warn level and reasons?</conf_title>
+			<conf_description><![CDATA[If set you "yes", members will be able to see their own warn level and reasons for their warns.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_show_own</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>147</conf_id>
+			<conf_title>Allow warnings to continue once the minimum or maximum has been reached?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_past_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>148</conf_id>
+			<conf_title>Type of visual indicator?</conf_title>
+			<conf_description>Controls which type of warn level meter is displayed.</conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>warn_show_rating</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra><![CDATA[0=Warn mode: Show graphical blocks & percentage
+1=Rating mode: Show < min | current | max > level]]></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>248</conf_id>
+			<conf_title>Moderators can ban via warn panel?</conf_title>
+			<conf_description><![CDATA[Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_mod_ban</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Forum Moderator Permissions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>249</conf_id>
+			<conf_title>Moderators can mod queue members via warn panel?</conf_title>
+			<conf_description><![CDATA[Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_mod_modq</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>250</conf_id>
+			<conf_title>Moderators can remove post rights via warn panel?</conf_title>
+			<conf_description><![CDATA[Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_mod_post</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>251</conf_id>
+			<conf_title>Number of times per day a moderator can warn a single member</conf_title>
+			<conf_description></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>warn_mod_day</conf_key>
+			<conf_value></conf_value>
+			<conf_default>3</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>153</conf_id>
+			<conf_title>Global Moderators can ban via warn panel?</conf_title>
+			<conf_description>Admins can automatically do this via the warn panel.</conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_gmod_ban</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group>Global Moderator Permissions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>154</conf_id>
+			<conf_title>Global Moderators can mod queue members via warn panel?</conf_title>
+			<conf_description>Admins can automatically do this via the warn panel.</conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_gmod_modq</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>155</conf_id>
+			<conf_title>Global Moderators can remove post rights via warn panel?</conf_title>
+			<conf_description>Admins can automatically do this via the warn panel.</conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_gmod_post</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>156</conf_id>
+			<conf_title>Number of times per day a global moderator can warn a single member</conf_title>
+			<conf_description></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>warn_gmod_day</conf_key>
+			<conf_value></conf_value>
+			<conf_default>3</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+	</settinggroup>
+
+</settingexport>
\ No newline at end of file
diff --git a/upload/install/sql/mysql_fulltext.php b/upload/install/sql/mysql_fulltext.php
new file mode 100644
index 00000000..2c05a456
--- /dev/null
+++ b/upload/install/sql/mysql_fulltext.php
@@ -0,0 +1,6 @@
+<?php
+
+$INDEX[] = "alter table ibf_posts ADD FULLTEXT(post)";
+$INDEX[] = "alter table ibf_topics ADD FULLTEXT(title)";
+
+?>
\ No newline at end of file
diff --git a/upload/install/sql/mysql_inserts.php b/upload/install/sql/mysql_inserts.php
new file mode 100644
index 00000000..02586612
--- /dev/null
+++ b/upload/install/sql/mysql_inserts.php
@@ -0,0 +1,183 @@
+<?php
+
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (1, 'pdf', 'application/pdf', 1, 0, 'folder_mime_types/pdf.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (2, 'png', 'image/png', 1, 1, 'folder_mime_types/quicktime.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (3, 'viv', 'video/vivo', 1, 0, 'folder_mime_types/win_player.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (4, 'wmv', 'video/x-msvideo', 1, 0, 'folder_mime_types/win_player.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (5, 'html', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (6, 'ram', 'audio/x-pn-realaudio', 1, 0, 'folder_mime_types/real_audio.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (7, 'gif', 'image/gif', 1, 1, 'folder_mime_types/gif.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (8, 'mpg', 'video/mpeg', 1, 0, 'folder_mime_types/quicktime.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (9, 'ico', 'image/ico', 1, 0, 'folder_mime_types/gif.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (10, 'tar', 'application/x-tar', 1, 0, 'folder_mime_types/zip.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (11, 'bmp', 'image/x-MS-bmp', 1, 0, 'folder_mime_types/gif.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (12, 'tiff', 'image/tiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (13, 'rtf', 'text/richtext', 1, 0, 'folder_mime_types/rtf.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (14, 'hqx', 'application/mac-binhex40', 1, 0, 'folder_mime_types/stuffit.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (15, 'aiff', 'audio/x-aiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (31, 'zip', 'application/zip', 1, 0, 'folder_mime_types/zip.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (17, 'ps', 'application/postscript', 1, 0, 'folder_mime_types/eps.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (18, 'doc', 'application/msword', 1, 0, 'folder_mime_types/doc.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (19, 'mov', 'video/quicktime', 1, 0, 'folder_mime_types/quicktime.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (20, 'ppt', 'application/powerpoint', 1, 0, 'folder_mime_types/ppt.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (21, 'wav', 'audio/x-wav', 1, 0, 'folder_mime_types/music.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (22, 'mp3', 'audio/x-mpeg', 1, 0, 'folder_mime_types/music.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (23, 'jpg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (24, 'txt', 'text/plain', 1, 0, 'folder_mime_types/txt.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (25, 'xml', 'text/xml', 1, 0, 'folder_mime_types/script.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (26, 'css', 'text/css', 1, 0, 'folder_mime_types/script.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (27, 'swf', 'application/x-shockwave-flash', 0, 0, 'folder_mime_types/quicktime.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (32, 'php', 'application/octet-stream', 1, 0, 'folder_mime_types/php.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (28, 'htm', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (29, 'jpeg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+$INSERT[] = "INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (33, 'gz', 'application/x-gzip', 1, 0, 'folder_mime_types/zip.gif');";
+
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('skin_id_cache', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('bbcode', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('moderators', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('multimod', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('banfilters', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('attachtypes', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('emoticons', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('forum_cache', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('badwords', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('systemvars', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('adminnotes', '', '', 0);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('ranks', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('group_cache', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('stats', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('profilefields', 'a:0:{}', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('settings','', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('languages', '', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('birthdays', 'a:0:{}', '', 1);";
+$INSERT[] = "INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);";
+
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (1, ':mellow:', 'mellow.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (2, ':huh:', 'huh.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (3, '^_^', 'happy.gif', 0, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (4, ':o', 'ohmy.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (5, ';)', 'wink.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (6, ':P', 'tongue.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (7, ':D', 'biggrin.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (8, ':lol:', 'laugh.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (9, 'B)', 'cool.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (10, ':rolleyes:', 'rolleyes.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (11, '-_-', 'sleep.gif', 0, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (12, '&lt;_&lt;', 'dry.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (13, ':)', 'smile.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (14, ':wub:', 'wub.gif', 0, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (15, ':angry:', 'mad.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (16, ':(', 'sad.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (17, ':unsure:', 'unsure.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (18, ':wacko:', 'wacko.gif', 0, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (19, ':blink:', 'blink.gif', 1, 'default');";
+$INSERT[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable, emo_set) VALUES (20, ':ph34r:', 'ph34r.gif', 0, 'default');";
+
+$INSERT[] = "INSERT INTO ibf_forums VALUES (2, 1, 1, 1079604888, 1, 'IPB Team', 'A Test Forum', 'A test forum that may be removed at any time', 1, 1, 1, 1, '', 'Welcome!', 1, 'last_post', 'Z-A', 100, 0, 0, 1, 1, 1, NULL, 1, 1, '', 0, 0, '', '', '', '', '', 1, '', 'a:5:{s:11:\"start_perms\";s:1:\"*\";s:11:\"reply_perms\";s:1:\"*\";s:10:\"read_perms\";s:1:\"*\";s:12:\"upload_perms\";s:1:\"*\";s:10:\"show_perms\";s:1:\"*\";}', 0, 0, 0);";
+$INSERT[] = "INSERT INTO ibf_forums VALUES (1, 0, 0, 0, 0, '', 'A Test Root', 'A test forum that may be removed at any time', 1, 1, 0, 1, '', '', 0, 'last_post', 'Z-A', 30, 0, 0, 1, 1, 1, NULL, -1, 0, '', 0, 0, '', '', '', '', '', 0, '', 'a:5:{s:11:\"start_perms\";s:1:\"*\";s:11:\"reply_perms\";s:1:\"*\";s:10:\"read_perms\";s:1:\"*\";s:12:\"upload_perms\";s:1:\"*\";s:10:\"show_perms\";s:1:\"*\";}', 0, 0, 0);";
+
+$INSERT[] = "INSERT INTO ibf_forum_perms SET perm_name='Validating Forum Mask', perm_id=1";
+$INSERT[] = "INSERT INTO ibf_forum_perms SET perm_name='Member Forum Mask', perm_id=3";
+$INSERT[] = "INSERT INTO ibf_forum_perms SET perm_name='Guest Forum Mask', perm_id=2";
+$INSERT[] = "INSERT INTO ibf_forum_perms SET perm_name='Admin Forum Mask', perm_id=4";
+$INSERT[] = "INSERT INTO ibf_forum_perms SET perm_name='Banned Forum Mask', perm_id=5";
+
+$INSERT[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_post_closed, g_perm_id, g_photo_max_vars, g_dohtml, g_edit_topic, g_email_limit, g_bypass_badwords, g_can_msg_attach) VALUES (4, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 'Admin', 0, 1, 1, 1, 1, '', 50000, 1, 1, '', '', 50, 6, 0, 5, '-1&-1', 0, 1, '4', '50:150:150', 1, 1, '10:15', 1, 1);";
+$INSERT[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_post_closed, g_perm_id, g_photo_max_vars, g_dohtml, g_edit_topic, g_email_limit, g_bypass_badwords, g_can_msg_attach) VALUES (2, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 'Guests', NULL, NULL, NULL, NULL, NULL, '', -1, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 0, 0, '2', '', 0, 0, '10:15', 0, 0);";
+$INSERT[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_post_closed, g_perm_id, g_photo_max_vars, g_dohtml, g_edit_topic, g_email_limit, g_bypass_badwords, g_can_msg_attach) VALUES (3, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 'Members', 0, 1, 0, 0, 0, '', 500, 1, 0, '', '', 50, 0, 20, 0, '-1&-1', 0, 0, '3', '::', 0, 0, '10:15', 0, 0);";
+$INSERT[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_post_closed, g_perm_id, g_photo_max_vars, g_dohtml, g_edit_topic, g_email_limit, g_bypass_badwords, g_can_msg_attach) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Validating', 0, 1, 0, 0, 0, '', 0, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 0, 0, '1', '', 0, 0, '10:15', 0, 0);";
+$INSERT[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_post_closed, g_perm_id, g_photo_max_vars, g_dohtml, g_edit_topic, g_email_limit, g_bypass_badwords, g_can_msg_attach) VALUES (5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Banned', 0, 0, 0, 0, 0, '', NULL, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 1, 0, '5', '', 0, 0, '10:15', 0, 0);";
+
+$INSERT[] = "INSERT INTO ibf_languages (lid, ldir, lname, lauthor, lemail) VALUES (1, 'en', 'English', 'Invision Power Board', 'languages@invisionboard.com');";
+
+$INSERT[] = "INSERT INTO ibf_posts (pid, append_edit, edit_time, author_id, author_name, use_sig, use_emo, ip_address, post_date, icon_id, post, queued, topic_id, post_title, new_topic, edit_name, post_key, post_parent, post_htmlstate) VALUES (1, 0, NULL, 1, 'Invision Power Board Team', 0, 1, '127.0.0.1', 1069075118, 0, 'Welcome to your new Invision Power Board!<br>This is simply a test message confirming that the installation was successful.<br>You can remove this message, topic, forum or even category at any time.', 0, 1, NULL, 1, NULL, '0', 0, 0);";
+
+$INSERT[] = "INSERT INTO ibf_skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');";
+$INSERT[] = "INSERT INTO ibf_skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+
+
+$INSERT[] = "INSERT INTO ibf_task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (1, 'Hourly Clean Out', 'cleanout.php', 1079704080, -1, -1, -1, 59, '2a7d083832daa123b73a68f9c51fdb29', 1, 'Kill old sessions, reg images, searches', 1);";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (3, 'Daily Stats Rebuild', 'rebuildstats.php', 1079740800, -1, -1, 0, 0, '640b9a6c373ff207bc1b1100a98121af', 1, 'Rebuilds board statistics', 1);";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (6, 'Daily Clean Out', 'dailycleanout.php', 1079751600, -1, -1, 3, 0, 'e71b52f3ff9419abecedd14b54e692c4', 1, 'Prunes topic subscriptions and old read topic entries', 1);";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (8, 'Birthday and Events Cache', 'calendarevents.php', 1079725800, -1, -1, 12, -1, '2c148c9bd754d023a7a19dd9b1535796', 1, 'Caches calendar events &amp; birthdays', 1);";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES ('Announcements Update', 'announcements.php', 1080747660, -1, -1, 4, -1, 'e82f2c19ab1ed57c140fccf8aea8b9fe', 1,'Rebuilds cache and expires out of date announcements', 1);";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Send Bulk Mail', 'bulkmail.php', 1086706080, -1, -1, -1, -1, '61359ac93eb93ebbd935a4e275ade2db', 0, 'Dynamically assigned, no need to edit or change', 0, 'bulkmail', 1);";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Daily Topic &amp; Forum Digest', 'dailydigest.php', 1086912600, -1, -1, 0, 10, '723cab2aae32dd5d04898b1151038846', 1, 'Emails out daily topic &amp; forum digest emails', 1, 'dailydigest', 0)";
+$INSERT[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Weekly Topic &amp; Forum Digest', 'weeklydigest.php', 1087096200, 0, -1, 3, 10, '7e7fccd07f781bdb24ac108d26612931', 1, 'Emails weekly topic &amp; forum digest emails', 1, 'weeklydigest', 0)";
+
+
+$INSERT[] = "INSERT INTO ibf_titles (id, posts, title, pips) VALUES (1, 0, 'Newbie', '1');";
+$INSERT[] = "INSERT INTO ibf_titles (id, posts, title, pips) VALUES (2, 10, 'Member', '2');";
+$INSERT[] = "INSERT INTO ibf_titles (id, posts, title, pips) VALUES (4, 30, 'Advanced Member', '3');";
+
+$INSERT[] = "INSERT INTO ibf_topics VALUES (1, 'Welcome', '', 'open', 0, 1, 1069075118, 1, 1069075118, 0, 'IPB Team', 'IPB Team', '0', 0, 1, 2, 1, 0, 0, NULL, NULL, 0, 0, 1, 0);";
+$INSERT[] = "INSERT INTO ibf_subscription_currency SET subcurrency_code='USD', subcurrency_desc='United States Dollars', subcurrency_exchange='1.00', subcurrency_default=1;";
+$INSERT[] = "INSERT INTO ibf_subscription_currency SET subcurrency_code='GBP', subcurrency_desc='United Kingdom Pounds', subcurrency_exchange=' 0.630776', subcurrency_default=0;";
+$INSERT[] = "INSERT INTO ibf_subscription_currency SET subcurrency_code='CAD', subcurrency_desc='Canada Dollars', subcurrency_exchange='1.37080', subcurrency_default=0;";
+$INSERT[] = "INSERT INTO ibf_subscription_currency SET subcurrency_code='EUR', subcurrency_desc='Euro', subcurrency_exchange='0.901517', subcurrency_default=0;";
+
+
+$INSERT[] = "INSERT INTO ibf_subscription_methods (submethod_id, submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES (1, 'PayPal', 'paypal', '', '', '', '', '', '', '', 0, 1, 'All major credit cards accepted. See <a href=\"https://www.paypal.com/affil/pal=9DJEWQQKVB6WL\" target=\"_blank\">PayPal</a> for more information.', '', 1, 'USD');";
+$INSERT[] = "INSERT INTO ibf_subscription_methods (submethod_id, submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES (2, 'NOCHEX', 'nochex', '', '', '', '', '', '', '', 0, 1, 'UK debit and credit cards, such as Switch, Solo and VISA Delta. All prices will be convereted into GBP (UK Pounds) upon ordering.', NULL, 1, 'GBP');";
+$INSERT[] = "INSERT INTO ibf_subscription_methods (submethod_id, submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES (3, 'Post Service', 'manual', '', '', '', '', '', '', '', 0, 0, 'You can use this method if you wish to send us a check, postal order or international money order.', NULL, 1, 'USD');";
+$INSERT[] = "INSERT INTO ibf_subscription_methods (submethod_id, submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES (4, '2CheckOut', '2checkout', '', '', '', '', '', '', '', 1, 1, 'All major credit cards accepted. See <a href=\'http://www.2checkout.com/cgi-bin/aff.2c?affid=28376\' target=\'_blank\'>2CheckOut</a> for more information.', NULL, 1, 'USD');";
+$INSERT[] = "INSERT INTO ibf_subscription_methods (submethod_id, submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES (5, 'Safshop', 'safshop', '', '', NULL, NULL, NULL, NULL, NULL, 0, 1, 'Accepts all major credit cards', NULL, 1, 'USD');";
+$INSERT[] = "INSERT INTO ibf_subscription_methods (submethod_id, submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES (6, 'Protx', 'protx', '', '', '', '', '', '', '', 1, 1, 'Accepts all major credit cards', '', 1, 'GBP');";
+
+
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (1, 'Registration benefits', 'To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br>\r<br>During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br>\r<br>In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br>\r<br>Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br>\r<br>For more information on these items, please see the relevant sections in this documentation.', 'How to register and the added benefits of being a registered member.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (3, 'Recovering lost or forgotten passwords', 'Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br>This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br>\r<br>To do this, click on the <a href=\'index.php?act=Reg&CODE=10\'>Lost Password link</a> found on the log in page.\r<br>\r<br>Further instruction is available from there.', 'How to reset your password if you\'ve forgotten it.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (4, 'Your Control Panel (My Controls)', 'Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br>\r<br><b>Subscriptions</b>\r<br>\r<br>This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br>\r<br><b>Edit Profile Info</b>\r<br>\r<br>This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br>\r<br><b>Edit Signature</b>\r<br>\r<br>A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br>\r<br><b>Edit Avatar Settings</b>\r<br>\r<br>An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br>\r<br><b>Change Personal Photo</b>\r<br>\r<br>This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br>\r<br><b>Email Settings</b>\r<br>\r<br><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br>\r<br><b>Board Settings</b>\r<br>\r<br>From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br>You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br>You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br>\r<br><b>Change Email Address</b>\r<br>\r<br>At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br>\r<br><b>Change Password</b>\r<br>\r<br>You may change your password from this section. Please note that you will need to know your current password before you can change your password.', 'Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (5, 'Email Notification of new messages', 'This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br>\r<br>There are three ways to subscribe to a topic:\r<br><ul>\r<br><li>Click the \'Track This Topic\' link at the top of the topic that you wish to track</li>\r<br><li> On the posting screen when replying to or creating a topic, check the \'Enable email notification of replies?\' checkbox</li>\r<br><li> From the E-Mail settings section of your User CP (My Controls) check the \'Enable Email Notification by default?\' option, this will automatically subscribe you to any topic that you make a reply to</li>\r<br></ul>Please note that to avoid multiple emails being sent to your email address, you will only get one e-mail for each topic you are subscribed to until the next time you visit the board.\r<br>\r<br>You are also able to subscribe to each individual forum on the board, to be notified when a new topic is created in that particular forum. To enable this, click the \'Subscribe to this forum\' link at the bottom of the forum that you wish to subscribe to.\r<br>\r<br>To unsubscribe from any forums or topics that you are subscribed to - just go to the \'Subscriptions\' section of \'My Controls\' and you can do thi from there.', 'How to get emailed when a new reply is added to a topic.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (6, 'Your Personal Messenger', 'Your personal messenger acts much like an email account in that you can send and receive messages and store messages in folders.\r<br>\r<br><b>Compose a New PM</b>\r<br>\r<br>This will allow you to send a message to another member. If you have names in your contact list, you can choose a name from it - or you may choose to enter a name in the relevant form field. This will be automatically filled in if you clicked a \'PM\' button on the board (from the member list or a post). If allowed, you may also be able to enter in multiple names in the box provided, will need to add one username per line.\r<br>If the administrator allows, you may use BB Code and HTML in your private message. If you choose to check the \'Add a copy of this message to you sent items folder\' box, a copy of the message will be saved for you for later reference. If you tick the \'Track this message?\' box, then the details of the message will be available in your \'Message Tracker\' where you will be able to see if/when it has been read.\r<br>\r<br><bInbox</b>\r<br>\r<br>Your inbox is where all new messages are sent to. Clicking on the message title will show you the message in a similar format to the board topic view. You can also delete or move messages from your inbox.\r<br>\r<br><b>Empty PM Folders</b>\r<br>\r<br>This option provides you with a quick and easy way to clear out all of your PM folders.\r<br>\r<br><b>Edit Storage Folders</b>\r<br>\r<br>You may rename, add or remove folders to store messages is, allowing you to organise your messages to your preference. You cannot remove \'Sent Items\' or \'Inbox\'.\r<br>\r<br><b>PM Buddies/Block List</b>\r<br>\r<br>You may add in users names in this section, or edit any saved entries. You can also use this as a ban list, denying the named member the ability to message you.\r<br>Names entered in this section will appear in the drop down list when sending a new PM, allowing you to quickly choose the members name when sending a message.\r<br>\r<br><b>Archive Messages</b>\r<br>\r<br>If your messenger folders are full and you are unable to receive new messages, you can archive them off. This compiles the messages into a single HTML page or Microsoft © Excel Format. This page is then emailed to your registered email address for your convenience.\r<br>\r<br><b>Saved (Unsent) PMs</b>\r<br>\r<br>This area will allow you to go back to any PM\'s that you have chosen to save to be sent later.\r<br>\r<br><b>Message Tracker</B>\r<br>\r<br>This is the page that any messages that you have chosen to track will appear. Details of if and when they have been read by the recipient will appear here. This also gives you the chance to delete any messages that you have sent and not yet been read by the intended recipient.', 'How to send personal messages, track them, edit your messenger folders and archive stored messages.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (7, 'Contacting the moderating team & reporting posts', '<b>Contacting the moderating team</b>\r<br>\r<br>If you need to contact a moderator or simply wish to view the complete administration team, you can click the link \'The moderating team\' found at the bottom of the main board page (the first page you see when visiting the board), or from \'My Assistant\'.\r<br>\r<br>This list will show you administrators (those who have administration control panel access), global moderators (those who can moderate in all forums) and the moderators of the individual forums.\r<br>\r<br>If you wish to contact someone about your member account, then contact an administrator - if you wish to contact someone about a post or topic, contact either a global moderator or the forum moderator.\r<br>\r<br><b>Reporting a post</b>\r<br>\r<br>If the administrator has enabled this function on the board, you\'ll see a \'Report\' button in a post, next to the \'Quote\' button. This function will let you report the post to the forum moderator (or the administrator(s), if there isn\'t a specific moderator available). You can use this function when you think the moderator(s) should be aware of the existance of that post. However, <b>do not use this to chat with the moderator(s)!</b>. You can use the email function or the Personal Messenger function for that.', 'Where to find a list of the board moderators and administrators.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (8, 'Viewing members profile information', 'You can view a members profile at any time by clicking on their name when it is underlined (as a link) or by clicking on their name in a post within a topic.\r<br>\r<br>This will show you their profile page which contains their contact information (if they have entered some) and their \'active stats\'.\r<br>\r<br>You can also click on the \'Mini Profile\' button underneath their posts, this will show up a mini \'e-card\' with their contact information and a photograph if they have chosen to have one.', 'How to view members contact information.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (9, 'Viewing active topics and new posts', 'You can view which new topics have new replies today by clicking on the \'Today\'s Active Topics\' link found at the bottom of the main board page (the first page you see when visiting the board). You can set your own date criteria, choosing to view all topics  with new replies during several date choices.\r<br>\r<br>The \'View New Posts\' link in the member bar at the top of each page, will allow you to view all of the topics which have new replies in since your last visit to the board.', 'How to view all the topics which have a new reply today and the new posts made since your last visit.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (10, 'Searching Topics and Posts', 'The search feature is designed to allow you to quickly find topics and posts that contain the keywords you enter.\r<br>\r<br>There are two types of search form available, simple search and advanced search. You may switch between the two using the \'More Options\' and \'Simple Mode\' buttons.\r<br>\r<br><b>Simple Mode</b>\r<br>\r<br>All you need to do here is enter in a keyword into the search box, and select a forum(s) to search in. (to select multiple forums, hold down the control key on a PC, or the Shift/Apple key on a Mac) choose a sorting order and search.\r<br>\r<br><b>Advanced Mode</b>\r<br>\r<br>The advanced search screen, will give you a much greater range of options to choose from to refine your search. In addition to searching by keyword, you are able to search by a members username or a combination of both. You can also choose to refine your search by selecting a date range, and there are a number of sorting options available. There are also two ways of displaying the search results, can either show the post text in full or just show a link to the topic, can choose this using the radio buttons available.\r<br>\r<br>If the administrator has enabled it, you may have a minimum amount of time to wait between searches, this is known as search flood control.\r<br>\r<br>There are also search boxes available at the bottom of each forum, to allow you to carry out a quick search of all of the topics within that particular forum.', 'How to use the search feature.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (11, 'Logging in and out', 'If you have chosen not to remember your log in details in cookies, or you are accessing the board on another computer, you will need to log into the board to access your member profile and post with your registered name.\r<br>\r<br>When you log in, you have the choice to save cookies that will log you in automatically when you return. Do not use this option on a shared computer for security.\r<br>\r<br>You can also choose to hide - this will keep your name from appearing in the active users list.\r<br>\r<br>Logging out is simply a matter of clicking on the \'Log Out\' link that is displayed when you are logged in. If you find that you are not logged out, you may need to manually remove your cookies. See the \'Cookies\' help file for more information.', 'How to log in and out from the board and how to remain anonymous and not be shown on the active users list.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (13, 'My Assistant', 'This feature is sometimes referred to as a \'Browser Buddy\'. \r<br>\r<br>At the top it tells you how many posts have been made since you last visited the board.. Also underneath this the number of posts with replies that have been made in topics that the individual has also posted in.\r<br>Click on the \'View\' link on either of the two sentences to see the posts.\r<br>\r<br>The next section is five links to useful features:\r<br><ul>\r<br><li>The link to the moderating team is basically a quick link to see all those that either administrate or moderate certain forums on the message board.</li>\r<br><li> The link to \'Today\'s Active Topics\' shows you all the topics that have been created in the last 24 hours on the board.</li>\r<br><li>Today\'s Top 10 Posters link shows you exactly as the name suggests. It shows you the amount of posts by the members and also their total percentage of the total posts made that day.</li>\r<br><li>The overall Top 10 Posters link shows you the top 10 posters for the whole time that the board has been installed.</li>\r<br><li>My last 10 posts links to the latest topics that you have made on the board. These are shortened on the page, to save space, and are linked to if you require to read more of them.</li>\r<br></ul>The two search features allow you to search the whole board for certain words in a whole topic. It isn\'t as featured as the normal search option so it is not as comprehensive.\r<br>\r<br>The Help Search is just as comprehensive as the normal help section\'s search function and allows for quick searching of all the help topics on the board.', 'A comprehensive guide to use this handy little feature.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (12, 'Posting', 'There are three different posting screens available. The new topic button, visible in forums and in topics allows you to add a new topic to that particular forum. The new poll button (if the admin has enabled it) will also be viewable in topics and forums allowing you to create a new poll in the forum. When viewing a topic, there will be an add reply button, allowing you to add a new reply onto that particular topic. \r\n<br>\r\n<br><b>Posting new topics and replying</b>\r\n<br>\r\n<br>When making a post, you will most likely have the option to use IBF code when posting. This will allow you to add various types of formatting to your messages. For more information on this, click the \'BB Code Help\' link under the emoticon box to launch the help window.\r\n<br>\r\n<br>On the left of the text entry box, there is the clickable emoticons box - you can click on these to add them to the content of your message (these are sometimes known as \'smilies\').\r\n<br>\r\n<br>There are three options available when making a post or a reply. \'Enable emoticons?\' if this is unchecked, then any text that would normally be converted into an emoticon will not be. \'Enable signature?\' allows you to choose whether or not you would like your signature to appear on that individual post. \'Enable email notification of replies?\' ticking this box will mean that you will receive e-mail updates to the topic, see the \'Email Notification of new messages\' help topic for more information on this.\r\n<br>\r\n<br>You also have the option to choose a post icon for the topic/post when creating one. This icon will appear next to the topic name on the topic listing in that forum, or will appear next to the date/time of the message if making a reply to a topic.\r\n<br>\r\n<br>If the admin has enabled it, you will also see a file attachments option, this will allow you to attach a file to be uploaded when making a post. Click the browse button to select a file from your computer to be uploaded. If you upload an image file, it may be shown in the content of the post, all other file types will be linked to.\r\n<br>\r\n<br><b>Poll Options</b>\r\n<br>\r\n<br>If you have chosen to post a new poll, there will be an extra two option boxes at the top of the help screen. The first input box will allow you to enter the question that you are asking in the poll. The text field underneath is where you will input the choices for the poll. Simply enter a different option on each line. The maximum number of choices is set by the board admin, and this figure is displayed on the left.\r\n<br>\r\n<br><b>Quoting Posts</b>\r\n<br>\r\n<br>Displayed below each post in a topic, there is a \'Quote\' button. Pressing this button will allow you to reply to a topic, and have the text from a particular reply quoted in your own reply. When you choose to do this, an extra text field will appear below the main text input box to allow you to edit the content of the post being quoted.\r\n<br>\r\n<br><b>Editing Posts</b>\r\n<br>\r\n<br>Above any posts that you have made, you may see an \'Edit\' button. Pressing this will allow you to edit the post that you had previously made. \r\n<br>\r\n<br>When editing you may see an option to \'Add the \'Edit by\' line in this post?\'. If you tick this then it will show up in the posts that it has been edited and the time at which it was edited. If this option does not appear, then the edit by line will always be added to the post.\r\n<br>\r\n<br>If you are unable to see the edit button displayed on each post that you have made, then the administrator may have prevented you from editing posts, or the time limit for editing may have expired.\r\n<br>\r\n<br><b>Fast Reply</b>\r\n<br>\r\n<br>Where it has been enabled, there will be a fast reply button on each topic. Clicking this will open up a posting box on the topic view screen, cutting down on the time required to load the main posting screen. Click the fast reply button to expand the reply box and type the post inside of there. Although the fast reply box is not expanded by default, you can choose the option to have it expanded by default, from the board settings section of your control panel. Pressing the \'More Options\' button will take you to the normal posting screen.', 'A guide to the features avaliable when posting on the boards.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (14, 'Member List', 'The member list, accessed via the \'Members\' link at the top of each page, is basically a listing of all of the members that have registered on the board. \r\n<br>\r\n<br>If you are looking to search for a particular member by all/part of their username, then in the drop down box at the bottom of the page, change the selection from \'Search All Available\' to \'Name Begins With\' or \'Name Contains\' and input all/part of their name in the text input field and press the \'Go!\' button. \r\n<br>\r\n<br>Also, at the bottom of the member list page, there are a number of sorting options available to alter the way in which the list is displayed. \r\n<br>\r\n<br>If a member has chosen to add a photo to their profile information, then a camera icon will appear next to their name, and you may click this to view the photo.', 'Explaining the different ways to sort and search through the list of members.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (15, 'Topic Options', 'At the bottom of each topic, there is a \'Topic Options\' button. Pressing this button will expand the topic options box. \r<br>\r<br>From this box, you can select from the following options: \r<br><ul>\r<br><li>Track this topic - this option will allow you to receive e-mail updates for the topic, see the \'Email Notification of new messages\' help file for more information on this</li>\r<br><li>Subscribe to this forum - will allow you to receive e-mail updates for any new topics posted in the forum, see the Notification of new messages\' help file for more information on this</li>\r<br><li>Download / Print this Topic - will show the topic in a number of different formats. \'Printer Friendly Version\' will display a version of the topic that is suitable for printing out. \'Download HTML Version\' will download a copy of the topic to your hard drive, and this can then be viewed in a web browser, without having to visit the board. \'Download Microsoft Word Version\' will allow you to download the file to your hard drive and open it up in the popular word processing application, Microsoft Word, for viewing offline.</li>\r<br></ul>', 'A guide to the options avaliable when viewing a topic.');";
+$INSERT[] = "INSERT INTO ibf_faq (id, title, text, description) VALUES (16, 'Calendar', 'This board features it\'s very own calendar feature, which can be accessed via the calendar link at the top of the board.\r<br>\r<br>You are able to add your own personal events to the calendar - and these are only viewable by yourself. To add a new event, use the \'Add New Event\' button to be taken to the event posting screen. There are three types of events that you can now add:\r<br><ul>\r<br><li>A single day/one off event can be added using the first option, by just selecting the date for it to appear on.</li>\r<br><li>Ranged Event - is an event that spans across multiple days, to do this in addition to selecting the start date as above, will need to add the end date for the event. There are also options available  to highlight the message on the calendar, useful if there is more than one ranged event being displayed at any one time.</li>\r<br><li>Recurring Event - is a one day event, that you can set to appear at set intervals on the calendar, either weekly, monthly or yearly.</li>\r<br></ul>If the admistrator allows you, you may also be able to add a public event, that will not just be shown to yourself, but will be viewable by everyone.\r<br>\r<br>Also, if the admistrator has chosen,  there will be a link to all the birthdays happening on a particular day displayed on the calendar, and your birthday will appear if you have chosen to enter a date of birth in the Profile Info section of your control panel.', 'More information on the boards calendar feature.');";
+
+
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (2, 'CPU Saving &amp; Optimization', 'This section allows certain features to be limited or removed to get more performance out of your board.', 16);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (3, 'Date &amp; Time Formats', 'This section contains the date and time formats used throughout the board.', 7);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (4, 'User Profiles', 'This section allows you to adjust your member\'s global permissions and other options.', 22);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (5, 'Topics, Posts and Polls', 'These options control various elements when posting, reading topics and reading polls.', 32);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (6, 'Security and Privacy', 'These options allow you to adjust the security and privacy options for your board.', 18);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (7, 'Cookies', 'This section allows you to set the default cookie options.', 3);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (8, 'COPPA Set-up', 'This section allows you to comply with <a href=\'http://www.ftc.gov/ogc/coppa1.htm\'>COPPA</a>.', 3);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (9, 'Calendar &amp; Birthdays', 'This section will allow you to set up the board calendar and its related options.', 8);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (10, 'News Set-up', 'This section will allow you to specify the forum you wish to export news topics from to be used with ssi.php and IPDynamic Lite.', 2);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (11, 'Personal Message Set-up', 'This section allows you to control the global PM options.', 3);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (12, 'Email Set-up', 'This section will allow you to change the incoming and outgoing email addresses as well as the email method.', 7);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (13, 'Warn Set-up', 'This section will allow you to set up the warning system.', 15);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (14, 'Trash Can Set-up', 'The trashcan is a special forum in which topics are moved into instead of being deleted.', 6);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (15, 'Board Offline / Online', 'Use this setting to turn switch your board online or offline and leave a message for your visitors.', 2);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (16, 'Search Engine Spiders', 'This section will allow you to set up and maintain your search engine bot spider recognition settings.', 7);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (17, 'Board Guidelines', 'This section allows you to maintain your board guidelines. If enabled, a link will be added to the board header linking to the board guidelines.', 4);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (18, 'Converge Set Up', 'Converge is Invision Power Services central authentication method for all IPS applications. This allows you to have a single log-in for all your IPS products.', 1);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (19, 'Full Text Search Set-Up', 'Full text searching is a very fast and very efficient way of searching large amounts of posts without maintaining a manual index. This may not be available for your system.', 2);";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (20,'Invision Chat Settings (Legacy Version)', 'This will allow you to customize your Invision Chat integration settings for the legacy edition.', 14, 1, 'chat');";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (21,'Invision Chat Settings', 'This will allow you to customize your Invision Chat integration settings for the new 2004 edition', 10, 1, 'chat04');";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (22,'IPB Portal', 'These settings enable you to enable or disable IPB Portal and control the options IPB Portal offers.', 20, 0, 'ipbportal');";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (23,'Subscriptions Manager', 'These settings control various subscription manager features.', 3, 0, 'subsmanager');";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (24,'IPB Registration', 'This section will allow you to edit your IPB registered licence settings.', 3, 1, 'ipbreg');";
+$INSERT[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (25,'IPB Copyright Removal', 'This section allows you to manage your copyright removal key.', 2, 1, 'ipbcopyright');";
+
+
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Snap Back', 'This tag displays a little linked image which links back to a post - used when quoting posts from the board. Opens in same window by default.', 'snapback', '<a href=\"index.php?act=findpost&amp;pid={content}\"><{POST_SNAPBACK}></a>', 0, '[snapback]100[/snapback]');";
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Right', 'Aligns content to the right of the posting area', 'right', '<div align=\'right\'>{content}</div>', 0, '[right]Some text here[/right]');";
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Left', 'Aligns content to the left of the post', 'left', '<div align=\'left\'>{content}</div>', 0, '[left]Left aligned text[/left]');";
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Center', 'Aligns content to the center of the posting area.', 'center', '<div align=\'center\'>{content}</div>', 0, '[center]Centered Text[/center]');";
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Topic Link', 'This tag provides an easy way to link to a topic', 'topic', '<a href=\'index.php?showtopic={option}\'>{content}</a>', 1, '[topic=100]Click me![/topic]');";
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Link', 'This tag provides an easy way to link to a post.', 'post', '<a href=\'index.php?act=findpost&pid={option}\'>{content}</a>', 1, '[post=100]Click me![/post]');";
+$INSERT[] ="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
+
+$INSERT[] = "INSERT INTO ibf_upgrade_history (upgrade_id, upgrade_version_id, upgrade_version_human, upgrade_date, upgrade_mid, upgrade_notes) VALUES ('', '20010', '2.0.0', '0', '0', '');";
+
+?>
\ No newline at end of file
diff --git a/upload/install/sql/mysql_install.php b/upload/install/sql/mysql_install.php
new file mode 100644
index 00000000..ee8d35fa
--- /dev/null
+++ b/upload/install/sql/mysql_install.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   INVISION POWER BOARD INSTALLER v2.0
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
++--------------------------------------------------------------------------
+|
+|   > Script written by Matthew Mecham
+|   > Date started: 12th August 2004
+|   > MYSQL EXTRA CONFIG / INSTALL FILE
++--------------------------------------------------------------------------
+*/
+
+class install_extra
+{
+	var $errors     = array();
+	var $info_extra = array();
+	
+	function install_extra()
+	{
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// WHEN SHOWING THE FORM....
+	/*-------------------------------------------------------------------------*/
+	
+	function install_form_extra()
+	{
+		/*$extra = "<tr>
+					<td class='pformleftw'><b>Test Var 1 (Test Var)</b></td>
+					<td class='pformright'><input type='text' id='textinput' name='some_test_var' value=''></td>
+				  </tr>
+				  <tr>
+					<td class='pformleftw'><b>Test Var 2 (Other Test)</b></td>
+					<td class='pformright'><input type='text' id='textinput' name='some_other_test' value=''></td>
+				  </tr>";
+	
+		return $extra;*/
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// WHEN SAVING TO CONF GLOBAL
+	// Return errors in $errors[]
+	/*-------------------------------------------------------------------------*/
+	
+	function install_form_process()
+	{
+		//-----------------------------------------
+		// When processed, return all vars to save
+		// in conf_global in the array $this->info_extra
+		// This will also be saved into $INFO[] for
+		// the installer
+		//-----------------------------------------
+		
+		/*if ( ! $_REQUEST['some_test_var'] )
+		{
+			$this->errors[] = 'You must complete the required SQL section!';
+			return;
+		}
+		
+		$this->info_extra['some_test_var']   = $_REQUEST['some_test_var'];
+		$this->info_extra['some_other_test'] = $_REQUEST['some_other_test'];*/
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/install/sql/mysql_tables.php b/upload/install/sql/mysql_tables.php
new file mode 100644
index 00000000..f035ed04
--- /dev/null
+++ b/upload/install/sql/mysql_tables.php
@@ -0,0 +1,973 @@
+<?php
+
+$TABLE[] = "CREATE TABLE ibf_admin_logs (
+  id bigint(20) NOT NULL auto_increment,
+  act varchar(255) default NULL,
+  code varchar(255) default NULL,
+  member_id int(10) default NULL,
+  ctime int(10) default NULL,
+  note text,
+  ip_address varchar(255) default NULL,
+  PRIMARY KEY  (id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_admin_sessions (
+  session_id varchar(32) NOT NULL default '',
+  session_ip_address varchar(32) NOT NULL default '',
+  session_member_name varchar(250) NOT NULL default '',
+  session_member_id mediumint(8) NOT NULL default '0',
+  session_member_login_key varchar(32) NOT NULL default '',
+  session_location varchar(64) NOT NULL default '',
+  session_log_in_time int(10) NOT NULL default '0',
+  session_running_time int(10) NOT NULL default '0',
+  PRIMARY KEY  (session_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_announcements (
+  announce_id int(10) unsigned NOT NULL auto_increment,
+  announce_title varchar(255) NOT NULL default '',
+  announce_post text NOT NULL,
+  announce_forum text NOT NULL,
+  announce_member_id mediumint(8) unsigned NOT NULL default '0',
+  announce_html_enabled tinyint(1) NOT NULL default '0',
+  announce_views int(10) unsigned NOT NULL default '0',
+  announce_start int(10) unsigned NOT NULL default '0',
+  announce_end int(10) unsigned NOT NULL default '0',
+  announce_active tinyint(1) NOT NULL default '1',
+  PRIMARY KEY  (announce_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_attachments (
+  attach_id int(10) NOT NULL auto_increment,
+  attach_file varchar(250) NOT NULL default '',
+  attach_location varchar(250) NOT NULL default '',
+  attach_thumb_location varchar(250) NOT NULL default '',
+  attach_hits int(10) NOT NULL default '0',
+  attach_date int(10) NOT NULL default '0',
+  attach_temp tinyint(1) NOT NULL default '0',
+  attach_pid int(10) NOT NULL default '0',
+  attach_post_key varchar(32) NOT NULL default '0',
+  attach_msg int(10) NOT NULL default '0',
+  attach_member_id mediumint(8) NOT NULL default '0',
+  attach_approved int(10) NOT NULL default '1',
+  attach_filesize int(10) NOT NULL default '0',
+  attach_thumb_width smallint(5) NOT NULL default '0',
+  attach_thumb_height smallint(5) NOT NULL default '0',
+  attach_is_image tinyint(1) NOT NULL default '0',
+  attach_ext varchar(10) NOT NULL default '',
+  PRIMARY KEY  (attach_id),
+  KEY attach_pid (attach_pid),
+  KEY attach_msg (attach_msg),
+  KEY attach_post_key (attach_post_key),
+  KEY attach_mid_size (attach_member_id,attach_filesize)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_attachments_type (
+  atype_id int(10) NOT NULL auto_increment,
+  atype_extension varchar(18) NOT NULL default '',
+  atype_mimetype varchar(255) NOT NULL default '',
+  atype_post tinyint(1) NOT NULL default '1',
+  atype_photo tinyint(1) NOT NULL default '0',
+  atype_img text NOT NULL,
+  PRIMARY KEY  (atype_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_badwords (
+  wid int(3) NOT NULL auto_increment,
+  type varchar(250) NOT NULL default '',
+  swop varchar(250) default NULL,
+  m_exact tinyint(1) default '0',
+  PRIMARY KEY  (wid)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_banfilters (
+  ban_id int(10) NOT NULL auto_increment,
+  ban_type varchar(10) NOT NULL default 'ip',
+  ban_content text NOT NULL,
+  ban_date int(10) NOT NULL default '0',
+  PRIMARY KEY  (ban_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_bulk_mail (
+  mail_id int(10) NOT NULL auto_increment,
+  mail_subject varchar(255) NOT NULL default '',
+  mail_content mediumtext NOT NULL,
+  mail_groups mediumtext NOT NULL,
+  mail_honor tinyint(1) NOT NULL default '1',
+  mail_opts mediumtext NOT NULL,
+  mail_start int(10) NOT NULL default '0',
+  mail_updated int(10) NOT NULL default '0',
+  mail_sentto int(10) NOT NULL default '0',
+  mail_active tinyint(1) NOT NULL default '0',
+  mail_pergo smallint(5) NOT NULL default '0',
+  PRIMARY KEY  (mail_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_cache_store (
+  cs_key varchar(255) NOT NULL default '',
+  cs_value mediumtext NOT NULL,
+  cs_extra varchar(255) NOT NULL default '',
+  cs_array tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (cs_key)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_calendar_events (
+  eventid mediumint(8) NOT NULL auto_increment,
+  userid mediumint(8) NOT NULL default '0',
+  year int(4) NOT NULL default '2002',
+  month int(2) NOT NULL default '1',
+  mday int(2) NOT NULL default '1',
+  title varchar(254) NOT NULL default 'no title',
+  event_text text NOT NULL,
+  read_perms varchar(254) NOT NULL default '*',
+  unix_stamp int(10) NOT NULL default '0',
+  priv_event tinyint(1) NOT NULL default '0',
+  show_emoticons tinyint(1) NOT NULL default '1',
+  rating smallint(2) NOT NULL default '1',
+  event_ranged tinyint(1) NOT NULL default '0',
+  event_repeat tinyint(1) NOT NULL default '0',
+  repeat_unit char(2) NOT NULL default '',
+  end_day int(2) default NULL,
+  end_month int(2) default NULL,
+  end_year int(4) default NULL,
+  end_unix_stamp int(10) default NULL,
+  event_bgcolor varchar(32) NOT NULL default '',
+  event_color varchar(32) NOT NULL default '',
+  PRIMARY KEY  (eventid),
+  KEY unix_stamp (unix_stamp)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_conf_settings (
+  conf_id int(10) NOT NULL auto_increment,
+  conf_title varchar(255) NOT NULL default '',
+  conf_description text NOT NULL,
+  conf_group varchar(255) NOT NULL default '',
+  conf_type varchar(255) NOT NULL default '',
+  conf_key varchar(255) NOT NULL default '',
+  conf_value text NOT NULL,
+  conf_default text NOT NULL,
+  conf_extra text NOT NULL,
+  conf_evalphp text NOT NULL,
+  conf_protected tinyint(1) NOT NULL default '0',
+  conf_position smallint(3) NOT NULL default '0',
+  conf_start_group varchar(255) NOT NULL default '',
+  conf_end_group tinyint(1) NOT NULL default '0',
+  conf_help_key varchar(255) NOT NULL default '0',
+  conf_add_cache tinyint(1) NOT NULL default '1',
+  PRIMARY KEY  (conf_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_conf_settings_titles (
+  conf_title_id smallint(3) NOT NULL auto_increment,
+  conf_title_title varchar(255) NOT NULL default '',
+  conf_title_desc text NOT NULL,
+  conf_title_count smallint(3) NOT NULL default '0',
+  conf_title_noshow tinyint(1) NOT NULL default '0',
+  conf_title_keyword varchar(200) NOT NULL default '0',
+  PRIMARY KEY  (conf_title_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_contacts (
+  id mediumint(8) NOT NULL auto_increment,
+  contact_id mediumint(8) NOT NULL default '0',
+  member_id mediumint(8) NOT NULL default '0',
+  contact_name varchar(32) NOT NULL default '',
+  allow_msg tinyint(1) default NULL,
+  contact_desc varchar(50) default NULL,
+  PRIMARY KEY  (id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_custom_bbcode (
+  bbcode_id int(10) NOT NULL auto_increment,
+  bbcode_title varchar(255) NOT NULL default '',
+  bbcode_desc text NOT NULL,
+  bbcode_tag varchar(255) NOT NULL default '',
+  bbcode_replace text NOT NULL,
+  bbcode_useoption tinyint(1) NOT NULL default '0',
+  bbcode_example text NOT NULL,
+  PRIMARY KEY  (bbcode_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_email_logs (
+  email_id int(10) NOT NULL auto_increment,
+  email_subject varchar(255) NOT NULL default '',
+  email_content text NOT NULL,
+  email_date int(10) NOT NULL default '0',
+  from_member_id mediumint(8) NOT NULL default '0',
+  from_email_address varchar(250) NOT NULL default '',
+  from_ip_address varchar(16) NOT NULL default '127.0.0.1',
+  to_member_id mediumint(8) NOT NULL default '0',
+  to_email_address varchar(250) NOT NULL default '',
+  topic_id int(10) NOT NULL default '0',
+  PRIMARY KEY  (email_id),
+  KEY from_member_id (from_member_id),
+  KEY email_date (email_date)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_emoticons (
+  id smallint(3) NOT NULL auto_increment,
+  typed varchar(32) NOT NULL default '',
+  image varchar(128) NOT NULL default '',
+  clickable smallint(2) NOT NULL default '1',
+  emo_set varchar(64) NOT NULL default 'default',
+  PRIMARY KEY  (id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_faq (
+  id mediumint(8) NOT NULL auto_increment,
+  title varchar(128) NOT NULL default '',
+  text text,
+  description text NOT NULL,
+  PRIMARY KEY  (id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_forum_perms (
+  perm_id int(10) NOT NULL auto_increment,
+  perm_name varchar(250) NOT NULL default '',
+  PRIMARY KEY  (perm_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_forum_tracker (
+  frid mediumint(8) NOT NULL auto_increment,
+  member_id varchar(32) NOT NULL default '',
+  forum_id smallint(5) NOT NULL default '0',
+  start_date int(10) default NULL,
+  last_sent int(10) NOT NULL default '0',
+  forum_track_type varchar(100) NOT NULL default 'delayed',
+  PRIMARY KEY  (frid)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_forums (
+  id smallint(5) NOT NULL default '0',
+  topics mediumint(6) default NULL,
+  posts mediumint(6) default NULL,
+  last_post int(10) default NULL,
+  last_poster_id mediumint(8) NOT NULL default '0',
+  last_poster_name varchar(32) default NULL,
+  name varchar(128) NOT NULL default '',
+  description text,
+  position smallint(5) default NULL,
+  use_ibc tinyint(1) default NULL,
+  use_html tinyint(1) default NULL,
+  status tinyint(1) default '1',
+  password varchar(32) default NULL,
+  last_title varchar(128) default NULL,
+  last_id int(10) default NULL,
+  sort_key varchar(32) default NULL,
+  sort_order varchar(32) default NULL,
+  prune tinyint(3) default NULL,
+  show_rules tinyint(1) default NULL,
+  preview_posts tinyint(1) default NULL,
+  allow_poll tinyint(1) NOT NULL default '1',
+  allow_pollbump tinyint(1) NOT NULL default '0',
+  inc_postcount tinyint(1) NOT NULL default '1',
+  skin_id int(10) default NULL,
+  parent_id mediumint(5) default '-1',
+  quick_reply tinyint(1) default '0',
+  redirect_url varchar(250) default '',
+  redirect_on tinyint(1) NOT NULL default '0',
+  redirect_hits int(10) NOT NULL default '0',
+  redirect_loc varchar(250) default '',
+  rules_title varchar(255) NOT NULL default '',
+  rules_text text NOT NULL,
+  topic_mm_id varchar(250) NOT NULL default '',
+  notify_modq_emails text,
+  sub_can_post tinyint(1) default '1',
+  permission_custom_error text NOT NULL,
+  permission_array mediumtext NOT NULL,
+  permission_showtopic tinyint(1) NOT NULL default '0',
+  queued_topics mediumint(6) NOT NULL default '0',
+  queued_posts mediumint(6) NOT NULL default '0',
+  PRIMARY KEY  (id),
+  KEY id (id),
+  KEY position (position,parent_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_groups (
+  g_id int(3) unsigned NOT NULL auto_increment,
+  g_view_board tinyint(1) default NULL,
+  g_mem_info tinyint(1) default NULL,
+  g_other_topics tinyint(1) default NULL,
+  g_use_search tinyint(1) default NULL,
+  g_email_friend tinyint(1) default NULL,
+  g_invite_friend tinyint(1) default NULL,
+  g_edit_profile tinyint(1) default NULL,
+  g_post_new_topics tinyint(1) default NULL,
+  g_reply_own_topics tinyint(1) default NULL,
+  g_reply_other_topics tinyint(1) default NULL,
+  g_edit_posts tinyint(1) default NULL,
+  g_delete_own_posts tinyint(1) default NULL,
+  g_open_close_posts tinyint(1) default NULL,
+  g_delete_own_topics tinyint(1) default NULL,
+  g_post_polls tinyint(1) default NULL,
+  g_vote_polls tinyint(1) default NULL,
+  g_use_pm tinyint(1) default NULL,
+  g_is_supmod tinyint(1) default NULL,
+  g_access_cp tinyint(1) default NULL,
+  g_title varchar(32) NOT NULL default '',
+  g_can_remove tinyint(1) default NULL,
+  g_append_edit tinyint(1) default NULL,
+  g_access_offline tinyint(1) default NULL,
+  g_avoid_q tinyint(1) default NULL,
+  g_avoid_flood tinyint(1) default NULL,
+  g_icon text NOT NULL,
+  g_attach_max bigint(20) default NULL,
+  g_avatar_upload tinyint(1) default '0',
+  g_calendar_post tinyint(1) default '0',
+  prefix varchar(250) default NULL,
+  suffix varchar(250) default NULL,
+  g_max_messages int(5) default '50',
+  g_max_mass_pm int(5) default '0',
+  g_search_flood mediumint(6) default '20',
+  g_edit_cutoff int(10) default '0',
+  g_promotion varchar(10) default '-1&-1',
+  g_hide_from_list tinyint(1) default '0',
+  g_post_closed tinyint(1) default '0',
+  g_perm_id varchar(255) NOT NULL default '',
+  g_photo_max_vars varchar(200) default '',
+  g_dohtml tinyint(1) NOT NULL default '0',
+  g_edit_topic tinyint(1) NOT NULL default '0',
+  g_email_limit varchar(15) NOT NULL default '10:15',
+  g_bypass_badwords tinyint(1) NOT NULL default '0',
+  g_can_msg_attach tinyint(1) NOT NULL default '0',
+  g_attach_per_post int(10) NOT NULL default '0',
+  PRIMARY KEY  (g_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_languages (
+  lid mediumint(8) NOT NULL auto_increment,
+  ldir varchar(64) NOT NULL default '',
+  lname varchar(250) NOT NULL default '',
+  lauthor varchar(250) default NULL,
+  lemail varchar(250) default NULL,
+  PRIMARY KEY  (lid)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_mail_error_logs (
+  mlog_id int(10) NOT NULL auto_increment,
+  mlog_date int(10) NOT NULL default '0',
+  mlog_to varchar(250) NOT NULL default '',
+  mlog_from varchar(250) NOT NULL default '',
+  mlog_subject varchar(250) NOT NULL default '',
+  mlog_content varchar(250) NOT NULL default '',
+  mlog_msg text NOT NULL,
+  mlog_code varchar(200) NOT NULL default '',
+  mlog_smtp_msg text NOT NULL,
+  PRIMARY KEY  (mlog_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_mail_queue (
+  mail_id int(10) NOT NULL auto_increment,
+  mail_date int(10) NOT NULL default '0',
+  mail_to varchar(255) NOT NULL default '',
+  mail_from varchar(255) NOT NULL default '',
+  mail_subject text NOT NULL,
+  mail_content text NOT NULL,
+  mail_type varchar(200) NOT NULL default '',
+  PRIMARY KEY  (mail_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_member_extra (
+  id mediumint(8) NOT NULL default '0',
+  notes text,
+  links text,
+  bio text,
+  ta_size char(3) default NULL,
+  photo_type varchar(10) default '',
+  photo_location varchar(255) default '',
+  photo_dimensions varchar(200) default '',
+  aim_name varchar(40) NOT NULL default '',
+  icq_number int(15) NOT NULL default '0',
+  website varchar(250) NOT NULL default '',
+  yahoo varchar(40) NOT NULL default '',
+  interests text NOT NULL,
+  msnname varchar(200) NOT NULL default '',
+  vdirs text NOT NULL,
+  location varchar(250) NOT NULL default '',
+  signature text NOT NULL default '',
+  avatar_location varchar(128) NOT NULL default '',
+  avatar_size varchar(9) NOT NULL default '',
+  avatar_type varchar(15) NOT NULL default 'local',
+  PRIMARY KEY  (id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_members (
+  id mediumint(8) NOT NULL default '0',
+  name varchar(255) NOT NULL default '',
+  mgroup smallint(3) NOT NULL default '0',
+  legacy_password varchar(32) NOT NULL default '',
+  email varchar(60) NOT NULL default '',
+  joined int(10) NOT NULL default '0',
+  ip_address varchar(16) NOT NULL default '',
+  posts mediumint(7) default '0',
+  title varchar(64) default NULL,
+  allow_admin_mails tinyint(1) default NULL,
+  time_offset varchar(10) default NULL,
+  hide_email varchar(8) default NULL,
+  email_pm tinyint(1) default NULL,
+  email_full tinyint(1) default NULL,
+  skin smallint(5) default NULL,
+  warn_level int(10) default NULL,
+  warn_lastwarn int(10) NOT NULL default '0',
+  language varchar(32) default NULL,
+  last_post int(10) default NULL,
+  restrict_post varchar(100) NOT NULL default '0',
+  view_sigs tinyint(1) default '1',
+  view_img tinyint(1) default '1',
+  view_avs tinyint(1) default '1',
+  view_pop tinyint(1) default '1',
+  bday_day int(2) default NULL,
+  bday_month int(2) default NULL,
+  bday_year int(4) default NULL,
+  new_msg tinyint(2) default NULL,
+  msg_total smallint(5) default '0',
+  show_popup tinyint(1) default NULL,
+  misc varchar(128) default NULL,
+  last_visit int(10) default '0',
+  last_activity int(10) default '0',
+  dst_in_use tinyint(1) default '0',
+  view_prefs varchar(64) default '-1&-1',
+  coppa_user tinyint(1) default '0',
+  mod_posts varchar(100) NOT NULL default '0',
+  auto_track varchar(50) default '0',
+  temp_ban varchar(100) default '0',
+  sub_end int(10) NOT NULL default '0',
+  login_anonymous char(3) NOT NULL default '0&0',
+  ignored_users text NOT NULL,
+  mgroup_others varchar(255) NOT NULL default '',
+  org_perm_id varchar(255) NOT NULL default '',
+  member_login_key varchar(32) NOT NULL default '',
+  subs_pkg_chosen smallint(3) NOT NULL default '0',
+  PRIMARY KEY  (id),
+  KEY name (name),
+  KEY mgroup (mgroup),
+  KEY bday_day (bday_day),
+  KEY bday_month (bday_month)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_members_converge (
+  converge_id int(10) NOT NULL auto_increment,
+  converge_email varchar(250) NOT NULL default '',
+  converge_joined int(10) NOT NULL default '0',
+  converge_pass_hash varchar(32) NOT NULL default '',
+  converge_pass_salt varchar(5) NOT NULL default '',
+  PRIMARY KEY  (converge_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_message_text (
+  msg_id int(10) NOT NULL auto_increment,
+  msg_date int(10) default NULL,
+  msg_post text,
+  msg_cc_users text,
+  msg_sent_to_count smallint(5) NOT NULL default '0',
+  msg_deleted_count smallint(5) NOT NULL default '0',
+  msg_post_key varchar(32) NOT NULL default '0',
+  msg_author_id mediumint(8) NOT NULL default '0',
+  PRIMARY KEY  (msg_id),
+  KEY msg_date (msg_date),
+  KEY msg_sent_to_count (msg_sent_to_count),
+  KEY msg_deleted_count (msg_deleted_count)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_message_topics (
+  mt_id int(10) NOT NULL auto_increment,
+  mt_msg_id int(10) NOT NULL default '0',
+  mt_date int(10) NOT NULL default '0',
+  mt_title varchar(255) NOT NULL default '',
+  mt_from_id mediumint(8) NOT NULL default '0',
+  mt_to_id mediumint(8) NOT NULL default '0',
+  mt_vid_folder varchar(32) NOT NULL default '',
+  mt_read tinyint(1) NOT NULL default '0',
+  mt_hasattach smallint(5) NOT NULL default '0',
+  mt_hide_cc tinyint(1) default '0',
+  mt_tracking tinyint(1) default '0',
+  mt_owner_id mediumint(8) NOT NULL default '0',
+  mt_user_read int(10) default '0',
+  PRIMARY KEY  (mt_id),
+  KEY mt_from_id (mt_from_id),
+  KEY mt_owner_id (mt_owner_id,mt_to_id,mt_vid_folder,mt_date)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_moderator_logs (
+  id int(10) NOT NULL auto_increment,
+  forum_id int(5) default '0',
+  topic_id int(10) NOT NULL default '0',
+  post_id int(10) default NULL,
+  member_id mediumint(8) NOT NULL default '0',
+  member_name varchar(32) NOT NULL default '',
+  ip_address varchar(16) NOT NULL default '0',
+  http_referer varchar(255) default NULL,
+  ctime int(10) default NULL,
+  topic_title varchar(128) default NULL,
+  action varchar(128) default NULL,
+  query_string varchar(128) default NULL,
+  PRIMARY KEY  (id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_moderators (
+  mid mediumint(8) NOT NULL auto_increment,
+  forum_id int(5) NOT NULL default '0',
+  member_name varchar(32) NOT NULL default '',
+  member_id mediumint(8) NOT NULL default '0',
+  edit_post tinyint(1) default NULL,
+  edit_topic tinyint(1) default NULL,
+  delete_post tinyint(1) default NULL,
+  delete_topic tinyint(1) default NULL,
+  view_ip tinyint(1) default NULL,
+  open_topic tinyint(1) default NULL,
+  close_topic tinyint(1) default NULL,
+  mass_move tinyint(1) default NULL,
+  mass_prune tinyint(1) default NULL,
+  move_topic tinyint(1) default NULL,
+  pin_topic tinyint(1) default NULL,
+  unpin_topic tinyint(1) default NULL,
+  post_q tinyint(1) default NULL,
+  topic_q tinyint(1) default NULL,
+  allow_warn tinyint(1) default NULL,
+  edit_user tinyint(1) NOT NULL default '0',
+  is_group tinyint(1) default '0',
+  group_id smallint(3) default NULL,
+  group_name varchar(200) default NULL,
+  split_merge tinyint(1) default '0',
+  can_mm tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (mid),
+  KEY forum_id (forum_id),
+  KEY group_id (group_id),
+  KEY member_id (member_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_pfields_content (
+  member_id mediumint(8) NOT NULL default '0',
+  updated int(10) default '0',
+  PRIMARY KEY  (member_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_pfields_data (
+  pf_id smallint(5) NOT NULL auto_increment,
+  pf_title varchar(250) NOT NULL default '',
+  pf_desc varchar(250) NOT NULL default '',
+  pf_content text NOT NULL,
+  pf_type varchar(250) NOT NULL default '',
+  pf_not_null tinyint(1) NOT NULL default '0',
+  pf_member_hide tinyint(1) NOT NULL default '0',
+  pf_max_input smallint(6) NOT NULL default '0',
+  pf_member_edit tinyint(1) NOT NULL default '0',
+  pf_position smallint(6) NOT NULL default '0',
+  pf_show_on_reg tinyint(1) NOT NULL default '0',
+  pf_input_format text NOT NULL,
+  pf_admin_only tinyint(1) NOT NULL default '0',
+  pf_topic_format text NOT NULL,
+  PRIMARY KEY  (pf_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_polls (
+  pid mediumint(8) NOT NULL auto_increment,
+  tid int(10) NOT NULL default '0',
+  start_date int(10) default NULL,
+  choices text,
+  starter_id mediumint(8) NOT NULL default '0',
+  votes smallint(5) NOT NULL default '0',
+  forum_id smallint(5) NOT NULL default '0',
+  poll_question varchar(255) default NULL,
+  PRIMARY KEY  (pid)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_posts (
+  pid int(10) NOT NULL auto_increment,
+  append_edit tinyint(1) default '0',
+  edit_time int(10) default NULL,
+  author_id mediumint(8) NOT NULL default '0',
+  author_name varchar(32) default NULL,
+  use_sig tinyint(1) NOT NULL default '0',
+  use_emo tinyint(1) NOT NULL default '0',
+  ip_address varchar(16) NOT NULL default '',
+  post_date int(10) default NULL,
+  icon_id smallint(3) default NULL,
+  post text,
+  queued tinyint(1) NOT NULL default '0',
+  topic_id int(10) NOT NULL default '0',
+  post_title varchar(255) default NULL,
+  new_topic tinyint(1) default '0',
+  edit_name varchar(255) default NULL,
+  post_key varchar(32) NOT NULL default '0',
+  post_parent int(10) NOT NULL default '0',
+  post_htmlstate smallint(1) NOT NULL default '0',
+  PRIMARY KEY  (pid),
+  KEY topic_id (topic_id,queued,pid),
+  KEY author_id (author_id,topic_id),
+  KEY post_date (post_date)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_reg_antispam (
+  regid varchar(32) NOT NULL default '',
+  regcode varchar(8) NOT NULL default '',
+  ip_address varchar(32) default NULL,
+  ctime int(10) default NULL,
+  PRIMARY KEY  (regid)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_search_results (
+  id varchar(32) NOT NULL default '',
+  topic_id text NOT NULL,
+  search_date int(12) NOT NULL default '0',
+  topic_max int(3) NOT NULL default '0',
+  sort_key varchar(32) NOT NULL default 'last_post',
+  sort_order varchar(4) NOT NULL default 'desc',
+  member_id mediumint(10) default '0',
+  ip_address varchar(64) default NULL,
+  post_id text,
+  post_max int(10) NOT NULL default '0',
+  query_cache text
+)";
+
+$TABLE[] = "CREATE TABLE ibf_sessions (
+  id varchar(32) NOT NULL default '0',
+  member_name varchar(64) default NULL,
+  member_id mediumint(8) NOT NULL default '0',
+  ip_address varchar(16) default NULL,
+  browser varchar(64) default NULL,
+  running_time int(10) default NULL,
+  login_type char(3) default '',
+  location varchar(40) default NULL,
+  member_group smallint(3) default NULL,
+  in_forum smallint(5) NOT NULL default '0',
+  in_topic int(10) default NULL,
+  in_error tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (id),
+  KEY in_topic (in_topic),
+  KEY in_forum (in_forum)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_skin_macro (
+  macro_id smallint(3) NOT NULL auto_increment,
+  macro_value varchar(200) default NULL,
+  macro_replace text,
+  macro_can_remove tinyint(1) default '0',
+  macro_set smallint(3) NOT NULL default '0',
+  PRIMARY KEY  (macro_id),
+  KEY macro_set (macro_set)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_skin_sets (
+  set_skin_set_id int(10) NOT NULL auto_increment,
+  set_name varchar(150) NOT NULL default '',
+  set_image_dir varchar(200) NOT NULL default '',
+  set_hidden tinyint(1) NOT NULL default '0',
+  set_default tinyint(1) NOT NULL default '0',
+  set_css_method varchar(100) NOT NULL default 'inline',
+  set_skin_set_parent smallint(5) NOT NULL default '-1',
+  set_author_email varchar(255) NOT NULL default '',
+  set_author_name varchar(255) NOT NULL default '',
+  set_author_url varchar(255) NOT NULL default '',
+  set_css mediumtext NOT NULL,
+  set_cache_macro mediumtext NOT NULL,
+  set_wrapper mediumtext NOT NULL,
+  set_css_updated int(10) NOT NULL default '0',
+  set_cache_css mediumtext NOT NULL,
+  set_cache_wrapper mediumtext NOT NULL,
+  set_emoticon_folder varchar(60) NOT NULL default 'default',
+  PRIMARY KEY  (set_skin_set_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_skin_templates (
+  suid int(10) NOT NULL auto_increment,
+  set_id int(10) NOT NULL default '0',
+  group_name varchar(255) NOT NULL default '',
+  section_content mediumtext,
+  func_name varchar(255) default NULL,
+  func_data text,
+  updated int(10) default NULL,
+  can_remove tinyint(4) default '0',
+  PRIMARY KEY  (suid)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_skin_templates_cache (
+  template_id varchar(32) NOT NULL default '',
+  template_group_name varchar(255) NOT NULL default '',
+  template_group_content mediumtext NOT NULL,
+  template_set_id int(10) NOT NULL default '0',
+  PRIMARY KEY  (template_id),
+  KEY template_set_id (template_set_id),
+  KEY template_group_name (template_group_name)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_spider_logs (
+  sid int(10) NOT NULL auto_increment,
+  bot varchar(255) NOT NULL default '',
+  query_string text NOT NULL,
+  entry_date int(10) NOT NULL default '0',
+  ip_address varchar(16) NOT NULL default '',
+  PRIMARY KEY  (sid)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_subscription_currency (
+  subcurrency_code varchar(10) NOT NULL default '',
+  subcurrency_desc varchar(250) NOT NULL default '',
+  subcurrency_exchange decimal(10,8) NOT NULL default '0.00000000',
+  subcurrency_default tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (subcurrency_code)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_subscription_extra (
+  subextra_id smallint(5) NOT NULL auto_increment,
+  subextra_sub_id smallint(5) NOT NULL default '0',
+  subextra_method_id smallint(5) NOT NULL default '0',
+  subextra_product_id varchar(250) NOT NULL default '0',
+  subextra_can_upgrade tinyint(1) NOT NULL default '0',
+  subextra_recurring tinyint(1) NOT NULL default '0',
+  subextra_custom_1 text,
+  subextra_custom_2 text,
+  subextra_custom_3 text,
+  subextra_custom_4 text,
+  subextra_custom_5 text,
+  PRIMARY KEY  (subextra_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_subscription_logs (
+  sublog_id int(10) NOT NULL auto_increment,
+  sublog_date int(10) NOT NULL default '0',
+  sublog_member_id mediumint(8) NOT NULL default '0',
+  sublog_transid int(10) NOT NULL default '0',
+  sublog_ipaddress varchar(16) NOT NULL default '',
+  sublog_data text,
+  sublog_postdata text,
+  PRIMARY KEY  (sublog_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_subscription_methods (
+  submethod_id smallint(5) NOT NULL auto_increment,
+  submethod_title varchar(250) NOT NULL default '',
+  submethod_name varchar(20) NOT NULL default '',
+  submethod_email varchar(250) NOT NULL default '',
+  submethod_sid text,
+  submethod_custom_1 text,
+  submethod_custom_2 text,
+  submethod_custom_3 text,
+  submethod_custom_4 text,
+  submethod_custom_5 text,
+  submethod_is_cc tinyint(1) NOT NULL default '0',
+  submethod_is_auto tinyint(1) NOT NULL default '0',
+  submethod_desc text,
+  submethod_logo text,
+  submethod_active tinyint(1) NOT NULL default '0',
+  submethod_use_currency varchar(10) NOT NULL default 'USD',
+  PRIMARY KEY  (submethod_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_subscription_trans (
+  subtrans_id int(10) NOT NULL auto_increment,
+  subtrans_sub_id smallint(5) NOT NULL default '0',
+  subtrans_member_id mediumint(8) NOT NULL default '0',
+  subtrans_old_group smallint(5) NOT NULL default '0',
+  subtrans_paid decimal(10,2) NOT NULL default '0.00',
+  subtrans_cumulative decimal(10,2) NOT NULL default '0.00',
+  subtrans_method varchar(20) NOT NULL default '',
+  subtrans_start_date int(11) NOT NULL default '0',
+  subtrans_end_date int(11) NOT NULL default '0',
+  subtrans_state varchar(200) NOT NULL default '',
+  subtrans_trxid varchar(200) NOT NULL default '',
+  subtrans_subscrid varchar(200) NOT NULL default '',
+  subtrans_currency varchar(10) NOT NULL default 'USD',
+  PRIMARY KEY  (subtrans_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_subscriptions (
+  sub_id smallint(5) NOT NULL auto_increment,
+  sub_title varchar(250) NOT NULL default '',
+  sub_desc text,
+  sub_new_group mediumint(8) NOT NULL default '0',
+  sub_length smallint(5) NOT NULL default '1',
+  sub_unit char(2) NOT NULL default 'm',
+  sub_cost decimal(10,2) NOT NULL default '0.00',
+  sub_run_module varchar(250) NOT NULL default '',
+  PRIMARY KEY  (sub_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_task_logs (
+  log_id int(10) NOT NULL auto_increment,
+  log_title varchar(255) NOT NULL default '',
+  log_date int(10) NOT NULL default '0',
+  log_ip varchar(16) NOT NULL default '0',
+  log_desc text NOT NULL,
+  PRIMARY KEY  (log_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_task_manager (
+  task_id int(10) NOT NULL auto_increment,
+  task_title varchar(255) NOT NULL default '',
+  task_file varchar(255) NOT NULL default '',
+  task_next_run int(10) NOT NULL default '0',
+  task_week_day tinyint(1) NOT NULL default '-1',
+  task_month_day smallint(2) NOT NULL default '-1',
+  task_hour smallint(2) NOT NULL default '-1',
+  task_minute smallint(2) NOT NULL default '-1',
+  task_cronkey varchar(32) NOT NULL default '',
+  task_log tinyint(1) NOT NULL default '0',
+  task_description text NOT NULL,
+  task_enabled tinyint(1) NOT NULL default '1',
+  task_key varchar(30) NOT NULL default '',
+  task_safemode tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (task_id),
+  KEY task_next_run (task_next_run)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_titles (
+  id smallint(5) NOT NULL auto_increment,
+  posts int(10) default NULL,
+  title varchar(128) default NULL,
+  pips varchar(128) default NULL,
+  PRIMARY KEY  (id),
+  KEY posts (posts)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_topic_mmod (
+  mm_id smallint(5) NOT NULL auto_increment,
+  mm_title varchar(250) NOT NULL default '',
+  mm_enabled tinyint(1) NOT NULL default '0',
+  topic_state varchar(10) NOT NULL default 'leave',
+  topic_pin varchar(10) NOT NULL default 'leave',
+  topic_move smallint(5) NOT NULL default '0',
+  topic_move_link tinyint(1) NOT NULL default '0',
+  topic_title_st varchar(250) NOT NULL default '',
+  topic_title_end varchar(250) NOT NULL default '',
+  topic_reply tinyint(1) NOT NULL default '0',
+  topic_reply_content text NOT NULL,
+  topic_reply_postcount tinyint(1) NOT NULL default '0',
+  mm_forums text NOT NULL,
+  topic_approve tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (mm_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_topics (
+  tid int(10) NOT NULL auto_increment,
+  title varchar(250) NOT NULL default '',
+  description varchar(70) default NULL,
+  state varchar(8) default NULL,
+  posts int(10) default NULL,
+  starter_id mediumint(8) NOT NULL default '0',
+  start_date int(10) default NULL,
+  last_poster_id mediumint(8) NOT NULL default '0',
+  last_post int(10) default NULL,
+  icon_id tinyint(2) default NULL,
+  starter_name varchar(32) default NULL,
+  last_poster_name varchar(32) default NULL,
+  poll_state varchar(8) default NULL,
+  last_vote int(10) default NULL,
+  views int(10) default NULL,
+  forum_id smallint(5) NOT NULL default '0',
+  approved tinyint(1) default NULL,
+  author_mode tinyint(1) default NULL,
+  pinned tinyint(1) default NULL,
+  moved_to varchar(64) default NULL,
+  rating text,
+  total_votes int(5) NOT NULL default '0',
+  topic_hasattach smallint(5) NOT NULL default '0',
+  topic_firstpost int(10) NOT NULL default '0',
+  topic_queuedposts int(10) NOT NULL default '0',
+  PRIMARY KEY  (tid),
+  KEY last_post (last_post),
+  KEY forum_id (forum_id,approved,pinned),
+  KEY topic_firstpost (topic_firstpost)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_topics_read (
+  read_tid int(10) NOT NULL default '0',
+  read_mid mediumint(8) NOT NULL default '0',
+  read_date int(10) NOT NULL default '0',
+  UNIQUE KEY read_tid_mid (read_tid,read_mid)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_tracker (
+  trid mediumint(8) NOT NULL auto_increment,
+  member_id mediumint(8) NOT NULL default '0',
+  topic_id int(10) NOT NULL default '0',
+  start_date int(10) default NULL,
+  last_sent int(10) NOT NULL default '0',
+  topic_track_type varchar(100) NOT NULL default 'delayed',
+  PRIMARY KEY  (trid),
+  KEY topic_id (topic_id)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_upgrade_history (
+  upgrade_id int(10) NOT NULL auto_increment,
+  upgrade_version_id int(10) NOT NULL default '0',
+  upgrade_version_human varchar(200) NOT NULL default '',
+  upgrade_date int(10) NOT NULL default '0',
+  upgrade_mid int(10) NOT NULL default '0',
+  upgrade_notes text NOT NULL,
+  PRIMARY KEY  (upgrade_id)
+)";
+
+$TABLE[] = "CREATE TABLE ibf_validating (
+  vid varchar(32) NOT NULL default '',
+  member_id mediumint(8) NOT NULL default '0',
+  real_group smallint(3) NOT NULL default '0',
+  temp_group smallint(3) NOT NULL default '0',
+  entry_date int(10) NOT NULL default '0',
+  coppa_user tinyint(1) NOT NULL default '0',
+  lost_pass tinyint(1) NOT NULL default '0',
+  new_reg tinyint(1) NOT NULL default '0',
+  email_chg tinyint(1) NOT NULL default '0',
+  ip_address varchar(16) NOT NULL default '0',
+  PRIMARY KEY  (vid),
+  KEY new_reg (new_reg)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_voters (
+  vid int(10) NOT NULL auto_increment,
+  ip_address varchar(16) NOT NULL default '',
+  vote_date int(10) NOT NULL default '0',
+  tid int(10) NOT NULL default '0',
+  member_id varchar(32) default NULL,
+  forum_id smallint(5) NOT NULL default '0',
+  PRIMARY KEY  (vid)
+)";
+
+
+$TABLE[] = "CREATE TABLE ibf_warn_logs (
+  wlog_id int(10) NOT NULL auto_increment,
+  wlog_mid mediumint(8) NOT NULL default '0',
+  wlog_notes text NOT NULL,
+  wlog_contact varchar(250) NOT NULL default 'none',
+  wlog_contact_content text NOT NULL,
+  wlog_date int(10) NOT NULL default '0',
+  wlog_type varchar(6) NOT NULL default 'pos',
+  wlog_addedby mediumint(8) NOT NULL default '0',
+  PRIMARY KEY  (wlog_id)
+)";
+
+    
+
+?>
\ No newline at end of file
diff --git a/upload/install_templates.txt b/upload/install_templates.txt
deleted file mode 100644
index d9c6c72f..00000000
--- a/upload/install_templates.txt
+++ /dev/null
@@ -1 +0,0 @@
-(1, 'skin_boards', '<tr>\n           <td class=\'pformstrip\' colspan=\'2\'>{$total} {$ibforums->lang[\'whoschatting_total\']} <a href=\'$link\'>{$ibforums->lang[\'whoschatting_loadchat\']}</a></td>\n    	</tr>\n    	<tr>\n          <td width="5%" class=\'row2\'><{F_ACTIVE}></td>\n          <td class=\'row4\' width=\'95%\'>\n            {$names}<div class=\'desc\' style=\'margin-top:5px\'>$txt</div>\n          </td>\n        </tr>', 'whoschatting_show', '$total, $names, $link, $txt', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr>\n           <td class=\'pformstrip\' colspan=\'2\'>{$ibforums->lang[\'whoschatting_total\']} <a href=\'$link\'>{$ibforums->lang[\'whoschatting_loadchat\']}</a></td>\n    	</tr>\n    	<tr>\n          <td width="5%" class=\'row2\'><{F_ACTIVE}></td>\n          <td class=\'row4\' width=\'95%\'>\n            <i>{$ibforums->lang[\'whoschatting_none\']}</i>\n          </td>\n        </tr>', 'whoschatting_empty', '$link', 1035406235, 0);||~&~||(1, 'skin_boards', '{$ibforums->base_url}act=chat', 'whoschatting_inline_link', '', 1035406235, 0);||~&~||(1, 'skin_boards', 'javascript:chat_pop({$ibforums->vars[\'chat_width\']}, {$ibforums->vars[\'chat_height\']});', 'whoschatting_popup_link', '', 1035406235, 0);||~&~||(1, 'skin_boards', ',', 'active_list_sep', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<!-- Board Stats -->\n	<!--IBF.QUICK_LOG_IN-->\n    <br />\n	<div align=\'center\'>\n		<a href=\'{$ibforums->base_url}act=Stats&amp;CODE=leaders\'>{$ibforums->lang[\'sm_forum_leaders\']}</a> |\n		<a href=\'{$ibforums->base_url}act=Search&amp;CODE=getactive\'>{$ibforums->lang[\'sm_todays_posts\']}</a> |\n		<a href=\'{$ibforums->base_url}act=Stats\'>{$ibforums->lang[\'sm_today_posters\']}</a> |\n		<a href=\'{$ibforums->base_url}act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc\'>{$ibforums->lang[\'sm_all_posters\']}</a>\n	</div>\n    <br />\n	<div class="tableborder">\n		<div class="maintitle">{$ibforums->lang[\'board_stats\']}</div>\n		<table cellpadding=\'4\' cellspacing=\'1\' border=\'0\' width=\'100%\'>', 'stats_header', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr>\n           <td class=\'pformstrip\' colspan=\'2\'>$active[TOTAL] {$ibforums->lang[\'active_users\']}</td>\n    	</tr>\n    	<tr>\n          <td width="5%" class=\'row2\'><{F_ACTIVE}></td>\n          <td class=\'row4\' width=\'95%\'>\n            <b>{$active[GUESTS]}</b> {$ibforums->lang[\'guests\']}, <b>$active[MEMBERS]</b> {$ibforums->lang[\'public_members\']} <b>$active[ANON]</b> {$ibforums->lang[\'anon_members\']}\n            <div class=\'thin\'>{$active[NAMES]}</div>\n            {$active[\'links\']}\n          </td>\n        </tr>\n        <!--IBF.WHOSCHATTING-->', 'ActiveUsers', '$active', 1035406235, 0);||~&~||(1, 'skin_boards', '{$ibforums->lang[\'oul_show_more\']} <a href=\'{$ibforums->base_url}act=Online&amp;CODE=listall&amp;sort_key=click\'>{$ibforums->lang[\'oul_click\']}</a>, <a href=\'{$ibforums->base_url}act=Online&amp;CODE=listall&amp;sort_key=name&amp;sort_order=asc&amp;show_mem=reg\'>{$ibforums->lang[\'oul_name\']}</a>', 'active_user_links', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr>\n		     <td class=\'pformstrip\' colspan=\'2\'>{$ibforums->lang[\'board_stats\']}</td>\n		   </tr>\n		   <tr>\n			 <td class=\'row2\' width=\'5%\' valign=\'middle\'><{F_STATS}></td>\n			 <td class=\'row4\' width="95%" align=\'left\'>$text<br />{$ibforums->lang[\'most_online\']}</td>\n		   </tr>', 'ShowStats', '$text', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr>\n           <td class=\'pformstrip\' colspan=\'2\'>{$ibforums->lang[\'birthday_header\']}</td>\n    	</tr>\n    	<tr>\n          <td class=\'row2\' width=\'5%\' valign=\'middle\'><{F_ACTIVE}></td>\n          <td class=\'row4\' width=\'95%\'><b>$total</b> $birth_lang<br />$birthusers</td>\n        </tr>', 'birthdays', '$birthusers="", $total="", $birth_lang=""', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr>\n           <td class=\'pformstrip\' colspan=\'2\'>{$ibforums->lang[\'calender_f_title\']}</td>\n    	</tr>\n    	<tr>\n          <td class=\'row2\' width=\'5%\' valign=\'middle\'><{F_ACTIVE}></td>\n          <td class=\'row4\' width=\'95%\'>$events</td>\n        </tr>', 'calendar_events', '$events = ""', 1035406235, 0);||~&~||(1, 'skin_boards', '</table>\n	 </div>\n    <!-- Board Stats -->', 'stats_footer', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<br />\n   <div align=\'right\'><a href="{$ibforums->base_url}act=Login&amp;CODE=06">{$ibforums->lang[\'d_delete_cookies\']}</a> &middot; <a href="{$ibforums->base_url}act=Login&amp;CODE=05">{$ibforums->lang[\'d_post_read\']}</a></div>', 'bottom_links', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<div class="tableborder">\n	  <div class=\'maintitle\' align=\'left\'><{CAT_IMG}>&nbsp;<a href="{$ibforums->base_url}c={$Data[\'id\']}">{$Data[\'name\']}</a></div>\n      <table width="100%" border="0" cellspacing="1" cellpadding="4">\n        <tr> \n          <th align="center" width="2%" class=\'titlemedium\'><img src="{$ibforums->vars[\'img_url\']}/spacer.gif" alt="" width="28" height="1" /></th>\n          <th align="left" width="59%" class=\'titlemedium\'>{$ibforums->lang[\'cat_name\']}</th>\n          <th align="center" width="7%" class=\'titlemedium\'>{$ibforums->lang[\'topics\']}</th>\n          <th align="center" width="7%" class=\'titlemedium\'>{$ibforums->lang[\'replies\']}</th>\n          <th align="left" width="25%" class=\'titlemedium\'>{$ibforums->lang[\'last_post_info\']}</th>\n        </tr>', 'CatHeader_Expanded', '$Data', 1035406235, 0);||~&~||(1, 'skin_boards', '<br />\n	<div class="tableborder">\n	  <table width="100%" border="0" cellspacing="1" cellpadding="4">\n	  <tr> \n		<td align="center" class=\'titlemedium\'><img src="{$ibforums->vars[\'img_url\']}/spacer.gif" alt="" width="28" height="1" /></td>\n		<th align=\'left\' width="59%" class=\'titlemedium\'>{$ibforums->lang[\'cat_name\']}</th>\n		<th align="center" width="7%" class=\'titlemedium\'>{$ibforums->lang[\'topics\']}</th>\n		<th align="center" width="7%" class=\'titlemedium\'>{$ibforums->lang[\'replies\']}</th>\n		<th align=\'left\' width="27%" class=\'titlemedium\'>{$ibforums->lang[\'last_post_info\']}</th>\n	  </tr>', 'subheader', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr> \n          <td class=\'darkrow2\' colspan="5">&nbsp;</td>\n        </tr>\n      </table>\n    </div>\n    <br />', 'end_this_cat', '', 1035406235, 0);||~&~||(1, 'skin_boards', '', 'end_all_cats', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<b>{$ibforums->vars[\'board_name\']} {$ibforums->lang[\'newslink\']} <a href=\'{$ibforums->base_url}showtopic=$tid\'>$title</a></b><br />', 'newslink', '$fid="", $title="", $tid=""', 1035406235, 0);||~&~||(1, 'skin_boards', '<div align=\'left\' style=\'text-align:left;padding-bottom:4px\'>\n		<!-- IBF.NEWSLINK -->{$ibforums->lang[\'welcome_back_text\']} $lastvisit\n	</div>', 'PageTop', '$lastvisit', 1035406235, 0);||~&~||(1, 'skin_boards', '<form style=\'display:inline\' action="{$ibforums->base_url}act=Login&amp;CODE=01&amp;CookieDate=1" method="post">\n<div align=\'right\'><strong>{$ibforums->lang[\'qli_title\']}</strong>\n<input type="text" class="forminput" size="10" name="UserName" onfocus="this.value=\'\'" value="{$ibforums->lang[\'qli_name\']}" />\n<input type=\'password\' class=\'forminput\' size=\'10\' name=\'PassWord\' onfocus="this.value=\'\'" value=\'ibfrules\' />\n<input type=\'submit\' class=\'forminput\' value=\'{$ibforums->lang[\'qli_go\']}\' />\n</div>\n</form>', 'quick_log_in', '', 1035406235, 0);||~&~||(1, 'skin_boards', '<a href=\'{$ibforums->base_url}act=Login&amp;CODE=04&amp;f={$id}\' title=\'{$ibforums->lang[\'bi_markread\']}\'>{$img}</a>', 'forum_img_with_link', '$img, $id', 1035406235, 0);||~&~||(1, 'skin_boards', '<a href=\'{$ibforums->base_url}act=Login&amp;CODE=04&amp;f={$id}&amp;i=1\' title=\'{$ibforums->lang[\'bi_markallread\']}\'>{$img}</a>', 'subforum_img_with_link', '$img, $id', 1035406235, 0);||~&~||(1, 'skin_boards', '<tr> \n          <td class="row4" align="center">{$info[\'img_new_post\']}</td>\n          <td class="row4"><b><a href="{$ibforums->base_url}showforum={$info[\'id\']}">{$info[\'name\']}</a></b><br /><span class=\'desc\'>{$info[\'description\']}<br />{$info[\'moderator\']}</span></td>\n          <td class="row2" align="center">{$info[\'topics\']}</td>\n          <td class="row2" align="center">{$info[\'posts\']}</td>\n          <td class="row2" nowrap="nowrap">{$info[\'last_post\']}<br />{$ibforums->lang[\'in\']}:&nbsp;{$info[\'last_unread\']}{$info[\'last_topic\']}<br />{$ibforums->lang[\'by\']}: {$info[\'last_poster\']}</td>\n        </tr>', 'ForumRow', '$info', 1035406235, 0);||~&~||(1, 'skin_boards', '<!-- Forum {$info[\'id\']} entry -->\n        <tr> \n          <td class="row4" align="center"><{BR_REDIRECT}></td>\n          <td class="row4"><b><a href="{$ibforums->base_url}showforum={$info[\'id\']}" {$info[\'redirect_target\']}>{$info[\'name\']}</a></b><br /><span class=\'desc\'>{$info[\'description\']}</span></td>\n          <td class="row2" align="center">-</td>\n          <td class="row2" align="center">-</td>\n          <td class="row2">{$ibforums->lang[\'rd_hits\']}: {$info[\'redirect_hits\']}</td>\n        </tr>\n    <!-- End of Forum {$info[\'id\']} entry -->', 'forum_redirect_row', '$info', 1035406235, 0);||~&~||(1, 'skin_boards', '<a href=\'{$ibforums->base_url}showtopic=$tid&amp;view=getlastpost\' title=\'{$ibforums->lang[\'tt_golast\']}\'><{LAST_POST}></a>', 'forumrow_lastunread_link', '$fid, $tid', 1035406235, 0);||~&~||(1, 'skin_buddy', '<script language=\'javascript\' type="text/javascript">\n<!--\n function redirect_to(where, closewin)\n {\n 	opener.location= \'$ibforums->base_url\' + where;\n 	\n 	if (closewin == 1)\n 	{\n 		self.close();\n 	}\n }\n \n function check_form(helpform)\n {\n 	opener.name = "ibfmain";\n \n 	if (helpform == 1) {\n 		document.theForm2.target = \'ibfmain\';\n 	} else {\n 		document.theForm.target = \'ibfmain\';\n 	}\n 	\n 	return true;\n }\n \n function shrink()\n {\n 	window.resizeTo(\'200\',\'75\');\n }\n \n function expand()\n {\n 	window.resizeTo(\'200\',\'450\');\n }\n \n \n //-->\n </script>', 'buddy_js', '', 1035406235, 0);||~&~||(1, 'skin_buddy', '{$ibforums->lang[\'new_posts\']}\n	<br />\n	{$ibforums->lang[\'my_replies\']}', 'build_away_msg', '', 1035406235, 0);||~&~||(1, 'skin_buddy', '( <b><a href=\'javascript:redirect_to("$url", 0)\'>{$ibforums->lang[\'view_link\']}</a></b> )', 'append_view', '$url=""', 1035406235, 0);||~&~||(1, 'skin_buddy', '<div id="ucpcontent">\n <div class="titlemedium" align="center">{$ibforums->lang[\'page_title\']}&nbsp;&nbsp;&nbsp;[ <a href=\'javascript:shrink()\' style=\'text-decoration:none\'>-</a>&nbsp;&nbsp;<a href=\'javascript:expand()\' style=\'text-decoration:none\'>+</a> ]</div>\n <div class="pformstrip" align="center">{$ibforums->lang[\'while_away\']}</div>\n <p>{$away_text}</p>\n <div class="pformstrip" align="center">{$ibforums->lang[\'show_me\']}</div>\n <p>\n	&middot;&nbsp;<a href=\'javascript:redirect_to("&amp;act=Stats&amp;CODE=leaders",0)\'>{$ibforums->lang[\'sm_forum_leaders\']}</a>\n	<br />&middot;&nbsp;<a href=\'javascript:redirect_to("&amp;act=Search&amp;CODE=getactive",0)\'>{$ibforums->lang[\'sm_todays_posts\']}</a>\n	<br />&middot;&nbsp;<a href=\'javascript:redirect_to("&amp;act=Stats",0)\'>{$ibforums->lang[\'sm_today_posters\']}</a>\n	<br />&middot;&nbsp;<a href=\'javascript:redirect_to("&amp;act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc",0)\'>{$ibforums->lang[\'sm_all_posters\']}</a>\n	<br />&middot;&nbsp;<a href=\'javascript:redirect_to("&amp;act=Search&amp;CODE=lastten",0)\'>{$ibforums->lang[\'sm_my_last_posts\']}</a>\n </p>\n <div class="pformstrip" align="center">{$ibforums->lang[\'search_forums\']}</div>\n <div align="center">\n <p>\n <form action="{$ibforums->base_url}act=Search&amp;CODE=01&amp;forums=all&amp;cat_forum=forum&amp;joinname=1&amp;search_in=posts&amp;result_type=topics" method="post" name=\'theForm\' onsubmit=\'return check_form();\'>\n  <input type=\'text\' size=\'17\' name=\'keywords\' class=\'forminput\' />&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'go\']}\' />\n </form>\n </p>\n </div>\n \n <div class="pformstrip" align="center">{$ibforums->lang[\'search_help\']}</div>\n <div align="center">\n <p>\n <form action="{$ibforums->base_url}act=Help&amp;CODE=02" method="post" name=\'theForm2\' onsubmit=\'return check_form(1);\'>\n  <input type=\'text\' size=\'17\' name=\'search_q\' class=\'forminput\' />&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'go\']}\' />\n </form>\n </p>\n </div>\n</div>\n<div align="center"><!--CLOSE.LINK--></div>', 'main', '$away_text=""', 1035406235, 0);||~&~||(1, 'skin_buddy', '<form action="{$ibforums->base_url}act=Login&amp;CODE=01&amp;CookieDate=1&amp;buddy=1" method="post" name=\'theForm\' onSubmit=\'return check_form();\'>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'page_title\']}</div>\n <div class=\'pformstrip\'>{$ibforums->lang[\'log_in_needed\']}</div>\n <div class=\'tablepad\'>\n  {$ibforums->lang[\'no_guests\']}\n  <br /><br />\n  <center>\n  <b>{$ibforums->lang[\'log_in\']}</b>\n  <br /><br />\n  {$ibforums->lang[\'lin_name\']}<br /><input type=\'text\' name=\'UserName\' class=\'forminput\'>\n  <br />\n  {$ibforums->lang[\'lin_pass\']}<br /><input type=\'password\' name=\'PassWord\' class=\'forminput\'>\n  <br />\n  <input type=\'submit\' value=\'{$ibforums->lang[\'log_in\']}\' class=\'forminput\'>\n  </center>\n  <br /><br />\n  {$ibforums->lang[\'reg_text\']}\n  <br /><br />\n  <center><a href=\'javascript:redirect_to("&amp;act=Reg", 1);\'>{$ibforums->lang[\'reg_link\']}</a></center>\n </div>\n</div>\n<!--CLOSE.LINK-->\n</form>', 'login', '', 1035406235, 0);||~&~||(1, 'skin_buddy', '<div align="center">\n [ <a href="javascript:window.location=window.location;">{$ibforums->lang[\'refresh\']}</a> ] | [ <a href=\'javascript:self.close();\'>{$ibforums->lang[\'close_win\']}</a> ]\n</div>', 'closelink', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<script language=\'Javascript\' type=\'text/javascript\'>\n	<!--\n	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\n		if (posleft != 0) { x = posleft }\n		if (postop  != 0) { y = postop  }\n	\n		if (!scroll) { scroll = 1 }\n		if (!resize) { resize = 1 }\n	\n		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n		  X = (screen.width  - width ) / 2;\n		  Y = (screen.height - height) / 2;\n		}\n		if (scroll != 0) { scroll = 1 }\n	\n		var Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n	 }\n	function changeDiv(id, method)\n	{\n		var itm = null;\n		if (document.getElementById) {\n			itm = document.getElementById(id);\n		} else if (document.all)     {\n			itm = document.all[id];\n		} else if (document.layers)   {\n			itm = document.layers[id];\n		}\n		\n		if (itm.style)\n		{\n			if ( method == \'show\' )\n			{\n				itm.style.display = "";\n			}\n			else\n			{\n				itm.style.display = "none";\n			}\n		}\n		else\n		{\n			itm.visibility = "show";\n		}\n	}\n	\n	function selecttype()\n	{\n		\n		if ( document.REPLIER.eventtype[1].checked == true )\n		{\n			// Ranged date...\n			\n			changeDiv( \'rangeshow\', \'show\' );\n			changeDiv( \'rangehide\', \'none\' );\n			changeDiv( \'recurshow\', \'none\' );\n			changeDiv( \'recurhide\', \'show\' );\n		}\n		else if ( document.REPLIER.eventtype[2].checked == true )\n		{\n			// Repeating event\n			\n			changeDiv( \'rangeshow\', \'none\' );\n			changeDiv( \'rangehide\', \'show\' );\n			changeDiv( \'recurshow\', \'show\' );\n			changeDiv( \'recurhide\', \'none\' );\n		}\n		else\n		{\n			changeDiv( \'rangeshow\', \'none\' );\n			changeDiv( \'rangehide\', \'show\' );\n			changeDiv( \'recurshow\', \'none\' );\n			changeDiv( \'recurhide\', \'show\' );\n		}\n	}\n	\n	function changeColour(BOXid, val)\n	{\n		document.all.BOXid.style.backgroundColor = val;\n	}\n	//-->\n</script>\n<table class=\'tableborder\' cellpadding="0" cellspacing="0" width="100%">\n<tr>\n <td class=\'maintitle\' colspan="2">&nbsp;&nbsp;$data</td>\n</tr>', 'table_top', '$data', 1035406235, 0);||~&~||(1, 'skin_calendar', '<tr>\n  <td class=\'pformstrip\' align=\'center\' style=\'text-align:center\' colspan="2"><input type="submit" name="submit" value="$data" tabindex=\'4\' class=\'forminput\'></td>\n</tr>\n</table>\n</form>\n<br />\n<br clear="all" />', 'calendar_end_form', '$data', 1035406235, 0);||~&~||(1, 'skin_calendar', '<form action=\'{$ibforums->base_url}act=calendar&amp;code=addnewevent\' method=\'post\' name=\'REPLIER\' onSubmit=\'return ValidateForm()\'>', 'calendar_start_form', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<form action=\'{$ibforums->base_url}act=calendar&amp;code=doedit&amp;eventid=$eventid\' method=\'post\' name=\'REPLIER\' onsubmit=\'return ValidateForm()\'>', 'calendar_start_edit_form', '$eventid', 1035406235, 0);||~&~||(1, 'skin_calendar', '<tr> \n          <td class="pformleft"><strong>{$ibforums->lang[\'calendar_title\']}</strong></td>\n          <td class="pformright"><input type=\'text\' size=\'40\' maxlength=\'40\' name=\'event_title\' class=\'forminput\' value=\'$data\' /></td>\n        </tr>', 'calendar_event_title', '$data=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '<tr> \n          <td class="row1" width="100%" colspan=\'2\' style=\'height:40px;border:1px solid black\'><input type=\'checkbox\' name=\'event_delete\' value=\'1\'>&nbsp;{$ibforums->lang[\'calendar_delete_box\']}</td>\n        </tr>', 'calendar_delete_box', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<tr> \n          <td class="pformleft" valign=\'top\'><strong>{$ibforums->lang[\'calendar_event_date\']}</strong></td>\n          <td class="pformright">\n          	<table cellpadding=\'3\'>\n          	<tr>\n          	 <td><input type=\'radio\' name=\'eventtype\' id=\'single\' onclick=\'selecttype();\' class=\'radiobutton\' value=\'single\' {$checked[\'normal\']}><strong><label for=\'single\'>{$ibforums->lang[\'fv_single\']}</label></strong></td>\n          	 <td><select name=\'e_day\' class=\'forminput\'>$days</select>&nbsp;&nbsp;<select name=\'e_month\' class=\'forminput\'>$months</select>&nbsp;&nbsp;<select name=\'e_year\' class=\'forminput\'>$years</select></td>\n          	</tr>\n          	<tr>\n          	 <td><input type=\'radio\' name=\'eventtype\' id=\'range\' onclick=\'selecttype();\' class=\'radiobutton\' value=\'range\'{$checked[\'range\']}><strong><label for=\'range\'>{$ibforums->lang[\'fv_range\']}</label></strong></td>\n          	 <td>\n          	    <div id=\'rangeshow\' style=\'display:{$div[\'range_on\']}\'>\n          	      <table cellpadding=\'3\'>\n          	       <tr>\n          	        <td><strong>{$ibforums->lang[\'fv_range_ends\']}</strong></td>\n          	        <td><select name=\'end_day\' class=\'forminput\'>$end_days</select>&nbsp;&nbsp;<select name=\'end_month\' class=\'forminput\'>$end_months</select>&nbsp;&nbsp;<select name=\'end_year\' class=\'forminput\'>$end_years</select></td>\n          	       </tr>\n          	       <tr>\n          	       	<td><strong>{$ibforums->lang[\'fv_bgcolor\']}</strong></td>\n          	       	<td>{$cols[\'bg\']} <input type=\'text\' name=\'style\' size=\'5\' readonly=\'readonly\' id=\'stylebg\' style=\'border:2px inset black;\' /></td>\n          	       </tr>\n          	       <tr>\n          	       	<td><strong>{$ibforums->lang[\'fv_font\']}</strong></td>\n          	       	<td>{$cols[\'ft\']} <input type=\'text\' name=\'style2\' size=\'5\' readonly=\'readonly\' id=\'styleft\' style=\'border:2px inset black;\' /></td>\n          	       </tr>\n          	      </table>\n          	    </div>\n          	    <div id=\'rangehide\' style=\'display:{$div[\'range_off\']}\'>{$ibforums->lang[\'fv_hidden\']}</div>\n          	 </td>\n          	</tr>\n          	<tr>\n          	 <td><input type=\'radio\' name=\'eventtype\' id=\'recur\'  onclick=\'selecttype();\' class=\'radiobutton\' value=\'recur\' {$checked[\'recur\']}><strong><label for=\'recur\'>{$ibforums->lang[\'fv_recur\']}</label></strong></td>\n          	 <td>\n          	     <div id=\'recurshow\' style=\'display:{$div[\'recur_on\']}\'>\n          	     	<strong>{$ibforums->lang[\'fv_recur_every\']}</strong> <select name=\'recur_unit\' class=\'forminput\'>$recur_unit</select>\n          	     	<strong>{$ibforums->lang[\'fv_until\']}</strong> <select name=\'recend_day\' class=\'forminput\'>{$recend[\'d\']}</select><select name=\'recend_month\' class=\'forminput\'>{$recend[\'m\']}</select>&nbsp;&nbsp;<select name=\'recend_year\' class=\'forminput\'>{$recend[\'y\']}</select>\n          	     </div>\n          	     <div id=\'recurhide\' style=\'display:{$div[\'recur_off\']}\'>{$ibforums->lang[\'fv_hidden\']}</div>\n          	 </td>\n			</tr>\n			</table>\n          </td>\n        </tr>', 'calendar_choose_date', '$days, $months, $years, $end_days, $end_months, $end_years, $recur_days, $recur_unit, $div, $checked, $cols, $recend', 1035406235, 0);||~&~||(1, 'skin_calendar', '<tr> \n          <td class="pformleft"><strong>{$ibforums->lang[\'calendar_event_type\']}</strong></td>\n          <td class="pformright"><select name=\'e_type\' class=\'forminput\'><option value=\'public\'$pub_select>{$ibforums->lang[\'calendar_type_public\']}</option><option value=\'private\'$priv_select>{$ibforums->lang[\'calendar_type_private\']}</option></select></td>\n        </tr>', 'calendar_event_type', '$pub_select="", $priv_select=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '<tr> \n          <td class="pformleft">{$ibforums->lang[\'calendar_group_filter\']}</td>\n          <td class="pformright"><select name=\'e_groups[]\' class=\'forminput\' size=\'5\' multiple>$groups</select></td>\n        </tr>', 'calendar_admin_group_box', '$groups', 1035406235, 0);||~&~||(1, 'skin_calendar', '<div align=\'right\'><a href=\'javascript:deleteEvent($id)\'><{P_DELETE}></a>&nbsp;<a href=\'{$ibforums->base_url}act=calendar&amp;code=edit&amp;eventid=$id\'><{P_EDIT}></a></div>', 'cal_edit_del_button', '$id', 1035406235, 0);||~&~||(1, 'skin_calendar', '<div class=\'pformstrip\'>{$event[\'title\']} ($event_type)</div>\n  <table width="100%" border="0" cellspacing="1" cellpadding="3">\n  <tr>\n   <td class=\'row4\' width=\'1%\' valign=\'middle\' nowrap=\'nowrap\'><span class=\'normalname\'><a href=\'{$ibforums->base_url}showuser={$member[\'id\']}\'>{$member[\'name\']}</a></span></td>\n   <td class=\'row4\' width=\'99%\'><div align=\'left\' style=\'float:left;width:auto;padding-top:4px;padding-bottom:4px;\'><strong>{$ibforums->lang[\'event_date\']} {$event[\'mday\']} {$event[\'month_text\']} {$event[\'year\']}</strong> $date_ends ($type)</div>$edit_button</td>\n  </tr>\n  <tr>\n   <td valign=\'top\' class=\'row1\' nowrap=\'nowrap\'>{$member[\'avatar\']}<span class=\'postdetails\'><br />{$ibforums->lang[\'group\']} {$member[\'g_title\']}<br />{$ibforums->lang[\'posts\']} {$member[\'posts\']}<br />{$ibforums->lang[\'joined\']} {$member[\'joined\']}</span></td>\n   <td valign=\'top\' class=\'row1\'><span class=\'postcolor\'>{$event[\'event_text\']}</span></td>\n  </tr>\n  </table>', 'cal_show_event', '$event, $member, $event_type, $edit_button="", $type, $date_ends=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '<script type=\'text/javascript\'>\n	function deleteEvent(id) {\n		if (confirm(\'{$ibforums->lang[\'js_del_1\']}\')) {\n			 window.location.href = "{$ibforums->base_url}act=calendar&code=delete&e=" + id;\n		 }\n		 else {\n			alert (\'{$ibforums->lang[\'js_del_2\']}\');\n		} \n	}\n</script>\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cal_title_events\']}</div>', 'cal_page_events_start', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<div align=\'center\' class=\'pformstrip\'>&lt;&lt; <a href=\'{$ibforums->base_url}act=calendar&amp;d={$ibforums->input[\'d\']}&amp;m={$ibforums->input[\'m\']}&amp;y={$ibforums->input[\'y\']}\'>{$ibforums->lang[\'back\']}</a></div>\n</div>', 'cal_page_events_end', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<div class=\'pformstrip\'>{$ibforums->lang[\'cal_birthdays\']}</div>\n  <div class=\'tablepad\'>\n   <ul>', 'cal_birthday_start', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<li><a href=\'{$ibforums->base_url}showuser=$uid\'>$uname</a> ($age)</li>', 'cal_birthday_entry', '$uid, $uname, $age=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '</ul>\n  </div>', 'cal_birthday_end', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<form action=\'{$ibforums->base_url}act=calendar\' method=\'post\'>\n<div align=\'left\' id=\'calendarname\'><a href=\'{$ibforums->base_url}act=calendar&amp;code=newevent\' title=\'{$ibforums->lang[\'post_new_event\']}\'><{CAL_NEWEVENT}></a> <span style=\'position:relative;top:3px\'>$month $year</span></div>\n<br />\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>\n    <div align=\'center\'>\n      &lt; <a href=\'{$ibforums->base_url}act=calendar&amp;m={$prev[\'month_id\']}&amp;y={$prev[\'year_id\']}\'>{$prev[\'month_name\']} {$prev[\'year_id\']}</a>\n      &middot; {$ibforums->lang[\'table_title\']} &middot;\n	   <a href=\'{$ibforums->base_url}act=calendar&amp;m={$next[\'month_id\']}&amp;y={$next[\'year_id\']}\'>{$next[\'month_name\']} {$next[\'year_id\']}</a> &gt;\n	</div>\n  </div>\n  <table width="100%" border="0" cellspacing="1" cellpadding="0">\n   <tr>\n	 <!--IBF.DAYS_TITLE_ROW-->\n   \n	 <!--IBF.DAYS_CONTENT-->\n	</tr>\n  </table>\n</div>\n<br />\n<div class=\'tableborder\'>\n  <div class=\'pformstrip\'>\n     <div align=\'left\' style=\'float:left;width:40%\'><a href=\'{$ibforums->base_url}act=calendar&amp;code=newevent\'>{$ibforums->lang[\'post_new_event\']}</a></div>\n  	 <div align=\'right\'><strong>{$ibforums->lang[\'month_jump\']}</strong>&nbsp;<select name=\'m\' class=\'forminput\'><!--IBF.MONTH_BOX--></select>&nbsp;<select name=\'y\' class=\'forminput\'><!--IBF.YEAR_BOX--></select>&nbsp;&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'form_submit_show\']}\' class=\'forminput\' /></div>\n  </div>\n</div>\n</form>', 'cal_main_content', '$month, $year, $prev, $next', 1035406235, 0);||~&~||(1, 'skin_calendar', '<td width=\'14%\' class=\'pformstrip\'>$day</td>', 'cal_day_bit', '$day', 1035406235, 0);||~&~||(1, 'skin_calendar', '</tr>\n	<!-- NEW ROW-->\n	<tr>', 'cal_new_row', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<td style=\'height:100px\' class=\'darkrow1\'><br /></td>', 'cal_blank_cell', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '<td style=\'height:100px\' valign=\'top\' class=\'row3\'>\n	<div class=\'caldate\'>$month_day</div>$events\n	</td>', 'cal_date_cell', '$month_day, $events=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '<td style=\'height:100px;border:2px;border-style:outset\' valign=\'top\' class=\'row1\'>\n	<div class=\'caldate\'>$month_day</div>\n	$events\n	</td>', 'cal_date_cell_today', '$month_day, $events=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '<div style=\'padding:2px\'>', 'cal_events_start', '', 1035406235, 0);||~&~||(1, 'skin_calendar', '&middot;<strong><a href=\'{$ibforums->base_url}act=calendar&amp;$link\'>$text</a></strong><br />', 'cal_events_wrap', '$link, $text', 1035406235, 0);||~&~||(1, 'skin_calendar', '<div style=\'background-color:$bg;color:$ft;padding:3px;border-top:3px outset $bg;border-bottom:3px outset $bg;\'><a href=\'{$ibforums->base_url}act=calendar&amp;$link\' style=\'color:$ft\'>$text</a></div>', 'cal_events_wrap_range', '$link, $text, $ft="", $bg=""', 1035406235, 0);||~&~||(1, 'skin_calendar', '&middot; <a href=\'{$ibforums->base_url}act=calendar&amp;$link\' title=\'{$ibforums->lang[\'tbt_recur\']}\'>$text</a><br />', 'cal_events_wrap_recurring', '$link, $text', 1035406235, 0);||~&~||(1, 'skin_calendar', '</div>', 'cal_events_end', '', 1035406235, 0);||~&~||(1, 'skin_csite', '&nbsp;&middot; <a href="$url">$title</a>', 'rules_link', '$url="", $title=""', 1035406235, 0);||~&~||(1, 'skin_csite', '&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=chat\'>{$ibforums->lang[\'live_chat\']}</a>', 'show_chat_link_inline', '', 1035406235, 0);||~&~||(1, 'skin_csite', '&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href="javascript:chat_pop();">{$ibforums->lang[\'live_chat\']}</a>', 'show_chat_link_popup', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<script type="text/javascript">\n<!--\nfunction buddy_pop() { window.open(\'{$ibforums->js_base_url}act=buddy\',\'BrowserBuddy\',\'width=200,height=500,resizable=yes,scrollbars=yes\'); }\nfunction chat_pop()  { window.open(\'{$ibforums->js_base_url}act=chat&pop=1\',\'Chat\',\'width={$ibforums->vars[\'chat_width\']},height={$ibforums->vars[\'chat_height\']},resizable=yes,scrollbars=yes\'); }\n//-->\n</script>', 'csite_javascript', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<style type=\'text/css\'>\n{$css}\n</style>', 'csite_css_inline', '$css=""', 1035406235, 0);||~&~||(1, 'skin_csite', ',', 'csite_sep_char', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<style type=\'text/css\' media="all">\n@import url({$ibforums->vars[\'board_url\']}/css.php?d={$css}_{$img}.css);\n</style>', 'csite_css_external', '$css, $img', 1035406235, 0);||~&~||(1, 'skin_csite', '&middot; <a href=\'$link\' style=\'text-decoration:none\'>$name</a><br />', 'tmpl_links_wrap', '$link="", $name=""', 1035406235, 0);||~&~||(1, 'skin_csite', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'wbox_welcome\']}, $name</div>\n <div class=\'tablepad\'>\n  <span class=\'desc\'>$last_visit</span>\n  <br />&middot; <a href="{$ibforums->base_url}act=Search&amp;CODE=getnew" style=\'text-decoration:none\'>{$ibforums->lang[\'wbox_getnewposts\']}</a>\n  <br />&middot; <a href="{$ibforums->base_url}act=UserCP" style=\'text-decoration:none\'>{$ibforums->lang[\'wbox_mycontrols\']}</a>\n  <br />&middot; <a href="javascript:buddy_pop();" style=\'text-decoration:none\'>{$ibforums->lang[\'wbox_myassistant\']}</a>\n  <br />&middot; <a href="{$ibforums->base_url}act=Login&amp;CODE=03&amp;return=$return" style=\'text-decoration:none\'>{$ibforums->lang[\'wbox_logout\']}</a>\n </div>\n</div>\n<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> <a href=\'{$ibforums->base_url}&act=Msg\'>{$ibforums->lang[\'pm_title\']}</a></div>\n <div class=\'tablepad\'><span class=\'desc\'>$pm_string</span></div>\n</div>', 'tmpl_welcomebox_member', '$pm_string="",$last_visit="", $name="", $return=""', 1035406235, 0);||~&~||(1, 'skin_csite', '<form action="{$ibforums->base_url}act=Login&amp;CODE=01&amp;CookieDate=1&amp;return=$return" method="post">\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'wbox_welcome\']}, {$ibforums->lang[\'wbox_guest_name\']}</div>\n <div class=\'tablepad\'>\n 	<span class=\'desc\'>$top_string</span>\n 	<br /><br />&middot; <strong><a href="{$ibforums->base_url}act=Search&amp;CODE=getactive" style=\'text-decoration:none\'>{$ibforums->lang[\'wbox_getnewposts\']}</a></strong>\n 	<br /><br /><span class=\'desc\'>{$ibforums->lang[\'wbox_g_username\']}</span>\n 	<br /><input type=\'text\' class=\'textinput\' size=\'15\' name=\'UserName\' />\n 	<br /><span class=\'desc\'>{$ibforums->lang[\'wbox_g_password\']}</span>\n 	<br /><input type=\'password\' class=\'textinput\' size=\'15\' name=\'PassWord\' />\n 	<br /><input type=\'submit\' class=\'textinput\' value=\'{$ibforums->lang[\'wbox_g_login\']}\' />\n </div>\n</div>\n</form>', 'tmpl_welcomebox_guest', '$top_string, $return', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<form action=\'{$ibforums->base_url}act=Search&amp;CODE=01&amp;forums=all\' method=\'post\' name=\'search\'>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'search_title\']}</div>\n <div class=\'tablepad\' align=\'center\'>\n  <input type=\'text\' name=\'keywords\' value=\'\' size=\'10\' class=\'textinput\' /><input type=\'submit\' value=\'{$ibforums->lang[\'search_go\']}\' />\n  <br /><a href=\'{$ibforums->base_url}act=Search&amp;mode=adv\'>{$ibforums->lang[\'search_advanced\']}</a>\n </div>\n</div>\n</form>', 'tmpl_search', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'links_title\']}</div>\n <div class=\'tablepad\'>\n  $links\n </div>\n</div>', 'tmpl_sitenav', '$links', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'aff_title\']}</div>\n <div class=\'tablepad\'>\n  $links\n </div>\n</div>', 'tmpl_affiliates', '$links', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<form action="{$ibforums->vars[\'dynamiclite\']}&amp;s={$ibforums->session_id}&amp;setskin=1" method="post">\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'cskin_title\']}</div>\n <div class=\'tablepad\' align="center">\n  <span class=\'desc\'>{$ibforums->lang[\'cskin_text\']}</span>\n  <br />\n  $select\n  <br />\n  <input type=\'submit\' value=\'{$ibforums->lang[\'cskin_go\']}\' />\n </div>\n</div>\n</form>', 'tmpl_changeskin', '$select', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> <a href="{$ibforums->base_url}act=Online">{$ibforums->lang[\'online_title\']}</a></div>\n <div class=\'tablepad\'>\n  <span class=\'desc\'>$breakdown<br />$split<br />$names</span>\n </div>\n</div>', 'tmpl_onlineusers', '$breakdown, $split, $names', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<form action="{$ibforums->base_url}act=Poll&amp;t=$tid" method="post">\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> <a href="{$ibforums->base_url}showtopic=$tid">{$ibforums->lang[\'poll_title\']}</a></div>\n <div class=\'pformstrip\'>$question</div>\n <div class=\'tablepad\'>', 'tmpl_poll_header', '$question,$tid', 1035406235, 0);||~&~||(1, 'skin_csite', '$choice\n  <br /><img src=\'{$ibforums->vars[\'img_url\']}/bar_left.gif\' border=\'0\' width=\'4\' height=\'11\' align=\'middle\' alt=\'\' /><img src=\'{$ibforums->vars[\'img_url\']}/bar.gif\' border=\'0\' width=\'$width\' height=\'11\' align=\'middle\' alt=\'\' /><img src=\'{$ibforums->vars[\'img_url\']}/bar_right.gif\' border=\'0\' width=\'4\' height=\'11\' align=\'middle\' alt=\'\' />\n  <br />', 'tmpl_poll_result_row', '$votes, $id, $choice, $percent, $width', 1035406235, 0);||~&~||(1, 'skin_csite', '<input type=\'radio\' name=\'poll_vote\' value=\'$id\' class=\'radiobutton\' />&nbsp;<strong>$choice</strong>\n  <br />', 'tmpl_poll_choice_row', '$id, $choice', 1035406235, 0);||~&~||(1, 'skin_csite', '<span class=\'desc\'>\n   &middot; <strong>$total</strong>\n   <br />&middot; $vote\n   <br />&middot; <a href="{$ibforums->base_url}showtopic=$tid">{$ibforums->lang[\'poll_discuss\']}</a>\n  </span>\n  </div>\n</div>\n</form>', 'tmpl_poll_footer', '$vote, $total, $tid', 1035406235, 0);||~&~||(1, 'skin_csite', '<input type=\'submit\' value=\'{$ibforums->lang[\'poll_vote\']}\' class=\'codebuttons\' />', 'tmpl_poll_vote', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'discuss_title\']}</div>\n $posts\n</div>', 'tmpl_latestposts', '$posts', 1035406235, 0);||~&~||(1, 'skin_csite', '<div class=\'row2\' style=\'padding:3px\'><strong><a href=\'{$ibforums->base_url}showtopic=$tid\' style=\'text-decoration:none;font-size:10px\'>$title</a></strong></div>\n<div class=\'desc\' style=\'padding:3px\'>\n <a href=\'{$ibforums->base_url}showuser=$mid\' style=\'text-decoration:none\'>$mname</a> &#064; $date\n <br />{$ibforums->lang[\'recent_read\']}: $views &nbsp; {$ibforums->lang[\'recent_comments\']}: $posts\n</div>', 'tmpl_topic_row', '$tid, $title, $posts, $views, $mid, $mname, $date', 1035406235, 0);||~&~||(1, 'skin_csite', '<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}> {$ibforums->lang[\'recent_title\']}</div>\n $articles\n</div>', 'tmpl_recentarticles', '$articles', 1035406235, 0);||~&~||(1, 'skin_csite', '<a href="{$ibforums->base_url}showtopic=$tid&amp;view=getlastpost">{$ibforums->lang[\'article_comment\']}</a>', 'tmpl_comment_link', '$tid', 1035406235, 0);||~&~||(1, 'skin_csite', '...<a href="{$ibforums->base_url}showtopic=$tid">{$ibforums->lang[\'article_readmore\']}</a>', 'tmpl_readmore_link', '$tid', 1035406235, 0);||~&~||(1, 'skin_csite', '$articles', 'tmpl_articles', '$articles', 1035406235, 0);||~&~||(1, 'skin_csite', '<select name="skinid" class="forminput" onchange="window.location=\'{$ibforums->vars[\'dynamiclite\']}&s={$ibforums->session_id}&setskin=1&skinid=\' + this.value">', 'tmpl_skin_select_top', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<option value="$sid" $used>$name</option>', 'tmpl_skin_select_row', '$sid, $name, $used', 1035406235, 0);||~&~||(1, 'skin_csite', '</select>', 'tmpl_skin_select_bottom', '', 1035406235, 0);||~&~||(1, 'skin_csite', '<table cellspacing="0" width="100%" class=\'tableborder\'>\n<tr>\n <td class=\'maintitle\' colspan="2"><img src="{$ibforums->vars[\'img_url\']}/cs_page.gif" alt="" border="0" />&nbsp;<a href="{$ibforums->base_url}showtopic={$entry[\'tid\']}">{$entry[\'title\']}</a></td>\n</tr>\n<tr>\n <td class=\'row2\' colspan="2" style=\'padding:5px\'>$top_string</td>\n</tr>\n<tr>\n <td class="post1" width="5%" valign="top" style="padding:5px">{$entry[\'avatar\']}</td>\n <td class="post1" width="95%" valign="top" style="padding:5px">{$entry[\'post\']} $read_more</td>\n</tr>\n<tr>\n <td class=\'row2\' colspan="2" style=\'padding:5px\' align=\'right\'>\n   $bottom_string\n   &nbsp;&nbsp;<a href="{$ibforums->base_url}act=Print&amp;client=printer&amp;f={$entry[\'forum_id\']}&amp;t={$entry[\'tid\']}"><img src="{$ibforums->vars[\'img_url\']}/cs_print.gif" alt="Print" border="0" /></a>\n   <a href="{$ibforums->base_url}act=Forward&amp;f={$entry[\'forum_id\']}&amp;t={$entry[\'tid\']}"><img src="{$ibforums->vars[\'img_url\']}/cs_email.gif" alt="email" border="0" /></a>\n </td>\n</tr>\n</table>\n<br />', 'tmpl_articles_row', '$entry, $bottom_string, $read_more, $top_string', 1035406235, 0);||~&~||(1, 'skin_csite', '$avatar', 'tmpl_wrap_avatar', '$avatar', 1035406235, 0);||~&~||(1, 'skin_csite', '<div class=\'desc\'>[ DB Queries: $queries ] [ Execution Time: $time ]</div>', 'tmpl_debug', '$queries, $time', 1035406235, 0);||~&~||(1, 'skin_csite', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\n        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n<head>\n	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />\n	<meta name="generator" content="IPDynamic Lite">\n	<meta http-equiv="Pragma" content="no-cache">\n	<meta http-equiv="no-cache">\n	<meta http-equiv="Cache-Control" content="no-cache">\n	<title><!--CS.TEMPLATE.TITLE--></title>\n	<!--CS.TEMPLATE.JAVASCRIPT-->\n	<!--CS.TEMPLATE.CSS-->\n</head>\n<body>\n<div id=\'ipbwrapper\'>\n<!--Header-->\n<div id=\'logostrip\'>\n  <a href=\'{$ibforums->base_url}\' title=\'Board Home\'><img src=\'{$ibforums->vars[\'img_url\']}/logo4.gif\' alt=\'Powered by Invision Power Board\' border="0" /></a>\n</div>\n<table width="100%" cellspacing="6" id="submenu">\n<tr>\n <td><a href=\'{$ibforums->vars[\'home_url\']}\'>{$ibforums->vars[\'home_name\']}</a><!--IBF.RULES--></td>\n <td align="right">\n   <img src="{$ibforums->vars[\'img_url\']}/atb_help.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=Help\'>{$ibforums->lang[\'tb_help\']}</a>\n   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_search.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=Search&amp;f={$ibforums->input[\'f\']}\'>{$ibforums->lang[\'tb_search\']}</a>\n   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_members.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=Members\'>{$ibforums->lang[\'tb_mlist\']}</a>\n   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_calendar.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=calendar\'>{$ibforums->lang[\'tb_calendar\']}</a>\n   <!--IBF.CHATLINK-->\n </td>\n</tr>\n</table>\n<!--CS.TEMPLATE.LINKS-->\n<!--End Header-->\n<!--Main Content-->\n<table width="100%" class=\'tableborder\' cellspacing="0" cellpadding="6">\n<tr>\n <td width="200" class=\'row3\' valign="top">\n   <!-- LEFT -->\n    <!--CS.TEMPLATE.WELCOMEBOX-->\n    <!--CS.TEMPLATE.SEARCH-->\n    <!--CS.TEMPLATE.SITENAV-->\n    <!--CS.TEMPLATE.CHANGESKIN-->\n    <!--CS.TEMPLATE.ONLINEUSERS-->\n    <!--CS.TEMPLATE.POLL-->\n    <!--CS.TEMPLATE.LATESTPOSTS-->\n    <!--CS.TEMPLATE.RECENTARTICLES-->\n    <!--CS.TEMPLATE.AFFILIATES-->\n   <!--END LEFT-->\n   <br /><img src=\'{$ibforums->vars[\'img_url\']}/spacer.gif\' alt=\'\' width=\'200\' height=\'1\' />\n </td>\n <!--SPACER-->\n <td width="5" class=\'row3\'>&nbsp;</td>\n <td width="90%" class=\'row3\' valign="top">\n   <!--MAIN-->\n    \n    <!--CS.TEMPLATE.ARTICLES-->\n   \n   <!--END MAIN-->\n </td>\n</tr>\n<!--End Main Content-->\n<tr>\n <td colspan=\'3\'  class=\'row3\' align=\'center\'>\n <!--CS.TEMPLATE.COPYRIGHT-->\n <!--CS.TEMPLATE.DEBUG-->\n </td>\n</tr>\n</table>\n<div class=\'titlemedium\'>&nbsp;</div>\n</div>\n</body>\n</html>', 'csite_skeleton_template', '', 1035406235, 0);||~&~||(1, 'skin_emails', '<div class="tableborder">\n <div class="pformstrip">$title</div>\n <div class="tablepad">$body</div>\n</div>', 'board_rules', '$title="", $body=""', 1035406235, 0);||~&~||(1, 'skin_emails', '<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'errors_found\']}</div>\n  <div class="tablepad"><span class=\'postcolor\'>$data</span></div>\n</div>\n<br />', 'errors', '$data', 1035406235, 0);||~&~||(1, 'skin_emails', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'chat_title\']}</div>\n <div class=\'tablepad\' align=\'center\'>\n  <applet\n	 codebase="http://client.invisionchat.com/current/"\n	 code="Client.class" archive="scclient_$lang.zip"\n	 width=$w height=$h\n	 style=\'border: 1px solid #000\'>\n	 <param name="room" value="$acc_no">\n	 <param name="cabbase" value="scclient_$lang.cab">\n	 <param name="username" value="$user">\n	 <param name="password" value="$pass">\n	 <param name="autologin" value="yes">\n  </applet>\n </div>\n</div>\n<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'chat_help\']}</div>\n <div class=\'tablepad\'>\n   {$ibforums->lang[\'chat_help_text\']}\n </div>\n</div>', 'chat_inline', '$acc_no, $lang, $w, $h, $user="",$pass=""', 1035406235, 0);||~&~||(1, 'skin_emails', '<div align=\'center\'>\n <applet\n	codebase="http://client.invisionchat.com/current/"\n	code="Client.class" archive="scclient_$lang.zip"\n	width=$w height=$h\n	style=\'border: 1px solid <{tbl_border}>\'>\n	<param name="room" value="$acc_no">\n	<param name="cabbase" value="scclient_$lang.cab">\n	<param name="username" value="$user">\n	<param name="password" value="$pass">\n	<param name="autologin" value="yes">\n </applet>\n</div>', 'chat_pop', '$acc_no, $lang, $w, $h, $user="",$pass=""', 1035406235, 0);||~&~||(1, 'skin_emails', '<form action="{$ibforums->base_url}act=report&amp;send=1&amp;f=$fid&amp;t=$tid&amp;p=$pid&amp;st=$st" method="post" name=\'REPLIER\'>\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'report_title\']}</div>\n  <div class=\'pformstrip\'>&nbsp;</div>\n  <table cellpadding=\'4\' cellspacing=\'1\' border=\'0\' width=\'100%\'>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'report_topic\']}</b></td>\n   <td class=\'row1\' width=\'80%\'><a href=\'{$ibforums->base_url}showtopic=$tid&amp;st=$st&amp;&#35;entry$pid\'>$topic_title</a>\n   </td>\n   </tr>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'>{$ibforums->lang[\'report_message\']}</td>\n   <td class=\'row1\' width=\'80%\'><textarea cols=\'60\' rows=\'12\' wrap=\'soft\' name=\'message\' class=\'textinput\'></textarea>\n   </td>\n   </tr>\n  </table>\n  <div align=\'center\' class=\'pformstrip\'><input type="submit" value="{$ibforums->lang[\'report_submit\']}" class=\'forminput\' /></div>\n </div>\n</form>', 'report_form', '$fid, $tid, $pid, $st, $topic_title', 1035406235, 0);||~&~||(1, 'skin_emails', '<object classid=\'clsid:F3A614DC-ABE0-11d2-A441-00C04F795683\' codebase=\'#Version=2,0,0,83\' codetype=\'application/x-oleobject\' id=\'MsgrObj\' name=\'MsgrApp\' width=\'0\' height=\'0\'></object>\n			  <object classid=\'clsid:FB7199AB-79BF-11d2-8D94-0000F875C541\' codetype=\'application/x-oleobject\' id=\'MsgrApp\' name=\'MsgrApp\' width=\'0\' height=\'0\'></object>\n              <tr>\n                <td class=\'row2\' align=\'left\'><b>{$ibforums->lang[\'msn_name\']}</b></td>\n                <td class=\'row2\' align=\'left\'><input type=\'text\' name=\'msnname\' value=\'$msnname\' size=\'40\' class=\'forminput\' onMouseOver="this.focus()" onFocus="this.select()"></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'center\' colspan=\'2\'><a href="javascript:MsgrApp.LaunchIMUI(\'$msnname\');">{$ibforums->lang[\'msn_send_msg\']}</a></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'center\' colspan=\'2\'><a href="javascript:MsgrApp.LaunchAddContactUI(\'$msnname\');">{$ibforums->lang[\'msn_add_contact\']}</a></td>\n              </tr>', 'msn_body', '$msnname', 1035406235, 0);||~&~||(1, 'skin_emails', '<tr>\n                <td class=\'row2\' align=\'left\'><b>{$ibforums->lang[\'yahoo_name\']}</b></td>\n                <td class=\'row2\' align=\'left\'><input type=\'text\' name=\'msnname\' value=\'$yahoo\' size=\'40\' class=\'forminput\' onMouseOver="this.focus()" onFocus="this.select()"></td>\n              </tr>\n               <tr>\n                <td class=\'row2\' align=\'left\'><b>{$ibforums->lang[\'yahoo_status\']}</b></td>\n                <td class=\'row2\' align=\'left\'><img border=0 src="http://opi.yahoo.com/online?u=$yahoo&amp;m=g&amp;t=2"></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'center\' colspan=\'2\'><a href="http://edit.yahoo.com/config/send_webmesg?.target=$yahoo&amp;.src=pg">{$ibforums->lang[\'yahoo_send_msg\']}</a></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'center\' colspan=\'2\'><a href="http://members.yahoo.com/interests?.oc=t&amp;.kw=$yahoo&amp;.sb=1">{$ibforums->lang[\'yahoo_view_profile\']}</a></td>\n              </tr>', 'yahoo_body', '$yahoo', 1035406235, 0);||~&~||(1, 'skin_emails', '<form action="http://msg.mirabilis.com/scripts/WWPMsg.dll" METHOD="POST" name="frmPager">\n			      <INPUT TYPE="hidden" NAME="subject" VALUE="From WebPager Panel">\n              <input type="hidden" name="to" value="{$data[UIN]}">\n              <tr>\n                <td class=\'row2\' align=\'left\'><b>{$ibforums->lang[\'name\']}</b></td>\n                <td class=\'row2\' align=\'left\'><input type=\'text\' name=\'from\' value=\'{$ibforums->member[\'name\']}\' size=\'40\' class=\'forminput\' onMouseOver="this.focus()" onFocus="this.select()"></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'left\'><b>{$ibforums->lang[\'email\']}</b></td>\n                <td class=\'row2\' align=\'left\'><input type=\'text\' name=\'fromemail\' value=\'{$ibforums->member[\'email\']}\' size=\'40\' class=\'forminput\' onMouseOver="this.focus()" onFocus="this.select()"></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'left\' valign=\'top\'><b>{$ibforums->lang[\'msg\']}</b></td>\n                <td class=\'row2\' align=\'left\'><textarea wrap=\'virtual\' cols=\'50\' rows=\'12\' wrap=\'soft\' name=\'body\' class=\'textinput\' onMouseOver="this.focus()" onFocus="this.select()"></textarea></td>\n              </tr>\n              <tr>\n                <td class=\'row2\' align=\'center\' colspan=\'2\'><input type=\'submit\' value=\'{$ibforums->lang[\'submit\']}\' class=\'forminput\'></td>\n              </tr>\n              </form>', 'icq_body', '$data', 1035406235, 0);||~&~||(1, 'skin_emails', '<!-- End content Table -->\n            </table>\n            </td>\n            </tr>\n            <tr>\n            <td class=\'darkrow1\' colspan=\'2\'>&nbsp;</td>\n            </tr>\n            </table>', 'end_table', '', 1035406235, 0);||~&~||(1, 'skin_emails', '<table cellpadding=\'0\' cellspacing=\'0\' border=\'0\' width=\'100%\' bgcolor=\'<{tbl_border}>\' align=\'center\'>\n        <tr>\n            <td>\n              <table cellpadding=\'4\' cellspacing=\'0\' border=\'0\' width=\'100%\'>\n                <tr>\n                   <td colspan=\'2\' align=\'center\' class=\'titlemedium\'>{$data[TITLE]}</td>', 'pager_header', '$data', 1035406235, 0);||~&~||(1, 'skin_emails', '<!-- Begin AIM Remote -->\n<table width=\'140\' align=\'center\'>\n<tr align=\'right\'><td><a href="http://www.aol.co.uk/aim/index.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_man.gif" width=44 height=55 border=0 alt="Download AIM"></a><img src="http://www.aol.co.uk/aim/remote/gr/aimver_topsm.gif" width=73 height=55 border=0 alt="AIM Remote"><br /><a href="aim:goim?screenname={$data[\'AOLNAME\']}&amp;message=Hi.+Are+you+there?"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_im.gif" width=117 height=39 border=0 alt="Send me an Instant Message"></a><br /><a href="aim:addbuddy?screenname={$data[\'AOLNAME\']}"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_bud.gif" width=117 height=39 border=0 alt="Add me to Your Buddy List"></a><br /><a href="http://www.aol.co.uk/aim/remote.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_botadd.gif" width=117 height=23 border=0 alt="Add Remote to Your Page"></a><br /><a href="http://www.aol.co.uk/aim/index.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_botdow.gif" width=117 height=29 border=0 alt="Download AOL Instant Messenger"></a><br /><br /></td></tr></table>\n<!-- End AIM Remote -->', 'aol_body', '$data', 1035406235, 0);||~&~||(1, 'skin_emails', '<form action="{$ibforums->base_url}" method="post" name=\'REPLIER\'>\n<input type=\'hidden\' name=\'act\'  value=\'Forward\'>\n<input type=\'hidden\' name=\'CODE\' value=\'01\'>\n<input type=\'hidden\' name=\'s\'    value=\'{$ibforums->session_id}\'>\n<input type=\'hidden\' name=\'st\'   value=\'{$ibforums->input[\'st\']}\'>\n<input type=\'hidden\' name=\'f\'    value=\'{$ibforums->input[\'f\']}\'>\n<input type=\'hidden\' name=\'t\'    value=\'{$ibforums->input[\'t\']}\'>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'title\']}</div>\n <table cellpadding=\'4\' cellspacing=\'0\' border=\'0\' width=\'100%\'>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'send_lang\']}</b></td>\n   <td class=\'row1\' width=\'80%\'>$lang</td>\n   </tr>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'to_name\']}</b></td>\n   <td class=\'row1\' width=\'80%\'><input type=\'text\' class=\'forminput\' name=\'to_name\' value=\'\' size=\'30\' maxlength=\'100\'></td>\n   </tr>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'to_email\']}</b></td>\n   <td class=\'row1\' width=\'80%\'><input type=\'text\' class=\'forminput\' name=\'to_email\' value=\'\' size=\'30\' maxlength=\'100\'></td>\n   </tr>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'subject\']}</b></td>\n   <td class=\'row1\' width=\'80%\'><input type=\'text\' class=\'forminput\' name=\'subject\' value=\'{$title}\' size=\'30\' maxlength=\'120\'></td>\n   </tr>\n   <tr>\n   <td class=\'row1\' align=\'left\'  width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'message\']}</b></td>\n   <td class=\'row1\' width=\'80%\'><textarea cols=\'60\' rows=\'12\' wrap=\'soft\' name=\'message\' class=\'textinput\'>{$text}</textarea>\n   </td>\n   </tr>\n  </table>\n  <div align=\'center\' class=\'pformstrip\'><input type="submit" value="{$ibforums->lang[\'submit_send\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'forward_form', '$title, $text, $lang', 1035406235, 0);||~&~||(1, 'skin_emails', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'send_email_to\']} {$data[NAME]}</div>\n  <div class=\'tablepad\'>{$ibforums->lang[\'show_address_text\']}\n  <br />\n  &gt;&gt;<b><a href="mailto:{$data[ADDRESS]}" class=\'misc\'>{$ibforums->lang[\'send_email_to\']} {$data[NAME]}</a></b>\n </div>\n</div>', 'show_address', '$data', 1035406235, 0);||~&~||(1, 'skin_emails', '<form action="{$ibforums->base_url}" method="post" name=\'REPLIER\'>\n<input type=\'hidden\' name=\'act\' value=\'Mail\'>\n<input type=\'hidden\' name=\'CODE\' value=\'01\'>\n<input type=\'hidden\' name=\'to\' value=\'{$data[\'TO\']}\'>\n<div><strong>{$ibforums->lang[\'imp_text\']}</strong></div>\n<br />\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'send_title\']}</div>\n  <div class=\'pformstrip\'>{$ibforums->lang[\'send_email_to\']} {$data[\'NAME\']}</div>\n  <table width=\'100%\' cellspacing=\'1\'>\n	<tr>\n	  <td class=\'pformleftw\' valign=\'top\'><b>{$ibforums->lang[\'subject\']}</b></td>\n	  <td class=\'pformright\'><input type=\'text\' name=\'subject\' value=\'{$data[\'subject\']}\' size=\'50\' maxlength=\'50\' class=\'forminput\' /></td>\n	</tr>\n	<tr>\n	  <td class=\'pformleftw\' valign=\'top\'><b>{$ibforums->lang[\'message\']}</b><br /><br />{$ibforums->lang[\'msg_txt\']}</td>\n	  <td class=\'pformright\'><textarea cols=\'60\' rows=\'12\' wrap=\'soft\' name=\'message\' class=\'textinput\'>{$data[\'content\']}</textarea></td>\n	</tr>\n   </table>\n   <div class=\'pformstrip\' align=\'center\'><input type="submit" value="{$ibforums->lang[\'submit_send\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'send_form', '$data', 1035406235, 0);||~&~||(1, 'skin_emails', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'email_sent\']}</div>\n  <div class=\'tablepad\'>{$ibforums->lang[\'email_sent_txt\']} $member_name</div>\n</div>', 'sent_screen', '$member_name', 1035406235, 0);||~&~||(1, 'skin_emails', '<table cellpadding=\'0\' cellspacing=\'1\' border=\'0\' width=\'<{tbl_width}>\' align=\'center\'>\n        <tr>\n            <td align=\'right\'>$data</td>\n        </tr>\n       </table>', 'forum_jump', '$data', 1035406235, 0);||~&~||(1, 'skin_forum', '<a href="javascript:multi_page_jump( $total, $pp, \'$qe\' )" title="{$ibforums->lang[\'tpl_jump\']}">{$ibforums->lang[\'multi_page_forum\']}</a>', 'show_page_jump', '$total, $pp, $qe', 1035406235, 0);||~&~||(1, 'skin_forum', '<form action=\'{$ibforums->base_url};act=SF&amp;f=$data\' method=\'post\'>\n<input type=\'hidden\' name=\'act\' value=\'SF\'>\n<input type=\'hidden\' name=\'f\' value=\'$data\'>\n<input type=\'hidden\' name=\'L\' value=\'1\'>\n<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\'>\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'need_password\']}</div>\n  <div class=\'tablepad\'>{$ibforums->lang[\'need_password_txt\']}</div>\n  <div class=\'tablepad\' style=\'text-align:center\'>\n    <strong>{$ibforums->lang[\'enter_pass\']}</strong>\n    <br />\n    <input type=\'password\' size=\'20\' name=\'f_password\' />\n  </div>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'f_pass_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'Forum_log_in', '$data', 1035406235, 0);||~&~||(1, 'skin_forum', '&#0124; <a href=\'{$ibforums->base_url}act=Track&amp;f=$fid&amp;type=forum\'>{$ibforums->lang[\'ft_title\']}</a>', 'show_sub_link', '$fid', 1035406235, 0);||~&~||(1, 'skin_forum', '<br />\n<strong>{$ibforums->lang[\'post_modq\']} <a href=\'{$ibforums->base_url}act=modcp\'>{$ibforums->lang[\'post_click\']}</a></strong>', 'show_mod_link', '$fid', 1035406235, 0);||~&~||(1, 'skin_forum', '<script language=\'javascript\' type="text/javascript">\n<!--\n	function who_posted(tid)\n	{\n		window.open("{$ibforums->js_base_url}act=Stats&CODE=who&t="+tid, "WhoPosted", "toolbar=no,scrollbars=yes,resizable=yes,width=230,height=300");\n	}\n//-->\n</script>\n<!--IBF.SUBFORUMS-->\n<!--IBF.MODLINK-->\n<table width="100%" cellpadding="0" cellspacing="0" border="0">\n<tr>\n <td align=\'left\' width="20%" nowrap="nowrap">{$data[\'SHOW_PAGES\']}</td>\n <td align=\'right\' width="80%"><a href=\'{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data[\'id\']}\'><{A_POST}></a>{$data[POLL_BUTTON]}</td>\n</tr>\n</table>\n<br />\n	<form action=\'{$ibforums->base_url}act=SF&amp;f={$data[\'id\']}&amp;st={$ibforums->input[\'st\']}\' method=\'post\'>\n      <div class="tableborder">\n        <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$data[\'name\']}</div>\n		<table width=\'100%\' border=\'0\' cellspacing=\'1\' cellpadding=\'4\'>\n		  <tr> \n			<td align=\'center\' class=\'titlemedium\'><img src=\'{$ibforums->vars[\'img_url\']}/spacer.gif\' alt=\'\' width=\'20\' height=\'1\' /></td>\n			<td align=\'center\' class=\'titlemedium\'><img src=\'{$ibforums->vars[\'img_url\']}/spacer.gif\' alt=\'\' width=\'20\' height=\'1\' /></td>\n			<th width=\'45%\' align=\'left\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_topic_title\']}</th>\n			<th width=\'14%\' align=\'center\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_topic_starter\']}</th>\n			<th width=\'7%\' align=\'center\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_replies\']}</th>\n			<th width=\'7%\' align=\'center\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_hits\']}</th>\n			<th width=\'27%\' align=\'left\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_last_action\']}</th>\n		  </tr>\n        <!-- Forum page unique top -->', 'PageTop', '$data', 1035406235, 0);||~&~||(1, 'skin_forum', '</table>\n    \n      <!--IBF.FORUM_ACTIVE-->\n      \n      <div align=\'center\' class=\'darkrow2\' style=\'padding:4px\'>{$ibforums->lang[\'showing_text\']}{$ibforums->lang[\'sort_text\']}&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'sort_submit\']}\' class=\'forminput\' /></div>\n	</div>\n</form>\n<br />\n<table width="100%" cellpadding="0" cellspacing="0" border="0">\n<tr>\n <td align=\'left\' width="20%" nowrap="nowrap">{$data[\'SHOW_PAGES\']}</td>\n <td align=\'right\' width="80%"><a href=\'{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data[\'id\']}\'><{A_POST}></a>{$data[POLL_BUTTON]}</td>\n</tr>\n</table>\n<br />\n<div align=\'left\' class="wrapmini">\n	<{B_NEW}>&nbsp;&nbsp;{$ibforums->lang[\'pm_open_new\']}\n	<br /><{B_NORM}>&nbsp;&nbsp;{$ibforums->lang[\'pm_open_no\']}\n	<br /><{B_HOT}>&nbsp;&nbsp;{$ibforums->lang[\'pm_hot_new\']}\n	<br /><{B_HOT_NN}>&nbsp;&nbsp;{$ibforums->lang[\'pm_hot_no\']}\n</div>\n<div align=\'left\' class="wrapmini">\n	<{B_POLL}>&nbsp;&nbsp;{$ibforums->lang[\'pm_poll\']}\n	<br /><{B_POLL_NN}>&nbsp;&nbsp;{$ibforums->lang[\'pm_poll_no\']}\n	<br /><{B_LOCKED}>&nbsp;&nbsp;{$ibforums->lang[\'pm_locked\']}\n	<br /><{B_MOVED}>&nbsp;&nbsp;{$ibforums->lang[\'pm_moved\']}\n</div>\n<div align=\'right\'>\n    <form action=\'{$ibforums->base_url}\' method=\'post\' name=\'search\'>\n	<input type=\'hidden\' name=\'forums\' value=\'{$data[\'id\']}\' />\n	<input type=\'hidden\' name=\'cat_forum\' value=\'forum\' />\n	<input type=\'hidden\' name=\'act\' value=\'Search\' />\n	<input type=\'hidden\' name=\'joinname\' value=\'1\' />\n	<input type=\'hidden\' name=\'CODE\' value=\'01\' />\n	{$ibforums->lang[\'search_forum\']}&nbsp;\n	<input type=\'text\' size=\'30\' name=\'keywords\' class=\'forminput\' value=\'{$ibforums->lang[\'enter_keywords\']}\' onfocus=\'this.value = "";\' /><input type=\'submit\' value=\'{$ibforums->lang[\'search_go\']}\' class=\'forminput\' />\n   </form>\n   <br />\n   <br />\n   {$data[FORUM_JUMP]}\n</div>\n<br />\n<br />\n<div align=\'center\'><a href=\'{$ibforums->base_url}act=Login&amp;CODE=04&amp;f={$data[\'id\']}\'>{$ibforums->lang[\'mark_as_read\']}</a> <!--IBF.SUB_FORUM_LINK--></div>\n<br clear="all" />', 'TableEnd', '$data', 1035406235, 0);||~&~||(1, 'skin_forum', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$rules[\'title\']}</div>\n  <div class=\'tablepad\'>{$rules[\'body\']}</div>\n  <div class=\'pformstrip\' align=\'center\'>&gt;&gt;<a href=\'{$ibforums->base_url}act=SF&amp;f={$rules[\'fid\']}\'>{$ibforums->lang[\'back_to_forum\']}</a></div>\n</div>', 'show_rules', '$rules', 1035406235, 0);||~&~||(1, 'skin_forum', '<div><span class=\'pagetitle\'>$title</span>$pages</div>', 'page_title', '$title="", $pages=""', 1035406235, 0);||~&~||(1, 'skin_forum', '<div class=\'darkrow2\' style=\'padding:6px\'>{$ibforums->lang[\'active_users_title\']} ({$ibforums->lang[\'active_users_detail\']})</div>\n	  <div class=\'row2\' style=\'padding:6px\'>{$ibforums->lang[\'active_users_members\']} {$active[\'names\']}</div>', 'forum_active_users', '$active=array()', 1035406235, 0);||~&~||(1, 'skin_forum', '<tr> \n					<td class=\'row4\' colspan=\'7\' align=\'center\'>\n						<br />\n                         <b>{$ibforums->lang[\'no_topics\']}</b>\n						<br /><br />\n					</td>\n        </tr>', 'show_no_matches', '', 1035406235, 0);||~&~||(1, 'skin_forum', '<a href=\'javascript:who_posted($tid);\'>$posts</a>', 'who_link', '$tid, $posts', 1035406235, 0);||~&~||(1, 'skin_forum', '<!-- Begin Topic Entry {$data[\'tid\']} -->\n    <tr> \n	  <td align=\'center\' class=\'row4\'>{$data[\'folder_img\']}</td>\n      <td align=\'center\' class=\'row2\'>{$data[\'topic_icon\']}</td>\n      <td class=\'row4\'>\n        {$data[\'go_new_post\']}{$data[\'prefix\']} <a href="{$ibforums->base_url}showtopic={$data[\'tid\']}" title="{$ibforums->lang[\'topic_started_on\']} {$data[\'start_date\']}">{$data[\'title\']}</a>  {$data[PAGES]}\n        <br /><span class=\'desc\'>{$data[\'description\']}</span></td>\n      <td align=\'center\' class=\'row2\'>{$data[\'starter\']}</td>\n      <td align=\'center\' class=\'row4\'>{$data[\'posts\']}</td>\n      <td align=\'center\' class=\'row2\'>{$data[\'views\']}</td>\n      <td class=\'row2\'><span class=\'desc\'>{$data[\'last_post\']}<br /><a href=\'{$ibforums->base_url}showtopic={$data[\'tid\']}&amp;view=getlastpost\'>{$data[\'last_text\']}</a> <b>{$data[\'last_poster\']}</b></span></td>\n    </tr>\n    <!-- End Topic Entry {$data[\'tid\']} -->', 'RenderRow', '$data', 1035406235, 0);||~&~||(1, 'skin_forum', '<!-- START PINNED -->\n    <tr>\n      <td align=\'center\' class=\'darkrow1\'>&nbsp;</td>\n      <td align=\'center\' class=\'darkrow1\'>&nbsp;</td>\n	  <td align=\'left\' class=\'darkrow1\' colspan=\'5\' style=\'padding:6px\'><b>{$ibforums->lang[\'pinned_start\']}</b></td>\n    </tr>', 'render_pinned_start', '', 1035406235, 0);||~&~||(1, 'skin_forum', '<!-- END PINNED -->\n    <tr>\n      <td align=\'center\' class=\'darkrow1\'>&nbsp;</td>\n      <td align=\'center\' class=\'darkrow1\'>&nbsp;</td>\n	  <td align=\'left\' class=\'darkrow1\' colspan=\'5\' style=\'padding:6px\'><b>{$ibforums->lang[\'regular_topics\']}</b></td>\n    </tr>', 'render_pinned_end', '', 1035406235, 0);||~&~||(1, 'skin_forum', '<!-- Begin Pinned Topic Entry {$data[\'tid\']} -->\n    <tr> \n	  <td align=\'center\' class=\'row4\'>{$data[\'folder_img\']}</td>\n      <td align=\'center\' class=\'row2\'>{$data[\'topic_icon\']}</td>\n      <td class=\'row4\'>\n       {$data[\'go_new_post\']}<b>{$data[\'prefix\']} <a href=\'{$ibforums->base_url}showtopic={$data[\'tid\']}\' class=\'linkthru\' title=\'{$ibforums->lang[\'topic_started_on\']} {$data[\'start_date\']}\'>{$data[\'title\']}</a></b>  {$data[PAGES]}\n        <br /><span class=\'desc\'>{$data[\'description\']}</span></td>\n      <td align=\'center\' class=\'row4\'>{$data[\'starter\']}</td>\n      <td align=\'center\' class=\'row4\'>{$data[\'posts\']}</td>\n      <td align=\'center\' class=\'row4\'>{$data[\'views\']}</td>\n      <td class=\'row4\'><span class=\'desc\'>{$data[\'last_post\']}<br /><a href=\'{$ibforums->base_url}showtopic={$data[\'tid\']}&amp;view=getlastpost\'>{$data[\'last_text\']}</a> <b>{$data[\'last_poster\']}</b></span></td>\n    </tr>\n    <!-- End Pinned Topic Entry {$data[\'tid\']} -->', 'render_pinned_row', '$data', 1035406235, 0);||~&~||(1, 'skin_global', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> \n<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"> \n <head> \n  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> \n  <title>$title</title>\n  $css\n </head>\n <script language=\'JavaScript\' type="text/javascript">\n <!--\n function buddy_pop() { window.open(\'index.{$ibforums->vars[\'php_ext\']}?act=buddy&s={$ibforums->session_id}\',\'BrowserBuddy\',\'width=250,height=500,resizable=yes,scrollbars=yes\'); }\n function chat_pop(cw,ch)  { window.open(\'index.{$ibforums->vars[\'php_ext\']}?s={$ibforums->session_id}&act=chat&pop=1\',\'Chat\',\'width=\'+cw+\',height=\'+ch+\',resizable=yes,scrollbars=yes\'); }\n function multi_page_jump( url_bit, total_posts, per_page )\n {\n pages = 1; cur_st = parseInt("{$ibforums->input[\'st\']}"); cur_page  = 1;\n if ( total_posts % per_page == 0 ) { pages = total_posts / per_page; }\n  else { pages = Math.ceil( total_posts / per_page ); }\n msg = "{$ibforums->lang[\'tpl_q1\']}" + " " + pages;\n if ( cur_st > 0 ) { cur_page = cur_st / per_page; cur_page = cur_page -1; }\n show_page = 1;\n if ( cur_page < pages )  { show_page = cur_page + 1; }\n if ( cur_page >= pages ) { show_page = cur_page - 1; }\n  else { show_page = cur_page + 1; }\n userPage = prompt( msg, show_page );\n if ( userPage > 0  ) {\n	 if ( userPage < 1 )     {    userPage = 1;  }\n	 if ( userPage > pages ) { userPage = pages; }\n	 if ( userPage == 1 )    {     start = 0;    }\n	 else { start = (userPage - 1) * per_page; }\n	 window.location = url_bit + "&st=" + start;\n }\n }\n //-->\n </script>\n <body>\n <div style=\'text-align:left\'>\n $text\n </div>\n </body>\n</html>', 'pop_up_window', '$title, $css, $text', 1035406235, 0);||~&~||(1, 'skin_global', '<a title="{$ibforums->lang[\'tpl_jump\']}" href="javascript:multi_page_jump(\'$ub\',$tp,$pp);">{$ibforums->lang[\'tpl_pages\']}</a>', 'make_page_jump', '$tp="", $pp="", $ub=""', 1035406235, 0);||~&~||(1, 'skin_global', '<br /><br />--------------------<br />\n<div class=\'signature\'>$sig</div>', 'signature_separator', '$sig=""', 1035406235, 0);||~&~||(1, 'skin_global', '<!-- Show FAQ/Forum Rules -->\n    <div align=\'left\'><{F_RULES}>&nbsp;<b>{$rules[\'title\']}</b><br /><br />{$rules[\'body\']}</div>\n	<br />\n   <!-- End FAQ/Forum Rules -->', 'forum_show_rules_full', '$rules', 1035406235, 0);||~&~||(1, 'skin_global', '<!-- Show FAQ/Forum Rules -->\n	\n    <div align=\'left\'><{F_RULES}>&nbsp;<b><a href=\'{$ibforums->base_url}act=SR&amp;f={$rules[\'fid\']}\'>{$rules[\'title\']}</a></b></div>\n	\n    <!-- End FAQ/Forum Rules -->', 'forum_show_rules_link', '$rules', 1035406235, 0);||~&~||(1, 'skin_global', '<style type=\'text/css\'>\n{$css}\n</style>', 'css_inline', '$css=""', 1035406235, 0);||~&~||(1, 'skin_global', '<style type=\'text/css\' media="all">\n@import url(css.php?d={$css}_{$img}.css);\n</style>', 'css_external', '$css, $img', 1035406235, 0);||~&~||(1, 'skin_global', '<table width="100%" id="userlinks" cellspacing="6">\n   <tr>\n    <td><strong>{$ibforums->lang[\'logged_in_as\']} <a href=\'{$ibforums->base_url}showuser={$ibforums->member[\'id\']}\'>{$ibforums->member[\'name\']}</a></strong> ( <a href=\'{$ibforums->base_url}act=Login&amp;CODE=03\'>{$ibforums->lang[\'log_out\']}</a>$ad_link $mod_link $val_link )</td>\n    <td align=\'right\'>\n      <b><a href=\'{$ibforums->base_url}act=UserCP&amp;CODE=00\' title=\'{$ibforums->lang[\'cp_tool_tip\']}\'>{$ibforums->lang[\'your_cp\']}</a></b> &middot; <a href=\'{$ibforums->base_url}act=Msg&amp;CODE=01\'>{$msg[TEXT]}</a>\n      &middot; <a href=\'{$ibforums->base_url}act=Search&amp;CODE=getnew\'>{$ibforums->lang[\'view_new_posts\']}</a> &middot; <a href=\'javascript:buddy_pop();\' title=\'{$ibforums->lang[\'bb_tool_tip\']}\'>{$ibforums->lang[\'l_qb\']}</a></td>\n   </tr>\n  </table>', 'Member_bar', '$msg, $ad_link, $mod_link, $val_link', 1035406235, 0);||~&~||(1, 'skin_global', '<table width="100%" id="userlinks" cellspacing="6">\n   <tr>\n    <td>{$ibforums->lang[\'guest_stuff\']} ( <a href=\'{$ibforums->base_url}act=Login&amp;CODE=00\'>{$ibforums->lang[\'log_in\']}</a> | <a href=\'{$ibforums->base_url}act=Reg&amp;CODE=00\'>{$ibforums->lang[\'register\']}</a> )</td>\n    <td align=\'right\'><a href=\'{$ibforums->base_url}act=Reg&amp;CODE=reval\'>{$ibforums->lang[\'ml_revalidate\']}</a></td>\n   </tr>\n  </table>', 'Guest_bar', '', 1035406235, 0);||~&~||(1, 'skin_global', '<table width="100%" id="userlinks" cellspacing="6">\n   <tr>\n    <td><strong>{$ibforums->lang[\'mb_disabled\']} </strong></td>\n   </tr>\n  </table>', 'member_bar_disabled', '', 1035406235, 0);||~&~||(1, 'skin_global', '<table width="100%" id="userlinks" cellspacing="6">\n   <tr>\n    <td><b>{$ibforums->lang[\'logged_in_as\']} {$ibforums->member[\'name\']}</b> ( <a href=\'{$ibforums->base_url}act=Login&amp;CODE=03\'>{$ibforums->lang[\'log_out\']}</a>$ad_link $mod_link $val_link )</td>\n    <td align=\'right\'>\n   <b><a href=\'{$ibforums->base_url}act=UserCP&amp;CODE=00\' title=\'{$ibforums->lang[\'cp_tool_tip\']}\'>{$ibforums->lang[\'your_cp\']}</a></b>\n    &middot;  <a href=\'{$ibforums->base_url}act=Search&amp;CODE=getnew\'>{$ibforums->lang[\'view_new_posts\']}</a>  &middot;  <a href=\'javascript:buddy_pop();\' title=\'{$ibforums->lang[\'bb_tool_tip\']}\'>{$ibforums->lang[\'l_qb\']}</a></td>\n   </tr>\n  </table>', 'Member_no_usepm_bar', '$ad_link, $mod_link, $val_link', 1035406235, 0);||~&~||(1, 'skin_global', '<script language=\'JavaScript\' type="text/javascript">\n<!--\nfunction buddy_pop() { window.open(\'index.{$ibforums->vars[\'php_ext\']}?act=buddy&s={$ibforums->session_id}\',\'BrowserBuddy\',\'width=250,height=500,resizable=yes,scrollbars=yes\'); }\nfunction chat_pop(cw,ch)  { window.open(\'index.{$ibforums->vars[\'php_ext\']}?s={$ibforums->session_id}&act=chat&pop=1\',\'Chat\',\'width=\'+cw+\',height=\'+ch+\',resizable=yes,scrollbars=yes\'); }\nfunction multi_page_jump( url_bit, total_posts, per_page )\n{\npages = 1; cur_st = parseInt("{$ibforums->input[\'st\']}"); cur_page  = 1;\nif ( total_posts % per_page == 0 ) { pages = total_posts / per_page; }\n else { pages = Math.ceil( total_posts / per_page ); }\nmsg = "{$ibforums->lang[\'tpl_q1\']}" + " " + pages;\nif ( cur_st > 0 ) { cur_page = cur_st / per_page; cur_page = cur_page -1; }\nshow_page = 1;\nif ( cur_page < pages )  { show_page = cur_page + 1; }\nif ( cur_page >= pages ) { show_page = cur_page - 1; }\n else { show_page = cur_page + 1; }\nuserPage = prompt( msg, show_page );\nif ( userPage > 0  ) {\n	if ( userPage < 1 )     {    userPage = 1;  }\n	if ( userPage > pages ) { userPage = pages; }\n	if ( userPage == 1 )    {     start = 0;    }\n	else { start = (userPage - 1) * per_page; }\n	window.location = url_bit + "&st=" + start;\n}\n}\n//-->\n</script>\n \n<!--IBF.BANNER-->\n<div id=\'logostrip\'>\n  <a href=\'{$ibforums->base_url}\' title=\'Board Home\'><img src=\'{$ibforums->vars[\'img_url\']}/logo4.gif\' alt=\'Powered by Invision Power Board\' border="0" /></a>\n</div>\n<!-- IE6/Win TABLE FIX -->\n<table  width="100%" cellspacing="6" id="submenu">\n<tr>\n <td><a href=\'{$ibforums->vars[\'home_url\']}\'>{$ibforums->vars[\'home_name\']}</a><!--IBF.RULES--></td>\n <td align="right">\n   <img src="{$ibforums->vars[\'img_url\']}/atb_help.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=Help\'>{$ibforums->lang[\'tb_help\']}</a>\n   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_search.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=Search&amp;f={$ibforums->input[\'f\']}\'>{$ibforums->lang[\'tb_search\']}</a>\n   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_members.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=Members\'>{$ibforums->lang[\'tb_mlist\']}</a>\n   &nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_calendar.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=calendar\'>{$ibforums->lang[\'tb_calendar\']}</a>\n   <!--IBF.CHATLINK-->\n   <!--IBF.TSLLINK-->\n </td>\n</tr>\n</table>\n<% MEMBER BAR %>\n<br />', 'BoardHeader', '$time=""', 1035406235, 0);||~&~||(1, 'skin_global', '&nbsp;&middot; <a href="$url">$title</a>', 'rules_link', '$url="", $title=""', 1035406235, 0);||~&~||(1, 'skin_global', '&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_toplist.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=module&amp;module=toplist\'>{$ibforums->lang[\'tb_toplist\']}</a>', 'show_tsl_link_inline', '', 1035406235, 0);||~&~||(1, 'skin_global', '&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href=\'{$ibforums->base_url}act=chat\'>{$ibforums->lang[\'live_chat\']}</a>', 'show_chat_link_inline', '', 1035406235, 0);||~&~||(1, 'skin_global', '&nbsp; &nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/atb_chat.gif" border="0" alt="" />&nbsp;<a href="javascript:chat_pop({$ibforums->vars[\'chat_width\']}, {$ibforums->vars[\'chat_height\']});">{$ibforums->lang[\'live_chat\']}</a>', 'show_chat_link_popup', '', 1035406235, 0);||~&~||(1, 'skin_global', '<div id=\'navstrip\' align=\'left\'><{F_NAV}>&nbsp;', 'start_nav', '', 1035406235, 0);||~&~||(1, 'skin_global', '</div>\n<br />', 'end_nav', '', 1035406235, 0);||~&~||(1, 'skin_global', '<html>\n<head>\n<title>{$ibforums->lang[\'stand_by\']}</title>\n<meta http-equiv=\'refresh\' content=\'2; url=$Url\' />\n<script type="text/javascript"> </script>\n$css\n</head>\n<body>\n<table width=\'100%\' height=\'85%\' align=\'center\'>\n<tr>\n  <td valign=\'middle\'>\n	  <table align=\'center\' cellpadding="4" class="tablefill">\n	  <tr> \n		<td width="100%" align="center">\n		  {$ibforums->lang[\'thanks\']}, \n		  $Text<br /><br />\n		  {$ibforums->lang[\'transfer_you\']}<br /><br />\n	      (<a href=\'$Url\'>{$ibforums->lang[\'dont_wait\']}</a>)\n	    </td>\n	  </tr>\n	</table>\n  </td>\n</tr>\n</table>\n</body>\n</html>', 'Redirect', '$Text, $Url, $css', 1035406235, 0);||~&~||(1, 'skin_global', '<script language=\'JavaScript\' type="text/javascript">\n     <!--\n       window.open(\'index.{$ibforums->vars[\'php_ext\']}?act=Msg&CODE=99&s={$ibforums->session_id}\',\'NewPM\',\'width=500,height=250,resizable=yes,scrollbars=yes\'); \n     //-->\n     </script>', 'PM_popup', '', 1035406235, 0);||~&~||(1, 'skin_global', '&nbsp;&middot; <b><a href=\'{$ibforums->vars[\'board_url\']}/admin.{$ibforums->vars[\'php_ext\']}\' target=\'_blank\'>{$ibforums->lang[\'admin_cp\']}</a></b>', 'admin_link', '', 1035406235, 0);||~&~||(1, 'skin_global', '&middot; <b><a href=\'{$ibforums->base_url}act=modcp&amp;forum={$ibforums->input[\'f\']}\'>{$ibforums->lang[\'mod_cp\']}</a></b>', 'mod_link', '', 1035406235, 0);||~&~||(1, 'skin_global', '&nbsp;&middot; <a href=\'{$ibforums->base_url}act=Reg&amp;CODE=reval\'>{$ibforums->lang[\'ml_revalidate\']}</a>', 'validating_link', '', 1035406235, 0);||~&~||(1, 'skin_global', '<form action=\'{$ibforums->vars[\'board_url\']}/index.{$ibforums->vars[\'php_ext\']}\' method=\'post\'>\n<input type=\'hidden\' name=\'act\' value=\'Login\' />\n<input type=\'hidden\' name=\'CODE\' value=\'01\' />\n<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\' />\n<input type=\'hidden\' name=\'referer\' value=\'$q_string\' />\n<input type=\'hidden\' name=\'CookieDate\' value=\'1\' />\n<div class="tableborder">\n  <div class="titlemedium">{$ibforums->lang[\'er_log_in_title\']}</div>\n  <table>\n   <tr>\n	<td class="pformleft">{$ibforums->lang[\'erl_enter_name\']}</td>\n	<td class="pformright"><input type=\'text\' size=\'20\' maxlength=\'64\' name=\'UserName\' class=\'forminput\' /></td>\n   </tr>\n   <tr>\n	<td class="pformleft">{$ibforums->lang[\'erl_enter_pass\']}</td>\n	<td class="pformright"><input type=\'password\' size=\'20\' name=\'PassWord\' class=\'forminput\' /></td>\n   </tr>\n  </table>\n  <div class="pformstrip" align="center"><input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'erl_log_in_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'error_log_in', '$q_string', 1035406235, 0);||~&~||(1, 'skin_global', '<form action=\'{$ibforums->vars[\'board_url\']}/index.{$ibforums->vars[\'php_ext\']}\' method=\'post\'>\n<input type=\'hidden\' name=\'act\' value=\'Login\' />\n<input type=\'hidden\' name=\'CODE\' value=\'01\' />\n<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\' />\n<input type=\'hidden\' name=\'referer\' value=\'\' />\n<input type=\'hidden\' name=\'CookieDate\' value=\'1\' />\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'offline_title\']}</div>\n  <div class=\'tablepad\'>$message</div>\n  <table width=\'100%\' cellpadding=\'0\' cellspacing=\'0\'>\n  <tr>\n   <td class=\'pformleftw\'>{$ibforums->lang[\'erl_enter_name\']}</td>\n   <td class=\'pformright\'><input type=\'text\' size=\'20\' maxlength=\'64\' name=\'UserName\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n   <td class=\'pformleftw\'>{$ibforums->lang[\'erl_enter_pass\']}</td>\n   <td class=\'pformright\'><input type=\'password\' size=\'20\' name=\'PassWord\' class=\'forminput\' /></td>\n  </tr>\n  </table>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'erl_log_in_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'board_offline', '$message = ""', 1035406235, 0);||~&~||(1, 'skin_global', '<script language=\'JavaScript\' type="text/javascript">\n<!--\nfunction contact_admin() {\n  // Very basic spam bot stopper\n	  \n  admin_email_one = \'$ad_email_one\';\n  admin_email_two = \'$ad_email_two\';\n  \n  window.location = \'mailto:\'+admin_email_one+\'@\'+admin_email_two+\'?subject=Error on the forums\';\n  \n}\n//-->\n</script>\n<div class="tableborder">\n <div class="maintitle"><img src=\'{$ibforums->vars[\'img_url\']}/nav_m.gif\' alt=\'\' width=\'8\' height=\'8\' />&nbsp;{$ibforums->lang[\'error_title\']}</div>\n</div>\n<div class="tablefill">\n  {$ibforums->lang[\'exp_text\']}<br /><br />\n  <b>{$ibforums->lang[\'msg_head\']}</b>\n  <br /><br />\n  <span class=\'postcolor\' style=\'padding:10px\'>$message</span>\n  <br /><br />\n  <!--IBF.LOG_IN_TABLE-->\n  <!--IBF.POST_TEXTAREA-->\n  <br /><br />\n  <b>{$ibforums->lang[\'er_links\']}</b>\n  <br /><br />\n  &middot; <a href=\'{$ibforums->base_url}act=Reg&amp;CODE=10\'>{$ibforums->lang[\'er_lost_pass\']}</a><br />\n  &middot; <a href=\'{$ibforums->base_url}act=Reg&amp;CODE=00\'>{$ibforums->lang[\'er_register\']}</a><br />\n  &middot; <a href=\'{$ibforums->base_url}act=Help&amp;CODE=00\'>{$ibforums->lang[\'er_help_files\']}</a><br />\n  &middot; <a href=\'javascript:contact_admin();\'>{$ibforums->lang[\'er_contact_admin\']}</a>\n</div>\n<div class="tableborder">\n <div class="pformstrip" align="center">&lt; <a href=\'javascript:history.go(-1)\'>{$ibforums->lang[\'error_back\']}</a></div>\n</div>', 'Error', '$message, $ad_email_one="", $ad_email_two=""', 1035406235, 0);||~&~||(1, 'skin_global', '<br />\n<div>\n<strong>{$ibforums->lang[\'err_title\']}</strong>\n<br /><br />\n{$ibforums->lang[\'err_expl\']}\n</div>\n<br />\n<br />\n<div align=\'center\'>\n<input type=\'button\' tabindex=\'1\' value=\'{$ibforums->lang[\'err_select\']}\' onclick=\'document.mehform.saved.select()\'><br />\n<form name=\'mehform\'>\n<textarea cols=\'70\' rows=\'5\' name=\'saved\' tabindex=\'2\'>$post</textarea>\n</form>\n</div>', 'error_post_textarea', '$post=""', 1035406235, 0);||~&~||(1, 'skin_help', '<li class="helprow"><a href=\'{$ibforums->base_url}act=Help&amp;CODE=01&amp;HID={$entry[\'id\']}\'><b>{$entry[\'title\']}</b></a><br />{$entry[\'description\']}</li>', 'row', '$entry', 1035406235, 0);||~&~||(1, 'skin_help', '</div>\n<div style=\'padding:4px\'>$text</div>\n</div>', 'display', '$text', 1035406235, 0);||~&~||(1, 'skin_help', '</ul>\n </div>\n</div>', 'end', '', 1035406235, 0);||~&~||(1, 'skin_help', '<tr>\n                   <td class=\'row1\' colspan=\'2\'><b>{$ibforums->lang[\'no_results\']}</b></td>\n                 </tr>', 'no_results', '', 1035406235, 0);||~&~||(1, 'skin_help', '<div>$two_text</div>\n<br />\n<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Help\' />\n<input type=\'hidden\' name=\'CODE\' value=\'02\' />\n<div class="tableborder">\n  <div class="maintitle">$one_text</div>\n  <div class="tablepad">{$ibforums->lang[\'search_txt\']}&nbsp;&nbsp;<input type=\'text\' maxlength=\'60\' size=\'30\' class=\'forminput\' name=\'search_q\' />&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>\n<br />\n<div class="tableborder">\n  <div class="maintitle">$three_text</div>\n  <div class="tablepad">\n  <ul id="help">', 'start', '$one_text, $two_text, $three_text', 1035406235, 0);||~&~||(1, 'skin_legends', '<form name=\'finduser\' method=\'post\' action=\'{$ibforums->base_url}act=legends&amp;entry=$entry&amp;name=$name&amp;sep=$sep&amp;CODE=finduser_two\'>\n<table cellspacing=\'1\' cellpadding=\'10\' width=\'100%\' height=\'100%\' align=\'center\' class=\'row1\'>\n<tr>\n   <td class=\'pagetitle\' align=\'left\'>{$ibforums->lang[\'fu_title\']}<hr noshade></td>\n</tr>\n<tr>\n   <td align=\'center\' valign=\'middle\'><b>{$ibforums->lang[\'fu_enter_name\']}</b><br /><br /><input type=\'text\' size=\'40\' name=\'username\' class=\'forminput\'><br /><br /><input type=\'submit\' value=\'{$ibforums->lang[\'fu_search_but\']}\'></td>\n</tr>\n<tr>\n   <td align=\'center\' style=\'font-size:12px;font-weight:bold\'><a href=\'javascript:window.close();\'>{$ibforums->lang[\'fu_close_win\']}</a></td>\n</tr>\n</table>\n</form>', 'find_user_one', '$entry="", $name="", $sep="comma"', 1035406235, 0);||~&~||(1, 'skin_legends', '<form name=\'finduser\' method=\'post\' action=\'{$ibforums->base_url}entry=$entry&amp;name=$name&amp;sep=$sep&amp;CODE=finduser_two\'>\n<table cellspacing=\'1\' cellpadding=\'10\' width=\'100%\' height=\'100%\' align=\'center\' class=\'row1\'>\n<tr>\n   <td class=\'pagetitle\' align=\'left\'>{$ibforums->lang[\'fu_error\']}<hr noshade></td>\n</tr>\n<tr>\n   <td align=\'center\' valign=\'middle\'>$msg</td>\n</tr>\n<tr>\n   <td align=\'center\' style=\'font-size:12px;font-weight:bold\'><a href=\'javascript:history.go(-1);\'>{$ibforums->lang[\'fu_back\']}</a> :: <a href=\'javascript:window.close();\'>{$ibforums->lang[\'fu_close_win\']}</a></td>\n</tr>\n</table>\n</form>', 'find_user_error', '$msg', 1035406235, 0);||~&~||(1, 'skin_legends', '<script language=\'javascript\'>\n<!--\n	function add_to_form()\n	{\n		\n		var separator = \'$sep\';\n		var entry     = \'$entry\';\n		\n		var name = document.finduser.username.options[document.finduser.username.selectedIndex].value;\n		\n		if (separator == \'line\')\n		{\n			separator = \'\\\\n\';\n		}\n		\n		if (entry == \'textarea\')\n		{\n			// Where shall we put the separator?\n			\n			var tbox     = opener.document.REPLIER.$name.value;\n			var tboxSize = opener.document.REPLIER.$name.value.length;\n			\n			// Remove leading spaces...\n			\n			while ( opener.document.REPLIER.$name.value.slice(0,1) == " " )\n			{\n				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(1, opener.document.REPLIER.$name.value.length - 1);\n				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;\n			}\n			\n			// Remove trailing spaces...\n			\n			while ( opener.document.REPLIER.$name.value.slice(opener.document.REPLIER.$name.value.length - 1, opener.document.REPLIER.$name.value.length) == " " )\n			{\n				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(0, opener.document.REPLIER.$name.value.length - 1);\n				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;\n			}\n			\n			// Do we have a leading comma?\n			\n			while ( opener.document.REPLIER.$name.value.slice(0,1) == "\\\\n" )\n			{\n				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(1, opener.document.REPLIER.$name.value.length - 1);\n				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;\n			}\n			\n			// Do we have a trailing comma?...\n			\n			while ( opener.document.REPLIER.$name.value.slice(opener.document.REPLIER.$name.value.length - 1, opener.document.REPLIER.$name.value.length) == "\\\\n" )\n			{\n				opener.document.REPLIER.$name.value = opener.document.REPLIER.$name.value.substr(0, opener.document.REPLIER.$name.value.length - 1);\n				opener.document.REPLIER.$name.value.length = opener.document.REPLIER.$name.value.length;\n			}\n			\n			// First in box?\n			\n			if ( opener.document.REPLIER.$name.value.length == 0)\n			{\n				opener.document.REPLIER.$name.value += name;\n			}\n			else\n			{\n				opener.document.REPLIER.$name.value += separator + name;\n			}\n		}\n		\n	}\n//-->\n</script>\n<form name=\'finduser\'>\n<table cellspacing=\'1\' cellpadding=\'10\' width=\'100%\' height=\'100%\' align=\'center\' class=\'row1\'>\n<tr>\n   <td class=\'pagetitle\' align=\'left\'>{$ibforums->lang[\'fu_title\']}<hr noshade></td>\n</tr>\n<tr>\n   <td align=\'center\' valign=\'middle\'>{$ibforums->lang[\'fu_add_desc\']}<br /><br /><select name=\'username\' class=\'forminput\'>$names</select><br /><br /><input type=\'button\' name=\'add\' onClick=\'add_to_form()\' value=\'{$ibforums->lang[\'fu_add_mem\']}\'></td>\n</tr>\n<tr>\n   <td align=\'center\' style=\'font-size:12px;font-weight:bold\'><a href=\'javascript:history.go(-1);\'>{$ibforums->lang[\'fu_back\']}</a> :: <a href=\'javascript:window.close();\'>{$ibforums->lang[\'fu_close_win\']}</a></td>\n</tr>\n</table>\n</form>', 'find_user_final', '$names="",$entry="", $name="", $sep="line"', 1035406235, 0);||~&~||(1, 'skin_legends', '<script language=\'javascript\'>\n<!--\n	function add_smilie(code)\n	{\n		opener.document.REPLIER.Post.value += \' \' + code + \' \';\n		//return true;\n	}\n//-->\n</script>', 'emoticon_javascript', '', 1035406235, 0);||~&~||(1, 'skin_legends', '<div style=\'padding:6px\'>{$ibforums->lang[\'bbc_intro\']}</div>\n<br />', 'bbcode_header', '', 1035406235, 0);||~&~||(1, 'skin_legends', '<span style=\'color:#F00;font-weight:bold;\'>$tag</span>', 'wrap_tag', '$tag', 1035406235, 0);||~&~||(1, 'skin_legends', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>$title</div>\n  <table class=\'tablebasic\' cellspacing=\'1\' cellpadding=\'4\'>\n  <tr>\n	 <td width=\'50%\' align=\'center\' class=\'pformstrip\' valign=\'middle\'>$row1</td>\n	 <td width=\'50%\' align=\'center\' class=\'pformstrip\' valign=\'middle\'>$row2</td>\n  </tr>', 'page_header', '$title, $row1, $row2', 1035406235, 0);||~&~||(1, 'skin_legends', '<tr>\n	  <td align=\'center\' class=\'row1\' valign=\'middle\'><a href={$out}javascript:add_smilie({$in}$code{$in}){$out}>$code</a></td>\n	  <td align=\'center\' class=\'row2\' valign=\'middle\'><a href={$out}javascript:add_smilie({$in}$code{$in}){$out}><img src=\'{$ibforums->vars[\'EMOTICONS_URL\']}/$image\' border=\'0\' valign=\'absmiddle\' alt=\'$image\'></a></td>\n   </tr>', 'emoticons_row', '$code, $image, $in="\'", $out="\'"', 1035406235, 0);||~&~||(1, 'skin_legends', '<tr>\n	  <td align=\'left\' class=\'row1\' valign=\'middle\'>$before</td>\n	  <td align=\'left\' class=\'row2\' valign=\'middle\'>$after</td>\n   </tr>', 'bbcode_row', '$before, $after', 1035406235, 0);||~&~||(1, 'skin_legends', '</table>\n</div>', 'page_footer', '', 1035406235, 0);||~&~||(1, 'skin_login', '<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'errors_found\']}</div>\n  <div class="tablepad"><span class=\'postcolor\'>$data</span></div>\n</div>\n<br />', 'errors', '$data', 1035406235, 0);||~&~||(1, 'skin_login', '<script language=\'JavaScript\' type="text/javascript">\n<!--\nfunction ValidateForm() {\n	var Check = 0;\n	if (document.LOGIN.UserName.value == \'\') { Check = 1; }\n	if (document.LOGIN.PassWord.value == \'\') { Check = 1; }\n	if (Check == 1) {\n		alert("{$ibforums->lang[\'blank_fields\']}");\n		return false;\n	} else {\n		document.LOGIN.submit.disabled = true;\n		return true;\n	}\n}\n//-->\n</script>     \n{$ibforums->lang[\'login_text\']}\n<br />\n<br />\n<b>{$ibforums->lang[\'forgot_pass\']} <a href=\'{$ibforums->vars[\'board_url\']}/index.{$ibforums->vars[\'php_ext\']}?act=Reg&amp;CODE=10\'>{$ibforums->lang[\'pass_link\']}</a></b>\n<br />\n<br />\n<form action="{$ibforums->base_url}act=Login&amp;CODE=01" method="post" name=\'LOGIN\' onsubmit=\'return ValidateForm()\'>\n<input type=\'hidden\' name=\'referer\' value="$referer" />\n<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'log_in\']}</div>\n  <div class=\'pformstrip\'>$message</div>\n  <table class="tablebasic" cellspacing="1">\n  <tr>\n    <td class=\'pformleftw\'>{$ibforums->lang[\'enter_name\']}</td>\n    <td class=\'pformright\'><input type=\'text\' size=\'20\' maxlength=\'64\' name=\'UserName\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n    <td class=\'pformleftw\'>{$ibforums->lang[\'enter_pass\']}</td>\n    <td class=\'pformright\'><input type=\'password\' size=\'20\' name=\'PassWord\' class=\'forminput\' /></td>\n  </tr>\n  </table>\n  <div class="pformstrip">{$ibforums->lang[\'options\']}</div>		\n  <table class="tablebasic" cellspacing="1">\n  <tr>\n    <td class=\'pformleftw\'>{$ibforums->lang[\'cookies\']}</td>\n    <td class=\'pformright\'><input type="radio" name="CookieDate" value="1" checked="checked" />{$ibforums->lang[\'cookie_yes\']}<br /><input type="radio" name="CookieDate" value="0" />{$ibforums->lang[\'cookie_no\']}</td>\n  </tr>\n  <tr>\n    <td class=\'pformleftw\'>{$ibforums->lang[\'privacy\']}</td>\n    <td class=\'pformright\'><input type="checkbox" name="Privacy" value="1" />{$ibforums->lang[\'anon_name\']}</td>\n  </tr>\n  </table>		\n  <div class="pformstrip" align="center"><input type="submit" name=\'submit\' value="{$ibforums->lang[\'log_in_submit\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'ShowForm', '$message, $referer=""', 1035406235, 0);||~&~||(1, 'skin_mlist', '<script language=\'Javascript\' type=\'text/javascript\'>\n<!--\nfunction PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\n	if (posleft != 0) { x = posleft }\n	if (postop  != 0) { y = postop  }\n	if (!scroll) { scroll = 1 }\n	if (!resize) { resize = 1 }\n	if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n	  X = (screen.width  - width ) / 2;\n	  Y = (screen.height - height) / 2;\n	}\n	if (scroll != 0) { scroll = 1 }\n	var Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n }\n//-->\n</script>\n<form action=\'{$ibforums->base_url}\' method=\'post\'>\n<input type=\'hidden\' name=\'act\' value=\'Members\' />\n<input type=\'hidden\' name=\'s\'   value=\'{$ibforums->session_id}\' />\n<div align="left">{$links[SHOW_PAGES]}</div>\n<br />\n<div class=\'tableborder\'>\n <div class="maintitle">{$ibforums->lang[\'page_title\']}</div>\n <table width="100%" border="0" cellspacing="1" cellpadding="4">\n  <tr>\n	<th class=\'pformstrip\' width="30%">{$ibforums->lang[\'member_name\']}</th>\n	<th class=\'pformstrip\' align="center" width="10%">{$ibforums->lang[\'member_level\']}</th>\n	<th class=\'pformstrip\' align="center" width="10%">{$ibforums->lang[\'member_group\']}</th>\n	<th class=\'pformstrip\' align="center" width="20%">{$ibforums->lang[\'member_joined\']}</th>\n	<th class=\'pformstrip\' align="center" width="10%">{$ibforums->lang[\'member_posts\']}</th>\n	<th class=\'pformstrip\' align="center">{$ibforums->lang[\'member_email\']}</th>\n	<th class=\'pformstrip\' align="center">{$ibforums->lang[\'member_aol\']}</th>\n	<th class=\'pformstrip\' align="center">{$ibforums->lang[\'member_icq\']}</th>\n	<th class=\'pformstrip\' width="5%" align="center">{$ibforums->lang[\'member_photo\']}</th>\n	\n  </tr>', 'Page_header', '$links', 1035406235, 0);||~&~||(1, 'skin_mlist', '<br />\n<div align="left">{$links[SHOW_PAGES]}</div>', 'end', '$links', 1035406235, 0);||~&~||(1, 'skin_mlist', 'No results', 'no_results', '', 1035406235, 0);||~&~||(1, 'skin_mlist', '<!-- nothing here -->', 'start', '', 1035406235, 0);||~&~||(1, 'skin_mlist', '<!-- End content Table -->\n  <tr> \n    <td class=\'row3\' colspan="9" align=\'center\' valign=\'middle\'>\n      <strong>{$ibforums->lang[\'photo_only\']}&nbsp;<input type="checkbox" value="1" name="photoonly" class="forminput" $checked /></strong>\n    </td>\n  </tr>\n  <tr> \n    <td class=\'pformstrip\' colspan="9" align=\'center\' valign=\'middle\'>\n      <select class=\'forminput\' name=\'name_box\'>\n	 <option value=\'begins\'>{$ibforums->lang[\'ch_begins\']}</option>\n	 <option value=\'contains\'>{$ibforums->lang[\'ch_contains\']}</option>\n	 <option value=\'all\' selected="selected">{$ibforums->lang[\'ch_all\']}</option>\n	 </select>&nbsp;&nbsp;<input class=\'forminput\' type=\'text\' size=\'25\' name=\'name\' value=\'{$ibforums->input[\'name\']}\' />\n    </td>\n  </tr>\n  <tr>\n   <td class=\'darkrow1\' colspan="9" align=\'center\' valign=\'middle\'>\n     {$ibforums->lang[\'sorting_text\']}&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'sort_submit\']}\' class=\'forminput\' />\n   </td>\n </tr>\n</table>\n</div>\n</form>', 'Page_end', '$checked=""', 1035406235, 0);||~&~||(1, 'skin_mlist', '<!-- Entry for {$member[MEMBER_NAME]} -->\n  <tr>\n	 <td class=\'row4\'><strong><a href="{$ibforums->base_url}showuser={$member[\'id\']}">{$member[\'name\']}</a></strong></td>\n	 <td class=\'row4\'>{$member[\'pips\']}</td>\n	 <td class=\'row2\' align="center" width="20%">{$member[\'group\']}</td>\n	 <td class=\'row4\' align="center" width="20%">{$member[\'joined\']}</td>\n	 <td class=\'row4\' align="center" width="10%">{$member[\'posts\']}</td>\n	 <td class=\'row2\' align="center">{$member[\'member_email\']}</td>\n	 <td class=\'row2\' align="center">{$member[\'aim_name\']}</td>\n	 <td class=\'row2\' align="center">{$member[\'icq_number\']}</td>\n	 <td class=\'row2\' align="center">{$member[\'camera\']}</td>\n  </tr>\n  <!-- End of Entry -->', 'show_row', '$member', 1035406235, 0);||~&~||(1, 'skin_mod', '<table cellspacing=\'0\' cellpadding=\'0\' width=\'100%\' border=\'0\'>\n<tr>\n <td align=\'left\'><span id=\'phototitle\'>$name</span></td>\n <td align=\'right\'>$links</td>\n</tr>\n</table>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'w_v_title\']}: <a href=\'{$ibforums->base_url}showuser=$id\'>$name</a></div>\n</div>\n <table cellspacing=\'1\' width=\'100%\' cellpadding=\'6\' class=\'plainborder\'>\n <tr>\n  <th class=\'pformstrip\' width=\'30%\'>{$ibforums->lang[\'w_v_warnby\']}</th>\n  <th class=\'pformstrip\' width=\'70%\'>{$ibforums->lang[\'w_v_notes\']}</th>\n </tr>', 'warn_view_header', '$id, $name, $links', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n    <td class=\'row4\' valign=\'top\'><strong>$puni_name</strong></td>\n    <td class=\'row4\' valign=\'top\'>{$ibforums->lang[\'w_v_warned_on\']} <strong>$date</strong></td>\n  </tr>\n  <tr>\n    <td class=\'row1\' valign=\'middle\'><span class=\'warngood\'>{$ibforums->lang[\'w_v_minus\']}</span></td>\n    <td class=\'row1\' valign=\'top\'><span class=\'postcolor\'>$content</span></td>\n  </tr>', 'warn_view_positive_row', '$date, $content, $puni_name', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n    <td class=\'row4\' valign=\'top\'><strong>$puni_name</strong></td>\n    <td class=\'row4\' valign=\'top\'>{$ibforums->lang[\'w_v_warned_on\']} <strong>$date</strong></td>\n  </tr>\n  <tr>\n    <td class=\'row1\' valign=\'middle\'><span class=\'warnbad\'>{$ibforums->lang[\'w_v_add\']}</span></td>\n    <td class=\'row1\' valign=\'top\'><span class=\'postcolor\'>$content</span></td>\n  </tr>', 'warn_view_negative_row', '$date, $content, $puni_name', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n    <td class=\'row1\' colspan=\'2\' align=\'center\'><strong>{$ibforums->lang[\'w_v_none\']}</strong></td>\n  </tr>', 'warn_view_none', '', 1035406235, 0);||~&~||(1, 'skin_mod', '</table>', 'warn_view_footer', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'w_done_t\']}</div>\n <div class=\'pformstrip\'>&nbsp;</div>\n <div class=\'tablepad\'>\n  {$ibforums->lang[\'w_done_te\']}\n  <ul>\n   <li><a href=\'{$ibforums->base_url}\'>{$ibforums->lang[\'w_done_home\']}</a></li>\n   <!--IBF.FORUM_TOPIC-->\n  </ul>\n </div>\n</div>', 'warn_success', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<li><a href=\'{$ibforums->base_url}showforum=$fid\'>{$ibforums->lang[\'w_done_forum\']} <strong>$fname</strong></a></li>\n   <li><a href=\'{$ibforums->base_url}showtopic=$tid&amp;st=$st\'>{$ibforums->lang[\'w_done_topic\']} <strong>$tname</strong></a></li>', 'warn_success_forum', '$fid, $fname, $tid, $tname, $st=0', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'errors_found\']}</div>\n  <div class="tablepad"><span class=\'postcolor\'>$data</span></div>\n</div>\n<br />', 'warn_errors', '$data', 1035406235, 0);||~&~||(1, 'skin_mod', '<form method=\'post\' action=\'{$ibforums->base_url}&amp;act=warn&amp;CODE=dowarn&amp;mid=$mid&amp;t=$tid&amp;st=$st&amp;type={$ibforums->input[\'type\']}\'>\n<input type=\'hidden\' name=\'key\' value=\'$key\'>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'w_warnfor\']} <a href=\'{$ibforums->base_url}showuser=$mid\'>$name</a> ( $min &lt; $cur &gt; $max )</div>\n <div class=\'pformstrip\'>{$ibforums->lang[\'w_complete\']}</div>\n <table width=\'100%\' cellpadding=\'0\' border=\'0\' cellspacing=\'0\'>\n <tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[\'w_adjust_level\']}</strong></td>\n  <td class=\'pformright\'>\n    <input type=\'radio\' name=\'level\' id=\'add\' class=\'radiobutton\' value=\'add\' {$type[\'add\']} /><label for=\'add\' class=\'warnbad\'><strong>{$ibforums->lang[\'w_add\']}</strong></label>\n    <br />\n    <input type=\'radio\' name=\'level\' id=\'minus\' class=\'radiobutton\' value=\'remove\' {$type[\'minus\']} /><label for=\'minus\' class=\'warngood\'><strong>{$ibforums->lang[\'w_remove\']}</strong></label>\n </tr>', 'warn_header', '$mid, $name, $cur=0, $min = 0, $max=10, $key, $tid=\'\',$st=\'\', $type', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[\'w_modq\']}</strong></td>\n  <td class=\'pformright\'>\n    <input type=\'checkbox\' name=\'mod_indef\' class=\'forminput\' value=\'1\' $mod_tick> {$ibforums->lang[\'w_modq_i\']}\n    <br /><strong>{$ibforums->lang[\'w_orfor\']}</strong>\n    <input type=\'input\' name=\'mod_value\' class=\'forminput\' value=\'{$mod_array[\'timespan\']}\' size=\'5\'> <select name=\'mod_unit\' class=\'forminput\'><option value=\'d\' {$mod_array[\'days\']}>{$ibforums->lang[\'w_day\']}</option><option value=\'h\' {$mod_array[\'hours\']}>{$ibforums->lang[\'w_hour\']}</option></select>\n 	$mod_extra\n </tr>', 'warn_mod_posts', '$mod_tick, $mod_array, $mod_extra', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[\'w_resposts\']}</strong></td>\n  <td class=\'pformright\'>\n    <input type=\'checkbox\' name=\'post_indef\' class=\'forminput\' value=\'1\' $post_tick> {$ibforums->lang[\'w_resposts_i\']}\n    <br /><strong>{$ibforums->lang[\'w_orfor\']}</strong>\n    <input type=\'input\' name=\'post_value\' class=\'forminput\' value=\'{$post_array[\'timespan\']}\' size=\'5\'> <select name=\'post_unit\' class=\'forminput\'><option value=\'d\' {$post_array[\'days\']}>{$ibforums->lang[\'w_day\']}</option><option value=\'h\' {$post_array[\'hours\']}>{$ibforums->lang[\'w_hour\']}</option></select>\n 	$post_extra\n </tr>', 'warn_rem_posts', '$post_tick, $post_array, $post_extra', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[\'w_suspend\']}</strong></td>\n  <td class=\'pformright\'>\n     {$ibforums->lang[\'w_susfor\']}  <input type=\'input\' name=\'susp_value\' class=\'forminput\' value=\'{$susp_array[\'timespan\']}\' size=\'5\'> <select name=\'susp_unit\' class=\'forminput\'><option value=\'d\' {$susp_array[\'days\']}>{$ibforums->lang[\'w_day\']}</option><option value=\'h\' {$susp_array[\'hours\']}>{$ibforums->lang[\'w_hour\']}</option></select>\n 	  $susp_extra\n </tr>', 'warn_suspend', '$susp_array, $susp_extra', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n   <td class=\'pformleftw\' valign=\'top\'><strong>{$ibforums->lang[\'w_reason\']}</strong><br />{$ibforums->lang[\'w_reason2\']}</td>\n   <td class=\'pformright\'><textarea rows=\'6\' cols=\'70\' class=\'textinput\' name=\'reason\'>{$ibforums->input[\'reason\']}</textarea></td>\n  </tr>\n  <tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[\'w_c_subj\']}</strong></td>\n  <td class=\'pformright\'><input type=\'input\' name=\'subject\' class=\'forminput\' value=\'{$ibforums->input[\'subject\']}\' size=\'30\'></td>\n </tr>\n  <tr>\n   <td class=\'pformleftw\' valign=\'top\'><strong>{$ibforums->lang[\'w_contact\']}</strong><br />{$ibforums->lang[\'w_contact2\']}</td>\n   <td class=\'pformright\'>\n   	  {$ibforums->lang[\'w_c\']}&nbsp;<select name=\'contactmethod\' class=\'forminput\'><option value=\'pm\'>{$ibforums->lang[\'w_c_p\']}</option><option value=\'email\'>{$ibforums->lang[\'w_c_e\']}</option></select>\n     <br /><textarea rows=\'6\' cols=\'70\' class=\'textinput\' name=\'contact\'>{$ibforums->input[\'contact\']}</textarea>\n   </td>\n  </tr>\n  </table>\n  <div align=\'center\' class=\'pformstrip\'><input type=\'submit\' class=\'forminput\' value=\'{$ibforums->lang[\'w_submit\']}\' /></div>\n</div>\n</form>', 'warn_footer', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<br /><strong>{$ibforums->lang[\'w_restricted\']}</strong>', 'warn_restricition_in_place', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'pformstrip\'>$words</div>', 'mod_exp', '$words', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'pformstrip\' align=\'center\'><input type="submit" name="submit" value="$action" class=\'forminput\' /></div>\n</div>\n</form>', 'end_form', '$action', 1035406235, 0);||~&~||(1, 'skin_mod', '<table width=\'100%\' cellspacing=\'1\'>\n  <tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[move_from]} <b>$forum_name</b> {$ibforums->lang[to]}</strong></td>\n  <td class=\'pformright\'><select name=\'move_id\' class=\'forminput\'>$jhtml</select></td>\n  </tr>\n  <tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[\'leave_link\']}</strong></td>\n  <td class=\'pformright\'><select name=\'leave\' class=\'forminput\'><option value=\'y\' selected="selected">{$ibforums->lang[\'yes\']}</option><option value=\'n\'>{$ibforums->lang[\'no\']}</option></select></td>\n  </tr>\n  </table>', 'move_form', '$jhtml, $forum_name', 1035406235, 0);||~&~||(1, 'skin_mod', '<script language=\'JavaScript\' type=\'text/javascript\'>\n  <!--\n  function ValidateForm() {\n	 document.REPLIER.submit.disabled = true;\n	 return true;\n  }\n  //-->\n  </script>', 'delete_js', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<table width=\'100%\' cellspacing=\'1\'>\n  <tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[edit_f_title]}</strong></td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'50\' name=\'TopicTitle\' value=\'$title\' /></td>\n  </tr>\n  <tr>\n  <td class=\'pformleftw\'><strong>{$ibforums->lang[edit_f_desc]}</strong></td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'40\' name=\'TopicDesc\' value=\'$desc\' /></td>\n  </tr>\n  </table>', 'topictitle_fields', '$title, $desc', 1035406235, 0);||~&~||(1, 'skin_mod', '<table width=\'100%\' cellpadding=\'6\' border=\'0\' cellspacing=\'0\'>', 'poll_edit_top', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n				<td class=\'row1\'><b>{$ibforums->lang[\'pe_option\']} $id</b></td>\n                <td class=\'row1\'><input type=\'text\' size=\'60\' maxlength=\'250\' name=\'POLL_$id\' value=\'$entry\'></td>\n                </tr>', 'poll_entry', '$id, $entry', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n				<td class=\'row1\'><b>{$ibforums->lang[\'pe_option\']} $id</b> <em>( {$ibforums->lang[\'pe_unused\']} )</em></td>\n                <td class=\'row1\'><input type=\'text\' size=\'60\' maxlength=\'250\' name=\'POLL_$id\' value=\'\'></td>\n                </tr>', 'poll_edit_new_entry', '$id', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n	   <td class=\'row1\'><b>{$ibforums->lang[\'pe_question\']}</b></td>\n	   <td class=\'row1\'><input type=\'text\' size=\'60\' maxlength=\'250\' name=\'poll_question\' value=\'$poll_question\'></td>\n	   </tr>\n	   <tr>\n	   <td class=\'row1\'><b>{$ibforums->lang[\'pe_pollonly\']}</b></td>\n	   <td class=\'row1\'><select name=\'pollonly\' class=\'forminput\'><option value=\'0\'>{$ibforums->lang[\'pe_no\']}</option><option value=\'1\'>{$ibforums->lang[\'pe_yes\']}</option></select></td>\n	   </tr>\n	   </table>', 'poll_select_form', '$poll_question=""', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'tableborder\'>\n <div class=\'maintitle\'>$posting_title</div>', 'table_top', '$posting_title', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'th_title\']}</div>\n   <table cellspacing=\'1\' width=\'100%\'>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_topic\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_topic\']}</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_desc\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_desc\']}&nbsp;</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_start_date\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_start_date\']}</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_start_name\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_start_name\']}</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_last_date\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_last_date\']}</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_last_name\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_last_name\']}</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'th_avg_post\']}</b></td>\n	<td class=\'pformright\'>{$data[\'th_avg_post\']}</td>\n   </tr>\n   </table>\n</div>', 'topic_history', '$data', 1035406235, 0);||~&~||(1, 'skin_mod', '<br />\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'ml_title\']}</div>\n  <table cellspacing=\'1\' width=\'100%\'>\n  <tr>\n   <td class=\'pformstrip\' width=\'30%\'><b>{$ibforums->lang[\'ml_name\']}</b></td>\n   <td class=\'pformstrip\' width=\'50%\'><b>{$ibforums->lang[\'ml_desc\']}</b></td>\n   <td class=\'pformstrip\' width=\'20%\'><b>{$ibforums->lang[\'ml_date\']}</b></td>\n  </tr>', 'mod_log_start', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n	<td class=\'pformright\' colspan=\'3\' align=\'center\'><i>{$ibforums->lang[\'ml_none\']}</i></td>\n   </tr>', 'mod_log_none', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<tr>\n	<td class=\'pformright\'>{$data[\'member\']}</td>\n	<td class=\'pformright\'>{$data[\'action\']}</td>\n	<td class=\'pformright\'>{$data[\'date\']}</td>\n   </tr>', 'mod_log_row', '$data', 1035406235, 0);||~&~||(1, 'skin_mod', '</table>\n</div>', 'mod_log_end', '', 1035406235, 0);||~&~||(1, 'skin_mod', '<br />\n<div align=\'right\'>{$data}</div>\n<br />', 'forum_jump', '$data, $menu_extra=""', 1035406235, 0);||~&~||(1, 'skin_mod', '<table cellspacing=\'1\' width=\'100%\'>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'mt_new_title\']}</b></td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\'  class=\'forminput\' maxlength=\'100\' name=\'title\' value=\'\' /></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'mt_new_desc\']}</b></td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\'  class=\'forminput\' maxlength=\'100\' name=\'desc\' value=\'\' /></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'st_forum\']}</b></td>\n	<td class=\'pformright\'><select name=\'fid\' class=\'forminput\'>$jump</select></td>\n   </tr>\n  </table>\n</div>\n<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'st_post\']}</div>', 'split_body', '$jump=""', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'pformstrip\'>{$row[\'st_top_bit\']}</div>\n  <div class=\'tablepad\'>\n   {$row[\'post\']}\n   <div align=\'right\'><b>{$ibforums->lang[\'st_split\']}</b>&nbsp;&nbsp;<input type=\'checkbox\' name=\'post_{$row[\'pid\']}\' value=\'1\' /></div>\n </div>', 'split_row', '$row', 1035406235, 0);||~&~||(1, 'skin_mod', '<div class=\'pformstrip\' align=\'center\'> <input type="submit" name="submit" value="$action" class=\'forminput\' /></div>\n</div>\n</form>', 'split_end_form', '$action', 1035406235, 0);||~&~||(1, 'skin_mod', '<table cellspacing=\'1\' width=\'100%\'>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'mt_new_title\']}</b></td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'50\' name=\'title\' value=\'$title\' /></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'mt_new_desc\']}</b></td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'40\' name=\'desc\' value=\'$desc\' /></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><b>{$ibforums->lang[\'mt_tid\']}</b></td>\n	<td class=\'pformright\'><input type=\'text\' size=\'50\' name=\'topic_url\' value=\'\' /></td>\n   </tr>\n  </table>', 'merge_body', '$title="", $desc=""', 1035406235, 0);||~&~||(1, 'skin_modcp', '<option value=\'-1\'>------------------------------</option>\n<option value=\'-1\'>{$ibforums->lang[\'mm_title\']}</option>\n<option value=\'-1\'>------------------------------</option>', 'mm_start', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<option value=\'t_{$id}\'>--  $title</option>', 'mm_entry', '$id, $title', 1035406235, 0);||~&~||(1, 'skin_modcp', '', 'mm_end', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'tableborder\'>\n <div align=\'center\' class=\'pformstrip\'>\n  <a href=\'{$ibforums->base_url}act=modcp&amp;CODE=showforums\'>{$ibforums->lang[\'menu_forums\']}</a> &middot;\n  <a href=\'{$ibforums->base_url}act=modcp&amp;CODE=members\'>{$ibforums->lang[\'menu_users\']}</a> &middot;\n  <a href=\'{$ibforums->base_url}act=modcp&amp;CODE=ip\'>{$ibforums->lang[\'menu_ip\']}</a>\n </div>\n</div>\n<br />', 'mod_cp_start', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form name=\'ibform\' action=\'{$ibforums->base_url}\' method=\'POST\'>\n<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\'>\n<input type=\'hidden\' name=\'act\' value=\'modcp\'>\n<input type=\'hidden\' name=\'CODE\' value=\'domodposts\'>\n<input type=\'hidden\' name=\'f\' value=\'{$fid}\'>\n<input type=\'hidden\' name=\'tid\' value=\'{$tid}\'>\n<strong>{$ibforums->lang[\'cp_mod_posts_title2\']} $forumname</strong>\n<br />$pages\n\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>$title</div>', 'modtopicview_start', '$tid,$forumname, $fid, $title', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cp_mod_posts_title2\']} $forumname</div>\n  <table width=\'100%\' cellpadding=\'4\' cellspacing=\'1\'>\n  <tr>\n	<th class=\'pformstrip\' width=\'40%\' align=\'left\'>{$ibforums->lang[\'cp_3_title\']}</th>\n	<th class=\'pformstrip\' width=\'20%\' align=\'center\'>{$ibforums->lang[\'cp_3_replies\']}</th>\n	<th class=\'pformstrip\' width=\'20%\' align=\'center\'>{$ibforums->lang[\'cp_3_approveall\']}</th>\n	<th class=\'pformstrip\' width=\'20%\' align=\'center\'>{$ibforums->lang[\'cp_3_viewall\']}</th>\n  </tr>', 'modpost_topicstart', '$forumname, $fid', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n	 <td class=\'row1\' width=\'40%\' align=\'left\'><b><a href=\'{$ibforums->base_url}act=ST&amp;f=$fid&amp;t=$tid\' target=\'_blank\'>$title</a></b></td>\n	 <td class=\'row1\' width=\'20%\' align=\'center\'>$replies</td>\n	 <td class=\'row1\' width=\'20%\' align=\'center\'><a href=\'{$ibforums->base_url}act=modcp&amp;f=$fid&amp;tid=$tid&amp;CODE=modtopicapprove\'>{$ibforums->lang[\'cp_3_approveall\']}</a></td>\n	 <td class=\'row1\' width=\'20%\' align=\'center\'><a href=\'{$ibforums->base_url}act=modcp&amp;f=$fid&amp;tid=$tid&amp;CODE=modtopicview\'>{$ibforums->lang[\'cp_3_viewall\']}</a></td>\n   </tr>', 'modpost_topicentry', '$title, $tid, $replies, $fid', 1035406235, 0);||~&~||(1, 'skin_modcp', '</table>\n</div>', 'modpost_topicend', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form name=\'ibform\' action=\'{$ibforums->base_url}\' method=\'POST\'>\n<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\'>\n<input type=\'hidden\' name=\'act\' value=\'modcp\'>\n<input type=\'hidden\' name=\'CODE\' value=\'domodtopics\'>\n<input type=\'hidden\' name=\'f\' value=\'{$fid}\'>\n<strong>{$ibforums->lang[\'cp_mod_topics_title2\']} $forumname</strong>\n<br />$pages', 'modtopics_start', '$pages,$forumname, $fid', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'tableborder\'>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'cp_1_go\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'modtopics_end', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'tableborder\'>\n  <div class=\'titlemedium\'><select name=\'TID_$topic_id\' class=\'forminput\'><option value=\'approve\'>{$ibforums->lang[\'cp_1_approve\']}</option><option value=\'remove\'>{$ibforums->lang[\'cp_1_remove\']}</option><option value=\'leave\'>{$ibforums->lang[\'cp_1_leave\']}</option></select>&nbsp;&nbsp; $title</div>', 'mod_topic_title', '$title, $topic_id', 1035406235, 0);||~&~||(1, 'skin_modcp', '<table width=\'100%\' cellspacing=\'1\'>	\n   <tr>\n	   <td valign=\'top\' class=\'row1\' nowrap="nowrap"><span class=\'normalname\'>{$data[\'member\'][\'name\']}</span><br /><br />{$data[\'member\'][\'avatar\']}<span class=\'postdetails\'><br />{$data[\'member\'][\'MEMBER_GROUP\']}<br />{$data[\'member\'][\'MEMBER_POSTS\']}<br />{$data[\'member\'][\'MEMBER_JOINED\']}</span></td>\n	   <td valign=\'top\' class=\'row1\' width=\'100%\'>\n		   <b>{$ibforums->lang[\'posted_on\']} {$data[\'msg\'][\'post_date\']}</b><br /><br />\n		   <span class=\'postcolor\'>\n			{$data[\'msg\'][\'post\']}\n		   </span>\n	   </td>\n	</tr>\n	</table>', 'mod_postentry', '$data', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'pformstrip\' align=\'right\'><select name=\'PID_$pid\' class=\'forminput\'><option value=\'approve\'>{$ibforums->lang[\'cp_1_approve\']}</option><option value=\'remove\'>{$ibforums->lang[\'cp_1_remove\']}</option><option value=\'leave\'>{$ibforums->lang[\'cp_1_leave\']}</option></select>&nbsp;&nbsp;{$ibforums->lang[\'cp_3_postno\']}&nbsp;$pid</div>', 'mod_postentry_checkbox', '$pid', 1035406235, 0);||~&~||(1, 'skin_modcp', '</div>\n<br />', 'mod_topic_spacer', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n  <td colspan=\'2\'>\n    <table cellpadding=\'2\' cellspacing=\'1\' border=\'0\' width=\'100%\' class=\'fancyborder\' align=\'center\'>\n     <tr>\n       <td><span class=\'pagetitle\'>{$ibforums->lang[\'cp_results\']}</span>\n       </td>\n     </tr>\n	  <tr>\n	    <td colspan=\'2\'><b>$text</b></td>\n	  </tr>\n	 </table>\n   </td>\n  </tr>', 'results', '$text', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'mpt_confirm\']}</div>\n  <div class=\'pformstrip\'>{$ibforums->lang[\'cp_check_result\']}</div>\n  <table width=\'100%\' cellspacing=\'0\'>\n   <tr>\n	<td class=\'pformleftw\'><strong>{$ibforums->lang[\'cp_total_topics\']}</strong></td>\n	<td class=\'pformright\'>$tcount</td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'><span style=\'color:red;font-weight:bold;\'>{$ibforums->lang[\'cp_total_match\']}</span></td>\n	<td class=\'pformright\'><span style=\'color:red;font-weight:bold;\'>$count</span></td>\n   </tr>\n   </table>\n   <form action=\'{$ibforums->base_url}$link\' method=\'post\'>\n   <input type=\'hidden\' name=\'key\' value=\'$key\' />\n   <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' class=\'forminput\' value=\'$link_text\' /></div>\n   </form>\n</div>\n<br />', 'prune_confirm', '$tcount, $count, $link, $link_text, $key', 1035406235, 0);||~&~||(1, 'skin_modcp', '<!-- IBF.CONFIRM -->\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cp_prune\']} {$forum[\'name\']}</div>\n  <div class=\'pformstrip\'>{$ibforums->lang[\'mpt_help\']}</div>\n  <div class=\'tablepad\'>{$ibforums->lang[\'cp_prune_text\']}</div>\n  <form name=\'ibform\' action=\'{$ibforums->base_url}\' method=\'POST\'>\n  <input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\'>\n  <input type=\'hidden\' name=\'act\' value=\'modcp\'>\n  <input type=\'hidden\' name=\'CODE\' value=\'prune\'>\n  <input type=\'hidden\' name=\'f\' value=\'{$forum[\'id\']}\'>\n  <input type=\'hidden\' name=\'check\' value=\'1\'>\n  <div class=\'pformstrip\'>{$ibforums->lang[\'mpt_title\']}</div>\n   <table width=\'100%\' cellspacing=\'0\'>\n   <tr>\n	<td class=\'pformleftw\'>{$ibforums->lang[\'cp_action\']}</td>\n	<td class=\'pformright\'><select name=\'df\' class=\'forminput\'>$forums</select></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'>{$ibforums->lang[\'cp_prune_days\']}</td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\' name=\'dateline\' value=\'{$ibforums->input[\'dateline\']}\' class=\'forminput\' /></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'>{$ibforums->lang[\'cp_prune_type\']}</td>\n	<td class=\'pformright\'>$select &nbsp; <input type=\'checkbox\' id=\'cbox\' name=\'ignore_pin\' value=\'1\' checked=\'checked\' class=\'checkbox\' />&nbsp;<label for=\'cbox\'>{$ibforums->lang[\'mps_ignorepin\']}</label></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'>{$ibforums->lang[\'cp_prune_replies\']}</td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\' name=\'posts\' value=\'{$ibforums->input[\'posts\']}\' class=\'forminput\' /></td>\n   </tr>\n   <tr>\n	<td class=\'pformleftw\'>{$ibforums->lang[\'cp_prune_member\']}</td>\n	<td class=\'pformright\'><input type=\'text\' size=\'40\' name=\'member\' value=\'{$ibforums->input[\'member\']}\' class=\'forminput\' /></td>\n   </tr>\n   </table>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'cp_prune_sub1\']}\' class=\'forminput\' /></div>\n  </form>\n</div>', 'prune_splash', '$forum, $forums, $select', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form name=\'ibform\' action=\'{$ibforums->base_url}act=modcp&amp;CODE=compedit&amp;memberid={$profile[\'id\']}\' method=\'post\'>\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cp_edit_user\']}: {$profile[\'name\']}</div>\n  <table class=\'tablebasic\'>\n  <tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'cp_remove_av\']}</td>\n   <td class=\'pformright\'><select name=\'avatar\' class=\'forminput\'><option value=\'0\'>{$ibforums->lang[\'no\']}</option><option value=\'1\'>{$ibforums->lang[\'yes\']}</option></select></td>\n  </tr>\n  <tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'cp_remove_photo\']}</td>\n   <td class=\'pformright\'><select name=\'photo\' class=\'forminput\'><option value=\'0\'>{$ibforums->lang[\'no\']}</option><option value=\'1\'>{$ibforums->lang[\'yes\']}</option></select></td>\n  </tr>\n  <tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'cp_edit_website\']}</td>\n   <td class=\'pformright\'><input type=\'text\' size=\'40\' name=\'website\' value=\'{$profile[\'website\']}\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'cp_edit_location\']}</td>\n   <td class=\'pformright\'><input type=\'text\' size=\'40\' name=\'location\' value=\'{$profile[\'location\']}\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'cp_edit_interests\']}</td>\n   <td class=\'pformright\'><textarea cols=\'50\' rows=\'3\' name=\'interests\' class=\'forminput\'>{$profile[\'interests\']}</textarea></td>\n  </tr>\n   <tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'cp_edit_signature\']}</td>\n   <td class=\'pformright\'><textarea cols=\'50\' rows=\'5\' name=\'signature\' class=\'forminput\'>{$profile[\'signature\']}</textarea></td>\n  </tr>\n  </table>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'cp_find_2_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'edit_user_form', '$profile', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form name=\'ibform\' action=\'{$ibforums->base_url}act=modcp&amp;CODE=doedituser\' method=\'post\'>\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cp_edit_user\']}</div>\n  <table class=\'tablebasic\' cellspacing="1" cellpadding="3">\n  <tr>\n   <td width=\'40%\' class=\'row1\'>{$ibforums->lang[\'cp_find_2_user\']}</td>\n   <td class=\'row1\'>$select</td>\n  </tr>\n  </table>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'cp_find_2_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'find_two', '$select', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form name=\'ibform\' action=\'{$ibforums->base_url}act=modcp&amp;CODE=dofinduser\' method=\'post\'>\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cp_edit_user\']}</div>\n  <table class=\'tablebasic\' cellspacing="1" cellpadding="3">\n  <tr>\n   <td width=\'40%\' class=\'row1\'>{$ibforums->lang[\'cp_find_user\']}</td>\n   <td class=\'row1\'><input type=\'text\' size=\'40\' name=\'name\' value=\'\' class=\'forminput\' /></td>\n  </tr>\n  </table>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'cp_find_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'find_user', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form name=\'ibform\' action=\'{$ibforums->base_url}\' method=\'post\'>\n<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\'>\n<input type=\'hidden\' name=\'act\' value=\'modcp\'>\n<input type=\'hidden\' name=\'CODE\' value=\'doip\'>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'menu_ip\']}</div>\n <table class=\'tablebasic\'>\n <tr>\n   <td width=\'40%\' class=\'row1\'>{$ibforums->lang[\'ip_enter\']}</td>\n   <td class=\'row1\'>\n	 <input type=\'text\' size=\'20\' maxlength=\'24\' name=\'ip\' value=\'{$ip}\' class=\'forminput\' />\n	 <select name=\'iptool\' class=\'forminput\'>\n		 <option value=\'resolve\'>{$ibforums->lang[\'ip_resolve\']}</option>\n		 <option value=\'posts\'>{$ibforums->lang[\'ip_posts\']}</option>\n		 <option value=\'members\'>{$ibforums->lang[\'ip_members\']}</option>\n	 </select>\n   </td>\n  </tr>\n  </table>\n  <div class=\'pformstrip\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'ip_submit\']}\' class=\'forminput\' /></div>\n</div>\n</form>\n<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'iph_title\']}</div>\n <div class=\'tablepad\' style=\'line-height:150%\'>{$ibforums->lang[\'ip_desc_text\']}<br /><br />{$ibforums->lang[\'ip_warn_text\']}</div>\n</div>', 'ip_start_form', '$ip=""', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div align=\'left\'>$pages</div>\n<br />\n<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'ipm_title\']}</div>\n <table cellpadding=\'6\' class=\'tablebasic\'>\n <tr>\n  <th class=\'pformstrip\' width=\'20%\'>{$ibforums->lang[\'ipm_name\']}</th>\n  <th class=\'pformstrip\' width=\'20%\'>{$ibforums->lang[\'ipm_ip\']}</th>\n  <th class=\'pformstrip\' width=\'10%\'>{$ibforums->lang[\'ipm_posts\']}</th>\n  <th class=\'pformstrip\' width=\'20%\'>{$ibforums->lang[\'ipm_reg\']}</th>\n  <th class=\'pformstrip\' width=\'30%\'>{$ibforums->lang[\'ipm_options\']}</th>\n </tr>', 'ip_member_start', '$pages', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n	  <td class=\'row2\'>{$row[\'name\']}</td>\n	  <td class=\'row2\'>{$row[\'ip_address\']}</td>\n	  <td class=\'row2\'>{$row[\'posts\']}</td>\n	  <td class=\'row2\'>{$row[\'joined\']}</td>\n	  <td class=\'row2\' align=\'center\'><a href=\'{$ibforums->base_url}showuser={$row[\'id\']}\' target=\'_blank\'>{$ibforums->lang[\'ipm_view\']}</a>\n	  | <a href=\'{$ibforums->base_url}act=modcp&amp;CODE=doedituser&amp;memberid={$row[\'id\']}\'>{$ibforums->lang[\'ipm_edit\']}</a></td>\n	 </tr>', 'ip_member_row', '$row', 1035406235, 0);||~&~||(1, 'skin_modcp', '</table>\n</div>\n<br />\n<div align=\'left\'>$pages</div>', 'ip_member_end', '$pages', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n  <td class=\'pagetitle\'>{$ibforums->lang[\'cp_welcome\']}</td>\n </tr>\n <tr>\n  <td>{$ibforums->lang[\'cp_welcome_text\']}</td>\n </tr>\n <tr>\n  <td>\n    <table cellpadding=\'2\' cellspacing=\'1\' border=\'0\' width=\'75%\' class=\'fancyborder\' align=\'center\'>\n	  <tr>\n	    <td><b>{$ibforums->lang[\'cp_mod_in\']}</b></td>\n	    <td>$forum</td>\n	  </tr>\n	  <tr>\n	    <td><b>{$ibforums->lang[\'cp_topics_wait\']}</b></td>\n	    <td>$tcount</td>\n	  </tr>\n	  <tr>\n	    <td><b>{$ibforums->lang[\'cp_posts_wait\']}</b></td>\n	    <td>$pcount</td>\n	  </tr>\n	 </table>\n   </td>\n  </tr>', 'splash', '$tcount, $pcount, $forum', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n                <td class=\'row1\' colspan=\'2\'>$words</td>\n                </tr>', 'mod_exp', '$words', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n                <td class=\'row2\' align=\'center\' colspan=\'2\'>\n                <input type="submit" name="submit" value="$action" class=\'forminput\'>\n                </td></tr></table>\n                </td></tr></table>\n                </form>', 'end_form', '$action', 1035406235, 0);||~&~||(1, 'skin_modcp', '<!-- Forum {$info[\'id\']} entry -->\n  <tr>\n	<td class=\'row4\' align=\'center\' width=\'5%\'>{$info[\'folder_icon\']}</td>\n	<td class="row4" colspan=2><b><a href="{$ibforums->base_url}act=modcp&amp;CODE=showtopics&amp;f={$info[\'id\']}">{$info[\'name\']}</a></b><br /><span class=\'desc\'>{$info[\'description\']}</span><br />{$info[\'moderator\']}</td>\n	<td class="row2" align="center">{$info[\'q_topics\']}</td>\n	<td class="row2" align="center">{$info[\'q_posts\']}</td>\n	<td class="row2">{$info[\'last_post\']}<br />{$ibforums->lang[\'in\']}: {$info[\'last_topic\']}<br />{$ibforums->lang[\'by\']}: {$info[\'last_poster\']}</td>\n	<td class="row2" align="center">{$info[\'select_button\']}</td>        \n  </tr>\n<!-- End of Forum {$info[\'id\']} entry -->', 'forum_row', '$info', 1035406235, 0);||~&~||(1, 'skin_modcp', '<!-- Forum {$info[\'id\']} entry -->\n  <tr>\n	<td class=\'row4\' align=\'center\' width=\'5%\'>&nbsp;</td>\n	<td class=\'row4\' align=\'center\' width=\'5%\'>{$info[\'folder_icon\']}</td>\n	<td class="row2"><b><a href="{$ibforums->base_url}act=modcp&amp;CODE=showtopics&amp;f={$info[\'id\']}">{$info[\'name\']}</a></b><br /><span class=\'desc\'>{$info[\'description\']}</span><br />{$info[\'moderator\']}</td>\n	<td class="row2" align="center">{$info[\'q_topics\']}</td>\n	<td class="row2" align="center">{$info[\'q_posts\']}</td>\n	<td class="row2">{$info[\'last_post\']}<br />{$ibforums->lang[\'in\']}: {$info[\'last_topic\']}<br />{$ibforums->lang[\'by\']}: {$info[\'last_poster\']}</td>\n	<td class="row2" align="center"><input type=\'radio\' name=\'f\' value=\'{$info[\'id\']}\' /></td>        \n  </tr>\n<!-- End of Forum {$info[\'id\']} entry -->', 'subforum_row', '$info', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form action=\'{$ibforums->base_url}act=modcp&amp;CODE=fchoice\' method=\'post\'>\n<div class=\'tableborder\'>\n  <table class=\'tablebasic\' cellspacing="1" cellpadding="3">', 'forum_page_start', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n	<td colspan=\'7\' class=\'maintitle\'>$cat_name</td>\n  </tr>\n  <tr> \n	<th class=\'titlemedium\' align=\'left\' width=\'5%\'>&nbsp;</th>\n	<th width="35%" class=\'titlemedium\' colspan=\'2\'>{$ibforums->lang[\'cat_name\']}</th>\n	<th width="15%" class=\'titlemedium\'>{$ibforums->lang[\'f_q_topics\']}</th>\n	<th width="15%" class=\'titlemedium\'>{$ibforums->lang[\'f_q_posts\']}</th>\n	<th width="25%" class=\'titlemedium\'>{$ibforums->lang[\'last_post_info\']}</th>\n	<th width="5%"  class=\'titlemedium\'>{$ibforums->lang[\'f_select\']}</th>\n  </tr>', 'cat_row', '$cat_name', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n   <td colspan=\'7\' class=\'row2\' align=\'right\'><b>{$ibforums->lang[\'f_w_selected\']}</b>\n   <select class=\'forminput\' name=\'fact\'>\n   <option value=\'mod_topic\'>{$ibforums->lang[\'cp_mod_topics\']}</option>\n   <option value=\'mod_post\'>{$ibforums->lang[\'cp_mod_posts\']}</option>\n   <option value=\'prune_move\'>{$ibforums->lang[\'cp_prune_posts\']}</option>\n   </select>&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'f_go\']}\' class=\'forminput\' />\n   </td>\n  </tr>\n  </table>\n</div>\n</form>', 'forum_page_end', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>$title</div>\n  <div class=\'tablepad\'>$msg</div>\n</div>', 'mod_simple_page', '$title="",$msg=""', 1035406235, 0);||~&~||(1, 'skin_modcp', '{$ibforums->lang[\'ipp_found\']} $count\n<br />\n<br />\n<a target=\'_blank\' href=\'{$ibforums->base_url}act=Search&amp;CODE=show&amp;searchid=$uid&amp;search_in=posts&amp;result_type=posts\'>{$ibforums->lang[\'ipp_click\']}</a>', 'ip_post_results', '$uid="",$count=""', 1035406235, 0);||~&~||(1, 'skin_modcp', '<script language=\'javascript\'>\n<!--\n function checkdelete() {\n \n   isDelete = document.topic.tact.options[document.topic.tact.selectedIndex].value;\n   \n   msg = \'\';\n   \n   if (isDelete == \'delete\')\n   {\n	   msg = "{$ibforums->lang[\'cp_js_delete\']}";\n	   \n	   formCheck = confirm(msg);\n	   \n	   if (formCheck == true)\n	   {\n		   return true;\n	   }\n	   else\n	   {\n		   return false;\n	   }\n   }\n }\n//-->\n</script>\n<form action=\'{$ibforums->base_url}act=modcp&amp;f={$info[\'id\']}&amp;CODE=topicchoice\' method=\'post\' name=\'topic\' onsubmit=\'return checkdelete();\'>\n<div class=\'pagelinks\'>$pages</div>\n<div align=\'right\'>\n  <a href=\'{$ibforums->base_url}act=modcp&amp;fact=mod_topic&amp;CODE=fchoice&amp;f={$info[\'id\']}\'>{$ibforums->lang[\'cp_mod_topics\']}</a> &middot;\n  <a href=\'{$ibforums->base_url}act=modcp&amp;fact=mod_post&amp;CODE=fchoice&amp;f={$info[\'id\']}\'>{$ibforums->lang[\'cp_mod_posts\']}</a> &middot;\n  <a href=\'{$ibforums->base_url}act=modcp&amp;fact=prune_move&amp;CODE=fchoice&amp;f={$info[\'id\']}\'>{$ibforums->lang[\'cp_prune_posts\']}</a>\n</div>\n<br />\n<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$info[\'name\']} [ <a target=\'_blank\' href=\'{$ibforums->base_url}showforum={$info[\'id\']}\'>{$ibforums->lang[\'new_show_forum\']}</a> ]</div>\n  <table width=\'100%\' border=\'0\' cellspacing=\'1\' cellpadding=\'4\'>\n  <tr> \n	<td class=\'titlemedium\' style=\'width:5px\'>&nbsp;</td>\n	<td class=\'titlemedium\' style=\'width:5px\'>&nbsp;</td>\n	<td width=\'40%\' class=\'titlemedium\'>{$ibforums->lang[\'h_topic_title\']}</td>\n	<td width=\'15%\' align=\'center\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_topic_starter\']}</td>\n	<td width=\'7%\' align=\'center\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_replies\']}</td>\n	<td width=\'8%\' align=\'center\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_hits\']}</td>\n	<td width=\'25%\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'h_last_action\']}</td>\n	<td width=\'5%\' nowrap="nowrap" class=\'titlemedium\'>{$ibforums->lang[\'f_select\']}</td>\n  </tr>', 'start_topics', '$pages,$info', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr> \n	<td class=\'row4\' colspan=\'8\' align=\'center\'>\n		<br />\n		 <b>{$ibforums->lang[\'fv_no_topics\']}</b>\n		<br /><br />\n	</td>\n  </tr>', 'show_no_topics', '', 1035406235, 0);||~&~||(1, 'skin_modcp', '<!-- Begin Topic Entry {$data[\'tid\']} -->\n    <tr> \n	  <td align=\'center\' class=\'row4\'>{$data[\'folder_img\']}</td>\n      <td align=\'center\' class=\'row2\'>{$data[\'topic_icon\']}</td>\n      <td class=\'row4\'>{$data[\'prefix\']} <a target=\'_blank\' href=\'{$ibforums->base_url}showtopic={$data[\'tid\']}\' title=\'{$ibforums->lang[\'topic_started_on\']} {$data[\'start_date\']}\'>{$data[\'title\']}</a><br /><span class=\'desc\'>{$data[\'description\']}</span></td>\n      <td align=\'center\' class=\'row2\'>{$data[\'starter\']}</td>\n      <td align=\'center\' class=\'row4\'>{$data[\'posts\']}</td>\n      <td align=\'center\' class=\'row2\'>{$data[\'views\']}</td>\n      <td class=\'row2\'>{$data[\'last_post\']}<br />{$data[\'last_text\']} <b>{$data[\'last_poster\']}</b></td>\n      <td align=\'center\' class=\'row2\'><input type=\'checkbox\' name=\'TID_{$data[\'real_tid\']}\' value=\'1\' /></td>\n    </tr>\n    <!-- End Topic Entry {$data[\'tid\']} -->', 'topic_row', '$data', 1035406235, 0);||~&~||(1, 'skin_modcp', '</table>\n  <div class=\'pformstrip\' align=\'center\'>\n     {$ibforums->lang[\'t_w_selected\']}\n	 <select class=\'forminput\' name=\'tact\'>\n	 <option value=\'close\'>{$ibforums->lang[\'cpt_close\']}</option>\n	 <option value=\'open\'>{$ibforums->lang[\'cpt_open\']}</option>\n	 <option value=\'pin\'>{$ibforums->lang[\'cpt_pin\']}</option>\n	 <option value=\'unpin\'>{$ibforums->lang[\'cpt_unpin\']}</option>\n	 <option value=\'move\'>{$ibforums->lang[\'cpt_move\']}</option>\n	 <option value=\'delete\'>{$ibforums->lang[\'cpt_delete\']}</option>\n	 <!--IBF.MMOD-->\n	 </select> &nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'f_go\']}\' class=\'forminput\' />\n  </div>\n</div>\n</form>', 'topics_end', '$data', 1035406235, 0);||~&~||(1, 'skin_modcp', '<form action=\'{$ibforums->base_url}act=modcp&amp;CODE=topicchoice&amp;tact=domove&amp;f=$fid\' method=\'post\'>\n<div class=\'tableborder\'>\n <div class=\'maintitle\'>{$ibforums->lang[\'cp_tmove_start\']} $forum_name</div>\n <table class=\'tablebasic\'>', 'move_checked_form_start', '$forum_name, $fid', 1035406235, 0);||~&~||(1, 'skin_modcp', '<tr>\n   <td class=\'row1\' width=\'10%\' align=\'center\'><input type=\'checkbox\' name=\'TID_$tid\' value=\'1\' checked="checked" /></td>\n   <td class=\'row1\' width=\'90%\' align=\'left\'><strong>$title</strong></td>\n  </tr>', 'move_checked_form_entry', '$tid, $title', 1035406235, 0);||~&~||(1, 'skin_modcp', '</table>\n   <div align=\'center\' class=\'tablepad\'>{$ibforums->lang[\'cp_tmove_to\']}&nbsp;&nbsp;<select class=\'forminput\' name=\'df\'>$jump_html</select></div>\n   <div align=\'center\' class=\'pformstrip\'><input type=\'submit\' value=\'{$ibforums->lang[\'cp_tmove_end\']}\' class=\'forminput\' /></div>\n </div>\n</form>', 'move_checked_form_end', '$jump_html', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class="pformstrip">{$ibforums->lang[\'pm_preview\']}</div>\n<p>$data</p>', 'preview', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class="pformstrip">{$ibforums->lang[\'err_errors\']}</div>\n<span class=\'postcolor\'><p>$data<br /><br />{$ibforums->lang[\'pme_none_sent\']}</p></span>', 'pm_errors', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<script language=\'javascript\'>\n<!--\n function goto_inbox() {\n 	opener.document.location.href = \'{$ibforums->base_url}act=Msg&amp;CODE=01\';\n 	window.close();\n }\n \n function goto_this_inbox() {\n 	window.resizeTo(\'700\',\'500\');\n 	document.location.href = \'{$ibforums->base_url}&act=Msg&CODE=01\';\n }\n \n function go_read_msg() {\n 	window.resizeTo(\'700\',\'500\');\n 	document.location.href = \'{$ibforums->base_url}&act=Msg&CODE=03&VID=in&MSID=$mid\';\n }\n \n//-->\n</script>\n<table cellspacing=\'1\' cellpadding=\'10\' width=\'100%\' height=\'100%\' align=\'center\' class=\'row1\'>\n<tr>\n   <td id=\'phototitle\' align=\'center\'>{$ibforums->lang[\'pmp_title\']}</td>\n</tr>\n<tr>\n   <td align=\'center\'>$text</td>\n</tr>\n<tr>\n   <td align=\'center\' style=\'font-size:12px;font-weight:bold\'>\n   <a href=\'javascript:go_read_msg();\'>{$ibforums->lang[\'pmp_get_last\']}</a>\n   <br /><br />\n   <a href=\'javascript:goto_inbox();\'>{$ibforums->lang[\'pmp_go_inbox\']}</a> ( <a href=\'javascript:goto_this_inbox();\'>{$ibforums->lang[\'pmp_thiswindow\']}</a> )<br /><br /><a href=\'javascript:window.close();\'>{$ibforums->lang[\'pmp_ignore\']}</a></td>\n</tr>\n</table>', 'pm_popup', '$text, $mid', 1035406235, 0);||~&~||(1, 'skin_msg', '<html>\n <head>\n  <title>Private Message Archive</title>\n </head>\n <style type=\'text/css\'>\n	 BODY { font-family: Verdana, Tahoma, Arial, sans-serif;\n			font-size: 11px;\n			color: #000;\n			margin:0px;\n			padding:0px;\n			background-color:#FFF;\n			text-align:center\n		   }\n		   \n	#ipbwrapper { text-align:left; width:95%; margin-left:auto;margin-right:auto }\n	\n	html { overflow-x: auto; } \n	\n	a:link, a:visited, a:active { text-decoration: underline; color: #000 }\n	a:hover { color: #465584; text-decoration:underline }\n	img        { vertical-align:middle; border:0px }\n	\n	.post1 { background-color: #F5F9FD }\n	.post2 { background-color: #EEF2F7 }\n	\n	/* Common elements */\n	.row1 { background-color: #F5F9FD }\n	.row2 { background-color: #DFE6EF }\n	.row3 { background-color: #EEF2F7 }\n	.row4 { background-color: #E4EAF2 }\n	\n	/* tableborders gives the white column / row lines effect */\n	.plainborder { border:1px solid #345487;background-color:#F5F9FD }\n	.tableborder { border:1px solid #345487;background-color:#FFF; padding:0; margin:0 }\n	.tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px;  }\n	.tablepad    { background-color:#F5F9FD;padding:6px }\n	.tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }\n	\n	.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px }\n	#QUOTE { font-family: Verdana, Arial; font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }\n	#CODE  { font-family: Courier, Courier New, Verdana, Arial;  font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }\n	\n	/* Main table top (dark blue gradient by default) */\n	.maintitle { vertical-align:middle;font-weight:bold; color:#FFF; background-color:D1DCEB;padding:8px 0px 8px 5px; background-image: url({$ibforums->vars[\'board_url\']}/style_images/<#IMG_DIR#>/tile_back.gif) }\n	.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }\n	.maintitle a:hover { text-decoration: underline }\n    \n    /* Topic View elements */\n	.signature   { font-size: 10px; color: #339; line-height:150% }\n	.postdetails { font-size: 10px }\n	.postcolor   { font-size: 12px; line-height: 160% }\n </style>\n <body>\n <div id=\'ipbwrapper\'>', 'archive_html_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><img src="{$ibforums->vars[\'board_url\']}/style_images/<#IMG_DIR#>/f_norm.gif" alt=\'PM\' />&nbsp;PM: {$info[\'msg_title\']}</div>\n <div class=\'tablefill\'><div class=\'postcolor\'>{$info[\'msg_content\']}</div></div>\n <div class=\'pformstrip\'>Sent by <b>{$info[\'msg_sender\']}</b> on {$info[\'msg_date\']}</div>\n</div>\n<br />', 'archive_html_entry', '$info', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><img src="{$ibforums->vars[\'board_url\']}/style_images/<#IMG_DIR#>/f_moved.gif" alt=\'PM\' />&nbsp;PM: {$info[\'msg_title\']}</div>\n <div class=\'tablefill\'><div class=\'postcolor\'>{$info[\'msg_content\']}</div></div>\n <div class=\'pformstrip\'>Sent to <b>{$info[\'msg_sender\']}</b> on {$info[\'msg_date\']}</div>\n</div>\n<br />', 'archive_html_entry_sent', '$info', 1035406235, 0);||~&~||(1, 'skin_msg', '</div>\n </body>\n</html>', 'archive_html_footer', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class="pformstrip">{$ibforums->lang[\'arc_comp_title\']}</div>\n<p>{$ibforums->lang[\'arc_complete\']}</p>', 'archive_complete', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Msg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'15\' />\n<div class="pformstrip">{$ibforums->lang[\'archive_title\']}</div>\n<p>{$ibforums->lang[\'archive_text\']}</p>\n<table width="100%" style="padding:6px">\n<tr>\n   <td><b>{$ibforums->lang[\'arc_folders\']}</b></td>\n   <td>$jump_html</td>\n</tr>\n<tr>\n   <td><b>{$ibforums->lang[\'arc_dateline\']}</b></td>\n   <td valign=\'middle\'><select name=\'dateline\' class=\'forminput\'>\n	 <option value=\'1\'>1</option>\n	 <option value=\'7\'>7</option>\n	 <option value=\'30\' selected=\'selected\'>30</option>\n	 <option value=\'90\'>90</option>\n	 <option value=\'365\'>365</option>\n	 <option value=\'all\'>{$ibforums->lang[\'arc_alldays\']}</option>\n	 </select>&nbsp;&nbsp;{$ibforums->lang[\'arc_days\']}\n	 <select name=\'oldnew\' class=\'forminput\'>\n	  <option value=\'newer\' selected=\'selected\'>{$ibforums->lang[\'arch_new\']}</option>\n	  <option value=\'older\'>{$ibforums->lang[\'arch_old\']}</option>\n	 </select>\n   </td>\n</tr>\n<tr>\n   <td><b>{$ibforums->lang[\'arc_max\']}</b></td>\n   <td valign=\'middle\'><select name=\'number\' class=\'forminput\'><option value=\'5\'>5</option><option value=\'10\'>10</option><option value=\'20\' selected>20</option><option value=\'30\'>30</option><option value=\'40\'>40</option><option value=\'50\'>50</option></select></td>\n</tr>\n<tr>\n   <td><b>{$ibforums->lang[\'arc_delete\']}</b></td>\n   <td valign=\'middle\'><select name=\'delete\' class=\'forminput\'><option value=\'yes\'>{$ibforums->lang[\'arc_yes\']}</option><option value=\'no\' selected=\'selected\'>{$ibforums->lang[\'arc_no\']}</option></select></td>\n</tr>\n<tr>\n   <td><b>{$ibforums->lang[\'arc_type\']}</b></td>\n   <td valign=\'middle\'><select name=\'type\' class=\'forminput\'><option value=\'xls\' selected>{$ibforums->lang[\'arc_xls\']}</option><option value=\'html\'>{$ibforums->lang[\'arc_html\']}</option></select></td>\n</tr>\n</table>\n<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'arc_submit\']}" class=\'forminput\' /></div>\n</form>', 'archive_form', '$jump_html=""', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n      <td class=\'row1\' colspan=\'5\' align=\'center\'><b>{$ibforums->lang[\'inbox_no_msg\']}</b></td>                \n      </tr>', 'No_msg_inbox', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Msg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'dofolderdelete\' />\n<div class="pformstrip">{$ibforums->lang[\'mi_prune_msg\']}</div>\n<p>{$ibforums->lang[\'fd_text\']}</p>\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n<tr>\n  <th class="titlemedium">{$ibforums->lang[\'fd_name\']}</th>\n  <th class="titlemedium">{$ibforums->lang[\'fd_count\']}</th>\n  <th class="titlemedium">{$ibforums->lang[\'fd_empty\']}</th>\n</tr>', 'empty_folder_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n  <td class="row1"><strong>$real</strong></td>\n  <td class="row1" align="center">$cnt</td>\n  <td class="row1" align="center"><input type="checkbox" class="checkbox" name="its_$id" value="1" /></td>\n</tr>', 'empty_folder_row', '$real, $id, $cnt', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n  <td class="row2" colspan=\'3\' align=\'center\'><input type="checkbox" class="checkbox" name="save_unread" value="1" checked="checked"/> <strong>{$ibforums->lang[\'fd_save_unread\']}</strong></td>\n</tr>', 'empty_folder_save_unread', '', 1035406235, 0);||~&~||(1, 'skin_msg', '</table>\n<div class="pformstrip" align="center"><input type=\'submit\' value=\'{$ibforums->lang[\'fd_continue\']}\' class=\'forminput\'></div>\n</div>\n</form>', 'empty_folder_footer', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Msg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'08\' />\n<div class="pformstrip">{$ibforums->lang[\'prefs_current\']}</div>\n<p>{$ibforums->lang[\'prefs_text_a\']}</p>', 'prefs_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<p><input type=\'text\' name=\'{$data[ID]}\' value=\'{$data[REAL]}\' class=\'forminput\' />{$data[EXTRA]}</p>', 'prefs_row', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class="pformstrip">{$ibforums->lang[\'prefs_new\']}</div>\n<p>{$ibforums->lang[\'prefs_text_b\']}</p>', 'prefs_add_dirs', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class="pformstrip" align="center"><input type=\'submit\' value=\'{$ibforums->lang[\'prefs_submit\']}\' class=\'forminput\'></div>\n</form>', 'prefs_footer', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<div class="pformstrip">{$ibforums->lang[\'address_current\']}</div>', 'Address_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<br />\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n<tr>\n  <td class="titlemedium"><b>{$ibforums->lang[\'member_name\']}</b></td>\n  <td width="60%" class="titlemedium"><b>{$ibforums->lang[\'enter_block\']}</b></td>\n</tr>', 'Address_table_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n  <td class=\'row1 align=\'left\' valign=\'middle\'><a href=\'{$ibforums->base_url}act=Profile&amp;CODE=03&amp;MID={$entry[\'contact_id\']}\'><b>{$entry[\'contact_name\']}</b></a> &nbsp; &nbsp;[ {$entry[\'contact_desc\']} ]</td>\n  <td class=\'row1 align=\'left\' valign=\'middle\'>\n	   [ <a href=\'{$ibforums->base_url}act=Msg&amp;CODE=11&amp;MID={$entry[\'contact_id\']}\'>{$ibforums->lang[\'edit\']}</a> ] :: [ <a href=\'{$ibforums->base_url}act=Msg&amp;CODE=10&amp;MID={$entry[\'contact_id\']}\'>{$ibforums->lang[\'delete\']}</a> ]\n		&nbsp;&nbsp;( {$entry[\'text\']} )\n  </td>\n</tr>', 'render_address_row', '$entry', 1035406235, 0);||~&~||(1, 'skin_msg', '<p style="text-align:center">{$ibforums->lang[\'address_none\']}</p>', 'Address_none', '', 1035406235, 0);||~&~||(1, 'skin_msg', '</table>\n</div>\n<br />', 'end_address_table', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Msg\'>\n<input type=\'hidden\' name=\'CODE\' value=\'12\'>\n<input type=\'hidden\' name=\'MID\' value=\'{$data[MEMBER][\'contact_id\']}\'>\n<div class="pformstrip">{$ibforums->lang[\'member_edit\']}</div>\n<table width="100%">\n<tr>\n <td valign=\'middle\' align=\'left\'><b>{$data[MEMBER][\'contact_name\']}</b></td>\n <td valign=\'middle\' align=\'left\'>{$ibforums->lang[\'enter_desc\']}<br /><input type=\'text\' name=\'mem_desc\' size=\'30\' maxlength=\'60\' value=\'{$data[MEMBER][\'contact_desc\']}\' class=\'forminput\' /></td>\n <td valign=\'middle\' align=\'left\'>{$ibforums->lang[\'allow_msg\']}<br />{$data[SELECT]}</td>\n</tr>\n</table>\n<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'submit_address_edit\']}" class=\'forminput\' /></div>\n</form>', 'address_edit', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Msg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'09\' />\n<div class="pformstrip">{$ibforums->lang[\'member_add\']}</div>\n<table style="padding:6px">\n<tr>\n <td valign=\'middle\'>{$ibforums->lang[\'enter_a_name\']}<br /><input type=\'text\' name=\'mem_name\' size=\'20\' maxlength=\'40\' value=\'$mem_to_add\' class=\'forminput\' /></td>\n <td valign=\'middle\'>{$ibforums->lang[\'enter_desc\']}<br /><input type=\'text\' name=\'mem_desc\' size=\'30\' maxlength=\'60\' value=\'\' class=\'forminput\' /></td>\n <td valign=\'middle\'>{$ibforums->lang[\'allow_msg\']}<br /><select name=\'allow_msg\' class=\'forminput\'><option value=\'yes\' selected="selected">{$ibforums->lang[\'yes\']}<option value=\'no\'>{$ibforums->lang[\'no\']}</select></td>\n</tr>\n</table>\n<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'submit_address\']}" class=\'forminput\' /></div>\n</form>', 'address_add', '$mem_to_add', 1035406235, 0);||~&~||(1, 'skin_msg', '<script language=\'javascript\' type="text/javascript">\n<!--\nfunction PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\nif (posleft != 0) { x = posleft }\nif (postop  != 0) { y = postop  }\nif (!scroll) { scroll = 1 }\nif (!resize) { resize = 1 }\nif ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n  X = (screen.width  - width ) / 2;\n  Y = (screen.height - height) / 2;\n}\nif (scroll != 0) { scroll = 1 }\nvar Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n}\n//-->\n</script>\n<div class="pformstrip">{$data[\'msg\'][\'title\']}</div>\n<div align="right" style="padding:6px;font-weight:bold">\n  [ <a href=\'{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MSID={$data[\'msg\'][\'msg_id\']}&amp;MID={$data[\'member\'][\'id\']}&amp;fwd=1\'>{$ibforums->lang[\'vm_forward_pm\']}</a> | <a href=\'{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MID={$data[\'member\'][\'id\']}&amp;MSID={$data[\'msg\'][\'msg_id\']}\'>{$ibforums->lang[\'pm_reply_link\']}</a> ]\n</div>\n<div class="tableborder">\n <div class="titlemedium">&nbsp;&nbsp;{$ibforums->lang[\'m_pmessage\']}</div>\n <table width=\'100%\' cellpadding=\'3\' cellspacing=\'1\'>\n  <tr>\n      <td valign=\'middle\' class=\'row4\'><span class=\'normalname\'><a href="{$ibforums->base_url}showuser={$data[\'member\'][\'id\']}">{$data[\'member\'][\'name\']}</a></span></td>\n        <td class=\'row4\' valign=\'top\'>\n        \n        <!-- POSTED DATE DIV -->\n        \n        <div align=\'left\' class=\'row4\' style=\'float:left;padding-top:4px;padding-bottom:4px\'>\n        {$data[POST][\'post_icon\']}<span class=\'postdetails\'><b>{$data[\'msg\'][\'title\']}</b>, {$data[\'msg\'][\'msg_date\']}</span>\n        </div>\n        \n        <!-- DELETE  DIV -->\n        \n        <div align=\'right\'>\n          <a href=\'{$ibforums->base_url}CODE=05&amp;act=Msg&amp;MSID={$data[\'msg\'][\'msg_id\']}&amp;VID={$data[\'member\'][\'VID\']}\'><{P_DELETE}></a>\n          &nbsp;<a href=\'{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MID={$data[\'member\'][\'id\']}&amp;MSID={$data[\'msg\'][\'msg_id\']}\'><{P_QUOTE}></a>\n        </div>\n      \n      </td>\n    </tr>\n    <tr>\n      <td valign=\'top\' class=\'post1\'>\n        <span class=\'postdetails\'>\n        {$data[\'member\'][\'avatar\']}\n        <br />{$data[\'member\'][\'title\']}\n        <br />{$data[\'member\'][\'member_rank_img\']}<br />\n        <br />{$data[\'member\'][\'member_group\']}\n        <br />{$data[\'member\'][\'member_posts\']}\n        <br />{$data[\'member\'][\'member_joined\']}\n        <br />\n        </span>\n        <img src=\'{$ibforums->vars[\'img_url\']}/spacer.gif\' alt=\'\' width=\'160\' height=\'1\' /><br /> \n      </td>\n      <td width=\'100%\' valign=\'top\' class=\'post1\'><span class=\'postcolor\'>{$data[\'msg\'][\'message\']}</span><span class="signature">{$data[\'member\'][\'signature\']}</span></td>\n    </tr>\n    <tr>\n      <td class=\'darkrow3\' align=\'left\'>[ <a href=\'{$ibforums->base_url}CODE=02&amp;act=Msg&amp;MID={$data[\'member\'][\'id\']}\'>{$ibforums->lang[\'add_to_book\']}</a> ]</td>\n      <td class=\'darkrow3\' nowrap="nowrap" align=\'left\'>\n      \n        <!-- EMAIL / WWW / MSGR -->\n      \n        <div align=\'left\' class=\'darkrow3\' style=\'float:left;\'>\n        {$data[\'member\'][\'addresscard\']}{$data[\'member\'][\'message_icon\']}{$data[\'member\'][\'email_icon\']}{$data[\'member\'][\'website_icon\']}{$data[\'member\'][\'integ_icon\']}{$data[\'member\'][\'icq_icon\']}{$data[\'member\'][\'aol_icon\']}{$data[\'member\'][\'yahoo_icon\']}{$data[\'member\'][\'msn_icon\']}\n      </div>\n        \n        <!-- UP -->\n         \n        <div align=\'right\'><a href=\'javascript:scroll(0,0);\'><img src=\'{$ibforums->vars[\'img_url\']}/p_up.gif\' alt=\'Top\' border=\'0\' /></a></div>\n      </td>\n    </tr>\n</table>\n</div>\n<div style="float:left;width:auto;padding:6px">\n<form action="{$ibforums->base_url}" name=\'jump\' method="post">\n<input type=\'hidden\' name=\'act\' value=\'Msg\'>\n<input type=\'hidden\' name=\'CODE\' value=\'01\'>\n{$ibforums->lang[goto_folder]}:</b>&nbsp; {$data[\'jump\']}\n<input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[goto_submit]}\' class=\'forminput\' />\n</form>\n</div>\n<div align="right" style="padding:6px;font-weight:bold">\n  [ <a href=\'{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MSID={$data[\'msg\'][\'msg_id\']}&amp;MID={$data[\'member\'][\'id\']}&amp;fwd=1\'>{$ibforums->lang[\'vm_forward_pm\']}</a> | <a href=\'{$ibforums->base_url}CODE=04&amp;act=Msg&amp;MID={$data[\'member\'][\'id\']}&amp;MSID={$data[\'msg\'][\'msg_id\']}\'>{$ibforums->lang[\'pm_reply_link\']}</a> ]\n</div>', 'Render_msg', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<script language=\'JavaScript\' type="text/javascript">\n<!--\nfunction CheckAll(fmobj) {\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.name != \'allbox\') && (e.type==\'checkbox\') && (!e.disabled)) {\n			e.checked = fmobj.allbox.checked;\n		}\n	}\n}\nfunction CheckCheckAll(fmobj) {	\n	var TotalBoxes = 0;\n	var TotalOn = 0;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.name != \'allbox\') && (e.type==\'checkbox\')) {\n			TotalBoxes++;\n			if (e.checked) {\n				TotalOn++;\n			}\n		}\n	}\n	if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}\n	else {fmobj.allbox.checked=false;}\n}\n//-->\n</script>\n<form action="{$ibforums->base_url}CODE=31&amp;act=Msg" name=\'trackread\' method="post">\n<div class=\'pformstrip\'>{$ibforums->lang[\'tk_read_messages\']}</div>\n<p>{$ibforums->lang[\'tk_read_desc\']}</p>\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'1\' align=\'center\' width=\'100%\'>\n<tr>\n  <th align=\'left\' width=\'5%\' class=\'titlemedium\'>&nbsp;</th>\n  <th align=\'left\' width=\'30%\' class=\'titlemedium\'><b>{$ibforums->lang[\'message_title\']}</b></th>\n  <th align=\'left\' width=\'30%\' class=\'titlemedium\'><b>{$ibforums->lang[\'pms_message_to\']}</b></th>\n  <th align=\'left\' width=\'20%\' class=\'titlemedium\'><b>{$ibforums->lang[\'tk_read_date\']}</b></th>\n  <th align=\'left\' width=\'5%\' class=\'titlemedium\'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll(document.trackread);" /></th>\n</tr>', 'trackread_table_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n  <td class=\'row2\' align=\'left\' valign=\'middle\'>{$data[\'icon\']}</td>\n  <td class=\'row2\' align=\'left\'>{$data[\'title\']}</td>\n  <td class=\'row2\' align=\'left\'><a href=\'{$ibforums->base_url}showuser={$data[\'memid\']}\'>{$data[\'to_name\']}</a></td>\n  <td class=\'row2\' align=\'left\'>{$data[\'date\']}</td>\n  <td class=\'row2\' align=\'left\'><input type=\'checkbox\' name=\'msgid_{$data[\'msg_id\']}\' value=\'yes\' class=\'forminput\' onclick="CheckCheckAll(document.trackread);" /></td>\n</tr>', 'trackread_row', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n <td align=\'right\' class=\'titlemedium\' colspan=\'5\'><input type=\'submit\' name=\'endtrack\' value=\'{$ibforums->lang[\'tk_untrack_button\']}\' class=\'forminput\' /> {$ibforums->lang[\'selected_msg\']}</td>\n</tr>\n</table>\n</div>\n</form>\n<br />', 'trackread_end', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<form action="{$ibforums->base_url}CODE=32&amp;act=Msg" name=\'trackunread\' method="post">\n<div class=\'pformstrip\'>{$ibforums->lang[\'tk_unread_messages\']}</div>\n<p>{$ibforums->lang[\'tk_unread_desc\']}</p>\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'1\' align=\'center\' width=\'100%\'>\n<tr>\n  <th align=\'left\' width=\'5%\' class=\'titlemedium\'>&nbsp;</td>\n  <th align=\'left\' width=\'30%\' class=\'titlemedium\'><b>{$ibforums->lang[\'message_title\']}</b></th>\n  <th align=\'left\' width=\'30%\' class=\'titlemedium\'><b>{$ibforums->lang[\'pms_message_to\']}</b></th>\n  <th align=\'left\' width=\'20%\' class=\'titlemedium\'><b>{$ibforums->lang[\'tk_unread_date\']}</b></th>\n  <th align=\'left\' width=\'5%\' class=\'titlemedium\'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll(document.trackunread);" /></th>\n</tr>', 'trackUNread_table_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n  <td class=\'row2\' align=\'left\' valign=\'middle\'>{$data[\'icon\']}</td>\n  <td class=\'row2\' align=\'left\'>{$data[\'title\']}</td>\n  <td class=\'row2\' align=\'left\'><a href=\'{$ibforums->base_url}showuser={$data[\'memid\']}\'>{$data[\'to_name\']}</a></td>\n  <td class=\'row2\' align=\'left\'>{$data[\'date\']}</td>\n  <td class=\'row2\' align=\'left\'><input type=\'checkbox\' name=\'msgid_{$data[\'msg_id\']}\' value=\'yes\' class=\'forminput\' onclick="CheckCheckAll(document.trackunread);" /></td>\n</tr>', 'trackUNread_row', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n <td align=\'right\' class=\'titlemedium\' colspan=\'5\'><input type=\'submit\' name=\'delete\' value=\'{$ibforums->lang[\'delete_button\']}\' class=\'forminput\' /> {$ibforums->lang[\'selected_msg\']}</td>\n</tr>\n</table>\n</div>\n</form>', 'trackUNread_end', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<script language=\'JavaScript\' type="text/javascript">\n<!--\nfunction CheckAll(cb) {\n	var fmobj = document.mutliact;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.name != \'allbox\') && (e.type==\'checkbox\') && (!e.disabled)) {\n			e.checked = fmobj.allbox.checked;\n		}\n	}\n}\nfunction CheckCheckAll(cb) {	\n	var fmobj = document.mutliact;\n	var TotalBoxes = 0;\n	var TotalOn = 0;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.name != \'allbox\') && (e.type==\'checkbox\')) {\n			TotalBoxes++;\n			if (e.checked) {\n				TotalOn++;\n			}\n		}\n	}\n	if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}\n	else {fmobj.allbox.checked=false;}\n}\n//-->\n</script>\n<form action="{$ibforums->base_url}CODE=06&amp;act=Msg&amp;saved=1" name=\'mutliact\' method="post">\n<div class="pformstrip">{$ibforums->lang[\'pms_saved_title\']}</div>\n<br />\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'1\' align=\'center\' width=\'100%\'>\n<tr>\n  <th align=\'left\' width=\'5%\' class=\'titlemedium\'>&nbsp;</td>\n  <th align=\'left\' width=\'30%\' class=\'titlemedium\'><b>{$ibforums->lang[\'message_title\']}</b></th>\n  <th align=\'left\' width=\'30%\' class=\'titlemedium\'><b>{$ibforums->lang[\'pms_message_to\']}</b></th>\n  <th align=\'left\' width=\'20%\' class=\'titlemedium\'><b>{$ibforums->lang[\'pms_saved_date\']}</b></th>\n  <th align=\'left\' width=\'10%\' class=\'titlemedium\'><b>{$ibforums->lang[\'pms_cc_users\']}</b></th>\n  <th align=\'left\' width=\'5%\' class=\'titlemedium\'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll();" /></th>\n</tr>', 'unsent_table_header', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n  <td class=\'row2\' align=\'left\' valign=\'middle\'>{$data[\'msg\'][\'icon\']}</td>\n  <td class=\'row2\' align=\'left\'><a href=\'{$ibforums->base_url}act=Msg&amp;CODE=21&amp;MSID={$data[\'msg\'][\'msg_id\']}\'>{$data[\'msg\'][\'title\']}</a></td>\n  <td class=\'row2\' align=\'left\'><a href=\'{$ibforums->base_url}showuser={$data[\'msg\'][\'recipient_id\']}\'>{$data[\'msg\'][\'to_name\']}</a></td>\n  <td class=\'row2\' align=\'left\'>{$data[\'msg\'][\'date\']}</td>\n  <td class=\'row2\' align=\'center\'>{$data[\'msg\'][\'cc_users\']}</td>\n  <td class=\'row2\' align=\'left\'><input type=\'checkbox\' name=\'msgid_{$data[\'msg\'][\'msg_id\']}\' value=\'yes\' class=\'forminput\' /></td>\n</tr>', 'unsent_row', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n <td align=\'center\' nowrap class=\'titlemedium\' colspan=\'6\'><input type=\'submit\' name=\'delete\' value=\'{$ibforums->lang[\'delete_button\']}\' class=\'forminput\' /> {$ibforums->lang[\'selected_msg\']}</td>\n</tr>\n</table>\n</div>\n</form>', 'unsent_end', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<!-- inbox folder -->\n<script language=\'JavaScript\' type="text/javascript">\n<!--\nvar ie  = document.all  ? 1 : 0;\n//var ns4 = document.layers ? 1 : 0;\nfunction hl(cb)\n{\n   if (ie)\n   {\n	   while (cb.tagName != "TR")\n	   {\n		   cb = cb.parentElement;\n	   }\n   }\n   else\n   {\n	   while (cb.tagName != "TR")\n	   {\n		   cb = cb.parentNode;\n	   }\n   }\n   cb.className = \'hlight\';\n}\nfunction dl(cb) {\n   if (ie)\n   {\n	   while (cb.tagName != "TR")\n	   {\n		   cb = cb.parentElement;\n	   }\n   }\n   else\n   {\n	   while (cb.tagName != "TR")\n	   {\n		   cb = cb.parentNode;\n	   }\n   }\n   cb.className = \'dlight\';\n}\nfunction cca(cb) {\n   if (cb.checked)\n   {\n	   hl(cb);\n   }\n   else\n   {\n	   dl(cb);\n   }\n}\n	   \nfunction CheckAll(cb) {\n	var fmobj = document.mutliact;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.name != \'allbox\') && (e.type==\'checkbox\') && (!e.disabled)) {\n			e.checked = fmobj.allbox.checked;\n			if (fmobj.allbox.checked)\n			{\n			   hl(e);\n			}\n			else\n			{\n			   dl(e);\n			}\n		}\n	}\n}\nfunction CheckCheckAll(cb) {	\n	var fmobj = document.mutliact;\n	var TotalBoxes = 0;\n	var TotalOn = 0;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.name != \'allbox\') && (e.type==\'checkbox\')) {\n			TotalBoxes++;\n			if (e.checked) {\n				TotalOn++;\n			}\n		}\n	}\n	if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}\n	else {fmobj.allbox.checked=false;}\n}\nfunction select_read() {	\n	var fmobj = document.mutliact;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if ((e.type==\'hidden\') && (e.value == 1) && (! isNaN(e.name) ))\n		{\n			eval("fmobj.msgid_" + e.name + ".checked=true;");\n			hl(e);\n		}\n	}\n}\nfunction unselect_all() {	\n	var fmobj = document.mutliact;\n	for (var i=0;i<fmobj.elements.length;i++) {\n		var e = fmobj.elements[i];\n		if (e.type==\'checkbox\') {\n			e.checked=false;\n			dl(e);\n		}\n	}\n}\n//-->\n</script>\n<div class="pformstrip">$dirname</div>\n<table width="100%" style="padding:6px">\n<tr>\n <td valign="middle">\n  <!-- LEFT -->\n  <table style="width:250px" cellspacing="1" class="tableborder">\n   <tr>\n	<td class=\'row1\' align=\'left\' colspan=\'3\'>{$info[\'full_messenger\']}</td>\n   </tr>\n   <tr>\n	<td align=\'left\' valign=\'middle\' class=\'row2\' colspan=\'3\'><img src=\'{$ibforums->vars[\'img_url\']}/bar_left.gif\' border=\'0\' width=\'4\' height=\'11\' align=\'middle\' alt=\'\' /><img src=\'{$ibforums->vars[\'img_url\']}/bar.gif\' border=\'0\' width=\'{$info[\'img_width\']}\' height=\'11\' align=\'middle\' alt=\'\' /><img src=\'{$ibforums->vars[\'img_url\']}/bar_right.gif\' border=\'0\' width=\'4\' height=\'11\' align=\'middle\' alt=\'\' /></td>\n   </tr>\n   <tr>\n	 <td class=\'row1\' width=\'33%\' align=\'left\' valign=\'middle\'>0%</td>\n	 <td class=\'row1\' width=\'33%\' align=\'center\' valign=\'middle\'>50%</td>\n	 <td class=\'row1\' width=\'33%\' align=\'right\' valign=\'middle\'>100%</td>\n   </tr>\n  </table>\n </td>\n <!-- RIGHT -->\n <td align="right" valign="bottom" style="line-height:100%;">\n  $pages<br /><br />\n  <a href=\'javascript:select_read()\'>{$ibforums->lang[\'pmpc_mark_read\']}</a> :: <a href=\'javascript:unselect_all()\'>{$ibforums->lang[\'pmpc_unmark_all\']}</a><br /><br />\n  <form action="{$ibforums->base_url}CODE=01&amp;act=Msg" name=\'jump\' method="post">\n  <b>{$ibforums->lang[\'goto_folder\']}: </b>&nbsp; $vdi_html <input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'goto_submit\']}\' class=\'forminput\' />\n  </form>\n </td>\n</tr>\n</table>\n<!-- INBOX TABLE -->\n  \n<form action="{$ibforums->base_url}CODE=06&amp;act=Msg" name=\'mutliact\' method="post">\n<div class="tableborder">\n  <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	<th width=\'5%\'  class=\'titlemedium\'>&nbsp;</th>\n	<th width=\'35%\' class=\'titlemedium\'><a href=\'{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID={$info[\'vid\']}&amp;sort=title&amp;st={$ibforums->input[\'st\']}\'><b>{$ibforums->lang[\'message_title\']}</b></a></th>\n	<th width=\'30%\' class=\'titlemedium\'><a href=\'{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID={$info[\'vid\']}&amp;sort=name&amp;st={$ibforums->input[\'st\']}\'><b>{$ibforums->lang[\'message_from\']}</b></a></th>\n	<th width=\'25%\' class=\'titlemedium\'><a href=\'{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID={$info[\'vid\']}&amp;sort={$info[\'date_order\']}&amp;st={$ibforums->input[\'st\']}\'><b>{$ibforums->lang[\'message_date\']}</b></a></th>\n	<th width=\'5%\'  class=\'titlemedium\'><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll();" /></th>\n  </tr>', 'inbox_table_header', '$dirname, $info, $vdi_html="", $pages=""', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr class="dlight">\n	<td align="center" valign=\'middle\'>{$data[\'msg\'][\'icon\']}</td>\n	<td><a href=\'{$ibforums->base_url}act=Msg&amp;CODE=03&amp;VID={$data[\'stat\'][\'current_id\']}&amp;MSID={$data[\'msg\'][\'msg_id\']}\'>{$data[\'msg\'][\'title\']}</a></td>\n	<td><a href=\'{$ibforums->base_url}showuser={$data[\'msg\'][\'from_id\']}\'>{$data[\'msg\'][\'from_name\']}</a> {$data[\'msg\'][\'add_to_contacts\']}</td>\n	<td>{$data[\'msg\'][\'date\']}</td>\n	<td align="center"><input type=\'hidden\' name=\'{$data[\'msg\'][\'msg_id\']}\' value=\'{$data[\'msg\'][\'read_state\']}\' /><input type=\'checkbox\' name=\'msgid_{$data[\'msg\'][\'msg_id\']}\' value=\'yes\' class=\'forminput\' onclick="cca(this);" /></td>\n  </tr>', 'inbox_row', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n   <td align=\'right\' class=\'titlemedium\' colspan=\'5\'>\n	 <input type=\'submit\' name=\'move\' value=\'{$ibforums->lang[\'move_button\']}\' class=\'forminput\' /> $vdi_html {$ibforums->lang[\'move_or_delete\']} <input type=\'submit\' name=\'delete\' value=\'{$ibforums->lang[\'delete_button\']}\' class=\'forminput\' /> {$ibforums->lang[\'selected_msg\']}\n  </td>\n</tr>\n</table>\n</div>\n</form>\n<div class="wrapmini" style="padding:6px"><{M_READ}>&nbsp;{$ibforums->lang[\'icon_read\']}<br /><{M_UNREAD}>&nbsp;{$ibforums->lang[\'icon_unread\']}</div>\n<div align="right" style="padding:6px">$pages<br /><i>$amount_info</i></div>', 'end_inbox', '$vdi_html, $amount_info="", $pages=""', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n <td colspan=\'2\' class=\'pformstrip\'>{$ibforums->lang[\'msg_options\']}</td>\n</tr>\n<tr>\n <td class="pformleft">&nbsp;</td>\n <td class="pformright">\n	<input type=\'checkbox\' name=\'add_sent\' value=\'yes\' checked="checked" />&nbsp;<b>{$ibforums->lang[\'auto_sent_add\']}</b>\n	<br /><input type=\'checkbox\' name=\'add_tracking\' value=\'1\' />&nbsp;<b>{$ibforums->lang[\'vm_track_msg\']}</b>\n </td>\n</tr>\n<tr>\n <td class=\'pformstrip\' align=\'center\' colspan=\'2\'>\n  <input type="submit" value="{$ibforums->lang[\'submit_send\']}" tabindex="4" accesskey="s" class=\'forminput\' name=\'submit\' />\n  <input type="submit" value="{$ibforums->lang[\'pm_pre_button\']}" tabindex="5" class=\'forminput\' name=\'preview\' />\n  <input type="submit" value="{$ibforums->lang[\'pms_send_later\']}" tabindex="6" class=\'forminput\' name=\'save\' />\n </td>\n</tr>\n</table>\n</form>', 'send_form_footer', '', 1035406235, 0);||~&~||(1, 'skin_msg', '<script language=\'javascript\' type="text/javascript">\n<!--\nfunction find_users()\n{\n  url = "index.{$ibforums->vars[\'php_ext\']}?act=legends&CODE=finduser_one&s={$ibforums->session_id}&entry=textarea&name=carbon_copy&sep=line";\n  window.open(url,\'FindUsers\',\'width=400,height=250,resizable=yes,scrollbars=yes\'); \n}\n//-->\n</script>\n<form action="{$ibforums->base_url}" method="post" name=\'REPLIER\' onsubmit=\'return ValidateForm(1)\'>\n<input type=\'hidden\' name=\'act\' value=\'Msg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'04\' />\n<input type=\'hidden\' name=\'MODE\' value=\'01\' />\n<input type=\'hidden\' name=\'OID\'  value=\'{$data[\'OID\']}\' />\n<table width="100%" cellspacing="0">\n<tr>\n  <td colspan=\'2\' class=\'pformstrip\'>{$ibforums->lang[\'to_whom\']}</td>\n</tr>\n<tr>\n  <td class="pformleft">{$ibforums->lang[\'address_list\']}</td>\n  <td class="pformright">{$data[CONTACTS]}&nbsp;</td>\n</tr>  \n<tr>\n  <td class="pformleft">{$ibforums->lang[\'enter_name\']}</td>\n  <td class="pformright"><input type=\'text\' name=\'entered_name\' size=\'50\' value=\'{$data[N_ENTER]}\' tabindex="1" class=\'forminput\' /></td>\n</tr>\n<!--IBF.MASS_PM_BOX-->\n<tr>\n  <td colspan=\'2\' class=\'pformstrip\'>{$ibforums->lang[\'enter_message\']}</td>\n</tr>\n<tr>\n  <td class="pformleft">{$ibforums->lang[\'msg_title\']}</td>\n  <td class="pformright"><input type=\'text\' name=\'msg_title\' size=\'40\' tabindex="2" maxlength=\'40\' value=\'{$data[O_TITLE]}\' class=\'forminput\' /></td>\n</tr>', 'Send_form', '$data', 1035406235, 0);||~&~||(1, 'skin_msg', '<tr>\n<td colspan=\'2\' class=\'pformstrip\'>{$ibforums->lang[\'carbon_copy_title\']}</td>\n</tr>\n<tr>\n<td class="pformleft">{$ibforums->lang[\'carbon_copy_desc\']}</td>\n<td class=\'pformright\'>\n <textarea name=\'carbon_copy\' rows=\'5\' cols=\'40\'>$names</textarea><br />\n <input type=\'button\' class=\'forminput\' name=\'findusers\' onclick=\'find_users()\' value=\'{$ibforums->lang[\'find_user_names\']}\' />\n</td>\n</tr>', 'mass_pm_box', '$names=""', 1035406235, 0);||~&~||(1, 'skin_online', '<!-- Entry for {$session[\'member_id\']} -->\n              <tr>\n                <td class=\'row1\'>{$session[\'member_name\']}</td>\n                <td class=\'row1\'>{$session[\'where_line\']}</td>\n                <td class=\'row1\' align=\'center\'>{$session[\'running_time\']}</td>\n                <td class=\'row1\' align=\'center\'>{$session[\'msg_icon\']}</td>\n              </tr>\n              <!-- End of Entry -->', 'show_row', '$session', 1035406235, 0);||~&~||(1, 'skin_online', '<!-- End content Table -->\n            <tr>\n            <td colspan=\'4\' class=\'darkrow1\' align=\'center\' valign=\'middle\'>\n             <form method=\'post\' action=\'{$ibforums->base_url}act=Online&amp;CODE=listall\'>\n             <b>{$ibforums->lang[\'s_by\']}&nbsp;</b>\n             <select class=\'forminput\' name=\'sort_key\'>{$sort_key}</select>\n             <select class=\'forminput\' name=\'show_mem\'>&nbsp;{$show_mem}</select>\n             <select class=\'forminput\' name=\'sort_order\'>&nbsp;{$sort_order}</select>\n             <input type=\'submit\' value=\'{$ibforums->lang[\'s_go\']}\' class=\'forminput\'>\n             <form>\n            </td>\n            </tr>\n            </table>\n           </div>\n          <br />\n          <div align=\'left\'>$links</div>', 'Page_end', '$show_mem, $sort_order, $sort_key, $links', 1035406235, 0);||~&~||(1, 'skin_online', '<script language=\'Javascript\' type=\'text/javascript\'>\n		<!--\n		function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\n			if (posleft != 0) { x = posleft }\n			if (postop  != 0) { y = postop  }\n		\n			if (!scroll) { scroll = 1 }\n			if (!resize) { resize = 1 }\n		\n			if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n			  X = (screen.width  - width ) / 2;\n			  Y = (screen.height - height) / 2;\n			}\n			if (scroll != 0) { scroll = 1 }\n		\n			var Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n	     }\n		//-->\n	</script>\n	\n    <div align=\'left\'>$links</div>\n    <br />\n    <div class="tableborder">\n      <div class=\'maintitle\'>&nbsp;&nbsp;{$ibforums->lang[\'page_title\']}</div>\n	  <table cellpadding=\'4\' cellspacing=\'1\' border=\'0\' width=\'100%\'>\n		<tr>\n		   <th align=\'left\' width=\'30%\' class=\'titlemedium\'>{$ibforums->lang[\'member_name\']}</th>\n		   <th align=\'left\' width=\'30%\' class=\'titlemedium\'>{$ibforums->lang[\'where\']}</th>\n		   <th align=\'center\' width=\'20%\' class=\'titlemedium\'>{$ibforums->lang[\'time\']}</th>\n		   <th align=\'left\' width=\'10%\' class=\'titlemedium\'>&nbsp;</th>\n		</tr>', 'Page_header', '$links', 1035406235, 0);||~&~||(1, 'skin_poll', '<script type="text/javascript">\nfunction go_gadget_show()\n{\n	window.location = "{$ibforums->base_url}&act=ST&f=$fid&t=$tid&mode=show&st={$ibforums->input[\'start\']}";\n}\nfunction go_gadget_vote()\n{\n	window.location = "{$ibforums->base_url}&act=ST&f=$fid&t=$tid&st={$ibforums->input[\'start\']}";\n}\n</script>', 'poll_javascript', '$tid,$fid', 1035406235, 0);||~&~||(1, 'skin_poll', '<input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'poll_add_vote\']}\' title="{$ibforums->lang[\'tt_poll_vote\']}" class=\'forminput\' />', 'button_vote', '', 1035406235, 0);||~&~||(1, 'skin_poll', '<input type=\'submit\' name=\'nullvote\' value=\'{$ibforums->lang[\'poll_null_vote\']}\' title="{$ibforums->lang[\'tt_poll_null\']}" class=\'forminput\' />', 'button_null_vote', '', 1035406235, 0);||~&~||(1, 'skin_poll', '<input type=\'button\' value=\'{$ibforums->lang[\'pl_show_results\']}\' class=\'forminput\' title="{$ibforums->lang[\'tt_poll_show\']}" onclick=\'go_gadget_show()\' />', 'button_show_results', '', 1035406235, 0);||~&~||(1, 'skin_poll', '<input type=\'button\' name=\'viewresult\' value=\'{$ibforums->lang[\'pl_show_vote\']}\'  title="{$ibforums->lang[\'tt_poll_svote\']}" class=\'forminput\' onclick=\'go_gadget_vote()\' />', 'button_show_voteable', '', 1035406235, 0);||~&~||(1, 'skin_poll', '[ <a href="{$ibforums->base_url}act=Mod&amp;CODE=20&amp;f=$fid&amp;t=$tid&amp;auth_key=$key">{$ibforums->lang[\'ba_edit\']}</a> ]', 'edit_link', '$tid, $fid, $key=""', 1035406235, 0);||~&~||(1, 'skin_poll', '[ <a href="{$ibforums->base_url}act=Mod&amp;CODE=22&amp;f=$fid&amp;t=$tid&amp;auth_key=$key">{$ibforums->lang[\'ba_delete\']}</a> ]', 'delete_link', '$tid, $fid, $key=""', 1035406235, 0);||~&~||(1, 'skin_poll', '<tr>\n    <td class=\'row1\' colspan=\'3\'><input type="radio" name="poll_vote" value="$id" class="radiobutton" />&nbsp;<strong>$answer</strong></td>\n    </tr>', 'Render_row_form', '$votes, $id, $answer', 1035406235, 0);||~&~||(1, 'skin_poll', '<!--IBF.POLL_JS-->\n<form action="{$ibforums->base_url}act=Poll&amp;t=$tid" method="post">\n<div align="right" class="pformstrip">$edit &nbsp; $delete</div>\n<div class="tablepad" align="center">\n<table cellpadding="5" align="center">\n<tr>\n <td colspan=\'3\' align=\'center\'><b>$poll_q</b></td>\n</tr>', 'poll_header', '$tid, $poll_q, $edit, $delete', 1035406235, 0);||~&~||(1, 'skin_poll', '</table>\n</div>\n<div align="center" class="pformstrip"><!--IBF.VOTE-->&nbsp;<!--IBF.SHOW--></div>\n</form>', 'ShowPoll_footer', '', 1035406235, 0);||~&~||(1, 'skin_poll', '<tr>\n    <td class=\'row1\'>$answer</td>\n    <td class=\'row1\'> [ <b>$votes</b> ] </td>\n    <td class=\'row1\' align=\'left\'><img src=\'{$ibforums->vars[\'img_url\']}/bar_left.gif\' border=\'0\' width=\'4\' height=\'11\' align=\'middle\' alt=\'\' /><img src=\'{$ibforums->vars[\'img_url\']}/bar.gif\' border=\'0\' width=\'$width\' height=\'11\' align=\'middle\' alt=\'\' /><img src=\'{$ibforums->vars[\'img_url\']}/bar_right.gif\' border=\'0\' width=\'4\' height=\'11\' align=\'middle\' alt=\'\' />&nbsp;[$percentage%]</td>\n    </tr>', 'Render_row_results', '$votes, $id, $answer, $percentage, $width', 1035406235, 0);||~&~||(1, 'skin_poll', '<tr>\n    <td class=\'row1\' colspan=\'3\' align=\'center\'><strong>{$ibforums->lang[\'pv_total_votes\']}: $total_votes</strong></td>\n    </tr>', 'show_total_votes', '$total_votes', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'unreg_namestuff\']}</td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'guest_name\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'40\' name=\'UserName\' value=\'$data\' class=\'textinput\' /></td>\n</tr>', 'nameField_unreg', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n  <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'tt_poll_settings\']}</td>\n</tr>\n<tr>\n  <td class=\'pformleft\'><strong>{$ibforums->lang[\'poll_question\']}</strong></td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'250\' name=\'pollq\' value=\'{$ibforums->input[\'pollq\']}\' class=\'textinput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'poll_choices\']}<br /><br />$extra</td>\n  <td class=\'pformright\'><textarea cols=\'60\' rows=\'12\' name=\'PollAnswers\' class=\'textinput\'>$data</textarea><!--IBF.POLL_OPTIONS--></td>\n</tr>', 'poll_box', '$data, $extra=""', 1035406235, 0);||~&~||(1, 'skin_post', '<br /><input type=\'checkbox\' size=\'40\' value=\'1\' name=\'allow_disc\' class=\'forminput\' />&nbsp;{$ibforums->lang[\'poll_only\']}', 'poll_options', '', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n  <td class=\'pformstrip\' align=\'center\' style=\'text-align:center\' colspan="2">\n	<input type="submit" name="submit" value="$data" tabindex=\'4\' class=\'forminput\' accesskey=\'s\' />&nbsp;\n  </td>\n</tr>\n</table>\n</form>\n<br />\n<br clear="all" />', 'poll_end_form', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n <td class=\'pformstrip\' colspan="2">{$ibforums->lang[\'ib_code_buttons\']}</td>\n </tr>\n <tr>\n   <td class=\'pformleft\'>\n	   <input type=\'radio\' name=\'bbmode\' class=\'radiobutton\' value=\'ezmode\' onclick=\'setmode(this.value)\' />&nbsp;<b>{$ibforums->lang[\'bbcode_guided\']}</b><br />\n	   <input type=\'radio\' name=\'bbmode\' class=\'radiobutton\' value=\'normal\' onclick=\'setmode(this.value)\' checked="checked" />&nbsp;<b>{$ibforums->lang[\'bbcode_normal\']}</b>\n	   <script type=\'text/javascript\' src=\'html/ibfcode.js\'></script>\n   </td>\n   <td class=\'pformright\'>\n	   <input type=\'button\' accesskey=\'b\' value=\' B \'       onclick=\'simpletag("B")\' class=\'codebuttons\' name=\'B\' style="font-weight:bold" onmouseover="hstat(\'bold\')" />\n	   <input type=\'button\' accesskey=\'i\' value=\' I \'       onclick=\'simpletag("I")\' class=\'codebuttons\' name=\'I\' style="font-style:italic" onmouseover="hstat(\'italic\')" />\n	   <input type=\'button\' accesskey=\'u\' value=\' U \'       onclick=\'simpletag("U")\' class=\'codebuttons\' name=\'U\' style="text-decoration:underline" onmouseover="hstat(\'under\')" />\n	   \n	   <select name=\'ffont\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'FONT\')"  onmouseover="hstat(\'font\')">\n	   <option value=\'0\'>{$ibforums->lang[\'ct_font\']}</option>\n	   <option value=\'Arial\' style=\'font-family:Arial\'>{$ibforums->lang[\'ct_arial\']}</option>\n	   <option value=\'Times\' style=\'font-family:Times\'>{$ibforums->lang[\'ct_times\']}</option>\n	   <option value=\'Courier\' style=\'font-family:Courier\'>{$ibforums->lang[\'ct_courier\']}</option>\n	   <option value=\'Impact\' style=\'font-family:Impact\'>{$ibforums->lang[\'ct_impact\']}</option>\n	   <option value=\'Geneva\' style=\'font-family:Geneva\'>{$ibforums->lang[\'ct_geneva\']}</option>\n	   <option value=\'Optima\' style=\'font-family:Optima\'>Optima</option>\n	   </select><select name=\'fsize\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'SIZE\')" onmouseover="hstat(\'size\')">\n	   <option value=\'0\'>{$ibforums->lang[\'ct_size\']}</option>\n	   <option value=\'1\'>{$ibforums->lang[\'ct_sml\']}</option>\n	   <option value=\'7\'>{$ibforums->lang[\'ct_lrg\']}</option>\n	   <option value=\'14\'>{$ibforums->lang[\'ct_lest\']}</option>\n	   </select><select name=\'fcolor\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'COLOR\')" onmouseover="hstat(\'color\')">\n	   <option value=\'0\'>{$ibforums->lang[\'ct_color\']}</option>\n	   <option value=\'blue\' style=\'color:blue\'>{$ibforums->lang[\'ct_blue\']}</option>\n	   <option value=\'red\' style=\'color:red\'>{$ibforums->lang[\'ct_red\']}</option>\n	   <option value=\'purple\' style=\'color:purple\'>{$ibforums->lang[\'ct_purple\']}</option>\n	   <option value=\'orange\' style=\'color:orange\'>{$ibforums->lang[\'ct_orange\']}</option>\n	   <option value=\'yellow\' style=\'color:yellow\'>{$ibforums->lang[\'ct_yellow\']}</option>\n	   <option value=\'gray\' style=\'color:gray\'>{$ibforums->lang[\'ct_grey\']}</option>\n	   <option value=\'green\' style=\'color:green\'>{$ibforums->lang[\'ct_green\']}</option>\n	   </select>\n	   &nbsp; <a href=\'javascript:closeall();\' onmouseover="hstat(\'close\')">{$ibforums->lang[\'js_close_all_tags\']}</a>\n	   <br />\n	   <input type=\'button\' accesskey=\'h\' value=\' http:// \' onclick=\'tag_url()\'            class=\'codebuttons\' name=\'url\' onmouseover="hstat(\'url\')" />\n	   <input type=\'button\' accesskey=\'g\' value=\' IMG \'     onclick=\'tag_image()\'          class=\'codebuttons\' name=\'img\' onmouseover="hstat(\'img\')" />\n	   <input type=\'button\' accesskey=\'e\' value=\'  @  \'     onclick=\'tag_email()\'          class=\'codebuttons\' name=\'email\' onmouseover="hstat(\'email\')" />\n	   <input type=\'button\' accesskey=\'q\' value=\' QUOTE \'   onclick=\'simpletag("QUOTE")\'   class=\'codebuttons\' name=\'QUOTE\' onmouseover="hstat(\'quote\')" />\n	   <input type=\'button\' accesskey=\'p\' value=\' CODE \'    onclick=\'simpletag("CODE")\'    class=\'codebuttons\' name=\'CODE\' onmouseover="hstat(\'code\')" />\n	   <input type=\'button\' accesskey=\'l\' value=\' LIST \'     onclick=\'tag_list()\'          class=\'codebuttons\' name="LIST" onmouseover="hstat(\'list\')" />\n	   <!--<input type=\'button\' accesskey=\'l\' value=\' SQL \'     onclick=\'simpletag("SQL")\'     class=\'codebuttons\' name=\'SQL\'>\n	   <input type=\'button\' accesskey=\'t\' value=\' HTML \'    onclick=\'simpletag("HTML")\'    class=\'codebuttons\' name=\'HTML\'>-->\n	   <br />\n	   {$ibforums->lang[\'hb_open_tags\']}:&nbsp;<input type=\'text\' name=\'tagcount\' size=\'3\' maxlength=\'3\' style=\'font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;\' readonly="readonly" class=\'row1\' value="0" />\n	   &nbsp;<input type=\'text\' name=\'helpbox\' size=\'50\' maxlength=\'120\' style=\'width:auto;font-size:10px;font-family:verdana,arial;border:0px\' readonly="readonly" class=\'row1\' value="{$ibforums->lang[\'hb_start\']}" />\n	</td>\n   </tr>\n   <tr>\n     <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'post\']}</td>\n   </tr>\n   <tr>\n     <td class=\'pformleft\'>\n	   <!--SMILIE TABLE-->\n	   <br />\n	   (<a href=\'javascript:CheckLength()\'>{$ibforums->lang[\'check_length\']}</a>)\n     </td>\n     <td class="pformright" valign=\'top\'><textarea cols=\'70\' rows=\'15\' name=\'Post\' tabindex=\'3\' class=\'textinput\'>$data</textarea></td>\n   </tr>', 'pm_postbox_buttons', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n   <td class=\'pformstrip\' colspan="2">{$ibforums->lang[\'ib_code_buttons\']}</td>\n </tr>\n <tr>\n   <td class=\'pformleft\'>\n	   <input type=\'radio\' class=\'radiobutton\' name=\'bbmode\' value=\'ezmode\' onclick=\'setmode(this.value)\' />&nbsp;<b>{$ibforums->lang[\'bbcode_guided\']}</b><br />\n	   <input type=\'radio\' class=\'radiobutton\' name=\'bbmode\' value=\'normal\' onclick=\'setmode(this.value)\' checked="checked" />&nbsp;<b>{$ibforums->lang[\'bbcode_normal\']}</b>\n	   <script type=\'text/javascript\' src=\'html/ibfcode.js\'></script>\n   </td>\n   <td class=\'pformright\'>\n	   <input type=\'button\' accesskey=\'b\' value=\' B \'       onclick=\'simpletag("B")\' class=\'codebuttons\' name=\'B\' style="font-weight:bold" onmouseover="hstat(\'bold\')" />\n	   <input type=\'button\' accesskey=\'i\' value=\' I \'       onclick=\'simpletag("I")\' class=\'codebuttons\' name=\'I\' style="font-style:italic" onmouseover="hstat(\'italic\')" />\n	   <input type=\'button\' accesskey=\'u\' value=\' U \'       onclick=\'simpletag("U")\' class=\'codebuttons\' name=\'U\' style="text-decoration:underline" onmouseover="hstat(\'under\')" />\n	   \n	   <select name=\'ffont\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'FONT\')"  onmouseover="hstat(\'font\')">\n	   <option value=\'0\'>{$ibforums->lang[\'ct_font\']}</option>\n	   <option value=\'Arial\' style=\'font-family:Arial\'>{$ibforums->lang[\'ct_arial\']}</option>\n	   <option value=\'Times\' style=\'font-family:Times\'>{$ibforums->lang[\'ct_times\']}</option>\n	   <option value=\'Courier\' style=\'font-family:Courier\'>{$ibforums->lang[\'ct_courier\']}</option>\n	   <option value=\'Impact\' style=\'font-family:Impact\'>{$ibforums->lang[\'ct_impact\']}</option>\n	   <option value=\'Geneva\' style=\'font-family:Geneva\'>{$ibforums->lang[\'ct_geneva\']}</option>\n	   <option value=\'Optima\' style=\'font-family:Optima\'>Optima</option>\n	   </select><select name=\'fsize\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'SIZE\')" onmouseover="hstat(\'size\')">\n	   <option value=\'0\'>{$ibforums->lang[\'ct_size\']}</option>\n	   <option value=\'1\'>{$ibforums->lang[\'ct_sml\']}</option>\n	   <option value=\'7\'>{$ibforums->lang[\'ct_lrg\']}</option>\n	   <option value=\'14\'>{$ibforums->lang[\'ct_lest\']}</option>\n	   </select><select name=\'fcolor\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'COLOR\')" onmouseover="hstat(\'color\')">\n	   <option value=\'0\'>{$ibforums->lang[\'ct_color\']}</option>\n	   <option value=\'blue\' style=\'color:blue\'>{$ibforums->lang[\'ct_blue\']}</option>\n	   <option value=\'red\' style=\'color:red\'>{$ibforums->lang[\'ct_red\']}</option>\n	   <option value=\'purple\' style=\'color:purple\'>{$ibforums->lang[\'ct_purple\']}</option>\n	   <option value=\'orange\' style=\'color:orange\'>{$ibforums->lang[\'ct_orange\']}</option>\n	   <option value=\'yellow\' style=\'color:yellow\'>{$ibforums->lang[\'ct_yellow\']}</option>\n	   <option value=\'gray\' style=\'color:gray\'>{$ibforums->lang[\'ct_grey\']}</option>\n	   <option value=\'green\' style=\'color:green\'>{$ibforums->lang[\'ct_green\']}</option>\n	   </select>\n	   &nbsp; <a href=\'javascript:closeall();\' onmouseover="hstat(\'close\')">{$ibforums->lang[\'js_close_all_tags\']}</a>\n	   <br />\n	   <input type=\'button\' accesskey=\'h\' value=\' http:// \' onclick=\'tag_url()\'            class=\'codebuttons\' name=\'url\' onmouseover="hstat(\'url\')" />\n	   <input type=\'button\' accesskey=\'g\' value=\' IMG \'     onclick=\'tag_image()\'          class=\'codebuttons\' name=\'img\' onmouseover="hstat(\'img\')" />\n	   <input type=\'button\' accesskey=\'e\' value=\'  @  \'     onclick=\'tag_email()\'          class=\'codebuttons\' name=\'email\' onmouseover="hstat(\'email\')" />\n	   <input type=\'button\' accesskey=\'q\' value=\' QUOTE \'   onclick=\'simpletag("QUOTE")\'   class=\'codebuttons\' name=\'QUOTE\' onmouseover="hstat(\'quote\')" />\n	   <input type=\'button\' accesskey=\'p\' value=\' CODE \'    onclick=\'simpletag("CODE")\'    class=\'codebuttons\' name=\'CODE\' onmouseover="hstat(\'code\')" />\n	   <input type=\'button\' accesskey=\'l\' value=\' LIST \'     onclick=\'tag_list()\'          class=\'codebuttons\' name="LIST" onmouseover="hstat(\'list\')" />\n	   <!--<input type=\'button\' accesskey=\'l\' value=\' SQL \'     onclick=\'simpletag("SQL")\'     class=\'codebuttons\' name=\'SQL\'>\n	   <input type=\'button\' accesskey=\'t\' value=\' HTML \'    onclick=\'simpletag("HTML")\'    class=\'codebuttons\' name=\'HTML\'>-->\n	   <br />\n	   {$ibforums->lang[\'hb_open_tags\']}:&nbsp;<input type=\'text\' name=\'tagcount\' size=\'3\' maxlength=\'3\' style=\'font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;\' readonly="readonly" class=\'row1\' value="0" />\n	   &nbsp;<input type=\'text\' name=\'helpbox\' size=\'50\' maxlength=\'120\' style=\'width:auto;font-size:10px;font-family:verdana,arial;border:0px\' readonly="readonly" class=\'row1\' value="{$ibforums->lang[\'hb_start\']}" />\n	</td>\n   </tr>\n   <tr>\n     <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'post\']}</td>\n   </tr>\n   <tr>\n     <td class=\'pformleft\' align=\'center\'>\n	   <!--SMILIE TABLE-->\n	   <br /><div class=\'desc\'><strong><a href=\'javascript:CheckLength()\'>{$ibforums->lang[\'check_length\']}</a> &middot; <a href=\'javascript:bbc_pop()\'>{$ibforums->lang[\'bbc_help\']}</a></strong></div>\n     </td>\n     <td class="pformright" valign=\'top\'>\n     	<textarea cols=\'80\' rows=\'20\' name=\'Post\' tabindex=\'3\' class=\'textinput\'>$data</textarea></td>\n   </tr>\n   <tr>\n	<td class=\'pformleft\'><b>{$ibforums->lang[\'po_options\']}</b></td>\n	<td class=\'pformright\'>\n	 <!--IBF.EMO-->\n	 <!--IBF.SIG-->\n	 <!--IBF.TRACK-->\n	</td>\n   </tr>', 'postbox_buttons', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<input type=\'checkbox\' name=\'enableemo\' class=\'checkbox\' value=\'yes\' $checked />&nbsp;{$ibforums->lang[\'enable_emo\']}', 'get_box_enableemo', '$checked', 1035406235, 0);||~&~||(1, 'skin_post', '<br /><input type=\'checkbox\' name=\'enablesig\' class=\'checkbox\' value=\'yes\' $checked />&nbsp;{$ibforums->lang[\'enable_sig\']}', 'get_box_enablesig', '$checked', 1035406235, 0);||~&~||(1, 'skin_post', '<br /><input type=\'checkbox\' name=\'enabletrack\' class=\'checkbox\' value=\'1\' $checked />&nbsp;{$ibforums->lang[\'enable_track\']}', 'get_box_enabletrack', '$checked', 1035406235, 0);||~&~||(1, 'skin_post', '<br />{$ibforums->lang[\'already_sub\']}', 'get_box_alreadytrack', '', 1035406235, 0);||~&~||(1, 'skin_post', '<script language="javascript1.2" type="text/javascript">\n<!--\nvar MessageMax  = "{$ibforums->lang[\'the_max_length\']}";\nvar Override    = "{$ibforums->lang[\'override\']}";\nMessageMax      = parseInt(MessageMax);\nif ( MessageMax < 0 )\n{\n	MessageMax = 0;\n}\n	\nfunction emo_pop()\n{\n  window.open(\'index.{$ibforums->vars[\'php_ext\']}?act=legends&CODE=emoticons&s={$ibforums->session_id}\',\'Legends\',\'width=250,height=500,resizable=yes,scrollbars=yes\'); \n}\nfunction bbc_pop()\n{\n  window.open(\'index.{$ibforums->vars[\'php_ext\']}?act=legends&CODE=bbcode&s={$ibforums->session_id}\',\'Legends\',\'width=700,height=500,resizable=yes,scrollbars=yes\'); \n}	\nfunction CheckLength() {\n	MessageLength  = document.REPLIER.Post.value.length;\n	message  = "";\n		if (MessageMax > 0) {\n			message = "{$ibforums->lang[\'js_post\']}: {$ibforums->lang[\'js_max_length\']} " + MessageMax + " {$ibforums->lang[\'js_characters\']}.";\n		} else {\n			message = "";\n		}\n		alert(message + "      {$ibforums->lang[\'js_used\']} " + MessageLength + " {$ibforums->lang[\'js_characters\']}.");\n}\n	\n	function ValidateForm(isMsg) {\n		MessageLength  = document.REPLIER.Post.value.length;\n		errors = "";\n		\n		if (isMsg == 1)\n		{\n			if (document.REPLIER.msg_title.value.length < 2)\n			{\n				errors = "{$ibforums->lang[\'msg_no_title\']}";\n			}\n		}\n	\n		if (MessageLength < 2) {\n			 errors = "{$ibforums->lang[\'js_no_message\']}";\n		}\n		if (MessageMax !=0) {\n			if (MessageLength > MessageMax) {\n				errors = "{$ibforums->lang[\'js_max_length\']} " + MessageMax + " {$ibforums->lang[\'js_characters\']}. {$ibforums->lang[\'js_current\']}: " + MessageLength;\n			}\n		}\n		if (errors != "" && Override == "") {\n			alert(errors);\n			return false;\n		} else {\n			document.REPLIER.submit.disabled = true;\n			return true;\n		}\n	}\n	\n	// IBC Code stuff\n	var text_enter_url      = "{$ibforums->lang[\'jscode_text_enter_url\']}";\n	var text_enter_url_name = "{$ibforums->lang[\'jscode_text_enter_url_name\']}";\n	var text_enter_image    = "{$ibforums->lang[\'jscode_text_enter_image\']}";\n	var text_enter_email    = "{$ibforums->lang[\'jscode_text_enter_email\']}";\n	var text_enter_flash    = "{$ibforums->lang[\'jscode_text_enter_flash\']}";\n	var text_code           = "{$ibforums->lang[\'jscode_text_code\']}";\n	var text_quote          = "{$ibforums->lang[\'jscode_text_quote\']}";\n	var error_no_url        = "{$ibforums->lang[\'jscode_error_no_url\']}";\n	var error_no_title      = "{$ibforums->lang[\'jscode_error_no_title\']}";\n	var error_no_email      = "{$ibforums->lang[\'jscode_error_no_email\']}";\n	var error_no_width      = "{$ibforums->lang[\'jscode_error_no_width\']}";\n	var error_no_height     = "{$ibforums->lang[\'jscode_error_no_height\']}";\n	var prompt_start        = "{$ibforums->lang[\'js_text_to_format\']}";\n	\n	var help_bold           = "{$ibforums->lang[\'hb_bold\']}";\n	var help_italic         = "{$ibforums->lang[\'hb_italic\']}";\n	var help_under          = "{$ibforums->lang[\'hb_under\']}";\n	var help_font           = "{$ibforums->lang[\'hb_font\']}";\n	var help_size           = "{$ibforums->lang[\'hb_size\']}";\n	var help_color          = "{$ibforums->lang[\'hb_color\']}";\n	var help_close          = "{$ibforums->lang[\'hb_close\']}";\n	var help_url            = "{$ibforums->lang[\'hb_url\']}";\n	var help_img            = "{$ibforums->lang[\'hb_img\']}";\n	var help_email          = "{$ibforums->lang[\'hb_email\']}";\n	var help_quote          = "{$ibforums->lang[\'hb_quote\']}";\n	var help_list           = "{$ibforums->lang[\'hb_list\']}";\n	var help_code           = "{$ibforums->lang[\'hb_code\']}";\n	var help_click_close    = "{$ibforums->lang[\'hb_click_close\']}";\n	var list_prompt         = "{$ibforums->lang[\'js_tag_list\']}";\n	\n	\n	//-->\n</script>', 'get_javascript', '', 1035406235, 0);||~&~||(1, 'skin_post', '<!-- REG NAME -->', 'nameField_reg', '', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n   <td class=\'pformstrip\' colspan="2">{$ibforums->lang[\'tt_options\']}</td>\n  </tr>\n  <tr>\n    <td class=\'pformleft\'>{$ibforums->lang[\'mod_options\']}</td>\n    <td class=\'pformright\'>$jump</select></td>\n  </tr>', 'mod_options', '$jump', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n  <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'post_to_quote\']}</td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'post_to_quote_txt\']}</td>\n  <td class=\'pformright\'><textarea cols=\'60\' rows=\'12\' wrap=\'soft\' name=\'QPost\' class=\'textinput\'>{$data[\'post\']}</textarea><input type=\'hidden\' name=\'QAuthor\' value=\'{$data[\'author_id\']}\' /><input type=\'hidden\' name=\'QAuthorN\' value=\'{$data[\'author_name\']}\' /><input type=\'hidden\' name=\'QDate\'   value=\'{$data[\'post_date\']}\' /></td>\n</tr>', 'quote_box', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<br />\n<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'last_posts\']}</div>\n  <table cellpadding=\'6\' cellspacing=\'1\' border=\'0\' width=\'100%\'>', 'TopicSummary_top', '', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n    <td class=\'row4\' valign=\'top\' width=\'20%\'><b>{$data[\'author\']}</b></td>\n    <td class=\'row4\' valign=\'top\' width=\'80%\'>{$ibforums->lang[\'posted_on\']} {$data[\'date\']}</td>\n  </tr>\n  <tr>\n    <td class=\'row1\' valign=\'top\' width=\'20%\'>&nbsp;</td>\n    <td class=\'row1\' valign=\'top\' width=\'80%\'><span class=\'postcolor\'>{$data[\'post\']}</span></td>\n  </tr>', 'TopicSummary_body', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '</table>\n  <div class="pformstrip"><a href="javascript:PopUp(\'index.{$ibforums->vars[\'php_ext\']}?act=ST&amp;f={$ibforums->input[\'f\']}&amp;t={$ibforums->input[\'t\']}\',\'TopicSummary\',700,450,1,1)">{$ibforums->lang[\'review_topic\']}</a></div>\n</div>', 'TopicSummary_bottom', '', 1035406235, 0);||~&~||(1, 'skin_post', '<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'post_preview\']}</div>\n  <div class="row1" style="padding:6px"><div class=\'postcolor\'>$data</div></div>\n</div>\n<br />', 'preview', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<tr> \n          <td class="pformstrip" colspan="2">{$ibforums->lang[\'upload_title\']}</td>\n        </tr>\n        <tr> \n          <td class=\'pformleft\'>{$ibforums->lang[\'upload_text\']} $data</td>\n          <td class=\'pformright\' width="100%">\n           <table cellpadding=\'4\' cellspacing=\'0\' width=\'100%\' border=\'0\'>\n            <tr>\n             <td><input type=\'radio\' name=\'editupload\' value=\'keep\' checked></td>\n             <td width=\'100%\'><b>{$ibforums->lang[\'eu_keep\']}</b> ( $file_name )</td>\n            </tr>\n            <tr>\n             <td><input type=\'radio\' name=\'editupload\' value=\'delete\'></td>\n             <td width=\'100%\'><b>{$ibforums->lang[\'eu_delete\']}</b></td>\n            </tr>\n            <tr>\n             <td valign=\'middle\'><input type=\'radio\' name=\'editupload\' value=\'new\'></td>\n             <td><b>{$ibforums->lang[\'eu_new\']}</b><br /><input class=\'textinput\' type=\'file\' size=\'30\' name=\'FILE_UPLOAD\' onclick=\'document.REPLIER.editupload[2].checked=true;\' /></td>\n            </tr>\n           </table>\n          </td>\n        </tr>', 'edit_upload_field', '$data, $file_name=""', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n    <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'upload_title\']}</td>\n  </tr>\n  <tr>\n    <td class=\'pformleft\'>{$ibforums->lang[\'upload_text\']} $data</td>\n    <td class=\'pformright\'><input class=\'textinput\' type=\'file\' size=\'30\' name=\'FILE_UPLOAD\' /></td>\n  </tr>', 'Upload_field', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'errors_found\']}</div>\n  <div class="tablepad"><span class=\'postcolor\'>$data</span></div>\n</div>\n<br />', 'errors', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n  <td class=\'pformstrip\' align=\'center\' style=\'text-align:center\' colspan="2">\n	<input type="submit" name="submit" value="$data" tabindex=\'4\' class=\'forminput\' accesskey=\'s\' />&nbsp;\n	<input type="submit" name="preview" value="{$ibforums->lang[\'button_preview\']}" tabindex=\'5\' class=\'forminput\' />\n  </td>\n</tr>\n</table>\n</form>\n<br />\n<br clear="all" />', 'EndForm', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<table class=\'tablefill\' cellpadding=\'4\' align=\'center\'>\n<tr>\n<td align="center" colspan="{$ibforums->vars[\'emo_per_row\']}"><b>{$ibforums->lang[\'click_smilie\']}</b></td>\n</tr>\n<!--THE SMILIES-->\n<tr>\n<td align="center" colspan="{$ibforums->vars[\'emo_per_row\']}"><b><a href=\'javascript:emo_pop()\'>{$ibforums->lang[\'all_emoticons\']}</a></b></td>\n</tr>\n</table>', 'smilie_table', '', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'post_icon\']}</td>\n  <td class=\'pformright\'>\n	<input type="radio" class="radiobutton" name="iconid" value="1" />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon1.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="2"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon2.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="3"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon3.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="4"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon4.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="5"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon5.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="6"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon6.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="7"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon7.gif"  align=\'middle\' alt=\'\' /><br />\n	<input type="radio" class="radiobutton" name="iconid" value="8" />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon8.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="9"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon9.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="10"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon10.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="11"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon11.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="12"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon12.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="13"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon13.gif"  align=\'middle\' alt=\'\' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="14"  />&nbsp;&nbsp;<img src="{$ibforums->vars[\'img_url\']}/icon14.gif"  align=\'middle\' alt=\'\' /><br />\n    <input type="radio" class="radiobutton" name="iconid" value="0" checked="checked" />&nbsp;&nbsp;[ Use None ]\n  </td>\n </tr>', 'PostIcons', '', 1035406235, 0);||~&~||(1, 'skin_post', '<script language=\'Javascript\' type=\'text/javascript\'>\n	<!--\n	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\n		if (posleft != 0) { x = posleft }\n		if (postop  != 0) { y = postop  }\n	\n		if (!scroll) { scroll = 1 }\n		if (!resize) { resize = 1 }\n	\n		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n		  X = (screen.width  - width ) / 2;\n		  Y = (screen.height - height) / 2;\n		}\n		if (scroll != 0) { scroll = 1 }\n	\n		var Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n	 }\n	//-->\n</script>\n<table class=\'tableborder\' cellpadding="0" cellspacing="0" width="100%">\n<tr>\n <td class=\'maintitle\' colspan="2">&nbsp;&nbsp;$data</td>\n</tr>', 'table_top', '$data', 1035406235, 0);||~&~||(1, 'skin_post', '<!--FORUM RULES--><br />\n<!--START TABLE-->\n<!--NAME FIELDS-->\n<!--TOPIC TITLE-->\n<!--POLL BOX-->\n<!--POST BOX-->\n<!--QUOTE BOX-->\n<!--POST ICONS-->\n<!--UPLOAD FIELD-->\n<!--MOD OPTIONS-->\n<!--END TABLE-->', 'table_structure', '', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n  <td class=\'pformleft\'><b>{$ibforums->lang[\'edit_ops\']}</b></td>\n  <td class=\'pformright\'><input type=\'checkbox\' name=\'add_edit\' value=\'1\' $checked class=\'forminput\' />&nbsp;{$ibforums->lang[\'append_edit\']}</td>\n</tr>', 'add_edit_box', '$checked=""', 1035406235, 0);||~&~||(1, 'skin_post', '<tr>\n <td colspan="2" class=\'pformstrip\'>{$ibforums->lang[\'tt_topic_settings\']}</td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'topic_title\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'50\' name=\'TopicTitle\' value=\'{$data[TITLE]}\' tabindex=\'1\' class=\'forminput\' /></td>\n</tr>\n<tr>\n   <td class=\'pformleft\'>{$ibforums->lang[\'topic_desc\']}</td>\n   <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'40\' name=\'TopicDesc\' value=\'{$data[DESC]}\' tabindex=\'2\' class=\'forminput\' /></td>\n</tr>', 'topictitle_fields', '$data', 1035406235, 0);||~&~||(1, 'skin_printpage', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'tvo_title\']}&nbsp;$title</div>\n <div class=\'tablepad\'>\n  <b><a href=\'{$ibforums->base_url}act=Print&amp;client=printer&amp;f=$fid&amp;t=$tid\'>{$ibforums->lang[\'o_print_title\']}</a></b>\n  <br />\n  {$ibforums->lang[\'o_print_desc\']}\n  <br /><br />\n  <b><a href=\'{$ibforums->base_url}act=Print&amp;client=html&amp;f=$fid&amp;t=$tid\'>{$ibforums->lang[\'o_html_title\']}</a></b>\n  <br />\n  {$ibforums->lang[\'o_html_desc\']}\n  <br /><br />\n  <b><a href=\'{$ibforums->base_url}act=Print&amp;client=wordr&amp;f=$fid&amp;t=$tid\'>{$ibforums->lang[\'o_word_title\']}</a></b>\n  <br />\n  {$ibforums->lang[\'o_word_desc\']}\n </div>\n <div align=\'center\' class=\'pformstrip\'>&lt;&lt;<a href=\'{$ibforums->base_url}showtopic=$tid\'>{$ibforums->lang[\'back_topic\']}</a></div>\n</div>\n<br />', 'choose_form', '$fid, $tid, $title', 1035406235, 0);||~&~||(1, 'skin_printpage', '<table width=\'90%\' align=\'center\' cellpadding=\'6\' border=\'1\'>\n	<tr>\n	 <td bgcolor=\'#EEEEEE\'><font face=\'arial\' size=\'2\' color=\'#000000\'><b>{$ibforums->lang[\'by\']}: {$entry[\'author_name\']}</b> {$ibforums->lang[\'on\']} {$entry[\'post_date\']}</b></font></td>\n	</tr>\n	<tr>\n	 <td><font face=\'arial\' size=\'3\' color=\'#000000\'>{$entry[\'post\']}</font></td>\n	</tr>\n	</table>\n	<br />', 'pp_postentry', '$poster, $entry', 1035406235, 0);||~&~||(1, 'skin_printpage', '<center><font face=\'arial\' size=\'1\' color=\'#000000\'>Powered by Invision Power Board (http://www.invisionboard.com)<br />&copy; Invision Power Services (http://www.invisionpower.com)</font></center>', 'pp_end', '', 1035406235, 0);||~&~||(1, 'skin_printpage', '<html>\n    <head>\n      <title>{$ibforums->vars[\'board_name\']} [Powered by Invision Power Board]</title>\n    </head>\n    <body bgcolor=\'#FFFFFF\' alink=\'#000000\' vlink=\'#000000\' link=\'#000000\'>\n     <table width=\'90%\' border=\'0\' align=\'center\' cellpadding=\'6\'>\n      <tr>\n       <td><b><font face=\'arial\' size=\'5\' color=\'#4C77B6\'><b>{$ibforums->lang[\'title\']}</font></b>\n       	   <br /><font face=\'arial\' size=\'2\' color=\'#000000\'><b><a href=\'{$ibforums->base_url}act=ST&amp;f=$fid&amp;t=$tid\'>{$ibforums->lang[\'topic_here\']}</a></b></font>\n       </td>\n      </tr>\n      <tr>\n       <td><font face=\'arial\' size=\'2\' color=\'#000000\'><b>{$ibforums->vars[\'board_name\']} &gt; $forum_name &gt; <font color=\'red\'>$topic_title</font></b></font></td>\n      </tr>\n     </table>\n     <br />\n     <br />', 'pp_header', '$forum_name, $topic_title, $topic_starter,$fid, $tid', 1035406235, 0);||~&~||(1, 'skin_profile', '<tr>\n	<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'warn_level\']}</b></td>\n	<td align=\'left\' class=\'row1\'><a href="javascript:PopUp(\'{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view\',\'Pager\',\'500\',\'450\',\'0\',\'1\',\'1\',\'1\')">{$percent}</a>%: <a href=\'{$ibforums->base_url}act=warn&amp;type=minus&amp;mid={$mid}\' title=\'{$ibforums->lang[\'tt_warn_minus\']}\'><{WARN_MINUS}></a>{$img}<a href=\'{$ibforums->base_url}act=warn&amp;type=add&amp;mid={$mid}\' title=\'{$ibforums->lang[\'tt_warn_add\']}\'><{WARN_ADD}></a>\n</td>\n  </tr>', 'warn_level', '$mid, $img, $percent', 1035406235, 0);||~&~||(1, 'skin_profile', '<tr>\n	<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'warn_level\']}</b></td>\n	<td align=\'left\' class=\'row1\'><a href="javascript:PopUp(\'{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view\',\'Pager\',\'500\',\'450\',\'0\',\'1\',\'1\',\'1\')">{$percent}</a>%: {$img}</td>\n  </tr>', 'warn_level_no_mod', '$mid, $img, $percent', 1035406235, 0);||~&~||(1, 'skin_profile', '<tr>\n	<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'rating_level\']}</b></td>\n	<td align=\'left\' class=\'row1\'><a href=\'{$ibforums->base_url}act=warn&amp;type=minus&amp;mid={$mid}\' title=\'{$ibforums->lang[\'tt_warn_minus\']}\'><{WARN_MINUS}></a> &lt;&nbsp;$min ( <a href="javascript:PopUp(\'{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view\',\'Pager\',\'500\',\'450\',\'0\',\'1\',\'1\',\'1\')">{$level}</a> ) $max&nbsp;&gt; <a href=\'{$ibforums->base_url}act=warn&amp;type=add&amp;mid={$mid}\' title=\'{$ibforums->lang[\'tt_warn_add\']}\'><{WARN_ADD}></a></td>\n  </tr>', 'warn_level_rating', '$mid, $level,$min=0,$max=10', 1035406235, 0);||~&~||(1, 'skin_profile', '<tr>\n	<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'rating_level\']}</b></td>\n	<td align=\'left\' class=\'row1\'>&lt;&nbsp;$min ( <a href="javascript:PopUp(\'{$ibforums->base_url}act=warn&amp;mid={$mid}&amp;CODE=view\',\'Pager\',\'500\',\'450\',\'0\',\'1\',\'1\',\'1\')">{$level}</a> ) $max&nbsp;&gt;</td>\n  </tr>', 'warn_level_rating_no_mod', '$mid, $level,$min=0,$max=10', 1035406235, 0);||~&~||(1, 'skin_profile', '<img src="$show_photo" border="0" alt="User Photo" $show_width $show_height />', 'get_photo', '$show_photo, $show_width, $show_height', 1035406235, 0);||~&~||(1, 'skin_profile', '<div id="photowrap">\n <div id="phototitle">$name</div>\n <div id="photoimg">$photo</div>\n</div>', 'show_photo', '$name, $photo', 1035406235, 0);||~&~||(1, 'skin_profile', '<html>\n <head>\n  <title>$name</title>\n  <style type="text/css">\n	 form { display:inline; }\n	 img  { vertical-align:middle }\n	 BODY { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; margin-left:5%;margin-right:5%;margin-top:5px;  }\n	 TABLE, TR, TD { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; }\n	 a:link, a:visited, a:active { text-decoration: underline; color: #000 }\n	 a:hover { color: #465584; text-decoration:underline }\n	 #profilename { font-size:28px; font-weight:bold; }\n	 #photowrap { padding:6px; }\n	 #phototitle { font-size:24px; border-bottom:1px solid black }\n	 #photoimg   { text-align:center; margin-top:15px } \n	 .plainborder { border:1px solid #345487;background-color:#F5F9FD }\n	 .tableborder { border:1px solid #345487;background-color:#FFF }\n	 .tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px }\n	 .tablepad    { background-color:#F5F9FD;padding:6px }\n	 .tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }\n	 .row1 { background-color: #F5F9FD }\n	 .row2 { background-color: #DFE6EF }\n	 .row3 { background-color: #EEF2F7 }\n	 .row4 { background-color: #E4EAF2 }\n  </style>\n  <script language=\'javascript\' type="text/javascript">\n  <!--\n   function redirect_to(where, closewin)\n   {\n	  document.location= \'$ibforums->base_url\' + where;\n	  \n	  if (closewin == 1)\n	  {\n		  self.close();\n	  }\n   }\n  //-->\n  </script>\n </head>\n<body>\n<table width="100%" height="100%">\n<tr>\n <td valign="middle" align="center" width="400">\n	<div id="phototitle">$name</div>\n	<br />\n	<table class="tablebasic" cellspacing="6">\n	<tr>\n	 <td valign="middle" class="row1">$photo</td>\n	 <td width="100%" class="row1" valign="bottom">\n	   <table class="tablebasic" cellpadding="5">\n		 <tr>\n		   <td nowrap="nowrap">{$ibforums->lang[\'email\']}</td>\n		   <td width="100%">{$info[\'email\']}</td>\n		 </tr>\n		 <tr>\n		  <td nowrap="nowrap">{$ibforums->lang[\'integ_msg\']}</td>\n		  <td width="100%">{$info[\'integ_msg\']}</td>\n	     </tr>\n		 <tr>\n		   <td nowrap="nowrap">{$ibforums->lang[\'aim\']}</td>\n		   <td width="100%">{$info[\'aim_name\']}</td>\n		 </tr>\n		 <tr>\n		   <td nowrap="nowrap">{$ibforums->lang[\'icq\']}</td>\n		   <td width="100%">{$info[\'icq_number\']}</td>\n		 </tr>\n		 <tr>\n		   <td nowrap="nowrap">{$ibforums->lang[\'yahoo\']}</td>\n		   <td width="100%">{$info[\'yahoo\']}</td>\n		 </tr>\n		 <tr>\n		   <td nowrap="nowrap">{$ibforums->lang[\'msn\']}</td>\n		   <td width="100%">{$info[\'msn_name\']}</td>\n		 </tr>\n		 <tr>\n		   <td nowrap="nowrap">{$ibforums->lang[\'pm\']}</b></td>\n		   <td><a href=\'javascript:redirect_to("&act=Msg&;CODE=4&MID={$info[\'mid\']}", 1);\'>{$ibforums->lang[\'click_here\']}</a></td>\n		 </tr>\n		</td>\n	   </tr>\n	  </table>\n	 </td>\n	</tr>\n	</table>\n  </td>\n </tr>\n</table>\n</body>\n</html>', 'show_card_download', '$name, $photo, $info', 1035406235, 0);||~&~||(1, 'skin_profile', '<script language=\'javascript\' type="text/javascript">\n<!--\n function redirect_to(where, closewin)\n {\n 	opener.location= \'$ibforums->base_url\' + where;\n 	\n 	if (closewin == 1)\n 	{\n 		self.close();\n 	}\n }\n//-->\n</script>\n<div id="photowrap">\n <div id="phototitle">$name</div>\n <br />\n <table class="tablebasic" cellspacing="6">\n <tr>\n  <td valign="middle" class="row1">$photo</td>\n  <td width="100%" class="row1" valign="bottom">\n    <table class="tablebasic" cellpadding="5">\n      <tr>\n        <td nowrap="nowrap">{$ibforums->lang[\'email\']}</td>\n		<td width="100%">{$info[\'email\']}</td>\n	  </tr>\n	  <tr>\n		<td nowrap="nowrap">{$ibforums->lang[\'integ_msg\']}</td>\n		<td width="100%">{$info[\'integ_msg\']}</td>\n	  </tr>\n	  <tr>\n		<td nowrap="nowrap">{$ibforums->lang[\'aim\']}</td>\n		<td width="100%">{$info[\'aim_name\']}</td>\n	  </tr>\n	  <tr>\n		<td nowrap="nowrap">{$ibforums->lang[\'icq\']}</td>\n		<td width="100%">{$info[\'icq_number\']}</td>\n	  </tr>\n	  <tr>\n		<td nowrap="nowrap">{$ibforums->lang[\'yahoo\']}</td>\n		<td width="100%">{$info[\'yahoo\']}</td>\n	  </tr>\n	  <tr>\n		<td nowrap="nowrap">{$ibforums->lang[\'msn\']}</td>\n		<td width="100%">{$info[\'msn_name\']}</td>\n	  </tr>\n	  <tr>\n		<td nowrap="nowrap">{$ibforums->lang[\'pm\']}</b></td>\n		<td><a href=\'javascript:redirect_to("&amp;act=Msg&amp;CODE=4&amp;MID={$info[\'mid\']}", 1);\'>{$ibforums->lang[\'click_here\']}</a></td>\n	  </tr>\n     </td>\n    </tr>\n   </table>\n  </td>\n </tr>\n </table>\n</div>\n<div align="center">\n  <a href="{$ibforums->base_url}act=Profile&amp;CODE=showcard&amp;MID={$info[\'mid\']}&amp;download=1">{$ibforums->lang[\'ac_download\']}</a>\n  &middot; <a href="javascript:self.close();">{$ibforums->lang[\'ac_close\']}</a>\n</div>', 'show_card', '$name, $photo, $info', 1035406235, 0);||~&~||(1, 'skin_profile', '&middot; <a href=\'{$info[\'base_url\']}act=UserCP&amp;CODE=22\'>{$ibforums->lang[\'edit_my_sig\']}</a> &middot;\n<a href=\'{$info[\'base_url\']}act=UserCP&amp;CODE=24\'>{$ibforums->lang[\'edit_avatar\']}</a> &middot;\n<a href=\'{$info[\'base_url\']}act=UserCP&amp;CODE=01\'>{$ibforums->lang[\'edit_profile\']}</a>', 'user_edit', '$info', 1035406235, 0);||~&~||(1, 'skin_profile', '<script language=\'Javascript\' type=\'text/javascript\'>\n	<!--\n	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\n		if (posleft != 0) { x = posleft }\n		if (postop  != 0) { y = postop  }\n	\n		if (!scroll) { scroll = 1 }\n		if (!resize) { resize = 1 }\n	\n		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n		  X = (screen.width  - width ) / 2;\n		  Y = (screen.height - height) / 2;\n		}\n		if (scroll != 0) { scroll = 1 }\n	\n		var Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n	 }\n	//-->\n</script>\n<table class="tablebasic" cellspacing="0" cellpadding="2">\n<tr>\n <td>{$info[\'photo\']}</td>\n <td width="100%" valign="bottom">\n   <div id="profilename">{$info[\'name\']}</div>\n   <div>\n	 <a href=\'{$info[\'base_url\']}act=Search&amp;CODE=getalluser&amp;mid={$info[\'mid\']}\'>{$ibforums->lang[\'find_posts\']}</a> &middot;\n	 <a href=\'{$info[\'base_url\']}act=Msg&amp;CODE=02&amp;MID={$info[\'mid\']}\'>{$ibforums->lang[\'add_to_contact\']}</a>\n	 <!--MEM OPTIONS-->\n   </div>\n </td>\n</tr>\n</table>\n<br />\n<table cellpadding=\'0\' align=\'center\' cellspacing=\'2\' border=\'0\' width="100%">\n  <tr>\n	<td width=\'50%\' valign=\'top\' class="plainborder">\n	 <table cellspacing="1" cellpadding=\'6\' width=\'100%\'>\n	  <tr>\n		<td align=\'center\' colspan=\'2\' class=\'maintitle\'>{$ibforums->lang[\'active_stats\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'total_posts\']}</b></td>\n		<td align=\'left\' width=\'70%\' class=\'row1\'><b>{$info[\'posts\']}</b><br />( {$info[\'total_pct\']}% {$ibforums->lang[\'total_percent\']} )</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'posts_per_day\']}</b></td>\n		<td align=\'left\' class=\'row1\'><b>{$info[\'posts_day\']}</b></td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'joined\']}</b></td>\n		<td align=\'left\' class=\'row1\'><b>{$info[\'joined\']}</b></td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'fav_forum\']}</b></td>\n		<td align=\'left\' class=\'row1\'><a href=\'{$info[\'base_url\']}act=SF&amp;f={$info[\'fav_id\']}\'>{$info[\'fav_forum\']}</a><br />{$info[\'fav_posts\']} {$ibforums->lang[\'fav_posts\']}<br />( {$info[\'percent\']}% {$ibforums->lang[\'fav_percent\']} )</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'user_local_time\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'local_time\']}</td>\n	  </tr>\n	  </table>\n	</td>\n	\n	<!-- Communication -->\n	\n   <td width=\'50%\' valign=\'top\' class="plainborder">\n	 <table cellspacing="1" cellpadding=\'6\' width=\'100%\'>\n	  <tr>\n		<td align=\'center\' colspan=\'2\' class=\'maintitle\'>{$ibforums->lang[\'communicate\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'email\']}</b></td>\n		<td align=\'left\' width=\'70%\' class=\'row1\'>{$info[\'email\']}</td>\n	  </tr>\n	   <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'integ_msg\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'integ_msg\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'aim\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'aim_name\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'icq\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'icq_number\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'yahoo\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'yahoo\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'msn\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'msn_name\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'pm\']}</b></td>\n		<td align=\'left\' class=\'row1\'><a href=\'{$info[\'base_url\']}act=Msg&amp;CODE=4&amp;MID={$info[\'mid\']}\'>{$ibforums->lang[\'click_here\']}</a></td>\n	  </tr>\n	  </table>\n	</td>\n	\n	<!-- END CONTENT ROW 1 -->\n	<!-- information -->\n	\n  </tr>\n  <tr>\n	<td width=\'50%\' valign=\'top\' class="plainborder">\n	 <table cellspacing="1" cellpadding=\'6\' width=\'100%\'>\n	  <tr>\n		<td align=\'center\' colspan=\'2\' class=\'maintitle\'>{$ibforums->lang[\'info\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'homepage\']}</b></td>\n		<td align=\'left\' width=\'70%\' class=\'row1\'>{$info[\'homepage\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'birthday\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'birthday\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'location\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'location\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'interests\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'interests\']}</td>\n	  </tr>\n	  <!--{CUSTOM.FIELDS}-->\n	  </table>\n	</td>\n	\n	<!-- Profile -->\n	\n   <td width=\'50%\' valign=\'top\' class="plainborder">\n	 <table cellspacing="1" cellpadding=\'6\' width=\'100%\'>\n	  <tr>\n		<td align=\'center\' colspan=\'2\' class=\'maintitle\'>{$ibforums->lang[\'post_detail\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" width=\'30%\' valign=\'top\'><b>{$ibforums->lang[\'mgroup\']}</b></td>\n		<td align=\'left\' width=\'70%\'  class=\'row1\'>{$info[\'group_title\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'mtitle\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'member_title\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'avatar\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'avatar\']}</td>\n	  </tr>\n	  <tr>\n		<td class="row3" valign=\'top\'><b>{$ibforums->lang[\'siggie\']}</b></td>\n		<td align=\'left\' class=\'row1\'>{$info[\'signature\']}</td>\n	  </tr>\n	  <!--{WARN_LEVEL}-->\n	  </table>\n	</td>\n	</tr>\n</table>\n<div class=\'tableborder\'>\n <div class=\'pformstrip\' align=\'center\'>&lt;( <a href=\'javascript:history.go(-1)\'>{$ibforums->lang[\'back\']}</a> )</div>\n</div>', 'show_profile', '$info', 1035406235, 0);||~&~||(1, 'skin_profile', '<tr>\n              <td class="row3" valign=\'top\'><b>$title</b></td>\n              <td align=\'left\' class=\'row1\'>$value</td>\n            </tr>', 'custom_field', '$title, $value=""', 1035406235, 0);||~&~||(1, 'skin_register', '<html>\n      <head>\n       <title>{$ibforums->lang[\'cpf_title\']}</title>\n       <!--<link rel=\'stylesheet\' href=\'style_sheets/stylesheet_<{css_id}>.css\' type=\'text/css\'>-->\n      </head>\n     <body bgcolor=\'white\'>\n     <table cellpadding=\'0\' cellspacing=\'4\' border=\'0\' width=\'95%\' align=\'center\'>\n     <tr>\n        <td valign=\'middle\' align=\'left\'>\n        	<span class=\'pagetitle\'>{$ibforums->vars[\'board_name\']}: {$ibforums->lang[\'cpf_title\']}</span>\n        	<br /><br />\n        	<b><span style=\'font-size:12px\'>{$ibforums->lang[\'cpf_perm_parent\']}</span></b>\n        	<br /><br />\n        	{$ibforums->lang[\'cpf_fax\']} {$ibforums->vars[\'coppa_fax\']}\n        	<br /><br />\n        	{$ibforums->lang[\'cpf_address\']}\n        	<br />\n        	{$ibforums->vars[\'coppa_address\']}\n        \n        </td>\n     </tr>\n     </table>\n     <br />\n     <table cellpadding=\'4\' cellspacing=\'2\' border=\'1\' width=\'95%\' align=\'center\'>\n      <tr>\n		<td width=\'40%\'>{$ibforums->lang[\'user_name\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n		<tr>\n		<td width=\'40%\'>{$ibforums->lang[\'pass_word\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n		<tr>\n		<td width=\'40%\'>{$ibforums->lang[\'email_address\']}</td>\n		<td>&nbsp;</td>\n	  </tr>\n     </table>\n     <br />\n     <table cellpadding=\'0\' cellspacing=\'4\' border=\'0\' width=\'95%\' align=\'center\'>\n     <tr>\n        <td valign=\'middle\' align=\'left\'>\n        	<b><span style=\'font-size:12px\'>{$ibforums->lang[\'cpf_sign\']}</span></b>\n        </td>\n     </tr>\n     </table>\n     <br />\n     <table cellpadding=\'10\' cellspacing=\'2\' border=\'1\' width=\'95%\' align=\'center\'>\n      <tr>\n		<td width=\'40%\'>{$ibforums->lang[\'cpf_name\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n		<tr>\n		<td width=\'40%\'>{$ibforums->lang[\'cpf_relation\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n		<tr>\n		<td width=\'40%\'>{$ibforums->lang[\'cpf_signature\']}</td>\n		<td>&nbsp;</td>\n	    </tr>\n	    <tr>\n		<td width=\'40%\'>{$ibforums->lang[\'cpf_email\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n		<tr>\n		<td width=\'40%\'>{$ibforums->lang[\'cpf_phone\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n		<tr>\n		<td width=\'40%\'>{$ibforums->lang[\'cpf_date\']}</td>\n		<td>&nbsp;</td>\n		</tr>\n     </table>\n    </body>\n  </html>', 'coppa_form', '', 1035406235, 0);||~&~||(1, 'skin_register', '<div class=\'tableborder\'>\n  <div class=\'maintitle\'>{$ibforums->lang[\'cp2_title\']}</div>\n   <table cellpadding=\'3\' cellspacing=\'1\' border=\'0\' width=\'100%\'>\n   <tr>\n   <td class=\'row1\' align=\'left\'>\n	   {$ibforums->lang[\'cp2_text\']}\n	   <br /><br />\n	   <center><span style=\'font-weight:bold;font-size:12px\'>\n		&lt;&lt; <a href=\'{$ibforums->base_url}\'>{$ibforums->lang[\'cp2_cancel\']}</a>\n	   - <a href=\'{$ibforums->base_url}act=Reg&amp;coppa_pass=1&amp;coppa_user=1\'>{$ibforums->lang[\'cp2_continue\']}</a> &gt;&gt;\n	   </span></center>\n   </td>\n   </tr>\n   <tr>\n   <td valign=\'left\' class=\'titlemedium\'>{$ibforums->lang[\'coppa_form\']}</td>\n   </tr>\n   <tr>\n	<td class=\'row1\' align=\'left\'>{$ibforums->lang[\'coppa_form_text\']} <a href=\'mailto:{$ibforums->vars[\'email_in\']}\'>{$ibforums->vars[\'email_in\']}</a></td>\n   </tr>\n   </table>\n</div>', 'coppa_two', '', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'registration_form\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'coppa_info\']}</div>\n  <div class="tablepad"  align="center">\n	<span class="postcolor">\n	  <strong>\n	  {$ibforums->lang[\'coppa_link\']}\n	  <br /><br />\n	  &lt; <a href=\'{$ibforums->base_url}act=Reg&amp;coppa_pass=1\'>{$ibforums->lang[\'coppa_date_before\']} $coppadate</a>\n	  - <a href=\'{$ibforums->base_url}act=Reg&amp;CODE=coppa_two\'>{$ibforums->lang[\'coppa_date_after\']} $coppadate</a> &gt;\n	  </strong>\n	</span>\n  </div>\n  <div class="pformstrip">{$ibforums->lang[\'coppa_form\']}</div>\n  <div class="tablepad">{$ibforums->lang[\'coppa_form_text\']} <a href=\'mailto:{$ibforums->vars[\'email_in\']}\'>{$ibforums->vars[\'email_in\']}</a></div>\n</div>', 'coppa_start', '$coppadate', 1035406235, 0);||~&~||(1, 'skin_register', '<form action="{$ibforums->base_url}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'Reg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'11\' />\n<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'lost_pass_form\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'lp_header\']}</div>\n  <div class="tablepad"><span style="line-height:140%">{$ibforums->lang[\'lp_text\']}</span></div>\n  <div class="pformstrip">{$ibforums->lang[\'complete_form\']}</div>\n  <table class="tablebasic">\n  <tr>\n   <td class="pformleft"><strong>{$ibforums->lang[\'lp_user_name\']}</strong></td>\n   <td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'member_name\' class=\'forminput\' /></td>\n  </tr>\n  </table>\n</div>\n<!--{REG.ANTISPAM}-->\n<br />\n<div class="tableborder">\n   <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'lp_send\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'lost_pass_form', '$lasid=""', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tableborder">\n  <div class="maintitle"><!-- --></div>\n  <div class="pformstrip">{$ibforums->lang[\'registration_process\']}</div>\n  <div class="tablepad">{$ibforums->lang[\'thank_you\']} {$member[\'name\']}. {$ibforums->lang[\'auth_text\']} {$member[\'email\']}</div>\n</div>', 'show_authorise', '$member', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'rv_title\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'rv_process\']}</div>\n  <div class="tablepad">{$ibforums->lang[\'rv_done\']}</div>\n</div>', 'show_revalidated', '', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'lpf_title\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'registration_process\']}</div>\n  <div class="tablepad">{$ibforums->lang[\'lpass_text\']}</div>\n</div>', 'show_lostpasswait', '$member', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tableborder">\n  <div class="maintitle"><!-- --></div>\n  <div class="pformstrip">{$ibforums->lang[\'registration_process\']}</div>\n  <div class="tablepad">{$ibforums->lang[\'thank_you\']} {$member[\'name\']}. {$ibforums->lang[\'preview_reg_text\']}</div>\n</div>', 'show_preview', '$member', 1035406235, 0);||~&~||(1, 'skin_register', '<form action="{$ibforums->base_url}" method="post" name=\'REG\'>\n<input type=\'hidden\' name=\'act\' value=\'Reg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'reval2\' />\n<div>{$ibforums->lang[\'rv_ins\']}</div>\n<br />\n<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'rv_title\']}</div>\n  <table class="tablebasic">\n   <tr>\n	<td class="pformleft"><strong>{$ibforums->lang[\'rv_name\']}</strong></td>\n	<td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'64\' name=\'username\' value=\'$name\' class=\'forminput\' /></td>\n   </tr>\n  </table>\n  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'rv_go\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'show_revalidate_form', '$name=""', 1035406235, 0);||~&~||(1, 'skin_register', '<script language=\'javascript\' type="text/javascript">\n<!--\nfunction Validate() {\n	// Check for Empty fields\n	if (document.REG.uid.value == "" || document.REG.aid.value == "") {\n		alert ("{$ibforums->lang[\'js_blanks\']}");\n		return false;\n	}\n}\n//-->\n</script>\n<form action="{$ibforums->base_url}" method="post" name=\'REG\' onsubmit=\'return Validate()\'>\n<input type=\'hidden\' name=\'act\' value=\'Reg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'03\' />\n<input type=\'hidden\' name=\'type\' value=\'lostpass\' />\n<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'dumb_header\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'lpf_title\']}</div>\n   <!--IBF.INPUT_TYPE-->\n   <tr>\n	<td class="pformleft"><strong>{$ibforums->lang[\'lpf_pass1\']}</strong><br><em>{$ibforums->lang[\'lpf_pass11\']}</em></td>\n	<td class="pformright"><input type=\'password\' size=\'32\' maxlength=\'32\' name=\'pass1\' class=\'forminput\' /></td>\n   </tr>\n   <tr>\n	<td class="pformleft"><strong>{$ibforums->lang[\'lpf_pass2\']}</strong><br><em>{$ibforums->lang[\'lpf_pass22\']}</em></td>\n	<td class="pformright"><input type=\'password\' size=\'32\' maxlength=\'32\' name=\'pass2\' class=\'forminput\' /></td>\n   </tr>\n  </table>\n \n  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'dumb_submit\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'show_lostpass_form', '', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tablepad">{$ibforums->lang[\'dumb_text\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'complete_form\']}</div>\n  <table class="tablebasic">\n   <tr>\n	<td class="pformleft"><strong>{$ibforums->lang[\'user_id\']}</strong></td>\n	<td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'uid\' class=\'forminput\' /></td>\n   </tr>\n   <tr>\n	<td class="pformleft"><strong>{$ibforums->lang[\'val_key\']}</strong></td>\n	<td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'50\' name=\'aid\' class=\'forminput\' /></td>\n   </tr>', 'show_lostpass_form_manual', '', 1035406235, 0);||~&~||(1, 'skin_register', '<input type=\'hidden\' name=\'uid\' value=\'$uid\'  />\n  <input type=\'hidden\' name=\'aid\' value=\'$aid\'  />\n  <table class="tablebasic">', 'show_lostpass_form_auto', '$aid,$uid', 1035406235, 0);||~&~||(1, 'skin_register', '<script language=\'javascript\' type="text/javascript">\n<!--\nfunction Validate() {\n	// Check for Empty fields\n	if (document.REG.uid.value == "" || document.REG.aid.value == "") {\n		alert ("{$ibforums->lang[\'js_blanks\']}");\n		return false;\n	}\n}\n//-->\n</script>\n<form action="{$ibforums->base_url}" method="post" name=\'REG\' onsubmit=\'return Validate()\'>\n<input type=\'hidden\' name=\'act\' value=\'Reg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'03\' />\n<input type=\'hidden\' name=\'type\' value=\'$type\' />\n<div class="tableborder">\n  <div class="titlemedium">{$ibforums->lang[\'dumb_header\']}</div>\n  <div class="tablepad">{$ibforums->lang[\'dumb_text\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'complete_form\']}</div>\n  <table class="tablebasic">\n   <tr>\n	<td class="pformleft">{$ibforums->lang[\'user_id\']}</td>\n	<td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'uid\' class=\'forminput\' /></td>\n   </tr>\n   <tr>\n	<td class="pformleft">{$ibforums->lang[\'val_key\']}</td>\n	<td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'50\' name=\'aid\' class=\'forminput\' /></td>\n   </tr>\n  </table>\n  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'dumb_submit\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'show_dumb_form', '$type="reg"', 1035406235, 0);||~&~||(1, 'skin_register', '<script language=\'javascript\' type="text/javascript">\n<!--\nfunction Validate() {\n	// Check for Empty fields\n	if (document.REG.UserName.value == "" || document.REG.PassWord.value == "" || document.REG.PassWord_Check.value == "" || document.REG.EmailAddress.value == "") {\n		alert ("{$ibforums->lang[\'js_blanks\']}");\n		return false;\n	}\n\n	// Have we checked the checkbox?\n\n	if (document.REG.agree.checked == true) {\n		return true;\n	} else {\n		alert ("{$ibforums->lang[\'js_no_check\']}");\n		return false;\n	}\n}\n//-->\n</script>\n<form action="{$ibforums->vars[\'board_url\']}/index.{$ibforums->vars[\'php_ext\']}" method="post" name=\'REG\' onsubmit=\'return Validate()\'>\n<input type=\'hidden\' name=\'act\' value=\'Reg\' />\n<input type=\'hidden\' name=\'CODE\' value=\'02\' />\n<input type=\'hidden\' name=\'coppa_user\' value=\'{$data[\'coppa_user\']}\' />\n<b>{$ibforums->lang[\'reg_header\']}</b><br /><br />{$data[\'TEXT\']}\n<br />\n<br />\n<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'registration_form\']}</div>\n  <div class="pformstrip">{$ibforums->lang[\'complete_form\']}</div>\n  <table class="tablebasic">\n  <tr>\n    <td class="pformleft">{$ibforums->lang[\'user_name\']}</td>\n    <td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'64\' value=\'{$ibforums->input[\'UserName\']}\' name=\'UserName\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n    <td class="pformleft">{$ibforums->lang[\'pass_word\']}</td>\n    <td class="pformright"><input type=\'password\' size=\'32\' maxlength=\'32\' value=\'{$ibforums->input[\'PassWord\']}\' name=\'PassWord\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n    <td class="pformleft">{$ibforums->lang[\'re_enter_pass\']}</td>\n    <td class="pformright"><input type=\'password\' size=\'32\' maxlength=\'32\' value=\'{$ibforums->input[\'PassWord_Check\']}\'  name=\'PassWord_Check\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n    <td class="pformleft">{$ibforums->lang[\'email_address\']}</td>\n    <td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'50\' value=\'{$ibforums->input[\'EmailAddress\']}\'  name=\'EmailAddress\' class=\'forminput\' /></td>\n  </tr>\n  <tr>\n    <td class="pformleft">{$ibforums->lang[\'email_address_two\']}</td>\n    <td class="pformright"><input type=\'text\' size=\'32\' maxlength=\'50\'  value=\'{$ibforums->input[\'EmailAddress_two\']}\' name=\'EmailAddress_two\' class=\'forminput\' /></td>\n  </tr>\n  <!--{REQUIRED.FIELDS}-->\n  <!--{OPTIONAL.FIELDS}-->\n  <!--IBF.MODULES.EXTRA-->\n  </table>\n</div>\n<br />\n<!--{REG.ANTISPAM}-->\n<br />\n<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'terms_service\']}</div>\n  <div class="tablepad" align="center">\n   <strong>{$ibforums->lang[\'terms_service_text\']}</strong>\n   <br />\n   <br />\n   <textarea cols=\'75\' rows=\'9\' readonly="readonly" name=\'Post\' class=\'textinput\'>{$data[RULES]}</textarea>\n   <br /><br /><b>{$ibforums->lang[\'agree_submit\']}</b>&nbsp;<input type=\'checkbox\' name=\'agree\' value=\'1\' />\n  </div>\n  <div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'submit_form\']}" class=\'forminput\' /></div>\n</div>\n</form>', 'ShowForm', '$data', 1035406235, 0);||~&~||(1, 'skin_register', '<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'errors_found\']}</div>\n  <div class="tablepad"><span class=\'postcolor\'>$data</span></div>\n</div>\n<br />', 'errors', '$data', 1035406235, 0);||~&~||(1, 'skin_register', '<br />\n<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'las_title\']}</div>\n  <table class="tablebasic">\n	 <td class=\'row1\' width=\'40%\'>{$ibforums->lang[\'las_numbers\']}</td>\n	 <td class=\'row1\'>\n	   <input type=\'hidden\' name=\'regid\' value=\'$regid\' />\n	   <img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=1\' border=\'0\' alt=\'Code Bit\' />\n	   &nbsp;<img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=2\' border=\'0\' alt=\'Code Bit\' />\n	   &nbsp;<img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=3\' border=\'0\' alt=\'Code Bit\' />\n	   &nbsp;<img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=4\' border=\'0\' alt=\'Code Bit\' />\n	   &nbsp;<img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=5\' border=\'0\' alt=\'Code Bit\' />\n	   &nbsp;<img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=6\' border=\'0\' alt=\'Code Bit\' />\n	 </td>\n	 </tr>\n	 <tr>\n	 <td class=\'row1\' width=\'40%\'>{$ibforums->lang[\'las_text\']}</td>\n	 <td class=\'row1\'><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'reg_code\' class=\'forminput\' /></td>\n	 </tr>\n  </table>\n</div>', 'bot_antispam', '$regid', 1035406235, 0);||~&~||(1, 'skin_register', '<br />\n<div class="tableborder">\n  <div class="pformstrip">{$ibforums->lang[\'las_title\']}</div>\n  <table class="tablebasic">\n   <tr>\n	 <td class=\'row1\' width=\'40%\'>{$ibforums->lang[\'las_numbers\']}</td>\n	 <td class=\'row1\'>\n	   <input type=\'hidden\' name=\'regid\' value=\'$regid\' />\n	   <img src=\'{$ibforums->base_url}act=Reg&amp;CODE=image&amp;rc={$regid}\' border=\'0\' alt=\'Loading Image\' />\n	 </td>\n	 </tr>\n	 <tr>\n	 <td class=\'row1\' width=\'40%\'>{$ibforums->lang[\'las_text\']}</td>\n	 <td class=\'row1\'><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'reg_code\' class=\'forminput\' /></td>\n	 </tr>\n  </table>\n</div>', 'bot_antispam_gd', '$regid', 1035406235, 0);||~&~||(1, 'skin_register', '<form method="post" action="$action">\n$hidden\n<div class="tableborder">\n  <div class="maintitle">$title</div>\n  <table class="tablebasic">\n  $content\n  </table>\n  <div class="pformstrip" align="center"><input type="submit" class=\'forminput\' /></div>\n</div>\n</form>', 'tmpl_form', '$action, $hidden, $title, $content', 1035406235, 0);||~&~||(1, 'skin_register', '<tr>\n  <td colspan=\'2\' class=\'pformstrip\'>{$ibforums->lang[\'cf_optional\']}</td>\n</tr>', 'optional_title', '', 1035406235, 0);||~&~||(1, 'skin_register', '<tr>\n  <td class=\'pformleft\' valign=\'top\'><b>$title</b><br />$desc</td>\n  <td class=\'pformright\'>$content</td>\n</tr>', 'field_entry', '$title, $desc="", $content', 1035406235, 0);||~&~||(1, 'skin_register', '<input type=\'text\' size=\'30\' name=\'$name\' value=\'$value\' class=\'forminput\' />', 'field_textinput', '$name, $value=""', 1035406235, 0);||~&~||(1, 'skin_register', '<select name=\'$name\' class=\'forminput\'>$options</select>', 'field_dropdown', '$name, $options', 1035406235, 0);||~&~||(1, 'skin_register', '<textarea cols=\'60\' rows=\'5\' name=\'$name\' class=\'forminput\'>$value</textarea>', 'field_textarea', '$name, $value', 1035406235, 0);||~&~||(1, 'skin_search', '<!-- Begin Topic Entry {$Data[\'tid\']} -->\n    <tr> \n	  <td align=\'center\' class=\'row4\'>{$Data[\'folder_img\']}</td>\n      <td align=\'center\' width=\'3%\' class=\'row2\'>{$Data[\'topic_icon\']}</td>\n      <td class=\'row4\'>\n	  <table width=\'100%\' border=\'0\' cellspacing=\'0\' cellpadding=\'0\'>\n		  <tr> \n			<td valign=\'middle\'>{$Data[\'go_new_post\']}</td>\n            <td width=\'100%\'>{$Data[\'prefix\']} <a href=\'{$ibforums->base_url}showtopic={$Data[\'tid\']}&amp;hl={$Data[\'keywords\']}\'>{$Data[\'title\']}</a>  {$Data[PAGES]}</td>\n          </tr>\n        </table>\n        <span class=\'desc\'>{$Data[\'description\']}</span></td>\n      <td class=\'row4\' width=\'20%\' align=\'center\'><a href="{$ibforums->base_url}showforum={$Data[\'forum_id\']}">{$Data[\'forum_name\']}</a></td>\n      <td align=\'center\' class=\'row2\'>{$Data[\'starter\']}</td>\n      <td align=\'center\' class=\'row4\'>{$Data[\'posts\']}</td>\n      <td align=\'center\' class=\'row2\'>{$Data[\'views\']}</td>\n      <td class=\'row2\'>{$Data[\'last_post\']}<br /><a href=\'{$ibforums->base_url}showtopic={$Data[\'tid\']}&amp;view=getlastpost\'>{$Data[\'last_text\']}</a> <b>{$Data[\'last_poster\']}</b></td>\n    </tr>\n    <!-- End Topic Entry {$Data[\'tid\']} -->', 'RenderRow', '$Data', 1035406235, 0);||~&~||(1, 'skin_search', '<br />\n<div class="tableborder">\n  <div class="maintitle">{$Data[\'folder_img\']}&nbsp;{$Data[\'prefix\']} <a href=\'{$ibforums->base_url}showtopic={$Data[\'tid\']}&amp;hl={$Data[\'keywords\']}\' class=\'linkthru\'>{$Data[\'title\']}</a></span></b>  {$Data[PAGES]}</div>\n  <table class="tablebasic" cellpadding="6" cellspacing="1" width=\'100%\'>\n  <tr>\n	<td width=\'150\' align=\'left\' class=\'row4\'><span class=\'normalname\'>{$Data[\'author_name\']}</span></td>\n	<td class=\'row4\' width="100%"><strong>{$ibforums->lang[\'rp_postedon\']} {$Data[\'post_date\']}</strong></td>\n  </tr>\n  <tr>\n	<td class=\'post1\' align=\'left\'>\n	  <img src=\'{$ibforums->vars[\'img_url\']}/spacer.gif\' alt=\'\' width=\'150\' height=\'15\' />\n	  <br />\n	  <span class=\'postdetails\'>{$ibforums->lang[\'rp_replies\']} <b>{$Data[\'posts\']}</b><br />{$ibforums->lang[\'rp_hits\']} <b>{$Data[\'views\']}</b></span>\n	</td>\n	<td class=\'post1\' align=\'left\' width="100%">{$Data[\'post\']}</td>\n  </tr>\n   <tr>\n	<td class=\'row4\'>&nbsp;</td>\n	<td class=\'row4\'>{$ibforums->lang[\'rp_forum\']} <a href="{$ibforums->base_url}showforum={$Data[\'forum_id\']}">{$Data[\'forum_name\']}</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;{$ibforums->lang[\'rp_post\']} <a href=\'{$ibforums->base_url}act=ST&amp;f={$Data[\'forum_id\']}&amp;t={$Data[\'tid\']}&amp;hl={$Data[\'keywords\']}&amp;view=findpost&amp;p={$Data[\'pid\']}\' class=\'linkthru\'>#{$Data[\'pid\']}</a></td>\n  </tr>\n  </table>\n</div>', 'RenderPostRow', '$Data', 1035406235, 0);||~&~||(1, 'skin_search', '<div>{$Data[SHOW_PAGES]}</div>', 'start_as_post', '$Data', 1035406235, 0);||~&~||(1, 'skin_search', '<br />\n<div>{$Data[SHOW_PAGES]}</div>\n<div align=\'left\' class="wrapmini">\n	<{B_NEW}>&nbsp;&nbsp;{$ibforums->lang[\'pm_open_new\']}\n	<br /><{B_NORM}>&nbsp;&nbsp;{$ibforums->lang[\'pm_open_no\']}\n	<br /><{B_HOT}>&nbsp;&nbsp;{$ibforums->lang[\'pm_hot_new\']}\n	<br /><{B_HOT_NN}>&nbsp;&nbsp;{$ibforums->lang[\'pm_hot_no\']}\n</div>\n<div align=\'left\' class="wrapmini">\n	<{B_POLL}>&nbsp;&nbsp;{$ibforums->lang[\'pm_poll\']}\n	<br /><{B_POLL_NN}>&nbsp;&nbsp;{$ibforums->lang[\'pm_poll_no\']}\n	<br /><{B_LOCKED}>&nbsp;&nbsp;{$ibforums->lang[\'pm_locked\']}\n	<br /><{B_MOVED}>&nbsp;&nbsp;{$ibforums->lang[\'pm_moved\']}\n</div>', 'end_as_post', '$Data', 1035406235, 0);||~&~||(1, 'skin_search', '</table>\n<div class="titlemedium">&nbsp;</div>\n</div>\n<br />\n<div>{$Data[SHOW_PAGES]}</div>\n<br />\n<div align=\'left\' class="wrapmini">\n	<{B_NEW}>&nbsp;&nbsp;{$ibforums->lang[\'pm_open_new\']}\n	<br /><{B_NORM}>&nbsp;&nbsp;{$ibforums->lang[\'pm_open_no\']}\n	<br /><{B_HOT}>&nbsp;&nbsp;{$ibforums->lang[\'pm_hot_new\']}\n	<br /><{B_HOT_NN}>&nbsp;&nbsp;{$ibforums->lang[\'pm_hot_no\']}\n</div>\n<div align=\'left\' class="wrapmini">\n	<{B_POLL}>&nbsp;&nbsp;{$ibforums->lang[\'pm_poll\']}\n	<br /><{B_POLL_NN}>&nbsp;&nbsp;{$ibforums->lang[\'pm_poll_no\']}\n	<br /><{B_LOCKED}>&nbsp;&nbsp;{$ibforums->lang[\'pm_locked\']}\n	<br /><{B_MOVED}>&nbsp;&nbsp;{$ibforums->lang[\'pm_moved\']}\n</div>\n<br />\n<br clear="all" />', 'end', '$Data', 1035406235, 0);||~&~||(1, 'skin_search', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'be_link\']}</div>\n <table width=\'100%\' cellpadding=\'0\' cellspacing=\'1\'>\n <tr>\n  <th width=\'30%\' class=\'pformstrip\'>{$ibforums->lang[\'be_use\']}</th>\n  <th width=\'70%\' class=\'pformstrip\'>{$ibforums->lang[\'be_means\']}</th>\n </tr>\n <tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_u1\']}</td>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_m1\']}</td>\n </tr>\n <tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_u2\']}</td>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_m2\']}</td>\n </tr>\n <tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_u3\']}</td>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_m3\']}</td>\n </tr>\n <tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_u4\']}</td>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_m4\']}</td>\n </tr>\n <tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_u5\']}</td>\n  <td class=\'pformleft\'>{$ibforums->lang[\'be_m5\']}</td>\n </tr>\n </table>\n</div>', 'boolean_explain_page', '', 1035406235, 0);||~&~||(1, 'skin_search', '&#091; <a href=\'#\' title=\'{$ibforums->lang[\'be_ttip\']}\' onclick=\'win_pop()\'>{$ibforums->lang[\'be_link\']}</a> &#093;', 'boolean_explain_link', '', 1035406235, 0);||~&~||(1, 'skin_search', '<script type="text/javascript">\n<!--\nfunction go_gadget_advanced()\n{\n	window.location = "{$ibforums->js_base_url}act=Search&mode=adv&f={$ibforums->input[\'f\']}";\n}\nfunction win_pop()\n{\n    window.open(\'{$ibforums->js_base_url}act=Search&CODE=explain\',\'WIN\',\'width=400,height=300,resizable=yes,scrollbars=yes\'); \n}\n-->\n</script>\n<form action="{$ibforums->base_url}act=Search&amp;CODE=simpleresults&amp;mode=simple" method="post" name=\'sForm\'>\n$hidden_fields\n<div class="tableborder">\n  <div class="maintitle"  align=\'center\'>{$ibforums->lang[\'search_options\']}</div>\n  <div class="pformstrip" align="center">{$ibforums->lang[\'key_search\']}</div>\n  <div class="tablepad" align="center">\n    <input type=\'text\' maxlength=\'100\' size=\'40\' id="keywords" name=\'keywords\' class=\'forminput\' />\n	<br />\n	<label for="keywords">{$ibforums->lang[\'keysearch_text\']}</label> <!--IBF.BOOLEAN_EXPLAIN-->\n  </div>\n  <div class="pformstrip" align="center">{$ibforums->lang[\'search_where\']}</div>\n   <div class="tablepad" align="center">\n    $forums\n    <br /><br />\n    <strong>{$ibforums->lang[\'sf_show_me\']}</strong>\n      <input type="radio" name="sortby" value="relevant" id="sortby_one" checked="checked" class="radiobutton" />\n      <label for="sortby_one">{$ibforums->lang[\'sf_most_r_f\']}</label>\n      &nbsp;\n      <input type="radio" name="sortby" value="date" id="sortby_two" class="radiobutton" />\n      <label for="sortby_two">{$ibforums->lang[\'sf_most_date\']}</label>\n   </div>\n  <div class="pformstrip" align="center">\n    <input type=\'submit\' value=\'{$ibforums->lang[\'do_search\']}\' class=\'forminput\' />\n    &nbsp;\n    <input type=\'button\' value=\'{$ibforums->lang[\'so_more_opts\']}\' onclick="go_gadget_advanced()" class=\'forminput\' />\n  </div>\n</div>\n</form>', 'simple_form', '$forums', 1035406235, 0);||~&~||(1, 'skin_search', '<div class="plainborder">\n  <div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'search_results\']}</div>\n  <div class="pformstrip">\n	<div class="pagelinks">{$ibforums->lang[\'g_searched_for\']} <strong>{$data[\'keyword\']}</strong></div>\n	<div align="right">\n	   {$ibforums->lang[\'g_results\']} <strong>{$data[\'start\']} - {$data[\'end\']}</strong> {$ibforums->lang[\'g_of_about\']} <strong>{$data[\'matches\']}</strong>.\n	   {$ibforums->lang[\'g_search_took\']} <strong>{$data[\'ex_time\']}</strong> {$ibforums->lang[\'g_seconds\']}\n	</div>\n  </div>\n  <br />', 'result_simple_header', '$data', 1035406235, 0);||~&~||(1, 'skin_search', '<div class="pformstrip" align="left">{$ibforums->lang[\'search_pages\']} &nbsp;  &nbsp; &nbsp;<span class="googlepagelinks">{$data[\'links\']}</span></div>\n</div>', 'result_simple_footer', '$data', 1035406235, 0);||~&~||(1, 'skin_search', '<div class="{$data[\'css_class\']}">\n  <span class="googlish"><a href=\'{$ibforums->base_url}act=ST&amp;t={$data[\'tid\']}&amp;f={$data[\'id\']}&amp;view=findpost&amp;p={$data[\'pid\']}\'>{$data[\'title\']}</span></a>\n  <br />\n  {$data[\'post\']}\n  <br />\n  <span class=\'googlesmall\'>\n  {$ibforums->lang[\'location_g\']}: <a href=\'{$ibforums->base_url}act=idx\'>{$ibforums->lang[\'g_b_home\']}</a>\n  &gt; <a href=\'{$ibforums->base_url}act=SC&amp;c={$data[\'cat_id\']}\'>{$data[\'cat_name\']}</a>\n  &gt; <a href=\'{$ibforums->base_url}act=SF&amp;f={$data[\'id\']}\'>{$data[\'name\']}</a>\n  </span>\n  <br />\n  <span class="googlebottom"><strong>{$ibforums->lang[\'g_relevance\']}: {$data[\'relevance\']}% &middot; Author: {$data[\'author_name\']} &middot; Posted on: {$data[\'post_date\']}</strong></span>\n  <span class="googlesmall"> - <a href=\'{$ibforums->base_url}act=ST&amp;t={$data[\'tid\']}&amp;f={$data[\'id\']}&amp;view=findpost&amp;p={$data[\'pid\']}\' target=\'_blank\'>{$ibforums->lang[\'g_new_window\']}</a></span>\n  </div>\n  <br />', 'result_simple_entry', '$data', 1035406235, 0);||~&~||(1, 'skin_search', '<script type="text/javascript">\n<!--\nfunction go_gadget_simple()\n{\n	window.location = "{$ibforums->js_base_url}act=Search&mode=simple&f={$ibforums->input[\'f\']}";\n}\nfunction win_pop()\n{\n    window.open(\'{$ibforums->js_base_url}act=Search&CODE=explain\',\'WIN\',\'width=400,height=300,resizable=yes,scrollbars=yes\'); \n}\n-->\n</script>\n<form action="{$ibforums->base_url}act=Search&amp;CODE=01" method="post" name=\'sForm\'>\n$hidden_fields\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'0\' border=\'0\' width=\'100%\'>\n<tr>\n	<td colspan=\'2\' class="maintitle"  align=\'center\'>{$ibforums->lang[\'keywords_title\']}</td>\n</tr>\n<tr>\n	<td class=\'pformstrip\' width=\'50%\'>{$ibforums->lang[\'key_search\']}</td>\n	<td class=\'pformstrip\' width=\'50%\'>{$ibforums->lang[\'mem_search\']}</td>\n</tr>\n<tr>\n	<td class=\'row1\' valign=\'top\'>\n	  <input type=\'text\' maxlength=\'100\' size=\'40\' name=\'keywords\' id="keywords" class=\'forminput\' />\n	  <br /><br />\n	  <label for="keywords">{$ibforums->lang[\'keysearch_text\']}</label> <!--IBF.BOOLEAN_EXPLAIN-->\n	</td>\n	<td class=\'row1\' valign=\'top\'>\n	<table width=\'100%\' cellpadding=\'4\' cellspacing=\'0\' border=\'0\' align=\'center\'>\n	<tr>\n	 <td><input type=\'text\' maxlength=\'100\' size=\'50\' name=\'namesearch\' class=\'forminput\' /></td>\n	</tr>\n	<tr>\n	<td width=\'40%\'><input type=\'checkbox\' name=\'exactname\' id=\'matchexact\' value=\'1\' class="checkbox" /><label for="matchexact">{$ibforums->lang[\'match_name_ex\']}</label></td>\n   </tr>\n</table>\n</td>\n</tr>\n</table>\n</div>\n<br />\n<div class="tableborder">\n<table cellpadding=\'4\' cellspacing=\'0\' border=\'0\' width=\'100%\'>         \n<tr>\n	<td colspan=\'2\' class="maintitle"  align=\'center\'>{$ibforums->lang[\'search_options\']}</td>\n</tr>\n<tr>\n	<td class=\'pformstrip\' width=\'50%\' valign=\'middle\'>{$ibforums->lang[\'search_where\']}</td>\n	<td class=\'pformstrip\' width=\'50%\' valign=\'middle\'>{$ibforums->lang[\'search_refine\']}</td>\n</tr>\n<tr>\n	<td class=\'row1\' valign=\'middle\'>\n	  $forums\n	  <br />\n	  <input type=\'checkbox\' name=\'searchsubs\' value=\'1\' id="searchsubs" checked="checked" />&nbsp;<label for="searchsubs">{$ibforums->lang[\'search_in_subs\']}</label>\n	</td>\n	<td class=\'row1\' valign=\'top\'>\n		<table cellspacing=\'4\' cellpadding=\'0\' width=\'100%\' align=\'center\' border=\'0\'>\n		<tr>\n		 <td valign=\'top\'>\n		   <fieldset class="search">\n		     <legend><strong>{$ibforums->lang[\'search_from\']}</strong></legend>\n			 <select name=\'prune\' class=\'forminput\'>\n			 <option value=\'1\'>{$ibforums->lang[\'today\']}</option>\n			 <option value=\'7\'>{$ibforums->lang[\'this_week\']}</option>\n			 <option value=\'30\' selected="selected">{$ibforums->lang[\'this_month\']}</option>\n			 <option value=\'60\'>{$ibforums->lang[\'this_60\']}</option>\n			 <option value=\'90\'>{$ibforums->lang[\'this_90\']}</option>\n			 <option value=\'180\'>{$ibforums->lang[\'this_180\']}</option>\n			 <option value=\'365\'>{$ibforums->lang[\'this_year\']}</option>\n			 <option value=\'0\'>{$ibforums->lang[\'ever\']}</option>\n			 </select>\n			 <br />\n			 <input type=\'radio\' name=\'prune_type\' id="prune_older" value=\'older\' class=\'radiobutton\' />&nbsp;<label for="prune_older">{$ibforums->lang[\'older\']}</label>\n			 <br />\n			 <input type=\'radio\' name=\'prune_type\' id="prune_newer" value=\'newer\' class=\'radiobutton\' checked="checked" />&nbsp;<label for="prune_newer">{$ibforums->lang[\'newer\']}</label>\n		  </fieldset>\n		</td>\n		<td valign=\'top\'>\n		  <fieldset class="search">\n		     <legend><strong>{$ibforums->lang[\'sort_results\']}</strong></legend>\n			 <select name=\'sort_key\' class=\'forminput\'>\n			 <option value=\'last_post\'>{$ibforums->lang[\'last_date\']}</option>\n			 <option value=\'posts\'>{$ibforums->lang[\'number_topics\']}</option>\n			 <option value=\'starter_name\'>{$ibforums->lang[\'poster_name\']}</option>\n			 <option value=\'forum_id\'>{$ibforums->lang[\'forum_name\']}</option>\n			 </select>\n			 <br /><input type=\'radio\' name=\'sort_order\' id="sort_desc" class="radiobutton" value=\'desc\' checked="checked" /><label for="sort_desc">{$ibforums->lang[\'descending\']}</label>\n			 <br /><input type=\'radio\' name=\'sort_order\' id="sort_asc" class="radiobutton" value=\'asc\' /><label for="sort_asc">{$ibforums->lang[\'ascending\']}</label>\n		  </fieldset>\n		</td>\n		</tr>\n		<tr>\n		 <td nowrap="nowrap">\n		   <fieldset class="search">\n		     <legend><strong>{$ibforums->lang[\'search_where\']}</strong></legend>\n			 <input type=\'radio\' name=\'search_in\' class="radiobutton" id="search_in_posts" value=\'posts\' checked="checked" /><label for="search_in_posts">{$ibforums->lang[\'in_posts\']}</label>\n			 <br />\n			 <input type=\'radio\' name=\'search_in\' class="radiobutton" id="search_in_titles" value=\'titles\' /><label for="search_in_titles">{$ibforums->lang[\'in_topics\']}</label>\n		   </fieldset>\n		 </td>\n		 <td>\n		    <fieldset class="search">\n		     <legend><strong>{$ibforums->lang[\'result_type\']}</strong></legend>\n		     <input type=\'radio\' name=\'result_type\' class="radiobutton" value=\'topics\' id="result_topics" checked="checked" /><label for="result_topics">{$ibforums->lang[\'results_topics\']}</label>\n		     <br />\n		     <input type=\'radio\' name=\'result_type\' class="radiobutton" value=\'posts\' id="result_posts" /><label for="result_posts">{$ibforums->lang[\'results_post\']}</label>\n		   </fieldset>\n		 </td>\n		</tr>\n		</table>\n	</td>\n</tr>\n<tr>\n	<td class=\'pformstrip\' colspan=\'2\' align=\'center\'><input type=\'submit\' value=\'{$ibforums->lang[\'do_search\']}\' class=\'forminput\' /><!--IBF.SIMPLE_BUTTON--></td>\n</tr>\n</table>\n</div>\n</form>', 'Form', '$forums', 1035406235, 0);||~&~||(1, 'skin_search', '&nbsp;<input type=\'button\' value=\'{$ibforums->lang[\'so_less_opts\']}\' onclick="go_gadget_simple()" class=\'forminput\' />', 'form_simple_button', '', 1035406235, 0);||~&~||(1, 'skin_search', '<script language=\'Javascript\' type="text/javascript">\n<!--\nfunction checkvalues() {\n   f = document.dateline;\n   if (f.st_day.value < f.end_day.value) {\n	   alert("{$ibforums->lang[\'active_js_error\']}");\n	   return false;\n   }\n   if (f.st_day.value == f.end_day.value) {\n	   alert("{$ibforums->lang[\'active_js_error\']}");\n	   return false;\n   }\n}\n-->\n</script>\n<br />\n<form action=\'{$ibforums->base_url}act=Search&amp;CODE=getactive\' method=\'post\' name=\'dateline\' onsubmit=\'return checkvalues();\'>\n<div class="pagelinks">{$data[\'SHOW_PAGES\']}</div>\n<div align="right" style="width:35%;text-align:center;margin-right:0;margin-left:auto">\n <fieldset class="search">\n   <legend><strong>{$ibforums->lang[\'active_st_text\']}</strong></legend>\n   <label for=\'st_day\'>{$ibforums->lang[\'active_mid_text\']}</label>&nbsp;\n   <select name=\'st_day\' id=\'st_day\' class=\'forminput\'>\n	<option value=\'s1\'>{$ibforums->lang[\'active_yesterday\']}</option>\n	<option value=\'s2\'>2 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'s3\'>3 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'s4\'>4 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'s5\'>5 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'s6\'>6 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'s7\'>{$ibforums->lang[\'active_week\']}</option>\n	<option value=\'s30\'>{$ibforums->lang[\'active_month\']}</option>\n   </select>\n   &nbsp;\n   <label for=\'end_day\'>{$ibforums->lang[\'active_end_text\']}</label>&nbsp;\n   <select name=\'end_day\' id=\'end_day\' class=\'forminput\'>\n	<option value=\'e0\'>{$ibforums->lang[\'active_today\']}</option>\n	<option value=\'e1\'>{$ibforums->lang[\'active_yesterday\']}</option>\n	<option value=\'e2\'>2 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'e3\'>3 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'e4\'>4 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'e5\'>5 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'e6\'>6 {$ibforums->lang[\'active_days\']}</option>\n	<option value=\'e7\'>{$ibforums->lang[\'active_week\']}</option>\n   </select>\n   &nbsp;\n   <input type=\'submit\' value=\'&gt;&gt;\' title="{$ibforums->lang[\'active_label\']}" class=\'forminput\'>\n </fieldset>\n</div>\n</form>\n<br />\n<div class="tableborder">\n  <div class="maintitle"><{CAT_IMG}>{$ibforums->lang[\'active_topics\']}</div>\n  <table class="tablebasic" cellspacing="1" cellpadding="4">\n	<tr>\n	   <td class=\'titlemedium\' colspan=\'2\' >&nbsp;</td>\n	   <th align=\'left\' class=\'titlemedium\'>{$ibforums->lang[\'h_topic_title\']}</th>\n	   <th align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_forum_name\']}</th>\n	   <th align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_topic_starter\']}</th>\n	   <th align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_replies\']}</th>\n	   <th align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_hits\']}</th>\n	   <th class=\'titlemedium\'>{$ibforums->lang[\'h_last_action\']}</th>\n	</tr>', 'active_start', '$data', 1035406235, 0);||~&~||(1, 'skin_search', '<div>{$Data[SHOW_PAGES]}</div>\n<br />\n<div class="tableborder">\n<div class="maintitle"><{CAT_IMG}>&nbsp;{$ibforums->lang[\'your_results\']} &middot; <a style="text-decoration:underline" href="{$ibforums->base_url}act=Login&amp;CODE=05">{$ibforums->lang[\'mark_search_as_read\']}</a></div>\n<table class="tablebasic" cellpadding="2" cellspacing="1" width=\'100%\'>\n  <tr>\n	 <td class=\'titlemedium\' colspan=\'2\'>&nbsp;</td>\n	 <td align=\'left\' class=\'titlemedium\'>{$ibforums->lang[\'h_topic_title\']}</td>\n	 <td align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_forum_name\']}</td>\n	 <td align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_topic_starter\']}</td>\n	 <td align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_replies\']}</td>\n	 <td align=\'center\' class=\'titlemedium\'>{$ibforums->lang[\'h_hits\']}</td>\n	 <td class=\'titlemedium\'>{$ibforums->lang[\'h_last_action\']}</td>\n  </tr>', 'start', '$Data', 1035406235, 0);||~&~||(1, 'skin_search', '<tr><td colspan=\'8\' class=\'row1\' align=\'center\'><strong>{$ibforums->lang[\'active_no_topics\']}</strong></td></tr>', 'active_none', '', 1035406235, 0);||~&~||(1, 'skin_stats', '<script language=\'javascript\'>\n<!--\n function bog_off()\n {\n 	var tid = \'$tid\';\n 	var fid = \'$fid\';\n 	\n 	opener.location= \'$ibforums->base_url\' + \'showtopic=\' + tid;\n 	self.close();\n }\n //-->\n </script>\n<div class="tableborder">\n  <div class="titlemedium" align="center">{$ibforums->lang[\'who_farted\']} $title</div>\n  <table cellpadding=\'5\' cellspacing=\'1\' border=\'0\' width=\'100%\'>\n  <tr>\n	 <td width=\'70%\' align=\'left\'   class=\'pformstrip\'   valign=\'middle\'>{$ibforums->lang[\'who_poster\']}</td>\n	 <td width=\'30%\' align=\'center\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'who_posts\']}</td>\n  </tr>', 'who_header', '$fid, $tid, $title', 1035406235, 0);||~&~||(1, 'skin_stats', '<tr>\n	  <td align=\'left\' class=\'row1\' valign=\'middle\'>{$row[\'author_name\']}</td>\n	  <td align=\'center\' class=\'row1\' valign=\'middle\'>{$row[\'pcount\']}</td>\n   </tr>', 'who_row', '$row', 1035406235, 0);||~&~||(1, 'skin_stats', '<a href=\'{$ibforums->base_url}showuser=$id\' target=\'_blank\'>$name</a>', 'who_name_link', '$id, $name', 1035406235, 0);||~&~||(1, 'skin_stats', '</table>\n  <div class=\'titlemedium\' align=\'center\'><a href=\'javascript:bog_off();\'>{$ibforums->lang[\'who_go\']}</a></div>\n</div>', 'who_end', '', 1035406235, 0);||~&~||(1, 'skin_stats', '<table cellpadding=\'0\' cellspacing=\'0\' border=\'0\' width=\'<{tbl_width}>\' align=\'center\'>\n      <tr>\n         <td valign=\'middle\' align=\'left\'><span class=\'pagetitle\'>{$title}</td>\n      </tr>\n     </table>', 'page_title', '$title', 1035406235, 0);||~&~||(1, 'skin_stats', '<div class="tableborder">\n <div class="maintitle"><{CAT_IMG}>&nbsp;$group</div>\n <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	 <td width=\'30%\' align=\'left\'   class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'leader_name\']}</td>\n	 <td width=\'40%\' align=\'center\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'leader_forums\']}</td>\n	 <td align=\'center\' width=\'25%\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'leader_location\']}</td>\n	 <td align=\'center\' width=\'5%\'  class=\'pformstrip\' valign=\'middle\'>&nbsp;</td>\n  </tr>', 'group_strip', '$group', 1035406235, 0);||~&~||(1, 'skin_stats', '<tr>\n	 <td align=\'left\'   class=\'row1\' valign=\'middle\'><a href=\'{$ibforums->base_url}showuser={$info[\'id\']}\'>{$info[\'name\']}</a></td>\n	 <td align=\'center\' class=\'row1\' valign=\'middle\'>$forums</td>\n	 <td align=\'center\' class=\'row1\' valign=\'middle\'>{$info[\'location\']}</td>\n	 <td align=\'center\' class=\'row1\' valign=\'middle\'>{$info[\'msg_icon\']}</td>\n  </tr>', 'leader_row', '$info, $forums', 1035406235, 0);||~&~||(1, 'skin_stats', '<form method="post" onsubmit="if(document.jmenu$id.f.value == -1){return false;}" action="{$ibforums->base_url}act=SF" name="jmenu$id">\n<select class=\'forminput\' name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.jmenu$id.submit() }" style=\'width:95%\'>\n<option value="-1">$count_string</option>\n<option value="-1">--------------------------------------------------------</option>', 'leader_row_forum_start', '$id, $count_string', 1035406235, 0);||~&~||(1, 'skin_stats', '<option value=\'$id\'>$name</option>', 'leader_row_forum_entry', '$id, $name', 1035406235, 0);||~&~||(1, 'skin_stats', '</select></form>', 'leader_row_forum_end', '', 1035406235, 0);||~&~||(1, 'skin_stats', '</table>\n</div>\n<br />', 'close_strip', '', 1035406235, 0);||~&~||(1, 'skin_stats', '<div class=\'tableborder\'>\n <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'todays_posters\']}</div>\n <table cellpadding=\'5\' cellspacing=\'1\' border=\'0\' width=\'100%\'>\n <tr>\n	<th width=\'30%\' align=\'left\' class=\'pformstrip\'   valign=\'middle\'>{$ibforums->lang[\'member\']}</th>\n	<th width=\'20%\' align=\'center\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'member_joined\']}</th>\n	<th align=\'center\' width=\'15%\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'member_posts\']}</th>\n	<th align=\'center\' width=\'15%\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'member_today\']}</th>\n	<th align=\'center\' width=\'20%\' class=\'pformstrip\' valign=\'middle\'>{$ibforums->lang[\'member_percent\']}</th>\n </tr>', 'top_poster_header', '', 1035406235, 0);||~&~||(1, 'skin_stats', '<tr>\n	  <td align=\'left\' class=\'row1\' valign=\'middle\'><a href=\'{$ibforums->base_url}showuser={$info[\'id\']}\'>{$info[\'name\']}</a></td>\n	  <td align=\'center\' class=\'row1\' valign=\'middle\'>{$info[\'joined\']}</td>\n	  <td align=\'center\' class=\'row1\' valign=\'middle\'>{$info[\'posts\']}</td>\n	  <td align=\'center\' class=\'row1\' valign=\'middle\'>{$info[\'tpost\']}</td>\n	  <td align=\'center\' class=\'row1\' valign=\'middle\'>{$info[\'today_pct\']}%</td>\n   </tr>', 'top_poster_row', '$info', 1035406235, 0);||~&~||(1, 'skin_stats', '</table>\n  <div class=\'pformstrip\' align=\'center\'>{$ibforums->lang[\'total_today\']} $info</div>\n</div>', 'top_poster_footer', '$info', 1035406235, 0);||~&~||(1, 'skin_stats', '<tr>\n	  <td colspan=\'5\' align=\'center\' class=\'row1\' valign=\'middle\'>{$ibforums->lang[\'no_info\']}</td>\n   </tr>', 'top_poster_no_info', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />$desc_string\n<br /><br /><b>{$ibforums->lang[\'gw_nochex\']}</b>\n</p>\n<form action=\'https://www.nochex.com/nochex.dll/checkout\' method=\'post\'>\n<input type="hidden" name="email" value="$nochex_email" />\n<input type="hidden" name="amount" value="$to_pay" />\n<input type="hidden" name="ordernumber" value="{$new_sub_id}x{$member_id}x$cur_tran_id" />\n<input type="hidden" name="returnurl" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=nochex">\n<br /><br />\n<center>\n<input type="image" src="http://www.nochex.com/web/images/payme4.gif" border="0" name="submit" alt="Pay with NOCHEX now"></center>\n</form>', 'do_nochex_upgrade_screen', '$ccode, $member_id, $new_sub_id, $to_pay, $nochex_email, $sub_title, $cur_tran_id, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />$desc_string\n<br /><br /><b>{$ibforums->lang[\'gw_nochex\']}</b>\n</p>\n<form action=\'https://www.nochex.com/nochex.dll/checkout\' method=\'post\'>\n<input type="hidden" name="email" value="$nochex_email" />\n<input type="hidden" name="amount" value="$to_pay" />\n<input type="hidden" name="ordernumber" value="{$new_sub_id}x{$member_id}x0" />\n<input type="hidden" name="returnurl" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=nochex">\n<br /><br />\n<center>\n<input type="image" src="http://www.nochex.com/web/images/payme4.gif" border="0" name="submit" alt="Pay with NOCHEX now"></center>\n</form>', 'do_nochex_normal_screen', '$ccode, $member_id, $new_sub_id, $to_pay, $nochex_email, $sub_title, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<h2>{$ibforums->lang[\'man_title\']}</h2>\n<br />\n<table cellpadding=\'0\' cellspacing=\'1\' border=\'0\' width=\'245\' align=\'center\' bgcolor=\'#000000\'>\n<tr>\n <td>\n  <table cellpadding=\'4\'  cellspacing=\'1\' border=\'0\' width=\'100%\' align=\'center\'>\n  <tr>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->lang[\'man_mem\']}</td>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->member[\'name\']}</td>\n  </tr>\n  <tr>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->lang[\'man_mem_id\']}</td>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->member[\'id\']}</td>\n  </tr>\n  <tr>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->lang[\'man_email\']}</td>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->member[\'email\']}</td>\n  </tr>\n  <tr>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->lang[\'man_trans_id\']}</td>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$id}</td>\n  </tr>\n  <tr>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$ibforums->lang[\'man_sub\']}</td>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$sub[\'sub_title\']} $extra</td>\n  </tr>\n  <tr>\n   <td width=\'50%\' bgcolor=\'#FFFFFFF\'>{$ibforums->lang[\'man_pay\']}</td>\n   <td width=\'50%\' bgcolor=\'#FFFFFF\'>{$paid}</td>\n  </tr>\n </table>\n</td>\n</tr>\n</table>', 'show_ticket', '$sub, $id, $paid, $extra=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<script type="text/javascript">\n<!--\nfunction pop_ticket()\n{\n	window.open(\'{$ibforums->js_base_url}act=module&module=subscription&type=manual&CODE=custom&mode=ticket&tickid=0&upgrade=0&sid=$new_sub_id\',\'TICKET\',\'width=250,height=350,resizable=yes,scrollbars=yes\');\n}\n//-->\n</script>\n<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n$desc_string\n<br /><br />\n{$ibforums->lang[\'post_manual\']}\n<br /><br />\n{$ibforums->lang[\'post_manual_more\']}\n</p>\n<br /><br />\n<center>\n<input type="button" value="{$ibforums->lang[\'gw_manual\']}" onclick="pop_ticket()" />\n</center>', 'do_manual_normal_screen', '$new_sub_id, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<script type="text/javascript">\n<!--\nfunction pop_ticket()\n{\n	window.open(\'{$ibforums->js_base_url}act=module&module=subscription&type=manual&CODE=custom&mode=ticket&tickid={$cur_id}&upgrade=1&sid=$new_sub_id\',\'TICKET\',\'width=250,height=350,resizable=yes,scrollbars=yes\');\n}\n//-->\n</script>\n<div class="pformstrip">{$ibforums->lang[\'sc_upgrade_title\']}</div>\n<p>\n$desc_string\n<br /><br />\n{$ibforums->lang[\'post_manual\']}\n<br /><br />\n{$ibforums->lang[\'post_manual_more\']}\n</p>\n<br /><br />\n<center>\n<input type="button" value="{$ibforums->lang[\'gw_manual\']}" onclick="pop_ticket()" />\n</center>', 'do_manual_upgrade_screen', '$new_sub_id, $cur_id, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />$desc_string\n<br /><br /><b>{$ibforums->lang[\'gw_paypal\']}</b>\n</p>\n<form action=\'https://www.paypal.com/cgi-bin/webscr\' method=\'post\'>\n<input type="hidden" name="cmd" value="_xclick-subscriptions" />\n<input type="hidden" name="business" value="$paypal_email" />\n<input type="hidden" name="item_name" value="$sub_title" />\n<input type="hidden" name="item_number" value="$new_sub_id" />\n<input type="hidden" name="no_shipping" value="1" />\n<input type="hidden" name="src" value="1" />\n<input type="hidden" name="a3" value="$cost" />\n<input type="hidden" name="p3" value="$length" />\n<input type="hidden" name="t3" value="$unit" />\n<input type="hidden" name="custom" value="$member_id" />\n<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />\n<input type="hidden" name="currency_code" value="$ccode">\n<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<br /><br />\n<center>\n<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"></center>\n</form>', 'do_paypal_normal_recurring_screen', '$ccode, $member_id, $new_sub_id, $unit, $length, $cost, $paypal_email, $sub_title, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />$desc_string\n<br /><br /><b>{$ibforums->lang[\'gw_paypal\']}</b>\n</p>\n<form action=\'https://www.paypal.com/cgi-bin/webscr\' method=\'post\'>\n<input type="hidden" name="cmd" value="_xclick-subscriptions" />\n<input type="hidden" name="business" value="$paypal_email" />\n<input type="hidden" name="item_name" value="$sub_title" />\n<input type="hidden" name="item_number" value="$new_sub_id" />\n<input type="hidden" name="no_shipping" value="1" />\n<input type="hidden" name="src" value="1" />\n<input type="hidden" name="a1" value="$to_pay" />\n<input type="hidden" name="p1" value="$time_left_to_run" />\n<input type="hidden" name="t1" value="$time_left_unit" />\n<input type="hidden" name="a3" value="$cost" />\n<input type="hidden" name="p3" value="$length" />\n<input type="hidden" name="t3" value="$unit" />\n<input type="hidden" name="invoice" value="{$cur_tran_id}x{$new_sub_id}x{$member_id}" />\n<input type="hidden" name="custom" value="$member_id" />\n<input type="hidden" name="memo" value="upgrade" />\n<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />\n<input type="hidden" name="currency_code" value="$ccode">\n<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<br /><br />\n<center>\n<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"></center>\n</form>', 'do_paypal_upgrade_recurring_screen', '$ccode, $member_id, $new_sub_id, $to_pay, $time_left_to_run, $time_left_unit, $unit, $length, $cost, $paypal_email, $sub_title, $cur_tran_id, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />$desc_string\n<br /><br /><b>{$ibforums->lang[\'gw_paypal\']}</b>\n</p>\n<form action=\'https://www.paypal.com/cgi-bin/webscr\' method=\'post\'>\n<input type="hidden" name="cmd" value="_xclick" />\n<input type="hidden" name="business" value="$paypal_email" />\n<input type="hidden" name="amount" value="$to_pay">\n<input type="hidden" name="item_name" value="$sub_title" />\n<input type="hidden" name="item_number" value="$new_sub_id" />\n<input type="hidden" name="no_shipping" value="1" />\n<input type="hidden" name="custom" value="$member_id" />\n<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />\n<input type="hidden" name="currency_code" value="$ccode">\n<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<br /><br />\n<center>\n<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"></center>\n</form>', 'do_paypal_normal_screen', '$ccode, $member_id, $new_sub_id, $to_pay, $paypal_email, $sub_title, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_complete\']}</div>\n<p>\n{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />$desc_string\n<br /><br /><b>{$ibforums->lang[\'gw_paypal\']}</b>\n</p>\n<form action=\'https://www.paypal.com/cgi-bin/webscr\' method=\'post\'>\n<input type="hidden" name="cmd" value="_xclick" />\n<input type="hidden" name="business" value="$paypal_email" />\n<input type="hidden" name="amount" value="$to_pay">\n<input type="hidden" name="item_name" value="$sub_title" />\n<input type="hidden" name="item_number" value="$new_sub_id" />\n<input type="hidden" name="no_shipping" value="1" />\n<input type="hidden" name="invoice" value="{$cur_tran_id}x{$new_sub_id}x{$member_id}" />\n<input type="hidden" name="custom" value="$member_id" />\n<input type="hidden" name="memo" value="upgrade" />\n<input type="hidden" name="notify_url" value="{$ibforums->base_url}act=module&module=subscription&CODE=incoming&type=paypal" />\n<input type="hidden" name="currency_code" value="$ccode">\n<input type="hidden" name="return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<input type="hidden" name="cancel_return" value="{$ibforums->base_url}act=module&module=subscription&CODE=paydone&type=paypal">\n<br /><br />\n<center>\n<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" border="0" name="submit" alt="Make payments with PayPal - it\'s fast, free and secure!"></center>\n</form>', 'do_paypal_upgrade_screen', '$ccode, $member_id, $new_sub_id, $to_pay, $paypal_email, $sub_title, $cur_tran_id, $desc_string=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_upgrade_title\']}</div>\n<p>{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />{$ibforums->lang[\'sc_upgrade_string\']}\n</p>', 'sub_two_upgrade_summary', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_normal_title\']}</div>\n<p>{$ibforums->lang[\'sc_upgrade_explain\']}\n<br /><br />{$ibforums->lang[\'sc_normal_string\']}\n</p>', 'sub_two_normal_summary', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'sc_available_methods\']}</div>\n<form action=\'{$ibforums->base_url}act=module&amp;module=subscription&amp;upgrade=$upgrade&amp;CODE=paymentscreen&amp;curid=$curid&amp;sub=$sub_chosen&amp;currency=$currency\' method=\'post\'>             \n<div class="tableborder">\n  <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	<th width=\'5%\'  class=\'titlemedium\' align="center">&nbsp;</th>\n	<th width=\'95%\' class=\'titlemedium\'>{$ibforums->lang[\'sc_method\']}</th>\n  </tr>', 'sub_two_methods_top', '$sub_chosen, $upgrade="", $curid="", $currency=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<tr>\n <td class="row3" align="center"><input type=\'radio\' name=\'methodid\' value="$mid" /></td>\n <td class="row3"><b>$name</b><br /><i>$desc</i></td>\n</tr>', 'sub_two_methods_row', '$mid, $name, $desc=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '</table>\n</div>', 'sub_two_methods_bottom', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<br />\n<div class=\'tableborder\'>\n <div class=\'pformstrip\' align="center"><input type=\'submit\' value=\'{$ibforums->lang[\'s_continue_button2\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'sub_two_methods_continue_button', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'s_current_subs\']}</div>\n<p>{$ibforums->lang[\'s_current_explain\']}</p>             \n<div class="tableborder">\n  <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	<th width=\'5%\'  class=\'titlemedium\' align="center">{$ibforums->lang[\'s_transid\']}</th>\n	<th width=\'35%\' class=\'titlemedium\'>{$ibforums->lang[\'s_detail\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_started\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_end\']}</th>\n	<th width=\'10%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_paid\']}</th>\n	<th width=\'10%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_status\']}</th>\n   </tr>', 'sub_choose_current_top', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<tr>\n <td class="row3" align="center">$id</td>\n <td class="row3"><b>$name</b></td>\n <td class="row3" align="center">$start</td>\n <td class="row3" align="center">$end</td>\n <td class="row3" align="center">{$paid}</td>\n <td class="row3" align="center">$state</td>\n</tr>', 'sub_choose_current_row', '$id, $name, $start, $end, $paid, $state', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '</table>\n</div>', 'sub_choose_current_bottom', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<p>{$ibforums->lang[\'s_current_bottom\']}</p>', 'sub_page_bottom', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'s_dead_subs\']}</div>\n<p>{$ibforums->lang[\'s_dead_explain\']}</p>             \n<div class="tableborder">\n  <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	<th width=\'5%\'  class=\'titlemedium\' align="center">{$ibforums->lang[\'s_transid\']}</th>\n	<th width=\'35%\' class=\'titlemedium\'>{$ibforums->lang[\'s_detail\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_started\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_end\']}</th>\n	<th width=\'10%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_paid\']}</th>\n	<th width=\'10%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_status\']}</th>\n   </tr>', 'sub_choose_dead_top', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<tr>\n <td class="row3" align="center">$id</td>\n <td class="row3"><b>$name</b></td>\n <td class="row3" align="center">$start</td>\n <td class="row3" align="center">$end</td>\n <td class="row3" align="center">{$paid}</td>\n <td class="row3" align="center">$state</td>\n</tr>', 'sub_choose_dead_row', '$id, $name, $start, $end, $paid, $state', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '</table>\n</div>\n<br />', 'sub_choose_dead_bottom', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<br />\n<div class="pformstrip">{$ibforums->lang[\'s_upgrade_subs\']}</div>\n<p>{$ibforums->lang[\'s_upgrade_explain\']}</p>\n<br /> \n<form action=\'{$ibforums->base_url}act=module&amp;module=subscription&amp;upgrade=1&amp;CODE=paymentmethod&amp;curid=$cur_id&amp;currency=$currency\' method=\'post\'>             \n<div class="tableborder">\n  <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	<th width=\'5%\'  class=\'titlemedium\'>&nbsp;</th>\n	<th width=\'55%\' class=\'titlemedium\'>{$ibforums->lang[\'s_detail\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_end\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_balance_cost\']}</th>\n   </tr>', 'sub_choose_upgrade_top', '$cur_id="", $currency=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<tr>\n <td class="row3" align="center"><input type=\'radio\' name=\'sub\' value="$id" /></td>\n <td class="row3"><b>$name</b><br /><i>$desc</i></td>\n <td class="row3" align="center">$duration</td>\n <td class="row3" align="center">{$cost}</td>\n</tr>', 'sub_choose_upgrade_row', '$id, $name, $desc, $cost, $duration', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '</table>\n</div>\n<div class=\'tableborder\'>\n <div class=\'pformstrip\' align="center"><input type=\'submit\' value=\'{$ibforums->lang[\'s_continue_button\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'sub_choose_upgrade_bottom', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div class="pformstrip">{$ibforums->lang[\'s_available_subs\']}</div>\n<p>{$ibforums->lang[\'s_explain\']}</p>\n<br />\n<form action=\'{$ibforums->base_url}act=module&amp;module=subscription&amp;CODE=paymentmethod&amp;currency=$currency\' method=\'post\'>             \n<div class="tableborder">\n  <table cellpadding=\'4\' cellspacing=\'1\' width="100%">\n  <tr>\n	<th width=\'5%\'  class=\'titlemedium\'>&nbsp;</th>\n	<th width=\'55%\' class=\'titlemedium\'>{$ibforums->lang[\'s_detail\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_duration\']}</th>\n	<th width=\'20%\' class=\'titlemedium\' align="center">{$ibforums->lang[\'s_cost\']}</th>\n   </tr>', 'sub_choose_new_top', '$currency', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<tr>\n <td class="row3" align="center"><input type=\'radio\' name=\'sub\' value="$id" /></td>\n <td class="row3"><b>$name</b><br /><i>$desc</i></td>\n <td class="row3" align="center">$duration</td>\n <td class="row3" align="center">{$cost}</td>\n</tr>', 'sub_choose_new_row', '$id, $name, $desc, $cost, $duration', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '</table>\n</div>\n<div class=\'tableborder\'>\n <div class=\'pformstrip\' align="center"><input type=\'submit\' value=\'{$ibforums->lang[\'s_continue_button\']}\' class=\'forminput\' /></div>\n</div>\n</form>', 'sub_choose_new_bottom', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<div align=\'right\'><form action="$url" method="post">{$ibforums->lang[\'cc_currency_in\']} $select <input type=\'submit\' value=\'{$ibforums->lang[\'cc_change\']}\' class=\'forminput\' /></form></div>', 'sub_currency_change_form', '$select, $url', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<select name=\'currency\' class=\'forminput\'>', 'sub_currency_change_top', '', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '<option value=\'$id\' $default>$id $name</option>', 'sub_currency_change_row', '$id, $name, $default=""', 1035406235, 0);||~&~||(1, 'skin_subscriptions', '</select>', 'sub_currency_change_bottom', '', 1035406235, 0);||~&~||(1, 'skin_topic', '{$ibforums->lang[\'tt_warn\']} (<a href="javascript:PopUp(\'{$ibforums->base_url}act=warn&amp;mid={$id}&amp;CODE=view\',\'Pager\',\'500\',\'450\',\'0\',\'1\',\'1\',\'1\')">{$percent}</a>%)', 'warn_level_warn', '$id, $percent', 1035406235, 0);||~&~||(1, 'skin_topic', '&lt;&nbsp;$min ( <a href="javascript:PopUp(\'{$ibforums->base_url}act=warn&amp;mid={$id}&amp;CODE=view\',\'Pager\',\'500\',\'450\',\'0\',\'1\',\'1\',\'1\')">{$level}</a> ) $max&nbsp;&gt;', 'warn_level_rating', '$id, $level,$min=0,$max=10', 1035406235, 0);||~&~||(1, 'skin_topic', '<a href=\'{$ibforums->base_url}act=report&amp;f={$data[\'forum_id\']}&amp;t={$data[\'topic_id\']}&amp;p={$data[\'pid\']}&amp;st={$ibforums->input[\'st\']}\'><{P_REPORT}></a>', 'report_link', '$data', 1035406235, 0);||~&~||(1, 'skin_topic', '<span class=\'desc\'>{$ibforums->lang[\'ip\']}: $data</span>', 'ip_show', '$data', 1035406235, 0);||~&~||(1, 'skin_topic', '( <a href=\'{$ibforums->base_url}act=ST&amp;f=$fid&amp;t=$tid&amp;view=getnewpost\'>{$ibforums->lang[\'go_new_post\']}</a> )', 'golastpost_link', '$fid, $tid', 1035406235, 0);||~&~||(1, 'skin_topic', '<br />\n<form action=\'{$ibforums->base_url}act=mmod&amp;t=$tid\' method=\'post\'>\n<input type=\'hidden\' name=\'check\' value=\'1\'>\n<select name=\'mm_id\' class=\'forminput\'>\n<option value=\'-1\'>{$ibforums->lang[\'mm_title\']}</option>', 'mm_start', '$tid', 1035406235, 0);||~&~||(1, 'skin_topic', '<option value=\'$id\'>$name</option>', 'mm_entry', '$id, $name', 1035406235, 0);||~&~||(1, 'skin_topic', '</select>&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'mm_submit\']}\' class=\'forminput\' /></form>', 'mm_end', '', 1035406235, 0);||~&~||(1, 'skin_topic', '<div align=\'left\' style=\'float:left;width:auto\'>\n	<form method=\'POST\' style=\'display:inline\' name=\'modform\' action=\'{$ibforums->base_url}\'>\n	<input type=\'hidden\' name=\'t\' value=\'$tid\' />\n	<input type=\'hidden\' name=\'f\' value=\'$fid\' />\n	<input type=\'hidden\' name=\'st\' value=\'{$ibforums->input[\'st\']}\' />\n	<input type=\'hidden\' name=\'auth_key\' value=\'$key\' />\n	<input type=\'hidden\' name=\'act\' value=\'Mod\' />\n	<select name=\'CODE\' class=\'forminput\' style="font-weight:bold;color:red">\n	<option value=\'-1\' style=\'color:black\'>{$ibforums->lang[\'moderation_ops\']}</option>\n	$data\n	</select>&nbsp;<input type=\'submit\' value=\'{$ibforums->lang[\'jmp_go\']}\' class=\'forminput\' /></form>\n  </div>', 'Mod_Panel', '$data, $fid, $tid, $key=""', 1035406235, 0);||~&~||(1, 'skin_topic', '<option value=\'$id\'>$text</option>', 'mod_wrapper', '$id="", $text=""', 1035406235, 0);||~&~||(1, 'skin_topic', '<script type="text/javascript">\n	<!--\n	function emo_pop()\n	{\n	  window.open(\'index.{$ibforums->vars[\'php_ext\']}?act=legends&amp;CODE=emoticons&amp;s={$ibforums->session_id}\',\'Legends\',\'width=250,height=500,resizable=yes,scrollbars=yes\'); \n	}\n	//-->\n	</script>\n	<br />\n	<div align=\'left\' id=\'qr_open\' style="display:$show;position:relative;">\n	   <form name=\'REPLIER\' action="{$ibforums->base_url}" method=\'post\'>\n	   <input type=\'hidden\' name=\'act\' value=\'Post\' />\n	   <input type=\'hidden\' name=\'CODE\' value=\'03\' />\n	   <input type=\'hidden\' name=\'f\' value=\'$fid\' />\n	   <input type=\'hidden\' name=\'t\' value=\'$tid\' />\n	   <input type=\'hidden\' name=\'st\' value=\'{$ibforums->input[\'st\']}\' />\n	   <input type=\'hidden\' name=\'enabletrack\' value=\'{$ibforums->member[\'auto_track\']}\' />\n	   <input type=\'hidden\' name=\'auth_key\' value=\'$key\' />\n	   <!-- TITLE DIV -->\n	   <div class="tableborder">\n	     <div class=\'maintitle\'><{CAT_IMG}>&nbsp;{$ibforums->lang[\'qr_title\']}</div>\n		 <div class="tablepad" align="center">\n			 <textarea cols=\'70\' rows=\'8\' name=\'Post\' class=\'textinput\' tabindex="1"></textarea>\n			 <br /><br />\n			 <a href=\'javascript:emo_pop();\'>{$ibforums->lang[\'show_emo\']}</a> &#124;\n			 <input type=\'checkbox\' name=\'enableemo\' value=\'yes\' class="checkbox" checked="checked" />&nbsp;{$ibforums->lang[\'qr_add_smilie\']} &#124;\n			 <input type=\'checkbox\' name=\'enablesig\' value=\'yes\' class="checkbox" checked="checked" />&nbsp;{$ibforums->lang[\'qr_add_sig\']}\n			 <br /><br />\n			 <input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'qr_submit\']}\' class=\'forminput\' tabindex="2" accesskey="s" />&nbsp;\n			 <input type=\'submit\' name=\'preview\' value=\'{$ibforums->lang[\'qr_more_opts\']}\' class=\'forminput\' />\n			 &nbsp;&nbsp; <input type=\'button\' name=\'qrc\' onclick="ShowHide(\'qr_open\',\'qr_closed\');" value=\'{$ibforums->lang[\'qr_closeit\']}\' class=\'forminput\' />\n		 </div>\n	  </div>\n	   </form>\n	</div>', 'quick_reply_box_open', '$fid="",$tid="",$show="hide", $key=""', 1035406235, 0);||~&~||(1, 'skin_topic', '<!-- DEFAULT DIV -->\n	<a href="javascript:ShowHide(\'qr_open\',\'qr_closed\');" title="{$ibforums->lang[\'qr_open\']}" accesskey="f"><{T_QREPLY}></a>', 'quick_reply_box_closed', '', 1035406235, 0);||~&~||(1, 'skin_topic', '<a href="{$ibforums->base_url}act=Post&amp;CODE=14&amp;f=$fid&amp;t=$tid">{$ibforums->lang[\'new_poll_link\']}</a> &#124;&nbsp;', 'start_poll_link', '$fid, $tid', 1035406235, 0);||~&~||(1, 'skin_topic', '<script language=\'javascript\' type=\'text/javascript\'>\n    <!--\n    \n    function link_to_post(pid)\n    {\n    	temp = prompt( "{$ibforums->lang[\'tt_prompt\']}", "{$ibforums->base_url}showtopic={$ibforums->input[\'t\']}&view=findpost&p=" + pid );\n    	return false;\n    }\n    \n    function delete_post(theURL) {\n       if (confirm(\'{$ibforums->lang[\'js_del_1\']}\')) {\n          window.location.href=theURL;\n       }\n       else {\n          alert (\'{$ibforums->lang[\'js_del_2\']}\');\n       } \n    }\n    \n    function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {\n    if (posleft != 0) { x = posleft }\n    if (postop  != 0) { y = postop  }\n    if (!scroll) { scroll = 1 }\n    if (!resize) { resize = 1 }\n    if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {\n      X = (screen.width  - width ) / 2;\n      Y = (screen.height - height) / 2;\n    }\n    if (scroll != 0) { scroll = 1 }\n    var Win = window.open( url, name, \'width=\'+width+\',height=\'+height+\',top=\'+Y+\',left=\'+X+\',resizable=\'+resize+\',scrollbars=\'+scroll+\',location=no,directories=no,status=no,menubar=no,toolbar=no\');\n	}\n	\n	function ShowHide(id1, id2) {\n	  if (id1 != \'\') expMenu(id1);\n	  if (id2 != \'\') expMenu(id2);\n	}\n	\n	function expMenu(id) {\n	  var itm = null;\n	  if (document.getElementById) {\n		itm = document.getElementById(id);\n	  } else if (document.all){\n		itm = document.all[id];\n	  } else if (document.layers){\n		itm = document.layers[id];\n	  }\n	\n	  if (!itm) {\n	   // do nothing\n	  }\n	  else if (itm.style) {\n		if (itm.style.display == "none") { itm.style.display = ""; }\n		else { itm.style.display = "none"; }\n	  }\n	  else { itm.visibility = "show"; }\n	}\n    //-->\n    </script>\n    \n<a name=\'top\'></a>\n<!--IBF.FORUM_RULES-->\n<table width="100%" cellpadding="0" cellspacing="0" border="0">\n<tr>\n <td align=\'left\' width="20%" nowrap="nowrap">{$data[\'TOPIC\'][\'SHOW_PAGES\']}&nbsp;{$data[\'TOPIC\'][\'go_new\']}</td>\n <td align=\'right\' width="80%">{$data[TOPIC][REPLY_BUTTON]}<a href=\'{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data[FORUM][\'id\']}\' title=\'{$ibforums->lang[\'start_new_topic\']}\'><{A_POST}></a>{$data[TOPIC][POLL_BUTTON]}</td>\n</tr>\n</table>\n<br />\n<div class="tableborder">\n    <div class=\'maintitle\'><{CAT_IMG}>&nbsp;<b>{$data[\'TOPIC\'][\'title\']}</b>{$data[\'TOPIC\'][\'description\']}</div>\n	<!--{IBF.POLL}-->\n	<div align=\'right\' class=\'postlinksbar\'>\n	  <strong><!--{IBF.START_NEW_POLL}--><a href=\'{$ibforums->base_url}act=Track&amp;f={$data[\'FORUM\'][\'id\']}&amp;t={$data[\'TOPIC\'][\'tid\']}\'>{$ibforums->lang[\'track_topic\']}</a> |\n	  <a href=\'{$ibforums->base_url}act=Forward&amp;f={$data[\'FORUM\'][\'id\']}&amp;t={$data[\'TOPIC\'][\'tid\']}\'>{$ibforums->lang[\'forward\']}</a> |\n	  <a href=\'{$ibforums->base_url}act=Print&amp;client=printer&amp;f={$data[\'FORUM\'][\'id\']}&amp;t={$data[\'TOPIC\'][\'tid\']}\'>{$ibforums->lang[\'print\']}</a></strong>\n	</div>', 'PageTop', '$data', 1035406235, 0);||~&~||(1, 'skin_topic', '<!--Begin Msg Number {$post[\'pid\']}-->\n    <table width=\'100%\' border=\'0\' cellspacing=\'1\' cellpadding=\'3\'>\n    <tr>\n      <td valign=\'middle\' class=\'row4\' width="1%"><a name=\'entry{$post[\'pid\']}\'></a><span class=\'{$post[\'name_css\']}\'>{$author[\'name\']}</span></td>\n        <td class=\'row4\' valign=\'top\' width="99%">\n        \n        <!-- POSTED DATE DIV -->\n        \n        <div align=\'left\' class=\'row4\' style=\'float:left;padding-top:4px;padding-bottom:4px\'>\n        {$post[\'post_icon\']}<span class=\'postdetails\'><b><a title="{$ibforums->lang[\'tt_link\']}" href="#" onclick="link_to_post({$post[\'pid\']}); return false;" style="text-decoration:underline">{$ibforums->lang[\'posted_on\']}</a></b> {$post[\'post_date\']}</span>\n        </div>\n        \n        <!-- REPORT / DELETE / EDIT / QUOTE DIV -->\n        \n        <div align=\'right\'>\n        {$post[\'report_link\']}{$post[\'delete_button\']}{$post[\'edit_button\']}<a href=\'{$ibforums->base_url}act=Post&amp;CODE=06&amp;f={$ibforums->input[f]}&amp;t={$ibforums->input[t]}&amp;p={$post[\'pid\']}\'><{P_QUOTE}></a>\n      </div>\n      \n      </td>\n    </tr>\n    <tr>\n      <td valign=\'top\' class=\'{$post[\'post_css\']}\'>\n        <span class=\'postdetails\'>{$author[\'avatar\']}<br /><br />\n        {$author[\'title\']}<br />\n        {$author[\'member_rank_img\']}<br /><br />\n        {$author[\'member_group\']}<br />\n        {$author[\'member_posts\']}<br />\n        {$author[\'member_number\']}<br />\n        {$author[\'member_joined\']}<br /><br />\n        {$author[\'warn_text\']} {$author[\'warn_minus\']}{$author[\'warn_img\']}{$author[\'warn_add\']}</span><br />\n        <!--$ author[field_1]-->\n        <img src=\'{$ibforums->vars[\'img_url\']}/spacer.gif\' alt=\'\' width=\'160\' height=\'1\' /><br /> \n      </td>\n      <td width=\'100%\' valign=\'top\' class=\'{$post[\'post_css\']}\'>\n        <!-- THE POST {$post[\'pid\']} -->\n        <div class=\'postcolor\'>{$post[\'post\']} {$post[\'attachment\']}</div>\n        {$post[\'signature\']}\n        <!-- THE POST -->\n      </td>\n    </tr>\n    <tr>\n      <td class=\'darkrow3\' align=\'left\'><b>{$post[\'ip_address\']}</b></td>\n      <td class=\'darkrow3\' nowrap="nowrap" align=\'left\'>\n      \n        <!-- PM / EMAIL / WWW / MSGR -->\n      \n        <div align=\'left\' class=\'darkrow3\' style=\'float:left;width:auto\'>\n        {$author[\'addresscard\']}{$author[\'message_icon\']}{$author[\'email_icon\']}{$author[\'website_icon\']}{$author[\'integ_icon\']}{$author[\'icq_icon\']}{$author[\'aol_icon\']}{$author[\'yahoo_icon\']}{$author[\'msn_icon\']}\n        </div>\n        \n        <!-- REPORT / UP -->\n         \n        <div align=\'right\'>\n         <a href=\'javascript:scroll(0,0);\'><img src=\'{$ibforums->vars[\'img_url\']}/p_up.gif\' alt=\'Top\' border=\'0\' /></a>\n        </div>\n      </td>\n    </tr>\n    </table>\n    <div class=\'darkrow1\' style=\'height:5px\'><!-- --></div>', 'RenderRow', '$post, $author', 1035406235, 0);||~&~||(1, 'skin_topic', '<!--IBF.TOPIC_ACTIVE-->\n      <div class="activeuserstrip" align="center">&laquo; <a href=\'{$ibforums->base_url}showtopic={$data[TOPIC][\'tid\']}&amp;view=old\'>{$ibforums->lang[\'t_old\']}</a> &#0124; <strong><a href=\'{$ibforums->base_url}showforum={$data[\'FORUM\'][\'id\']}\'>{$data[\'FORUM\'][\'name\']}</a></strong> &#0124; <a href=\'{$ibforums->base_url}showtopic={$data[TOPIC][\'tid\']}&amp;view=new\'>{$ibforums->lang[\'t_new\']}</a> &raquo;</div>\n</div>\n \n<br />\n<table width="100%" cellpadding="0" cellspacing="0" border="0">\n<tr>\n <td align=\'left\' width="20%" nowrap="nowrap"><!--IBF.TOPIC_OPTIONS_CLOSED-->{$data[TOPIC][SHOW_PAGES]}</td>\n <td align=\'right\' width="80%">{$data[TOPIC][REPLY_BUTTON]}<!--IBF.QUICK_REPLY_CLOSED--><a href=\'{$ibforums->base_url}act=Post&amp;CODE=00&amp;f={$data[FORUM][\'id\']}\' title=\'{$ibforums->lang[\'start_new_topic\']}\'><{A_POST}></a>{$data[TOPIC][POLL_BUTTON]}</td>\n</tr>\n</table>\n<!--IBF.QUICK_REPLY_OPEN-->\n<!--IBF.TOPIC_OPTIONS_OPEN-->\n<br />\n<!--IBF.MOD_PANEL-->\n<div align=\'right\'>{$data[FORUM][\'JUMP\']}</div>\n<!--IBF.MULTIMOD-->\n<br />', 'TableFooter', '$data', 1035406235, 0);||~&~||(1, 'skin_topic', '<div id=\'topic_open\' style=\'display:none;z-index:2;\'>\n    <div class="tableborder">\n	  <div class=\'maintitle\'><{CAT_IMG}>&nbsp;<a href="javascript:ShowHide(\'topic_open\',\'topic_closed\')">{$ibforums->lang[\'to_close\']}</a></div>\n	  <div class=\'tablepad\'>\n	   <b><a href=\'{$ibforums->base_url}act=Track&amp;f={$fid}&amp;t={$tid}\'>{$ibforums->lang[\'tt_title\']}</a></b>\n	   <br />\n	   <span class=\'desc\'>{$ibforums->lang[\'tt_desc\']}</span>\n	   <br /><br />\n	   <b><a href=\'{$ibforums->base_url}act=Track&amp;f={$fid}&amp;type=forum\'>{$ibforums->lang[\'ft_title\']}</a></b>\n	   <br />\n	   <span class=\'desc\'>{$ibforums->lang[\'ft_desc\']}</span>\n	   <br /><br />\n	   <b><a href=\'{$ibforums->base_url}act=Print&amp;client=choose&amp;f={$fid}&amp;t={$tid}\'>{$ibforums->lang[\'av_title\']}</a></b>\n	   <br />\n	   <span class=\'desc\'>{$ibforums->lang[\'av_desc\']}</span>\n	 </div>\n   </div>\n</div>', 'topic_opts_open', '$fid, $tid', 1035406235, 0);||~&~||(1, 'skin_topic', '<a href="javascript:ShowHide(\'topic_open\',\'topic_closed\')" title="{$ibforums->lang[\'to_open\']}"><{T_OPTS}></a>', 'topic_opts_closed', '', 1035406235, 0);||~&~||(1, 'skin_topic', '<div class="activeuserstrip">{$ibforums->lang[\'active_users_title\']} ({$ibforums->lang[\'active_users_detail\']})</div>\n	  <div class=\'row2\' style=\'padding:6px\'>{$ibforums->lang[\'active_users_members\']} {$active[\'names\']}</div>', 'topic_active_users', '$active=array()', 1035406235, 0);||~&~||(1, 'skin_topic', '<br />\n<br />\n<strong><span class=\'edit\'>{$ibforums->lang[\'pic_attach\']}</span></strong>\n<br />\n<img src=\'{$ibforums->vars[\'upload_url\']}/$file_name\' class=\'attach\' alt=\'{$ibforums->lang[\'pic_attach\']}\' />', 'Show_attachments_img', '$file_name', 1035406235, 0);||~&~||(1, 'skin_topic', '<br />\n<br />\n<strong><span class=\'edit\'>{$ibforums->lang[\'pic_attach_thumb\']}</span></strong>\n<br />\n<a href=\'{$ibforums->base_url}act=Attach&amp;type=post&amp;id=$aid\' title=\'{$ibforums->lang[\'pic_attach_thumb\']}\' target=\'_blank\'><img src=\'{$ibforums->vars[\'upload_url\']}/$file_name\' width=\'$width\' height=\'$height\' class=\'attach\' alt=\'{$ibforums->lang[\'pic_attach\']}\' /></a>', 'Show_attachments_img_thumb', '$file_name, $width, $height, $aid', 1035406235, 0);||~&~||(1, 'skin_topic', '<br />\n<br />\n<strong><span class=\'edit\'>{$ibforums->lang[\'attached_file\']} ( {$ibforums->lang[\'attach_hits\']}: {$data[\'hits\']} )</span></strong>\n<br />\n<a href=\'{$ibforums->base_url}act=Attach&amp;type=post&amp;id={$data[\'pid\']}\' title=\'{$ibforums->lang[\'attach_dl\']}\' target=\'_blank\'><img src=\'{$ibforums->vars[\'mime_img\']}/{$data[\'image\']}\' border=\'0\' alt=\'{$ibforums->lang[\'attached_file\']}\' /></a>\n&nbsp;<a href=\'{$ibforums->base_url}act=Attach&amp;type=post&amp;id={$data[\'pid\']}\' title=\'{$ibforums->lang[\'attach_dl\']}\' target=\'_blank\'>{$data[\'name\']}</a>', 'Show_attachments', '$data', 1035406235, 0);||~&~||(1, 'skin_ucp', '<script language="javascript" type="text/javascript">\n<!--\n	var url_input      = "$url_photo";\n	var remove_pressed = 0;\n	\n	function clear_it()\n	{\n		if ( document.bob.url_photo.value != "" )\n		{\n			url_input = document.bob.url_photo.value;\n		}\n      \n		document.bob.url_photo.value = "";\n	}\n   \n	function restore_it()\n	{\n		if (url_input != "")\n		{\n			document.bob.url_photo.value = url_input;\n		}\n	}\n   \n	function checkform()\n	{\n   		if ( remove_pressed != 1 )\n   		{\n   			return true;\n   		}\n   		else\n   		{\n   			fcheck = confirm("{$ibforums->lang[\'pp_confirm\']}");\n   			if ( fcheck == true )\n   			{\n   				return true;\n   			}\n   			else\n   			{\n   				return false;\n   			}\n   		}\n	}\n//-->\n</script>\n<form action="{$ibforums->base_url}auth_key=$key" enctype=\'multipart/form-data\' method="post" name="bob" onsubmit="return checkform();">\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'dophoto\' />\n<div class="pformstrip">{$ibforums->lang[\'pph_title\']}</div>\n<p>{$ibforums->lang[\'pph_desc\']}<br />{$ibforums->lang[\'pph_max\']}</p>\n<div class="pformstrip">{$ibforums->lang[\'pph_current\']}</div>\n<div align="center">\n <p>$cur_photo<br />$cur_type $show_size</p>\n</div>\n<div class="pformstrip">{$ibforums->lang[\'pph_change\']}</div>\n<table class=\'tablebasic\' cellpadding=\'4\'>\n<tr>\n <td class=\'pformleft\'>{$ibforums->lang[\'pph_url\']}</td>\n <td class=\'pformright\'><input type=\'text\' onfocus="restore_it()" name=\'url_photo\' value=\'$url_photo\' size=\'40\' class=\'forminput\' />&nbsp;&nbsp;(<a href=\'javascript:restore_it()\'>{$ibforums->lang[\'pp_restore\']}</a>)</td>\n</tr>\n<!--IPB.UPLOAD-->\n<!--IPB.SIZE-->\n</table>\n<div align="center" class="pformstrip">\n  <input type="submit" name=\'submit\' value="{$ibforums->lang[\'pph_submit\']}" class=\'forminput\' />\n  &nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" onclick="remove_pressed=1;" name=\'remove\' value="{$ibforums->lang[\'pph_remove\']}" class=\'forminput\' />\n</div>\n</form>', 'photo_page', '$cur_photo, $cur_type, $url_photo, $show_size, $key=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n <td class=\'pformleft\'>&nbsp;</td>\n <td class=\'pformright\'><strong>{$ibforums->lang[\'pph_autosize\']}</strong><br />({$ibforums->lang[\'pph_as_desc\']})</td>\n</tr>', 'photo_page_autosize', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n <td class=\'pformleft\'>&nbsp;</td>\n <td class=\'pformright\'><strong>{$ibforums->lang[\'width\']}</strong>&nbsp;<input type=\'text\' size=\'3\' name=\'man_width\' />&nbsp;&nbsp;<strong>{$ibforums->lang[\'height\']}</strong>&nbsp;<input type=\'text\' size=\'3\' name=\'man_height\' /></td>\n</tr>', 'photo_page_mansize', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n <td class=\'pformleft\'>{$ibforums->lang[\'pph_upload\']}</td>\n <td class=\'pformright\'><input type=\'hidden\' name=\'MAX_FILE_SIZE\' value=\'$max_filesize\' /><input type=\'file\' name=\'upload_photo\' value=\'\' size=\'40\' class=\'forminput\' onclick="clear_it()"/></td>\n</tr>', 'photo_page_upload', '$max_filesize', 1035406235, 0);||~&~||(1, 'skin_ucp', '<script language=\'Javascript\' type="text/javascript">\n   var msg = "$msg";\n   if ( msg != "")\n   {\n	   alert(msg);\n   }\n</script>\n<form action="{$ibforums->base_url}" method="post" name=\'form1\'>\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'09\' />\n<div class="pformstrip">{$ibforums->lang[\'change_email_title\']}</div>\n<p>$txt</p>\n<table width="100%" style="padding:6px">\n<tr>\n  <td width=\'40%\'><strong>{$ibforums->lang[\'ce_new_email\']}</strong></td>\n  <td align=\'left\'><input type=\'text\' name=\'in_email_1\' value=\'\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td><strong>{$ibforums->lang[\'ce_new_email2\']}</strong></td>\n  <td align=\'left\'><input type=\'text\' name=\'in_email_2\' value=\'\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td><strong>{$ibforums->lang[\'ec_passy\']}</strong></td>\n  <td align=\'left\'><input type=\'password\' name=\'password\' value=\'\' class=\'forminput\' /></td>\n</tr>\n</table>\n<!--ANTIBOT-->\n<div align="center" class="pformstrip"><input type="submit" name=\'change_email\' value="{$ibforums->lang[\'account_email_submit\']}" class=\'forminput\' /></div>\n</form>', 'email_change', '$txt="", $msg=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'ras_title\']}</div>\n<table width="100%" style="padding:6px">\n<tr>\n  <td width=\'40%\'>{$ibforums->lang[\'ras_numbers\']}</td>\n  <td>\n	 <input type=\'hidden\' name=\'regid\' value=\'$regid\' />\n	 <img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=1\' border=\'0\' alt=\'Code Bit\' />\n	 &nbsp;<img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=2\' border=\'0\' alt=\'Code Bit\' />\n	 &nbsp;<img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=3\' border=\'0\' alt=\'Code Bit\' />\n	 &nbsp;<img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=4\' border=\'0\' alt=\'Code Bit\' />\n	 &nbsp;<img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=5\' border=\'0\' alt=\'Code Bit\' />\n	 &nbsp;<img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=6\' border=\'0\' alt=\'Code Bit\' />\n  </td>\n</tr>\n<tr>\n  <td width=\'40%\'>{$ibforums->lang[\'ras_text\']}</td>\n  <td><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'reg_code\' class=\'forminput\' /></td>\n</tr>\n</table>', 'email_change_img', '$regid=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'ras_title\']}</div>\n<table width="100%" style="padding:6px">\n<tr>\n  <td width=\'40%\'>{$ibforums->lang[\'ras_numbers\']}</td>\n  <td>\n	 <input type=\'hidden\' name=\'regid\' value=\'$regid\' />\n	 <img src=\'{$ibforums->base_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}\' border=\'0\' alt=\'Code Bit\' />\n  </td>\n</tr>\n<tr>\n  <td width=\'40%\'>{$ibforums->lang[\'ras_text\']}</td>\n  <td><input type=\'text\' size=\'32\' maxlength=\'32\' name=\'reg_code\' class=\'forminput\' /></td>\n</tr>\n</table>', 'email_change_gd', '$regid=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<form action="{$ibforums->base_url}" method="post" name=\'form1\'>\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'29\' />\n<div class="pformstrip">{$ibforums->lang[\'account_pass_title\']}</div>\n<p>{$ibforums->lang[\'pass_change_text\']}</p>\n<table width="100%" style="padding:6px">\n<tr>\n  <td><b>{$ibforums->lang[\'account_pass_old\']}</b></td>\n  <td><input type=\'password\' name=\'current_pass\' value=\'\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td><b>{$ibforums->lang[\'account_pass_new\']}</b></td>\n  <td><input type=\'password\' name=\'new_pass_1\' value=\'\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td><b>{$ibforums->lang[\'account_pass_new2\']}</b></td>\n  <td><input type=\'password\' name=\'new_pass_2\' value=\'\' class=\'forminput\' /></td>\n</tr>\n</table>\n<div align="center" class="pformstrip"><input type="submit" name=\'s_pass\' value="{$ibforums->lang[\'account_pass_submit\']}" class=\'forminput\' /></div>\n</form>', 'pass_change', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<script langauge=\'javascript\' type="text/javascript">\n<!--\nvar url_input      = "{$data[\'current_url_avatar\']}";\nvar remove_pressed = 0;\n\nfunction select_url() {\n  restore_it();\n}\nfunction select_upload() {\n  \n  try\n  {\n	  if ( document.creator.url_avatar.value != "" ) {\n		  url_input = document.creator.url_avatar.value;\n	  }\n	\n	  document.creator.url_avatar.value = "";\n  }\n  catch(nourl)\n  {\n  	  return true;\n  }\n}\n\nfunction restore_it()\n{\n	if (url_input != "")\n	{\n		document.creator.url_avatar.value = url_input;\n	}\n}\nfunction checkform()\n{\n	if ( remove_pressed != 1 )\n	{\n		return true;\n	}\n	else\n	{\n		fcheck = confirm("{$ibforums->lang[\'av_confirm\']}");\n		if ( fcheck == true )\n		{\n			return true;\n		}\n		else\n		{\n			return false;\n		}\n	}\n}\n  \n//-->\n</script>\n<!--IBF.LIMITS_AVATAR-->\n<div class="pformstrip">{$ibforums->lang[\'av_current\']}</div>\n<div class="tablepad" align="center">{$data[\'current_avatar_image\']}<br />{$data[\'current_avatar_type\']} {$data[\'current_avatar_dims\']}</div>\n<div class="pformstrip">{$ibforums->lang[\'avatar_pre_title\']}</div>\n<form action=\'{$ibforums->base_url}act=UserCP&amp;CODE=getgallery\' method=\'post\'>\n<table class=\'tablebasic\' cellpadding=\'4\'>\n<tr>\n <td class=\'pformleft\'>{$ibforums->lang[\'av_go_gal\']}</td>\n <td class=\'pformright\'>{$data[\'avatar_galleries\']}&nbsp;&nbsp;<input type="submit" value="{$ibforums->lang[\'av_go_go\']}" name="submit" class="forminput" /></td>\n</tr>\n</table>\n</form>\n<form action=\'{$ibforums->base_url}auth_key=$key\' method=\'post\' $formextra name=\'creator\' onsubmit="return checkform();">\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'25\' />\n$hidden_field\n<!--IBF.EXTERNAL_TITLE-->\n<!--IBF.URL_AVATAR-->\n<!--IBF.UPLOAD_AVATAR-->\n<!--IPB.SIZE-->\n<div align="center" class="pformstrip">\n  <input type="submit" name="submit" value="{$ibforums->lang[\'av_update\']}" class=\'forminput\' />\n  &nbsp;&nbsp;&nbsp;<input type="submit" name="remove" onclick="remove_pressed=1;" value="{$ibforums->lang[\'av_remove\']}" class=\'forminput\' />\n</div>\n</form>', 'avatar_main', '$data, $formextra="", $hidden_field="", $key=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'av_gallery_title\']} $title</div>\n<form action=\'{$ibforums->base_url}act=UserCP&amp;CODE=getgallery\' method=\'post\'>\n<div id="padandcenter"><strong>{$ibforums->lang[\'av_gall_jump\']}</strong>&nbsp;$av_gals&nbsp;&nbsp;<input type="submit" value="{$ibforums->lang[\'av_go_go\']}" name="submit" class="forminput" /></div>\n</form>\n<form action=\'{$ibforums->base_url}auth_key=$key\' method=\'post\'>\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'setinternalavatar\' />\n<input type=\'hidden\' name=\'current_folder\' value=\'$current_folder\' />\n<table class=\'tablebasic\' cellpadding=\'4\'>', 'avatar_gallery_start_table', '$title="", $av_gals="", $current_folder, $key=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '</table>\n<div align="center" class="pformstrip">\n  <input type="submit" name="submit" value="{$ibforums->lang[\'av_gall_submit\']}" class=\'forminput\' />\n  &nbsp;&nbsp;&nbsp;<input type="button" name="remove" onclick="self.location=\'{$ibforums->base_url}act=UserCP&amp;CODE=24\';" value="{$ibforums->lang[\'av_gall_cancel\']}" class=\'forminput\' />\n</div>\n</form>', 'avatar_gallery_end_table', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>', 'avatar_gallery_start_row', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '</tr>', 'avatar_gallery_end_row', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<td align="center"><img src="html/avatars{$img}" border="0" alt="txt"><br /><input type="radio" class="radiobutton" name="avatar" value="$form" id="$form" />&nbsp;<strong><label for="$form">$txt</label></strong></td>', 'avatar_gallery_cell_row', '$img, $txt, $form', 1035406235, 0);||~&~||(1, 'skin_ucp', '<td>&nbsp;</td>', 'avatar_gallery_blank_row', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<table class=\'tablebasic\' cellpadding=\'4\'>\n<tr>\n <td class=\'pformleft\'>&nbsp;</td>\n <td class=\'pformright\'><strong>{$ibforums->lang[\'av_autosize\']}</strong><br />({$ibforums->lang[\'av_as_desc\']})</td>\n</tr>\n</table>', 'avatar_autosize', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<table class=\'tablebasic\' cellpadding=\'4\'>\n<tr>\n <td class=\'pformleft\'>&nbsp;</td>\n <td class=\'pformright\'><strong>{$ibforums->lang[\'width\']}</strong>&nbsp;<input type=\'text\' size=\'3\' name=\'man_width\' />&nbsp;&nbsp;<strong>{$ibforums->lang[\'height\']}</strong>&nbsp;<input type=\'text\' size=\'3\' name=\'man_height\' /></td>\n</tr>\n</table>', 'avatar_mansize', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'avatar_url_title\']}</div>', 'avatar_external_title', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'av_settings\']}</div>\n<p>{$ibforums->lang[\'av_text_url\']} {$ibforums->lang[\'av_text_upload\']}<br />{$ibforums->lang[\'av_allowed_files\']}</p>', 'avatar_limits', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<table class=\'tablebasic\' cellpadding=\'4\'>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'av_upload\']}</td>\n  <td class=\'pformright\'><input type=\'file\' size=\'30\' name=\'upload_avatar\' class=\'forminput\' onfocus=\'select_upload()\' onclick=\'select_upload()\' /></td>\n</tr>\n</table>', 'avatar_upload_field', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<table class=\'tablebasic\' cellpadding=\'4\'>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'av_url\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'80\' name=\'url_avatar\' value=\'$avatar\' class=\'forminput\' onfocus=\'select_url()\' />&nbsp;&nbsp;(<a href=\'javascript:restore_it()\'>{$ibforums->lang[\'pp_restore\']}</a>)</td>\n</tr>\n</table>', 'avatar_url_field', '$avatar', 1035406235, 0);||~&~||(1, 'skin_ucp', '<script language="javascript1.2" type="text/javascript">\n<!--\nvar MessageMax  = "{$ibforums->lang[\'the_max_length\']}";\nvar Override    = "{$ibforums->lang[\'override\']}";\nfunction CheckLength() {\n    MessageLength  = document.REPLIER.Post.value.length;\n    message  = "";\n        if (MessageMax > 0) {\n            message = "{$ibforums->lang[\'js_max_length\']} " + MessageMax + " {$ibforums->lang[\'js_characters\']}.";\n        } else {\n            message = "";\n        }\n        alert(message + " {$ibforums->lang[\'js_used\']} " + MessageLength + " {$ibforums->lang[\'js_characters\']}.");\n}\nfunction ValidateForm() {\n    MessageLength  = document.REPLIER.Post.value.length;\n    errors = "";\n    if (MessageMax !=0) {\n        if (MessageLength > MessageMax) {\n            errors = "{$ibforums->lang[\'js_max_length\']} " + MessageMax + " {$ibforums->lang[\'js_characters\']}. {$ibforums->lang[\'js_current\']}: " + MessageLength;\n        }\n    }\n    if (errors != "" && Override == "") {\n        alert(errors);\n        return false;\n    } else {\n        document.REPLIER.submit.disabled = true;\n        return true;\n    }\n}\n\n// IBC Code stuff\n	var text_enter_url      = "{$ibforums->lang[\'jscode_text_enter_url\']}";\n	var text_enter_url_name = "{$ibforums->lang[\'jscode_text_enter_url_name\']}";\n	var text_enter_image    = "{$ibforums->lang[\'jscode_text_enter_image\']}";\n	var text_enter_email    = "{$ibforums->lang[\'jscode_text_enter_email\']}";\n	var text_enter_flash    = "{$ibforums->lang[\'jscode_text_enter_flash\']}";\n	var text_code           = "{$ibforums->lang[\'jscode_text_code\']}";\n	var text_quote          = "{$ibforums->lang[\'jscode_text_quote\']}";\n	var error_no_url        = "{$ibforums->lang[\'jscode_error_no_url\']}";\n	var error_no_title      = "{$ibforums->lang[\'jscode_error_no_title\']}";\n	var error_no_email      = "{$ibforums->lang[\'jscode_error_no_email\']}";\n	var error_no_width      = "{$ibforums->lang[\'jscode_error_no_width\']}";\n	var error_no_height     = "{$ibforums->lang[\'jscode_error_no_height\']}";\n	var prompt_start        = "{$ibforums->lang[\'js_text_to_format\']}";\n	\n	var help_bold           = "{$ibforums->lang[\'hb_bold\']}";\n	var help_italic         = "{$ibforums->lang[\'hb_italic\']}";\n	var help_under          = "{$ibforums->lang[\'hb_under\']}";\n	var help_font           = "{$ibforums->lang[\'hb_font\']}";\n	var help_size           = "{$ibforums->lang[\'hb_size\']}";\n	var help_color          = "{$ibforums->lang[\'hb_color\']}";\n	var help_close          = "{$ibforums->lang[\'hb_close\']}";\n	var help_url            = "{$ibforums->lang[\'hb_url\']}";\n	var help_img            = "{$ibforums->lang[\'hb_img\']}";\n	var help_email          = "{$ibforums->lang[\'hb_email\']}";\n	var help_quote          = "{$ibforums->lang[\'hb_quote\']}";\n	var help_list           = "{$ibforums->lang[\'hb_list\']}";\n	var help_code           = "{$ibforums->lang[\'hb_code\']}";\n	var help_click_close    = "{$ibforums->lang[\'hb_click_close\']}";\n	var list_prompt         = "{$ibforums->lang[\'js_tag_list\']}";\n//-->\n</script>\n<form action="{$ibforums->base_url}" method="post" name=\'REPLIER\'>\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'23\' />\n<input type=\'hidden\' name=\'key\' value=\'$key\' />\n<div class=\'pformstrip\'>{$ibforums->lang[\'cp_current_sig\']}</div>\n<div class=\'signature\' style="width:75%;margin-right:auto;margin-left:auto;padding:6px">$sig</div>\n<div class=\'pformstrip\'>{$ibforums->lang[\'cp_edit_sig\']}</div>\n<table width="100%">\n<tr> \n  <td class="pformleft">\n	<input type=\'radio\' name=\'bbmode\' value=\'ezmode\' onclick=\'setmode(this.value)\' />&nbsp;<b>{$ibforums->lang[\'bbcode_guided\']}</b><br />\n	<input type=\'radio\' name=\'bbmode\' value=\'normal\' onclick=\'setmode(this.value)\' checked="checked" />&nbsp;<b>{$ibforums->lang[\'bbcode_normal\']}</b>\n    <script language=\'javascript\' type="text/javascript" src=\'html/ibfcode.js\'></script>\n  </td>\n  <td class="pformright" valign="top">\n	<input type=\'button\' accesskey=\'b\' value=\' B \'       onclick=\'simpletag("B")\' class=\'codebuttons\' name=\'B\' style="font-weight:bold" onmouseover="hstat(\'bold\')" />\n	<input type=\'button\' accesskey=\'i\' value=\' I \'       onclick=\'simpletag("I")\' class=\'codebuttons\' name=\'I\' style="font-style:italic" onmouseover="hstat(\'italic\')" />\n	<input type=\'button\' accesskey=\'u\' value=\' U \'       onclick=\'simpletag("U")\' class=\'codebuttons\' name=\'U\' style="text-decoration:underline" onmouseover="hstat(\'under\')" />\n	\n	<select name=\'ffont\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'FONT\')"  onmouseover="hstat(\'font\')">\n	<option value=\'0\'>{$ibforums->lang[\'ct_font\']}</option>\n	<option value=\'Arial\' style=\'font-family:Arial\'>{$ibforums->lang[\'ct_arial\']}</option>\n	<option value=\'Times\' style=\'font-family:Times\'>{$ibforums->lang[\'ct_times\']}</option>\n	<option value=\'Courier\' style=\'font-family:Courier\'>{$ibforums->lang[\'ct_courier\']}</option>\n	<option value=\'Impact\' style=\'font-family:Impact\'>{$ibforums->lang[\'ct_impact\']}</option>\n	<option value=\'Geneva\' style=\'font-family:Geneva\'>{$ibforums->lang[\'ct_geneva\']}</option>\n	<option value=\'Optima\' style=\'font-family:Optima\'>Optima</option>\n	</select><select name=\'fsize\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'SIZE\')" onmouseover="hstat(\'size\')">\n	<option value=\'0\'>{$ibforums->lang[\'ct_size\']}</option>\n	<option value=\'1\'>{$ibforums->lang[\'ct_sml\']}</option>\n	<option value=\'7\'>{$ibforums->lang[\'ct_lrg\']}</option>\n	<option value=\'14\'>{$ibforums->lang[\'ct_lest\']}</option>\n	</select><select name=\'fcolor\' class=\'codebuttons\' onchange="alterfont(this.options[this.selectedIndex].value, \'COLOR\')" onmouseover="hstat(\'color\')">\n	<option value=\'0\'>{$ibforums->lang[\'ct_color\']}</option>\n	<option value=\'blue\' style=\'color:blue\'>{$ibforums->lang[\'ct_blue\']}</option>\n	<option value=\'red\' style=\'color:red\'>{$ibforums->lang[\'ct_red\']}</option>\n	<option value=\'purple\' style=\'color:purple\'>{$ibforums->lang[\'ct_purple\']}</option>\n	<option value=\'orange\' style=\'color:orange\'>{$ibforums->lang[\'ct_orange\']}</option>\n	<option value=\'yellow\' style=\'color:yellow\'>{$ibforums->lang[\'ct_yellow\']}</option>\n	<option value=\'gray\' style=\'color:gray\'>{$ibforums->lang[\'ct_grey\']}</option>\n	<option value=\'green\' style=\'color:green\'>{$ibforums->lang[\'ct_green\']}</option>\n	</select>\n	&nbsp; <a href=\'javascript:closeall();\' onmouseover="hstat(\'close\')">{$ibforums->lang[\'js_close_all_tags\']}</a>\n	<br />\n	<input type=\'button\' accesskey=\'h\' value=\' http:// \' onclick=\'tag_url()\'            class=\'codebuttons\' name=\'url\' onmouseover="hstat(\'url\')">\n	<input type=\'button\' accesskey=\'g\' value=\' IMG \'     onclick=\'tag_image()\'          class=\'codebuttons\' name=\'img\' onmouseover="hstat(\'img\')">\n	<input type=\'button\' accesskey=\'e\' value=\'  @  \'     onclick=\'tag_email()\'          class=\'codebuttons\' name=\'email\' onmouseover="hstat(\'email\')">\n	<input type=\'button\' accesskey=\'q\' value=\' QUOTE \'   onclick=\'simpletag("QUOTE")\'   class=\'codebuttons\' name=\'QUOTE\' onmouseover="hstat(\'quote\')">\n	<input type=\'button\' accesskey=\'p\' value=\' CODE \'    onclick=\'simpletag("CODE")\'    class=\'codebuttons\' name=\'CODE\' onmouseover="hstat(\'code\')">\n	<input type=\'hidden\' accesskey=\'l\' value=\' LIST \'     onclick=\'tag_list()\'          class=\'codebuttons\' name="LIST" onmouseover="hstat(\'list\')">\n	<!--<input type=\'button\' accesskey=\'l\' value=\' SQL \'     onclick=\'simpletag("SQL")\'     class=\'codebuttons\' name=\'SQL\'>\n	<input type=\'button\' accesskey=\'t\' value=\' HTML \'    onclick=\'simpletag("HTML")\'    class=\'codebuttons\' name=\'HTML\'>-->\n	<br />\n	<input type=\'text\' name=\'helpbox\' size=\'50\' maxlength=\'120\' style=\'width:450px;font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;\' readonly="readonly" class=\'row1\' value="{$ibforums->lang[\'hb_start\']}" />\n	<br />\n	<b>{$ibforums->lang[\'hb_open_tags\']}:</b>&nbsp;<input type=\'text\' name=\'tagcount\' size=\'3\' maxlength=\'3\' style=\'font-size:10px;font-family:verdana,arial;border:0px;font-weight:bold;\' readonly="readonly" class=\'row1\' value="0" />\n  </td>\n</tr>\n</table>\n<div align="center"><p><textarea cols=\'60\' rows=\'12\' name=\'Post\' tabindex=\'3\' class=\'textinput\'>$t_sig</textarea><br />(<a href=\'javascript:CheckLength()\'>{$ibforums->lang[\'check_length\']}</a>)</p></div>\n<div class=\'pformstrip\' align="center"><input type=\'submit\' value=\'{$ibforums->lang[\'cp_submit_sig\']}\' class="forminput" /></div>\n</form>', 'signature', '$sig, $t_sig, $key', 1035406235, 0);||~&~||(1, 'skin_ucp', '<script language="javascript" type=\'text/javascript\'>\n<!--\nvar LocationMax  = "{$ibforums->vars[\'max_location_length\']}";\nvar InterestMax  = "{$ibforums->vars[\'max_interest_length\']}";\nfunction CheckLength(Type) {\n    LocationLength  = document.theForm.Location.value.length;\n    InterestLength  = document.theForm.Interests.value.length;\n    message  = "";\n    if (Type == "location") {\n        if (LocationMax !=0) {\n            message = "{$ibforums->lang[\'js_location\']}: {$ibforums->lang[\'js_max\']} " + LocationMax + " {$ibforums->lang[\'js_characters\']}.";\n        } else {\n            message = "";\n        }\n        alert(message + "  {$ibforums->lang[\'js_used\']} " + LocationLength + " {$ibforums->lang[\'js_so_far\']}.");\n    }\n    if (Type == "interest") {\n        if (InterestMax !=0) {\n            message = "{$ibforums->lang[\'js_interests\']}: {$ibforums->lang[\'js_max\']} " + InterestMax + " {$ibforums->lang[\'js_characters\']}.";\n        } else {\n            message = "";\n        }\n        alert(message + "  {$ibforums->lang[\'js_used\']} " + InterestLength + " {$ibforums->lang[\'js_so_far\']}.");\n    }\n    \n}\nfunction ValidateProfile() {\n    LocationLength  = document.theForm.Location.value.length;\n    InterestLength  = document.theForm.Interests.value.length;\n    errors = "";\n    if (LocationMax !=0) {\n        if (LocationLength > LocationMax) {\n            errors = "{$ibforums->lang[\'js_location\']}:  {$ibforums->lang[\'js_max\']} " + LocationMax + " {$ibforums->lang[\'js_characters\']}.  {$ibforums->lang[\'js_used\']}: " + LocationLength;\n        }\n    }\n    if (InterestMax !=0) {\n        if (InterestLength > InterestMax) {\n            errors = errors + "  {$ibforums->lang[\'js_interests\']}:  {$ibforums->lang[\'js_max\']} " + InterestMax + " {$ibforums->lang[\'js_characters\']}.  {$ibforums->lang[\'js_used\']}: " + InterestLength;\n        }\n    } \n    \n    if (errors != "") {\n        alert(errors);\n        return false;\n    } else {\n        return true;\n    }\n}\n//-->\n</script>\n<form action="{$ibforums->base_url}auth_key={$Profile[\'key\']}" method="post" name=\'theForm\' onsubmit=\'return ValidateProfile()\'>\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'21\' />\n<!--{REQUIRED.FIELDS}-->\n<div class=\'pformstrip\'>{$ibforums->lang[\'profile_title\']}</div>\n<table width=\'100%\'>\n<!--{MEMBERTITLE}-->\n<!--{BIRTHDAY}-->\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'website\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'1200\' name=\'WebSite\' value=\'{$Profile[\'website\']}\' class=\'forminput\' /></td>\n</tr>  \n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'icq\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'20\' name=\'ICQNumber\' value=\'{$Profile[\'icq_number\']}\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'aol\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'30\' name=\'AOLName\' value=\'{$Profile[\'aim_name\']}\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'yahoo\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'30\' name=\'YahooName\' value=\'{$Profile[\'yahoo\']}\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'msn\']}</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'30\' name=\'MSNName\' value=\'{$Profile[\'msnname\']}\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\'><a href=\'http://www.integritymessenger.com/\' target=\'_blank\'>{$ibforums->lang[\'integ_msg\']}</a></td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'30\' name=\'integ_msg\' value=\'{$Profile[\'integ_msg\']}\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\'>{$ibforums->lang[\'location\']}<br />(<a href=\'javascript:CheckLength("location");\'>{$ibforums->lang[\'check_length\']}</a>)</td>\n  <td class=\'pformright\'><input type=\'text\' size=\'40\' name=\'Location\' value=\'{$Profile[\'location\']}\' class=\'forminput\' /></td>\n</tr>\n<tr>\n  <td class=\'pformleft\' valign=\'top\'>{$ibforums->lang[\'interests\']}<br />(<a href=\'javascript:CheckLength("interest");\'>{$ibforums->lang[\'check_length\']}</a>)</td>\n  <td class=\'pformright\'><textarea cols=\'60\' rows=\'10\' wrap=\'soft\' name=\'Interests\' class=\'forminput\'>{$Profile[\'interests\']}</textarea></td>\n</tr>\n<!--{OPTIONAL.FIELDS}-->\n<tr>\n  <td class=\'pformstrip\' align=\'center\' colspan=\'2\'><input type="submit" value="{$ibforums->lang[\'submit_profile\']}" class=\'forminput\' /></td>\n</tr>\n</table>\n</form>', 'personal_panel', '$Profile', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n  <td class=\'pformleft\'><b>{$ibforums->lang[\'birthday\']}</b></td>\n  <td class=\'pformright\'>\n  <select name=\'day\' class=\'forminput\'>{$day}</select> \n  <select name=\'month\' class=\'forminput\'>{$month}</select> \n  <select name=\'year\' class=\'forminput\'>{$year}</select>\n  </td>\n  </tr>', 'birthday', '$day,$month,$year', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n   <td class=\'pformleft\'><b>{$ibforums->lang[\'member_title\']}</b></td>\n   <td class=\'pformright\'><input type=\'text\' size=\'40\' maxlength=\'120\' name=\'member_title\' value=\'$title\' class=\'forminput\'></td>\n   </tr>', 'member_title', '$title', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class=\'pformstrip\'>{$ibforums->lang[\'cf_required\']}</div>\n <table width=\'100%\'>', 'required_title', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '</table>', 'required_end', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n  <td class=\'pformleft\' valign=\'top\'><b>$title</b><br />$desc</td>\n  <td class=\'pformright\'>$content</td>\n  </tr>', 'field_entry', '$title, $desc="", $content', 1035406235, 0);||~&~||(1, 'skin_ucp', '<input type=\'text\' size=\'50\' name=\'$name\' value=\'$value\' class=\'forminput\' />', 'field_textinput', '$name, $value=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<select name=\'$name\' class=\'forminput\'>$options</select>', 'field_dropdown', '$name, $options', 1035406235, 0);||~&~||(1, 'skin_ucp', '<textarea cols=\'60\' rows=\'5\' wrap=\'soft\' name=\'$name\' class=\'forminput\'>$value</textarea>', 'field_textarea', '$name, $value', 1035406235, 0);||~&~||(1, 'skin_ucp', '<!--\nTABLE TO FIX IE/6 ISSUE\nThe one where 23% margin + 100% table = 123% in IE6 o_O\n-->\n<table cellspacing="0" cellpadding="0" width=\'100%\'>\n<tr>\n <td id="ucpmenu" valign="top">\n    <div class=\'maintitle\'>{$ibforums->lang[\'tt_menu\']}</div>\n     <!--IBF.TSLLINKS-->\n	 <!-- Messenger -->\n	 <div class=\'pformstrip\'>{$ibforums->lang[\'m_messenger\']}</div>\n	 <p>\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=04\'><strong>{$ibforums->lang[\'mess_new\']}</strong></a><br />\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=01\'><strong>{$ibforums->lang[\'mess_inbox\']}</strong></a><br />\n	 <!--IBF.FOLDER_LINKS-->\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=delete\'>{$ibforums->lang[\'mi_prune_msg\']}</a><br />\n	  &middot; <a href=\'{$base_url}act=Msg&amp;CODE=07\'>{$ibforums->lang[\'mess_folders\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=02\'>{$ibforums->lang[\'mess_contact\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=14\'>{$ibforums->lang[\'mess_archive\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=20\'>{$ibforums->lang[\'mess_saved\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=Msg&amp;CODE=30\'>{$ibforums->lang[\'mess_tracker\']}</a><br />\n	 </p>\n	 <!-- End Messenger -->\n	 <!-- Topic Tracker -->\n	 <div class=\'pformstrip\'>{$ibforums->lang[\'m_tracker\']}</div>\n	 <p>\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=26\'>{$ibforums->lang[\'m_view_subs\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=50\'>{$ibforums->lang[\'m_view_forum\']}</a><br />\n	 </p>\n	 <!-- Profile -->\n	 <div class=\'pformstrip\'>{$ibforums->lang[\'m_personal\']}</div>\n	 <p>\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=01\'>{$ibforums->lang[\'m_contact_info\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=22\'>{$ibforums->lang[\'m_sig_info\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=24\'>{$ibforums->lang[\'m_avatar_info\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=photo\'>{$ibforums->lang[\'m_change_photo\']}</a><br />\n	 </p>\n	 <!-- Options -->\n	 <div class=\'pformstrip\'>{$ibforums->lang[\'m_options\']}</div>\n	 <p>\n	 <!--IBF.OPTION_LINKS-->\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=02\'>{$ibforums->lang[\'m_email_opt\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=04\'>{$ibforums->lang[\'m_board_opt\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=06\'>{$ibforums->lang[\'m_skin_lang\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=08\'>{$ibforums->lang[\'m_email_change\']}</a><br />\n	 &middot; <a href=\'{$base_url}act=UserCP&amp;CODE=28\'>{$ibforums->lang[\'m_passy_opt\']}</a>\n	 </p>\n </td>\n <td style=\'padding:2px\'><!-- --></td>\n<!-- Start main CP area -->\n <td id="ucpcontent" valign="top">\n  <div class=\'maintitle\'>{$ibforums->lang[\'welcome\']}</div>', 'Menu_bar', '$base_url', 1035406235, 0);||~&~||(1, 'skin_ucp', '<!-- Top Site List -->\n	 <div class=\'pformstrip\'>{$ibforums->lang[\'m_top_list\']}</div>\n	 <p>\n	 &middot; <a href=\'{$ibforums->base_url}act=module&module=toplist\'><strong>{$ibforums->lang[\'tsl_home\']}</strong></a><br />\n	 &middot; <a href=\'{$ibforums->base_url}act=module&module=toplist&amp;CODE=01\'><strong>{$ibforums->lang[\'tsl_your_sites\']}</strong></a><br />\n	 </p>', 'tsl_links', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '&middot; <a href=\'$url\'>$name</a><br />', 'menu_bar_new_link', '$url, $name', 1035406235, 0);||~&~||(1, 'skin_ucp', '&nbsp; &#039;-- <a href=\'{$ibforums->base_url}act=Msg&amp;CODE=01&amp;VID=$id\'>$real</a><br />', 'menu_bar_msg_folder_link', '$id, $real', 1035406235, 0);||~&~||(1, 'skin_ucp', '</td>\n</tr>\n</table>\n<!-- end main CP area -->\n<br clear="all" />', 'CP_end', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class=\'pformstrip\'>{$ibforums->lang[\'stats_header\']}</div>\n	  <table width=\'100%\' border="0" cellspacing="0" cellpadding="4">\n		<tr> \n		  <td width="40%">{$ibforums->lang[\'email_address\']}</td>\n		  <td width="60%">{$member[MEMBER_EMAIL]}</td>\n		</tr>\n		<tr> \n		  <td width="40%">{$ibforums->lang[\'number_posts\']}</td>\n		  <td width="60%">{$member[MEMBER_POSTS]}</td>\n		</tr>\n		<tr> \n		  <td width="40%">{$ibforums->lang[\'registered\']}</td>\n		  <td width="60%">{$member[DATE_REGISTERED]}</td>\n		</tr>\n		<tr> \n		  <td width="40%">{$ibforums->lang[\'daily_average\']}</td>\n		  <td width="60%">{$member[DAILY_AVERAGE]}</td>\n		</tr>\n	  </table>\n	  <!-- MSG -->\n	  <div class=\'pformstrip\'>{$ibforums->lang[\'messenger_summary\']}</div>\n	  <table width="100%" border="0" cellspacing="0" cellpadding="4">\n		<tr> \n		  <td width="40%">{$ibforums->lang[\'total_messages\']}</td>\n		  <td width="60%">{$member[\'total_messages\']} {$member[\'full_percent\']}</td>\n		</tr>\n		<tr> \n		  <td width="40%">{$ibforums->lang[\'messages_left\']}</td>\n		  <td width="60%">{$member[\'space_free\']} {$member[\'full_messenger\']}</td>\n		</tr>\n	  </table>\n	  <!-- END MSG -->\n	  <div class=\'pformstrip\'>{$ibforums->lang[\'note_pad\']}</div>\n	  <div align=\'center\'>\n	  <p>\n		<form name=\'notepad\' action="{$ibforums->base_url}" method="post">\n		<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n		<input type=\'hidden\' name=\'s\' value=\'{$ibforums->session_id}\' />\n		<input type=\'hidden\' name=\'CODE\' value=\'20\' />\n        <textarea cols=\'65\' rows=\'{$member[\'SIZE\']}\' name=\'notes\' class=\'forminput\'>{$member[\'NOTES\']}</textarea>\n        <br />\n	    {$ibforums->lang[\'ta_size\']}&nbsp;<select name=\'ta_size\' class=\'forminput\'>{$member[\'SIZE_CHOICE\']}</select>\n        <input type=\'submit\' value=\'{$ibforums->lang[\'submit_notepad\']}\' class=\'forminput\' />\n        </form>\n      </p>\n     </div>', 'splash', '$member', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'dead_section_title\']}</div>\n<p>\n{$ibforums->lang[\'dead_section_text\']}\n</p>', 'dead_section', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<form action="{$ibforums->base_url}auth_key=$key" method="post">\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'05\' />\n<div class="pformstrip">{$ibforums->lang[\'settings_time\']}</div>\n<p>\n{$ibforums->lang[\'settings_time_txt\']}&nbsp;$time\n<br />\n$time_select\n<br /><br />\n<input type=\'checkbox\' class=\'forminput\' name=\'DST\' value=\'1\' $dst_check /> &nbsp;{$ibforums->lang[\'dst_box\']}\n</p>', 'settings_header', '$Profile, $time_select, $time, $dst_check, $key=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<script language=\'Javascript\' type="text/javascript">\n  <!--\n	function do_preview() {\n		\n		var f = document.prefs.u_skin;\n		\n		if (f.options[f.selectedIndex].value == -1) {\n			return false;\n		}\n		\n		window.open( "$ibforums->js_base_url" + \'skinid=\'+f.options[f.selectedIndex].value, \'Preview\', \'width=800,height=600,top=0,left=0,resizable=1,scrollbars=1,location=no,directories=no,status=no,menubar=no,toolbar=no\');\n		\n	}\n  -->\n</script>\n<form action="{$ibforums->base_url}auth_key=$key" method="post" name=\'prefs\'>\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'07\' />\n<div class="pformstrip">{$ibforums->lang[\'settings_title\']}</div>                \n<table width="100%">\n<tr>\n  <td width="50%">{$ibforums->lang[\'settings_lang_txt\']}</td>\n  <td align=\'left\'>$lang_select</td>\n</tr>\n</table>', 'skin_lang_header', '$lang_select, $key=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip">{$ibforums->lang[\'settings_skin\']}</div>                \n<table width="100%">\n<tr>\n  <td width="50%">{$ibforums->lang[\'settings_skin_txt\']}</td>\n  <td align=\'left\'>$skin &nbsp;&nbsp; <input type=\'button\' value=\'{$ibforums->lang[\'cp_skin_preview\']}\' class=\'forminput\' onclick=\'do_preview()\' /></td>\n</tr>\n</table>', 'settings_skin', '$skin', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class="pformstrip" align="center"><input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'settings_submit\']}\' class=\'forminput\' /></div>\n</form>', 'skin_lang_end', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class=\'pformstrip\'>{$ibforums->lang[\'settings_display\']}</div>\n<table width="100%" cellpadding="4">\n<tr>\n  <td width=\'70%\'>{$ibforums->lang[\'settings_viewsig\']}</td>\n  <td align=\'left\'>{$data[SIG]}</td>\n</tr>\n<tr>\n  <td>{$ibforums->lang[\'settings_viewimg\']}</td>\n  <td align=\'left\'>{$data[IMG]}</td>\n</tr>\n<tr>\n  <td>{$ibforums->lang[\'settings_viewava\']}</td>\n  <td align=\'left\'>{$data[AVA]}</td>\n</tr>\n<tr>\n  <td>{$ibforums->lang[\'settings_dopopup\']}</td>\n  <td align=\'left\'>{$data[POP]}</td>\n</tr>\n<!--<tr>\n  <td>{$ibforums->lang[\'hide_session_txt\']}<br/ ><span class=\'desc\'>{$ibforums->lang[\'hs_exp\']}</span></td>\n  <td align=\'left\'>{$data[SESS]}</td>\n</tr>-->\n<tr>\n  <td>{$ibforums->lang[\'open_qr\']}<br/ ></td>\n  <td align=\'left\'>{$data[QR]}</td>\n</tr>\n<tr>\n  <td>{$ibforums->lang[\'pp_number_posts\']}</td>\n  <td align=\'left\'><select name=\'postpage\' class=\'forminput\'>{$data[\'PPS\']}</select></td>\n</tr>\n<tr>\n  <td>{$ibforums->lang[\'pp_number_topics\']}</td>\n  <td align=\'left\'><select name=\'topicpage\' class=\'forminput\'>{$data[\'TPS\']}</select></td>\n</tr>\n</table>\n&nbsp;<span class=\'desc\'>{$ibforums->lang[\'need_cookie_yum_yum\']}</span>\n<div class="pformstrip" align=\'center\'><input type=\'submit\' name=\'submit\' value=\'{$ibforums->lang[\'settings_submit\']}\' class=\'forminput\' /></div>\n</form>', 'settings_end', '$data', 1035406235, 0);||~&~||(1, 'skin_ucp', '<form action="{$ibforums->base_url}auth_key={$Profile[\'key\']}" method="post">\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'03\' />\n<div class="pformstrip">{$ibforums->lang[\'privacy_settings\']}</div>\n<br />\n<table width="100%">\n<tr>\n  <td align=\'right\' valign=\'top\'><input type=\'checkbox\' name=\'hide_email\' value=\'1\' {$Profile[\'hide_email\']} /></td>\n  <td align=\'left\' width=\'100%\'>{$ibforums->lang[\'hide_email\']}</td>\n</tr>  \n<tr>\n  <td align=\'right\' valign=\'top\'><input type=\'checkbox\' name=\'admin_send\' value=\'1\' {$Profile[\'allow_admin_mails\']} /></td>\n  <td align=\'left\'  width=\'100%\'>{$ibforums->lang[\'admin_send\']}</td>\n</tr>\n</table>\n<br />\n<div class="pformstrip">{$ibforums->lang[\'board_prefs\']}</div>\n<br />\n<table width="100%">\n<tr>\n  <td align=\'right\' valign=\'top\'><input type=\'checkbox\' name=\'send_full_msg\' value=\'1\' {$Profile[\'email_full\']} /></td>\n  <td align=\'left\'  width=\'100%\'>{$ibforums->lang[\'send_full_msg\']}</td>\n</tr>\n<tr>\n  <td align=\'right\' valign=\'top\'><input type=\'checkbox\' name=\'pm_reminder\' value=\'1\' {$Profile[\'email_pm\']} /></td>\n  <td align=\'left\'  width=\'100%\'>{$ibforums->lang[\'pm_reminder\']}</td>\n</tr>\n<tr>\n  <td align=\'right\' valign=\'top\'><input type=\'checkbox\' name=\'auto_track\' value=\'1\' {$Profile[\'auto_track\']} /></td>\n  <td align=\'left\'  width=\'100%\'>{$ibforums->lang[\'auto_track\']}</td>\n</tr>\n</table>\n<br />\n<div class="pformstrip" align="center"><input type="submit" value="{$ibforums->lang[\'submit_email\']}" class=\'forminput\' /></div>\n</form>', 'email', '$Profile', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div class=\'pformstrip\'>{$ibforums->lang[\'forum_subs_header\']}</div>\n<br />\n<div class=\'tableborder\'>\n  <table cellpadding=\'4\' cellspacing=\'1\' align=\'center\' width=\'100%\'>\n  <tr>\n    <td class=\'titlemedium\' align=\'left\' width=\'5%\'>&nbsp;</td>\n    <th class=\'titlemedium\' align=\'left\' width=\'50%\'>{$ibforums->lang[\'ft_forum\']}</th>\n    <th class=\'titlemedium\' align=\'center\' width=\'5%\'>{$ibforums->lang[\'ft_topics\']}</th>\n    <th class=\'titlemedium\' align=\'center\' width=\'5%\'>{$ibforums->lang[\'ft_posts\']}</th>\n    <th class=\'titlemedium\' align=\'center\' width=\'35%\'>{$ibforums->lang[\'ft_last_post\']}</th>\n  </tr>', 'forum_subs_header', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n	 <td class=\'row1\' align=\'center\' width=\'5%\'>{$data[\'folder_icon\']}</td>\n	 <td class=\'row1\' align=\'left\'>\n		 <b><a href=\'{$ibforums->base_url}act=SF&amp;f={$data[\'id\']}\'>{$data[\'name\']}</a></b>\n		 <br /><span class=\'desc\'>{$data[\'description\']}</span>\n		 <br /><br /><b>[ <a href=\'{$ibforums->base_url}act=UserCP&amp;CODE=51&amp;f={$data[\'id\']}\'>{$ibforums->lang[\'ft_unsub\']}</a> ]</b>\n	 </td>\n	 <td class=\'row1\' align=\'center\'>{$data[\'topics\']}</td>\n	 <td class=\'row1\' align=\'center\'>{$data[\'posts\']}</td>\n	 <td class=\'row1\' align=\'left\'>{$data[\'last_post\']}<br />{$ibforums->lang[\'in\']} {$data[\'last_topic\']}<br />{$ibforums->lang[\'by\']} {$data[\'last_poster\']}</td>\n   </tr>', 'forum_subs_row', '$data', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n	  <td class=\'row1\' align=\'center\' colspan=\'5\'>{$ibforums->lang[\'forum_subs_none\']}</td>\n	</tr>', 'forum_subs_none', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n <td align=\'right\' class=\'titlemedium\' valign=\'middle\' colspan=\'5\'><a href=\'{$ibforums->base_url}act=UserCP&amp;CODE=51&amp;f=all\'>{$ibforums->lang[\'ft_unsub_all\']}</a></td>\n</tr>\n</table>\n</div>', 'forum_subs_end', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<!-- inbox folder -->\n  <script language=\'JavaScript\' type=\'text/javascript\'>\n  <!--\n  function CheckAll(cb) {\n	  var fmobj = document.mutliact;\n	  for (var i=0;i<fmobj.elements.length;i++) {\n		  var e = fmobj.elements[i];\n		  if ((e.name != \'allbox\') && (e.type==\'checkbox\') && (!e.disabled)) {\n			  e.checked = fmobj.allbox.checked;\n		  }\n	  }\n  }\n  function CheckCheckAll(cb) {	\n	  var fmobj = document.mutliact;\n	  var TotalBoxes = 0;\n	  var TotalOn = 0;\n	  for (var i=0;i<fmobj.elements.length;i++) {\n		  var e = fmobj.elements[i];\n		  if ((e.name != \'allbox\') && (e.type==\'checkbox\')) {\n			  TotalBoxes++;\n			  if (e.checked) {\n				  TotalOn++;\n			  }\n		  }\n	  }\n	  if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}\n	  else {fmobj.allbox.checked=false;}\n  }\n  //-->\n  </script>\n<div class=\'pformstrip\'>{$ibforums->lang[\'subs_header\']}</div>\n<form action="{$ibforums->base_url}" name=\'mutliact\' method="post">\n<input type=\'hidden\' name=\'act\' value=\'UserCP\' />\n<input type=\'hidden\' name=\'CODE\' value=\'27\' />\n<br />\n<div align="center" class="tableborder">\n<table width="100%" cellspacing="1" cellpadding="4">\n<tr>\n  <td class=\'titlemedium\' align=\'left\' width=\'5%\'>&nbsp;</td>\n  <th class=\'titlemedium\' align=\'left\' width=\'55%\'>{$ibforums->lang[\'subs_topic\']}</th>\n  <th class=\'titlemedium\' align=\'center\' width=\'5%\'>{$ibforums->lang[\'subs_replies\']}</th>\n  <th class=\'titlemedium\' align=\'center\' width=\'5%\'>{$ibforums->lang[\'subs_view\']}</th>\n  <th class=\'titlemedium\' align=\'left\' width=\'25%\'>{$ibforums->lang[\'subs_last_post\']}</th>\n  <td align=\'center\' width=\'5%\' class=\'titlemedium\'><input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();"></td>\n</tr>', 'subs_header', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n  <td class=\'row3\' align=\'center\' width=\'5%\'>{$data[\'folder_icon\']}</td>\n  <td class=\'row3\' align=\'left\'><a href=\'{$ibforums->base_url}act=ST&amp;f={$data[\'forum_id\']}&amp;t={$data[\'tid\']}\'>{$data[\'title\']}</a> ( <a href=\'{$ibforums->base_url}act=ST&amp;f={$data[\'forum_id\']}&amp;t={$data[\'tid\']}\' target=\'_blank\'>{$ibforums->lang[\'new_window\']}</a> )<br /><span class=\'desc\'>{$data[\'description\']}{$ibforums->lang[\'subs_start\']} {$data[\'start_date\']}</span></td>\n  <td class=\'row3\' align=\'center\'>{$data[\'posts\']}</td>\n  <td class=\'row3\' align=\'center\'>{$data[\'views\']}</td>\n  <td class=\'row3\' align=\'left\'>{$data[\'last_post_date\']}<br />{$ibforums->lang[\'subs_by\']} {$data[\'last_poster\']}</td>\n  <td class=\'row2\' align=\'center\'><input type=\'checkbox\' name=\'id-{$data[\'trid\']}\' value=\'yes\' class=\'forminput\' /></td>\n</tr>', 'subs_row', '$data', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n                   <td class=\'row3\' align=\'center\' colspan=\'6\'>{$ibforums->lang[\'subs_none\']}</td>\n                 </tr>', 'subs_none', '', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n                   <td colspan=\'6\' class=\'darkrow3\' align=\'left\'><b>$fname</b></td>\n                 </tr>', 'subs_forum_row', '$fid, $fname', 1035406235, 0);||~&~||(1, 'skin_ucp', '<tr>\n <td align=\'center\' class=\'titlemedium\' valign=\'middle\' colspan=\'6\'><input type=\'submit\' class=\'forminput\' value=\'{$ibforums->lang[\'subs_delete\']}\'>&nbsp;&nbsp;{$ibforums->lang[\'with_selected\']}</td>\n</tr>\n</table>\n</div>\n</form>\n<div align="right" style="padding:5px"><i>$text</i></div>\n<div align="right" style="padding:5px">\n 	<form action=\'{$ibforums->base_url}act=UserCP&amp;CODE=26\' method=\'post\'>\n 	{$ibforums->lang[\'show_topics_from\']} <select class=\'forminput\' name=\'datecut\'>$days</select>\n 	<input type=\'submit\' class=\'forminput\' value=\'{$ibforums->lang[\'jmp_go\']}\'>\n 	</form>\n</div>', 'subs_end', '$text="", $days=""', 1035406235, 0);||~&~||(1, 'skin_ucp', '<div align=\'right\'>{$data}</div>', 'forum_jump', '$data, $menu_extra=""', 1035406235, 0);
\ No newline at end of file
diff --git a/upload/ipb_templates.xml b/upload/ipb_templates.xml
new file mode 100644
index 00000000..8b37f164
--- /dev/null
+++ b/upload/ipb_templates.xml
@@ -0,0 +1,10579 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<templateexport exported="1095780684" versionid="20000" type="master">
+	<templategroup>
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<!-- nothing here -->]]></section_content>
+			<func_name>mlist_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<li><a href="{ipb.script_url}showforum=$fid">{ipb.lang['w_done_forum']} <b>$fname</b></a></li>
+				<li><a href="{ipb.script_url}showtopic=$tid&amp;st=$st">{ipb.lang['w_done_topic']} <b>$tname</b></a></li>]]></section_content>
+			<func_name>warn_success_forum</func_name>
+			<func_data><![CDATA[$fid="",$fname="",$tid="",$tname="",$st=0]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleftw"><b>{ipb.lang['w_suspend']}</b></td>
+		<td class="pformright">
+			{ipb.lang['w_susfor']}  <input type="input" name="susp_value" value="{$susp_array['timespan']}" size="5" />&nbsp;
+			<select name="susp_unit">
+				<option value="d" {$susp_array['days']}>{ipb.lang['w_day']}</option>
+				<option value="h" {$susp_array['hours']}>{ipb.lang['w_hour']}</option>
+			</select>
+			$susp_extra
+	</tr>]]></section_content>
+			<func_name>warn_suspend</func_name>
+			<func_data><![CDATA[$susp_array="",$susp_extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[</table>]]></section_content>
+			<func_name>warn_view_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+		<tr>
+			<td><span id="phototitle">$name</span></td>
+			<td align="right">$links</td>
+		</tr>
+	</table>
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['w_v_title']}: <a href="{ipb.script_url}showuser=$id">$name</a></div>
+	</div>
+	<table cellspacing="1">
+		<tr>
+			<th class="formsubtitle" width="30%">{ipb.lang['w_v_warnby']}</th>
+			<th class="formsubtitle" width="70%">{ipb.lang['w_v_notes']}</th>
+		</tr>]]></section_content>
+			<func_name>warn_view_header</func_name>
+			<func_data><![CDATA[$id="",$name="",$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row2" valign="top"><b>$puni_name</b></td>
+			<td class="row2" valign="top">{ipb.lang['w_v_warned_on']} <b>$date</b></td>
+		</tr>
+		<tr>
+			<td class="row1" valign="middle"><span class="warnbad">{ipb.lang['w_v_add']}</span></td>
+			<td class="row1" valign="top"><span class="postcolor">$content</span></td>
+		</tr>]]></section_content>
+			<func_name>warn_view_negative_row</func_name>
+			<func_data><![CDATA[$date="",$content="",$puni_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<br />
+		<b>{ipb.lang['w_restricted']}</b>]]></section_content>
+			<func_name>warn_restricition_in_place</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['w_done_t']}</div>
+	<div class="formsubtitle">&nbsp;</div>
+		<div class="tablepad">
+			{ipb.lang['w_done_te']}
+			<ul>
+				<li><a href="{ipb.script_url}">{ipb.lang['w_done_home']}</a></li>
+				<!--IBF.FORUM_TOPIC-->
+			</ul>
+		</div>
+	</div>]]></section_content>
+			<func_name>warn_success</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row2" valign="top"><b>$puni_name</b></td>
+			<td class="row2" valign="top">{ipb.lang['w_v_warned_on']} <b>$date</b></td>
+		</tr>
+		<tr>
+			<td class="row1" valign="middle"><span class="warngood">{ipb.lang['w_v_minus']}</span></td>
+			<td class="row1" valign="top"><span class="postcolor">$content</span></td>
+		</tr>]]></section_content>
+			<func_name>warn_view_positive_row</func_name>
+			<func_data><![CDATA[$date="",$content="",$puni_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" colspan="2" align="center"><b>{ipb.lang['w_v_none']}</b></td>
+		</tr>]]></section_content>
+			<func_name>warn_view_none</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="formsubtitle" align="center"><input type="submit" name="submit" value="$action" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>end_form</func_name>
+			<func_data><![CDATA[$action=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<select name="$name">$options</select>\
+]]></section_content>
+			<func_name>field_dropdown</func_name>
+			<func_data><![CDATA[$name="",$options=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1" valign="top"><b>$title</b><br />$desc</td>
+		<td class="row1">$content</td>
+	</tr>]]></section_content>
+			<func_name>field_entry</func_name>
+			<func_data><![CDATA[$title="",$desc="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['recent_title']}</div>
+	$articles
+</div>]]></section_content>
+			<func_name>tmpl_recentarticles</func_name>
+			<func_data><![CDATA[$articles=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=Search&amp;CODE=01&amp;forums=all" method="post" name="search">
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['search_title']}</div>
+		<div class="formsubtitle"><a href="{ipb.script_url}act=Search&amp;mode=adv">{ipb.lang['search_advanced']}</a></div>
+		<div class="tablepad" align="center">
+			<input type="text" name="keywords" value="" size="15" />&nbsp;<input type="submit" value="{ipb.lang['search_go']}" />
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>tmpl_search</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">
+	<b><a href="{ipb.script_url}showtopic=$tid">$title</a></b>
+</div>
+<div class="tablepad">
+	<a href="{ipb.script_url}showuser=$mid">$mname</a> &#064; $date
+	<br />{ipb.lang['recent_read']}: $views &nbsp; {ipb.lang['recent_comments']}: $posts
+</div>]]></section_content>
+			<func_name>tmpl_topic_row</func_name>
+			<func_data><![CDATA[$tid="",$title="",$posts="",$views="",$mid="",$mname="",$date=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=Login&amp;CODE=01&amp;CookieDate=1&amp;return=$return" method="post">
+	<div id="userlinksguest">
+		<p class="pcen"><b>{ipb.lang['wbox_welcome']}, {ipb.lang['wbox_guest_name']}</b> ( <a href="{ipb.script_url}act=Login&amp;CODE=00">{ipb.lang['log_in']}</a> | <a href="{ipb.script_url}act=Reg&amp;CODE=00">{ipb.lang['register']}</a> )</p>
+	</div>
+</form>]]></section_content>
+			<func_name>tmpl_welcomebox_guest</func_name>
+			<func_data><![CDATA[$top_string="",$return=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<div id="userlinks">
+		<p class="home"><b>{ipb.lang['wbox_welcome']}, $name</b> ( <a href="{ipb.script_url}act=Login&amp;CODE=03&amp;return=$return">{ipb.lang['wbox_logout']}</a> )<br /></p>
+		<p><a href="{ipb.script_url}act=UserCP"><b>{ipb.lang['wbox_mycontrols']}</b></a>&nbsp;&middot;&nbsp;<a href="{ipb.script_url}act=Search&amp;CODE=getnew">{ipb.lang['wbox_getnewposts']}</a>&nbsp;&middot;&nbsp;<a href="javascript:buddy_pop();">{ipb.lang['wbox_myassistant']}</a>&nbsp;&middot;&nbsp;$pm_string</p>
+	</div>]]></section_content>
+			<func_name>tmpl_welcomebox_member</func_name>
+			<func_data><![CDATA[$pm_string="",$last_visit="",$name="",$return=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['links_title']}</div>
+	<div class="tablepad">
+		$links
+	</div>
+</div>]]></section_content>
+			<func_name>tmpl_sitenav</func_name>
+			<func_data><![CDATA[$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[</select>]]></section_content>
+			<func_name>tmpl_skin_select_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<select name="skinid" onchange="window.location='{ipb.vars['dynamiclite']}&s={ipb.session_id}&setskin=1&skinid=' + this.value">]]></section_content>
+			<func_name>tmpl_skin_select_top</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<input type="submit" value="{ipb.lang['poll_vote']}" class="codebuttons" />]]></section_content>
+			<func_name>tmpl_poll_vote</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[...<a href="{ipb.script_url}showtopic=$tid">{ipb.lang['article_readmore']}</a>]]></section_content>
+			<func_name>tmpl_readmore_link</func_name>
+			<func_data><![CDATA[$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[$choice
+<br /><{BAR_LEFT}><img src="{ipb.vars['img_url']}/bar.gif" width="$width" height="11" align="middle" alt="" /><{BAR_RIGHT}>
+<br />]]></section_content>
+			<func_name>tmpl_poll_result_row</func_name>
+			<func_data><![CDATA[$votes="",$id="",$choice="",$percent="",$width=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<form action="{ipb.script_url}act=Poll&amp;t=$tid" method="post">
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}showtopic=$tid">{ipb.lang['poll_title']}</a></div>
+		<div class="formsubtitle">$question</div>
+		<div class="tablepad">]]></section_content>
+			<func_name>tmpl_poll_header</func_name>
+			<func_data><![CDATA[$question="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<span class="desc">
+				&middot; <b>$total</b>
+				<br />&middot; $vote
+				<br />&middot; <a href="{ipb.script_url}showtopic=$tid">{ipb.lang['poll_discuss']}</a>
+			</span>
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>tmpl_poll_footer</func_name>
+			<func_data><![CDATA[$vote="",$total="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<input type="radio" name="poll_vote" value="$id" class="radiobutton" />&nbsp;<b>$choice</b>
+<br />]]></section_content>
+			<func_name>tmpl_poll_choice_row</func_name>
+			<func_data><![CDATA[$id="",$choice=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}act=Online">{ipb.lang['online_title']}</a></div>
+	<div class="tablepad">
+		<span class="desc">$breakdown<br />$split<br />$names</span>
+	</div>
+</div>]]></section_content>
+			<func_name>tmpl_onlineusers</func_name>
+			<func_data><![CDATA[$breakdown="",$split="",$names=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['discuss_title']}</div>
+	$posts
+</div>]]></section_content>
+			<func_name>tmpl_latestposts</func_name>
+			<func_data><![CDATA[$posts=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[&middot; <a href="$link">$name</a><br />]]></section_content>
+			<func_name>tmpl_links_wrap</func_name>
+			<func_data><![CDATA[$link="",$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<div class="desc">[ DB Queries: $queries ] [ Execution Time: $time ]</div>]]></section_content>
+			<func_name>tmpl_debug</func_name>
+			<func_data><![CDATA[$queries="",$time=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}showtopic=$tid&amp;view=getlastpost">{ipb.lang['article_comment']}</a>]]></section_content>
+			<func_name>tmpl_comment_link</func_name>
+			<func_data><![CDATA[$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<form action="{ipb.vars['dynamiclite']}&amp;s={ipb.session_id}&amp;setskin=1" method="post">
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}> {ipb.lang['cskin_title']}</div>
+		<div class="formsubtitle">{ipb.lang['cskin_text']}</div>
+		<div class="tablepad" align="center">
+			$select &nbsp; <input type="submit" value="{ipb.lang['cskin_go']}" />
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>tmpl_changeskin</func_name>
+			<func_data><![CDATA[$select=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<style type="text/css" media="all">
+	@import url({ipb.vars['board_url']}/css.php?d={$css}_{$img}.css);
+</style>]]></section_content>
+			<func_name>csite_css_external</func_name>
+			<func_data><![CDATA[$css="",$img=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<style type="text/css">
+	{$css}
+</style>]]></section_content>
+			<func_name>csite_css_inline</func_name>
+			<func_data><![CDATA[$css=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<!-- -->]]></section_content>
+			<func_name>csite_javascript</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content>,</section_content>
+			<func_name>csite_sep_char</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<!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" xml:lang="en" lang="en">
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+		<meta name="generator" content="IPDynamic Lite">
+		<meta http-equiv="Pragma" content="no-cache">
+		<meta http-equiv="no-cache">
+		<meta http-equiv="Cache-Control" content="no-cache">
+		<title><!--CS.TEMPLATE.TITLE--></title>
+		<!--CS.TEMPLATE.JAVASCRIPT-->
+		<!--CS.TEMPLATE.CSS-->
+	</head>
+	<body>
+		<script type="text/javascript">
+		<!--
+		 var ipb_var_st       = "{ipb.input['st']}";
+		 var ipb_lang_tpl_q1  = "{ipb.lang['tpl_q1']}";
+		 var ipb_var_s        = "{ipb.session_id}";
+		 var ipb_var_phpext   = "{ipb.vars['php_ext']}";
+		 var ipb_var_base_url = "{$ibforums->js_base_url}";
+		 var ipb_input_f      = "{ipb.input['f']}";
+		 var ipb_input_t      = "{ipb.input['t']}";
+		 var ipb_input_p      = "{ipb.input['p']}";
+		 var ipb_var_cookieid = "{ipb.vars['cookie_id']}";
+		 //-->
+		</script>
+		<script type="text/javascript" src="jscripts/ipb_global.js"></script>
+		<div id="ipbwrapper">
+			<!--Header-->
+			<div class="borderwrap">
+				<div id="logostrip">
+					<a href="{ipb.script_url}" title="Return to Forums Index, Powered by IPB"><img src='style_images/<#IMG_DIR#>/logo4.gif' style='vertical-align:top' alt='IPB' border='0' /></a>
+				</div>
+				<div id="submenu">
+					<p class="home"><a href="{ipb.vars['home_url']}">{ipb.vars['home_name']}</a><!--IBF.RULES--></p>
+					<p>
+<if="ipb.vars['gallery_images_path'] != ''">
+<a href="{ipb.script_url}act=module&module=gallery">{ipb.lang['gallery']}</a>
+</if>
+
+						<a href="{ipb.script_url}act=Help">{ipb.lang['tb_help']}</a><a href="{ipb.script_url}act=Search&amp;f={ipb.input['f']}">{ipb.lang['tb_search']}</a><a href="{ipb.script_url}act=Members">{ipb.lang['tb_mlist']}</a><a href="{ipb.script_url}act=calendar">{ipb.lang['tb_calendar']}</a><!--IBF.CHATLINK--><!--IBF.TSLLINK--></td>
+					</p>
+				</div>
+			</div>
+			<!--CS.TEMPLATE.WELCOMEBOX-->
+			<!--CS.TEMPLATE.LINKS-->
+			<!--End Header-->
+			<!--Main Content-->
+			<table cellspacing="0">
+				<tr>
+					<td width="25%" class="nopad" valign="top">
+						<!-- LEFT -->
+						<!--CS.TEMPLATE.SEARCH-->
+						<!--CS.TEMPLATE.SITENAV-->
+						<!--CS.TEMPLATE.CHANGESKIN-->
+						<!--CS.TEMPLATE.ONLINEUSERS-->
+						<!--CS.TEMPLATE.POLL-->
+						<!--CS.TEMPLATE.LATESTPOSTS-->
+						<!--CS.TEMPLATE.RECENTARTICLES-->
+						<!--CS.TEMPLATE.AFFILIATES-->
+						<!--END LEFT-->
+					</td>
+					<!--SPACER-->
+					<td width="1%" class="nopad">&nbsp;</td>
+					<td width="75%" class="nopad" valign="top">
+						<!--MAIN-->
+						<!--CS.TEMPLATE.ARTICLES-->
+						<!--END MAIN-->
+					</td>
+				</tr>
+				<!--End Main Content-->
+			</table>
+			<!--CS.TEMPLATE.COPYRIGHT-->
+			<div style="text-align: center;"><!--CS.TEMPLATE.DEBUG--></div>
+		</div>
+	</body>
+</html>]]></section_content>
+			<func_name>csite_skeleton_template</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[&nbsp;<a href="$url">$title</a>]]></section_content>
+			<func_name>rules_link</func_name>
+			<func_data><![CDATA[$url="",$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[&nbsp;<a href="{ipb.script_url}act=chat">{ipb.lang['live_chat']}</a>]]></section_content>
+			<func_name>show_chat_link_inline</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[&nbsp;<a href="javascript:chat_pop();">{ipb.lang['live_chat']}</a>]]></section_content>
+			<func_name>show_chat_link_popup</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['aff_title']}</div>
+	<div class="tablepad">
+		$links
+	</div>
+</div>]]></section_content>
+			<func_name>tmpl_affiliates</func_name>
+			<func_data><![CDATA[$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content>$articles</section_content>
+			<func_name>tmpl_articles</func_name>
+			<func_data><![CDATA[$articles=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+<table cellspacing="0">
+	<tr>
+		<td class="maintitle" colspan="2"><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}showtopic={$entry['tid']}">{$entry['title']}</a></td>
+	</tr>
+	<tr>
+		<td class="row1" colspan="2">$top_string</td>
+	</tr>
+	<tr>
+		<td class="post1" width="5%" valign="top">{$entry['avatar']}</td>
+		<td class="post1" width="95%" valign="top"><div style="height: 200px; overflow: auto;">{$entry['post']}
+		<!--IBF.ATTACHMENT_{$entry['pid']}--></div></td>
+	</tr>
+	<tr>
+		<td class="row1" colspan="2" align="right">
+		$bottom_string
+		&nbsp;&nbsp;<a href="{ipb.script_url}act=Print&amp;client=printer&amp;f={$entry['forum_id']}&amp;t={$entry['tid']}"><img src='style_images/<#IMG_DIR#>/cs_print.gif' border='0' /></a>
+		<a href="{ipb.script_url}act=Forward&amp;f={$entry['forum_id']}&amp;t={$entry['tid']}"><img src='style_images/<#IMG_DIR#>/cs_email.gif' border='0' /></a>
+		</td>
+	</tr>
+</table>
+</div>
+<br />]]></section_content>
+			<func_name>tmpl_articles_row</func_name>
+			<func_data><![CDATA[$entry="",$bottom_string="",$top_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_upgrade_title']}</div>
+	<p>{ipb.lang['sc_upgrade_explain']}<br /><br />
+		{ipb.lang['sc_upgrade_string']}
+	</p>]]></section_content>
+			<func_name>sub_two_upgrade_summary</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_normal_title']}</div>
+	<p>{ipb.lang['sc_upgrade_explain']}<br /><br />
+		{ipb.lang['sc_normal_string']}
+	</p>]]></section_content>
+			<func_name>sub_two_normal_summary</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_available_methods']}</div>
+<form action="{ipb.script_url}act=module&amp;module=subscription&amp;nocp={ipb.input['nocp']}&amp;upgrade=$upgrade&amp;CODE=paymentscreen&amp;curid=$curid&amp;sub=$sub_chosen&amp;currency=$currency" method="post">             
+	<div class="borderwrapm">
+		<table cellspacing="1">
+			<tr>
+				<th width="5%" align="center">&nbsp;</th>
+				<th width="95%">{ipb.lang['sc_method']}</th>
+			</tr>]]></section_content>
+			<func_name>sub_two_methods_top</func_name>
+			<func_data><![CDATA[$sub_chosen="",$upgrade="",$curid="",$currency=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row3" align="center"><input type="radio" name="methodid" value="$mid" /></td>
+			<td class="row3"><b>$name</b><br /><i>$desc</i></td>
+		</tr>]]></section_content>
+			<func_name>sub_two_methods_row</func_name>
+			<func_data><![CDATA[$mid="",$name="",$desc=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</table>
+</div>]]></section_content>
+			<func_name>sub_two_methods_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrapm">
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['s_continue_button2']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>sub_two_methods_continue_button</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['tt_warn']} (<a href="javascript:PopUp('{ipb.script_url}act=warn&amp;mid={$id}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$percent}</a>%)]]></section_content>
+			<func_name>warn_level_warn</func_name>
+			<func_data><![CDATA[$id="",$percent=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="borderwrapm">
+	<div class="row1">
+		<b>{ipb.lang['msg_gen_title']}</b><br /><br />
+		{ipb.lang['msg_gen_text']}<br /><br />
+		<div>
+<if="ipb.vars['subsm_enforce'] != 1">
+&nbsp; &nbsp;<input type="button" class="button" value="Cancel Purchase & View Forums &gt; &gt;" onclick="locationjump('automodule=subscription&nocp=1&CODE=cancelfromreg');" />
+</if>
+
+		</div>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>sub_msg_general</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</div>
+</div>]]></section_content>
+			<func_name>sub_no_cp_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<!--{MSG}-->
+<div class="borderwrapm">
+	<div>]]></section_content>
+			<func_name>sub_no_cp_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div align="right">
+	<form action="$url" method="post">
+		{ipb.lang['cc_currency_in']} $select 
+		<input type="submit" value="{ipb.lang['cc_change']}" />
+	</form>
+</div>]]></section_content>
+			<func_name>sub_currency_change_form</func_name>
+			<func_data><![CDATA[$select="",$url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<option value="$id" $default>$id $name</option>]]></section_content>
+			<func_name>sub_currency_change_row</func_name>
+			<func_data><![CDATA[$id="",$name="",$default=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<select name="currency">]]></section_content>
+			<func_name>sub_currency_change_top</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="borderwrapm">
+	<div class="row1">
+		<b>{ipb.lang['msg_force_title']}</b><br /><br />
+		{ipb.lang['msg_force_text']}
+<if="ipb.input['CODE'] == "paymentmethod"">
+<br /><br />
+		<div>
+			<input type="button" class="button" value="&lt; &lt; Choose Another Package" onclick="locationjump('automodule=subscription&nocp=1&msgtype=general');" />
+		</div>
+</if>
+
+		</div>
+	</div>
+<br />]]></section_content>
+			<func_name>sub_msg_force</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="borderwrapm">
+	<div class="row1">
+		<b>{ipb.lang['msg_reg_title']}</b><br /><br />
+		{ipb.lang['msg_reg_text']}
+			<br /><br />
+		<div>
+			<input type="button" class="button" value="&lt; &lt; Choose Another Package" onclick="locationjump('automodule=subscription&nocp=1&msgtype=general');" />
+<if="ipb.vars['subsm_enforce'] != 1">
+&nbsp; &nbsp;<input type="button" class="button" value="Cancel Purchase & View Forums &gt; &gt;" onclick="locationjump('automodule=subscription&nocp=1&CODE=cancelfromreg');" />
+</if>
+
+		</div>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>sub_msg_fromreg</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</table>
+</div>
+<div class="borderwrapm">
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['s_continue_button']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>sub_choose_upgrade_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<tr>
+				<td class="row3" align="center"><input type="radio" name="sub" value="$id" /></td>
+				<td class="row3"><b>$name</b><br /><i>$desc</i></td>
+				<td class="row3" align="center">$duration</td>
+				<td class="row3" align="center">{$cost}</td>
+			</tr>]]></section_content>
+			<func_name>sub_choose_upgrade_row</func_name>
+			<func_data><![CDATA[$id="",$name="",$desc="",$cost="",$duration=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<br />
+<div class="formsubtitle">{ipb.lang['s_upgrade_subs']}</div>
+<p>{ipb.lang['s_upgrade_explain']}</p>
+<br /> 
+<form action="{ipb.script_url}act=module&amp;module=subscription&amp;nocp={ipb.input['nocp']}&amp;upgrade=1&amp;CODE=paymentmethod&amp;curid=$cur_id&amp;currency=$currency" method="post">             
+	<div class="borderwrapm">
+		<table cellspacing="1">
+			<tr>
+				<th width="5%">&nbsp;</th>
+				<th width="55%">{ipb.lang['s_detail']}</th>
+				<th width="20%" align="center">{ipb.lang['s_end']}</th>
+				<th width="20%" align="center">{ipb.lang['s_balance_cost']}</th>
+			</tr>]]></section_content>
+			<func_name>sub_choose_upgrade_top</func_name>
+			<func_data><![CDATA[$cur_id="",$currency=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<b>{ipb.lang['oul_show_more']}</b> <a href="{ipb.script_url}act=Online&amp;CODE=listall&amp;sort_key=click">{ipb.lang['oul_click']}</a>, <a href="{ipb.script_url}act=Online&amp;CODE=listall&amp;sort_key=name&amp;sort_order=asc&amp;show_mem=reg">{ipb.lang['oul_name']}</a>]]></section_content>
+			<func_name>active_user_links</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formsubtitle" colspan="2">$active[TOTAL] {ipb.lang['active_users']}</td>
+		</tr>
+		<tr>
+			<td class="row1" width="1%"><{F_ACTIVE}></td>
+			<td class="row2">
+				<b>{$active[GUESTS]}</b> {ipb.lang['guests']}, <b>{$active[MEMBERS]}</b> {ipb.lang['public_members']} <b>{$active[ANON]}</b> {ipb.lang['anon_members']}
+				<div class="thin">{$active[NAMES]}</div>
+				{$active['links']}
+			</td>
+		</tr>
+		<!--IBF.WHOSCHATTING-->]]></section_content>
+			<func_name>ActiveUsers</func_name>
+			<func_data><![CDATA[$active=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formsubtitle" colspan="2">{ipb.lang['birthday_header']}</td>
+		</tr>
+		<tr>
+			<td class="row1" width="1%"><{F_CALEN}></td>
+			<td class="row2"><b>$total</b> $birth_lang<br />$birthusers</td>
+		</tr>]]></section_content>
+			<func_name>birthdays</func_name>
+			<func_data><![CDATA[$birthusers="",$total="",$birth_lang=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<!-- no content -->]]></section_content>
+			<func_name>bottom_links</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formsubtitle" colspan="2">{ipb.lang['calender_f_title']}</td>
+		</tr>
+		<tr>
+			<td class="row1" width="1%"><{F_CALEN}></td>
+			<td class="row2">$events</td>
+		</tr>]]></section_content>
+			<func_name>calendar_events</func_name>
+			<func_data><![CDATA[$events=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_buddy</group_name>
+			<section_content><![CDATA[( <b><a href="javascript:redirect_to('$url', 0)">{ipb.lang['view_link']}</a></b> )]]></section_content>
+			<func_name>append_view</func_name>
+			<func_data><![CDATA[$url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_buddy</group_name>
+			<section_content><![CDATA[<script language='javascript' type="text/javascript">
+<!--
+ function redirect_to(where, closewin)
+ {
+ 	opener.location= '{ipb.script_url}' + where;
+ 	
+ 	if (closewin == 1)
+ 	{
+ 		self.close();
+ 	}
+ }
+ 
+ function check_form(helpform)
+ {
+ 	opener.name = "ibfmain";
+ 
+ 	if (helpform == 1) {
+ 		document.theForm2.target = 'ibfmain';
+ 	} else {
+ 		document.theForm.target = 'ibfmain';
+ 	}
+ 	
+ 	return true;
+ }
+ 
+ function shrink()
+ {
+ 	window.resizeTo('200','75');
+ }
+ 
+ function expand()
+ {
+ 	window.resizeTo('200','450');
+ }
+ 
+ 
+ //-->
+ </script>]]></section_content>
+			<func_name>buddy_js</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_buddy</group_name>
+			<section_content><![CDATA[{ipb.lang['new_posts']}
+<br />
+{ipb.lang['my_replies']}]]></section_content>
+			<func_name>build_away_msg</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_buddy</group_name>
+			<section_content><![CDATA[<p><a href="javascript:window.location=window.location;">{ipb.lang['refresh']}</a> / <a href="javascript:self.close();">{ipb.lang['close_win']}</a></p>]]></section_content>
+			<func_name>closelink</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_buddy</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=Login&amp;CODE=01&amp;CookieDate=1&amp;buddy=1" method="post" name="theForm" onSubmit="return check_form();">
+	<div class="borderwrap">
+		<h3>{ipb.lang['page_title']}</h3>
+		<div class="formsubtitle" align="center">{ipb.lang['log_in_needed']}</div>
+			<p>{ipb.lang['no_guests']}</p>
+			<div class="formsubtitle" align="center">{ipb.lang['log_in']}</div>
+			<div class="fieldwrap">
+				<h4>{ipb.lang['lin_name']}</h4>
+				<input type="text" name="UserName" />
+				<h4>{ipb.lang['lin_pass']}</h4>
+				<input type="password" name="PassWord" />
+				<input type="submit" value="{ipb.lang['log_in']}" class="button" />
+			</div>
+			<p>{ipb.lang['reg_text']}<br /><a href="javascript:redirect_to('&amp;act=Reg', 1);">{ipb.lang['reg_link']}</a></p>
+	<div align="center"><!--CLOSE.LINK--></div>
+	</div>
+</form>]]></section_content>
+			<func_name>login</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Login&amp;CODE=04&amp;f={$id}&amp;i=1" title="{ipb.lang['bi_markallread']}">{$img}</a>]]></section_content>
+			<func_name>subforum_img_with_link</func_name>
+			<func_data><![CDATA[$img="",$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap" style="display:{$data['div_fc']}" id="fc_{$data['id']}">
+	<div class="maintitlecollapse">
+		<p class="expand"><a href="javascript:togglecategory({$data['id']}, 0);"><{E_PLUS}></a></p>
+		<p><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}showforum={$data['id']}">{$data['name']} {ipb.lang['sub_forum_title']}</a></p>
+	</div>
+</div>
+<div class="borderwrap" style="display:{$data['div_fo']}" id="fo_{$data['id']}">
+	<div class="maintitle">
+		<p class="expand"><a href="javascript:togglecategory({$data['id']}, 1);"><{E_MINUS}></a></p>
+		<p><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}showforum={$data['id']}">{$data['name']} {ipb.lang['sub_forum_title']}</a></p>
+	</div>
+	<table cellspacing="1">
+		<tr> 
+			<th colspan="2" width="66%">{ipb.lang['cat_name']}</th>
+			<th align="center" width="7%">{ipb.lang['topics']}</th>
+			<th align="center" width="7%">{ipb.lang['replies']}</th>
+			<th width="35%">{ipb.lang['last_post_info']}</th>
+		</tr>]]></section_content>
+			<func_name>subheader</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<!-- Forum {$data['id']} entry -->
+		<tr> 
+			<td align="center" class="row2" width="1%"><{BR_REDIRECT}></td>
+			<td class="row2"><b><a href="{ipb.script_url}showforum={$data['id']}" {$data['redirect_target']}>{$data['name']}</a></b><br /><span class="forumdesc">{$data['description']}</span></td>
+			<td align="center" class="row1">--</td>
+			<td align="center" class="row1">--</td>
+			<td class="row1"><b>{ipb.lang['rd_hits']}:</b> {$data['redirect_hits']}</td>
+		</tr>
+<!-- End of Forum {$data['id']} entry -->]]></section_content>
+			<func_name>forum_redirect_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formsubtitle" colspan="2">{$total} {ipb.lang['whoschatting_total']} <a href="$link">{ipb.lang['whoschatting_loadchat']}</a></td>
+		</tr>
+		<tr>
+			<td class="row1" width="1%"><{F_ACTIVE}></td>
+			<td class="row2">
+				{$names}<div class="desc">$txt</div>
+			</td>
+		</tr>]]></section_content>
+			<func_name>whoschatting_show</func_name>
+			<func_data><![CDATA[$total="",$names="",$link="",$txt=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formsubtitle" colspan="2">{ipb.lang['whoschatting_total']} <a href="$link">{ipb.lang['whoschatting_loadchat']}</a></td>
+		</tr>
+		<tr>
+			<td class="row1" width="1%"><{F_ACTIVE}></td>
+			<td class="row2">
+				<i>{ipb.lang['whoschatting_none']}</i>
+			</td>
+		</tr>]]></section_content>
+			<func_name>whoschatting_empty</func_name>
+			<func_data><![CDATA[$link=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content>{ipb.script_url}act=chat</section_content>
+			<func_name>whoschatting_inline_link</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[javascript:chat_pop({ipb.vars['chat_width']}, {ipb.vars['chat_height']});]]></section_content>
+			<func_name>whoschatting_popup_link</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}showforum={$id}&amp;modfilter=all"><{BC_QUEUED_POSTS}></a>&nbsp;]]></section_content>
+			<func_name>show_queued_img</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<br /><span class="desc"><b>Queued topics: $topics, posts: $posts</b></span>]]></section_content>
+			<func_name>show_queued_info</func_name>
+			<func_data>$posts=0,$topics=0</func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<br /><b>{ipb.lang['sub_forum_title']}:</b> $links]]></section_content>
+			<func_name>show_subforum_all_links</func_name>
+			<func_data><![CDATA[$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}showforum={$id}">{$name}</a>]]></section_content>
+			<func_name>show_subforum_link</func_name>
+			<func_data><![CDATA[$id="",$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formsubtitle" colspan="2">{ipb.lang['board_stats']}</td>
+		</tr>
+		<tr>
+			<td class="row1" width="1%"><{F_STATS}></td>
+			<td class="row2">$text<br />{ipb.lang['most_online']}</td>
+		</tr>]]></section_content>
+			<func_name>ShowStats</func_name>
+			<func_data><![CDATA[$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr> 
+			<td class="catend" colspan="2"><!-- no content --></td>
+		</tr>
+	</table>
+</div>
+<!-- Board Stats -->]]></section_content>
+			<func_name>stats_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<!-- Board Stats -->
+<div class="toplinks"><span><a href="{ipb.script_url}act=Login&amp;CODE=06">{ipb.lang['d_delete_cookies']}</a> &middot; <a href="{ipb.script_url}act=Login&amp;CODE=05">{ipb.lang['d_post_read']}</a></span></div>
+<div class="borderwrap" style="display:{$show['div_fc']}" id="fc_stat">
+	<div class="maintitle">
+		<p class="expand"><a href="javascript:togglecategory('stat', 0);"><{E_PLUS}></a></p>
+		<p><{CAT_IMG}>&nbsp;{ipb.lang['board_stats']}</p>
+	</div>
+	<div class="subtitlediv"><a href="{ipb.script_url}act=search&amp;CODE=getnew&amp;active=1&amp;lastdate=86400">{ipb.lang['sm_todays_posts']}</a> &middot; <a href="{ipb.script_url}act=Stats&amp;CODE=leaders">{ipb.lang['sm_forum_leaders']}</a> &middot; <a href="{ipb.script_url}act=Stats">{ipb.lang['sm_today_posters']}</a> &middot; <a href="{ipb.script_url}act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc">{ipb.lang['sm_all_posters']}</a></div>
+	<div class="formsubtitle">
+<if="ipb.vars['show_totals'] == 1">
+<p class="members">$posts posts &#0124; $members members</p>
+</if>
+
+		<p>$active users online</p>
+	</div>
+</div>
+<div class="borderwrap" style="display:{$show['div_fo']}" id="fo_stat">
+	<div class="maintitle">
+		<p class="expand"><a href="javascript:togglecategory('stat', 1);"><{E_MINUS}></a></p>
+		<p><{CAT_IMG}>&nbsp;{ipb.lang['board_stats']}</p>
+	</div>
+	<table cellspacing="1">
+		<tr>
+			<th align="right" colspan="2"><a href="{ipb.script_url}act=search&amp;CODE=getnew&amp;active=1&amp;lastdate=86400">{ipb.lang['sm_todays_posts']}</a> &middot; <a href="{ipb.script_url}act=Stats&amp;CODE=leaders">{ipb.lang['sm_forum_leaders']}</a> &middot; <a href="{ipb.script_url}act=Stats">{ipb.lang['sm_today_posters']}</a> &middot; <a href="{ipb.script_url}act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc">{ipb.lang['sm_all_posters']}</a>
+			</th>
+		</tr>]]></section_content>
+			<func_name>stats_header</func_name>
+			<func_data><![CDATA[$active="",$posts="",$members="",$show=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}showtopic=$tid&amp;view=getlastpost" title="{ipb.lang['tt_golast']}"><{LAST_POST}></a>]]></section_content>
+			<func_name>forumrow_lastunread_link</func_name>
+			<func_data><![CDATA[$fid="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<br /><b>{ipb.vars['board_name']} {ipb.lang['newslink']}</b> <i><a href="{ipb.script_url}showtopic=$tid">$title</a></i>]]></section_content>
+			<func_name>newslink</func_name>
+			<func_data><![CDATA[$fid="",$title="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<script type="text/javascript" src="jscripts/ipb_board.js"></script>
+<table cellspacing="0" class="newslink">
+	<tr>
+		<td><b>{ipb.lang['welcome_back_text']}: <span>$lastvisit</span></b><!-- IBF.NEWSLINK --></td>
+		<td align="right" valign="middle">
+<if="ipb.member['id'] == 0">
+<form action="{ipb.script_url}act=Login&amp;CODE=01&amp;CookieDate=1" method="post">
+				<input type="text" size="20" name="UserName" onfocus="this.value=''" value="{ipb.lang['qli_name']}" />
+				<input type="password" size="20" name="PassWord" onfocus="this.value=''" value="ibfrules" />
+				<input class="button" type="image" src="{ipb.vars['img_url']}/login-button.gif" />
+			</form>
+</if>
+<else>
+<form action="{ipb.script_url}act=Search&amp;CODE=01&amp;forums=all" method="post">
+				<input type="text" size="30" name="keywords"  onfocus="this.value=''" value="{ipb.lang['enter_search_words']}" />
+				<input class="button" type="image" src="{ipb.vars['img_url']}/login-button.gif" />
+			</form>
+</else>
+
+		</td>
+	</tr>
+</table>
+<br />]]></section_content>
+			<func_name>PageTop</func_name>
+			<func_data><![CDATA[$lastvisit=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<form method="post" action="{ipb.script_url}&amp;act=warn&amp;CODE=dowarn&amp;mid=$mid&amp;t=$tid&amp;st=$st&amp;type={ipb.input['type']}">
+	<input type="hidden" name="key" value="$key" />
+		<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['w_warnfor']} <a href="{ipb.script_url}showuser=$mid">$name</a> ( $min &lt; $cur &gt; $max )</div>
+			<div class="formsubtitle">{ipb.lang['w_complete']}</div>
+				<table cellspacing="0">
+					<tr>
+						<td class="pformleftw"><b>{ipb.lang['w_adjust_level']}</b></td>
+						<td class="pformright">
+							<input type="radio" name="level" id="add" class="radiobutton" value="add" {$type['add']} /><label for="add" class="warnbad"><b>{ipb.lang['w_add']}</b></label>
+								<br />
+							<input type="radio" name="level" id="minus" class="radiobutton" value="remove" {$type['minus']} /><label for="minus" class="warngood"><b>{ipb.lang['w_remove']}</b></label>
+						</td>
+					</tr>]]></section_content>
+			<func_name>warn_header</func_name>
+			<func_data><![CDATA[$mid="",$name="",$cur=0,$min=0,$max=10,$key="",$tid="",$st="",$type=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+						<td class="pformleftw"><b>{ipb.lang['w_modq']}</b></td>
+						<td class="pformright">
+							<input type="checkbox" name="mod_indef" value="1" $mod_tick /> {ipb.lang['w_modq_i']}
+								<br />
+							<b>{ipb.lang['w_orfor']}</b>
+							<input type="input" name="mod_value" value="{$mod_array['timespan']}" size="5" />&nbsp;
+							<select name="mod_unit">
+								<option value="d" {$mod_array['days']}>{ipb.lang['w_day']}</option>
+								<option value="h" {$mod_array['hours']}>{ipb.lang['w_hour']}</option>
+							</select>
+							$mod_extra
+					</tr>]]></section_content>
+			<func_name>warn_mod_posts</func_name>
+			<func_data><![CDATA[$mod_tick="",$mod_array="",$mod_extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+						<td class="pformleftw"><b>{ipb.lang['w_resposts']}</b></td>
+						<td class="pformright">
+							<input type="checkbox" name="post_indef" value="1" $post_tick /> {ipb.lang['w_resposts_i']}
+								<br />
+							<b>{ipb.lang['w_orfor']}</b>
+							<input type="input" name="post_value" value="{$post_array['timespan']}" size="5" />&nbsp;
+							<select name="post_unit">
+								<option value="d" {$post_array['days']}>{ipb.lang['w_day']}</option>
+								<option value="h" {$post_array['hours']}>{ipb.lang['w_hour']}</option>
+							</select>
+							$post_extra
+					</tr>]]></section_content>
+			<func_name>warn_rem_posts</func_name>
+			<func_data><![CDATA[$post_tick="",$post_array="",$post_extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="formsubtitle">{ipb.lang['errors_found']}</div>
+	<div class="tablepad"><span class="postcolor">$data</span></div>
+</div>
+<br />]]></section_content>
+			<func_name>warn_errors</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="pformleftw" valign="top"><b>{ipb.lang['w_reason']}</b><br />{ipb.lang['w_reason2']}</td>
+			<td class="pformright"><textarea rows="6" cols="70" class="textinput" name="reason">{ipb.input['reason']}</textarea></td>
+		</tr>
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang['w_c_subj']}</b></td>
+			<td class="pformright"><input type="input" name="subject" value="{ipb.input['subject']}" size="30" /></td>
+		</tr>
+		<tr>
+			<td class="pformleftw" valign="top"><b>{ipb.lang['w_contact']}</b><br />{ipb.lang['w_contact2']}</td>
+			<td class="pformright">
+				{ipb.lang['w_c']}&nbsp;
+				<select name="contactmethod">
+					<option value="pm">{ipb.lang['w_c_p']}</option>
+					<option value="email">{ipb.lang['w_c_e']}</option>
+				</select>
+					<br />
+				<textarea rows="6" cols="70" class="textinput" name="contact">{ipb.input['contact']}</textarea>
+			</td>
+		</tr>
+	</table>
+		<div align="center" class="formsubtitle"><input type="submit" value="{ipb.lang['w_submit']}" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>warn_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">$posting_title</div>]]></section_content>
+			<func_name>table_top</func_name>
+			<func_data><![CDATA[$posting_title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+		<div class="maintitle">{ipb.lang['th_title']}</div>
+		<table cellspacing="1">
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_topic']}</b></td>
+				<td class="pformright">{$data['th_topic']}</td>
+			</tr>
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_desc']}</b></td>
+				<td class="pformright">{$data['th_desc']}&nbsp;</td>
+			</tr>
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_start_date']}</b></td>
+				<td class="pformright">{$data['th_start_date']}</td>
+			</tr>
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_start_name']}</b></td>
+				<td class="pformright">{$data['th_start_name']}</td>
+			</tr>
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_last_date']}</b></td>
+				<td class="pformright">{$data['th_last_date']}</td>
+			</tr>
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_last_name']}</b></td>
+				<td class="pformright">{$data['th_last_name']}</td>
+			</tr>
+			<tr>
+				<td class="pformleftw"><b>{ipb.lang['th_avg_post']}</b></td>
+				<td class="pformright">{$data['th_avg_post']}</td>
+			</tr>
+		</table>
+	</div>]]></section_content>
+			<func_name>topic_history</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+var msg = "$msg";
+	if ( msg != ""){
+		alert(msg);
+	}
+</script>
+<form action="{ipb.script_url}" method="post" name="form1">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="09" />
+<div class="formsubtitle">{ipb.lang['change_email_title']}</div>
+<p>
+	$txt
+</p>
+<table cellspacing="0">
+	<tr>
+		<td width="40%"><b>{ipb.lang['ce_new_email']}</b></td>
+		<td><input type="text" name="in_email_1" value="" /></td>
+	</tr>
+	<tr>
+		<td><b>{ipb.lang['ce_new_email2']}</b></td>
+		<td><input type="text" name="in_email_2" value="" /></td>
+	</tr>
+	<tr>
+		<td><b>{ipb.lang['ec_passy']}</b></td>
+		<td><input type="password" name="password" value="" /></td>
+	</tr>
+</table>
+<!--ANTIBOT-->
+	<div class="formsubtitle" style="text-align: center;"><input type="submit" name="change_email" value="{ipb.lang['account_email_submit']}" /></div>
+</form>]]></section_content>
+			<func_name>email_change</func_name>
+			<func_data><![CDATA[$txt="",$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['ras_title']}</div>
+<table cellspacing="0">
+	<tr>
+		<td width="40%">{ipb.lang['ras_numbers']}</td>
+		<td>
+			<input type="hidden" name="regid" value="$regid" />
+			<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}" alt="Code Bit" />
+		</td>
+	</tr>
+	<tr>
+		<td width="40%">{ipb.lang['ras_text']}</td>
+		<td><input type="text" size="32" maxlength="32" name="reg_code" /></td>
+	</tr>
+</table>]]></section_content>
+			<func_name>email_change_gd</func_name>
+			<func_data><![CDATA[$regid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{$title}</div>
+	<p>$msg</p>]]></section_content>
+			<func_name>ucp_message</func_name>
+			<func_data><![CDATA[$title="",$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1"><b><a href="{ipb.script_url}act=announce&amp;id={$announce['announce_id']}">{$announce['announce_title']}</a></b> {$announce['announce_inactive']}<div class="desc">{ipb.lang['announce_by']} {$announce['name']}</div></td>
+			<td class="row1" align="center">{$announce['announce_starts_converted']}</td>
+			<td class="row1" align="center">{$announce['announce_end_converted']}</td>
+			<td class="row1"><div class="forumdesc">{$announce['announce_forum_show']}</div></td>
+			<td class="row1" align="center">
+				<a href="{ipb.script_url}act=usercp&amp;CODE=announce_edit&amp;id={$announce['announce_id']}">{ipb.lang['announce_edit']}</a>
+				&middot; <a href="#" onclick="delete_post('{ipb.script_url}act=usercp&amp;CODE=announce_delete&amp;id={$announce['announce_id']}'); return false;">{ipb.lang['announce_delete']}</a>
+			</td>
+		</tr>]]></section_content>
+			<func_name>ucp_announce_manage_row</func_name>
+			<func_data><![CDATA[$announce=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+ var ipb_lang_js_del_1 = "{ipb.lang['announce_del1']}";
+ var ipb_lang_js_del_2 = "{ipb.lang['announce_del2']}";
+-->
+</script>
+<script type="text/javascript" src="jscripts/ipb_topic.js"></script>
+<div class="formsubtitle">{ipb.lang['announce_current']}</div>
+<form action="{ipb.script_url}" name="mutliact" method="post">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="announce_alter" />
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="35%">{ipb.lang['announce_title']}</th>
+			<th align="center" width="10%">{ipb.lang['announce_starts']}</th>
+			<th align="center" width="10%">{ipb.lang['announce_end']}</th>
+			<th width="25%">{ipb.lang['announce_forums']}</th>
+			<th width="15%">&nbsp;</th>
+		</tr>
+<if="content">
+$content
+</if>
+<else>
+<tr>
+			<td align="center" colspan="5">{ipb.lang['announce_none']}</td>
+		</tr>
+</else>
+
+	<tr>
+		<td class="formbuttonrow" colspan="5"><a href="{ipb.script_url}act=usercp&amp;CODE=announce_add">{ipb.lang['announce_add']}</a></td>
+	</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>ucp_announce_manage</func_name>
+			<func_data><![CDATA[$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post" name="REPLIER">
+<input type="hidden" name="act" value="usercp" />
+<input type="hidden" name="CODE" value="end_subs" />
+<input type="hidden" name="method" value="$method" />
+<input type="hidden" name="auth_key" value="$key" />
+<input type="hidden" name="tid" value="{$topic['tid']}" />
+<input type="hidden" name="fid" value="{$forum['id']}" />
+<input type="hidden" name="st" value="{ipb.input['st']}" />
+<div class="formsubtitle">{ipb.lang['subs_c_title']}</div>
+<div>
+<if="topic['tid'] != """>
+<b>{ipb.lang['subs_c_topic']} {$topic['title']}</b>
+</if>
+<else>
+<b>{ipb.lang['subs_c_forum']} {$forum['name']}</b>
+</else>
+
+	<div class="desc">{ipb.lang['subs_exp_text']}</div>
+</div>
+<table cellspacing="0">
+	<tr>
+		<td width="5%" align="center"><input type="radio" name="emailtype" value="none" /></td>
+		<td><b>{ipb.lang['subs_none_title']}</b><div class="desc">{ipb.lang['subs_none_desc']}</div></td>
+	</tr>
+	<tr>
+		<td width="5%" align="center"><input type="radio" name="emailtype" value="delayed" checked="checked" /></td>
+		<td><b>{ipb.lang['subs_delayed']}</b><div class="desc">{ipb.lang['subs_delayed_desc']}</div></td>
+	</tr>
+	<tr>
+		<td width="5%" align="center"><input type="radio" name="emailtype" value="immediate" /></td>
+		<td><b>{ipb.lang['subs_immediate']}</b><div class="desc">{ipb.lang['subs_immediate_desc']}</div></td>
+	</tr>
+	<tr>
+		<td width="5%" align="center"><input type="radio" name="emailtype" value="daily" /></td>
+		<td><b>{ipb.lang['subs_daily']}</b><div class="desc">{ipb.lang['subs_daily_desc']}</div></td>
+	</tr>
+	<tr>
+		<td width="5%" align="center"><input type="radio" name="emailtype" value="weekly" /></td>
+		<td><b>{ipb.lang['subs_weekly']}</b><div class="desc">{ipb.lang['subs_weekly_desc']}</div></td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['subs_submit']}" class="button" /></td>
+	</tr>
+</table>
+</form>]]></section_content>
+			<func_name>subs_show_choice_page</func_name>
+			<func_data><![CDATA[$forum="",$topic="",$method="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post" name="REPLIER">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="announce_save" />
+<input type="hidden" name="type" value="$type" />
+<input type="hidden" name="id"   value="{$announce['announce_id']}" />
+<div class="formsubtitle">{$button}</div>
+<if="msg != """>
+<div class="borderwrapm"><div class="tablepad">{$msg}</div></div>
+</if>
+
+<table cellspacing="0">
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['announce_form_title']}</b></td>
+		<td class="pformright" valign="top"><input type="text" size="30" name="announce_title" value="{$announce['announce_title']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['announce_form_start']}</b><div class="desc">{ipb.lang['announce_form_startdesc']}</div></td>
+		<td class="pformright" valign="top"><input type="text" size="10" name="announce_start" value="{$announce['announce_start']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['announce_form_end']}</b><div class="desc">{ipb.lang['announce_form_enddesc']}</div></td>
+		<td class="pformright" valign="top"><input type="text" size="10" name="announce_end" value="{$announce['announce_end']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft" valign="top"><b>{ipb.lang['announce_form_forums']}</b><div class="desc">{ipb.lang['announce_form_forums2']}</div></td>
+		<td class="pformright" valign="top"><select class="dropdown" multiple="multiple" size="10" name="announce_forum[]">$forum_html</td>
+	</tr>
+	<tr>
+		<td class="pformleft" valign="top"><b>{ipb.lang['announce_form_content']}</b></td>
+		<td class="pformright" valign="top"><textarea cols="50" class="textarea" rows="15" name="announce_post" tabindex="3">{$announce['announce_post']}</textarea></td>
+	</tr>
+	<tr>
+		<td class="pformleft" valign="top"><b>{ipb.lang['announce_form_options']}</b></td>
+		<td class="pformright" valign="middle">
+			<input type="checkbox" class="checkbox" name="announce_active" value="1" {$announce['announce_active_checked']} />&nbsp;{ipb.lang['announce_form_enable']}
+			<br /><input type="checkbox" class="checkbox" name="announce_html_enabled" value="1" {$announce['announce_html_enabled']} />&nbsp;{ipb.lang['announce_use_html']}
+		</td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" value="{$button}" class="button" /></td>
+	</tr>
+</table>
+</form>]]></section_content>
+			<func_name>ucp_announce_form</func_name>
+			<func_data><![CDATA[$announce="",$button="",$forum_html="",$type="",$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td align="center" class="formbuttonrow" valign="middle" colspan="6">
+			<select name="trackchoice">
+				<option value="unsubscribe">{ipb.lang['subs_delete']}</option>
+				<option value="none">{ipb.lang['subs_c_change']} {ipb.lang['subs_none_title']}</option>
+				<option value="immediate">{ipb.lang['subs_c_change']} {ipb.lang['subs_immediate']}</option>
+				<option value="delayed">{ipb.lang['subs_c_change']} {ipb.lang['subs_delayed']}</option>
+				<option value="daily">{ipb.lang['subs_c_change']} {ipb.lang['subs_daily']}</option>
+				<option value="weekly">{ipb.lang['subs_c_change']} {ipb.lang['subs_weekly']}</option>
+			</select>&nbsp;&nbsp;
+			<input type="submit" class="button" value="{ipb.lang['with_selected']}" />
+		</td>
+	</tr>
+</table>
+</div>
+</form>
+<div align="right" style="padding: 5px;"><i>$text</i></div>
+<div align="right" style="padding: 5px;">
+	<form action="{ipb.script_url}act=UserCP&amp;CODE=26" method="post">
+		{ipb.lang['show_topics_from']}
+		<select name="datecut">
+			$days
+		</select>
+ 	<input type="submit" value="{ipb.lang['jmp_go']}" />
+ 	</form>
+</div>]]></section_content>
+			<func_name>subs_end</func_name>
+			<func_data><![CDATA[$text="",$days=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row2" align="center" colspan="6">{ipb.lang['subs_none']}</td>
+		</tr>]]></section_content>
+			<func_name>subs_none</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row2" align="center" width="5%">{$data['folder_img']}</td>
+			<td class="row2">
+				<a href="{ipb.script_url}act=ST&amp;f={$data['forum_id']}&amp;t={$data['tid']}">{$data['title']}</a>&nbsp;
+				( <a href="{ipb.script_url}act=ST&amp;f={$data['forum_id']}&amp;t={$data['tid']}" target="_blank">{ipb.lang['new_window']}</a> )
+  				<div class="desc">{$data['description']}{ipb.lang['subs_start']} {$data['start_date']}
+  					<br />
+  					{ipb.lang['subs_c_type']}: {ipb.lang[$type]}
+  				</div>
+  			</td>
+  			<td class="row2" align="center">{$data['posts']}</td>
+  			<td class="row2" align="center">{$data['views']}</td>
+  			<td class="row2">{$data['last_post_date']}<br />{ipb.lang['subs_by']} {$data['last_poster']}</td>
+  			<td class="row1" align="center"><input type="checkbox" name="id-{$data['trid']}" value="yes" /></td>
+  		</tr>]]></section_content>
+			<func_name>subs_row</func_name>
+			<func_data><![CDATA[$data="",$type=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td colspan="6" class="row1"><b>$fname</b></td>
+	</tr>]]></section_content>
+			<func_name>subs_forum_row</func_name>
+			<func_data><![CDATA[$fid="",$fname=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<!-- inbox folder -->
+<script type="text/javascript">
+<!--
+	function CheckAll(cb){
+		var fmobj = document.mutliact;
+			for (var i=0;i<fmobj.elements.length;i++){
+				var e = fmobj.elements[i];
+				if ((e.name != "allbox") && (e.type=="checkbox") && (!e.disabled)){
+				e.checked = fmobj.allbox.checked;
+				}
+			}
+	}
+	function CheckCheckAll(cb){	
+		var fmobj = document.mutliact;
+		var TotalBoxes = 0;
+		var TotalOn = 0;
+			for (var i=0;i<fmobj.elements.length;i++){
+		  		var e = fmobj.elements[i];
+		 		 if ((e.name != "allbox") && (e.type=="checkbox")){
+			 		 TotalBoxes++;
+			 		 if (e.checked){
+				 		 TotalOn++;
+				 	}
+				 }
+			}
+			
+			if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}
+			else{
+				fmobj.allbox.checked=false;
+			}
+	}
+-->
+</script>
+<div class="formsubtitle">{ipb.lang['subs_header']}</div>
+<form action="{ipb.script_url}" name="mutliact" method="post">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="27" />
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%">&nbsp;</th>
+			<th width="55%">{ipb.lang['subs_topic']}</th>
+			<th align="center" width="5%">{ipb.lang['subs_replies']}</th>
+			<th align="center" width="5%">{ipb.lang['subs_view']}</th>
+			<th width="25%">{ipb.lang['subs_last_post']}</th>
+			<th align="center" width="5%"><input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();" /></th>
+		</tr>]]></section_content>
+			<func_name>subs_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" valign="middle">{$row['author_name']}</td>
+			<td align="center" class="row1" valign="middle">{$row['pcount']}</td>
+		</tr>]]></section_content>
+			<func_name>who_row</func_name>
+			<func_data><![CDATA[$row=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<script language="javascript">
+<!--
+	function bog_off(){
+		var tid = "$tid";
+		var fid = "$fid";
+		
+		opener.location= "{ipb.script_url}" + "showtopic=" + tid;
+		self.close();
+	}
+-->
+</script>
+<div class="borderwrap">
+	<div class="maintitle" align="center">{ipb.lang['who_farted']} $title</div>
+	<table cellspacing="1">
+		<tr>
+			<th width="70%" valign="middle">{ipb.lang['who_poster']}</th>
+			<th width="30%" align="center" valign="middle">{ipb.lang['who_posts']}</th>
+		</tr>]]></section_content>
+			<func_name>who_header</func_name>
+			<func_data><![CDATA[$fid="",$tid="",$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<p>{ipb.lang['s_current_bottom']}</p>]]></section_content>
+			<func_name>sub_page_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</select>]]></section_content>
+			<func_name>sub_currency_change_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<br /><br />--------------------<br />
+<div class="signature">$sig</div>]]></section_content>
+			<func_name>signature_separator</func_name>
+			<func_data><![CDATA[$sig=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<div id="navstrip"><{F_NAV}>&nbsp;]]></section_content>
+			<func_name>start_nav</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1"><{B_PIN}></td>
+	<td class="row1">&nbsp;</td>
+	<td class="row1"><b>{ipb.lang['announce_row']}: <a href="{ipb.script_url}act=announce&amp;f={$data['forum_id']}&amp;id={$data['announce_id']}">{$data['announce_title']}</a></b></td>
+	<td class="row1" align="center">-</td>
+	<td class="row1" align="center"><a href="{ipb.script_url}showuser={$data['member_id']}">{$data['member_name']}</a></td>
+	<td class="row1" align="center">{$data['announce_views']}</td>
+	<td class="row1"><span class="desc">{$data['announce_start']}
+	<br /><a href="{ipb.script_url}act=announce&amp;f={$data['forum_id']}&amp;id={$data['announce_id']}">{ipb.lang['last_post_by']}</a> <b><a href="{ipb.script_url}showuser={$data['member_id']}">{$data['member_name']}</a></b></span>
+	</td>
+<if="ipb.member['is_mod'] and inforum == 1">
+<td align="center" class="row1">&nbsp;</td>
+</if>
+
+</tr>]]></section_content>
+			<func_name>announcement_row</func_name>
+			<func_data><![CDATA[$data="",$inforum=1]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<a href="#" onclick="PopUp('{ipb.script_url}act=attach&amp;code=showtopic&amp;tid={$tid}', 'Attach{$tid}', 500,400); return false;" title="{$count} {ipb.lang['topic_attach']}"><{ATTACH_ICON}></a>]]></section_content>
+			<func_name>topic_attach_icon</func_name>
+			<func_data><![CDATA[$tid="",$count=0]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<a href="javascript:who_posted($tid);">$posts</a>]]></section_content>
+			<func_name>who_link</func_name>
+			<func_data><![CDATA[$tid="",$posts=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<div><span class="pagetitle">$title</span>$pages</div>]]></section_content>
+			<func_name>page_title</func_name>
+			<func_data><![CDATA[$title="",$pages=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<script language="javascript" type="text/javascript">
+<!--
+var unselectedbutton = "{ipb.vars['img_url']}/topic_unselected.gif";
+var selectedbutton   = "{ipb.vars['img_url']}/topic_selected.gif";
+var lang_gobutton    = "{ipb.lang['f_go']}";
+var lang_suredelete  = "{ipb.lang['cp_js_delete']}";
+//-->
+</script>
+<script type="text/javascript" src="jscripts/ipb_forum.js"></script>   
+<!--IBF.SUBFORUMS-->
+<table cellspacing="0">
+	<tr>
+		<td style='padding-left:0px' width="60%">{$data['SHOW_PAGES']}</td>
+		<td class='nopad' style='padding:0px 0px 5px 0px' align="right" nowrap="nowrap"><a href="{ipb.script_url}act=Post&amp;CODE=00&amp;f={$data['id']}"><{A_POST}></a>{$data[POLL_BUTTON]}</td>
+	</tr>
+</table>
+<div class="borderwrap">
+	<div class="maintitle">
+	<p class="expand"><a href="{ipb.script_url}act=Login&amp;CODE=04&amp;f={$data['id']}">{ipb.lang['mark_as_read']}</a> &middot; <a href="{ipb.script_url}act=Track&amp;f={$data['id']}&amp;type=forum">{ipb.lang['ft_title']}</a>
+	</p>
+	<p><{CAT_IMG}>&nbsp;{$data['name']}</p>
+</div>
+<table cellspacing="1">
+	<tr> 
+		<th align="center">&nbsp;</th>
+		<th align="center">&nbsp;</th>
+		<th width="50%" nowrap="nowrap">{ipb.lang['h_topic_title']}</th>
+		<th width="7%" align="center" nowrap="nowrap">{ipb.lang['h_replies']}</th>
+		<th width="14%" align="center" nowrap="nowrap">{ipb.lang['h_topic_starter']}</th>
+		<th width="7%" align="center" nowrap="nowrap">{ipb.lang['h_hits']}</th>
+		<th width="22%" nowrap="nowrap">{ipb.lang['h_last_action']}</th>
+<if="ipb.member['is_mod']">
+<th width="1%" align="center">&nbsp;</th>
+</if>
+
+	</tr>
+	<!-- Forum page unique top -->
+	<!--IBF.ANNOUNCEMENTS-->]]></section_content>
+			<func_name>PageTop</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<span class="minipagelinklast"><a href="{ipb.script_url}showtopic={$tid}&amp;st=$st">&raquo; $page</a></span>]]></section_content>
+			<func_name>pagination_show_lastpage</func_name>
+			<func_data><![CDATA[$tid="",$st="",$page=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<span class="minipagelink"><a href="{ipb.script_url}showtopic={$tid}&amp;st=$st">$page</a></span>]]></section_content>
+			<func_name>pagination_show_page</func_name>
+			<func_data><![CDATA[$tid="",$st="",$page=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[&nbsp;<a href="javascript:multi_page_jump('{ipb.script_url}showtopic={$tid}', $posts, $perpage );" title="multipage jump"><img src='{ipb.vars['img_url']}/pages_icon.gif' alt='*' border='0' /></a> $pages]]></section_content>
+			<func_name>pagination_wrap_pages</func_name>
+			<func_data><![CDATA[$tid="",$pages="",$posts="",$perpage=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!-- Begin Topic Entry {$data['tid']} -->
+<tr> 
+	<td align="center" class="$class2">{$data['folder_img']}</td>
+	<td align="center" class="$class2">{$data['topic_icon']}</td>
+	<td class="$class2" valign="middle">
+		<div>
+			{$data['go_new_post']}{$data['prefix']} {$data['attach_img']}<a href="{ipb.script_url}showtopic={$data['tid']}" title="{ipb.lang['topic_started_on']} {$data['start_date']}">{$data['title']}</a> {$data[PAGES]}
+			<div class="desc">{$data['description']}</div>
+		</div>
+	</td>
+	<td align='center' class="$classposts">
+     {$data['posts']}
+<if="data['_hasqueued'] and inforum == 1">
+&nbsp;<a href="{ipb.script_url}showtopic={$data['tid']}&amp;modfilter=invisible_posts"><{BC_QUEUED_POSTS}></a>
+</if>
+
+    </td>
+	<td align="center" class="$class1">{$data['starter']}</td>
+	<td align="center" class="$class1">{$data['views']}</td>
+	<td class="$class1"><span class="lastaction">{$data['last_post']}<br /><a href="{ipb.script_url}showtopic={$data['tid']}&amp;view=getlastpost">{$data['last_text']}</a> <b>{$data['last_poster']}</b></span></td>
+<if="ipb.member['is_mod'] and inforum == 1 and data['tidon'] == 1">
+<td align="center" class="$class1"><a href="#" title="{ipb.lang['click_for_mod']}" onclick="forum_toggle_tid('{$data['real_tid']}'); return false;"><img name="img{$data['real_tid']}" src="{ipb.vars['img_url']}/topic_selected.gif" /></a></td>
+</if>
+<if="ipb.member['is_mod'] and inforum == 1 and data['tidon'] == 0">
+<td align="center" class="$class1"><a href="#" title="{ipb.lang['click_for_mod']}" onclick="forum_toggle_tid('{$data['real_tid']}'); return false;"><img name="img{$data['real_tid']}" src="{ipb.vars['img_url']}/topic_unselected.gif" /></a></td>
+</if>
+
+</tr>
+    <!-- End Topic Entry {$data['tid']} -->]]></section_content>
+			<func_name>render_forum_row</func_name>
+			<func_data><![CDATA[$data="",$class1='row2',$class2='row1',$classposts='row2',$inforum=0]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!-- END PINNED -->
+<tr>
+   <td class="darkrow1" colspan="8"><b>{ipb.lang['regular_topics']}</b></td>
+</tr>]]></section_content>
+			<func_name>render_pinned_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!--PINNED-->
+<if="show == 1">
+<tr>
+	<td class="darkrow1" colspan="8"><b>{ipb.lang['pinned_start']}</b></td>
+</tr>
+</if>
+
+    <!-- END PINNED -->]]></section_content>
+			<func_name>render_pinned_start</func_name>
+			<func_data>$show=0</func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<tr> 
+	<td class="row2" colspan="8" align="center">
+		<br />
+		<b>{ipb.lang['no_topics']}</b>
+		<br /><br />
+	</td>
+</tr>]]></section_content>
+			<func_name>show_no_matches</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<a href="javascript:multi_page_jump( $total, $pp, '$qe' )" title="{ipb.lang['tpl_jump']}">{ipb.lang['multi_page_forum']}</a>]]></section_content>
+			<func_name>show_page_jump</func_name>
+			<func_data><![CDATA[$total="",$pp="",$qe=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<h3><{CAT_IMG}>&nbsp;{$rules['title']}, <a href="{ipb.script_url}act=SF&amp;f={$rules['fid']}">{ipb.lang['back_to_forum']}</a></h3>
+	<p>{$rules['body']}</p>
+</div>]]></section_content>
+			<func_name>show_rules</func_name>
+			<func_data><![CDATA[$rules=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<tr>
+			<td colspan="8" class="darkrow1">
+				<table cellspacing="0">
+					<tr>
+						<td width="50%" class="nopad">
+							<form action="{ipb.script_url}" method="post" name="search">
+								<input type="hidden" name="forums" value="{$data['id']}" />
+								<input type="hidden" name="cat_forum" value="forum" />
+								<input type="hidden" name="act" value="Search" />
+								<input type="hidden" name="joinname" value="1" />
+								<input type="hidden" name="CODE" value="01" />
+								<input type="text" size="30" name="keywords" value="{ipb.lang['enter_keywords']}" onfocus="this.value = '';" /> <input type="submit" value="{ipb.lang['search_forum']}" class="button" />
+							</form>
+						</td>
+<if="ipb.member['is_mod']">
+<td width="50%" align="right" nowrap="nowrap" class="nopad">
+							<form name="modform" method="post" action="{ipb.script_url}act=mod&CODE=topicchoice&f={$data['id']}" onsubmit="return checkdelete();">
+								<input type="hidden" name="act" value="mod" />
+								<input type="hidden" name="auth_key" value="{$auth_key}" />
+								<input type="hidden" name="modfilter" value="{ipb.input['modfilter']}" />
+								<input type="hidden" value="{ipb.input['selectedtids']}" name="selectedtids"" />
+								<select name="tact">
+									<option value="close">{ipb.lang['cpt_close']}</option>
+									<option value="open">{ipb.lang['cpt_open']}</option>
+									<option value="pin">{ipb.lang['cpt_pin']}</option>
+									<option value="unpin">{ipb.lang['cpt_unpin']}</option>
+									<option value="move">{ipb.lang['cpt_move']}</option>
+									<option value="merge">{ipb.lang['cpt_merge']}</option>
+									<option value="delete">{ipb.lang['cpt_delete']}</option>
+									<option value="approve">{ipb.lang['cpt_approve']}</option>
+									<option value="unapprove">{ipb.lang['cpt_unapprove']}</option>
+									<!--IBF.MMOD-->
+								</select>&nbsp;
+								<input type="submit" name="gobutton" value="{ipb.lang['f_go']}" class="button" />
+							</form>
+						</td>
+</if>
+
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr> 
+			<td class="catend" colspan="8"><!-- no content --></td>
+		</tr>
+	</table>
+</div>
+<table cellspacing="0">
+	<tr>
+		<td style='padding-left:0px' width="50%" nowrap="nowrap">{$data['SHOW_PAGES']}</td>
+		<td class='nopad' style='padding:5px 0px 5px 0px' align="right" width="50%"><a href="{ipb.script_url}act=Post&amp;CODE=00&amp;f={$data['id']}"><{A_POST}></a>{$data[POLL_BUTTON]}</td>
+	</tr>
+</table>
+<!--IBF.FORUM_ACTIVE-->
+<div class="activeusers">
+	<div class="row2">
+		<table cellspacing="0">
+			<tr>
+				<td width="5%" nowrap="nowrap">
+					<{B_NEW}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_open_new']}</span>
+					<br /><{B_NORM}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_open_no']}</span>
+					<br /><{B_HOT}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_hot_new']}</span>
+					<br /><{B_HOT_NN}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_hot_no']}</span>&nbsp;
+				</td>
+				<td width="5%" nowrap="nowrap">
+					<{B_POLL}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_poll']}</span>
+					<br /><{B_POLL_NN}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_poll_no']}</span>
+					<br /><{B_LOCKED}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_locked']}</span>
+					<br /><{B_MOVED}>&nbsp;&nbsp;<span class="desc">{ipb.lang['pm_moved']}</span>
+				</td>
+				<td align="right" width="90%">
+					{$data[FORUM_JUMP]}<br /><br />
+					<form action="{ipb.script_url}act=SF&amp;f={$data['id']}&amp;st={ipb.input['st']}" method="post">
+						<select name="sort_key">{$ibforums->show['sort_by']}</select>
+						<select name="sort_by">{$ibforums->show['sort_order']}</select>
+						<select name="prune_day">{$ibforums->show['sort_prune']}</select>
+						<select name="topicfilter">{$ibforums->show['topic_filter']}</select>
+						<input type="submit" value="{ipb.lang['sort_submit']}" class="button" />
+					</form>
+				</td>
+			</tr>
+		</table>
+	</div>
+</div>
+<if="ipb.member['is_mod']">
+<br />
+<div align="center">
+	<a href="{ipb.script_url}showforum={$data['id']}&amp;modfilter=invisible_topics">{ipb.lang['mod_showallinvisible']}</a>
+	&middot;
+	<a href="{ipb.script_url}showforum={$data['id']}&amp;modfilter=invisible_posts">{ipb.lang['mod_showallposts']}</a>
+	&middot;
+	<a href="{ipb.script_url}act=mod&amp;CODE=resync&amp;f={$data['id']}&amp;auth_key={$auth_key}">{ipb.lang['mod_resync']}</a>
+	&middot;
+	<a href="javascript:PopUp('{ipb.script_url}act=mod&amp;CODE=prune_start&amp;f={$data['id']}&amp;auth_key={$auth_key}', 'PRUNE', 600,500)">{ipb.lang['mod_prune']}</a>
+</div>
+</if>
+
+<br clear="all" />]]></section_content>
+			<func_name>TableEnd</func_name>
+			<func_data><![CDATA[$data="",$auth_key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!-- end multimod -->]]></section_content>
+			<func_name>mm_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<option value="t_{$id}">--  $title</option>]]></section_content>
+			<func_name>mm_entry</func_name>
+			<func_data><![CDATA[$id="",$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<option value="-1">------------------------------</option>
+<option value="-1">{ipb.lang['mm_title']}</option>
+<option value="-1">------------------------------</option>]]></section_content>
+			<func_name>mm_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!-- Begin Pinned Topic Entry {$data['tid']} -->
+<tr> 
+	<td align="center" class="row2">{$data['folder_img']}</td>
+	<td align="center" class="row2">{$data['topic_icon']}</td>
+	<td class="row2">
+	<div>
+		{$data['go_new_post']}{$data['prefix']} {$data['attach_img']}<a href="{ipb.script_url}showtopic={$data['tid']}" title="{ipb.lang['topic_started_on']} {$data['start_date']}">{$data['title']}</a> {$data[PAGES]}
+		<div class="desc">{$data['description']}</div>
+	</div>
+	<td align="center" class="row2">{$data['posts']}</td>
+	<td align="center" class="row2">{$data['starter']}</td>
+	<td align="center" class="row2">{$data['views']}</td>
+	<td class="row2"><span class="desc">{$data['last_post']}<br /><a href="{ipb.script_url}showtopic={$data['tid']}&amp;view=getlastpost">{$data['last_text']}</a> <b>{$data['last_poster']}</b></span></td>
+</tr>
+<!-- End Pinned Topic Entry {$data['tid']} -->]]></section_content>
+			<func_name>OLD_render_pinned_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</table>
+</div>
+<div class="borderwrapm">
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['s_continue_button']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>sub_choose_new_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row3" align="center"><input type="radio" name="sub" value="$id" /></td>
+			<td class="row3"><b>$name</b><br /><i>$desc</i></td>
+			<td class="row3" align="center">$duration</td>
+			<td class="row3" align="center">{$cost}</td>
+		</tr>]]></section_content>
+			<func_name>sub_choose_new_row</func_name>
+			<func_data><![CDATA[$id="",$name="",$desc="",$cost="",$duration=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['s_available_subs']}</div>
+<p>{ipb.lang['s_explain']}</p>
+<br />
+<form action="{ipb.script_url}act=module&amp;module=subscription&amp;nocp={ipb.input['nocp']}&amp;CODE=paymentmethod&amp;currency=$currency" method="post">             
+	<div class="borderwrapm">
+		<table cellspacing="1">
+			<tr>
+				<th width="5%">&nbsp;</th>
+				<th width="55%">{ipb.lang['s_detail']}</th>
+				<th width="20%" align="center">{ipb.lang['s_duration']}</th>
+				<th width="20%" align="center">{ipb.lang['s_cost']}</th>
+			</tr>]]></section_content>
+			<func_name>sub_choose_new_top</func_name>
+			<func_data><![CDATA[$currency=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_paypal']}</b>
+</p>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick" />
+<input type="hidden" name="business" value="$paypal_email" />
+<input type="hidden" name="amount" value="$to_pay" />
+<input type="hidden" name="item_name" value="$sub_title" />
+<input type="hidden" name="item_number" value="$new_sub_id" />
+<input type="hidden" name="no_shipping" value="1" />
+<input type="hidden" name="invoice" value="{$cur_tran_id}x{$new_sub_id}x{$member_id}" />
+<input type="hidden" name="custom" value="$member_id" />
+<input type="hidden" name="memo" value="upgrade" />
+<input type="hidden" name="notify_url" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=paypal" />
+<input type="hidden" name="currency_code" value="$ccode" />
+<input type="hidden" name="return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+<input type="hidden" name="cancel_return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+	<br /><br />
+	<div>
+		<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" name="submit" alt="Make payments with PayPal - it"s fast, free and secure!" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_paypal_upgrade_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$paypal_email="",$sub_title="",$cur_tran_id="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</table>
+</div>
+<br />]]></section_content>
+			<func_name>sub_choose_dead_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row3" align="center">$id</td>
+			<td class="row3"><b>$name</b></td>
+			<td class="row3" align="center">$start</td>
+			<td class="row3" align="center">$end</td>
+			<td class="row3" align="center">{$paid}</td>
+			<td class="row3" align="center">$state</td>
+		</tr>]]></section_content>
+			<func_name>sub_choose_dead_row</func_name>
+			<func_data><![CDATA[$id="",$name="",$start="",$end="",$paid="",$state=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['s_current_subs']}</div>
+<p>{ipb.lang['s_current_explain']}</p>             
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%" align="center">{ipb.lang['s_transid']}</th>
+			<th width="35%">{ipb.lang['s_detail']}</th>
+			<th width="20%" align="center">{ipb.lang['s_started']}</th>
+			<th width="20%" align="center">{ipb.lang['s_end']}</th>
+			<th width="10%" align="center">{ipb.lang['s_paid']}</th>
+			<th width="10%" align="center">{ipb.lang['s_status']}</th>
+		</tr>]]></section_content>
+			<func_name>sub_choose_current_top</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['s_dead_subs']}</div>
+<p>{ipb.lang['s_dead_explain']}</p>             
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%" align="center">{ipb.lang['s_transid']}</th>
+			<th width="35%">{ipb.lang['s_detail']}</th>
+			<th width="20%" align="center">{ipb.lang['s_started']}</th>
+			<th width="20%" align="center">{ipb.lang['s_end']}</th>
+			<th width="10%" align="center">{ipb.lang['s_paid']}</th>
+			<th width="10%" align="center">{ipb.lang['s_status']}</th>
+		</tr>]]></section_content>
+			<func_name>sub_choose_dead_top</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[</table>
+</div>]]></section_content>
+			<func_name>sub_choose_current_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row3" align="center">$id</td>
+			<td class="row3"><b>$name</b></td>
+			<td class="row3" align="center">$start</td>
+			<td class="row3" align="center">$end</td>
+			<td class="row3" align="center">{$paid}</td>
+			<td class="row3" align="center">$state</td>
+		</tr>]]></section_content>
+			<func_name>sub_choose_current_row</func_name>
+			<func_data><![CDATA[$id="",$name="",$start="",$end="",$paid="",$state=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_protx']}</b>
+</p>
+<!--<form action="https://ukvpstest.protx.com/vps2form/submit.asp" method="post">-->
+<form action="https://ukvps.protx.com/vps2form/submit.asp" method="post">
+<input type="hidden" name="VPSProtocol" value="2.21" />
+<input type="hidden" name="TxType" value="PAYMENT" />
+<input type="hidden" name="Vendor" value="$protx_user" />
+<input type="hidden" name="Crypt" value="$crypt" />
+	<br /><br />
+	<div>
+		<input type="submit" value="Pay Using Protx" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_protx_normal_screen</func_name>
+			<func_data><![CDATA[$crypt="",$protx_user="",$sub_title="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_protx']}</b>
+</p>
+<!--<form action="https://ukvpstest.protx.com/vps2form/submit.asp" method="post">-->
+<form action="https://ukvps.protx.com/vps2form/submit.asp" method="post">
+<input type="hidden" name="VPSProtocol" value="2.21" />
+<input type="hidden" name="TxType" value="PAYMENT" />
+<input type="hidden" name="Vendor" value="$protx_user" />
+<input type="hidden" name="Crypt" value="$crypt" />
+	<br /><br />
+	<div>
+		<input type="submit" value="Pay Using Protx" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_protx_upgrade_screen</func_name>
+			<func_data><![CDATA[$crypt="",$protx_user="",$sub_title="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_safshop']}</b>
+</p>
+<form method="POST" action="https://order.safshop.net/servicepayment.cgi">
+<input type="hidden" name="vendorid" value="$vendor_id" />
+<input type="hidden" name="productid" value="$product_id" />
+<input type="hidden" name="buttonid" value="Buy" />
+<input type="hidden" name="item1" value="$to_pay" />
+<input type="hidden" name="myurl" value="{ipb.script_url}" />
+<input type="hidden" name="act" value="module" />
+<input type="hidden" name="module" value="subscription" />
+<input type="hidden" name="CODE" value="incoming" />
+<input type="hidden" name="type" value="safshop" />
+<input type="hidden" name="ordernumber" value="{$member_id}x{$new_sub_id}" />
+	<br /><br />
+	<div>
+		<input type="submit" name="b1" value="Purchase" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_safshop_normal_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$nochex_email="",$sub_title="",$desc_string="",$vendor_id="",$product_id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<h2>{ipb.lang['man_title']}</h2>
+<table cellspacing="1" class="ticket">
+	<tr>
+		<td>
+			<table cellspacing="1">
+				<tr>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.lang['man_mem']}</td>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.member['name']}</td>
+				</tr>
+				<tr>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.lang['man_mem_id']}</td>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.member['id']}</td>
+				</tr>
+				<tr>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.lang['man_email']}</td>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.member['email']}</td>
+				</tr>
+				<tr>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.lang['man_trans_id']}</td>
+					<td width="50%" bgcolor="#FFFFFF">{$id}</td>
+				</tr>
+				<tr>
+					<td width="50%" bgcolor="#FFFFFF">{ipb.lang['man_sub']}</td>
+					<td width="50%" bgcolor="#FFFFFF">{$sub['sub_title']} $extra</td>
+				</tr>
+				<tr>
+					<td width="50%" bgcolor="#FFFFFFF">{ipb.lang['man_pay']}</td>
+					<td width="50%" bgcolor="#FFFFFF">{$paid}</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>show_ticket</func_name>
+			<func_data><![CDATA[$sub="",$id="",$paid="",$extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+			<td colspan="5" align="center" class="row1" valign="middle">{ipb.lang['no_info']}</td>
+		</tr>]]></section_content>
+			<func_name>top_poster_no_info</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" valign="middle"><a href="{ipb.script_url}showuser={$info['id']}">{$info['name']}</a></td>
+			<td align="center" class="row1" valign="middle">{$info['joined']}</td>
+			<td align="center" class="row1" valign="middle">{$info['posts']}</td>
+			<td align="center" class="row1" valign="middle">{$info['tpost']}</td>
+			<td align="center" class="row1" valign="middle">{$info['today_pct']}%</td>
+		</tr>]]></section_content>
+			<func_name>top_poster_row</func_name>
+			<func_data><![CDATA[$info=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}showuser=$id" target="_blank">$name</a>]]></section_content>
+			<func_name>who_name_link</func_name>
+			<func_data><![CDATA[$id="",$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formbuttonrow" colspan="2"><a href="javascript:bog_off();">{ipb.lang['who_go']}</a></td>
+		</tr>
+			<tr>
+		<td class="catend" colspan="2"><!-- no content --></td>
+	</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>who_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="catend" colspan="5"><!-- no content --></td>
+	</tr>
+</table>
+</div>]]></section_content>
+			<func_name>top_poster_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['todays_posters']}</div>
+	<table cellspacing="1">
+		<tr>
+			<th width="30%" valign="middle">{ipb.lang['member']}</th>
+			<th width="20%" align="center" valign="middle">{ipb.lang['member_joined']}</th>
+			<th align="center" width="15%" valign="middle">{ipb.lang['member_posts']}</th>
+			<th align="center" width="15%" valign="middle">{ipb.lang['member_today']}</th>
+			<th align="center" width="20%" valign="middle">{ipb.lang['member_percent']}</th>
+		</tr>]]></section_content>
+			<func_name>top_poster_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[</select>
+</form>]]></section_content>
+			<func_name>leader_row_forum_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<option value="$id">$name</option>\
+]]></section_content>
+			<func_name>leader_row_forum_entry</func_name>
+			<func_data><![CDATA[$id="",$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<div>{$data[SHOW_PAGES]}</div>]]></section_content>
+			<func_name>start_as_post</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<script type="text/javascript" src="jscripts/ipb_forum.js"></script>
+<div>{$data[SHOW_PAGES]}</div>
+<br />
+<div class="borderwrap">
+	<div class="maintitle">
+		<div style="float: left;"><{CAT_IMG}>&nbsp;{ipb.lang['your_results']}</div>
+		<div align="right"><a href="{ipb.script_url}act=Login&amp;CODE=05">{ipb.lang['mark_search_as_read']}</a></div>
+	</div>
+	<table cellspacing="1">
+		<tr>
+			<th colspan="2">&nbsp;</th>
+			<th>{ipb.lang['h_topic_title']}</th>
+			<th align="center">{ipb.lang['h_forum_name']}</th>
+			<th align="center">{ipb.lang['h_topic_starter']}</th>
+			<th align="center">{ipb.lang['h_replies']}</th>
+			<th align="center">{ipb.lang['h_hits']}</th>
+			<th>{ipb.lang['h_last_action']}</th>
+		</tr>]]></section_content>
+			<func_name>start</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['search_results']}</div>
+	<table cellspacing="1">
+		<tr>
+			<th><b>{ipb.lang['you_search_for']}</b> {$keywords}</th>
+		</tr>
+		<tr>
+			<td class="row1">{ipb.lang['no_results_so_there_ha_ha']}<br /><br /><b><a href="{ipb.script_url}act=search">{ipb.lang['search_again']}</a></b></td>
+		</tr>
+		<tr>
+			<td class="catend"><!-- no content --></td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>search_error_page</func_name>
+			<func_data><![CDATA[$keywords=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+function go_gadget_advanced(){
+	window.location = "{$ibforums->js_base_url}act=Search&mode=adv&f={ipb.input['f']}";
+}
+function win_pop(){
+	window.open("{$ibforums->js_base_url}act=Search&CODE=explain","WIN","width=400,height=300,resizable=yes,scrollbars=yes"); 
+}
+-->
+</script>
+<form action="{ipb.script_url}act=Search&amp;CODE=simpleresults&amp;mode=simple" method="post" name="sForm">
+$hidden_fields
+	<div class="borderwrap">
+		<div class="maintitle"  align="center">{ipb.lang['search_options']}</div>
+		<div class="formsubtitle" align="center">{ipb.lang['key_search']}</div>
+		<div class="tablepad" align="center">
+			<input type="text" maxlength="100" size="40" id="keywords" name="keywords" /><br />
+			<label for="keywords">{ipb.lang['keysearch_text']}</label> <!--IBF.BOOLEAN_EXPLAIN-->
+		</div>
+		<div class="formsubtitle" align="center">{ipb.lang['search_where']}</div>
+		<div class="tablepad" align="center">
+			{$forums}<br /><br />
+			<b>{ipb.lang['sf_show_me']}</b>
+			<input type="radio" name="sortby" value="relevant" id="sortby_one" class="radiobutton" />
+			<label for="sortby_one">{ipb.lang['sf_most_r_f']}</label>&nbsp;
+			<input type="radio" name="sortby" value="date" id="sortby_two" checked="checked" class="radiobutton" />
+			<label for="sortby_two">{ipb.lang['sf_most_date']}</label>
+		</div>
+		<div class="formsubtitle" align="center">
+			<input type="submit" value="{ipb.lang['do_search']}" />&nbsp;
+			<input type="button" value="{ipb.lang['so_more_opts']}" onclick="go_gadget_advanced()" />
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>simple_form</func_name>
+			<func_data><![CDATA[$forums=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[&#091; <a href="#" title="{ipb.lang['be_ttip']}" onclick="win_pop()">{ipb.lang['be_link']}</a> &#093;]]></section_content>
+			<func_name>boolean_explain_link</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['be_link']}</div>
+	<table cellspacing="1">
+		<tr>
+			<th width="30%" class="formsubtitle">{ipb.lang['be_use']}</th>
+			<th width="70%" class="formsubtitle">{ipb.lang['be_means']}</th>
+		</tr>
+		<tr>
+			<td class="pformleft">{ipb.lang['be_u1']}</td>
+			<td class="pformleft">{ipb.lang['be_m1']}</td>
+		</tr>
+		<tr>
+			<td class="pformleft">{ipb.lang['be_u2']}</td>
+			<td class="pformleft">{ipb.lang['be_m2']}</td>
+		</tr>
+		<tr>
+			<td class="pformleft">{ipb.lang['be_u3']}</td>
+			<td class="pformleft">{ipb.lang['be_m3']}</td>
+		</tr>
+		<tr>
+			<td class="pformleft">{ipb.lang['be_u4']}</td>
+			<td class="pformleft">{ipb.lang['be_m4']}</td>
+		</tr>
+		<tr>
+			<td class="pformleft">{ipb.lang['be_u5']}</td>
+			<td class="pformleft">{ipb.lang['be_m5']}</td>
+		</tr>
+		<tr>
+			<td class="catend" colspan="2"><!-- no content --></td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>boolean_explain_page</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<!-- END RESULTS TABLE -->
+<if="as_post != 1">
+<tr>
+	<td class="formbuttonrow" colspan="8" style="text-align: right;">
+	<form action="{ipb.script_url}act=search&CODE=getnew&active=1" method="post">
+		{ipb.lang['active_start']}&nbsp;
+		<select class="dropdown" name="lastdate">
+			<option value="86400">{ipb.lang['active_today']}</option>
+			<option value="604800">{ipb.lang['active_week']}</option>
+			<option value="1209600">{ipb.lang['active_week2']}</option>
+			<option value="2419200">{ipb.lang['active_month']}</option>
+			<option value="7257600">{ipb.lang['active_month3']}</option>
+			<option value="31449600">{ipb.lang['active_year']}</option>
+		</select>
+		<input type="submit" value="{ipb.lang['active_go']}" class="button" /></form></td>
+</tr><tr>
+	<td class="catend" colspan="8"><!-- no content --></td>
+</tr>
+</table>
+</div>
+</if>
+
+<br />
+<div>{$data[SHOW_PAGES]}</div>
+<div class="borderwrap">
+	<table cellspacing="0">
+		<tr>
+			<td width="5%" class="row2" nowrap="nowrap"><{B_NEW}>&nbsp;&nbsp;{ipb.lang['pm_open_new']}<br /><{B_NORM}>&nbsp;&nbsp;{ipb.lang['pm_open_no']}<br /><{B_HOT}>&nbsp;&nbsp;{ipb.lang['pm_hot_new']}<br /><{B_HOT_NN}>&nbsp;&nbsp;{ipb.lang['pm_hot_no']}</td>
+			<td width="5%" class="row2" nowrap="nowrap"><{B_POLL}>&nbsp;&nbsp;{ipb.lang['pm_poll']}<br /><{B_POLL_NN}>&nbsp;&nbsp;{ipb.lang['pm_poll_no']}<br /><{B_LOCKED}>&nbsp;&nbsp;{ipb.lang['pm_locked']}<br /><{B_MOVED}>&nbsp;&nbsp;{ipb.lang['pm_moved']}</td>
+			<td align="right" width="90%" class="row2">{$ibforums->forum_jump}</td>
+		</tr>
+	</table>
+</div>
+<br />]]></section_content>
+			<func_name>end_results_table</func_name>
+			<func_data><![CDATA[$data="",$as_post=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_paypal']}</b>
+</p>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick" />
+<input type="hidden" name="business" value="$paypal_email" />
+<input type="hidden" name="amount" value="$to_pay" />
+<input type="hidden" name="item_name" value="$sub_title" />
+<input type="hidden" name="item_number" value="$new_sub_id" />
+<input type="hidden" name="no_shipping" value="1" />
+<input type="hidden" name="custom" value="$member_id" />
+<input type="hidden" name="notify_url" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=paypal" />
+<input type="hidden" name="currency_code" value="$ccode" />
+<input type="hidden" name="return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+<input type="hidden" name="cancel_return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+	<br /><br />
+	<div>
+		<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" name="submit" alt="Make payments with PayPal - it"s fast, free and secure!" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_paypal_normal_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$paypal_email="",$sub_title="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br /><b>{ipb.lang['gw_authorize']}</b>
+</p>
+<form method="POST" action="https://secure.authorize.net/gateway/transact.dll">
+	<input type="hidden" name="x_login" value="$vendor_id" />
+	<input type="hidden" name="x_relay_response" value="TRUE" />
+	<input type="hidden" name="x_relay_url" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=authorizenet" />
+	<input type="hidden" name="x_amount" value="$to_pay" />
+	<input type="hidden" name="x_currency_code" value="$ccode" />
+	<input type="hidden" name="x_fp_hash" value="$fp_hash" />
+	<input type="hidden" name="x_fp_timestamp" value="$fp_time" />
+	<input type="hidden" name="x_fp_sequence" value="$fp_seq" />
+	<input type="hidden" name="x_show_form" value="PAYMENT_FORM" />
+	<input type="hidden" name="x_description" value="$sub_title" />
+	<input type="hidden" name="x_cust_id" value="{$member_id}x{$new_sub_id}" />
+	<input type="hidden" name="x_test_request" value="false" /><br /><br />
+	<div>
+		<input type="submit" name="b1" value="Continue..." />
+	</div>
+</form>]]></section_content>
+			<func_name>do_authorizenet_normal_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$sub_title="",$desc_string="",$vendor_id="",$fp_hash="",$fp_seq="",$fp_time=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<div class="plainborder">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['search_results']}</div>
+	<div class="formsubtitle">
+		<div class="pagelinks">{ipb.lang['g_searched_for']} <b>{$data['keyword']}</b></div>
+		<div align="right">
+			{ipb.lang['g_results']} <b>{$data['start']} - {$data['end']}</b> {ipb.lang['g_of_about']} <b>{$data['matches']}</b>.
+			{ipb.lang['g_search_took']} <b>{$data['ex_time']}</b> {ipb.lang['g_seconds']}
+		</div>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>result_simple_header</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+	function go_gadget_simple(){
+		window.location = "{$ibforums->js_base_url}act=Search&mode=simple&f={ipb.input['f']}";
+	}
+	
+	function win_pop(){
+		window.open("{$ibforums->js_base_url}act=Search&CODE=explain","WIN","width=400,height=300,resizable=yes,scrollbars=yes"); 
+	}
+-->
+</script>
+<form action="{ipb.script_url}act=Search&amp;CODE=01" method="post" name="sForm">
+$hidden_fields
+<div class="borderwrap">
+	<table cellspacing="0">
+		<tr>
+			<td colspan="2" class="maintitle"  align="center">{ipb.lang['keywords_title']}</td>
+		</tr>
+		<tr>
+			<td class="formsubtitle" width="50%">{ipb.lang['key_search']}</td>
+			<td class="formsubtitle" width="50%">{ipb.lang['mem_search']}</td>
+		</tr>
+		<tr>
+			<td class="row1" valign="top">
+				<input type="text" maxlength="100" size="40" name="keywords" id="keywords" />
+				<br /><br />
+				<label for="keywords">{ipb.lang['keysearch_text']}</label> <!--IBF.BOOLEAN_EXPLAIN-->
+			</td>
+			<td class="row1" valign="top">
+				<table cellspacing="0">
+					<tr>
+						<td><input type="text" maxlength="100" size="50" name="namesearch" /></td>
+					</tr>
+					<tr>
+						<td width="40%"><input type="checkbox" name="exactname" id="matchexact" value="1" class="checkbox" /><label for="matchexact">{ipb.lang['match_name_ex']}</label></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+<br />
+<div class="borderwrap">
+	<table cellspacing="0">         
+		<tr>
+			<td colspan="2" class="maintitle"  align="center">{ipb.lang['search_options']}</td>
+		</tr>
+		<tr>
+			<td class="formsubtitle" width="50%" valign="middle">{ipb.lang['search_where']}</td>
+			<td class="formsubtitle" width="50%" valign="middle">{ipb.lang['search_refine']}</td>
+		</tr>
+		<tr>
+			<td class="row1" valign="middle">
+				$forums
+				<br />
+				<input type="checkbox" name="searchsubs" value="1" id="searchsubs" checked="checked" />&nbsp;<label for="searchsubs">{ipb.lang['search_in_subs']}</label>
+			</td>
+			<td class="row1" valign="top">
+				<table cellspacing="1">
+					<tr>
+						<td valign="top">
+							<fieldset class="search">
+							<legend><b>{ipb.lang['search_from']}</b></legend>
+								<select name="prune">
+									<option value="1">{ipb.lang['today']}</option>
+									<option value="7">{ipb.lang['this_week']}</option>
+									<option value="30">{ipb.lang['this_month']}</option>
+									<option value="60">{ipb.lang['this_60']}</option>
+									<option value="90">{ipb.lang['this_90']}</option>
+									<option value="180">{ipb.lang['this_180']}</option>
+									<option value="365">{ipb.lang['this_year']}</option>
+									<option value="0" selected="selected">{ipb.lang['ever']}</option>
+								</select><br />
+								<input type="radio" name="prune_type" id="prune_older" value="older" class="radiobutton" />&nbsp;<label for="prune_older">{ipb.lang['older']}</label><br />
+								<input type="radio" name="prune_type" id="prune_newer" value="newer" class="radiobutton" checked="checked" />&nbsp;<label for="prune_newer">{ipb.lang['newer']}</label>
+							</fieldset>
+						</td>
+						<td valign="top">
+							<fieldset class="search">
+								<legend><b>{ipb.lang['sort_results']}</b></legend>
+									<select name="sort_key">
+										<option value="last_post">{ipb.lang['last_date']}</option>
+										<option value="posts">{ipb.lang['number_topics']}</option>
+										<option value="starter_name">{ipb.lang['poster_name']}</option>
+										<option value="forum_id">{ipb.lang['forum_name']}</option>
+									</select><br />
+									<input type="radio" name="sort_order" id="sort_desc" class="radiobutton" value="desc" checked="checked" /><label for="sort_desc">{ipb.lang['descending']}</label><br />
+									<input type="radio" name="sort_order" id="sort_asc" class="radiobutton" value="asc" /><label for="sort_asc">{ipb.lang['ascending']}</label>
+								</fieldset>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap">
+								<fieldset class="search">
+								<legend><b>{ipb.lang['search_where']}</b></legend>
+									<input type="radio" name="search_in" class="radiobutton" id="search_in_posts" value="posts" checked="checked" /><label for="search_in_posts">{ipb.lang['in_posts']}</label><br />
+									<input type="radio" name="search_in" class="radiobutton" id="search_in_titles" value="titles" /><label for="search_in_titles">{ipb.lang['in_topics']}</label>
+								</fieldset>
+							</td>
+							<td>
+								<fieldset class="search">
+								<legend><b>{ipb.lang['result_type']}</b></legend>
+									<input type="radio" name="result_type" class="radiobutton" value="topics" id="result_topics" checked="checked" /><label for="result_topics">{ipb.lang['results_topics']}</label><br />
+									<input type="radio" name="result_type" class="radiobutton" value="posts" id="result_posts" /><label for="result_posts">{ipb.lang['results_post']}</label>
+								</fieldset>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td class="formsubtitle" colspan="2" align="center"><input type="submit" value="{ipb.lang['do_search']}" /><!--IBF.SIMPLE_BUTTON--></td>
+			</tr>
+		</table>
+	</div>
+</form>]]></section_content>
+			<func_name>Form</func_name>
+			<func_data><![CDATA[$forums=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<!-- Begin Topic Entry {$data['tid']} -->
+	<tr>
+		<td align="center" class="row2">{$data['folder_img']}</td>
+		<td align="center" width="3%" class="row1">{$data['topic_icon']}</td>
+		<td class="row2">
+			<table cellspacing="0">
+				<tr>
+<if="data['go_new_post'] != ''">
+<td valign="middle">{$data['go_new_post']}</td>
+</if>
+
+					<td width="100%">{$data['prefix']} <a href="{ipb.script_url}showtopic={$data['tid']}&amp;hl={$data['keywords']}">{$data['title']}</a>  {$data[PAGES]}</td>
+				</tr>
+			</table>
+			<span class="desc">{$data['description']}</span>
+		</td>
+		<td class="row2" width="15%"><span class="forumdesc"><a href="{ipb.script_url}showforum={$data['forum_id']}" title="{$data['forum_full_name']}">{$data['forum_name']}</a></span></td>
+		<td align="center" class="row1">{$data['starter']}</td>
+		<td align="center" class="row2">{$data['posts']}</td>
+		<td align="center" class="row1">{$data['views']}</td>
+		<td class="row1"><span class="desc">{$data['last_post']}<br /><a href="{ipb.script_url}showtopic={$data['tid']}&amp;view=getlastpost">{$data['last_text']}</a> <b>{$data['last_poster']}</b></span></td>
+	</tr>
+<!-- End Topic Entry {$data['tid']} -->]]></section_content>
+			<func_name>RenderRow</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[&nbsp;<input type="button" value="{ipb.lang['so_less_opts']}" onclick="go_gadget_simple()" />]]></section_content>
+			<func_name>form_simple_button</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<!-- Begin Topic Entry {$data['tid']} -->
+	<tr>
+		<td align="center" colspan="8" class="row1"><b>{ipb.lang['no_search_topics']}</b></td>
+	</tr>
+    <!-- End Topic Entry {$data['tid']} -->]]></section_content>
+			<func_name>no_results_row</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_search</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="maintitle">{$data['prefix']} <a href="{ipb.script_url}showtopic={$data['tid']}&amp;hl={$data['keywords']}">{$data['topic_title']}</a></div>
+	<table cellspacing="1">
+		<tr>
+			<td width="150" class="row2"><span class="normalname">{$data['author_name']}</span></td>
+			<td class="row2" width="100%"><b>{ipb.lang['rp_postedon']} {$data['post_date']}</b></td>
+		</tr>
+		<tr>
+			<td class="post1" valign='top'>
+				<span class="postdetails">
+					{$author['avatar']}<br /><br />
+					{$author['title']}<br />
+					{$author['member_rank_img']}<br /><br />
+					{$author['member_group']}<br />
+					{$author['member_posts']}<br />
+					{$author['member_joined']}<br />
+					{$author['member_location']}
+					{$author['member_number']}<br /><br />
+				
+					{$author['warn_text']} {$author['warn_minus']}{$author['warn_img']}{$author['warn_add']}
+				</span><br />
+        		<!--$ author[field_1]-->
+        		<img src="{ipb.vars['img_url']}/spacer.gif" alt="" width="160" height="1" />
+        	</td>
+        	<td class="post1" width="100%"><div class="postcolor" style='height:200px;overflow:auto'>{$data['post']}</div></td>
+        </tr>
+        <tr>
+        	<td class="row2">&nbsp;</td>
+        	<td class="row2">
+        		{ipb.lang['rp_forum']} <a href="{ipb.script_url}showforum={$data['forum_id']}">{$data['forum_name']}</a>
+        		&middot; {ipb.lang['rp_post']} <a href="{ipb.script_url}act=ST&amp;f={$data['forum_id']}&amp;t={$data['tid']}&amp;hl={$data['keywords']}&amp;view=findpost&amp;p={$data['pid']}" class="linkthru">#{$data['pid']}</a>
+        		&middot; {ipb.lang['rp_replies']} <b>{$data['topic_posts']}</b>
+        		&middot; {ipb.lang['rp_hits']} <b>{$data['views']}
+        	</td>
+  		</tr>
+  	</table>
+</div>]]></section_content>
+			<func_name>RenderPostRow</func_name>
+			<func_data><![CDATA[$data="",$author=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="formsubtitle">{ipb.lang['errors_found']}</div>
+	<div class="tablepad"><span class="postcolor">$data</span></div>
+</div>
+<br />]]></section_content>
+			<func_name>errors</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<select name="$name">$options</select>]]></section_content>
+			<func_name>field_dropdown</func_name>
+			<func_data><![CDATA[$name="",$options=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<fieldset>
+	<legend>$title</legend>
+		<div class="desc">$desc</div><br />
+		$content
+	</fieldset>]]></section_content>
+			<func_name>field_entry</func_name>
+			<func_data><![CDATA[$title="",$desc="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<textarea cols="60" rows="5" name="$name">$value</textarea>]]></section_content>
+			<func_name>field_textarea</func_name>
+			<func_data><![CDATA[$name="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+	<tr>
+		<td><span class="pagetitle">{$title}</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>page_title</func_name>
+			<func_data><![CDATA[$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<form method="post" onsubmit="if(document.jmenu$id.f.value == -1){return false;}" action="{ipb.script_url}act=SF" name="jmenu$id">
+	<select class="forminput" name="f" onchange="if(this.options[this.selectedIndex].value != -1){ document.jmenu$id.submit() }">
+		<option value="-1">$count_string</option>
+		<option value="-1">--------------------------------------------------------</option>]]></section_content>
+			<func_name>leader_row_forum_start</func_name>
+			<func_data><![CDATA[$id="",$count_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Reg" />
+<input type="hidden" name="CODE" value="11" />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['lost_pass_form']}</div>
+	<div class="formsubtitle">{ipb.lang['lp_header']}</div>
+	<div class="tablepad"><span>
+<if="ipb.vars['converge_login_method'] == 'username'">
+{ipb.lang['lp_text']}
+</if>
+<else>
+{ipb.lang['lp_text_email']}
+</else>
+
+	</span></div>
+	<div class="formsubtitle">{ipb.lang['complete_form']}</div>
+	<table cellspacing="0">
+		<tr>
+			<td class="pformleft">
+<if="ipb.vars['converge_login_method'] == 'username'">
+<strong>{ipb.lang['lp_user_name']}</strong>
+</if>
+<else>
+<strong>{ipb.lang['lp_email_address']}</strong>
+</else>
+
+</td>
+			<td class="pformright"><input type="text" size="32" maxlength="32" name="member_name" /></td>
+		</tr>
+	</table>
+<!--{REG.ANTISPAM}--><br />
+</div>
+<br />
+<div class="borderwrap">
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['lp_send']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>lost_pass_form</func_name>
+			<func_data><![CDATA[$lasid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<!--
+	<tr>
+  		<td colspan="2" class="formsubtitle">{ipb.lang['cf_optional']}</td>
+	</tr>
+-->]]></section_content>
+			<func_name>optional_title</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><!-- --></div>
+	<div class="formsubtitle">{ipb.lang['registration_process']}</div>
+	<div class="tablepad">{ipb.lang['thank_you']} {$member['name']}. {ipb.lang['auth_text']} {$member['email']}</div>
+</div>]]></section_content>
+			<func_name>show_authorise</func_name>
+			<func_data><![CDATA[$member=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_paypal']}</b>
+</p>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick-subscriptions" />
+<input type="hidden" name="business" value="$paypal_email" />
+<input type="hidden" name="item_name" value="$sub_title" />
+<input type="hidden" name="item_number" value="$new_sub_id" />
+<input type="hidden" name="no_shipping" value="1" />
+<input type="hidden" name="src" value="1" />
+<input type="hidden" name="a3" value="$cost" />
+<input type="hidden" name="p3" value="$length" />
+<input type="hidden" name="t3" value="$unit" />
+<input type="hidden" name="custom" value="$member_id" />
+<input type="hidden" name="notify_url" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=paypal" />
+<input type="hidden" name="currency_code" value="$ccode" />
+<input type="hidden" name="return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+<input type="hidden" name="cancel_return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+	<br /><br />
+	<div>
+		<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" name="submit" alt="Make payments with PayPal - it"s fast, free and secure!" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_paypal_normal_recurring_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$unit="",$length="",$cost="",$paypal_email="",$sub_title="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var ipb_lang_js_blanks   = "{ipb.lang['js_blanks']}";
+var ipb_lang_js_no_check = "{ipb.lang['js_no_check']}";
+var subsdesc_0 = "{ipb.lang['subsm_no_desc']}";<!--{SUBS.JSCRIPT}-->
+-->
+</script>
+<script type="text/javascript" src="jscripts/ipb_register.js"></script>
+<form action="{ipb.vars['board_url']}/index.{ipb.vars['php_ext']}" method="post" name="REG" onsubmit="return Validate()">
+<input type="hidden" name="act" value="Reg" />
+<input type="hidden" name="termsread" value="1" />
+<input type="hidden" name="agree_to_terms" value="1" />
+<input type="hidden" name="CODE" value="02" />
+<input type="hidden" name="coppa_user" value="{$data['coppa_user']}" />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['registration_form']}</div>
+	<div class="formsubtitle">{$data['TEXT']}</div>
+	<div class="tablepad">
+		<table cellspacing="0">
+			<tr>
+				<td width="50%">
+					<fieldset class="row3">
+					<legend><b>{ipb.lang['user_name_title']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td>{ipb.lang['user_name']} &nbsp;<span>(<a href="#" style="cursor: help; color: #555;" title="{ipb.lang['user_name_text']}">?</a>)</span></td>
+							</tr>
+							<tr>
+								<td><input type="text" size="50" maxlength="64" value="{ipb.input['UserName']}" name="UserName" /></td>
+							</tr>
+						</table>
+					</fieldset><br />
+					
+					<fieldset class="row3">
+					<legend><b>{ipb.lang['password_title']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td width="1%" nowrap="nowrap">{ipb.lang['password']} &nbsp;<span>(<a href="#" style="cursor: help; color: #555;" title="{ipb.lang['password_text']}">?</a>)</span></td>
+								<td width="100%">{ipb.lang['password_confirm']} &nbsp;<span>(<a href="#" style="cursor: help; color: #555;" title="{ipb.lang['password_confirm_text']}">?</a>)</span></td>
+							</tr>
+							<tr>
+								<td><input type="password" size="25" maxlength="32" value="{ipb.input['PassWord']}" name="PassWord" /></td>
+								<td><input type="password" size="25" maxlength="32" value="{ipb.input['PassWord_Check']}"  name="PassWord_Check" /></td>
+							</tr>
+						</table>
+					</fieldset><br />
+				
+					<fieldset class="row3">
+					<legend><b>{ipb.lang['email_address_title']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td width="1%" nowrap="nowrap">{ipb.lang['email_address']} &nbsp;<span>(<a href="#" style="cursor: help; color: #555;" title="{ipb.lang['email_address_text']}">?</a>)</span></td>
+								<td width="100%">{ipb.lang['email_address_confirm']} &nbsp;<span>(<a href="#" style="cursor: help; color: #555;" title="{ipb.lang['email_address_confirm_text']}">?</a>)</span></td>
+							</tr>
+							<tr>
+								<td><input type="text" size="25" maxlength="50" value="{ipb.input['EmailAddress']}"  name="EmailAddress" /></td>
+								<td><input type="text" size="25" maxlength="50"  value="{ipb.input['EmailAddress_two']}" name="EmailAddress_two" /></td>
+							</tr>
+						</table>
+					</fieldset>
+					<!--{REQUIRED.FIELDS}-->
+					<!--{SUBS.MANAGER}-->
+					<!--IBF.MODULES.EXTRA-->
+				</td>
+				<td width="50%" valign="top">
+					<div>
+						<b>{ipb.lang['cf_optional']}</b><br /><br />
+						<table cellspacing="0">
+							<tr>
+								<td>
+									<fieldset>
+									<legend>{ipb.lang['op_email_title']}</legend>
+										<div class="desc">{ipb.lang['op_email_text']}</div><br />
+										<input type="checkbox" name="allow_admin_mail" value="1" class="checkbox" <!--[admin.checked]--> /> {ipb.lang['op_email_ad']}<br />
+										<input type="checkbox" name="allow_member_mail" value="1" class="checkbox" <!--[member.checked]--> /> {ipb.lang['op_email_mem']}
+									</fieldset><br />
+							
+									<fieldset>
+									<legend>{ipb.lang['op_tz_title']}</legend>
+										<div class="desc">{ipb.lang['op_tz_text']}</div><br />
+										<!--{TIME_ZONE}--><br /><br />
+										<input type="checkbox" name="dst" value="1" class="checkbox" <!--[dst.checked]--> /> {ipb.lang['op_tz_dst']}<br />
+									</fieldset>
+									<!--{OPTIONAL.FIELDS}-->
+								</td>
+							</tr>
+						</table>
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td><!--{REG.ANTISPAM}--></td>
+				<td valign="middle" align="center">
+					<div class="desc">{ipb.lang['submit_text']}</div><br />
+						<input type="submit" value="{ipb.lang['submit_form']} &gt; &gt;" />
+					</div>
+				</td>
+			</tr>
+		</table>
+	</div>
+</div>
+</form>]]></section_content>
+			<func_name>ShowForm</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[</select>
+		</td>
+		<td align="center">
+			<input type="button" class="button" onclick="get_more_info()" value="{ipb.lang['subsm_more']}" />
+		</td>
+	</tr>
+</table>
+<div style="display: none; position: absolute; border: 3px outset #000;" class="tablepad" id="subspkdiv">
+	<textarea readonly="readonly" name="pkdesc"></textarea>
+	<div align="right"><a href="#" onclick="toggleview("subspkdiv"); return false;">{ipb.lang['subsm_close']}</a></div>
+</div>
+</fieldset>]]></section_content>
+			<func_name>subsm_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<option value="{$id}">$title ($duration) - $cost</option>]]></section_content>
+			<func_name>subsm_row</func_name>
+			<func_data><![CDATA[$id="",$title="",$cost="",$duration=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<br />
+<fieldset class="row3">
+<legend><b>{ipb.lang['subsm_title']}</b></legend>
+	<div class="desc"> &nbsp;{ipb.lang['cc_currency_in']} $cur</div>
+	<table cellspacing="0">
+		<tr>
+			<td width="1%">
+				<select class="dropdown" name="subspackage">]]></section_content>
+			<func_name>subsm_start</func_name>
+			<func_data><![CDATA[$cur=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<form method="post" action="$action">
+$hidden
+<div class="borderwrap">
+	<div class="maintitle">$title</div>
+	<table cellspacing="0">
+		$content
+	</table>
+	<div class="formsubtitle" align="center"><input type="submit" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>tmpl_form</func_name>
+			<func_data><![CDATA[$action="",$hidden="",$title="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=Reg&coppa_user={$coppa_user}&termsread=1&coppa_pass=1" method="post">
+	<div class="borderwrap">
+		<div class="maintitle">{ipb.lang['tc_title']}</div>
+		<table cellspacing="1">
+			<tr>
+				<th>{ipb.lang['tc_text']}</th>
+			</tr>
+			<tr>
+				<td class="row1">{$text}</td>
+			</tr>
+			<tr>
+				<td class="row2"><label for="agree_cbox"><input type="checkbox" id="agree_cbox" name="agree_to_terms" value="1" /> <b>{ipb.lang['agree_submit']}</b></label></td>
+			</tr>
+			<tr>
+				<td class="formbuttonrow"><input type="submit" value="{ipb.lang['tc_regbut']}" class="button"></td>
+			</tr>
+			<tr>
+				<td class="catend" colspan="2"><!-- no content --></td>
+			</tr>
+		</table>
+	</div>
+</form>]]></section_content>
+			<func_name>show_terms</func_name>
+			<func_data><![CDATA[$text="",$coppa_user=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post" name="REG">
+<input type="hidden" name="act" value="Reg" />
+<input type="hidden" name="CODE" value="reval2" />
+<div>{ipb.lang['rv_ins']}</div><br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['rv_title']}</div>
+	<table cellspacing="0">
+		<tr>
+			<td class="pformleft"><b>{ipb.lang['rv_name']}</b></td>
+			<td class="pformright"><input type="text" size="32" maxlength="64" name="username" value="$name" /></td>
+		</tr>
+	</table>
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['rv_go']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>show_revalidate_form</func_name>
+			<func_data><![CDATA[$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['rv_title']}</div>
+	<div class="formsubtitle">{ipb.lang['rv_process']}</div>
+	<div class="tablepad">{ipb.lang['rv_done']}</div>
+</div>]]></section_content>
+			<func_name>show_revalidated</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<script language="javascript" type="text/javascript">
+<!--
+	function Validate(){
+		// Check for Empty fields
+		if (document.REG.uid.value == "" || document.REG.aid.value == ""){
+			alert ("{ipb.lang['js_blanks']}");
+			return false;
+		}
+	}
+-->
+</script>
+<form action="{ipb.script_url}" method="post" name="REG" onsubmit="return Validate()">
+<input type="hidden" name="act" value="Reg" />
+<input type="hidden" name="CODE" value="03" />
+<input type="hidden" name="type" value="lostpass" />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['dumb_header']}</div>
+	<div class="formsubtitle">{ipb.lang['lpf_title']}</div>
+	<!--IBF.INPUT_TYPE-->
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['lpf_pass1']}</b><br><i>{ipb.lang['lpf_pass11']}</i></td>
+		<td class="pformright"><input type="password" size="32" maxlength="32" name="pass1" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['lpf_pass2']}</b><br><i>{ipb.lang['lpf_pass22']}</i></td>
+		<td class="pformright"><input type="password" size="32" maxlength="32" name="pass2" /></td>
+	</tr>
+</table>
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['dumb_submit']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>show_lostpass_form</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+	function Validate(){
+		// Check for Empty fields
+		if (document.REG.uid.value == "" || document.REG.aid.value == ""){
+			alert ("{ipb.lang['js_blanks']}");
+			return false;
+		}
+	}
+-->
+</script>
+<form action="{ipb.script_url}" method="post" name="REG" onsubmit="return Validate()">
+<input type="hidden" name="act" value="Reg" />
+<input type="hidden" name="CODE" value="03" />
+<input type="hidden" name="type" value="$type" />
+<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['dumb_header']}</div>
+	<div class="tablepad">{ipb.lang['dumb_text']}</div>
+	<div class="formsubtitle">{ipb.lang['complete_form']}</div>
+		<table cellspacing="0">
+			<tr>
+				<td class="pformleft">{ipb.lang['user_id']}</td>
+				<td class="pformright"><input type="text" size="32" maxlength="32" name="uid" /></td>
+			</tr>
+			<tr>
+				<td class="pformleft">{ipb.lang['val_key']}</td>
+				<td class="pformright"><input type="text" size="32" maxlength="50" name="aid" /></td>
+			</tr>
+		</table>
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['dumb_submit']}" /></div>
+</div>
+</form>]]></section_content>
+			<func_name>show_dumb_form</func_name>
+			<func_data><![CDATA[$type="reg"]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<input type="hidden" name="uid" value="$uid" />
+<input type="hidden" name="aid" value="$aid" />
+<table cellspacing="0">]]></section_content>
+			<func_name>show_lostpass_form_auto</func_name>
+			<func_data><![CDATA[$aid="",$uid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="tablepad">{ipb.lang['dumb_text']}</div>
+<div class="formsubtitle">{ipb.lang['complete_form']}</div>
+<table cellspacing="0">
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['user_id']}</b></td>
+		<td class="pformright"><input type="text" size="32" maxlength="32" name="uid" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['val_key']}</b></td>
+		<td class="pformright"><input type="text" size="32" maxlength="50" name="aid" /></td>
+	</tr>]]></section_content>
+			<func_name>show_lostpass_form_manual</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['lpf_title']}</div>
+	<div class="formsubtitle">{ipb.lang['registration_process']}</div>
+	<div class="tablepad">{ipb.lang['lpass_text']}</div>
+</div>]]></section_content>
+			<func_name>show_lostpasswait</func_name>
+			<func_data><![CDATA[$member=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><!-- --></div>
+	<div class="formsubtitle">{ipb.lang['registration_process']}</div>
+	<div class="tablepad">{ipb.lang['thank_you']} {$member['name']}. {ipb.lang['preview_reg_text']}</div>
+</div>]]></section_content>
+			<func_name>show_preview</func_name>
+			<func_data><![CDATA[$member=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<br />
+<input type="hidden" name="regid" value="$regid" />
+	<fieldset class="row3">
+	<legend><b>{ipb.lang['las_title']}</b></legend>
+		<table cellspacing="0">
+			<tr>
+				<td width="1%">
+					{ipb.lang['las_input']}<div class="desc">{ipb.lang['las_input_text']}</div>
+					<input type="text" size="25" maxlength="32" name="reg_code" />
+				</td>
+				<td align="center"><img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}" alt="Loading Image" /></td>
+			</tr>
+		</table>
+	</fieldset>]]></section_content>
+			<func_name>bot_antispam_gd</func_name>
+			<func_data><![CDATA[$regid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<html>
+	<head>
+		<title>{ipb.lang['cpf_title']}</title>
+		<!--<link rel="stylesheet" href="style_sheets/stylesheet_<{css_id}>.css" type="text/css">-->
+	</head>
+	
+	<body>
+		<table cellspacing="1">
+			<tr>
+				<td valign="middle">
+					<span class="pagetitle">{ipb.vars['board_name']}: {ipb.lang['cpf_title']}</span><br /><br />
+					<b><span>{ipb.lang['cpf_perm_parent']}</span></b><br /><br />
+					{ipb.lang['cpf_fax']} {ipb.vars['coppa_fax']}<br /><br />{ipb.lang['cpf_address']}<br />
+					{ipb.vars['coppa_address']}
+				</td>
+			</tr>
+		</table>
+		<br />
+		
+		<table cellspacing="1">
+			<tr>
+				<td width="40%">{ipb.lang['user_name']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['pass_word']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['email_address']}</td>
+				<td>&nbsp;</td>
+			</tr>
+		</table>
+		<br />
+		
+		<table cellspacing="1">
+			<tr>
+				<td valign="middle"><b><span>{ipb.lang['cpf_sign']}</span></b></td>
+			</tr>
+		</table>
+		<br />
+		
+		<table cellspacing="1">
+			<tr>
+				<td width="40%">{ipb.lang['cpf_name']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['cpf_relation']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['cpf_signature']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['cpf_email']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['cpf_phone']}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr>
+				<td width="40%">{ipb.lang['cpf_date']}</td>
+				<td>&nbsp;</td>
+			</tr>
+		</table>
+	</body>
+</html>]]></section_content>
+			<func_name>coppa_form</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_printpage</group_name>
+			<section_content><![CDATA[<div class="printpost">
+			<h4>{ipb.lang['by']}: {$entry['author_name']}</b> {ipb.lang['on']} {$entry['post_date']}</h4>
+			<p>{$entry['post']}</p>
+		</div>]]></section_content>
+			<func_name>pp_postentry</func_name>
+			<func_data><![CDATA[$poster="",$entry=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_printpage</group_name>
+			<section_content><![CDATA[<html>
+	<head>
+		<title>{ipb.vars['board_name']} [Powered by Invision Power Board]</title>
+		<!--IPB.CSS-->
+	</head>
+	<body>
+	<div id="print">
+		<h1>{ipb.lang['title']}</h1>
+		<h2><a href="{ipb.script_url}act=ST&amp;f=$fid&amp;t=$tid" title="Click to view Topic">{ipb.lang['topic_here']}</a></h2>
+		<h3>{ipb.vars['board_name']} _ $forum_name _ $topic_title</h3>]]></section_content>
+			<func_name>pp_header</func_name>
+			<func_data><![CDATA[$forum_name="",$topic_title="",$topic_starter="",$fid="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_printpage</group_name>
+			<section_content><![CDATA[<!--Copyright-->
+<if="ipb.vars['ipb_copy_number'] == ''">
+<p class="printcopy">Powered by Invision Power Board (http://www.invisionboard.com)<br />&copy; Invision Power Services (http://www.invisionpower.com)</p>
+</if>
+
+	</div>]]></section_content>
+			<func_name>pp_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_printpage</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['tvo_title']}&nbsp;$title</div>
+	<table cellspacing="1">
+		<tr>
+			<th>Please choose an option below</th>
+		</tr>
+		<tr>
+			<td class="row1"><b><a href="{ipb.script_url}act=Print&amp;client=printer&amp;f=$fid&amp;t=$tid">{ipb.lang['o_print_title']}</a></b><br />{ipb.lang['o_print_desc']}</td>
+		</tr>
+		<tr>
+			<td class="row2"><b><a href="{ipb.script_url}act=Print&amp;client=html&amp;f=$fid&amp;t=$tid">{ipb.lang['o_html_title']}</a></b><br />{ipb.lang['o_html_desc']}</td>
+		</tr>
+		<tr>
+			<td class="row1"><b><a href="{ipb.script_url}act=Print&amp;client=wordr&amp;f=$fid&amp;t=$tid">{ipb.lang['o_word_title']}</a></b><br />{ipb.lang['o_word_desc']}</td>
+		</tr>
+		<tr>
+			<td class="formbuttonrow"><a href="{ipb.script_url}showtopic=$tid">{ipb.lang['back_topic']}</a></td>
+		</tr>
+		<tr>
+			<td class="catend"><!-- no content --></td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>choose_form</func_name>
+			<func_data><![CDATA[$fid="",$tid="",$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<input type="text" size="30" name="$name" value="$value" />]]></section_content>
+			<func_name>field_textinput</func_name>
+			<func_data><![CDATA[$name="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['cp2_title']}</div>
+	<table cellspacing="1">
+		<tr>
+			<td class="row1">
+				{ipb.lang['cp2_text']}<br /><br />
+				<div>
+					<span>
+						&lt;&lt; <a href="{ipb.script_url}">{ipb.lang['cp2_cancel']}</a> 
+						- <a href="{ipb.script_url}act=Reg&amp;coppa_pass=1&amp;coppa_user=1">{ipb.lang['cp2_continue']}</a> &gt;&gt;
+					</span>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="formsubtitle">{ipb.lang['coppa_form']}</td>
+		</tr>
+		<tr>
+			<td class="row1">{ipb.lang['coppa_form_text']} <a href="mailto:{ipb.vars['email_in']}">{ipb.vars['email_in']}</a></td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>coppa_two</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<br />
+<input type="hidden" name="regid" value="$regid" />
+	<fieldset class="row3">
+	<legend><b>{ipb.lang['las_title']}</b></legend>
+		<table cellspacing="0">
+			<tr>
+				<td width="1%">
+					{ipb.lang['las_input']}<div class="desc">{ipb.lang['las_input_text']}</div>
+					<input type="text" size="25" maxlength="32" name="reg_code" />
+				</td>
+				<td align="center">
+					<img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=1" alt="Code Bit" />
+					&nbsp;<img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=2" alt="Code Bit" />
+					&nbsp;<img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=3" alt="Code Bit" />
+					&nbsp;<img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=4" alt="Code Bit" />
+					&nbsp;<img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=5" alt="Code Bit" />
+					&nbsp;<img src="{ipb.script_url}act=Reg&amp;CODE=image&amp;rc={$regid}&amp;p=6" alt="Code Bit" />
+				</td>
+			</tr>
+		</table>
+	</fieldset>]]></section_content>
+			<func_name>bot_antispam</func_name>
+			<func_data><![CDATA[$regid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_register</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['registration_form']}</div>
+	<div class="formsubtitle">{ipb.lang['coppa_info']}</div>
+	<div class="tablepad"  align="center">
+		<span class="postcolor">
+			<b>{ipb.lang['coppa_link']}<br /><br /> 
+			&lt; <a href="{ipb.script_url}act=Reg&amp;coppa_pass=1">{ipb.lang['coppa_date_before']} $coppadate</a>
+			- <a href="{ipb.script_url}act=Reg&amp;CODE=coppa_two">{ipb.lang['coppa_date_after']} $coppadate</a> &gt;
+			</b>
+		</span>
+	</div>
+	<div class="formsubtitle">{ipb.lang['coppa_form']}</div>
+	<div class="tablepad">{ipb.lang['coppa_form_text']} <a href="mailto:{ipb.vars['email_in']}">{ipb.vars['email_in']}</a></div>
+</div>]]></section_content>
+			<func_name>coppa_start</func_name>
+			<func_data><![CDATA[$coppadate=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;$group</div>
+		<table cellspacing="1">
+			<tr>
+				<th width="30%" valign="middle">{ipb.lang['leader_name']}</th>
+				<th width="40%" align="center" valign="middle">{ipb.lang['leader_forums']}</th>
+				<th align="center" width="25%" valign="middle">{ipb.lang['leader_location']}</th>
+				<th align="center" width="5%"  valign="middle">&nbsp;</th>
+			</tr>]]></section_content>
+			<func_name>group_strip</func_name>
+			<func_data><![CDATA[$group=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td width="1%"><img src="{ipb.vars['mime_img']}/{$attach['image']}" alt="" /></td>
+		<td width="35%"><b>{$attach['attach_file']}</b></td>
+		<td width="20%">({$attach['size']})</td>
+		<td width="10%"><input type="submit" name="removeattach_{$attach['attach_id']}" class="codebuttons" onclick="removeattach({$attach['attach_id']})" value="{ipb.lang['attach_remove']}" /></a>
+		<td width="10%"><input type="button" name="id{$attach['attach_id']}" class="codebuttons" onclick="insert_attach_to_textarea({$attach['attach_id']})" value="Add into Post" title="Adds a placeholder tag for the attachment in the post" /></a>
+	</tr>]]></section_content>
+			<func_name>uploadbox_entry</func_name>
+			<func_data><![CDATA[$attach=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[</tr>
+</table>
+<i>$spaceleft</i>
+</div>]]></section_content>
+			<func_name>uploadbox_tableend</func_name>
+			<func_data><![CDATA[$spaceleft=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+  <div>
+  	<table cellspacing="0">]]></section_content>
+			<func_name>uploadbox_tabletop</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row2" valign="top" width="20%"><b>{$data['author']}</b></td>
+		<td class="row2" valign="top" width="80%">{ipb.lang['posted_on']} {$data['date']}</td>
+	</tr>
+	<tr>
+		<td class="row1" valign="top" width="20%">&nbsp;</td>
+		<td class="row1" valign="top" width="80%"><span class="postcolor">{$data['post']}</span></td>
+	</tr>]]></section_content>
+			<func_name>TopicSummary_body</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['upload_title']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft" valign="top">{ipb.lang['upload_text']} $data</td>
+		<td class="pformright"><input class="forminput" type="file" size="30" name="FILE_UPLOAD" /> <input type="submit" onclick="Override=1;" name="attachgo" value="{ipb.lang['button_add_attachment']}" class="button" /><!--IBF.UPLOADED_ITEMS--></td>
+	</tr>]]></section_content>
+			<func_name>Upload_field</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formbuttonrow" colspan="2"><a href="javascript:PopUp('index.{ipb.vars['php_ext']}?act=ST&amp;f={ipb.input['f']}&amp;t={ipb.input['t']}','TopicSummary',700,450,1,1)">{ipb.lang['review_topic']}</a></td>
+	</tr>
+	<tr>
+		<td class="catend" colspan="2"><!-- no content --></td>
+	</tr>
+</table>
+</div>]]></section_content>
+			<func_name>TopicSummary_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+  <div class="maintitle">{ipb.lang['last_posts']}</div>
+  <table cellspacing="1">]]></section_content>
+			<func_name>TopicSummary_top</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['tt_topic_settings']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['topic_title']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="50" name="TopicTitle" value="{$data[TITLE]}" tabindex="1" class="forminput" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['topic_desc']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="40" name="TopicDesc" value="{$data[DESC]}" tabindex="2" class="forminput" /></td>
+	</tr>]]></section_content>
+			<func_name>topictitle_fields</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<!--FORUM RULES--><br />
+<!--START TABLE-->
+<!--NAME FIELDS-->
+<!--TOPIC TITLE-->
+<!--POLL BOX-->
+<!--POST BOX-->
+<!--POST ICONS-->
+<!--UPLOAD FIELD-->
+<!--MOD OPTIONS-->
+<!--END TABLE-->]]></section_content>
+			<func_name>table_structure</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+<table cellspacing="0">
+	<tr>
+		<td class="maintitle" colspan="2">&nbsp;&nbsp;$data</td>
+	</tr>]]></section_content>
+			<func_name>table_top</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<table cellspacing="0" style='width:auto'>
+	<tr>
+		<td align="center" colspan="{ipb.vars['emo_per_row']}"><b>{ipb.lang['click_smilie']}</b></td>
+	</tr>
+		<!--THE SMILIES-->
+	<tr>
+		<td align="center" colspan="{ipb.vars['emo_per_row']}"><b><a href="javascript:emo_pop()">{ipb.lang['all_emoticons']}</a></b></td>
+	</tr>
+</table>]]></section_content>
+			<func_name>smilie_table</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="formsubtitle">{ipb.lang['post_preview']}</div>
+	<div class="row1">
+		<div class="postcolor" style='padding:4px;'>$data</div>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>preview</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formbuttonrow" colspan="2">
+			<input type="submit" name="submit" value="$data" tabindex="7" class="button" accesskey="s" />&nbsp;
+			<input type="submit" name="preview" value="{ipb.lang['button_preview']}" tabindex="8" class="button" />
+		</td>
+	</tr>
+</table>
+</div>
+</form>
+<br style="clear: all;" />]]></section_content>
+			<func_name>EndForm</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+  <div class="formsubtitle">{ipb.lang['errors_found']}</div>
+  <div class="tablepad"><span class="postcolor">$data</span></div>
+</div>
+<br />]]></section_content>
+			<func_name>errors</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+{ipb.lang['already_sub']}]]></section_content>
+			<func_name>get_box_alreadytrack</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+<input type="checkbox" name="enableemo" class="checkbox" value="yes" $checked />&nbsp;{ipb.lang['enable_emo']}]]></section_content>
+			<func_name>get_box_enableemo</func_name>
+			<func_data><![CDATA[$checked=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+<input type="checkbox" name="enablesig" class="checkbox" value="yes" $checked />&nbsp;{ipb.lang['enable_sig']}]]></section_content>
+			<func_name>get_box_enablesig</func_name>
+			<func_data><![CDATA[$checked=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+<input type="checkbox" name="enabletrack" class="checkbox" value="1" $checked />&nbsp;{ipb.lang['enable_track']}]]></section_content>
+			<func_name>get_box_enabletrack</func_name>
+			<func_data><![CDATA[$checked=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<select name="post_htmlstatus" class="dropdown">
+	<option value="0"{$selected[0]}>{ipb.lang['pp_nohtml']}</option>
+	<option value="1"{$selected[1]}>{ipb.lang['pp_html1']}</option>
+	<option value="2"{$selected[2]}>{ipb.lang['pp_html2']}</option>
+</select>]]></section_content>
+			<func_name>get_box_html</func_name>
+			<func_data><![CDATA[$selected=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var MessageMax    = "{ipb.lang['the_max_length']}";
+var Override      = "{ipb.lang['override']}";
+var dontpassgo    = 0;
+MessageMax        = parseInt(MessageMax);
+	if ( MessageMax < 0 ){
+		MessageMax = 0;
+	}
+	
+	function emo_pop(){
+		window.open("index.{ipb.vars['php_ext']}?act=legends&CODE=emoticons&s={ipb.session_id}","Legends","width=250,height=500,resizable=yes,scrollbars=yes"); 
+	}
+	
+	function bbc_pop(){
+		window.open("index.{ipb.vars['php_ext']}?act=legends&CODE=bbcode&s={ipb.session_id}","Legends","width=700,height=500,resizable=yes,scrollbars=yes"); 
+	}
+	
+	function attach_pop(url){
+		window.open("{$ibforums->js_base_url}act=Post&CODE=20&"+url,"Attachments","width=500,height=400,resizable=yes,scrollbars=yes"); 
+	}	
+	
+	function CheckLength(){
+		MessageLength  = document.REPLIER.Post.value.length;
+		message  = "";
+			if (MessageMax > 0){
+				message = "{ipb.lang['js_post']}: {ipb.lang['js_max_length']} " + MessageMax + " {ipb.lang['js_characters']}.";
+			}
+			else{
+				message = "";
+				}
+		alert(message + "      {ipb.lang['js_used']} " + MessageLength + " {ipb.lang['js_characters']}.");
+	}
+	
+	function ValidateForm(isMsg){
+		MessageLength  = document.REPLIER.Post.value.length;
+		errors = "";
+		
+		// Check for remove attachments
+			if ( document.REPLIER.removeattachid.value > 0 ){
+				okdelete = confirm("{ipb.lang['remove_attach']}");
+		
+				if ( okdelete == true ){
+					return true;
+				}
+				else{
+					document.REPLIER.removeattachid.value = 0;
+					return false;
+				}
+			}
+	
+			if (isMsg == 1){
+				if (document.REPLIER.msg_title.value.length < 2){
+					errors = "{ipb.lang['msg_no_title']}";
+				}
+			}
+			
+			if (MessageLength < 2){
+				errors = "{ipb.lang['js_no_message']}";
+			}
+	
+			if (MessageMax !=0){
+				if (MessageLength > MessageMax){
+			errors = "{ipb.lang['js_max_length']} " + MessageMax + " {ipb.lang['js_characters']}. {ipb.lang['js_current']}: " + MessageLength;
+				}
+			}
+			
+			if (errors != "" && Override == ""){
+				alert(errors);
+				return false;
+			}
+			
+			else{
+				document.REPLIER.submit.disabled = true;
+				return true;
+			}
+	}
+	
+	function removeattach(id){
+		if ( id != "" ){
+			var Override = 1;
+			document.REPLIER.removeattachid.value = id;
+		}
+	}
+	
+// IBC Code stuff
+var text_enter_url      = "{ipb.lang['jscode_text_enter_url']}";
+var text_enter_url_name = "{ipb.lang['jscode_text_enter_url_name']}";
+var text_enter_image    = "{ipb.lang['jscode_text_enter_image']}";
+var text_enter_email    = "{ipb.lang['jscode_text_enter_email']}";
+var text_enter_flash    = "{ipb.lang['jscode_text_enter_flash']}";
+var text_code           = "{ipb.lang['jscode_text_code']}";
+var text_quote          = "{ipb.lang['jscode_text_quote']}";
+var error_no_url        = "{ipb.lang['jscode_error_no_url']}";
+var error_no_title      = "{ipb.lang['jscode_error_no_title']}";
+var error_no_email      = "{ipb.lang['jscode_error_no_email']}";
+var error_no_width      = "{ipb.lang['jscode_error_no_width']}";
+var error_no_height     = "{ipb.lang['jscode_error_no_height']}";
+var prompt_start        = "{ipb.lang['js_text_to_format']}";
+var help_bold           = "{ipb.lang['hb_bold']}";
+var help_italic         = "{ipb.lang['hb_italic']}";
+var help_under          = "{ipb.lang['hb_under']}";
+var help_font           = "{ipb.lang['hb_font']}";
+var help_size           = "{ipb.lang['hb_size']}";
+var help_color          = "{ipb.lang['hb_color']}";
+var help_close          = "{ipb.lang['hb_close']}";
+var help_url            = "{ipb.lang['hb_url']}";
+var help_img            = "{ipb.lang['hb_img']}";
+var help_email          = "{ipb.lang['hb_email']}";
+var help_quote          = "{ipb.lang['hb_quote']}";
+var help_list           = "{ipb.lang['hb_list']}";
+var help_code           = "{ipb.lang['hb_code']}";
+var help_click_close    = "{ipb.lang['hb_click_close']}";
+var list_prompt         = "{ipb.lang['js_tag_list']}";
+-->
+</script>]]></section_content>
+			<func_name>get_javascript</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft">{ipb.lang['post_icon']}</td>
+		<td class="pformright">
+			<input type="radio" class="radiobutton" name="iconid" value="1" />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon1.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="2"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon2.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="3"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon3.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="4"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon4.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="5"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon5.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="6"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon6.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="7"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon7.gif"  align='middle' alt='' /><br />
+			<input type="radio" class="radiobutton" name="iconid" value="8" />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon8.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="9"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon9.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="10"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon10.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="11"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon11.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="12"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon12.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="13"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon13.gif"  align='middle' alt='' />&nbsp;&nbsp;&nbsp;<input type="radio" class="radiobutton" name="iconid" value="14"  />&nbsp;&nbsp;<img src="{ipb.vars['img_url']}/folder_post_icons/icon14.gif"  align='middle' alt='' /><br />
+    		<input type="radio" class="radiobutton" name="iconid" value="0" checked="checked" />&nbsp;&nbsp;[ Use None ]
+		</td>
+	</tr>]]></section_content>
+			<func_name>PostIcons</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+function go_gadget_show()
+{
+	window.location = "{ipb.script_url}&act=ST&f=$fid&t=$tid&mode=show&st={ipb.input['start']}";
+}
+function go_gadget_vote()
+{
+	window.location = "{ipb.script_url}&act=ST&f=$fid&t=$tid&st={ipb.input['start']}";
+}
+</script>]]></section_content>
+			<func_name>poll_javascript</func_name>
+			<func_data><![CDATA[$tid="",$fid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<tr>
+    <td class="row1" colspan="3"><input type="radio" name="poll_vote" value="$id" class="radiobutton" />&nbsp;<b>$answer</b></td>
+</tr>]]></section_content>
+			<func_name>Render_row_form</func_name>
+			<func_data><![CDATA[$votes="",$id="",$answer=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1">$answer</td>
+	<td class="row1"> [ <b>$votes</b> ] </td>
+	<td class="row1"><{BAR_LEFT}><img src="{ipb.vars['img_url']}/bar.gif" width="$width" height="11" align="middle" alt="" /><{BAR_RIGHT}>&nbsp;[$percentage%]</td>
+</tr>]]></section_content>
+			<func_name>Render_row_results</func_name>
+			<func_data><![CDATA[$votes="",$id="",$answer="",$percentage="",$width=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<tr>
+    <td class="row1" colspan="3" align="center"><b>{ipb.lang['pv_total_votes']}: $total_votes</b></td>
+</tr>]]></section_content>
+			<func_name>show_total_votes</func_name>
+			<func_data><![CDATA[$total_votes=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<tr>
+			<td colspan="3" class="formbuttonrow"><!--IBF.VOTE-->&nbsp;<!--IBF.SHOW--></td>
+		</tr>
+		<tr>
+			<td class="catend" colspan="3"><!-- no content --></td>
+		</tr>
+		</table>
+</form>]]></section_content>
+			<func_name>ShowPoll_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_portal</group_name>
+			<section_content>$avatar</section_content>
+			<func_name>tmpl_wrap_avatar</func_name>
+			<func_data><![CDATA[$avatar=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<!--IBF.POLL_JS-->
+<form action="{ipb.script_url}act=Poll&amp;t=$tid&amp;st={ipb.input['st']}" method="post">
+		<table cellspacing="1">
+			<tr>
+				<th colspan="3" align="center"><b>$poll_q</b></th>
+			</tr>
+			<tr>
+				<td colspan="3" class="formsubtitle" align="right">$edit&nbsp;$delete</td>
+			</tr>]]></section_content>
+			<func_name>poll_header</func_name>
+			<func_data><![CDATA[$tid="",$poll_q="",$edit="",$delete=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formsubtitle" colspan="2">{ipb.lang['tt_options']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['mod_options']}</td>
+		<td class="pformright">$jump</select></td>
+	</tr>]]></section_content>
+			<func_name>mod_options</func_name>
+			<func_data><![CDATA[$jump=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<!-- REG NAME -->]]></section_content>
+			<func_name>nameField_reg</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['unreg_namestuff']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['guest_name']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="40" name="UserName" value="$data" class="textinput" /></td>
+	</tr>]]></section_content>
+			<func_name>nameField_unreg</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formsubtitle" colspan="2">{ipb.lang['ib_code_buttons']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">
+			<input type="radio" name="bbmode" value="ezmode" onclick="setmode(this.value)" />&nbsp;<b>{ipb.lang['bbcode_guided']}</b><br />
+			<input type="radio" name="bbmode" value="normal" onclick="setmode(this.value)" checked="checked" />&nbsp;<b>{ipb.lang['bbcode_normal']}</b>
+			<script type="text/javascript" src="jscripts/ipb_bbcode.js"></script>
+		</td>
+		<td class="pformright" valign="top">
+			<input type="button" accesskey="b" value=" B " onclick="simpletag('B')" class="codebuttons" name="B" style="font-weight: bold;" onmouseover="hstat('bold')" />
+			<input type="button" accesskey="i" value=" I " onclick="simpletag('I')" class="codebuttons" name="I" style="font-style: italic;" onmouseover="hstat('italic')" />
+			<input type="button" accesskey="u" value=" U " onclick="simpletag('U')" class="codebuttons" name="U" style="text-decoration: underline;" onmouseover="hstat('under')" />
+			<select name="ffont" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'FONT')"  onmouseover="hstat('font')">
+				<option value="0">{ipb.lang['ct_font']}</option>
+				<option value="Arial" style="font-family: Arial;">{ipb.lang['ct_arial']}</option>
+				<option value="Times" style="font-family: Times;">{ipb.lang['ct_times']}</option>
+				<option value="Courier" style="font-family: Courier;">{ipb.lang['ct_courier']}</option>
+				<option value="Impact" style="font-family: Impact;">{ipb.lang['ct_impact']}</option>
+				<option value="Geneva" style="font-family: Geneva;">{ipb.lang['ct_geneva']}</option>
+				<option value="Optima" style="font-family: Optima;">Optima</option>
+			</select>
+			<select name="fsize" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'SIZE')" onmouseover="hstat('size')">
+				<option value="0">{ipb.lang['ct_size']}</option>
+				<option value="1">{ipb.lang['ct_sml']}</option>
+				<option value="7">{ipb.lang['ct_lrg']}</option>
+				<option value="14">{ipb.lang['ct_lest']}</option>
+			</select>
+			<select name="fcolor" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'COLOR')" onmouseover="hstat('color')">
+				<option value="0">{ipb.lang['ct_color']}</option>
+				<option value="blue" style="color: blue;">{ipb.lang['ct_blue']}</option>
+				<option value="red" style="color: red;">{ipb.lang['ct_red']}</option>
+				<option value="purple" style="color: purple;">{ipb.lang['ct_purple']}</option>
+				<option value="orange" style="color: orange;">{ipb.lang['ct_orange']}</option>
+				<option value="yellow" style="color: yellow;">{ipb.lang['ct_yellow']}</option>
+				<option value="gray" style="color: gray;">{ipb.lang['ct_grey']}</option>
+				<option value="green" style="color: green;">{ipb.lang['ct_green']}</option>
+			</select>
+			&nbsp; <a href="javascript:closeall();" onmouseover="hstat('close')">{ipb.lang['js_close_all_tags']}</a>
+				<br />
+			<input type="button" accesskey="h" value=" http:// " onclick="tag_url()" class="codebuttons" name="url" onmouseover="hstat('url')" />
+			<input type="button" accesskey="g" value=" IMG " onclick="tag_image()" class="codebuttons" name="img" onmouseover="hstat('img')" />
+			<input type="button" accesskey="e" value="  @  " onclick="tag_email()" class="codebuttons" name="email" onmouseover="hstat('email')" />
+			<input type="button" accesskey="q" value=" QUOTE " onclick="simpletag('QUOTE')" class="codebuttons" name="QUOTE" onmouseover="hstat('quote')" />
+			<input type="button" accesskey="p" value=" CODE " onclick="simpletag('CODE')" class="codebuttons" name="CODE" onmouseover="hstat('code')" />
+			<input type="hidden" accesskey="l" value=" LIST " onclick="tag_list()" class="codebuttons" name="LIST" onmouseover="hstat('list')" />
+			<!--
+			<input type="button" accesskey="l" value=" SQL "     onclick="simpletag("SQL")"     class="codebuttons" name="SQL" />
+			<input type="button" accesskey="t" value=" HTML "    onclick="simpletag("HTML")"    class="codebuttons" name="HTML" />
+			-->
+				<br />
+			<input type="text" name="helpbox" size="50" maxlength="120" readonly="readonly" class="helpbox" value="{ipb.lang['hb_start']}" />
+				<br />
+			<b>{ipb.lang['hb_open_tags']}:</b>&nbsp;<input type="text" name="tagcount" size="3" maxlength="3" readonly="readonly" class="helpbox" value="0" />
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['post']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">
+			<!--SMILIE TABLE-->
+			<br />
+			(<a href="javascript:CheckLength()">{ipb.lang['check_length']}</a>)
+		</td>
+		<td class="pformright" valign="top"><textarea cols="70" rows="15" name="Post" tabindex="3" class="textarea">$data</textarea></td>
+	</tr>]]></section_content>
+			<func_name>pm_postbox_buttons</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}CODE=06&amp;act=Msg&amp;saved=1" name="mutliact" method="post">
+<div class="formsubtitle">{ipb.lang['pms_saved_title']}</div>
+<br />
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%">&nbsp;</th>
+			<th width="30%"><b>{ipb.lang['message_title']}</b></th>
+			<th width="30%"><b>{ipb.lang['pms_message_to']}</b></th>
+			<th width="20%"><b>{ipb.lang['pms_saved_date']}</b></th>
+			<th width="10%"><b>{ipb.lang['pms_cc_users']}</b></th>
+			<th align="center" width="5%"><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll();" /></th>
+		</tr>]]></section_content>
+			<func_name>unsent_table_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" valign="middle">{$data['icon']}</td>
+			<td class="row1">{$data['mt_title']}</td>
+			<td class="row1"><a href="{ipb.script_url}showuser={$data['memid']}">{$data['to_name']}</a></td>
+			<td class="row1">{$data['date']}</td>
+			<td class="row1"><input type="checkbox" name="msgid_{$data['mt_id']}" value="yes" onclick="CheckCheckAll(document.trackunread);" /></td>
+		</tr>]]></section_content>
+			<func_name>trackUNread_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td align="center" nowrap="nowrap" colspan="6" class="formbuttonrow"><input type="submit" name="delete" value="{ipb.lang['delete_button']}" /> {ipb.lang['selected_msg']}</td>
+		</tr>
+	</table>
+</div>
+</form>]]></section_content>
+			<func_name>unsent_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" valign="middle">{$data['msg']['icon']}</td>
+			<td class="row1">{$data['msg']['attach_img']}&nbsp;<a href="{ipb.script_url}act=Msg&amp;CODE=21&amp;MSID={$data['msg']['mt_id']}">{$data['msg']['mt_title']}</a></td>
+			<td class="row1"><a href="{ipb.script_url}showuser={$data['msg']['from_id']}">{$data['msg']['from_name']}</a></td>
+			<td class="row1">{$data['msg']['date']}</td>
+			<td class="row1" align="center">{$data['msg']['cc_users']}</td>
+			<td class="row1"><input type="checkbox" name="msgid_{$data['msg']['mt_id']}" value="yes" /></td>
+		</tr>]]></section_content>
+			<func_name>unsent_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}CODE=32&amp;act=Msg" name="trackunread" method="post">
+<div class="formsubtitle">{ipb.lang['tk_unread_messages']}</div>
+<p>{ipb.lang['tk_unread_desc']}</p>
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%">&nbsp;</th>
+			<th width="30%"><b>{ipb.lang['message_title']}</b></th>
+			<th width="30%"><b>{ipb.lang['pms_message_to']}</b></th>
+			<th width="20%"><b>{ipb.lang['tk_unread_date']}</b></th>
+			<th align="center" width="5%"><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll(document.trackunread);" /></th>
+		</tr>]]></section_content>
+			<func_name>trackUNread_table_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_online</group_name>
+			<section_content><![CDATA[<!-- End content Table -->
+		<tr>
+			<td colspan="4" class="formbuttonrow" align="center" valign="middle">
+				<form method="post" action="{ipb.script_url}act=Online&amp;CODE=listall">
+					<b>{ipb.lang['s_by']}&nbsp;</b>
+					<select class="forminput" name="sort_key">{$sort_key}</select>
+					<select class="forminput" name="show_mem">&nbsp;{$show_mem}</select>
+					<select class="forminput" name="sort_order">&nbsp;{$sort_order}</select>
+					<input type="submit" value="{ipb.lang['s_go']}" class="forminput" />
+				</form>
+			</td>
+		</tr>
+	</table>
+</div>
+<br />
+<div>$links</div>]]></section_content>
+			<func_name>Page_end</func_name>
+			<func_data><![CDATA[$show_mem="",$sort_order="",$sort_key="",$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_online</group_name>
+			<section_content><![CDATA[<script language='Javascript' type='text/javascript'>
+		<!--
+		function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
+			if (posleft != 0) { x = posleft }
+			if (postop  != 0) { y = postop  }
+		
+			if (!scroll) { scroll = 1 }
+			if (!resize) { resize = 1 }
+		
+			if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
+			  X = (screen.width  - width ) / 2;
+			  Y = (screen.height - height) / 2;
+			}
+			if (scroll != 0) { scroll = 1 }
+		
+			var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
+	     }
+		//-->
+	</script>
+<div align='left'>$links</div>
+<br />
+<div class="borderwrap">
+	<div class="maintitle">&nbsp;&nbsp;{ipb.lang['page_title']}</div>
+		<table cellspacing="1">
+			<tr>
+				<th width="30%">{ipb.lang['member_name']}</th>
+				<th width="30%">{ipb.lang['where']}</th>
+				<th align="center" width="20%">{ipb.lang['time']}</th>
+				<th width="10%">&nbsp;</th>
+			</tr>]]></section_content>
+			<func_name>Page_header</func_name>
+			<func_data><![CDATA[$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Mod&amp;CODE=20&amp;f=$fid&amp;t=$tid&amp;auth_key=$key"><{P_EDIT}></a>]]></section_content>
+			<func_name>edit_link</func_name>
+			<func_data><![CDATA[$tid="",$fid="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Mod&amp;CODE=22&amp;f=$fid&amp;t=$tid&amp;auth_key=$key"><{P_DELETE}></a>]]></section_content>
+			<func_name>delete_link</func_name>
+			<func_data><![CDATA[$tid="",$fid="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<input type="submit" name="submit" value="{ipb.lang['poll_add_vote']}" title="{ipb.lang['tt_poll_vote']}" />]]></section_content>
+			<func_name>button_vote</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<input type="button" name="viewresult" value="{ipb.lang['pl_show_vote']}"  title="{ipb.lang['tt_poll_svote']}" onclick="go_gadget_vote()" />]]></section_content>
+			<func_name>button_show_voteable</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<input type="button" value="{ipb.lang['pl_show_results']}" title="{ipb.lang['tt_poll_show']}" onclick="go_gadget_show()" />]]></section_content>
+			<func_name>button_show_results</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_poll</group_name>
+			<section_content><![CDATA[<input type="submit" name="nullvote" value="{ipb.lang['poll_null_vote']}" title="{ipb.lang['tt_poll_null']}" />]]></section_content>
+			<func_name>button_null_vote</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}CODE=31&amp;act=Msg" name="trackread" method="post">
+<div class="formsubtitle">{ipb.lang['tk_read_messages']}</div>
+<p>{ipb.lang['tk_read_desc']}</p>
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%">&nbsp;</th>
+			<th width="30%"><b>{ipb.lang['message_title']}</b></th>
+			<th width="30%"><b>{ipb.lang['pms_message_to']}</b></th>
+			<th width="20%"><b>{ipb.lang['tk_read_date']}</b></th>
+			<th align="center" width="5%"><input name="allbox" type="checkbox" value="Check All" onclick="CheckAll(document.trackread);" /></th>
+		</tr>]]></section_content>
+			<func_name>trackread_table_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_online</group_name>
+			<section_content><![CDATA[<!-- Entry for {$session['member_id']} -->
+			<tr>
+				<td class="row1">{$session['member_name']}</td>
+				<td class="row1">{$session['where_line']}</td>
+				<td class="row1" align="center">{$session['running_time']}</td>
+				<td class="row1" align="center">{$session['msg_icon']}</td>
+			</tr>
+<!-- End of Entry -->]]></section_content>
+			<func_name>show_row</func_name>
+			<func_data><![CDATA[$session=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td align="right" colspan="5" class="formbuttonrow"><input type="submit" name="endtrack" value="{ipb.lang['tk_untrack_button']}" /> {ipb.lang['selected_msg']}</td>
+		</tr>
+	</table>
+</div>
+</form>
+<br />]]></section_content>
+			<func_name>trackread_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1" valign="middle">{$data['icon']}</td>
+	<td class="row1">{$data['mt_title']}</td>
+	<td class="row1"><a href="{ipb.script_url}showuser={$data['memid']}">{$data['to_name']}</a></td>
+	<td class="row1">{$data['date']}</td>
+	<td class="row1"><input type="checkbox" name="msgid_{$data['mt_id']}" value="yes" onclick="CheckCheckAll(document.trackread);" /></td>
+</tr>]]></section_content>
+			<func_name>trackread_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td colspan="2" class="formsubtitle">{ipb.lang['msg_options']}</td>
+		</tr>
+		<tr>
+			<td class="pformleft">&nbsp;</td>
+			<td class="pformright">
+				<input type="checkbox" name="add_sent" value="yes" />&nbsp;<b>{ipb.lang['auto_sent_add']}</b>
+					<br />
+				<input type="checkbox" name="add_tracking" value="1" />&nbsp;<b>{ipb.lang['vm_track_msg']}</b>
+			</td>
+		</tr>
+		<tr>
+			<td class="formbuttonrow" align="center" colspan="2">
+				<input type="submit" value="{ipb.lang['submit_send']}" tabindex="4" accesskey="s" name="submit" />
+				<input type="submit" value="{ipb.lang['pm_pre_button']}" tabindex="5" name="preview" />
+				<input type="submit" value="{ipb.lang['pms_send_later']}" tabindex="6" name="save" />
+			</td>
+		</tr>
+	</table>
+</form>]]></section_content>
+			<func_name>send_form_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<b>CC:</b> $cc_users
+		<hr noshade="noshade" size="1" />]]></section_content>
+			<func_name>render_msg_show_cc</func_name>
+			<func_data><![CDATA[$cc_users=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+	function find_users(){
+		url = "index.{ipb.vars['php_ext']}?act=legends&CODE=finduser_one&s={ipb.session_id}&entry=textarea&name=carbon_copy&sep=line";
+		window.open(url,"FindUsers","width=400,height=250,resizable=yes,scrollbars=yes"); 
+	}
+-->
+</script>
+<form action="{ipb.script_url}" method="post" name="REPLIER" {$data['form_extra']} onsubmit="return ValidateForm(1)">
+<input type="hidden" name="act" value="Msg" />
+<input type="hidden" name="CODE" value="04" />
+<input type="hidden" name="MODE" value="01" />
+<input type="hidden" name="OID"  value="{$data['OID']}" />
+<input type="hidden" name="removeattachid" value="0" />
+<input type="hidden" name="post_key" value="{$data['post_key']}" />
+{$data['upload']}
+<table cellspacing="0">
+	<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['to_whom']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['address_list']}</td>
+		<td class="pformright">{$data[CONTACTS]}&nbsp;</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['enter_name']}</td>
+		<td class="pformright"><input type="text" name="entered_name" size="50" value="{$data[N_ENTER]}" tabindex="1" /></td>
+	</tr>
+		<!--IBF.MASS_PM_BOX-->
+	<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['enter_message']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['msg_title']}</td>
+		<td class="pformright"><input type="text" name="msg_title" size="40" tabindex="2" maxlength="40" value="{$data[O_TITLE]}" /></td>
+	</tr>]]></section_content>
+			<func_name>Send_form</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" valign="middle"><a href="{ipb.script_url}act=Profile&amp;CODE=03&amp;MID={$entry['contact_id']}"><b>{$entry['contact_name']}</b></a> &nbsp; &nbsp;[ {$entry['contact_desc']} ]</td>
+			<td class="row1" valign="middle">[ <a href="{ipb.script_url}act=Msg&amp;CODE=11&amp;MID={$entry['contact_id']}">{ipb.lang['edit']}</a> ] :: [ <a href="{ipb.script_url}act=Msg&amp;CODE=10&amp;MID={$entry['contact_id']}">{ipb.lang['delete']}</a> ]&nbsp;&nbsp;( {$entry['text']} )</td>
+		</tr>]]></section_content>
+			<func_name>render_address_row</func_name>
+			<func_data><![CDATA[$entry=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{$post['mt_title']}</div>
+	<div align="right" style='padding:2px;'>[ <a href="{ipb.script_url}CODE=04&amp;act=Msg&amp;MSID={$post['mt_id']}&amp;MID={$author['id']}&amp;fwd=1">{ipb.lang['vm_forward_pm']}</a> | <a href="{ipb.script_url}CODE=04&amp;act=Msg&amp;MID={$author['id']}&amp;MSID={$post['mt_id']}">{ipb.lang['pm_reply_link']}</a> ]</div>
+	
+	<div class="borderwrapm">
+		<div class="subtitle">{ipb.lang['m_pmessage']}</div>
+			<table cellspacing="1">
+				<tr>
+					<td valign="middle" class="row2"><span class="normalname"><a href="{ipb.script_url}showuser={$author['id']}">{$author['name']}</a></span></td>
+					<td class="row2" valign="top">
+						<!-- POSTED DATE DIV -->
+						<div class="row2" style='float:left'>
+							{$data[POST]['post_icon']}<span class="postdetails"><b>{$post['mt_title']}</b>, {$post['msg_date']}</span>
+						</div>
+						<!-- DELETE  DIV -->
+						<div align="right"><a href="{ipb.script_url}CODE=05&amp;act=Msg&amp;MSID={$post['mt_id']}&amp;VID={$author['VID']}"><{P_DELETE}></a>&nbsp;<a href="{ipb.script_url}CODE=04&amp;act=Msg&amp;MID={$author['id']}&amp;MSID={$post['mt_id']}"><{P_QUOTE}></a></div>
+					</td>
+				</tr>
+				<tr>
+					<td valign="top" class="post1">
+						<span class="postdetails">
+							{$author['avatar']}<br /><br />
+							{$author['title']}<br />
+							{$author['member_rank_img']}<br /><br />
+							{$author['member_group']}<br />
+							{$author['member_posts']}<br />
+							{$author['member_number']}<br />
+							{$author['member_joined']}<br /><br />
+							{$author['warn_text']} {$author['warn_minus']}{$author['warn_img']}{$author['warn_add']}
+						</span>
+						<br />
+						<!--$ author[field_1]-->
+						<img src="{ipb.vars['img_url']}/spacer.gif" alt="" width="160" height="1" /><br /> 
+					</td>
+					<td width="100%" valign="top" class="post1">
+						{$post['show_cc_users']}
+						<div class="postcolor">{$post['msg_post']} <!--IBF.ATTACHMENT_{$post['msg_id']}--></div>
+						{$author['signature']}
+					</td>
+				</tr>
+				<tr>
+					<td class="darkrow3">[ <a href="{ipb.script_url}CODE=02&amp;act=Msg&amp;MID={$author['id']}">{ipb.lang['add_to_book']}</a> ]</td>
+					<td class="darkrow3" nowrap="nowrap">
+						<!-- EMAIL / WWW / MSGR -->
+						<div class="darkrow3" style='float:left'>
+							{$author['addresscard']}{$author['message_icon']}{$author['email_icon']}{$author['website_icon']}{$author['icq_icon']}{$author['aol_icon']}{$author['yahoo_icon']}{$author['msn_icon']}
+						</div>
+						<!-- UP -->
+						<div align="right"><a href="javascript:scroll(0,0);"><{P_UP}></a></div>
+					</td>
+				</tr>
+			</table>
+		</div>
+		
+		<div style='padding:4px;float:left'>
+			<form action="{ipb.script_url}" name="jump" method="post">
+			<input type="hidden" name="act" value="Msg" />
+			<input type="hidden" name="CODE" value="01" />
+				{ipb.lang['goto_folder']}:&nbsp; {$jump}
+			<input type="submit" name="submit" value="{ipb.lang[goto_submit]}" />
+			</form>
+		</div>
+		<div align="right" style='padding:4px'>[ <a href="{ipb.script_url}CODE=04&amp;act=Msg&amp;MSID={$post['mt_id']}&amp;MID={$author['id']}&amp;fwd=1">{ipb.lang['vm_forward_pm']}</a> | <a href="{ipb.script_url}CODE=04&amp;act=Msg&amp;MID={$author['id']}&amp;MSID={$post['mt_id']}">{ipb.lang['pm_reply_link']}</a> ]</div>
+		<br />]]></section_content>
+			<func_name>Render_msg</func_name>
+			<func_data><![CDATA[$post="",$author="",$jump=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['pm_preview']}</div>
+	<p>$data</p>]]></section_content>
+			<func_name>preview</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<p><input type="text" name="{$data[ID]}" value="{$data[REAL]}" />{$data[EXTRA]}</p>]]></section_content>
+			<func_name>prefs_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Msg" />
+<input type="hidden" name="CODE" value="08" />
+	<div class="formsubtitle">{ipb.lang['prefs_current']}</div>
+	<p>{ipb.lang['prefs_text_a']}</p>]]></section_content>
+			<func_name>prefs_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td colspan="2" class="formsubtitle">{ipb.lang['carbon_copy_title']}</td>
+		</tr>
+		<tr>
+			<td class="pformleft">{ipb.lang['carbon_copy_desc']}</td>
+			<td class="pformright">
+				<textarea name="carbon_copy" rows="5" cols="40">$names</textarea><br />
+				<input type="button" name="findusers" onclick="find_users()" value="{ipb.lang['find_user_names']}" />
+				<br /><input type="checkbox" name="mt_hide_cc" value="1" />&nbsp;<b>{ipb.lang['cc_hide_users']}</b>
+			</td>
+		</tr>]]></section_content>
+			<func_name>mass_pm_box</func_name>
+			<func_data><![CDATA[$names=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="row1" colspan="5" align="center"><b>{ipb.lang['inbox_no_msg']}</b></td>
+		</tr>]]></section_content>
+			<func_name>No_msg_inbox</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['err_errors']}</div>
+	<span class="postcolor"><p>$data<br /><br />{ipb.lang['pme_none_sent']}</p></span>]]></section_content>
+			<func_name>pm_errors</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['prefs_new']}</div>
+	<p>{ipb.lang['prefs_text_b']}</p>]]></section_content>
+			<func_name>prefs_add_dirs</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['prefs_submit']}" /></div>
+</form>]]></section_content>
+			<func_name>prefs_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr id="{$msg['mt_id']}">
+			<td align="center" valign="middle" class="row1">{$msg['icon']}</td>
+			<td class="row1">{$msg['attach_img']}&nbsp;<a href="{ipb.script_url}act=Msg&amp;CODE=03&amp;VID={$msg['mt_vid_folder']}&amp;MSID={$msg['mt_id']}">{$msg['mt_title']}</a></td>
+			<td class="row1"><a href="{ipb.script_url}showuser={$msg['from_id']}">{$msg['from_name']}</a> {$msg['add_to_contacts']}</td>
+			<td class="row1">{$msg['date']}</td>
+			<td align="center" class="row1"><input type="hidden" name="{$msg['mt_id']}" value="{$msg['mt_read']}" /><input type="checkbox" name="msgid_{$msg['mt_id']}" value="yes" onclick="cca(this);" /></td>
+		</tr>]]></section_content>
+			<func_name>inbox_row</func_name>
+			<func_data><![CDATA[$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<!-- inbox folder -->
+<div class="formsubtitle">$dirname</div>
+	<table cellspacing="0">
+		<tr>
+			<td valign="middle">
+				<!-- LEFT -->
+				<table cellspacing="1" class="inbox">
+					<tr>
+						<td class="row1" colspan="3">{$info['full_messenger']}</td>
+					</tr>
+					<tr>
+						<td valign="middle" class="row1" colspan="3"><{BAR_LEFT}><img src="{ipb.vars['img_url']}/bar.gif" width="{$info['img_width']}" height="11" align="middle" alt="" /><{BAR_RIGHT}></td>
+					</tr>
+					<tr>
+						<td class="row1" width="33%" valign="middle">0%</td>
+						<td class="row1" width="33%" align="center" valign="middle">50%</td>
+						<td class="row1" width="33%" align="right" valign="middle">100%</td>
+					</tr>
+				</table>
+			</td>
+			
+			<!-- RIGHT -->
+			<td align="right" valign="bottom">
+				$pages<br /><br />
+				<a href="javascript:select_read()">{ipb.lang['pmpc_mark_read']}</a> :: <a href="javascript:unselect_all()">{ipb.lang['pmpc_unmark_all']}</a><br /><br />
+				<form action="{ipb.script_url}CODE=01&amp;act=Msg" name="jump" method="post">
+					<b>{ipb.lang['goto_folder']}: </b>&nbsp; $vdi_html 
+					<input type="submit" name="submit" value="{ipb.lang['goto_submit']}" />
+				</form>
+			</td>
+		</tr>
+	</table>
+<!-- INBOX TABLE -->
+  
+<form action="{ipb.script_url}CODE=06&amp;act=Msg" name="mutliact" method="post">
+<input type="hidden" name="curvid" value="$curvid" />
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%">&nbsp;</th>
+			<th width="35%"><a href="{ipb.script_url}act=Msg&amp;CODE=01&amp;VID={$info['vid']}&amp;sort=title&amp;st={ipb.input['st']}"><b>{ipb.lang['message_title']}</b></a></th>
+			<th width="30%"><a href="{ipb.script_url}act=Msg&amp;CODE=01&amp;VID={$info['vid']}&amp;sort=name&amp;st={ipb.input['st']}"><b>{ipb.lang['message_from']}</b></a></th>
+			<th width="25%"><a href="{ipb.script_url}act=Msg&amp;CODE=01&amp;VID={$info['vid']}&amp;sort={$info['date_order']}&amp;st={ipb.input['st']}"><b>{ipb.lang['message_date']}</b></a></th>
+			<th align="center" width="5%"><input name="allbox" type="checkbox" value="Check All" onclick="InboxCheckAll();" /></th>
+		</tr>]]></section_content>
+			<func_name>inbox_table_header</func_name>
+			<func_data><![CDATA[$dirname="",$info="",$vdi_html="",$pages="",$curvid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Msg" />
+<input type="hidden" name="CODE" value="09" />
+	<div class="formsubtitle">{ipb.lang['member_add']}</div>
+	<table cellspacing="0">
+		<tr>
+			<td valign="middle">{ipb.lang['enter_a_name']}<br /><input type="text" name="mem_name" size="20" maxlength="40" value="$mem_to_add" /></td>
+			<td valign="middle">{ipb.lang['enter_desc']}<br /><input type="text" name="mem_desc" size="30" maxlength="60" value="" /></td>
+			<td valign="middle">{ipb.lang['allow_msg']}<br /><select name="allow_msg"><option value="yes" selected="selected">{ipb.lang['yes']}</option><option value="no">{ipb.lang['no']}</option></select></td>
+		</tr>
+	</table>
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['submit_address']}" /></div>
+</form>]]></section_content>
+			<func_name>address_add</func_name>
+			<func_data><![CDATA[$mem_to_add=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+				<td class="row1" colspan="3" align="center"><input type="checkbox" class="checkbox" name="save_unread" value="1" checked="checked" /> <b>{ipb.lang['fd_save_unread']}</b></td>
+			</tr>]]></section_content>
+			<func_name>empty_folder_save_unread</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[</table>
+	</div>
+<br />]]></section_content>
+			<func_name>end_address_table</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+				<td align="right" colspan="5" class="formbuttonrow">
+					<input type="submit" name="move" value="{ipb.lang['move_button']}" /> $vdi_html {ipb.lang['move_or_delete']} <input type="submit" name="delete" value="{ipb.lang['delete_button']}" /> {ipb.lang['selected_msg']}
+				</td>
+			</tr>
+		</table>
+	</div>
+</form>
+<div style="padding: 5px;">
+	<div class="wrapmini"><{M_READ}>&nbsp;{ipb.lang['icon_read']}<br /><{M_UNREAD}>&nbsp;{ipb.lang['icon_unread']}</div>
+	<div align="right">$pages<br /><i>$amount_info</i></div>
+</div>]]></section_content>
+			<func_name>end_inbox</func_name>
+			<func_data><![CDATA[$vdi_html="",$amount_info="",$pages=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Msg" />
+<input type="hidden" name="CODE" value="dofolderdelete" />
+	<div class="formsubtitle">{ipb.lang['mi_prune_msg']}</div>
+	<p>{ipb.lang['fd_text']}</p>
+	<div class="borderwrapm">
+		<table cellspacing="1">
+			<tr>
+				<th>{ipb.lang['fd_name']}</th>
+				<th>{ipb.lang['fd_count']}</th>
+				<th>{ipb.lang['fd_empty']}</th>
+			</tr>]]></section_content>
+			<func_name>empty_folder_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+				<td class="row1"><b>$real</b></td>
+				<td class="row1" align="center">$cnt</td>
+				<td class="row1" align="center"><input type="checkbox" class="checkbox" name="its_$id" value="1" /></td>
+			</tr>]]></section_content>
+			<func_name>empty_folder_row</func_name>
+			<func_data><![CDATA[$real="",$id="",$cnt=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[</table>
+			<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['fd_continue']}" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>empty_folder_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[</div>
+</body>
+</html>]]></section_content>
+			<func_name>archive_html_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<html>
+<head>
+	<title>{ipb.lang['pma_title']}</title>
+	<style type="text/css">
+		html{
+			overflow-x: auto;
+		}
+		
+		body{
+			background-color: #fff;
+			color: #000;
+			font-family: Verdana, Tahoma, Arial, sans-serif;
+			font-size: 11px;
+			margin:0px;
+			padding:0px;
+			text-align:center;
+		   }
+		   
+		a:link, a:visited, a:active{
+			color: #000;
+			text-decoration: underline;
+		}
+		
+		a:hover{
+			color: #465584;
+			text-decoration:underline;
+		}
+		
+		img{
+			border: 0;
+			vertical-align: middle;
+		}
+				
+		#ipbwrapper{
+			margin: 0 auto 0 auto;
+			text-align: left;
+			width: 95%;
+		}
+		
+		.post1{
+			background-color: #F5F9FD;
+		}
+		
+		.post2{
+			background-color: #EEF2F7;
+		}
+	
+		/* Common elements */
+		.row1{
+			background-color: #F5F9FD;
+		}
+		
+		.row1{
+			background-color: #DFE6EF;
+		}
+		
+		.row3{
+			background-color: #EEF2F7;
+		}
+		
+		.row2{
+			background-color: #E4EAF2;
+		}
+	
+		/* tableborders gives the white column / row lines effect */
+		.plainborder{
+			background-color: #F5F9FD
+			border: 1px solid #345487;
+		}
+		
+		.tableborder{
+			background-color: #FFF;
+			border: 1px solid #345487;
+			margin: 0;
+			padding: 0;
+		}
+		
+		.tablefill{
+			background-color: #F5F9FD;
+			border: 1px solid #345487;
+			padding: 6px;
+		}
+		
+		.tablepad{
+			background-color: #F5F9FD;
+			padding:6px;
+		}
+		
+		.tablebasic{
+			border: 0;
+			margin: 0;
+			padding: 0;
+			width:100%;
+		}
+	
+		.pformstrip{
+			background-color: #D1DCEB;
+			color: #3A4F6C;
+			font-weight: bold;
+			margin-top:1px
+			padding:7px;
+		}
+		
+		#QUOTE{
+			background-color: #FAFCFE;
+			border: 1px solid #000;
+			color: #465584;
+			font-family: Verdana, Arial;
+			font-size: 11px;
+			padding: 2px;
+		}
+		
+		#CODE{
+			background-color: #FAFCFE;
+			border: 1px solid #000;
+			color: #465584;
+			font-family: Courier, Courier New, Verdana, Arial;
+			font-size: 11px;
+			padding: 2px;
+		}
+		/* Main table top (dark blue gradient by default) */
+		.maintitle{
+			background-color: #D1DCEB;
+			background-image: url({ipb.vars['board_url']}/style_images/<#IMG_DIR#>/tile_back.gif);
+			color: #FFF;
+			font-weight: bold;
+			padding:8px 0px 8px 5px;
+			vertical-align:middle;
+		}
+		
+		.maintitle a:link, .maintitle  a:visited, .maintitle  a:active{
+			color: #fff;
+			text-decoration: none;
+		}
+		
+		.maintitle a:hover{
+			text-decoration: underline;
+		}
+		
+		/* Topic View elements */
+		.signature{
+			color: #339;
+			font-size: 10px;
+			line-height:150%;
+		}
+		
+		.postdetails{
+			font-size: 10px;
+		}
+		
+		.postcolor{
+			font-size: 12px;
+			line-height: 160%;
+		}
+	</style>
+</head>
+<body>
+ <div id="ipbwrapper">]]></section_content>
+			<func_name>archive_html_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="borderwrapm">
+	<div class="maintitle"><{M_UNREAD}>&nbsp;PM: {$info['msg_title']}</div>
+	<div class="tablefill"><div class="postcolor">{$info['msg_content']}</div></div>
+	<div class="formsubtitle">Sent by <b>{$info['msg_sender']}</b> on {$info['msg_date']}</div>
+</div>
+<br />]]></section_content>
+			<func_name>archive_html_entry</func_name>
+			<func_data><![CDATA[$info=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="borderwrapm">
+	<div class="maintitle"><{B_MOVED}>&nbsp;PM: {$info['msg_title']}</div>
+	<div class="tablefill"><div class="postcolor">{$info['msg_content']}</div></div>
+	<div class="formsubtitle">Sent to <b>{$info['msg_sender']}</b> on {$info['msg_date']}</div>
+</div>
+<br />]]></section_content>
+			<func_name>archive_html_entry_sent</func_name>
+			<func_data><![CDATA[$info=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Msg" />
+<input type="hidden" name="CODE" value="12" />
+<input type="hidden" name="MID" value="{$data[MEMBER]['contact_id']}"  />
+	<div class="formsubtitle">{ipb.lang['member_edit']}</div>
+	<table cellspacing="0">
+		<tr>
+			<td valign="middle"><b>{$data[MEMBER]['contact_name']}</b></td>
+			<td valign="middle">{ipb.lang['enter_desc']}<br /><input type="text" name="mem_desc" size="30" maxlength="60" value="{$data[MEMBER]['contact_desc']}" /></td>
+			<td valign="middle">{ipb.lang['allow_msg']}<br />{$data[SELECT]}</td>
+		</tr>
+	</table>
+	<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['submit_address_edit']}" /></div>
+</form>]]></section_content>
+			<func_name>address_edit</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['address_current']}</div>]]></section_content>
+			<func_name>Address_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<p class="pcen">{ipb.lang['address_none']}</p>]]></section_content>
+			<func_name>Address_none</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<br />
+	<div class="borderwrapm">
+		<table cellspacing="1">
+			<tr>
+				<th><b>{ipb.lang['member_name']}</b></th>
+				<th width="60%"><b>{ipb.lang['enter_block']}</b></th>
+			</tr>]]></section_content>
+			<func_name>Address_table_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['arc_comp_title']}</div>
+	<p>{ipb.lang['arc_complete']}</p>]]></section_content>
+			<func_name>archive_complete</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Msg" />
+<input type="hidden" name="CODE" value="15" />
+	
+<div class="formsubtitle">{ipb.lang['archive_title']}</div>
+	<p>{ipb.lang['archive_text']}</p>
+		<table cellspacing="0">
+			<tr>
+				<td><b>{ipb.lang['arc_folders']}</b></td>
+				<td>$jump_html</td>
+			</tr>
+			<tr>
+				<td><b>{ipb.lang['arc_dateline']}</b></td>
+				<td valign="middle">
+					<select name="dateline">
+						<option value="1">1</option>
+						<option value="7">7</option>
+						<option value="30" selected="selected">30</option>
+						<option value="90">90</option>
+						<option value="365">365</option>
+						<option value="all">{ipb.lang['arc_alldays']}</option>
+					</select>
+						&nbsp;&nbsp;{ipb.lang['arc_days']}
+					<select name="oldnew">
+						<option value="newer" selected="selected">{ipb.lang['arch_new']}</option>
+						<option value="older">{ipb.lang['arch_old']}</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td><b>{ipb.lang['arc_max']}</b></td>
+				<td valign="middle"><select name="number"><option value="5">5</option><option value="10">10</option><option value="20" selected="selected">20</option><option value="30">30</option><option value="40">40</option><option value="50">50</option></select></td>
+			</tr>
+			<tr>
+				<td><b>{ipb.lang['arc_delete']}</b></td>
+				<td valign="middle"><select name="delete"><option value="yes">{ipb.lang['arc_yes']}</option><option value="no" selected="selected">{ipb.lang['arc_no']}</option></select></td>
+			</tr>
+			<tr>
+				<td><b>{ipb.lang['arc_type']}</b></td>
+				<td valign="middle"><select name="type"><option value="xls" selected="selected">{ipb.lang['arc_xls']}</option><option value="html">{ipb.lang['arc_html']}</option></select></td>
+			</tr>
+		</table>
+		<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['arc_submit']}" /></div>
+</form>]]></section_content>
+			<func_name>archive_form</func_name>
+			<func_data><![CDATA[$jump_html=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br /><b>{ipb.lang['gw_nochex']}</b>
+</p>
+<form action="https://www.nochex.com/nochex.dll/checkout" method="post">
+<input type="hidden" name="email" value="$nochex_email" />
+<input type="hidden" name="amount" value="$to_pay" />
+<input type="hidden" name="ordernumber" value="{$new_sub_id}x{$member_id}x$cur_tran_id" />
+<input type="hidden" name="returnurl" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=nochex" />
+<input type="hidden" name="responderurl" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=nochex" />
+	<br /><br />
+	<div>
+		<input type="image" src="http://www.nochex.com/web/images/payme4.gif" name="submit" alt="Pay with NOCHEX now" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_nochex_upgrade_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$nochex_email="",$sub_title="",$cur_tran_id="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+	function pop_ticket(){
+		window.open('{$ibforums->js_base_url}act=module&module=subscription&type=manual&CODE=custom&mode=ticket&tickid=0&upgrade=0&sid=$new_sub_id&currency=$ccode','TICKET','width=250,height=350,resizable=yes,scrollbars=yes,toolbar=yes');
+	}
+-->
+</script>
+<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+	<p>
+		$desc_string<br /><br />
+		ipb.lang['post_manual']}<br /><br />
+		{ipb.lang['post_manual_more']}
+	</p>
+	<br /><br />
+	<div>
+		<input type="button" value="{ipb.lang['gw_manual']}" onclick="pop_ticket()" />
+	</div>]]></section_content>
+			<func_name>do_manual_normal_screen</func_name>
+			<func_data><![CDATA[$new_sub_id="",$desc_string="",$ccode=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+function pop_ticket(){
+	window.open('{$ibforums->js_base_url}act=module&module=subscription&type=manual&CODE=custom&mode=ticket&tickid={$cur_id}&upgrade=1&sid=$new_sub_id&currency=$ccode','TICKET','width=250,height=350,resizable=yes,scrollbars=yes,toolbar=yes');
+}
+-->
+</script>
+<div class="formsubtitle">{ipb.lang['sc_upgrade_title']}</div>
+	<p>
+		$desc_string<br /><br />
+		{ipb.lang['post_manual']}<br /><br />
+		{ipb.lang['post_manual_more']}
+	</p>
+	<br /><br />
+	<div>
+		<input type="button" value="{ipb.lang['gw_manual']}" onclick="pop_ticket()" />
+	</div>]]></section_content>
+			<func_name>do_manual_upgrade_screen</func_name>
+			<func_data><![CDATA[$new_sub_id="",$cur_id="",$desc_string="",$ccode=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<br />
+<input type="checkbox" size="40" value="1" name="allow_disc" class="forminput" />&nbsp;{ipb.lang['poll_only']}]]></section_content>
+			<func_name>poll_options</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formsubtitle" colspan="2">{ipb.lang['ib_code_buttons']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">
+			<input type="radio" name="bbmode" value="ezmode" onclick="setmode(this.value)" />&nbsp;<b>{ipb.lang['bbcode_guided']}</b><br />
+			<input type="radio" name="bbmode" value="normal" onclick="setmode(this.value)" checked="checked" />&nbsp;<b>{ipb.lang['bbcode_normal']}</b>
+			<script type="text/javascript" src="jscripts/ipb_bbcode.js"></script>
+		</td>
+		<td class="pformright" valign="top">
+			<input type="button" accesskey="b" value=" B " onclick="simpletag('B')" class="codebuttons" name="B" style="font-weight: bold;" onmouseover="hstat('bold')" />
+			<input type="button" accesskey="i" value=" I " onclick="simpletag('I')" class="codebuttons" name="I" style="font-style: italic;" onmouseover="hstat('italic')" />
+			<input type="button" accesskey="u" value=" U " onclick="simpletag('U')" class="codebuttons" name="U" style="text-decoration: underline;" onmouseover="hstat('under')" />
+			
+			<select name="ffont" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'FONT')"  onmouseover="hstat('font')">
+				<option value="0">{ipb.lang['ct_font']}</option>
+				<option value="Arial" style="font-family: Arial;">{ipb.lang['ct_arial']}</option>
+				<option value="Times" style="font-family: Times;">{ipb.lang['ct_times']}</option>
+				<option value="Courier" style="font-family: Courier;">{ipb.lang['ct_courier']}</option>
+				<option value="Impact" style="font-family: Impact;">{ipb.lang['ct_impact']}</option>
+				<option value="Geneva" style="font-family: Geneva;">{ipb.lang['ct_geneva']}</option>
+				<option value="Optima" style="font-family: Optima;">Optima</option>
+			</select>
+			<select name="fsize" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'SIZE')" onmouseover="hstat('size')">
+				<option value="0">{ipb.lang['ct_size']}</option>
+				<option value="1">{ipb.lang['ct_sml']}</option>
+				<option value="7">{ipb.lang['ct_lrg']}</option>
+				<option value="14">{ipb.lang['ct_lest']}</option>
+			</select>
+			<select name="fcolor" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'COLOR')" onmouseover="hstat('color')">
+				<option value="0">{ipb.lang['ct_color']}</option>
+				<option value="blue" style="color: blue;">{ipb.lang['ct_blue']}</option>
+				<option value="red" style="color: red;">{ipb.lang['ct_red']}</option>
+				<option value="purple" style="color: purple;">{ipb.lang['ct_purple']}</option>
+				<option value="orange" style="color: orange;">{ipb.lang['ct_orange']}</option>
+				<option value="yellow" style="color: yellow;">{ipb.lang['ct_yellow']}</option>
+				<option value="gray" style="color: gray;">{ipb.lang['ct_grey']}</option>
+				<option value="green" style="color: green;">{ipb.lang['ct_green']}</option>
+			</select>
+			&nbsp; <a href="javascript:closeall();" onmouseover="hstat('close')">{ipb.lang['js_close_all_tags']}</a>
+				<br />
+			<input type="button" accesskey="h" value=" http:// " onclick="tag_url()" class="codebuttons" name="url" onmouseover="hstat('url')" />
+			<input type="button" accesskey="g" value=" IMG " onclick="tag_image()" class="codebuttons" name="img" onmouseover="hstat('img')" />
+			<input type="button" accesskey="e" value="  @  " onclick="tag_email()" class="codebuttons" name="email" onmouseover="hstat('email')" />
+			<input type="button" accesskey="q" value=" QUOTE " onclick="simpletag('QUOTE')" class="codebuttons" name="QUOTE" onmouseover="hstat('quote')" />
+			<input type="button" accesskey="p" value=" CODE " onclick="simpletag('CODE')" class="codebuttons" name="CODE" onmouseover="hstat('code')" />
+			<input type="hidden" accesskey="l" value=" LIST " onclick="tag_list()" class="codebuttons" name="LIST" onmouseover="hstat('list')" />
+			<!--
+			<input type="button" accesskey="l" value=" SQL "     onclick="simpletag("SQL")"     class="codebuttons" name="SQL" />
+			<input type="button" accesskey="t" value=" HTML "    onclick="simpletag("HTML")"    class="codebuttons" name="HTML" />
+			-->
+				<br />
+			<input type="text" name="helpbox" size="50" maxlength="120" readonly="readonly" class="helpbox" value="{ipb.lang['hb_start']}" />
+				<br />
+			<b>{ipb.lang['hb_open_tags']}:</b>&nbsp;<input type="text" name="tagcount" size="3" maxlength="3" readonly="readonly" class="helpbox" value="0" />
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['post']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft" align="center">
+			<!--SMILIE TABLE-->
+			<br /><div class="desc"><b><a href="javascript:CheckLength()">{ipb.lang['check_length']}</a> &middot; <a href="javascript:bbc_pop()">{ipb.lang['bbc_help']}</a></b></div>
+		</td>
+		<td class="pformright" valign="top"><textarea cols="80" rows="20" name="Post" tabindex="5" class="textarea">$data</textarea></td>
+	</tr>
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['po_options']}</b></td>
+		<td class="pformright">
+			<!--IBF.HTML-->
+			<!--IBF.EMO-->
+			<!--IBF.SIG-->
+			<!--IBF.TRACK-->
+		</td>
+	</tr>]]></section_content>
+			<func_name>postbox_buttons</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" name="submit" value="$data" tabindex="4" class="button" accesskey="s" />&nbsp;</td>
+	</tr>
+</table>
+</form>
+<br style="clear: all;" />]]></section_content>
+			<func_name>poll_end_form</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td colspan="2" class="formsubtitle">{ipb.lang['tt_poll_settings']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft"><b>{ipb.lang['poll_question']}</b></td>
+		<td class="pformright"><input type="text" tabindex="3" size="40" maxlength="250" name="pollq" value="{ipb.input['pollq']}" class="forminput" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['poll_choices']}<br /><br />$extra</td>
+		<td class="pformright"><textarea cols="60" tabindex="4" rows="12" name="PollAnswers" class="textarea">$data</textarea><!--IBF.POLL_OPTIONS--></td>
+	</tr>]]></section_content>
+			<func_name>poll_box</func_name>
+			<func_data><![CDATA[$data="",$extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="formsubtitle" colspan="2">{ipb.lang['upload_title']}</td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['upload_text']} $data</td>
+		<td class="pformright" width="100%">
+			<table cellspacing="0">
+				<tr>
+					<td><input type="radio" name="editupload" value="keep" checked /></td>
+					<td width="100%"><b>{ipb.lang['eu_keep']}</b> ( $file_name )</td>
+				</tr>
+				<tr>
+					<td><input type="radio" name="editupload" value="delete" /></td>
+					<td width="100%"><b>{ipb.lang['eu_delete']}</b></td>
+				</tr>
+				<tr>
+					<td valign="middle"><input type="radio" name="editupload" value="new" /></td>
+					<td><b>{ipb.lang['eu_new']}</b><br /><input class="forminput" type="file" size="30" name="FILE_UPLOAD" onclick="document.REPLIER.editupload[2].checked=true;" /></td>
+				</tr>
+			</table>
+		</td>
+	</tr>]]></section_content>
+			<func_name>edit_upload_field</func_name>
+			<func_data><![CDATA[$data="",$file_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_post</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft"><b>{ipb.lang['edit_ops']}</b></td>
+		<td class="pformright"><input type="checkbox" name="add_edit" value="1" $checked class="forminput" />&nbsp;{ipb.lang['append_edit']}</td>
+	</tr>]]></section_content>
+			<func_name>add_edit_box</func_name>
+			<func_data><![CDATA[$checked=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_login</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="formsubtitle">{ipb.lang['errors_found']}</div>
+	<div class="tablepad"><span class="postcolor">$data</span></div>
+</div>
+<br />]]></section_content>
+			<func_name>errors</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_login</group_name>
+			<section_content><![CDATA[<script language='JavaScript' type="text/javascript">
+<!--
+function ValidateForm() {
+	var Check = 0;
+	if (document.LOGIN.UserName.value == '') { Check = 1; }
+	if (document.LOGIN.PassWord.value == '') { Check = 1; }
+	if (Check == 1) {
+		alert("{ipb.lang['blank_fields']}");
+		return false;
+	} else {
+		document.LOGIN.submit.disabled = true;
+		return true;
+	}
+}
+//-->
+</script> 
+<form action="{ipb.script_url}act=Login&amp;CODE=01" method="post" name="LOGIN" onsubmit="return ValidateForm()">
+	<input type="hidden" name="referer" value="$referer" />
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['log_in']}</div>
+		<div class="formsubtitle">$message</div>
+		<div class="errorwrap">
+			<h4>Attention!</h4>
+			<p>{ipb.lang['login_text']}</p>
+			<p><b>{ipb.lang['forgot_pass']} <a href="{ipb.vars['board_url']}/index.{ipb.vars['php_ext']}?act=Reg&amp;CODE=10">{ipb.lang['pass_link']}</a></b></p>
+		</div>
+		<table cellspacing="1">
+			<tr>
+				<td width="60%" valign="top">
+					<fieldset>
+						<legend><b>{ipb.lang['log_in']}</b></legend>
+						<table cellspacing="1">
+							<tr>
+<if="ipb.vars['converge_login_method'] == 'username'">
+<td width="50%"><b>{ipb.lang['enter_name']}</b></td>
+								<td width="50%"><input type="text" size="25" maxlength="64" name="UserName" class="forminput" /></td>
+</if>
+<else>
+<td width="50%"><b>{ipb.lang['enter_email']}</b></td>
+								<td width="50%"><input type="text" size="25" value="{ipb.input['UserName']}" maxlength="64" name="UserName" class="forminput" /></td>
+</else>
+
+							</tr>
+							<tr>
+								<td width="50%"><b>{ipb.lang['enter_pass']}</b></td>
+								<td width="50%"><input type="password" size="25" name="PassWord" class="forminput" /></td>
+							</tr>
+						</table>
+					</fieldset>
+				</td>
+				<td width="40%" valign="top">
+					<fieldset>
+						<legend><b>{ipb.lang['options']}</b></legend>
+						<table cellspacing="1">
+							<tr>
+								<td width="10%"><input type="checkbox" name="CookieDate" value="1" checked="checked" /></td>
+								<td width="90%"><b>{ipb.lang['rememberme']}</b><br /><span class="desc">{ipb.lang['notrecommended']}</span></td>
+							</tr>
+							<tr>
+								<td width="10%"><input type="checkbox" name="Privacy" value="1" /></td>
+								<td width="90%"><b>{ipb.lang['form_invisible']}</b><br /><span class="desc">{ipb.lang['anon_name']}</span></td>
+							</tr>
+						</table>
+					</fieldset>
+				</td>
+			</tr>
+			<tr>
+				<td class="formbuttonrow" colspan="2"><input class="button" type="submit" name="submit" value="{ipb.lang['log_in_submit']}" /></td>
+			</tr>
+			<tr>
+				<td class="catend" colspan="2"><!-- no content --></td>
+			</tr>
+		</table>
+	</div>
+</form>]]></section_content>
+			<func_name>ShowForm</func_name>
+			<func_data><![CDATA[$message="",$referer=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<input type="text" size="50" name="$name" value="" />]]></section_content>
+			<func_name>mlist_custom_field_textinput</func_name>
+			<func_data><![CDATA[$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<div>
+	<fieldset>
+ 	<legend><b>{ipb.lang['title_options']}</b></legend>
+ 		<table cellspacing="0">
+ 			<tr>
+ 				<td>$data</td>
+ 			</tr>
+		</table>
+	</fieldset>
+</div>]]></section_content>
+			<func_name>mlist_custom_field_wrap</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<br />
+<div>{$links[SHOW_PAGES]}</div>]]></section_content>
+			<func_name>mlist_end</func_name>
+			<func_data><![CDATA[$links=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row2" colspan="7" align="center">{ipb.lang['no_results']}</td>
+</tr>]]></section_content>
+			<func_name>mlist_no_results</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="catend" colspan="7"><!-- no content --></td>
+</tr>
+	</table>
+</div>
+<br />
+<form action="{ipb.script_url}act=members" method="post">
+	<div class="borderwrap">
+		<div class="maintitle">
+			<div style="float: right;"><input type="button" class="button" value="{ipb.lang['toggle_more']}" onclick="toggleview('mlist');" /></div>
+			<div>{ipb.lang['title_search']}</div>
+		</div>
+		<div class="tablepad" align="center">
+			<table cellspacing="0">
+				<tr>
+					<td width="50%" valign="top">
+						<fieldset>
+						<legend><b>{ipb.lang['s_name']}</b></legend>
+							<select name="name_box">
+								<option value="begins">{ipb.lang['s_begins']}</option>
+								<option value="contains">{ipb.lang['s_contains']}</option>
+							</select>&nbsp;&nbsp;<input type="text" size="25" name="name" value="{ipb.input['name']}" />
+						</fieldset>
+					</td>
+					<td width="50%" valign="top">
+						<fieldset>
+						<legend><b>{ipb.lang['s_homepage']}</b></legend>
+							<input type="text" size="50" name="homepage" value="{ipb.input['homepage']}" />
+						</fieldset>
+					</td>
+				</tr>
+			</table>
+			
+			<!-- START HIDE -->
+	<div style="display: none;" id="mlist">
+		<table cellspacing="0">
+			<tr>
+				<td width="50%" valign="top">
+					<fieldset>
+					<legend><b>{ipb.lang['member_photo']}</b></legend>
+						{ipb.lang['photo_only']} &nbsp;<input type="checkbox" value="1" name="photoonly" $checked />
+					</fieldset>
+				</td>
+				<td width="50%" valign="top">
+					<fieldset>
+						<legend><b>{ipb.lang['s_signature']}</b></legend>
+							<input type="text" size="50" name="signature" value="{ipb.input['signature']}" />
+					</fieldset>
+				</td>
+			</tr>
+			<tr>
+				<td width="50%" valign="top">
+					<fieldset>
+					<legend><b>{ipb.lang['title_messengers']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td width="60%">{ipb.lang['s_aim']}</td>
+								<td width="40%"><input type="text" size="20" name="aim" value="{ipb.input['aim']}" /></td>
+							</tr>
+							<tr>
+								<td width="60%">{ipb.lang['s_yahoo']}</td>
+								<td width="40%"><input type="text" size="20" name="yahoo" value="{ipb.input['yahoo']}" /></td>
+							</tr>
+							<tr>
+								<td width="60%">{ipb.lang['s_icq']}</td>
+								<td width="40%"><input type="text" size="20" name="icq" value="{ipb.input['icq']}" /></td>
+							</tr>
+							<tr>
+								<td width="60%">{ipb.lang['s_msn']}</td>
+								<td width="40%"><input type="text" size="20" name="msn" value="{ipb.input['msn']}" /></td>
+							</tr>
+						</table>
+					</fieldset>
+				</td>
+				<td width="50%" valign="top">
+					<fieldset>
+					<legend><b>{ipb.lang['title_date']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td width="30%">{ipb.lang['s_posts']}</td>
+								<td width="70%">
+									<select class="dropdown" name="posts_ltmt">
+										<option value="lt">{ipb.lang['s_lessthan']}</option>
+										<option value="mt">{ipb.lang['s_morethan']}</option>
+									</select>
+									&nbsp;<input type="text" size="15" name="posts" value="{ipb.input['posts']}" />
+								</td>
+							</tr>
+							<tr>
+								<td width="30%">{ipb.lang['s_joined']}</td>
+								<td width="70%">
+									<select class="dropdown" name="joined_ltmt">
+										<option value="lt">{ipb.lang['s_lessthan']}</option>
+										<option value="mt">{ipb.lang['s_morethan']}</option>
+									</select>
+									&nbsp;<input type="text" size="10" name="joined" value="{ipb.input['joined']}" /> <span class="desc">{ipb.lang['s_dateformat']}</span>
+								</td>
+							</tr>
+							<tr>
+								<td width="30%">{ipb.lang['s_lastpost']}</td>
+								<td width="70%">
+									<select class="dropdown" name="lastpost_ltmt">
+										<option value="lt">{ipb.lang['s_lessthan']}</option>
+										<option value="mt">{ipb.lang['s_morethan']}</option>
+									</select>
+									&nbsp;<input type="text" size="10" name="lastpost" value="{ipb.input['lastpost']}" /> <span class="desc">{ipb.lang['s_dateformat']}</span>
+								</td>
+							</tr>
+							<tr>
+								<td width="30%">{ipb.lang['s_lastvisit']}</td>
+								<td width="70%">
+									<select class="dropdown" name="lastvisit_ltmt">
+										<option value="lt">{ipb.lang['s_lessthan']}</option>
+										<option value="mt">{ipb.lang['s_morethan']}</option>
+									</select>
+									&nbsp;<input type="text" size="10" name="lastvisit" value="{ipb.input['lastvisit']}" /> <span class="desc">{ipb.lang['s_dateformat']}</span>
+								</td>
+							</tr>
+						</table>
+					</fieldset>
+				</td>
+			</tr>
+		</table>
+		<!--CUSTOM_FIELDS-->
+	</div>
+		<!-- END HIDE -->
+</div>
+		<div align="center" class="formsubtitle">{ipb.lang['sorting_text']}&nbsp;<input type="submit" value="{ipb.lang['sort_submit']}" class="button" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>mlist_page_end</func_name>
+			<func_data><![CDATA[$checked=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<div>{$pages}</div>
+<br />
+<div class="borderwrap">
+	<div class="maintitle">
+		<div style="float: right;">
+			<form name="quickjumpform" action="{ipb.script_url}act=members" method="post">
+				<input type="submit" name="qjbutton" value="{ipb.lang['button_quickjump']}" class="button" />
+				<select name="quickjump">
+					{$quickjump}
+				</select>
+			</form>
+		</div>
+		<div>{ipb.lang['page_title']}</div>
+	</div>
+	
+	<table cellspacing="1">
+		<tr>
+			<th width="30%">{ipb.lang['member_name']}</th>
+			<th align="center" width="10%">{ipb.lang['member_level']}</th>
+			<th align="center" width="10%">{ipb.lang['member_group']}</th>
+			<th align="center" width="20%">{ipb.lang['member_joined']}</th>
+			<th align="center" width="10%">{ipb.lang['member_posts']}</th>
+			<th align="center">{ipb.lang['member_email']}</th>
+			<th width="5%" align="center">{ipb.lang['member_photo']}</th>
+		</tr>]]></section_content>
+			<func_name>mlist_page_header</func_name>
+			<func_data><![CDATA[$pages="",$quickjump=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<option value="$letter"{$selected}>$letter</option>]]></section_content>
+			<func_name>mlist_quick_jump_entry</func_name>
+			<func_data><![CDATA[$letter="",$selected=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<!-- Entry for {$member['name']} -->
+		<tr>
+			<td class="row2"><b><a href="{ipb.script_url}showuser={$member['id']}">{$member['name']}</a></b></td>
+			<td class="row2">{$member['member_rank_img']}</td>
+			<td class="row1" align="center" width="20%">{$member['group']}</td>
+			<td class="row2" align="center" width="20%">{$member['joined']}</td>
+			<td class="row2" align="center" width="10%">{$member['posts']}</td>
+			<td class="row1" align="center">{$member['email_icon']}</td>
+			<td class="row1" align="center">{$member['camera']}</td>
+		</tr>
+<!-- End of Entry -->]]></section_content>
+			<func_name>mlist_show_row</func_name>
+			<func_data><![CDATA[$member=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<select name="$name">
+	<option value="" selected="selected">{ipb.lang['s_any']}</option>
+	$options
+</select>]]></section_content>
+			<func_name>mlist_custom_field_dropdown</func_name>
+			<func_data><![CDATA[$name="",$options=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mlist</group_name>
+			<section_content><![CDATA[<tr>
+	<td valign="top"><b>$title</b><br />$desc</td>
+	<td>$content</td>
+</tr>]]></section_content>
+			<func_name>mlist_custom_field_entry</func_name>
+			<func_data><![CDATA[$title="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<div><b>$tag<b></div>]]></section_content>
+			<func_name>wrap_tag</func_name>
+			<func_data><![CDATA[$tag=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var separator = '$sep';
+var entry     = '$entry';
+var in_name   = '$name';
+//-->
+</script>
+<script type="text/javascript" src="jscripts/ipb_finduser.js"></script>
+<form name="finduser">
+	<table cellspacing="1">
+		<tr>
+			<td class="pagetitle">{ipb.lang['fu_title']}<hr noshade></td>
+		</tr>
+		<tr>
+			<td align="center" valign="middle">{ipb.lang['fu_add_desc']}<br /><br /><select name="username" class="forminput">$names</select><br /><br /><input type="button" name="add" onClick="add_to_form()" value="{ipb.lang['fu_add_mem']}"></td>
+		</tr>
+		<tr>
+			<td class="pcen"><a href="javascript:history.go(-1);">{ipb.lang['fu_back']}</a> :: <a href="javascript:window.close();">{ipb.lang['fu_close_win']}</a></td>
+		</tr>
+	</table>
+</form>]]></section_content>
+			<func_name>find_user_final</func_name>
+			<func_data><![CDATA[$names="",$entry="",$name="",$sep="line"]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<div>{ipb.lang['bbc_intro']}</div>
+<br />]]></section_content>
+			<func_name>bbcode_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1" valign="middle">$before</td>
+	<td class="row1" valign="middle">$after</td>
+</tr>]]></section_content>
+			<func_name>bbcode_row</func_name>
+			<func_data><![CDATA[$before="",$after=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[</table>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>bbcode_row_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<div>
+	<div class="borderwrap">
+		<div class="maintitle">$title</div>
+		<div class="row2">$desc</div>
+		<table cellspacing="1">
+			<tr>
+				<td width="50%" align="center" class="row1" valign="middle">{ipb.lang['bbc_before']}</td>
+				<td width="50%" align="center" class="row1" valign="middle">{ipb.lang['bbc_after']}</td>
+			</tr>]]></section_content>
+			<func_name>bbcode_row_header</func_name>
+			<func_data><![CDATA[$title="",$desc=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<script language='javascript'>
+<!--
+	function add_smilie(code)
+	{
+		opener.document.REPLIER.Post.value += ' ' + code + ' ';
+		//return true;
+	}
+//-->
+</script>]]></section_content>
+			<func_name>emoticon_javascript</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<tr>
+	<td align="center" class="row1" valign="middle"><a href={$out}javascript:add_smilie({$in}$code{$in}){$out}>$code</a></td>
+	<td align="center" class="row1" valign="middle"><a href={$out}javascript:add_smilie({$in}$code{$in}){$out}><img src="{ipb.vars['EMOTICONS_URL']}/$image" valign="absmiddle" alt="$image" /></a></td>
+</tr>]]></section_content>
+			<func_name>emoticons_row</func_name>
+			<func_data><![CDATA[$code="",$image="",$in="'",$out="'"]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<div>
+	<div class="borderwrap">
+		<div class="maintitle">$title</div>
+		<table cellspacing="1">
+			<tr>
+				<td width="50%" align="center" class="formsubtitle" valign="middle">$row1</td>
+				<td width="50%" align="center" class="formsubtitle" valign="middle">$row2</td>
+			</tr>]]></section_content>
+			<func_name>page_header</func_name>
+			<func_data><![CDATA[$title="",$row1="",$row2=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[</table>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>page_footer</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<form name="finduser" method="post" action="{ipb.script_url}act=legends&amp;entry=$entry&amp;name=$name&amp;sep=$sep&amp;CODE=finduser_two">
+	<table cellspacing="1">
+		<tr>
+			<td class="pagetitle">{ipb.lang['fu_title']}<hr noshade></td>
+		</tr>
+		<tr>
+			<td align="center" valign="middle"><b>{ipb.lang['fu_enter_name']}</b><br /><br /><input type="text" size="40" name="username" class="forminput" /><br /><br /><input type="submit" value="{ipb.lang['fu_search_but']}" /></td>
+		</tr>
+		<tr>
+			<td class="pcen"><a href="javascript:window.close();">{ipb.lang['fu_close_win']}</a></td>
+		</tr>
+	</table>
+</form>]]></section_content>
+			<func_name>find_user_one</func_name>
+			<func_data><![CDATA[$entry="",$name="",$sep="comma"]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_help</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1"><a href="{ipb.script_url}act=Help&amp;CODE=01&amp;HID={$entry['id']}"><b>{$entry['title']}</b></a><br />{$entry['description']}</td>
+	</tr>]]></section_content>
+			<func_name>row</func_name>
+			<func_data><![CDATA[$entry=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_help</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+	<input type="hidden" name="act" value="Help" />
+	<input type="hidden" name="CODE" value="02" />
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;$one_text</div>
+		<table cellspacing="1">
+			<tr>
+				<th>$two_text</th>
+			</tr>
+			<tr>
+				<td class="row2">{ipb.lang['search_txt']}&nbsp;&nbsp;<input type="text" maxlength="60" size="30" name="search_q" />&nbsp;<input class="gobutton" type="image" src="{ipb.vars['img_url']}/login-button.gif" /></td>
+			</tr>
+			<tr>
+				<td class="catend"></td>
+			</tr>
+		</table>
+	</div>
+</form>
+<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;$three_text</div>
+	<table cellspacing="1">
+		<tr>
+			<th>$two_text</th>
+		</tr>]]></section_content>
+			<func_name>start</func_name>
+			<func_data><![CDATA[$one_text="",$two_text="",$three_text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_help</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row2">$text</td>
+	</tr>]]></section_content>
+			<func_name>display</func_name>
+			<func_data><![CDATA[$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_help</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="catend"></td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>help_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_help</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row2" align="center"><b>{ipb.lang['no_results']}</b></td>
+	</tr>]]></section_content>
+			<func_name>no_results</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[&nbsp;<span class="pagelink"><a href="$url" title="$page">$page</a></span>]]></section_content>
+			<func_name>pagination_page_link</func_name>
+			<func_data><![CDATA[$url="",$page=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<span class="pagelink"><a href="$url" title="{ipb.lang['tpl_previous']}">&lt;</a></span>]]></section_content>
+			<func_name>pagination_previous_link</func_name>
+			<func_data><![CDATA[$url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<span class="pagelinklast"><a href="$url" title="{ipb.lang['tpl_gotofirst']}">&laquo;</a></span>&nbsp;]]></section_content>
+			<func_name>pagination_start_dots</func_name>
+			<func_data><![CDATA[$url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
+<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
+	<head> 
+		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
+		<title>$title</title>
+		$css
+	</head>
+	<script type="text/javascript">
+	  <!--
+	   var ipb_var_st       = "{ipb.input['st']}";
+	   var ipb_lang_tpl_q1  = "{ipb.lang['tpl_q1']}";
+	   var ipb_var_s        = "{ipb.session_id}";
+	   var ipb_var_phpext   = "{ipb.vars['php_ext']}";
+	   var ipb_var_base_url = "{ipb.script_url}";
+	   var ipb_input_f      = "{ipb.input['f']}";
+	   var ipb_input_t      = "{ipb.input['t']}";
+	   var ipb_input_p      = "{ipb.input['p']}";
+	   var ipb_var_cookieid = "{ipb.vars['cookie_id']}";
+	   var ipb_var_cookie_domain = "{ipb.vars['cookie_domain']}";
+	   //-->
+	</script>
+	<script type="text/javascript" src="jscripts/ipb_global.js"></script>
+	<body>
+		<div> 
+			$text
+		</div>
+	</body>
+</html>]]></section_content>
+			<func_name>pop_up_window</func_name>
+			<func_data><![CDATA[$title="",$css="",$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[&nbsp;<a href="$url">$title</a>]]></section_content>
+			<func_name>rules_link</func_name>
+			<func_data><![CDATA[$url="",$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=chat">{ipb.lang['live_chat']}</a>]]></section_content>
+			<func_name>show_chat_link_inline</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<a href="javascript:chat_pop({ipb.vars['chat_width']}, {ipb.vars['chat_height']});">{ipb.lang['live_chat']}</a>]]></section_content>
+			<func_name>show_chat_link_popup</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=module&amp;module=toplist">{ipb.lang['tb_toplist']}</a>]]></section_content>
+			<func_name>show_tsl_link_inline</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[&nbsp;<span class="pagecurrent">{$page}</span>]]></section_content>
+			<func_name>pagination_current_page</func_name>
+			<func_data><![CDATA[$page=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[&nbsp;<span class="pagelinklast"><a href="$url" title="{ipb.lang['tpl_gotolast']}">&raquo;</a></span>&nbsp;]]></section_content>
+			<func_name>pagination_end_dots</func_name>
+			<func_data><![CDATA[$url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<span class="pagelink"><a title="{ipb.lang['tpl_jump']}" href="javascript:multi_page_jump('$ub',$tp,$pp);">$pages {ipb.lang['tpl_pages']}</a></span>&nbsp;]]></section_content>
+			<func_name>pagination_make_jump</func_name>
+			<func_data><![CDATA[$tp="",$pp="",$ub="",$pages=1]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}setlanguage=1" name="langselectorbox" method="post">
+	<input type="hidden" name="langurlbits" value="act={ipb.input['act']}&CODE={ipb.input['CODE']}&t={ipb.input['t']}&f={ipb.input['f']}&st={ipb.input['st']}" />
+	<select name="langid" onchange="chooselang(this)">
+		<optgroup label="{ipb.lang['global_language']}">
+			$data
+		</optgroup>
+	</select>
+</form>]]></section_content>
+			<func_name>global_lang_chooser</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<html>
+	<head>
+		<title>{ipb.lang['stand_by']}</title>
+		<meta http-equiv="refresh" content="2; url=$Url" />
+		<script type="text/javascript"> </script>
+		$css
+	</head>
+	<body>
+		<div id="redirectwrap">
+			<h4>{ipb.lang['thanks']}</h4>
+			<p>$Text<br /><br />{ipb.lang['transfer_you']}</p>
+			<p class="redirectfoot">(<a href="$Url">{ipb.lang['dont_wait']}</a>)</p>
+		</div>
+	</body>
+</html>]]></section_content>
+			<func_name>Redirect</func_name>
+			<func_data><![CDATA[$Text="",$Url="",$css=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1"><b>{ipb.lang['yahoo_name']}</b></td>
+	<td class="row1"><input type="text" name="msnname" value="$yahoo" size="40" onMouseOver="this.focus()" onFocus="this.select()" /></td>
+</tr>
+<tr>
+	<td class="row1"><b>{ipb.lang['yahoo_status']}</b></td>
+	<td class="row1"><img src="http://opi.yahoo.com/online?u=$yahoo&amp;m=g&amp;t=2" /></td>
+</tr>
+<tr>
+	<td class="row1" align="center" colspan="2"><a href="http://edit.yahoo.com/config/send_webmesg?.target=$yahoo&amp;.src=pg">{ipb.lang['yahoo_send_msg']}</a></td>
+</tr>
+<tr>
+	<td class="row1" align="center" colspan="2"><a href="http://members.yahoo.com/interests?.oc=t&amp;.kw=$yahoo&amp;.sb=1">{ipb.lang['yahoo_view_profile']}</a></td>
+</tr>]]></section_content>
+			<func_name>yahoo_body</func_name>
+			<func_data><![CDATA[$yahoo=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['send_email_to']} {$data[NAME]}</div>
+	<div class="tablepad">
+		{ipb.lang['show_address_text']}
+		<br />
+		&gt;&gt;<b><a href="mailto:{$data[ADDRESS]}" class="misc">{ipb.lang['send_email_to']} {$data[NAME]}</a></b>
+	</div>
+</div>]]></section_content>
+			<func_name>show_address</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['email_sent']}</div>
+	<div class="tablepad">{ipb.lang['email_sent_txt']} $member_name</div>
+</div>]]></section_content>
+			<func_name>sent_screen</func_name>
+			<func_data><![CDATA[$member_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post" name="REPLIER">
+	<input type="hidden" name="act" value="Mail" />
+	<input type="hidden" name="CODE" value="01" />
+	<input type="hidden" name="to" value="{$data['TO']}" />
+	<div><b>{ipb.lang['imp_text']}</b></div>
+	<br />
+	<div class="borderwrap">
+		<div class="maintitle">{ipb.lang['send_title']}</div>
+		<div class="formsubtitle">{ipb.lang['send_email_to']} {$data['NAME']}</div>
+		<table cellspacing="1">
+			<tr>
+				<td class="pformleftw" valign="top"><b>{ipb.lang['subject']}</b></td>
+				<td class="pformright"><input type="text" name="subject" value="{$data['subject']}" size="50" maxlength="50" /></td>
+			</tr>
+			<tr>
+				<td class="pformleftw" valign="top"><b>{ipb.lang['message']}</b><br /><br />{ipb.lang['msg_txt']}</td>
+				<td class="pformright"><textarea cols="60" rows="12" wrap="soft" name="message" class="textinput">{$data['content']}</textarea></td>
+			</tr>
+			<tr>
+				<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['submit_send']}" /></td>
+			</tr>
+		</table>
+	</div>
+</form>]]></section_content>
+			<func_name>send_form</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=report&amp;send=1&amp;t=$tid&amp;p=$pid&amp;st=$st" method="post" name="REPLIER">
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['report_title']}</div>
+		<table cellspacing="1">
+			<tr>
+				<td class="row1"  width="30%" valign="top"><b>{ipb.lang['report_topic']}</b></td>
+				<td class="row1" width="80%"><a href="{ipb.script_url}showtopic=$tid&amp;st=$st&amp;&#35;entry$pid">$topic_title</a>
+				</td>
+			</tr>
+			<tr>
+				<td class="row1"  width="30%" valign="top">{ipb.lang['report_message']}</td>
+				<td class="row1" width="80%"><textarea cols="60" rows="12" wrap="soft" name="message" class="textinput"></textarea>
+				</td>
+			</tr>
+			<tr>
+				<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['report_submit']}" /></td>
+			</tr>
+		</table>
+	</div>
+</form>]]></section_content>
+			<func_name>report_form</func_name>
+			<func_data><![CDATA[$tid="",$pid="",$st="",$topic_title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+	<tr>
+		<td>
+			<table cellspacing="0">
+				<tr>
+					<th colspan="2" align="center">{$data[TITLE]}</th>]]></section_content>
+			<func_name>pager_header</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<form action="http://msg.mirabilis.com/scripts/WWPMsg.dll" method="POST" name="frmPager">
+	<input type="hidden" name="subject" value="From WebPager Panel" />
+	<input type="hidden" name="to" value="{$data[UIN]}" />
+	<tr>
+		<td class="row1"><b>{ipb.lang['name']}</b></td>
+		<td class="row1"><input type="text" name="from" value="{ipb.member['name']}" size="40" onMouseOver="this.focus()" onFocus="this.select()" /></td>
+	</tr>
+	<tr>
+		<td class="row1"><b>{ipb.lang['email']}</b></td>
+		<td class="row1"><input type="text" name="fromemail" value="{ipb.member['email']}" size="40" onMouseOver="this.focus()" onFocus="this.select()" /></td>
+	</tr>
+	<tr>
+		<td class="row1" valign="top"><b>{ipb.lang['msg']}</b></td>
+		<td class="row1"><textarea wrap="virtual" cols="50" rows="12" wrap="soft" name="body" class="textinput" onMouseOver="this.focus()" onFocus="this.select()"></textarea></td>
+	</tr>
+	<tr>
+		<td class="row1" align="center" colspan="2"><input type="submit" value="{ipb.lang['submit']}" /></td>
+	</tr>
+</form>]]></section_content>
+			<func_name>icq_body</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<object classid="clsid:F3A614DC-ABE0-11d2-A441-00C04F795683" codebase="#Version=2,0,0,83" codetype="application/x-oleobject" id="MsgrObj" name="MsgrApp" width="0" height="0"></object>
+<object classid="clsid:FB7199AB-79BF-11d2-8D94-0000F875C541" codetype="application/x-oleobject" id="MsgrApp" name="MsgrApp" width="0" height="0"></object>
+<tr>
+	<td class="row1"><b>{ipb.lang['msn_name']}</b></td>
+	<td class="row1"><input type="text" name="msnname" value="$msnname" size="40" onMouseOver="this.focus()" onFocus="this.select()" /></td>
+</tr>
+<tr>
+	<td class="row1" align="center" colspan="2"><a href="javascript:MsgrApp.LaunchIMUI('$msnname');">{ipb.lang['msn_send_msg']}</a></td>
+</tr>
+<tr>
+	<td class="row1" align="center" colspan="2"><a href="javascript:MsgrApp.LaunchAddContactUI('$msnname');">{ipb.lang['msn_add_contact']}</a></td>
+</tr>]]></section_content>
+			<func_name>msn_body</func_name>
+			<func_data><![CDATA[$msnname=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<table cellspacing="1">
+	<tr>
+		<td align="right">$data</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>forum_jump</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post" name='REPLIER'>
+	<input type="hidden" name="act"  value="Forward" />
+	<input type="hidden" name="CODE" value="01" />
+	<input type="hidden" name="s"    value="{ipb.session_id}" />
+	<input type="hidden" name="st"   value="{ipb.input['st']}" />
+	<input type="hidden" name="f"    value="{ipb.input['f']}" />
+	<input type="hidden" name="t"    value="{ipb.input['t']}" />
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['title']}</div>
+		<table cellspacing="0">
+			<tr>
+				<td class="row1"  width="30%" valign="top"><b>{ipb.lang['send_lang']}</b></td>
+				<td class="row1" width="80%">$lang</td>
+			</tr>
+			<tr>
+				<td class="row1"  width="30%" valign="top"><b>{ipb.lang['to_name']}</b></td>
+				<td class="row1" width="80%"><input type="text" name="to_name" value="" size="30" maxlength="100" /></td>
+			</tr>
+			<tr>
+				<td class="row1"  width="30%" valign="top"><b>{ipb.lang['to_email']}</b></td>
+				<td class="row1" width="80%"><input type="text" name="to_email" value="" size="30" maxlength="100" /></td>
+			</tr>
+			<tr>
+				<td class="row1"  width="30%" valign="top"><b>{ipb.lang['subject']}</b></td>
+				<td class="row1" width="80%"><input type="text" name="subject" value="{$title}" size="30" maxlength="120" /></td>
+			</tr>
+			<tr>
+				<td class="row1"  width="30%" valign="top"><b>{ipb.lang['message']}</b></td>
+				<td class="row1" width="80%"><textarea cols="60" rows="12" wrap="soft" name="message" class="textinput">{$text}</textarea>
+				</td>
+			</tr>
+			<tr>
+				<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['submit_send']}" /></td>
+			</tr>
+		</table>
+	</div>
+</form>]]></section_content>
+			<func_name>forward_form</func_name>
+			<func_data><![CDATA[$title="",$text="",$lang=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div align="center">
+	<applet codebase="http://{$server}/current/" code="Client.class" archive="scclient_$lang.zip" width="$w" height="$h">
+		<param name="room" value="$acc_no">
+		<param name="cabbase" value="scclient_$lang.cab">
+		<param name="username" value="$user">
+		<param name="password" value="$pass">
+		<param name="autologin" value="yes">
+	</applet>
+</div>]]></section_content>
+			<func_name>chat_pop</func_name>
+			<func_data><![CDATA[$server="",$acc_no="",$lang="",$w="",$h="",$user="",$pass=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<!-- End content Table -->
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td class="darkrow1" colspan="2">&nbsp;</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>end_table</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['errors_found']}</div>
+	<div class="tablepad"><span class="postcolor">$data</span></div>
+</div>
+<br />]]></section_content>
+			<func_name>errors</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['chat_title']}</div>
+	<div class="tablepad" align="center">
+		<applet codebase="http://{$server}/current/" code="Client.class" archive="scclient_$lang.zip" width="$w" height="$h">
+			<param name="room" value="$acc_no">
+			<param name="cabbase" value="scclient_$lang.cab">
+			<param name="username" value="$user">
+			<param name="password" value="$pass">
+			<param name="autologin" value="yes">
+		</applet>
+	</div>
+</div>
+<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['chat_help']}</div>
+	<div class="tablepad">
+		{ipb.lang['chat_help_text']}
+	</div>
+</div>]]></section_content>
+			<func_name>chat_inline</func_name>
+			<func_data><![CDATA[$server="",$acc_no="",$lang="",$w="",$h="",$user="",$pass=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<!-- Begin AIM Remote -->
+<table cellspacing="0" class="aoltable">
+	<tr align="right">
+		<td>
+			<a href="http://www.aol.co.uk/aim/index.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_man.gif" width="44" height="55"  alt="Download AIM" /></a>
+			<img src="http://www.aol.co.uk/aim/remote/gr/aimver_topsm.gif" width="73" height="55" alt="AIM Remote" />
+			<br />
+			<a href="aim:goim?screenname={$data['AOLNAME']}&amp;message=Hi.+Are+you+there?"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_im.gif" width="117" height="39" alt="Send me an Instant Message" /></a>
+			<br />
+			<a href="aim:addbuddy?screenname={$data['AOLNAME']}"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_bud.gif" width="117" height="39" alt="Add me to Your Buddy List" /></a>
+			<br />
+			<a href="http://www.aol.co.uk/aim/remote.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_botadd.gif" width="117" height="23" alt="Add Remote to Your Page" /></a>
+			<br />
+			<a href="http://www.aol.co.uk/aim/index.html"><img src="http://www.aol.co.uk/aim/remote/gr/aimver_botdow.gif" width="117" height="29" alt="Download AOL Instant Messenger" /></a>
+			<br /><br />
+		</td>
+	</tr>
+</table>
+<!-- End AIM Remote -->]]></section_content>
+			<func_name>aol_body</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">$title</div>
+	<div class="tablepad">$body</div>
+</div>]]></section_content>
+			<func_name>board_rules</func_name>
+			<func_data><![CDATA[$title="",$body=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_emails</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['chat_title']}</div>
+	<div class="tablepad" align="center">
+		<applet codebase="$server" archive="pchat.zip" code="ParaChat.class" width="$w" height="$h"> 
+			<param name=cabbase value="pchat.cab"> 
+			<param name=roam.Group value="$group"> 
+			<param name=Channel value="$room">
+			<param name="ctrl.Language" value="$lang">
+			<param name="ui.ChatWindow" value="$textmode">
+			<param name="ui.BgColor" value="{$style['applet_bg']}">
+			<param name="ui.FgColor" value="{$style['applet_fg']}">
+			<param name="cmd.ChatBg" value="{$style['window_bg']}">
+			<param name="cmd.ChatFg" value="{$style['window_fg']}">
+			<param name="cmd.FontSize" value="{$style['font_size']}">
+			<!--CUSTOMPARAM-->
+			<!--AUTOLOGIN-->
+			Sorry, your browser is not Java enabled, please visit <a href="http://chathelp.invisionsitetools.com/java.html">our java support pages</a>
+		</applet>
+	</div>
+</div>
+<br />
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['chat_help']}</div>
+	<div class="tablepad">
+		{ipb.lang['chat_help_text']}
+	</div>
+</div>]]></section_content>
+			<func_name>chat04_inline</func_name>
+			<func_data><![CDATA[$server="",$group="",$room="",$w="",$h="",$lang="",$textmode="",$style=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[</tr>
+	<!-- NEW ROW-->
+<tr>
+	<td class="formsubtitle">
+		<a href="{ipb.script_url}act=calendar&amp;code=showweek&amp;week=$week">&raquo;</a>
+	</td>]]></section_content>
+			<func_name>mini_cal_new_row</func_name>
+			<func_data><![CDATA[$week=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td width="14%" class="subtitle">$day</td>]]></section_content>
+			<func_name>mini_cal_day_bit</func_name>
+			<func_data><![CDATA[$day=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">
+		<p class="goto"><a href="{ipb.script_url}act=calendar&amp;m={$mid}&amp;y=$year"><{CAL_GOTO}></a></p>
+		<p>{$month} {$year}</p>
+	</div>
+	<table cellspacing="1">
+		<tr>
+			<td class="subtitle">&nbsp;</td>
+			{$content}
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>mini_cal_mini_wrap</func_name>
+			<func_data><![CDATA[$month="",$mid="",$year="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<script language='Javascript' type='text/javascript'>
+	<!--
+	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
+		if (posleft != 0) { x = posleft }
+		if (postop  != 0) { y = postop  }
+	
+		if (!scroll) { scroll = 1 }
+		if (!resize) { resize = 1 }
+	
+		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
+		  X = (screen.width  - width ) / 2;
+		  Y = (screen.height - height) / 2;
+		}
+		if (scroll != 0) { scroll = 1 }
+	
+		var Win = window.open( url, name, 'width='+width+',height='+height+',top='+Y+',left='+X+',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
+	 }
+	function changeDiv(id, method)
+	{
+		var itm = null;
+		if (document.getElementById) {
+			itm = document.getElementById(id);
+		} else if (document.all)     {
+			itm = document.all[id];
+		} else if (document.layers)   {
+			itm = document.layers[id];
+		}
+		
+		if (itm.style)
+		{
+			if ( method == 'show' )
+			{
+				itm.style.display = "";
+			}
+			else
+			{
+				itm.style.display = "none";
+			}
+		}
+		else
+		{
+			itm.visibility = "show";
+		}
+	}
+	
+	function selecttype()
+	{
+		
+		if ( document.REPLIER.eventtype[1].checked == true )
+		{
+			// Ranged date...
+			
+			changeDiv( 'rangeshow', 'show' );
+			changeDiv( 'rangehide', 'none' );
+			changeDiv( 'recurshow', 'none' );
+			changeDiv( 'recurhide', 'show' );
+		}
+		else if ( document.REPLIER.eventtype[2].checked == true )
+		{
+			// Repeating event
+			
+			changeDiv( 'rangeshow', 'none' );
+			changeDiv( 'rangehide', 'show' );
+			changeDiv( 'recurshow', 'show' );
+			changeDiv( 'recurhide', 'none' );
+		}
+		else
+		{
+			changeDiv( 'rangeshow', 'none' );
+			changeDiv( 'rangehide', 'show' );
+			changeDiv( 'recurshow', 'none' );
+			changeDiv( 'recurhide', 'show' );
+		}
+	}
+	
+	function changeColour(BOXid, val)
+	{
+		document.all.BOXid.style.backgroundColor = val;
+	}
+	//-->
+</script>
+<div class="borderwrap">
+<table cellspacing="0">
+	<tr>
+		<td class="maintitle" colspan="2">&nbsp;&nbsp;$data</td>
+	</tr>]]></section_content>
+			<func_name>table_top</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!-- inbox folder -->
+<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['attach_page_title']}: $title</div>
+	<table cellspacing="1">
+		<tr>
+			<th width="2%">&nbsp;</th>
+			<th width="73%"><b>{ipb.lang['attach_title']}</b></th>
+			<th width="5%">{ipb.lang['attach_size']}</b></a></th>
+			<th width="15%"><b>{ipb.lang['attach_post']}</b></th>
+		</tr>]]></section_content>
+			<func_name>forums_attachments_top</func_name>
+			<func_data><![CDATA[$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<!-- inbox folder -->
+	</table>
+</div>]]></section_content>
+			<func_name>forums_attachments_bottom</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<tr id="{$data['attach_id']}">
+	<td align="center" class="row1"><img src="{ipb.vars['mime_img']}/{$data['image']}" alt="{ipb.lang['attached_file']}" /></td>
+	<td class="row2">
+		<a href="{ipb.script_url}act=Attach&amp;type=post&amp;id={$data['attach_id']}" title="{$data['attach_file']}" target="_blank">{$data['short_name']}</a>
+		<div class="desc">( {ipb.lang['attach_hits']}: {$data['attach_hits']} )<br />( {ipb.lang['attach_post_date']} {$data['attach_date']} )</div>
+	</td>
+	<td align="center" class="row1">{$data['real_size']}</td>
+	<td class="row2" align="center"><a href="#" onclick="opener.location='{ipb.script_url}showtopic={$data['tid']}&amp;view=findpost&amp;p={$data['pid']}';">{$data['pid']}</a></td>
+</tr>]]></section_content>
+			<func_name>forums_attachments_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="darkrow1" colspan="8"><b>{ipb.lang['announce_start']}</b></td>
+</tr>
+$announce]]></section_content>
+			<func_name>announcement_wrap</func_name>
+			<func_data><![CDATA[$announce=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="formsubtitle" style="padding: 4px;">{ipb.lang['active_users_title']} ({ipb.lang['active_users_detail']})</div>
+	<div class="row1" style="padding: 4px;">{ipb.lang['active_users_members']} {$active['names']}</div>
+</div>
+<br />]]></section_content>
+			<func_name>forum_active_users</func_name>
+			<func_data>$active=array()</func_data>
+		</template>
+
+		<template>
+			<group_name>skin_forum</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post">
+	<input type="hidden" name="act" value="SF" />
+	<input type="hidden" name="f" value="$fid" />
+	<input type="hidden" name="L" value="1" />
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['need_password']}</div>
+		<div class="tablepad">{ipb.lang['need_password_txt']}</div>
+		<div class="tablepad">
+			<b>{ipb.lang['enter_pass']}</b>
+			<input type="password" size="20" name="f_password" />
+		</div>
+		<div class="pformstrip" align="center"><input type="submit" value="{ipb.lang['f_pass_submit']}" class="forminput" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>forum_password_log_in</func_name>
+			<func_data><![CDATA[$fid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr> 
+	<td class="row1" width="100%" colspan="2">
+		<input type="checkbox" name="event_delete" value="1">&nbsp;{ipb.lang['calendar_delete_box']}
+	</td>
+</tr>]]></section_content>
+			<func_name>calendar_delete_box</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="formbuttonrow" colspan="2">
+				<input type="submit" name="submit" value="$data" tabindex="4">
+			</td>
+		</tr>
+	</table>
+</div>
+</form>
+<br />
+<br clear="all" />]]></section_content>
+			<func_name>calendar_end_form</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr> 
+	<td class="pformleft"><b>{ipb.lang['calendar_title']}</b></td>
+	<td class="pformright"><input type="text" size="40" maxlength="40" name="event_title" value="$data" /></td>
+</tr>]]></section_content>
+			<func_name>calendar_event_title</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr> 
+	<td class="pformleft"><b>{ipb.lang['calendar_event_type']}</b></td>
+	<td class="pformright">
+		<select name="e_type">
+			<option value="public"$pub_select>{ipb.lang['calendar_type_public']}</option>
+			<option value="private"$priv_select>{ipb.lang['calendar_type_private']}</option>
+		</select>
+	</td>
+</tr>]]></section_content>
+			<func_name>calendar_event_type</func_name>
+			<func_data><![CDATA[$pub_select="",$priv_select=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=calendar&amp;code=doedit&amp;eventid=$eventid" method="post" name="REPLIER" onsubmit="return ValidateForm()">
+	<input type="hidden" name="removeattachid" value="" />]]></section_content>
+			<func_name>calendar_start_edit_form</func_name>
+			<func_data><![CDATA[$eventid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=calendar&amp;code=addnewevent" method="post" name="REPLIER" onSubmit="return ValidateForm()">
+	<input type="hidden" name="removeattachid" value="" />]]></section_content>
+			<func_name>calendar_start_form</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td class="mcellblank"><!-- no content --></td>]]></section_content>
+			<func_name>mini_cal_blank_cell</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td class="mcelldate">
+	<div class="calday">$month_day</div>
+</td>]]></section_content>
+			<func_name>mini_cal_date_cell</func_name>
+			<func_data><![CDATA[$month_day="",$events=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr> 
+	<td class="pformleft">{ipb.lang['calendar_group_filter']}</td>
+	<td class="pformright"><select name="e_groups[]" size="5" multiple>$groups</select></td>
+</tr>]]></section_content>
+			<func_name>calendar_admin_group_box</func_name>
+			<func_data><![CDATA[$groups=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr> 
+	<td class="pformleft" valign="top"><b>{ipb.lang['calendar_event_date']}</b></td>
+	<td class="pformright">
+		<table cellspacing="0">
+			<tr>
+				<td>
+					<input type="radio" name="eventtype" id="single" onclick="selecttype();" class="radiobutton" value="single" {$checked['normal']} />
+					<b><label for="single">{ipb.lang['fv_single']}</label></b>
+				</td>
+				<td>
+					<select name="e_day">
+						$days
+					</select>&nbsp;&nbsp;
+					<select name="e_month">
+						$months
+					</select>&nbsp;&nbsp;
+					<select name="e_year">
+						$years
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<input type="radio" name="eventtype" id="range" onclick="selecttype();" class="radiobutton" value="range"{$checked['range']} />
+					<b><label for="range">{ipb.lang['fv_range']}</label></b>
+				</td>
+				<td>
+					<div id="rangeshow" style="display: {$div['range_on']};">
+						<table cellspacing="0">
+							<tr>
+								<td><b>{ipb.lang['fv_range_ends']}</b></td>
+								<td>
+									<select name="end_day">
+										$end_days
+									</select>&nbsp;&nbsp;
+									<select name="end_month">
+										$end_months
+									</select>&nbsp;&nbsp;
+									<select name="end_year">
+										$end_years
+									</select>
+								</td>
+							</tr>
+							<tr>
+								<td><b>{ipb.lang['fv_bgcolor']}</b></td>
+								<td>
+									{$cols['bg']} <input type="text" name="style" size="5" readonly="readonly" id="stylebg" />
+								</td>
+							</tr>
+							<tr>
+								<td><b>{ipb.lang['fv_font']}</b></td>
+								<td>
+									{$cols['ft']} <input type="text" name="style2" size="5" readonly="readonly" id="styleft" />
+								</td>
+							</tr>
+						</table>
+					</div>
+					<div id="rangehide" style="display: {$div['range_off']};">{ipb.lang['fv_hidden']}</div>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<input type="radio" name="eventtype" id="recur"  onclick="selecttype();" class="radiobutton" value="recur" {$checked['recur']} />
+					<b><label for="recur">{ipb.lang['fv_recur']}</label></b>
+				</td>
+				<td>
+					<div id="recurshow" style="display: {$div['recur_on']};">
+						<b>{ipb.lang['fv_recur_every']}</b> 
+						<select name="recur_unit">
+							$recur_unit
+						</select>
+						<b>{ipb.lang['fv_until']}</b> 
+						<select name="recend_day">
+							{$recend['d']}
+						</select>
+						<select name="recend_month">
+							{$recend['m']}
+						</select>&nbsp;&nbsp;
+						<select name="recend_year">
+							{$recend['y']}
+						</select>
+					</div>
+					<div id="recurhide" style="display: {$div['recur_off']};">{ipb.lang['fv_hidden']}</div>
+				</td>
+			</tr>
+		</table>
+	</td>
+</tr>]]></section_content>
+			<func_name>calendar_choose_date</func_name>
+			<func_data><![CDATA[$days="",$months="",$years="",$end_days="",$end_months="",$end_years="",$recur_days="",$recur_unit="",$div="",$checked="",$cols="",$recend=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_buddy</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<h3>{ipb.lang['page_title']}</h3>
+	<div class="formsubtitle">{ipb.lang['while_away']}</div>
+	<p>{$away_text}</p>
+	<div class="formsubtitle">{ipb.lang['show_me']}</div>
+	<p><a href="javascript:redirect_to('&amp;act=Stats&amp;CODE=leaders',0)">{ipb.lang['sm_forum_leaders']}</a><br /><a href="javascript:redirect_to('&amp;act=Stats',0)">{ipb.lang['sm_today_posters']}</a><br /><a href="javascript:redirect_to('&amp;act=Members&amp;max_results=10&amp;sort_key=posts&amp;sort_order=desc',0)">{ipb.lang['sm_all_posters']}</a><br /><a href="javascript:redirect_to('&amp;act=Search&amp;CODE=lastten',0)">{ipb.lang['sm_my_last_posts']}</a></p>
+	<div class="formsubtitle" align="center">{ipb.lang['search_forums']}</div>
+	<div align="center">
+		<form action="{ipb.script_url}act=Search&amp;CODE=01&amp;forums=all&amp;cat_forum=forum&amp;joinname=1&amp;search_in=posts&amp;result_type=topics" method="post" name="theForm" onsubmit="return check_form();">
+			<input type="text" size="17" name="keywords" />&nbsp;<input class="gobutton" type="image" src="{ipb.vars['img_url']}/login-button.gif" value="{ipb.lang['go']}" />
+		</form>
+	</div>
+	<div class="formsubtitle" align="center">{ipb.lang['search_help']}</div>
+	<div align="center">
+		<form action="{ipb.script_url}act=Help&amp;CODE=02" method="post" name="theForm2" onsubmit="return check_form(1);">
+			<input type="text" size="17" name="search_q" />&nbsp;<input class="gobutton" type="image" src="{ipb.vars['img_url']}/login-button.gif" value="{ipb.lang['go']}" />
+		</form>
+	</div>
+	<div><!--CLOSE.LINK--></div>
+</div>]]></section_content>
+			<func_name>main</func_name>
+			<func_data><![CDATA[$away_text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="divpad">
+	<b><a href="{ipb.script_url}act=calendar&amp;$link">$text</a></b>
+</div>]]></section_content>
+			<func_name>cal_week_events_wrap</func_name>
+			<func_data><![CDATA[$link="",$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div style="background-color: $bg; color: $ft; padding: 3px; border: 1px outset $bg; width: 50%;'>
+	<a href="{ipb.script_url}act=calendar&amp;$link" style="color: $ft;">$text</a>
+</div>]]></section_content>
+			<func_name>cal_week_events_wrap_range</func_name>
+			<func_data><![CDATA[$link="",$text="",$ft="",$bg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="maintitle">$month $year</td>
+</tr>]]></section_content>
+			<func_name>cal_week_monthbar</func_name>
+			<func_data><![CDATA[$month="",$year=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="calmonths">
+	<a href="{ipb.script_url}act=calendar&amp;code=showweek&amp;week={$prev['0']}" title="{$prev['mday']} {$prev['month']} {$prev['year']}">&laquo;</a>
+	$date $month $year 
+	<a href="{ipb.script_url}act=calendar&amp;code=showweek&amp;week={$next['0']}" title="{$next['mday']} {$next['month']} {$next['year']}">&raquo;</a>
+</div>
+<table cellspacing="0">
+	<tr>
+		<td width="25%" valign="top" class="nopad">
+			<!--PREV.MONTH--><br />
+			<!--THIS.MONTH--><br />
+			<!--NEXT.MONTH--><br />
+		</td>
+		<td width="1%" class="nopad">&nbsp;</td>
+		<td width="75%" valign="top" class="nopad">
+			<div class="borderwrap">
+				<table cellspacing="0">
+					<!--IBF.DAYS_CONTENT-->
+					</tr>
+				</table>
+			</div>
+			<br />
+		</td>
+	</tr>
+</table>
+<form action="{ipb.script_url}act=calendar" method="post">
+	<div class="borderwrap">
+		<div class="barb">
+			<p class="overs"><span class="fauxbutton"><a href="{ipb.script_url}act=calendar&amp;code=newevent">Add New Event</a></span>&nbsp;<span class="fauxbutton"><a href="{ipb.script_url}act=calendar&amp;code=find&amp;what=thismonth">View Current Month</a></span>&nbsp;<span class="fauxbutton"><a href="{ipb.script_url}act=calendar&amp;code=find&amp;what=thisweek">View Current Week</a></span></p>
+			<p><select name="m"><!--IBF.MONTH_BOX--></select>&nbsp;<select name="y"><!--IBF.YEAR_BOX--></select>&nbsp;<input class="gobutton" type="image" src="{ipb.vars['img_url']}/login-button.gif" value="{ipb.lang['go']}" /></p>
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>cal_week_content</func_name>
+			<func_data><![CDATA[$date="",$month="",$year="",$prev="",$next=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="nopad">
+		<div class="bar">
+			<p class="over"><a href="{ipb.script_url}act=calendar&amp;code=newevent&amp;nd={$year}-{$mid}-{$date}">{ipb.lang['post_new_event']}</a></p>
+			<p><span class="weekday">$wday</span></p>
+		</div>
+	</td>
+</tr>
+<tr>
+	<td class="nopad">
+		<table cellspacing="0">
+			<tr>
+				<td width="5%" class="calweekday">$date</td>
+				<td class="row2">$events</td>
+			</tr>
+		</table>
+	</td>
+</tr>]]></section_content>
+			<func_name>cal_week_dayentry</func_name>
+			<func_data><![CDATA[$wday="",$date="",$month="",$mid="",$year="",$events=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div style="background-color: $bg; color: $ft; padding: 3px; border-top: 1px outset $bg; border-bottom: 1px outset $bg;">
+	<a href="{ipb.script_url}act=calendar&amp;$link" style="color: $ft;">$text</a>
+</div>]]></section_content>
+			<func_name>cal_events_wrap_range</func_name>
+			<func_data><![CDATA[$link="",$text="",$ft="",$bg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[Warn: (<a href="javascript:PopUp('{ipb.script_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$percent}</a>%) <a href="{ipb.script_url}act=warn&amp;type=minus&amp;mid={$mid}" title="{ipb.lang['tt_warn_minus']}"><{WARN_MINUS}></a>{$img}<a href="{ipb.script_url}act=warn&amp;type=add&amp;mid={$mid}" title="{ipb.lang['tt_warn_add']}"><{WARN_ADD}></a>]]></section_content>
+			<func_name>warn_level</func_name>
+			<func_data><![CDATA[$mid="",$img="",$percent=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[{ipb.lang['warn_level']}: (<a href="javascript:PopUp('{ipb.script_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$percent}</a>%) {$img}]]></section_content>
+			<func_name>warn_level_no_mod</func_name>
+			<func_data><![CDATA[$mid="",$img="",$percent=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[&lt;&nbsp;$min ( <a href="javascript:PopUp('{ipb.script_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$level}</a> ) $max&nbsp;&gt;]]></section_content>
+			<func_name>warn_level_rating_no_mod</func_name>
+			<func_data><![CDATA[$mid="",$level="",$min=0,$max=10]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[{ipb.lang['warn_level']}: <a href="{ipb.script_url}act=warn&amp;type=minus&amp;mid={$mid}" title="{ipb.lang['tt_warn_minus']}"><{WARN_MINUS}></a> &lt;&nbsp;$min ( <a href="javascript:PopUp('{ipb.script_url}act=warn&amp;mid={$mid}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$level}</a> ) $max&nbsp;&gt; <a href="{ipb.script_url}act=warn&amp;type=add&amp;mid={$mid}" title="{ipb.lang['tt_warn_add']}"><{WARN_ADD}></a>]]></section_content>
+			<func_name>warn_level_rating</func_name>
+			<func_data><![CDATA[$mid="",$level="",$min=0,$max=10]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<br />
+<div class="borderwrap">
+	<div class="formsubtitle" align="center" style="padding: 5px;">
+		<a href="{$info['base_url']}act=UserCP&amp;CODE=22">{ipb.lang['edit_my_sig']}</a> &middot;
+		<a href="{$info['base_url']}act=UserCP&amp;CODE=24">{ipb.lang['edit_avatar']}</a> &middot;
+		<a href="{$info['base_url']}act=UserCP&amp;CODE=01">{ipb.lang['edit_profile']}</a>
+	</div>
+</div>]]></section_content>
+			<func_name>user_edit</func_name>
+			<func_data><![CDATA[$info=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<tr>
+	<td colspan="2" align="center" class="row2">{ipb.lang['no_info']}</td>
+</tr>]]></section_content>
+			<func_name>no_custom_information</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<script language="javascript" type="text/javascript">
+<!--
+ function redirect_to(where, closewin)
+ {
+ 	opener.location= '{ipb.script_url}' + where;
+ 	
+ 	if (closewin == 1)
+ 	{
+ 		self.close();
+ 	}
+ }
+//-->
+</script>
+<div class="borderwrap" style="text-align: left;">
+	<div class="maintitle">$name</div>
+	<table cellspacing="1" class='row1'>
+		<tr>
+			<th><b>{ipb.lang['head_contact']}</b></th>
+			<th><b>{ipb.lang['photo_title']}</b></th>
+		</tr>
+		<tr>
+			<td valign="middle" class="nopad">
+				<table cellspacing="1">
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['email']}</td>
+						<td width="100%" class="row1"><b>{$info['email']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['website_addr']}</td>
+						<td width="100%" class="row1"><b>{$info['website']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['aim']}</td>
+						<td width="100%" class="row1"><{PRO_AIM}> <b>{$info['aim_name']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['icq']}</td>
+						<td width="100%" class="row1"><{PRO_ICQ}> <b>{$info['icq_number']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['yahoo']}</td>
+							<td width="100%" class="row1"><{PRO_YIM}> <b>{$info['yahoo']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['msn']}</td>
+						<td width="100%" class="row1"><{PRO_MSN}> <b>{$info['msn_name']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['pm']}</b></td>
+						<td class="row1"><b><a href="javascript:redirect_to('&act=Msg&CODE=4&MID={$info['mid']}', 1);">{ipb.lang['click_here']}</a></b></td>
+					</tr>
+				</table>
+			</td>
+			<td valign="middle" class="row1" align="center">$photo</td>
+		</tr>
+		<tr>
+			<td class="formbuttonrow" colspan="2"><a href="{ipb.script_url}act=Profile&amp;CODE=showcard&amp;MID={$info['mid']}&amp;download=1">{ipb.lang['ac_download']}</a> &middot; <a href="javascript:self.close();">{ipb.lang['ac_close']}</a></td>
+		</tr>
+		<tr>
+			<td class="catend" colspan="2"><!-- no content --></td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>show_card</func_name>
+			<func_data><![CDATA[$name="",$photo="",$info=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<html>
+	<head>
+		<title>$name</title>
+		<style type="text/css">
+			<!--CSS-->
+		</style>
+		<script language="javascript" type="text/javascript">
+		<!--
+		function redirect_to(where, closewin)
+		{
+		  document.location= "{ipb.script_url}" + where;
+		  
+		  if (closewin == 1)
+		  {
+			  self.close();
+		  }
+		}
+		//-->
+		</script>
+	</head>
+	<body>
+	<div class="borderwrap" style="text-align: left;">
+	<div class="maintitle">$name</div>
+	<table cellspacing="1" class='row1'>
+		<tr>
+			<th><b>{ipb.lang['head_contact']}</b></th>
+			<th><b>{ipb.lang['photo_title']}</b></th>
+		</tr>
+		<tr>
+			<td valign="middle" class="nopad">
+				<table cellspacing="1">
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['email']}</td>
+						<td width="100%" class="row1"><b>{$info['email']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['website_addr']}</td>
+						<td width="100%" class="row1"><b>{$info['website']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['aim']}</td>
+						<td width="100%" class="row1"><{PRO_AIM}> <b>{$info['aim_name']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['icq']}</td>
+						<td width="100%" class="row1"><{PRO_ICQ}> <b>{$info['icq_number']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['yahoo']}</td>
+							<td width="100%" class="row1"><{PRO_YIM}> <b>{$info['yahoo']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['msn']}</td>
+						<td width="100%" class="row1"><{PRO_MSN}> <b>{$info['msn_name']}</b></td>
+					</tr>
+					<tr>
+						<td nowrap="nowrap" class="row1">{ipb.lang['pm']}</b></td>
+						<td class="row1"><b><a href="javascript:redirect_to('&act=Msg&CODE=4&MID={$info['mid']}', 1);">{ipb.lang['click_here']}</a></b></td>
+					</tr>
+				</table>
+			</td>
+			<td valign="middle" class="row1" align="center">$photo</td>
+		</tr>
+		<tr>
+			<td class="catend" colspan="2"><!-- no content --></td>
+		</tr>
+	</table>
+   </div>
+	</body>
+</html>]]></section_content>
+			<func_name>show_card_download</func_name>
+			<func_data><![CDATA[$name="",$photo="",$info=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<div id="photowrap">
+	<div id="phototitle">$name</div>
+	<div id="photoimg">$photo</div>
+</div>]]></section_content>
+			<func_name>show_photo</func_name>
+			<func_data><![CDATA[$name="",$photo=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<script language="Javascript" type="text/javascript">
+	<!--
+	function PopUp(url, name, width,height,center,resize,scroll,posleft,postop) {
+		if (posleft != 0) { x = posleft }
+		if (postop  != 0) { y = postop  }
+	
+		if (!scroll) { scroll = 1 }
+		if (!resize) { resize = 1 }
+	
+		if ((parseInt (navigator.appVersion) >= 4 ) && (center)) {
+		  X = (screen.width  - width ) / 2;
+		  Y = (screen.height - height) / 2;
+		}
+		if (scroll != 0) { scroll = 1 }
+	
+		var Win = window.open( url, name, "width="+width+",height="+height+",top="+Y+",left="+X+",resizable="+resize+",scrollbars="+scroll+",location=no,directories=no,status=no,menubar=no,toolbar=no");
+	 }
+	//-->
+</script>
+<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['head_title']}: {$info['name']}</div>
+	<table cellspacing="1">
+		<tr>
+			<td width="1%" nowrap="nowrap" valign="top" class="row1">
+				<div id="profilename">{$info['name']}</div>
+				<br />
+				<div>{$info['avatar']}</div>
+				<div>{$info['member_title']}</div>
+				<div>{$info['member_rank_img']}</div>
+				<br />
+				<div class="postdetails">
+					{ipb.lang['mgroup']}: {$info['group_title']}<br />
+					{ipb.lang['joined']}: {$info['joined']}
+				</div>
+				<!--{WARN_LEVEL}-->
+			</td>
+			<td width="30%" align="center" nowrap="nowrap" valign="top" class="row1">
+				<fieldset>
+					<legend><b>{ipb.lang['profile_options']}</b></legend>
+					<table cellspacing="0">
+						<tr>
+							<td width="1%"><{PRO_ITEM}></td>
+							<td width="99%"><a href="{ipb.script_url}act=Msg&amp;CODE=02&amp;MID={$info['mid']}">{ipb.lang['add_to_contact']}</a></td>
+						</tr>
+						<tr>
+							<td width="1%"><{PRO_ITEM}></td>
+							<td width="99%"><a href="{ipb.script_url}act=Search&amp;CODE=getalluser&amp;mid={$info['mid']}">{ipb.lang['find_posts']}</a></td>
+						</tr>
+						<tr>
+							<td width="1%"><{PRO_ITEM}></td>
+							<td width="99%"><a href="{ipb.script_url}act=Search&amp;CODE=gettopicsuser&amp;mid={$info['mid']}">{ipb.lang['find_member_topics']}</a></td>
+						</tr>
+<if="ipb.member['id'] != 0">
+<tr>
+							<td width="1%"><{PRO_ITEM}></td>
+							<td width="99%"><a href="{ipb.script_url}act=usercp&amp;CODE=ignore&amp;uid={$info['mid']}">{ipb.lang['ignore_user']}</a></td>
+						</tr>
+</if>
+<if="ipb.member['g_is_supmod'] == 1">
+<tr>
+							<td width="1%"><{PRO_ITEM}></td>
+							<td width="99%"><a href="{ipb.script_url}act=mod&amp;CODE=editmember&amp;auth_key={$auth_key}&amp;mid={$info['mid']}">{ipb.lang['supmod_edit_member']}</a></td>
+						</tr>
+</if>
+
+					</table>
+				</fieldset>
+			</td>
+			<td width="1%" align="right" class="row1">{$info['photo']}</td>
+		</tr>
+	</table>
+</div>
+<br />
+<table cellspacing="1">
+	<tr>
+		<!-- STATS -->
+		<td width="50%" valign="top" style="padding-left: 0;">
+			<table cellspacing="1" class="borderwrap">
+				<tr>
+					<td align="center" colspan="2" class="maintitle">{ipb.lang['active_stats']}</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['user_local_time']}</b></td>
+					<td class="row1">{$info['local_time']}</td>
+				</tr>
+				<tr>
+					<td class="row2" width="30%" valign="top"><b>{ipb.lang['total_posts']}</b></td>
+					<td width="70%" class="row1"><b>{$info['posts']}</b>
+					<br />( {$info['posts_day']} {ipb.lang['posts_per_day']} / {$info['total_pct']}% {ipb.lang['total_percent']} )
+					</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['fav_forum']}</b></td>
+					<td class="row1"><a href="{$info['base_url']}act=SF&amp;f={$info['fav_id']}"><b>{$info['fav_forum']}</b></a><br />( {$info['fav_posts']} {ipb.lang['fav_posts']} / {$info['percent']}% {ipb.lang['fav_percent']} )</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['last_active']}</b></td>
+					<td class="row1">{$info['last_active']}</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['last_click']}</b></td>
+					<td class="row1">{$info['online_status_indicator']} {$info['online_extra']}</td>
+				</tr>
+			</table>
+		</td>
+		<!-- Communication -->
+		<td width="50%" valign="top" style="padding-right: 0;">
+			<table cellspacing="1" class="borderwrap">
+				<tr>
+					<td align="center" colspan="2" class="maintitle">{ipb.lang['communicate']}</td>
+				</tr>
+				<tr>
+					<td width="1%" class="row1"><{PRO_AIM}></td>
+					<td width="99%" class="row2">{$info['aim_name']}</td>
+				</tr>
+				<tr>
+					<td width="1%" class="row1"><{PRO_YIM}></td>
+					<td width="99%" class="row2">{$info['yahoo']}</td>
+				</tr>
+				<tr>
+					<td width="1%" class="row1"><{PRO_ICQ}></td>
+					<td width="99%" class="row2">{$info['icq_number']}</td>
+				</tr>
+				<tr>
+					<td width="1%" class="row1"><{PRO_MSN}></td>
+					<td width="99%" class="row2">{$info['msn_name']}</td>
+				</tr>
+				<tr>
+					<td width="1%" class="row1"><{PRO_CONTACT}></td>
+					<td width="99%" class="row2"><a href="{$info['base_url']}act=Msg&amp;CODE=4&amp;MID={$info['mid']}">{ipb.lang['pm']}</a></td>
+				</tr>
+				<tr>
+					<td width="1%" class="row1"><{PRO_CONTACT}></td>
+					<td width="99%" class="row2">{$info['email']}</td>
+				</tr>
+			</table>
+		</td>
+		<!-- END CONTENT ROW 1 -->
+		<!-- information -->
+	</tr>
+	<tr>
+		<td width="50%" valign="top" style="padding-left: 0;">
+			<table cellspacing="1" class="borderwrap">
+				<tr>
+					<td align="center" colspan="2" class="maintitle">{ipb.lang['info']}</td>
+				</tr>
+				<tr>
+					<td class="row2" width="30%" valign="top"><b>{ipb.lang['homepage']}</b></td>
+					<td width="70%" class="row1">{$info['homepage']}</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['birthday']}</b></td>
+					<td class="row1">{$info['birthday']}</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['location']}</b></td>
+					<td class="row1">{$info['location']}</td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['interests']}</b></td>
+					<td class="row1">{$info['interests']}</td>
+				</tr>
+			</table>
+		</td>
+		<!-- Profile -->
+		<td width="50%" valign="top" style="padding-right: 0;">
+			<table cellspacing="1" class="borderwrap">
+				<tr>
+					<td align="center" colspan="2" class="maintitle">{ipb.lang['head_addit']}</td>
+				</tr>
+				<!--{CUSTOM.FIELDS}-->
+			</table>
+		</td>
+	</tr>
+</table>
+<if="info['signature'] != """>
+<br />
+<div class="borderwrap">
+<table cellspacing="1">
+	<tr>
+		<td class="maintitle">{ipb.lang['siggie']}</td>
+	</tr>
+	<tr>
+		<td class="row2">
+			<div class="signature">{$info['signature']}</div>
+		</td>
+	</tr>
+</table>
+</div>
+</if>
+
+<!--MEM OPTIONS-->]]></section_content>
+			<func_name>show_profile</func_name>
+			<func_data><![CDATA[$info="",$auth_key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="barc">
+	<p class="over">$edit_button</p>
+	<p><b>{$event['title']} ($event_type)</b></p>
+</div>
+<table cellspacing="1">
+	<tr>
+		<td class="row2" width="1%" valign="middle" nowrap="nowrap"><span class="normalname"><a href="{ipb.script_url}showuser={$member['id']}">{$member['name']}</a></span></td>
+		<td class="row2" width="99%">
+			<b>{ipb.lang['event_date']} {$event['mday']} {$event['month_text']} {$event['year']} $date_ends</b> ($type)
+		</td>
+	</tr>
+	<tr>
+		<td valign="top" class="row1" nowrap="nowrap">
+			{$member['avatar']}<span class="postdetails"><br />{ipb.lang['group']} {$member['g_title']}<br />{ipb.lang['posts']} {$member['posts']}<br />{ipb.lang['joined']} {$member['joined']}</span>
+		</td>
+		<td valign="top" class="row1">
+			<span class="postcolor">{$event['event_text']}</span>
+		</td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><a href="{ipb.script_url}act=calendar&amp;d={ipb.input['d']}&amp;m={ipb.input['m']}&amp;y={ipb.input['y']}"><b>{ipb.lang['back']}</b></a></td>
+	</tr>
+	<tr>
+		<td class="catend" colspan="2"><!-- no content --></td>
+	</tr>
+</table>]]></section_content>
+			<func_name>cal_show_event</func_name>
+			<func_data><![CDATA[$event="",$member="",$event_type="",$edit_button="",$type="",$date_ends=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+	<tr>
+		<td class="pformleft">&nbsp;</td>
+		<td class="pformright"><b>{ipb.lang['av_autosize']}</b><br />({ipb.lang['av_as_desc']})</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>avatar_autosize</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['avatar_url_title']}</div>]]></section_content>
+			<func_name>avatar_external_title</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<td>&nbsp;</td>]]></section_content>
+			<func_name>avatar_gallery_blank_row</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<td align="center"><img src="style_avatars{$img}" alt="txt" /><br /><input type="radio" class="radiobutton" name="avatar" value="$form" id="$form" />&nbsp;<b><label for="$form">$txt</label></b></td>]]></section_content>
+			<func_name>avatar_gallery_cell_row</func_name>
+			<func_data><![CDATA[$img="",$txt="",$form=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[</tr>]]></section_content>
+			<func_name>avatar_gallery_end_row</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[</table>
+<div align="center" class="formsubtitle">
+	<input type="submit" name="submit" value="{ipb.lang['av_gall_submit']}" />
+	&nbsp;&nbsp;&nbsp;<input type="button" name="remove" onclick="self.location='{ipb.script_url}act=UserCP&amp;CODE=24';" value="{ipb.lang['av_gall_cancel']}" />
+</div>
+</form>]]></section_content>
+			<func_name>avatar_gallery_end_table</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>]]></section_content>
+			<func_name>avatar_gallery_start_row</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['av_gallery_title']} $title</div>
+<form action="{ipb.script_url}act=UserCP&amp;CODE=getgallery" method="post">
+	<div id="padandcenter"><b>{ipb.lang['av_gall_jump']}</b>&nbsp;$av_gals&nbsp;&nbsp;<input type="submit" value="{ipb.lang['av_go_go']}" name="submit" /></div>
+</form>
+<form action="{ipb.script_url}auth_key=$key" method="post">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="setinternalavatar" />
+<input type="hidden" name="current_folder" value="$current_folder" />
+	<table cellspacing="0">]]></section_content>
+			<func_name>avatar_gallery_start_table</func_name>
+			<func_data><![CDATA[$title="",$av_gals="",$current_folder="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['av_settings']}</div>
+	<p>{ipb.lang['av_text_url']} {ipb.lang['av_text_upload']}<br />{ipb.lang['av_allowed_files']}</p>]]></section_content>
+			<func_name>avatar_limits</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var url_input      = "{$data['current_url_avatar']}";
+var remove_pressed = 0;
+	function select_url(){
+		restore_it();
+	}
+	
+	function select_upload(){
+		try{
+			if ( document.creator.url_avatar.value != "" ) {
+				url_input = document.creator.url_avatar.value;
+			}
+			document.creator.url_avatar.value = "";
+		}
+		catch(nourl){
+			return true;
+		}
+	}
+	
+	function restore_it(){
+		if (url_input != ""){
+			document.creator.url_avatar.value = url_input;
+			}
+		}
+	function checkform(){
+		if ( remove_pressed != 1 ){
+			return true;
+		}
+	
+		else{
+			fcheck = confirm("{ipb.lang['av_confirm']}");
+			if ( fcheck == true ){
+				return true;
+			}
+			else{
+				return false;
+				}
+			}
+	}
+-->
+</script>
+<!--IBF.LIMITS_AVATAR-->
+<div class="formsubtitle">{ipb.lang['av_current']}</div>
+<div class="tablepad" align="center">{$data['current_avatar_image']}<br />{$data['current_avatar_type']} {$data['current_avatar_dims']}</div>
+<div class="formsubtitle">{ipb.lang['avatar_pre_title']}</div>
+<form action="{ipb.script_url}act=UserCP&amp;CODE=getgallery" method="post">
+	<table cellspacing="0">
+		<tr>
+			<td class="pformleft">{ipb.lang['av_go_gal']}</td>
+			<td class="pformright">{$data['avatar_galleries']}&nbsp;&nbsp;<input type="submit" value="{ipb.lang['av_go_go']}" name="submit" /></td>
+		</tr>
+	</table>
+</form>
+<form action="{ipb.script_url}auth_key=$key" method="post" $formextra name="creator" onsubmit="return checkform();">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="25" />
+$hidden_field
+<!--IBF.EXTERNAL_TITLE-->
+<!--IBF.URL_AVATAR-->
+<!--IBF.UPLOAD_AVATAR-->
+<!--IPB.SIZE-->
+	<div align="center" class="formsubtitle">
+		<input type="submit" name="submit" value="{ipb.lang['av_update']}" />
+		&nbsp;&nbsp;&nbsp;<input type="submit" name="remove" onclick="remove_pressed=1;" value="{ipb.lang['av_remove']}" />
+	</div>
+</form>]]></section_content>
+			<func_name>avatar_main</func_name>
+			<func_data><![CDATA[$data="",$formextra="",$hidden_field="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+	<tr>
+		<td class="pformleft">&nbsp;</td>
+		<td class="pformright"><b>{ipb.lang['width']}</b>&nbsp;<input type="text" size="3" name="man_width" />&nbsp;&nbsp;<b>{ipb.lang['height']}</b>&nbsp;<input type="text" size="3" name="man_height" /></td>
+	</tr>
+</table>]]></section_content>
+			<func_name>avatar_mansize</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+	<tr>
+		<td class="pformleft">{ipb.lang['av_upload']}</td>
+		<td class="pformright"><input type="file" size="30" name="upload_avatar" onfocus="select_upload()" onclick="select_upload()" /></td>
+	</tr>
+</table>]]></section_content>
+			<func_name>avatar_upload_field</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<table cellspacing="0">
+	<tr>
+		<td class="pformleft">{ipb.lang['av_url']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="80" name="url_avatar" value="$avatar" onfocus="select_url()" />&nbsp;&nbsp;(<a href="javascript:restore_it()">{ipb.lang['pp_restore']}</a>)</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>avatar_url_field</func_name>
+			<func_data><![CDATA[$avatar=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft"><b>{ipb.lang['birthday']}</b></td>
+		<td class="pformright">
+			<select name="day">&nbsp;
+				{$day}
+			</select> 
+			<select name="month">&nbsp;
+				{$month}
+			</select>
+			<select name="year">&nbsp;
+				{$year}
+			</select>
+		</td>
+	</tr>]]></section_content>
+			<func_name>birthday</func_name>
+			<func_data><![CDATA[$day="",$month="",$year=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[</div>
+		</td>
+	</tr>
+</table>
+	<!-- end main CP area -->
+	<br style="clear: all;" />]]></section_content>
+			<func_name>CP_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['dead_section_title']}</div>
+<p>
+	{ipb.lang['dead_section_text']}
+</p>]]></section_content>
+			<func_name>dead_section</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}auth_key={$Profile['key']}" method="post">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="03" />
+<div class="formsubtitle">{ipb.lang['privacy_settings']}</div>
+<table cellspacing="0">
+	<tr>
+		<td align="right" valign="top"><input type="checkbox" name="hide_email" value="1" {$Profile['hide_email']} /></td>
+		<td width="100%">{ipb.lang['hide_email']}</td>
+	</tr>
+	<tr>
+		<td align="right" valign="top"><input type="checkbox" name="admin_send" value="1" {$Profile['allow_admin_mails']} /></td>
+		<td  width="100%">{ipb.lang['admin_send']}</td>
+	</tr>
+</table>
+	<br />
+<div class="formsubtitle">{ipb.lang['board_prefs']}</div>
+<table cellspacing="0">
+	<tr>
+		<td align="right" valign="top"><input type="checkbox" name="send_full_msg" value="1" {$Profile['email_full']} /></td>
+		<td  width="100%">{ipb.lang['send_full_msg']}</td>
+	</tr>
+	<tr>
+		<td align="right" valign="top"><input type="checkbox" name="pm_reminder" value="1" {$Profile['email_pm']} /></td>
+		<td  width="100%">{ipb.lang['pm_reminder']}</td>
+	</tr>
+	<tr>
+		<td align="right" valign="top"><input type="checkbox" name="auto_track" value="1" {$Profile['auto_track']} /></td>
+		<td  width="100%">
+			{ipb.lang['auto_track']}
+				<select name="trackchoice">
+					<option value="none">{ipb.lang['subs_none_title']}</option>
+					<option value="immediate">{ipb.lang['subs_immediate']}</option>
+					<option value="delayed">{ipb.lang['subs_delayed']}</option>
+					<option value="daily">{ipb.lang['subs_daily']}</option>
+					<option value="weekly">{ipb.lang['subs_weekly']}</option>
+				</select>
+					<br />
+			{ipb.lang['auto_track_desc']}
+		</td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['submit_email']}" /></td>
+	</tr>
+</table>
+</form>]]></section_content>
+			<func_name>email</func_name>
+			<func_data><![CDATA[$Profile=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+			<td width="1%" align="center"><select name="attach_{$attach['attach_id']}" class="dropdown"><option value="keep">{ipb.lang['cm_keep']}</option><option value="delete">{ipb.lang['cm_delete']}</option></select></td>
+			<td width="1%"><img src="{ipb.vars['mime_img']}/{$attach['image']}" alt="" /></td>
+			<td width="15%" nowrap="nowrap">{$attach['size']}</td>
+			<td width="95%"><a href="{ipb.script_url}act=Attach&amp;type=post&amp;id={$attach['attach_id']}" target="_blank"><b>{$attach['attach_file']}</b></a> #{$attach['attach_pid']}</td>
+		</tr>]]></section_content>
+			<func_name>uploadbox_entry</func_name>
+			<func_data><![CDATA[$attach=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<table cellspacing="1">
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang[edit_f_title]}</b></td>
+			<td class="pformright"><input type="text" size="40" maxlength="50" name="TopicTitle" value="$title" /></td>
+		</tr>
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang[edit_f_desc]}</b></td>
+			<td class="pformright"><input type="text" size="40" maxlength="40" name="TopicDesc" value="$desc" /></td>
+		</tr>
+	</table>]]></section_content>
+			<func_name>topictitle_fields</func_name>
+			<func_data><![CDATA[$title="",$desc=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<textarea cols="60" rows="5" wrap="soft" name="$name">$value</textarea>]]></section_content>
+			<func_name>field_textarea</func_name>
+			<func_data><![CDATA[$name="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<input type="text" size="35" name="$name" value="$value" />]]></section_content>
+			<func_name>field_textinput</func_name>
+			<func_data><![CDATA[$name="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<br />
+	<div align="right">{$data}</div>
+<br />]]></section_content>
+			<func_name>forum_jump</func_name>
+			<func_data><![CDATA[$data="",$menu_extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<table cellspacing="1">
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang['mt_new_title']}</b></td>
+			<td class="pformright"><input type="text" size="40" maxlength="50" name="title" value="$title" /></td>
+		</tr>
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang['mt_new_desc']}</b></td>
+			<td class="pformright"><input type="text" size="40" maxlength="40" name="desc" value="$desc" /></td>
+		</tr>
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang['mt_tid']}</b></td>
+			<td class="pformright"><input type="text" size="50" name="topic_url" value="" /></td>
+		</tr>
+	</table>]]></section_content>
+			<func_name>merge_body</func_name>
+			<func_data><![CDATA[$title="",$desc=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}act=mod&amp;CODE=postchoice&amp;tact=merge&amp;checked=1" method="post">
+	<input type="hidden" name="act" value="mod" />
+	<input type="hidden" name="selectedpids" value="{ipb.input['selectedpids']}" />
+	<input type="hidden" name="auth_key" value="{$auth_key}" />
+	<input type="hidden" name="t" value="{ipb.input['t']}" />
+	<input type="hidden" name="f" value="{ipb.input['f']}" />
+	<input type="hidden" name="st" value="{ipb.input['st']}" />
+	
+		<div class="borderwrap">
+		<div class="maintitle">{ipb.lang['cm_title']}</div>
+			<table cellspacing="1">
+				<tr>
+					<td width="35%" class="row2"><b>{ipb.lang['cm_post']}</b></td>
+					<td width="65%" class="row2"><select name="postdate" class="dropdown">{$pid}</select></td>
+				</tr>
+				<tr>
+					<td class="row2"><b>{ipb.lang['cm_author']}</b></td>
+					<td class="row2"><select name="postauthor" class="dropdown">{$author}</select></td>
+				</tr>
+				<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['cm_text']}</b></td>
+					<td class="row2"><textarea cols="70" rows="20" name="Post" class="textarea">$post</textarea></td>
+				</tr>
+<if="upload != """>
+<tr>
+					<td class="row2" valign="top"><b>{ipb.lang['cm_attach']}</b><div class="desc">{ipb.lang['cm_attach2']}</div></td>
+					<td class="row2">
+						<table cellspacing="1">
+							$upload
+						</table>
+					</td>
+				</tr>
+</if>
+
+			</table>
+			<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['cm_submit']}" /></div>
+		</div>
+</form>]]></section_content>
+			<func_name>merge_post_form</func_name>
+			<func_data><![CDATA[$post="",$pid="",$author="",$auth_key="",$upload=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">$words</div>]]></section_content>
+			<func_name>mod_exp</func_name>
+			<func_data><![CDATA[$words=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[</table>
+</div>]]></section_content>
+			<func_name>mod_log_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="pformright" colspan="3" align="center"><i>{ipb.lang['ml_none']}</i></td>
+</tr>]]></section_content>
+			<func_name>mod_log_none</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="pformright">{$data['member']}</td>
+	<td class="pformright">{$data['action']}</td>
+	<td class="pformright">{$data['date']}</td>
+</tr>]]></section_content>
+			<func_name>mod_log_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<br />
+	<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['ml_title']}</div>
+		<table cellspacing="1">
+			<tr>
+				<td class="formsubtitle" width="30%"><b>{ipb.lang['ml_name']}</b></td>
+				<td class="formsubtitle" width="50%"><b>{ipb.lang['ml_desc']}</b></td>
+				<td class="formsubtitle" width="20%"><b>{ipb.lang['ml_date']}</b></td>
+			</tr>]]></section_content>
+			<func_name>mod_log_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">$title</div>
+		<div class="tablepad">
+			$msg
+			<br /><br />
+			<div align="center"><a href="#" onclick="window.close();">{ipb.lang['cpp_close']}</a></div>
+		</div>
+	</div>]]></section_content>
+			<func_name>mod_simple_page</func_name>
+			<func_data><![CDATA[$title="",$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[</table>
+			<div align="center" class="tablepad"><b>{ipb.lang['cp_tmove_to']}</b>&nbsp;&nbsp;<select name="df">$jump_html</select></div>
+			<div align="center" class="formsubtitle"><input type="submit" value="{ipb.lang['cp_tmove_end']}" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>move_checked_form_end</func_name>
+			<func_data><![CDATA[$jump_html=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1" width="40%" align="right"><input type="checkbox" name="TID_$tid" value="1" checked="checked" /></td>
+	<td class="row1" width="60%"><b>$title</b></td>
+</tr>]]></section_content>
+			<func_name>move_checked_form_entry</func_name>
+			<func_data><![CDATA[$tid="",$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['cp_tmove_start']} $forum_name</div>
+		<table cellspacing="0">]]></section_content>
+			<func_name>move_checked_form_start</func_name>
+			<func_data><![CDATA[$forum_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<table cellspacing="1">
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang[move_from]} <b>$forum_name</b> {ipb.lang[to]}</b></td>
+			<td class="pformright"><select name="move_id">$jhtml</select></td>
+		</tr>
+		<tr>
+			<td class="pformleftw"><b>{ipb.lang['leave_link']}</b></td>
+			<td class="pformright"><select name="leave"><option value="y" selected="selected">{ipb.lang['yes']}</option><option value="n">{ipb.lang['no']}</option></select></td>
+		</tr>
+	</table>]]></section_content>
+			<func_name>move_form</func_name>
+			<func_data><![CDATA[$jhtml="",$forum_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<table cellspacing="1">
+		<tr>
+			<td class="row2" width="40%"><b>{ipb.lang['cmp_topic']}</b><div class="desc">{ipb.lang['cmp_topic2']}</div></td>
+			<td class="row2" width="60%"><input type="text" size="50" name="topic_url" value="" /></td>
+		</tr>
+	</table>
+</div>
+<br />
+<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['st_post']}</div>]]></section_content>
+			<func_name>move_post_body</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1"><b>{ipb.lang['pe_option']} $id</b> <i>( {ipb.lang['pe_unused']} )</i></td>
+		<td class="row1"><input type="text" size="60" maxlength="250" name="POLL_$id" value="" /></td>
+		<td class="row1"><input type="text" size="7" maxlength="250" name="VOTES_$id" value="0" /></td>
+	</tr>]]></section_content>
+			<func_name>poll_edit_new_entry</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<table cellspacing="0">]]></section_content>
+			<func_name>poll_edit_top</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1"><b>{ipb.lang['pe_option']} $id</b></td>
+		<td class="row1"><input type="text" size="60" maxlength="250" name="POLL_$id" value="$entry" /></td>
+		<td class="row1"><input type="text" size="7" maxlength="250" name="VOTES_$id" value="$votes" /></td>
+	</tr>]]></section_content>
+			<func_name>poll_entry</func_name>
+			<func_data><![CDATA[$id="",$entry="",$votes=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1"><b>{ipb.lang['pe_question']}</b></td>
+		<td class="row1"><input type="text" size="60" maxlength="250" name="poll_question" value="$poll_question" /></td>
+	</tr>
+	<tr>
+		<td class="row1"><b>{ipb.lang['pe_pollonly']}</b></td>
+		<td class="row1">
+			<select name="pollonly">
+				<option value="0">{ipb.lang['pe_no']}</option>
+				<option value="1">{ipb.lang['pe_yes']}</option>
+			</select>
+		</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>poll_select_form</func_name>
+			<func_data><![CDATA[$poll_question=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[&nbsp;<span class="pagelink"><a href="$url" title="{ipb.lang['tpl_next']}">&gt;</a></span>]]></section_content>
+			<func_name>pagination_next_link</func_name>
+			<func_data><![CDATA[$url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content>{$start}{$start_dots}{$previous_link}{$pages}{$next_link}{$end_dots}</section_content>
+			<func_name>pagination_compile</func_name>
+			<func_data><![CDATA[$start="",$previous_link="",$start_dots="",$pages="",$end_dots="",$next_link=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<div id="userlinksguest">
+	<p class="pcen">{ipb.lang['mb_disabled']}</b></p>
+</div>]]></section_content>
+			<func_name>member_bar_disabled</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<div id="pmnotewrap">
+	<h4>{ipb.lang['pmp_title']} {$msg['name']}</h4>
+	<div class="pminfo">
+		<p class="pmavatar">{$msg['avatar']}</p>
+		<p><b>{$msg['mt_title']}</b><br />{$msg['msg_post']}<br /><br /><i>{$msg['name']} {ipb.lang['pmp_part1']} {$msg['g_title']} {ipb.lang['pmp_part2']} {$msg['posts']} {ipb.lang['pmp_part3']}</i></p>
+		<div class="cleared"><!-- float cleared --></div>
+	</div>
+	<p class="pmnotefoot"><a href='{ipb.script_url}act=Msg&amp;CODE=03&amp;MSID={$msg['mt_id']}&amp;VID=in'>{ipb.lang['pmp_read_in_window']}</a> / <a href='{ipb.script_url}act=Msg&amp;CODE=03&amp;MSID={$msg['mt_id']}&amp;VID=in' target='_blank'>{ipb.lang['pmp_read_new_window']}</a></p>
+</div>]]></section_content>
+			<func_name>msg_get_new_pm_notification</func_name>
+			<func_data><![CDATA[$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}setskin=1" name="skinselectorbox" method="post">
+	<input type="hidden" name="skinurlbits" value="act={ipb.input['act']}&CODE={ipb.input['CODE']}&id={ipb.input['id']}&t={ipb.input['t']}&f={ipb.input['f']}&st={ipb.input['st']}" />
+	<select name="skinid" onchange="chooseskin(this)">
+		<optgroup label="{ipb.lang['global_skinselector']}">
+			$data
+		</optgroup>
+	</select>
+</form>]]></section_content>
+			<func_name>global_skin_chooser</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<if="ipb.member['id']">
+<div id="userlinks">
+	<p class="home"><b>{ipb.lang['logged_in_as']} <a href="{ipb.script_url}showuser={ipb.member['id']}">{ipb.member['name']}</a></b> ( <a href="{ipb.script_url}act=Login&amp;CODE=03">{ipb.lang['log_out']}</a> )</p>
+	<p>
+</if>
+<else>
+<div id="userlinksguest">
+	<p class="pcen"><b>{ipb.lang['guest_stuff']}</b> ( <a href="{ipb.script_url}act=Login&amp;CODE=00">{ipb.lang['log_in']}</a> | <a href="{ipb.script_url}act=Reg&amp;CODE=00">{ipb.lang['register']}</a> )
+</else>
+<if="ipb.member['mgroup'] == ipb.vars['auth_group']">
+<b><a href="{ipb.script_url}act=reg&amp;CODE=reval">{ipb.lang['resend_val']}</a></b> &middot;
+</if>
+<if="ipb.member['g_access_cp']">
+<b><a href="{ipb.vars['board_url']}/admin.{ipb.vars['php_ext']}" target="_blank">{ipb.lang['admin_cp']}</a></b> &middot;
+</if>
+<if="ipb.member['id']">
+&nbsp;<b><a href="{ipb.script_url}act=UserCP&amp;CODE=00" title="{ipb.lang['cp_tool_tip']}">{ipb.lang['your_cp']}</a></b> &middot;&nbsp;<a href="{ipb.script_url}act=Search&amp;CODE=getnew">{ipb.lang['view_new_posts']}</a>&nbsp;&middot;&nbsp;<a href="javascript:buddy_pop();" title="{ipb.lang['bb_tool_tip']}">{ipb.lang['l_qb']}</a>
+</if>
+<if="ipb.member['g_use_pm']">
+&nbsp;&middot;&nbsp;<a href="{ipb.script_url}act=Msg&amp;CODE=01">{$msg[TEXT]}</a>
+</if>
+
+	</p>
+</div>]]></section_content>
+			<func_name>member_bar</func_name>
+			<func_data><![CDATA[$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<h4>{ipb.lang['err_title']}</h4>
+<p>{ipb.lang['err_expl']}</p>
+<div class="fieldwrap">
+	<h4>{ipb.lang['err_title']}</h4>
+	<form name="mehform">
+		<textarea cols="70" rows="5" name="saved" tabindex="2">$post</textarea>
+	</form>
+	<p class="formbuttonrow1"><input class="button" type="button" tabindex="1" value="{ipb.lang['err_select']}" onclick="document.mehform.saved.select()" /></p>
+</div>]]></section_content>
+			<func_name>error_post_textarea</func_name>
+			<func_data><![CDATA[$post=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<!-- Show FAQ/Forum Rules -->
+<div class="borderwrap">
+	<h3><{CAT_IMG}>&nbsp;{$rules['title']}</h3>
+	<p>{$rules['body']}</p>
+</div>
+<!-- End FAQ/Forum Rules -->]]></section_content>
+			<func_name>forum_show_rules_full</func_name>
+			<func_data><![CDATA[$rules=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<!-- Show FAQ/Forum Rules -->
+<div class="ruleswrap">
+	&nbsp;<{F_RULES}>&nbsp;<b><a href="{ipb.script_url}act=SR&amp;f={$rules['fid']}">{$rules['title']}</a></b>
+</div>]]></section_content>
+			<func_name>forum_show_rules_link</func_name>
+			<func_data><![CDATA[$rules=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{$data['depthguide']} {$data['new_post']} <b>{$data['linked_name']}</b> &nbsp; <i><a href="{ipb.script_url}showtopic={$data['topic_id']}&amp;pid={$data['pid']}&amp;mode=threaded&amp;show={ipb.input['show']}&amp;st={ipb.input['st']}&#entry{$data['pid']}">{$data['post_title']}</a></i> &nbsp; <span class="desc">{$data['formatted_date']}</span><br />]]></section_content>
+			<func_name>toutline_show_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div style='background:#FFF9BA;'>{$data['depthguide']} {$data['new_post']} <b>{$data['linked_name']}</b> &nbsp; <i><a href="{ipb.script_url}showtopic={$data['topic_id']}&amp;pid={$data['pid']}&amp;mode=threaded&amp;show={ipb.input['show']}&amp;st={ipb.input['st']}&#entry{$data['pid']}">{$data['post_title']}</a></i> &nbsp; <span class="desc">{$data['formatted_date']}</span></div>]]></section_content>
+			<func_name>toutline_show_row_highlight</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[&lt;&nbsp;$min ( <a href="javascript:PopUp('{ipb.script_url}act=warn&amp;mid={$id}&amp;CODE=view','Pager','500','450','0','1','1','1')">{$level}</a> ) $max&nbsp;&gt;]]></section_content>
+			<func_name>warn_level_rating</func_name>
+			<func_data><![CDATA[$id="",$level="",$min=0,$max=10]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">Posts in this topic</div>
+	<div class="tablepad">]]></section_content>
+			<func_name>toutline_start_list</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content></section_content>
+			<func_name>toutline_start_new_parent</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['stats_header']}</div>
+<if="ipb.member['bio'] == "dupemail"">
+<div><b>{ipb.lang['conv_email_warning_title']}<br /><br />{ipb.lang['conv_email_warning']}</b></div>
+</if>
+
+<table cellspacing="0">
+	<tr>
+		<td width="50%" valign="top">
+			<fieldset class="search">
+			<legend><b>{ipb.lang['splash_attach']}</b></legend>
+<if="member['attach_html'] != """>
+{$member['attach_html']}
+</if>
+<else>
+<br /><br /><div align="center">{ipb.lang['splash_noattach']}</div><br /><br />&nbsp;
+</else>
+
+			</fieldset>
+		</td>
+		<td width="50%" valign="top">
+			<fieldset class="search">
+			<legend><b>{ipb.lang['stats_header']}</b></legend>
+				<table cellspacing="0">
+					<tr>
+						<td width="50%"><b>{ipb.lang['email_address']}</b></td>
+						<td width="50%">{$member['member_email']}</td>
+					</tr>
+					<tr>
+						<td width="50%"><b>{ipb.lang['number_posts']}</b></td>
+						<td width="50%">{$member['member_posts']}</td>
+					</tr>
+					<tr>
+						<td width="50%"><b>{ipb.lang['registered']}</b></td>
+						<td width="50%">{$member['date_registered']}</td>
+					</tr>
+					<tr>
+						<td width="50%"><b>{ipb.lang['daily_average']}</b></td>
+						<td width="50%">{$member['daily_average']}</td>
+					</tr>
+				</table>
+			</fieldset>
+		</td>
+	</tr>
+</table>
+<script type="text/javascript" src="jscripts/ipb_forum.js"></script>
+<div class="borderwrapm">
+<div class="maintitle">{ipb.lang['splash_last5']}</div>
+	<table cellspacing="1">
+<if="member['topic_html'] != """>
+<tr>
+			<th width="40%" nowrap="nowrap" colspan="3">{ipb.lang['h_topic_title']}</th>
+			<th width="7%" align="center" nowrap="nowrap">{ipb.lang['h_replies']}</th>
+			<th width="14%" align="center" nowrap="nowrap">{ipb.lang['h_topic_starter']}</th>
+			<th width="7%" align="center" nowrap="nowrap">{ipb.lang['h_hits']}</th>
+			<th width="32%" nowrap="nowrap">{ipb.lang['h_last_action']}</th>
+		</tr>
+      {$member['topic_html']}
+</if>
+<else>
+<tr>
+			<td colspan="7" align="center"><b>{ipb.lang['splash_nopost']}</b></td>
+		</tr>
+</else>
+
+	</table>
+</div>
+<div class="formsubtitle">{ipb.lang['note_pad']}</div>
+<div align="center">
+<p>
+	<form name="notepad" action="{ipb.script_url}" method="post">
+	<input type="hidden" name="act" value="UserCP" />
+	<input type="hidden" name="s" value="{ipb.session_id}" />
+	<input type="hidden" name="CODE" value="20" />
+	
+        <textarea cols="65" rows="{$member['SIZE']}" name="notes">{$member['NOTES']}</textarea>
+        	<br />
+	    {ipb.lang['ta_size']}&nbsp;
+	    <select name="ta_size">
+	    	{$member['SIZE_CHOICE']}
+	    </select>
+	<input type="submit" value="{ipb.lang['submit_notepad']}" />
+	</form>
+</p>
+</div>]]></section_content>
+			<func_name>splash</func_name>
+			<func_data><![CDATA[$member=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft">&nbsp;</td>
+		<td class="pformright"><b>{ipb.lang['width']}</b>&nbsp;<input type="text" size="3" name="man_width" />&nbsp;&nbsp;<b>{ipb.lang['height']}</b>&nbsp;<input type="text" size="3" name="man_height" /></td>
+	</tr>]]></section_content>
+			<func_name>photo_page_mansize</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}auth_key=$key" method="post">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="05" />
+<div class="formsubtitle">{ipb.lang['settings_time']}</div>
+<p>
+{ipb.lang['settings_time_txt']}&nbsp;$time
+<br />
+$time_select
+<br /><br />
+<input type="checkbox" name="DST" value="1" $dst_check /> &nbsp;{ipb.lang['dst_box']}
+</p>]]></section_content>
+			<func_name>settings_header</func_name>
+			<func_data><![CDATA[$Profile="",$time_select="",$time="",$dst_check="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft">{ipb.lang['pph_upload']}</td>
+		<td class="pformright"><input type="hidden" name="MAX_FILE_SIZE" value="$max_filesize" /><input type="file" name="upload_photo" value="" size="40" onclick="clear_it()" /></td>
+	</tr>]]></section_content>
+			<func_name>photo_page_upload</func_name>
+			<func_data><![CDATA[$max_filesize=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[</table>]]></section_content>
+			<func_name>required_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['cf_required']}</div>
+	<table cellspacing="0">]]></section_content>
+			<func_name>required_title</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['settings_display']}</div>
+<table cellspacing="0">
+	<tr>
+		<td width="70%">{ipb.lang['settings_viewsig']}</td>
+		<td>{$data[SIG]}</td>
+	</tr>
+	<tr>
+		<td>{ipb.lang['settings_viewimg']}</td>
+		<td>{$data[IMG]}</td>
+	</tr>
+	<tr>
+		<td>{ipb.lang['settings_viewava']}</td>
+		<td>{$data[AVA]}</td>
+	</tr>
+	<tr>
+		<td>{ipb.lang['settings_dopopup']}</td>
+		<td>{$data[POP]}</td>
+	</tr>
+<!--
+	<tr>
+		<td>{ipb.lang['hide_session_txt']}<br/ ><span class="desc">{ipb.lang['hs_exp']}</span></td>
+		<td>{$data[SESS]}</td>
+	</tr>
+-->
+	<tr>
+		<td>{ipb.lang['open_qr']}<br/ ></td>
+		<td>{$data[QR]}</td>
+	</tr>
+	<tr>
+		<td>{ipb.lang['pp_number_posts']}</td>
+		<td>
+			<select name="postpage">
+				{$data['PPS']}
+			</select>
+		</td>
+		</tr>
+		<tr>
+			<td>{ipb.lang['pp_number_topics']}</td>
+			<td><select name="topicpage">{$data['TPS']}</select></td>
+		</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><span class="desc">{ipb.lang['need_cookie_yum_yum']}</span><br /><input type="submit" name="submit" value="{ipb.lang['settings_submit']}" /></td>
+	</tr>
+	</table>
+</form>]]></section_content>
+			<func_name>settings_end</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var ipb_lang_tt_prompt = "{ipb.lang['tt_prompt']}";
+var ipb_lang_js_del_1  = "{ipb.lang['js_del_1']}";
+var ipb_lang_js_del_2  = "{ipb.lang['js_del_2']}";
+var addquotebutton     = "{ipb.vars['img_url']}/p_mq_add.gif";
+var removequotebutton  = "{ipb.vars['img_url']}/p_mq_remove.gif";
+var unselectedbutton = "{ipb.vars['img_url']}/topic_unselected.gif";
+var selectedbutton   = "{ipb.vars['img_url']}/topic_selected.gif";
+var lang_gobutton    = "{ipb.lang['f_go']}";
+var lang_suredelete  = "{ipb.lang['cp_js_delete']}";
+-->
+</script>
+<script type="text/javascript" src="jscripts/ipb_topic.js"></script>
+  
+<a name="top"></a>
+<!--IBF.FORUM_RULES-->
+<div class="borderwrap">
+	<div class="maintitle">
+		<p class="expand">
+			{$data['TOPIC']['to_button_threaded']} &middot;
+			{$data['TOPIC']['to_button_standard']} &middot;
+			{$data['TOPIC']['to_button_linearpl']}
+		</p>
+		<p><{CAT_IMG}>&nbsp;<b>{$data['TOPIC']['title']}</b>{$data['TOPIC']['description']}</p>
+	</div>
+	<!--{IBF.POLL}-->
+	<div align="right" class="subtitle">
+		<b><a href="{ipb.script_url}act=usercp&amp;CODE=start_subs&amp;method=topic&amp;tid={$data['TOPIC']['tid']}">{ipb.lang['track_topic']}</a> |
+			<a href="{ipb.script_url}act=Forward&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}">{ipb.lang['forward']}</a> |
+			<a href="{ipb.script_url}act=Print&amp;client=printer&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}">{ipb.lang['print']}</a></b>
+	</div>]]></section_content>
+			<func_name>topic_page_top_new_mode</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var MessageMax  = "{ipb.lang['the_max_length']}";
+var Override    = "{ipb.lang['override']}";
+	function CheckLength(){
+    	MessageLength  = document.REPLIER.Post.value.length;
+    	message  = "";
+	        if (MessageMax > 0){
+    	        message = "{ipb.lang['js_max_length']} " + MessageMax + " {ipb.lang['js_characters']}.";
+	        }
+	        else{
+            message = "";
+        	}
+        alert(message + " {ipb.lang['js_used']} " + MessageLength + " {ipb.lang['js_characters']}.");
+	}
+	
+	function ValidateForm(){
+    	MessageLength  = document.REPLIER.Post.value.length;
+    	errors = "";
+    		if (MessageMax !=0){
+        		if (MessageLength > MessageMax){
+            		errors = "{ipb.lang['js_max_length']} " + MessageMax + " {ipb.lang['js_characters']}. {ipb.lang['js_current']}: " + MessageLength;
+            	}
+            }
+			if (errors != "" && Override == ""){
+				alert(errors);
+				return false;
+			}
+			else{
+				document.REPLIER.submit.disabled = true;
+				return true;
+			}
+	}
+// IBC Code stuff
+	var text_enter_url      = "{ipb.lang['jscode_text_enter_url']}";
+	var text_enter_url_name = "{ipb.lang['jscode_text_enter_url_name']}";
+	var text_enter_image    = "{ipb.lang['jscode_text_enter_image']}";
+	var text_enter_email    = "{ipb.lang['jscode_text_enter_email']}";
+	var text_enter_flash    = "{ipb.lang['jscode_text_enter_flash']}";
+	var text_code           = "{ipb.lang['jscode_text_code']}";
+	var text_quote          = "{ipb.lang['jscode_text_quote']}";
+	var error_no_url        = "{ipb.lang['jscode_error_no_url']}";
+	var error_no_title      = "{ipb.lang['jscode_error_no_title']}";
+	var error_no_email      = "{ipb.lang['jscode_error_no_email']}";
+	var error_no_width      = "{ipb.lang['jscode_error_no_width']}";
+	var error_no_height     = "{ipb.lang['jscode_error_no_height']}";
+	var prompt_start        = "{ipb.lang['js_text_to_format']}";
+	
+	var help_bold           = "{ipb.lang['hb_bold']}";
+	var help_italic         = "{ipb.lang['hb_italic']}";
+	var help_under          = "{ipb.lang['hb_under']}";
+	var help_font           = "{ipb.lang['hb_font']}";
+	var help_size           = "{ipb.lang['hb_size']}";
+	var help_color          = "{ipb.lang['hb_color']}";
+	var help_close          = "{ipb.lang['hb_close']}";
+	var help_url            = "{ipb.lang['hb_url']}";
+	var help_img            = "{ipb.lang['hb_img']}";
+	var help_email          = "{ipb.lang['hb_email']}";
+	var help_quote          = "{ipb.lang['hb_quote']}";
+	var help_list           = "{ipb.lang['hb_list']}";
+	var help_code           = "{ipb.lang['hb_code']}";
+	var help_click_close    = "{ipb.lang['hb_click_close']}";
+	var list_prompt         = "{ipb.lang['js_tag_list']}";
+-->
+</script>
+<form action="{ipb.script_url}" method="post" name="REPLIER">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="23" />
+<input type="hidden" name="key" value="$key" />
+<div class="formsubtitle">{ipb.lang['cp_current_sig']}</div>
+<div class="signature" style="padding: 5px;">$sig</div>
+<div class="formsubtitle">{ipb.lang['cp_edit_sig']}</div>
+<table cellspacing="0">
+	<tr>
+		<td class="pformleft">
+			<input type="radio" name="bbmode" value="ezmode" onclick="setmode(this.value)" />&nbsp;<b>{ipb.lang['bbcode_guided']}</b><br />
+			<input type="radio" name="bbmode" value="normal" onclick="setmode(this.value)" checked="checked" />&nbsp;<b>{ipb.lang['bbcode_normal']}</b>
+			<script type="text/javascript" src="jscripts/ipb_bbcode.js"></script>
+		</td>
+		<td class="pformright" valign="top">
+			<input type="button" accesskey="b" value=" B " onclick="simpletag('B')" class="codebuttons" name="B" style="font-weight: bold;" onmouseover="hstat('bold')" />
+			<input type="button" accesskey="i" value=" I " onclick="simpletag('I')" class="codebuttons" name="I" style="font-style: italic;" onmouseover="hstat('italic')" />
+			<input type="button" accesskey="u" value=" U " onclick="simpletag('U')" class="codebuttons" name="U" style="text-decoration: underline;" onmouseover="hstat('under')" />
+			
+			<select name="ffont" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'FONT')"  onmouseover="hstat('font')">
+				<option value="0">{ipb.lang['ct_font']}</option>
+				<option value="Arial" style="font-family: Arial;">{ipb.lang['ct_arial']}</option>
+				<option value="Times" style="font-family: Times;">{ipb.lang['ct_times']}</option>
+				<option value="Courier" style="font-family: Courier;">{ipb.lang['ct_courier']}</option>
+				<option value="Impact" style="font-family: Impact;">{ipb.lang['ct_impact']}</option>
+				<option value="Geneva" style="font-family: Geneva;">{ipb.lang['ct_geneva']}</option>
+				<option value="Optima" style="font-family: Optima;">Optima</option>
+			</select>
+			<select name="fsize" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'SIZE')" onmouseover="hstat('size')">
+				<option value="0">{ipb.lang['ct_size']}</option>
+				<option value="1">{ipb.lang['ct_sml']}</option>
+				<option value="7">{ipb.lang['ct_lrg']}</option>
+				<option value="14">{ipb.lang['ct_lest']}</option>
+			</select>
+			<select name="fcolor" class="codebuttons" onchange="alterfont(this.options[this.selectedIndex].value, 'COLOR')" onmouseover="hstat('color')">
+				<option value="0">{ipb.lang['ct_color']}</option>
+				<option value="blue" style="color: blue;">{ipb.lang['ct_blue']}</option>
+				<option value="red" style="color: red;">{ipb.lang['ct_red']}</option>
+				<option value="purple" style="color: purple;">{ipb.lang['ct_purple']}</option>
+				<option value="orange" style="color: orange;">{ipb.lang['ct_orange']}</option>
+				<option value="yellow" style="color: yellow;">{ipb.lang['ct_yellow']}</option>
+				<option value="gray" style="color: gray;">{ipb.lang['ct_grey']}</option>
+				<option value="green" style="color: green;">{ipb.lang['ct_green']}</option>
+			</select>
+			&nbsp; <a href="javascript:closeall();" onmouseover="hstat('close')">{ipb.lang['js_close_all_tags']}</a>
+				<br />
+			<input type="button" accesskey="h" value=" http:// " onclick="tag_url()" class="codebuttons" name="url" onmouseover="hstat('url')" />
+			<input type="button" accesskey="g" value=" IMG " onclick="tag_image()" class="codebuttons" name="img" onmouseover="hstat('img')" />
+			<input type="button" accesskey="e" value="  @  " onclick="tag_email()" class="codebuttons" name="email" onmouseover="hstat('email')" />
+			<input type="button" accesskey="q" value=" QUOTE " onclick="simpletag('QUOTE')" class="codebuttons" name="QUOTE" onmouseover="hstat('quote')" />
+			<input type="button" accesskey="p" value=" CODE " onclick="simpletag('CODE')" class="codebuttons" name="CODE" onmouseover="hstat('code')" />
+			<input type="hidden" accesskey="l" value=" LIST " onclick="tag_list()" class="codebuttons" name="LIST" onmouseover="hstat('list')" />
+			<!--
+			<input type="button" accesskey="l" value=" SQL "     onclick="simpletag("SQL")"     class="codebuttons" name="SQL" />
+			<input type="button" accesskey="t" value=" HTML "    onclick="simpletag("HTML")"    class="codebuttons" name="HTML" />
+			-->
+				<br />
+			<input type="text" name="helpbox" size="50" maxlength="120" readonly="readonly" class="helpbox" value="{ipb.lang['hb_start']}" />
+				<br />
+			<b>{ipb.lang['hb_open_tags']}:</b>&nbsp;<input type="text" name="tagcount" size="3" maxlength="3" readonly="readonly" class="helpbox" value="0" />
+		</td>
+	</tr>
+	<tr>
+		<td class="pformleft" colspan="2" align="center"><textarea cols="60" rows="12" name="Post" tabindex="3" class="textinput">$t_sig</textarea><br />(<a href="javascript:CheckLength()">{ipb.lang['check_length']}</a>)</td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['cp_submit_sig']}" /></td>
+	</tr>
+</table>
+</form>]]></section_content>
+			<func_name>signature</func_name>
+			<func_data><![CDATA[$sig="",$t_sig="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft">&nbsp;</td>
+		<td class="pformright"><b>{ipb.lang['pph_autosize']}</b><br />({ipb.lang['pph_as_desc']})</td>
+	</tr>]]></section_content>
+			<func_name>photo_page_autosize</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['ras_title']}</div>
+<table cellspacing="0">
+	<tr>
+		<td width="40%">{ipb.lang['ras_numbers']}</td>
+		<td>
+			<input type="hidden" name="regid" value="$regid" />
+				<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=1" alt="Code Bit" />
+				&nbsp;<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=2" alt="Code Bit" />
+				&nbsp;<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=3" alt="Code Bit" />
+				&nbsp;<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=4" alt="Code Bit" />
+				&nbsp;<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=5" alt="Code Bit" />
+				&nbsp;<img src="{ipb.script_url}act=UserCP&amp;CODE=show_image&amp;rc={$regid}&amp;p=6" alt="Code Bit" />
+		</td>
+	</tr>
+	<tr>
+		<td width="40%">{ipb.lang['ras_text']}</td>
+		<td><input type="text" size="32" maxlength="32" name="reg_code" /></td>
+	</tr>
+</table>]]></section_content>
+			<func_name>email_change_img</func_name>
+			<func_data><![CDATA[$regid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr id="{$data['attach_id']}">
+		<td align="center" class="row1"><img src="{ipb.vars['mime_img']}/{$data['image']}" alt="{ipb.lang['attached_file']}" /></td>
+		<td class="row2">
+			<a href="{ipb.script_url}act=Attach&amp;type={$data['_type']}&amp;id={$data['attach_id']}" title="{$data['attach_file']}" target="_blank">{$data['short_name']}</a>
+			<div class="desc">( {ipb.lang['attach_hits']}: {$data['attach_hits']} )</div>
+		</td>
+		<td align="center" class="row1">{$data['real_size']}</td>
+		<td class="row2">
+<if="data['attach_pid'] > 0">
+<a href="{ipb.script_url}showtopic={$data['tid']}&amp;view=findpost&amp;p={$data['attach_pid']}">{$data['title']}</a>
+</if>
+<else>
+{$data['title']}
+</else>
+
+				<br />
+			<span class="desc">{$data['attach_date']}</span>
+		</td>
+		<td class="row2" align="center"><input type="checkbox" name="attach_{$data['attach_id']}" value="1" class="checkbox" /></td>
+	</tr>]]></section_content>
+			<func_name>attachments_row</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<!-- inbox folder -->
+<div class="formsubtitle">{ipb.lang['m_attach']}</div>
+<if="info['has_limit'] == 1">
+<table cellspacing="0">
+		<tr>
+			<td valign="middle">
+				<!-- LEFT -->
+				<table cellspacing="1" class="inbox">
+					<tr>
+						<td class="row1" colspan="3">{ipb.lang['attach_space_used']}</td>
+					</tr>
+					<tr>
+						<td valign="middle" class="row1" colspan="3"><{BAR_LEFT}><img src="{ipb.vars['img_url']}/bar.gif" width="{$info['img_width']}" height="11" align="middle" alt="" /><{BAR_RIGHT}></td>
+					</tr>
+					<tr>
+						<td class="row1" width="33%" valign="middle">0%</td>
+						<td class="row1" width="33%" align="center" valign="middle">50%</td>
+						<td class="row1" width="33%" align="right" valign="middle">100%</td>
+					</tr>
+				</table>
+			</td>
+			
+			<!-- RIGHT -->
+			<td align="right" valign="bottom">$pages<br /><br />{ipb.lang['attach_space_count']}</td>
+		</tr>
+	</table>
+</if>
+<else>
+<table cellspacing="0">
+	<tr>
+		<td>
+			<!-- LEFT -->
+			{ipb.lang['attach_space_used']}
+		</td>
+		<td align="right">
+			<!-- RIGHT -->
+			$pages
+		</td>
+	</tr>
+</table>
+</else>
+
+<!-- ATTACHMENTS TABLE -->
+  
+<form action="{ipb.script_url}act=usercp&amp;CODE=attach&amp;sort={ipb.input['sort']}" name="mutliact" method="post">
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="2%">&nbsp;</th>
+			<th width="35%"><b>{ipb.lang['attach_title']}</b></th>
+			<th width="5%"><b>{ipb.lang['attach_hsize']}</b></th>
+			<th width="27%"><b>{ipb.lang['attach_topic']}</b></a></th>
+			<th width="5%" align="center"><input name="allbox" type="checkbox" value="Check All" onclick="InboxCheckAll();" /></th>
+		</tr>
+<if="attach_html != """>
+{$attach_html}
+		<tr>
+			<td colspan="6" align="right" class="formbuttonrow"><input type="submit" value="{ipb.lang['attach_delete']}" class="button" /></td>
+		</tr>
+</if>
+<else>
+<tr>
+			<td colspan="6" align="center">{ipb.lang['splash_noattach']}</td>
+		</tr>
+</else>
+
+	</table>
+</div>
+</form>]]></section_content>
+			<func_name>attachments_top</func_name>
+			<func_data><![CDATA[$info="",$pages="",$attach_html=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var url_input = "$url_photo";
+var remove_pressed = 0;
+	
+	function clear_it(){
+		if ( document.bob.url_photo.value != "" ){
+			url_input = document.bob.url_photo.value;
+		}
+      	document.bob.url_photo.value = "";
+	}
+   
+	function restore_it(){
+		if (url_input != ""){
+		document.bob.url_photo.value = url_input;
+		}
+	}
+   
+	function checkform(){
+		if ( remove_pressed != 1 ){
+			return true;
+		}
+   		else{
+   			fcheck = confirm("{ipb.lang['pp_confirm']}");
+   			if ( fcheck == true ){
+   				return true;
+   			}
+   			else{
+   				return false;
+   			}
+   		}
+	}
+-->
+</script>
+<form action="{ipb.script_url}auth_key=$key" enctype="multipart/form-data" method="post" name="bob" onsubmit="return checkform();">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="dophoto" />
+<div class="formsubtitle">{ipb.lang['pph_title']}</div>
+<p>{ipb.lang['pph_desc']}<br />{ipb.lang['pph_max']}</p>
+<div class="formsubtitle">{ipb.lang['pph_current']}</div>
+<div align="center">
+ <p>$cur_photo<br />$cur_type ($show_size)</p>
+</div>
+<div class="formsubtitle">{ipb.lang['pph_change']}</div>
+<table cellspacing="0">
+	<tr>
+		<td class="pformleft">{ipb.lang['pph_url']}</td>
+		<td class="pformright"><input type="text" onfocus="restore_it()" name="url_photo" value="$url_photo" size="40" />&nbsp;&nbsp;(<a href="javascript:restore_it()">{ipb.lang['pp_restore']}</a>)</td>
+	</tr>
+	<!--IPB.UPLOAD-->
+	<!--IPB.SIZE-->
+</table>
+<div align="center" class="formsubtitle">
+	<input type="submit" name="submit" value="{ipb.lang['pph_submit']}" />
+	&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" onclick="remove_pressed=1;" name="remove" value="{ipb.lang['pph_remove']}" />
+</div>
+</form>]]></section_content>
+			<func_name>photo_page</func_name>
+			<func_data><![CDATA[$cur_photo="",$cur_type="",$url_photo="",$show_size="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var LocationMax  = "{ipb.vars['max_location_length']}";
+var InterestMax  = "{ipb.vars['max_interest_length']}";
+	function CheckLength(Type){
+		LocationLength  = document.theForm.Location.value.length;
+		InterestLength  = document.theForm.Interests.value.length;
+		message  = "";
+			if (Type == "location"){
+				if (LocationMax !=0) {
+					message = "{ipb.lang['js_location']}: {ipb.lang['js_max']} " + LocationMax + " {ipb.lang['js_characters']}.";
+				}
+			else{
+            	message = "";
+            }
+            	alert(message + "  {ipb.lang['js_used']} " + LocationLength + " {ipb.lang['js_so_far']}.");
+            }
+    		
+            if (Type == "interest"){
+	            if (InterestMax !=0){
+		            message = "{ipb.lang['js_interests']}: {ipb.lang['js_max']} " + InterestMax + " {ipb.lang['js_characters']}.";
+		        }
+		        else{
+			        message = "";
+			    }
+			    alert(message + "  {ipb.lang['js_used']} " + InterestLength + " {ipb.lang['js_so_far']}.");
+			}
+	}
+	
+	function ValidateProfile(){
+    	LocationLength  = document.theForm.Location.value.length;
+    	InterestLength  = document.theForm.Interests.value.length;
+    	errors = "";
+    		if (LocationMax !=0){
+	    		if (LocationLength > LocationMax) {
+		    		errors = "{ipb.lang['js_location']}:  {ipb.lang['js_max']} " + LocationMax + " {ipb.lang['js_characters']}.  {ipb.lang['js_used']}: " + LocationLength;
+		    	}
+		    }
+		   	if (InterestMax !=0){
+        		if (InterestLength > InterestMax){
+	        		errors = errors + "  {ipb.lang['js_interests']}:  {ipb.lang['js_max']} " + InterestMax + " {ipb.lang['js_characters']}.  {ipb.lang['js_used']}: " + InterestLength;
+	        	}
+	        }
+	        if (errors != ""){
+		        alert(errors);
+		        return false;
+		       	}
+		    else{
+			    return true;
+			   	}
+	}
+-->
+</script>
+<form action="{ipb.script_url}auth_key={$Profile['key']}" method="post" name="theForm" onsubmit="return ValidateProfile()">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="21" />
+<!--{REQUIRED.FIELDS}-->
+<div class="formsubtitle">{ipb.lang['profile_title']}</div>
+<table cellspacing="0">
+	<!--{MEMBERTITLE}-->
+	<!--{BIRTHDAY}-->
+	<tr>
+		<td class="pformleft">{ipb.lang['website']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="1200" name="WebSite" value="{$Profile['website']}" /></td>
+	</tr>  
+	<tr>
+		<td class="pformleft">{ipb.lang['icq']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="20" name="ICQNumber" value="{$Profile['icq_number']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['aol']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="30" name="AOLName" value="{$Profile['aim_name']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['yahoo']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="30" name="YahooName" value="{$Profile['yahoo']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['msn']}</td>
+		<td class="pformright"><input type="text" size="40" maxlength="30" name="MSNName" value="{$Profile['msnname']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft">{ipb.lang['location']}<br />(<a href="javascript:CheckLength('location');">{ipb.lang['check_length']}</a>)</td>
+		<td class="pformright"><input type="text" size="40" name="Location" value="{$Profile['location']}" /></td>
+	</tr>
+	<tr>
+		<td class="pformleft" valign="top">{ipb.lang['interests']}<br />(<a href="javascript:CheckLength('interest');">{ipb.lang['check_length']}</a>)</td>
+		<td class="pformright"><textarea cols="60" rows="10" wrap="soft" name="Interests">{$Profile['interests']}</textarea></td>
+	</tr>
+	<!--{OPTIONAL.FIELDS}-->
+	<tr>
+		<td class="formbuttonrow" align="center" colspan="2"><input type="submit" value="{ipb.lang['submit_profile']}" /></td>
+	</tr>
+</table>
+</form>]]></section_content>
+			<func_name>personal_panel</func_name>
+			<func_data><![CDATA[$Profile=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form name="ibform" action="{ipb.script_url}" method="post">
+<input type="hidden" name="s" value="{ipb.session_id}" />
+<input type="hidden" name="act" value="usercp" />
+<input type="hidden" name="CODE" value="doiptool" />
+<if="msg">
+<div class="formsubtitle">{ipb.lang['ipm_title']}</div>
+<p>
+	$msg
+</p>
+<br />
+</if>
+
+<div class="formsubtitle">{ipb.lang['menu_ipsearch']}</div>
+	<table cellspacing="0">
+		<tr>
+			<td width="40%" class="row1">{ipb.lang['ip_enter']}</td>
+			<td class="row1">
+				<input type="text" size="20" maxlength="24" name="ip" value="{$ip}" />
+				<select name="iptool">
+					<option value="resolve">{ipb.lang['ip_resolve']}</option>
+					<option value="posts">{ipb.lang['ip_posts']}</option>
+					<option value="members">{ipb.lang['ip_members']}</option>
+				</select>
+			</td>
+		</tr>
+	<tr>
+		<td class="formsubtitle" style="text-align: center;" colspan="2"><input type="submit" value="{ipb.lang['ip_submit']}" /></td>
+	</tr>
+	</table>
+</form>
+	<br />
+<div class="tablepad">
+	{ipb.lang['ip_desc_text']}
+	<br /><br />{ipb.lang['ip_warn_text']}
+</div>]]></section_content>
+			<func_name>mod_ip_start_form</func_name>
+			<func_data><![CDATA[$ip="",$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" method="post" name="form1">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="29" />
+<div class="formsubtitle">{ipb.lang['account_pass_title']}</div>
+<p>{ipb.lang['pass_change_text']}</p>
+<table cellspacing="0">
+	<tr>
+		<td><b>{ipb.lang['account_pass_old']}</b></td>
+		<td><input type="password" name="current_pass" value="" /></td>
+	</tr>
+	<tr>
+		<td><b>{ipb.lang['account_pass_new']}</b></td>
+		<td><input type="password" name="new_pass_1" value="" /></td>
+	</tr>
+	<tr>
+		<td><b>{ipb.lang['account_pass_new2']}</b></td>
+		<td><input type="password" name="new_pass_2" value="" /></td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" name="s_pass" value="{ipb.lang['account_pass_submit']}" /></td>
+	</tr>
+</table>
+</form>]]></section_content>
+			<func_name>pass_change</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row1"><a href="{ipb.script_url}showuser={$row['id']}">{$row['name']}</a></td>
+	<td class="row1">{$row['ip_address']}</td>
+	<td class="row1">{$row['posts']}</td>
+	<td class="row1">{$row['joined']}</td>
+	<td class="row1">{$row['groupname']}</td>
+	<td class="row1" align="center"><a href="{ipb.script_url}act=mod&amp;CODE=editmember&amp;mid={$row['id']}&amp;auth_key=$auth_key">{ipb.lang['ipm_edit']}</a></td>
+</tr>]]></section_content>
+			<func_name>mod_ip_member_row</func_name>
+			<func_data><![CDATA[$row="",$auth_key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[{ipb.lang['ipp_found']} $count
+<br />
+<br />
+<a target="_blank" href="{ipb.script_url}act=Search&amp;CODE=show&amp;searchid=$uid&amp;search_in=posts&amp;result_type=posts">{ipb.lang['ipp_click']}</a>]]></section_content>
+			<func_name>mod_ip_post_results</func_name>
+			<func_data><![CDATA[$uid="",$count=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div>
+	<div class="borderwrapm">
+		<table cellspacing="0">
+			<tr>
+				<th width="20%">{ipb.lang['ipm_name']}</th>
+				<th width="20%">{ipb.lang['ipm_ip']}</th>
+				<th width="10%">{ipb.lang['ipm_posts']}</th>
+				<th width="15%">{ipb.lang['ipm_reg']}</th>
+				<th width="15%">{ipb.lang['ipm_group']}</th>
+				<th width="20%">{ipb.lang['ipm_options']}</th>
+			</tr>
+			{$content}
+		</table>
+	</div>
+	<div>$pages</div>
+</div>]]></section_content>
+			<func_name>mod_ip_member_results</func_name>
+			<func_data><![CDATA[$pages="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[&nbsp;&nbsp; <{MSG_FOLDER}>&nbsp;<a href="{ipb.script_url}act=Msg&amp;CODE=01&amp;VID=$id">$real</a><br />]]></section_content>
+			<func_name>menu_bar_msg_folder_link</func_name>
+			<func_data><![CDATA[$id="",$real=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<{ITEM_START}> <a href="$url">$name</a><br />]]></section_content>
+			<func_name>menu_bar_new_link</func_name>
+			<func_data><![CDATA[$url="",$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form name="ibform" action="{ipb.script_url}act=usercp&amp;CODE=domemtool" method="post">
+<if="msg">
+<div class="formsubtitle">{ipb.lang['ipm_title']}</div>
+<p>
+	$msg
+</p>
+<br />
+</if>
+
+<div class="formsubtitle">{ipb.lang['cp_edit_user']}</div>
+	<table cellspacing="1">
+		<tr>
+			<td width="40%" class="row1">{ipb.lang['cp_find_user']}</td>
+			<td class="row1"><input type="text" size="40" name="name" value="{ipb.input['name']}" /></td>
+		</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="2"><input type="submit" value="{ipb.lang['cp_find_submit']}" /></td>
+	</tr>
+	</table>
+</form>]]></section_content>
+			<func_name>mod_find_user</func_name>
+			<func_data><![CDATA[$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+	function deleteEvent(id) {
+		if (confirm('{ipb.lang['js_del_1']}')) {
+			 window.location.href = "{ipb.script_url}act=calendar&code=delete&e=" + id;
+		 }
+		 else {
+			alert ('{ipb.lang['js_del_2']}');
+		} 
+	}
+</script>
+<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['cal_title_events']}</div>]]></section_content>
+			<func_name>cal_page_events_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[</div>]]></section_content>
+			<func_name>cal_page_events_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[</tr>
+<!-- NEW ROW-->
+<tr>
+	<td class="formsubtitle">
+		<a href="{ipb.script_url}act=calendar&amp;code=showweek&amp;week=$week">&raquo;</a>
+	</td>]]></section_content>
+			<func_name>cal_new_row</func_name>
+			<func_data><![CDATA[$week=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="divpad">
+	&middot; <a href="{ipb.script_url}act=calendar&amp;$link" title="{ipb.lang['tbt_recur']}">$text</a>
+</div>]]></section_content>
+			<func_name>cal_events_wrap_recurring</func_name>
+			<func_data><![CDATA[$link="",$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="calmonths">
+	<a href="{ipb.script_url}act=calendar&amp;m={$prev['month_id']}&amp;y={$prev['year_id']}" title="{$prev['month_name']} {$prev['year_id']}">&laquo;</a>
+	$month $year 
+	<a href="{ipb.script_url}act=calendar&amp;m={$next['month_id']}&amp;y={$next['year_id']}" title="{$next['month_name']} {$next['year_id']}">&raquo;</a>
+</div>
+<table cellspacing="0">
+	<tr>
+		<td width="25%" valign="top" class="nopad">
+			<!--PREV.MONTH--><br />
+			<!--THIS.MONTH--><br />
+			<!--NEXT.MONTH--><br />
+		</td>
+		<td width="1%" class="nopad">&nbsp;</td>
+		<td width="75%" valign="top" class="nopad">
+			<div class="borderwrap">
+				<div class="maintitle">{ipb.lang['table_title']}</div>
+				<table cellspacing="1">
+					<tr>
+						<td width="2%" class="subtitle">&nbsp;</td>
+						<!--IBF.DAYS_TITLE_ROW-->
+						<!--IBF.DAYS_CONTENT-->
+					</tr>
+				</table>
+			</div>
+			<br />
+		</td>
+	</tr>
+</table>
+<form action="{ipb.script_url}act=calendar" method="post">
+	<div class="borderwrap">
+		<div class="barb">
+			<p class="overs"><span class="fauxbutton"><a href="{ipb.script_url}act=calendar&amp;code=newevent">{ipb.lang['aa_add_new_event']}</a></span>&nbsp;<span class="fauxbutton"><a href="{ipb.script_url}act=calendar&amp;code=find&amp;what=thismonth">{ipb.lang['aa_cur_month']}</a></span>&nbsp;<span class="fauxbutton"><a href="{ipb.script_url}act=calendar&amp;code=find&amp;what=thisweek">{ipb.lang['aa_view_week']}</a></span></p>
+			<p><select name="m"><!--IBF.MONTH_BOX--></select>&nbsp;
+			   <select name="year"><!--IBF.YEAR_BOX--></select>&nbsp;
+			   <input class="gobutton" type="image" src="{ipb.vars['img_url']}/login-button.gif" value="Go" /></p>
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>cal_main_content</func_name>
+			<func_data><![CDATA[$month="",$year="",$prev="",$next=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[</div>
+	<div class="row1">$pages</div>
+</div>]]></section_content>
+			<func_name>toutline_end_list</func_name>
+			<func_data><![CDATA[$pages=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content></section_content>
+			<func_name>toutline_end_new_parent</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="$url">$macro</a>]]></section_content>
+			<func_name>toutline_mode_choice_off</func_name>
+			<func_data><![CDATA[$url="",$macro=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[[ <a href="$url">$macro</a> ]]]></section_content>
+			<func_name>toutline_mode_choice_on</func_name>
+			<func_data><![CDATA[$url="",$macro=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+var ipb_lang_tt_prompt = "{ipb.lang['tt_prompt']}";
+var ipb_lang_js_del_1  = "{ipb.lang['js_del_1']}";
+var ipb_lang_js_del_2  = "{ipb.lang['js_del_2']}";
+var addquotebutton     = "{ipb.vars['img_url']}/p_mq_add.gif";
+var removequotebutton  = "{ipb.vars['img_url']}/p_mq_remove.gif";
+var unselectedbutton = "{ipb.vars['img_url']}/topic_unselected.gif";
+var selectedbutton   = "{ipb.vars['img_url']}/topic_selected.gif";
+var lang_gobutton    = "{ipb.lang['f_go']}";
+var lang_suredelete  = "{ipb.lang['cp_js_delete']}";
+-->
+</script>
+<script type="text/javascript" src="jscripts/ipb_topic.js"></script>
+<a name="top"></a>
+<!--IBF.FORUM_RULES-->
+<table cellspacing="0">
+	<tr>
+		<td style='padding-left:0px' width="40%" valign="middle" nowrap="nowrap"><div>{$data['TOPIC']['SHOW_PAGES']}&nbsp;{$data['TOPIC']['go_new']}</div></td>
+		<td class='nopad' style='padding:0px 0px 5px 0px' align="right" width="60%" valign="middle">{$data[TOPIC][REPLY_BUTTON]}<a href="{ipb.script_url}act=Post&amp;CODE=00&amp;f={$data[FORUM]['id']}" title="{ipb.lang['start_new_topic']}"><{A_POST}></a>{$data[TOPIC][POLL_BUTTON]}<!--{IBF.START_NEW_POLL}--></td>
+	</tr>
+</table>
+<div class="borderwrap">
+	<div class="maintitle">
+		<p class="expand">
+			{$data['TOPIC']['to_button_threaded']} &middot;
+			{$data['TOPIC']['to_button_standard']} &middot;
+			{$data['TOPIC']['to_button_linearpl']}
+		</p>
+		<p><{CAT_IMG}>&nbsp;<b>{$data['TOPIC']['title']}</b>{$data['TOPIC']['description']}</p>
+	</div>
+	<!--{IBF.POLL}-->
+	<div align="right" class="subtitle">
+		<div><a href="{ipb.script_url}act=usercp&amp;CODE=start_subs&amp;method=topic&amp;tid={$data['TOPIC']['tid']}">{ipb.lang['track_topic']}</a> | <a href="{ipb.script_url}act=Forward&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}">{ipb.lang['forward']}</a> | <a href="{ipb.script_url}act=Print&amp;client=printer&amp;f={$data['FORUM']['id']}&amp;t={$data['TOPIC']['tid']}">{ipb.lang['print']}</a>
+		</div>
+	</div>]]></section_content>
+			<func_name>topic_page_top_classic</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[</div>
+<table cellspacing="0">
+	<tr>
+		<td style='padding-left:0px' width="40%" valign="middle" nowrap="nowrap"><div>{$data['TOPIC']['SHOW_PAGES']}&nbsp;{$data['TOPIC']['go_new']}</div></td>
+		<td class='nopad' style='padding:5px 0px 5px 0px' align="right" width="60%" valign="middle">{$data[TOPIC][REPLY_BUTTON]}<a href="{ipb.script_url}act=Post&amp;CODE=00&amp;f={$data[FORUM]['id']}" title="{ipb.lang['start_new_topic']}"><{A_POST}></a>{$data[TOPIC][POLL_BUTTON]}<!--{IBF.START_NEW_POLL}--></td>
+	</tr>
+</table>
+<a name="firstpost"></a>
+<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['tom_replies']}
+<if="noreplieshow != 1">
+({$data['TOPIC']['new_mode_start']} - {$data['TOPIC']['new_mode_end']})
+</if>
+
+	</div>]]></section_content>
+			<func_name>topic_end_first_post</func_name>
+			<func_data><![CDATA[$data="",$noreplieshow=0]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[</div>
+<br />]]></section_content>
+			<func_name>topic_end_outline</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="javascript:ShowHide('topic_open','topic_closed')" title="{ipb.lang['to_open']}"><{T_OPTS}></a>]]></section_content>
+			<func_name>topic_opts_closed</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div id="topic_open" style="display: none; z-index: 2;">
+	<br />
+	<div class="borderwrap">
+		<div class="maintitle"><{CAT_IMG}>&nbsp;<a href="javascript:ShowHide('topic_open','topic_closed')">{ipb.lang['to_close']}</a></div>
+		<div class="tablepad">
+			<b><a href="{ipb.script_url}act=Track&amp;f={$fid}&amp;t={$tid}">{ipb.lang['tt_title']}</a></b><br />
+			<span class="desc">{ipb.lang['tt_desc']}</span><br /><br />
+			<b><a href="{ipb.script_url}act=Track&amp;f={$fid}&amp;type=forum">{ipb.lang['ft_title']}</a></b><br />
+			<span class="desc">{ipb.lang['ft_desc']}</span><br /><br />
+			<b><a href="{ipb.script_url}act=Print&amp;client=choose&amp;f={$fid}&amp;t={$tid}">{ipb.lang['av_title']}</a></b><br />
+			<span class="desc">{ipb.lang['av_desc']}</span>
+		</div>
+	</div>
+</div>]]></section_content>
+			<func_name>topic_opts_open</func_name>
+			<func_data><![CDATA[$fid="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="formsubtitle" style="padding: 4px;">{ipb.lang['active_users_title']} ({ipb.lang['active_users_detail']})</div>
+	<div class="row1" style="padding: 4px;">{ipb.lang['active_users_members']} {$active['names']}</div>
+</div>]]></section_content>
+			<func_name>topic_active_users</func_name>
+			<func_data>$active=array()</func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<br /><br /><b><span class="edit">$title</span></b><br />]]></section_content>
+			<func_name>show_attachment_title</func_name>
+			<func_data><![CDATA[$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Attach&amp;type={$data['method']}&amp;id={$data['id']}" title="{ipb.lang['attach_dl']}" target="_blank"><img src="{ipb.vars['mime_img']}/{$data['image']}" alt="{ipb.lang['attached_file']}" /></a>
+&nbsp;<a href="{ipb.script_url}act=Attach&amp;type={$data['method']}&amp;id={$data['id']}" title="{ipb.lang['attach_dl']}" target="_blank">{$data['name']}</a> ( {$data['size']} )
+<span class="desc">{ipb.lang['attach_hits']}: {$data['hits']}</span><br />]]></section_content>
+			<func_name>Show_attachments</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img src="{ipb.vars['upload_url']}/$file_name" alt="{ipb.lang['pic_attach']}" />]]></section_content>
+			<func_name>Show_attachments_img</func_name>
+			<func_data><![CDATA[$file_name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Attach&amp;type=$method&amp;id=$aid" title="$file - {ipb.lang['attach_size']} $size, {ipb.lang['attach_ahits']} $hits" target="_blank"><img src="{ipb.vars['upload_url']}/$file_name" width="$width" height="$height" class="attach" alt="{ipb.lang['pic_attach']}" /></a>]]></section_content>
+			<func_name>Show_attachments_img_thumb</func_name>
+			<func_data><![CDATA[$file_name="",$width="",$height="",$aid="",$size="",$hits="",$file="",$method=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Post&amp;CODE=14&amp;f=$fid&amp;t=$tid"><{A_APOLL}></a>]]></section_content>
+			<func_name>start_poll_link</func_name>
+			<func_data><![CDATA[$fid="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<!-- END TABLE -->
+<if="is_outline == 1">
+<br />
+<div class="borderwrap">
+</if>
+
+<!-- TABLE FOOTER -->
+<div class="barc">
+	<div style="float: right; padding: 5px 5px 0 0;"><a href="{ipb.script_url}showtopic={$data[TOPIC]['tid']}&amp;view=old" style='text-decoration:none'>&laquo; {ipb.lang['t_old']}</a>
+	&middot; <a href="{ipb.script_url}showforum={$data['FORUM']['id']}" style='font-weight: bold;text-decoration:none'>{$data['FORUM']['name']}</a>
+	&middot; <a href="{ipb.script_url}showtopic={$data[TOPIC]['tid']}&amp;view=new" style='text-decoration:none'>{ipb.lang['t_new']} &raquo;</a></div>
+	<div>
+		<form action="{ipb.script_url}" method="post" name="search">
+			<input type="hidden" name="forums" value="{$data[FORUM]['id']}" />
+			<input type="hidden" name="topic" value="{$data[TOPIC]['tid']}" />
+			<input type="hidden" name="act" value="Search" />
+			<input type="hidden" name="CODE" value="searchtopic" />
+			<input type="text" size="25" name="keywords" class="searchinput" value="{ipb.lang['enter_keywords']}" onfocus="this.value = '';" />&nbsp;
+			<input type="submit" value="{ipb.lang['search_topic']}" class="button" />
+		</form>
+	</div>
+</div>
+</div>
+<br />
+<if="ipb.member['is_mod']">
+<div class="borderwrap">
+	<div class="bar" style="padding: 5px;">
+		<div style="float: right; text-align: right;">
+	 		<form name="modform" method="post" action="{ipb.script_url}act=mod&CODE=postchoice&f={$data['TOPIC']['forum_id']}&t={$data['TOPIC']['tid']}" onsubmit="return checkdelete();">
+	 			<input type="hidden" name="act" value="mod" />
+	 			<input type="hidden" name="auth_key" value="{$auth_key}" />
+	 			<input type="hidden" name="st" value="{ipb.input['st']}" />
+	 			<input type="hidden" value="{ipb.input['selectedpids']}" name="selectedpids" />
+	 			<select class="forminput" name="tact">
+	 				<option value="merge">{ipb.lang['cpt_merge']}</option>
+	 				<option value="move">{ipb.lang['cpt_move']}</option>
+	 				<option value="delete">{ipb.lang['cpt_delete']}</option>
+	 				<option value="split">{ipb.lang['cpt_split']}</option>
+	 				<option value="approve">{ipb.lang['cpt_approve']}</option>
+	 				<option value="unapprove">{ipb.lang['cpt_unapprove']}</option>
+	 			</select>&nbsp;
+	 			<input type="submit" name="gobutton" value="{ipb.lang['f_go']} ({ipb.input['selectedpidcount']})" class="button" />
+	 		</form>
+	 	</div>
+		<!--IBF.MOD_PANEL-->
+	 </div>
+</div>
+</if>
+
+<table cellspacing="0">
+	<tr>
+		<td style='padding-left:0px' width="30%" nowrap="nowrap" valign="middle"><div>{$data[TOPIC][SHOW_PAGES]}</div></td>
+		<td class='nopad' style='padding:5px 0px 5px 0px' align="right" width="70%"><!--IBF.QUICK_REPLY_CLOSED-->{$data[TOPIC][REPLY_BUTTON]}<!--IBF.TOPIC_OPTIONS_CLOSED--><a href="{ipb.script_url}act=Post&amp;CODE=00&amp;f={$data[FORUM]['id']}" title="{ipb.lang['start_new_topic']}"><{A_POST}></a><!--{$data[TOPIC][POLL_BUTTON]}--></td>
+	</tr>
+</table>
+<!--IBF.TOPIC_ACTIVE-->
+<!--IBF.MOD_PANEL_NO_MOD-->
+<!--IBF.QUICK_REPLY_OPEN-->
+<!--IBF.TOPIC_OPTIONS_OPEN-->
+<div class="borderwrap">
+	<div class="row2" style="padding: 5px;">
+		<!--IBF.MULTIMOD-->
+		<div align="right">{$data[FORUM]['JUMP']}</div>
+	</div>
+</div>
+<br />]]></section_content>
+			<func_name>TableFooter</func_name>
+			<func_data><![CDATA[$data="",$is_outline="",$auth_key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=report&amp;t={$data['topic_id']}&amp;p={$data['pid']}&amp;st={ipb.input['st']}"><{P_REPORT}></a>]]></section_content>
+			<func_name>report_link</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<!--Begin Msg Number {$post['pid']}-->
+<table cellspacing="1">
+	<tr>
+		<td valign="middle" class="row2" width="1%"><a name="entry{$post['pid']}"></a><span class="{$post['name_css']}">{$author['name']}</span></td>
+		<td class="row2" valign="top" width="99%">
+			<!-- POSTED DATE DIV -->
+			<div style="float: left;">
+				<span class="postdetails">{$post['post_icon']} <img src='{ipb.vars['img_url']}/to_post_off.gif' alt='post' border='0' style='padding-bottom:2px' /> {$post['post_date']}</span>
+			</div>
+			<!-- REPORT / DELETE / EDIT / QUOTE DIV -->
+			<div align="right">
+				<span class="postdetails">{$post['ip_address']} {ipb.lang['posted_on']}
+					<a title="{ipb.lang['tt_link']}" href="#" onclick="link_to_post({$post['pid']}); return false;">#{$post['post_count']}</a>
+<if="ipb.member['is_mod']">
+&#0124; <a href="#" title="Click to select this topic for bulk moderation" onclick="topic_toggle_pid('{$post['pid']}'); return false;">{$post['pid_start_image']}</a>
+</if>
+
+				</span>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top" class="{$post['post_css']}">
+        	<span class="postdetails">
+        		{$author['avatar']}<br /><br />
+        		{$author['title']}<br />
+        		{$author['member_rank_img']}<br /><br />
+        		{$author['member_group']}<br />
+        		{$author['member_posts']}<br />
+        		{$author['member_joined']}<br />
+        		{$author['member_location']}
+        		{$author['member_number']}<br />
+<if="author['custom_fields'] != """>
+{$author['custom_fields']}
+</if>
+
+<br />
+        		{$author['warn_text']} {$author['warn_minus']}{$author['warn_img']}{$author['warn_add']}
+        	</span><br />
+        	<img src="{ipb.vars['img_url']}/spacer.gif" alt="" width="160" height="1" /><br /> 
+       </td>
+       <td width="100%" valign="top" class="{$post['post_css']}">
+			<!-- THE POST {$post['pid']} -->
+			<div class="postcolor">{$post['post']} <!--IBF.ATTACHMENT_{$post['pid']}--></div>
+				{$post['signature']}
+			<!-- THE POST -->
+		</td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" nowrap="nowrap">
+			<div style='text-align:left'>{$author['online_status_indicator']}{$author['addresscard']}{$author['message_icon']}<!--{$author['email_icon']}--></div>
+		</td>
+		<td class="formbuttonrow" nowrap="nowrap">
+			<!-- PM / EMAIL / WWW / MSGR -->
+			<div style="float: left;">
+				{$post['report_link']}<a href="javascript:scroll(0,0);"><{P_UP}></a>
+			</div>
+			<!-- REPORT / UP -->
+         	<div align="right">
+         		{$post['delete_button']}{$post['edit_button']}<a href="#" onclick="multiquote_add({$post['pid']}); return false;" title="{ipb.lang['mq_title']}">{$post['mq_start_image']}</a><a href="{ipb.script_url}act=Post&amp;CODE=02&amp;f={ipb.input[f]}&amp;t={ipb.input[t]}&amp;qpid={$post['pid']}" title="{ipb.lang['tt_reply_to_post']}"><{P_QUOTE}></a>
+         	</div>
+         </td>
+	</tr><tr>
+	<td class="catend" colspan="2"><!-- no content --></td>
+</tr>
+</table>]]></section_content>
+			<func_name>RenderRow</func_name>
+			<func_data><![CDATA[$post="",$author=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="formsubtitle" align="center">
+			<input type="submit" name="submit" value="$action" />
+		</div>
+	</div>
+</form>]]></section_content>
+			<func_name>split_end_form</func_name>
+			<func_data><![CDATA[$action=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="row2">{ipb.lang['st_explain']}</div>
+		<table cellspacing="1">
+			<tr>
+				<td class="row1"><b>{ipb.lang['mt_new_title']}</b></td>
+				<td class="row2"><input type="text" size="40"  maxlength="100" name="title" value="" /></td>
+			</tr>
+			<tr>
+				<td class="row1"><b>{ipb.lang['mt_new_desc']}</b></td>
+				<td class="row2"><input type="text" size="40"  maxlength="100" name="desc" value="" /></td>
+			</tr>
+			<tr>
+				<td class="row1"><b>{ipb.lang['st_forum']}</b></td>
+				<td class="row2"><select name="fid">$jump</select></td>
+			</tr>
+		</table>
+	</div>
+<br />
+	<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['st_post']}</div>]]></section_content>
+			<func_name>split_body</func_name>
+			<func_data><![CDATA[$jump=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{$row['st_top_bit']}</div>
+	<div class="tablepad">
+		{$row['post']}
+		<div align="right"><b>{ipb.lang['st_split']}</b>&nbsp;&nbsp;<input type="checkbox" name="post_{$row['pid']}" value="1" checked="checked" /></div>
+	</div>]]></section_content>
+			<func_name>split_row</func_name>
+			<func_data><![CDATA[$row=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td><b><a href="{ipb.script_url}showuser={$member['id']}">{$member['name']}</a></b></td>
+		<td>{$member['prefix']}{$member['g_title']}{$member['suffix']}</td>
+		<td>{$member['posts']}</td>
+		<td><a href="{ipb.script_url}act=UserCP&amp;CODE=ignoreremove&amp;id={$member['id']}">{ipb.lang['mi5_remove']}</a></td>
+	</tr>]]></section_content>
+			<func_name>iu_populated_row</func_name>
+			<func_data><![CDATA[$member=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+	function find_users(field){
+		url = "index.{ipb.vars['php_ext']}?act=legends&CODE=finduser_one&s={ipb.session_id}&entry=textarea&name="+field+"&sep=none";
+		window.open(url,"FindUsers","width=400,height=250,resizable=yes,scrollbars=yes"); 
+	}
+-->
+</script>
+<form action="{ipb.script_url}" method="post" name="REPLIER">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="ignoreadd" />
+<div class="formsubtitle">{ipb.lang['mi5_title']}</div>
+<p>{ipb.lang['mi5_text']}</p>
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="30%">{ipb.lang['mi5_name']}</th>
+			<th width="30%">{ipb.lang['mi5_group']}</th>
+			<th width="20%">{ipb.lang['mi5_posts']}</th>
+			<th width="20%">&nbsp;</th>
+		</tr>]]></section_content>
+			<func_name>iu_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+			<td class="pformleft"><b>{ipb.lang['member_title']}</b></td>
+			<td class="pformright"><input type="text" size="40" maxlength="120" name="member_title" value="$title" /></td>
+		</tr>]]></section_content>
+			<func_name>member_title</func_name>
+			<func_data><![CDATA[$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<!--
+TABLE TO FIX IE/6 ISSUE
+The one where 23% margin + 100% table = 123% in IE6 o_O
+-->
+<script type="text/javascript" src="jscripts/ipb_pm.js"></script>
+<table cellspacing="0">
+	<tr>
+		<td valign="top" class="nopad" width="25%">
+			<div id="ucpmenu">
+			<div class="maintitle">{ipb.lang['tt_menu']}</div>
+<if="ipb.vars['top_site_list_integrate'] == 1">
+<!-- Top Site List -->
+			<div class="formsubtitle">{ipb.lang['m_top_list']}</div>
+			<p>
+				<{ITEM_START}> <a href="{ipb.script_url}act=module&module=toplist"><b>{ipb.lang['tsl_home']}</b></a><br />
+				<{ITEM_START}> <a href="{ipb.script_url}act=module&module=toplist&amp;CODE=01"><b>{ipb.lang['tsl_your_sites']}</b></a><br />
+			</p>
+</if>
+<if="ipb.vars['gallery_images_path'] != """>
+<div class="formsubtitle">{ipb.lang['m_gallery']}</div>
+			<p>
+				&middot; <a href="{ipb.script_url}act=module&module=gallery&cmd=albums">{ipb.lang['m_gallery_albums']}</a><br />
+				&middot; <a href="{ipb.script_url}act=module&module=gallery&cmd=favs">{ipb.lang['m_gallery_favs']}</a><br />
+			</p>
+</if>
+
+	 		<!-- Messenger Links -->
+<if="ipb.member['g_use_pm'] == 1">
+<div class="formsubtitle">{ipb.lang['m_messenger']}</div>
+			<p>
+				<{ITEM_START}> <a href="{$base_url}act=Msg&amp;CODE=04"><b>{ipb.lang['mess_new']}</b></a><br />
+				<!--IBF.FOLDER_LINKS-->
+				&nbsp;&nbsp; <{MSG_FOLDER}>&nbsp;<a href="{$base_url}act=Msg&amp;CODE=20">{ipb.lang['mess_saved']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=Msg&amp;CODE=delete">{ipb.lang['mi_prune_msg']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=Msg&amp;CODE=07">{ipb.lang['mess_folders']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=Msg&amp;CODE=02">{ipb.lang['mess_contact']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=Msg&amp;CODE=14">{ipb.lang['mess_archive']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=Msg&amp;CODE=30">{ipb.lang['mess_tracker']}</a><br />
+			</p>
+	 	<!-- End Messenger -->
+</if>
+
+		<!-- Topic Tracker -->
+			<div class="formsubtitle">{ipb.lang['m_tracker']}</div>
+			<p>
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=26">{ipb.lang['m_view_subs']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=50">{ipb.lang['m_view_forum']}</a><br />
+			</p>
+		<!-- Profile -->
+			<div class="formsubtitle">{ipb.lang['m_personal']}</div>
+			<p>
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=01">{ipb.lang['m_contact_info']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=22">{ipb.lang['m_sig_info']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=24">{ipb.lang['m_avatar_info']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=photo">{ipb.lang['m_change_photo']}</a><br />
+			</p>
+		<!-- Options -->
+			<div class="formsubtitle">{ipb.lang['m_options']}</div>
+			<p>
+				<!--IBF.OPTION_LINKS-->
+<if="ipb.member['g_attach_max'] != -1">
+<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=attach">{ipb.lang['m_attach']}</a><br />
+</if>
+
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=ignore">{ipb.lang['m_ignore_users']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=02">{ipb.lang['m_email_opt']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=04">{ipb.lang['m_board_opt']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=08">{ipb.lang['m_email_change']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=28">{ipb.lang['m_passy_opt']}</a>
+			</p>
+<if="ipb.member['g_is_supmod'] == 1">
+<div class="formsubtitle">{ipb.lang['menu_title_mod']}</div>
+			<p>
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=iptool">{ipb.lang['menu_ipsearch']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=memtool">{ipb.lang['menu_memsearch']}</a><br />
+				<{ITEM_START}> <a href="{$base_url}act=UserCP&amp;CODE=announce_start">{ipb.lang['menu_announcements']}</a>
+			</p>
+</if>
+
+		</div>
+		</td>
+		<td class="nopad" width="1%"><!-- --></td>
+		<!-- Start main CP area -->
+		<td valign="top" class="nopad" width="75%">
+			<div id="ucpcontent">
+			<div class="maintitle">{ipb.lang['welcome']}</div>]]></section_content>
+			<func_name>Menu_bar</func_name>
+			<func_data><![CDATA[$base_url=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td colspan="4" class="formsubtitle">{ipb.lang['mi5_addem']}</td>
+	</tr>
+	<tr>
+		<td colspan="2" class="row1"><input type="text" name="newbox_1" value="{ipb.input['newbox_1']}" /></td>
+		<td colspan="2" class="row2"><input type="button" value="{ipb.lang['mi5_finduser']}" name="findusers" onclick="find_users('newbox_1')"  /></td>
+	</tr>
+	<tr>
+		<td colspan="2" class="row1"><input type="text" name="newbox_2" value="{ipb.input['newbox_2']}" /></td>
+		<td colspan="2" class="row2"><input type="button" value="{ipb.lang['mi5_finduser']}" onclick="find_users('newbox_2')" /></td>
+	</tr>
+	<tr>
+		<td colspan="2" class="row1"><input type="text" name="newbox_3" value="{ipb.input['newbox_3']}" /></td>
+		<td colspan="2" class="row2"><input type="button" value="{ipb.lang['mi5_finduser']}" onclick="find_users('newbox_3')" /></td>
+	</tr>
+	<tr>
+		<td class="formbuttonrow" colspan="4"><input type="submit" value="{ipb.lang['mi5_edit']}" /></td>
+	</tr>
+</table>
+</div>
+</form>]]></section_content>
+			<func_name>iu_add_new</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['cp_prune']} {$forum['name']}</div>
+<if="confirm_data['show'] == 1">
+<div>
+		<div>
+			<div class="borderwrap" id="maxibox">
+				<div class="maintitle">
+					<div><input type="button" value=" X " class="button" style="color:red" onclick="my_hide_div( my_getbyid('maxibox') );my_show_div( my_getbyid('minibox') );return false;" /></div>
+					<div>{ipb.lang['mpt_confirm']}</div>
+				</div>
+					
+				<div class="formsubtitle">{ipb.lang['cp_check_result']}</div>
+					<table cellspacing="0">
+						<tr>
+							<td class="pformleftw"><b>{ipb.lang['cp_total_topics']}</b></td>
+							<td class="pformright">{$confirm_data['tcount']}</td>
+						</tr>
+						<tr>
+							<td class="pformleftw"><span>{ipb.lang['cp_total_match']}</span></td>
+							<td class="pformright"><span>{$confirm_data['count']}</span></td>
+						</tr>
+					</table>
+					
+					<form action="{ipb.script_url}{$confirm_data['link']}" method="post">
+						<input type="hidden" name="auth_key" value="$auth_key" />
+						<div class="formsubtitle" align="center"><input type="submit" value="{$confirm_data['link_text']}" /></div>
+					</form>
+				</div>
+				
+				<div class="borderwrap" style="display:none" id="minibox">
+				<div class="maintitle">
+					<div><input type="button" value=" + " class="button" style="color: red;" onclick="my_hide_div( my_getbyid('minibox') );my_show_div( my_getbyid('maxibox') );return false;" /></div>
+					<div>{ipb.lang['mpt_confirm']}</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</if>
+
+	<div class="formsubtitle">{ipb.lang['mpt_help']}</div>
+	<div class="tablepad">{ipb.lang['cp_prune_text']}</div>
+		<form name="ibform" action="{ipb.script_url}" method="POST">
+			<input type="hidden" name="s" value="{ipb.session_id}" />
+			<input type="hidden" name="act" value="mod" />
+			<input type="hidden" name="CODE" value="prune_start" />
+			<input type="hidden" name="f" value="{$forum['id']}" />
+			<input type="hidden" name="auth_key" value="$auth_key" />
+			<input type="hidden" name="check" value="1" />
+			
+				<div class="formsubtitle">{ipb.lang['mpt_title']}</div>
+					<table cellspacing="0">
+						<tr>
+							<td class="pformleftw">{ipb.lang['cp_action']}</td>
+							<td class="pformright"><select name="df">$forums_html</select></td>
+						</tr>
+						<tr>
+							<td class="pformleftw">{ipb.lang['cp_prune_days']}</td>
+							<td class="pformright"><input type="text" size="40" name="dateline" value="{ipb.input['dateline']}" /></td>
+						</tr>
+						<tr>
+							<td class="pformleftw">{ipb.lang['cp_prune_type']}</td>
+							<td class="pformright">$select<br /><input type="checkbox" id="cbox" name="ignore_pin" value="1" checked="checked" class="checkbox" />&nbsp;<label for="cbox">{ipb.lang['mps_ignorepin']}</label></td>
+						</tr>
+						<tr>
+							<td class="pformleftw">{ipb.lang['cp_prune_replies']}</td>
+							<td class="pformright"><input type="text" size="40" name="posts" value="{ipb.input['posts']}" /></td>
+						</tr>
+						<tr>
+							<td class="pformleftw">{ipb.lang['cp_prune_member']}</td>
+							<td class="pformright"><input type="text" size="40" name="member" value="{ipb.input['member']}" /></td>
+						</tr>
+					</table>
+				<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['cp_prune_sub1']}" class="button" /></div>
+			</div>
+		</form>]]></section_content>
+			<func_name>prune_splash</func_name>
+			<func_data><![CDATA[$forum="",$forums_html="",$select="",$auth_key="",$confirm_data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<table cellspacing="0" id="gfooter">
+	<tr>
+		<td width="45%"><% SKINCHOOSER %> <% LANGCHOOSER %></td>
+		<td width="10%" align="center" nowrap="nowrap"><a href="lofiversion/index.php<% LOFIVERSION %>"><b>{ipb.lang['global_lofi']}</b></a></td>
+		<td width="45%" align="right" nowrap="nowrap"><% QUICKSTATS %>{ipb.lang['global_timeisnow']}: {$time}</td>
+	</tr>
+</table>]]></section_content>
+			<func_name>global_board_footer</func_name>
+			<func_data><![CDATA[$time=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<!--ipb.javascript.start-->
+<script type="text/javascript">
+<!--
+ var ipb_var_st       = "{ipb.input['st']}";
+ var ipb_lang_tpl_q1  = "{ipb.lang['tpl_q1']}";
+ var ipb_var_s        = "{ipb.session_id}";
+ var ipb_var_phpext   = "{ipb.vars['php_ext']}";
+ var ipb_var_base_url = "{ipb.script_url}";
+ var ipb_input_f      = "{ipb.input['f']}";
+ var ipb_input_t      = "{ipb.input['t']}";
+ var ipb_input_p      = "{ipb.input['p']}";
+ var ipb_var_cookieid = "{ipb.vars['cookie_id']}";
+ var ipb_var_cookie_domain = "{ipb.vars['cookie_domain']}";
+ var ipb_var_cookie_path   = "{ipb.vars['cookie_path']}";
+ //-->
+</script>
+<script type="text/javascript" src='jscripts/ipb_global.js'></script>
+<!--ipb.javascript.end-->
+<div class="borderwrap">
+	<div id="logostrip"><a href='{ipb.script_url}'><!--ipb.logo.start--><img src='style_images/<#IMG_DIR#>/logo4.gif' style='vertical-align:top' alt='IPB' border='0' /><!--ipb.logo.end--></a></div>
+	<div id="submenu">
+		<p class="home"><!--ipb.leftlinks.start--><a href="{ipb.vars['home_url']}">{ipb.vars['home_name']}</a><!--IBF.RULES--><!--ipb.leftlinks.end--></p>
+		<p><!--ipb.rightlinks.start-->
+<if="ipb.vars['gallery_images_path'] != ''">
+<a href="{ipb.script_url}act=module&module=gallery">{ipb.lang['gallery']}</a>
+</if>
+
+	<a href="{ipb.script_url}act=Help">{ipb.lang['tb_help']}</a><a href="{ipb.script_url}act=Search&amp;f={ipb.input['f']}">{ipb.lang['tb_search']}</a><a href="{ipb.script_url}act=Members">{ipb.lang['tb_mlist']}</a><a href="{ipb.script_url}act=calendar">{ipb.lang['tb_calendar']}</a><!--IBF.CHATLINK--><!--IBF.TSLLINK-->
+		<!--ipb.rightlinks.end--></p>
+	</div>
+</div>]]></section_content>
+			<func_name>global_board_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<br />
+<form action="{ipb.vars['board_url']}/index.{ipb.vars['php_ext']}" method="post">
+	<input type="hidden" name="act" value="Login" />
+	<input type="hidden" name="CODE" value="01" />
+	<input type="hidden" name="s" value="{ipb.session_id}" />
+	<input type="hidden" name="referer" value="" />
+	<input type="hidden" name="CookieDate" value="1" />
+	<div class="borderwrap">
+		<h3><{CAT_IMG}>&nbsp;{ipb.lang['offline_title']}</h3>
+		<p>$message</p>
+		<div class="fieldwrap">
+			<h4>{ipb.lang['erl_enter_name']}</h4>
+			<input type="text" size="20" maxlength="64" name="UserName" />
+			<h4>{ipb.lang['erl_enter_pass']}</h4>
+			<input type="password" size="20" name="PassWord" />
+		</div>
+		<p class="formbuttonrow"><input class="button" type="submit" name="submit" value="{ipb.lang['erl_log_in_submit']}" /></p>
+	</div>
+</form>]]></section_content>
+			<func_name>board_offline</func_name>
+			<func_data><![CDATA[$message=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<style type="text/css" media="all">
+	@import url(style_images/css_{$css}.css);
+</style>]]></section_content>
+			<func_name>css_external</func_name>
+			<func_data><![CDATA[$css=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<style type="text/css">
+	{$css}
+</style>]]></section_content>
+			<func_name>css_inline</func_name>
+			<func_data><![CDATA[$css=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[</div>]]></section_content>
+			<func_name>end_nav</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<script language="JavaScript" type="text/javascript">
+<!--
+function contact_admin() {
+  // Very basic spam bot stopper
+	  
+  admin_email_one = '$ad_email_one';
+  admin_email_two = '$ad_email_two';
+  
+  window.location = 'mailto:'+admin_email_one+'@'+admin_email_two+'?subject=Error on the forums';
+  
+}
+//-->
+</script>
+<br />
+<div class="borderwrap">
+	<h3><{CAT_IMG}>&nbsp;{ipb.lang['error_title']}</h3>
+<if="show_top_msg == 1">
+<p>{ipb.lang['exp_text']}</p>
+	<div class="errorwrap">
+		<h4>{ipb.lang['msg_head']}</h4>
+</if>
+
+		<p>$message</p>
+	</div>
+	<!--IBF.LOG_IN_TABLE-->
+	<!--IBF.POST_TEXTAREA-->
+	<h4>{ipb.lang['er_links']}</h4>
+	<ul>
+		<li><a href="{ipb.script_url}act=Reg&amp;CODE=10">{ipb.lang['er_lost_pass']}</a></li>
+		<li><a href="{ipb.script_url}act=Reg&amp;CODE=00">{ipb.lang['er_register']}</a></li>
+		<li><a href="{ipb.script_url}act=Help&amp;CODE=00">{ipb.lang['er_help_files']}</a></li>
+		<li><a href="javascript:contact_admin();">{ipb.lang['er_contact_admin']}</a></li>
+	</ul>
+	<p class="formbuttonrow"><b><a href="javascript:history.go(-1)">{ipb.lang['error_back']}</a></b></p>
+</div>]]></section_content>
+			<func_name>Error</func_name>
+			<func_data><![CDATA[$message="",$ad_email_one="",$ad_email_two="",$show_top_msg=0]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img name="img{$pid}" src="{ipb.vars['img_url']}/topic_selected.gif" />]]></section_content>
+			<func_name>pid_image_selected</func_name>
+			<func_data><![CDATA[$pid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img name="img{$pid}" src="{ipb.vars['img_url']}/topic_unselected.gif" />]]></section_content>
+			<func_name>pid_image_unselected</func_name>
+			<func_data><![CDATA[$pid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img src="{ipb.vars['img_url']}/folder_post_icons/icon{$icon}.gif" alt="" />]]></section_content>
+			<func_name>post_icon</func_name>
+			<func_data><![CDATA[$icon=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="javascript:ShowHide('qr_open','qr_closed');" title="{ipb.lang['qr_open']}" accesskey="f"><{T_QREPLY}></a>]]></section_content>
+			<func_name>quick_reply_box_closed</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<script type="text/javascript">
+<!--
+	function emo_pop(){
+		window.open("index.{ipb.vars['php_ext']}?act=legends&amp;CODE=emoticons&amp;s={ipb.session_id}","Legends","width=250,height=500,resizable=yes,scrollbars=yes"); 
+	}
+-->
+</script>
+<div id="qr_open" style="display: $show; position: relative;">
+<br />
+<form name="REPLIER" action="{ipb.script_url}" method="post">
+<input type="hidden" name="act" value="Post" />
+<input type="hidden" name="CODE" value="03" />
+<input type="hidden" name="f" value="$fid" />
+<input type="hidden" name="t" value="$tid" />
+<input type="hidden" name="st" value="{ipb.input['st']}" />
+<input type="hidden" name="enabletrack" value="{ipb.member['auto_track']}" />
+<input type="hidden" name="auth_key" value="$key" />
+<!-- TITLE DIV -->
+<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;{ipb.lang['qr_title']}</div>
+	<div style='padding:6px' align="center">
+		<textarea cols="70" rows="8" name="Post" class="textarea" tabindex="1"></textarea><br /><br />
+		<a href="javascript:emo_pop();">{ipb.lang['show_emo']}</a> &#124;
+		<input type="checkbox" name="enableemo" value="yes" class="checkbox" checked="checked" />&nbsp;{ipb.lang['qr_add_smilie']} &#124;
+		<input type="checkbox" name="enablesig" value="yes" class="checkbox" checked="checked" />&nbsp;{ipb.lang['qr_add_sig']}<br /><br />
+		<input type="submit" name="submit" value="{ipb.lang['qr_submit']}" class="button" tabindex="2" accesskey="s" />&nbsp;
+		<input type="submit" name="preview" value="{ipb.lang['qr_more_opts']}" class="button" />
+		&nbsp;&nbsp; <input type="button" name="qrc" onclick="ShowHide('qr_open','qr_closed');" value="{ipb.lang['qr_closeit']}" class="button" />
+	</div>
+</div>
+</form>
+</div>
+<br />]]></section_content>
+			<func_name>quick_reply_box_open</func_name>
+			<func_data><![CDATA[$fid="",$tid="",$show="hide",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<!--Begin Msg Number {$post['pid']}-->
+<table cellspacing="1">
+	<tr>
+		<td valign="middle" class="row2" width="1%"><a name="entry{$post['pid']}"></a><span class="{$post['name_css']}">{$author['name']}</span></td>
+		<td class="row2" valign="top" width="99%">
+			<!-- POSTED DATE DIV -->
+			<div class="row2">
+				{$post['post_icon']}<span class="postdetails"><b><a title="{ipb.lang['tt_link']}" href="#" onclick="link_to_post({$post['pid']}); return false;">{ipb.lang['posted_on']}</a></b> {$post['post_date']}</span>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td valign="top" class="row2">
+			{$author['title']}<br />
+			{$author['member_rank_img']}<br /><br />
+			{$author['member_group']}<br />
+			{$author['member_posts']}<br />
+			<img src="{ipb.vars['img_url']}/spacer.gif" alt="" width="160" height="1" /><br /> 
+		</td>
+		<td width="100%" valign="top" class="row2">
+        	<!-- THE POST {$post['pid']} --> 
+        	You have chosen to ignore {$post['author_name']}.
+        	<a href="{ipb.script_url}showtopic={$post['topic_id']}&amp;view=findpost&amp;p={$post['pid']}">View this post</a> &middot; <a href="{ipb.script_url}act=UserCP&amp;CODE=ignoreremove&amp;id={$author['id']}">Un-ignore {$post['author_name']}</a>
+        	<!-- THE POST -->
+        </td>
+	</tr>
+</table>
+<div class="catend"><!-- --></div>]]></section_content>
+			<func_name>render_row_hidden</func_name>
+			<func_data><![CDATA[$post="",$author=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Mail&amp;CODE=00&amp;MID={$id}"><{P_EMAIL}></a>]]></section_content>
+			<func_name>member_icon_email</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Msg&amp;CODE=04&amp;MID={$id}"><{P_MSG}></a>]]></section_content>
+			<func_name>member_icon_msg</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}showuser={$id}"><{P_PROFILE}></a>]]></section_content>
+			<func_name>member_icon_profile</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="javascript:PopUp('{ipb.script_url}act=Profile&amp;CODE=showcard&amp;MID={$id}','AddressCard','600','300','0','1','1','1')" title="{ipb.lang['ac_title']}"><{P_CARD}></a>]]></section_content>
+			<func_name>member_icon_vcard</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['m_joined']} $date]]></section_content>
+			<func_name>member_joined</func_name>
+			<func_data><![CDATA[$date=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['m_location']} $location<br />]]></section_content>
+			<func_name>member_location</func_name>
+			<func_data><![CDATA[$location=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['member_no']} $number]]></section_content>
+			<func_name>member_number</func_name>
+			<func_data><![CDATA[$number=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['m_posts']} $posts]]></section_content>
+			<func_name>member_posts</func_name>
+			<func_data><![CDATA[$posts=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img src="$filename" alt="Group Icon" />]]></section_content>
+			<func_name>member_rank_img</func_name>
+			<func_data><![CDATA[$filename=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[</select>&nbsp;
+		<input type="submit" value="{ipb.lang['mm_submit']}" class="button" />
+	</form>
+</div>]]></section_content>
+			<func_name>mm_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<option value="$id">$name</option>]]></section_content>
+			<func_name>mm_entry</func_name>
+			<func_data><![CDATA[$id="",$name=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div style="float: left;">
+	<form action="{ipb.script_url}act=mmod&amp;t=$tid" method="post">
+	<input type="hidden" name="check" value="1" />
+		<select name="mm_id" class="dropdown">
+			<option value="-1">{ipb.lang['mm_title']}</option>]]></section_content>
+			<func_name>mm_start</func_name>
+			<func_data><![CDATA[$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div>
+	<form method="POST" name="modform2" action="{ipb.script_url}">
+	<input type="hidden" name="t" value="$tid" />
+	<input type="hidden" name="f" value="$fid" />
+	<input type="hidden" name="st" value="{ipb.input['st']}" />
+	<input type="hidden" name="auth_key" value="$key" />
+	<input type="hidden" name="act" value="Mod" />
+		<select name="CODE" class="dropdown">
+			<option value="-1">{ipb.lang['moderation_ops']}</option>
+			$data
+		</select>&nbsp;
+		<input type="submit" value="{ipb.lang['jmp_go']}" class="button" />
+	</form>
+</div>]]></section_content>
+			<func_name>Mod_Panel</func_name>
+			<func_data><![CDATA[$data="",$fid="",$tid="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<option value="$id">-{$text}</option>]]></section_content>
+			<func_name>mod_wrapper</func_name>
+			<func_data><![CDATA[$id="",$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img src="{ipb.vars['img_url']}/p_mq_add.gif" name="mad_$pid" alt="+" />]]></section_content>
+			<func_name>mq_image_add</func_name>
+			<func_data><![CDATA[$pid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<img src="{ipb.vars['img_url']}/p_mq_remove.gif" name="mad_$pid" alt="-" />]]></section_content>
+			<func_name>mq_image_remove</func_name>
+			<func_data><![CDATA[$pid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['ip']}: $data &#0124;]]></section_content>
+			<func_name>ip_show</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[{ipb.lang['m_group']} $title]]></section_content>
+			<func_name>member_group</func_name>
+			<func_data><![CDATA[$title=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<i>{ipb.lang['ip_private']}</i>]]></section_content>
+			<func_name>ip_admin_hide</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=usercp&amp;CODE=iptool&amp;ip={$ip}" target="_blank">{$ip}</a>]]></section_content>
+			<func_name>ip_admin_show</func_name>
+			<func_data><![CDATA[$ip=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<!--
+	( <a href="{ipb.script_url}act=ST&amp;f=$fid&amp;t=$tid&amp;view=getnewpost">{ipb.lang['go_new_post']}</a> )
+-->]]></section_content>
+			<func_name>golastpost_link</func_name>
+			<func_data><![CDATA[$fid="",$tid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="$url">$macro</a>]]></section_content>
+			<func_name>button_posting</func_name>
+			<func_data><![CDATA[$url="",$macro=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Post&amp;CODE=08&amp;f={$fid}&amp;t={$tid}&amp;p={$pid}&amp;st={ipb.input['st']}"><{P_EDIT}></a>]]></section_content>
+			<func_name>button_edit</func_name>
+			<func_data><![CDATA[$fid="",$tid="",$pid=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<a href="javascript:delete_post('{ipb.script_url}act=Mod&amp;CODE=04&amp;f={$fid}&amp;t={$tid}&amp;p={$pid}&amp;st={ipb.input['st']}&amp;auth_key=$key')"><{P_DELETE}></a>]]></section_content>
+			<func_name>button_delete</func_name>
+			<func_data><![CDATA[$fid="",$tid="",$pid="",$key=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<input type="text" size="50" name="$name" value="$value" />]]></section_content>
+			<func_name>field_textinput</func_name>
+			<func_data><![CDATA[$name="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+<div align="right" class="row1" style="padding: 5px;">{$data}</div>
+</div>]]></section_content>
+			<func_name>forum_jump</func_name>
+			<func_data><![CDATA[$data="",$menu_extra=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td align="right" class="formbuttonrow" valign="middle" colspan="6">
+			<select name="trackchoice">
+				<option value="unsubscribe">{ipb.lang['subs_delete']}</option>
+				<option value="none">{ipb.lang['subs_c_change']} {ipb.lang['subs_none_title']}</option>
+				<option value="immediate">{ipb.lang['subs_c_change']} {ipb.lang['subs_immediate']}</option>
+				<option value="delayed">{ipb.lang['subs_c_change']} {ipb.lang['subs_delayed']}</option>
+				<option value="daily">{ipb.lang['subs_c_change']} {ipb.lang['subs_daily']}</option>
+				<option value="weekly">{ipb.lang['subs_c_change']} {ipb.lang['subs_weekly']}</option>
+			</select>&nbsp;&nbsp;
+			<input type="submit" class="button" value="{ipb.lang['with_selected']}" />
+		</td>
+	</tr>
+</table>
+</div>
+</form>]]></section_content>
+			<func_name>forum_subs_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1" align="center" width="5%">{$data['folder_icon']}</td>
+		<td class="row1">
+			<b><a href="{ipb.script_url}act=SF&amp;f={$data['id']}">{$data['name']}</a></b>
+			<div class="desc">
+				{$data['description']}
+					<br />
+				{ipb.lang['subs_c_type']}: {ipb.lang[$type]}
+			</div>
+		</td>
+		<td class="row1" align="center">{$data['topics']}</td>
+		<td class="row1" align="center">{$data['posts']}</td>
+		<td class="row1">{$data['last_post']}<br />{ipb.lang['in']} {$data['last_topic']}<br />{ipb.lang['by']} {$data['last_poster']}</td>
+		<td class="row1" align="center"><input type="checkbox" name="id-{$data['forum_id']}" value="yes" /></td>
+	</tr>]]></section_content>
+			<func_name>forum_subs_row</func_name>
+			<func_data><![CDATA[$data="",$type=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<form action="{ipb.script_url}" name="mutliact" method="post">
+<input type="hidden" name="act" value="UserCP" />
+<input type="hidden" name="CODE" value="51" />
+<div class="formsubtitle">{ipb.lang['forum_subs_header']}</div>
+<div class="borderwrapm">
+	<table cellspacing="1">
+		<tr>
+			<th width="5%">&nbsp;</th>
+			<th width="50%">{ipb.lang['ft_forum']}</th>
+			<th align="center" width="5%">{ipb.lang['ft_topics']}</th>
+			<th align="center" width="5%">{ipb.lang['ft_posts']}</th>
+			<th align="center" width="35%">{ipb.lang['ft_last_post']}</th>
+			<th width="1%">&nbsp;</th>
+		</tr>]]></section_content>
+			<func_name>forum_subs_header</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="row1" align="center" colspan="6">{ipb.lang['forum_subs_none']}</td>
+	</tr>]]></section_content>
+			<func_name>forum_subs_none</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr> 
+			<td align="center" class="row2" width="1%">{$data['img_new_post']}</td>
+			<td class="row2">{$data['_queued_img']}<b><a href="{ipb.script_url}showforum={$data['id']}">{$data['name']}</a></b><br /><span class="forumdesc">{$data['description']}{$data['show_subforums']}<br /><i>{$data['moderator']}</i></span>{$data['_queued_info']}</td>
+			<td align="center" class="row1">{$data['topics']}</td>
+			<td align="center" class="row1">{$data['posts']}</td>
+			<td class="row1" nowrap="nowrap">{$data['last_unread']} <span>{$data['last_post']}<br /><b>{ipb.lang['in']}:</b>&nbsp;{$data['last_topic']}<br /><b>{ipb.lang['by']}:</b> {$data['last_poster']}</span></td>
+		</tr>]]></section_content>
+			<func_name>ForumRow</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content></section_content>
+			<func_name>end_all_cats</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<tr> 
+			<td class="catend" colspan="5"><!-- no content --></td>
+		</tr>
+	</table>
+</div>
+<br />]]></section_content>
+			<func_name>end_this_cat</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<a href="{ipb.script_url}act=Login&amp;CODE=04&amp;f={$id}" title="{ipb.lang['bi_markread']}">{$img}</a>]]></section_content>
+			<func_name>forum_img_with_link</func_name>
+			<func_data><![CDATA[$img="",$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_boards</group_name>
+			<section_content><![CDATA[<div class="borderwrap" style="display:{$data['div_fc']}" id="fc_{$data['id']}">
+	<div class="maintitlecollapse">
+		<p class="expand"><a href="javascript:togglecategory({$data['id']}, 0);"><{E_PLUS}></a></p>
+		<p><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}showforum={$data['id']}">{$data['name']}</a></p>
+	</div>
+</div>
+<div class="borderwrap" style="display:{$data['div_fo']}" id="fo_{$data['id']}">
+	<div class="maintitle">
+		<p class="expand"><a href="javascript:togglecategory({$data['id']}, 1);"><{E_MINUS}></a></p>
+		<p><{CAT_IMG}>&nbsp;<a href="{ipb.script_url}showforum={$data['id']}">{$data['name']}</a></p>
+	</div>
+	<table cellspacing="1">
+		<tr> 
+			<th colspan="2" width="66%">{ipb.lang['cat_name']}</th>
+			<th align="center" width="7%">{ipb.lang['topics']}</th>
+			<th align="center" width="7%">{ipb.lang['replies']}</th>
+			<th width="35%">{ipb.lang['last_post_info']}</th>
+		</tr>]]></section_content>
+			<func_name>CatHeader_Expanded</func_name>
+			<func_data><![CDATA[$data=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_legends</group_name>
+			<section_content><![CDATA[<form name="finduser" method="post" action="{ipb.script_url}entry=$entry&amp;name=$name&amp;sep=$sep&amp;CODE=finduser_two">
+	<table cellspacing="1">
+		<tr>
+			<td class="pagetitle">{ipb.lang['fu_error']}<hr noshade></td>
+		</tr>
+		<tr>
+			<td align="center" valign="middle">$msg</td>
+		</tr>
+		<tr>
+			<td class="pcen"><a href="javascript:history.go(-1);">{ipb.lang['fu_back']}</a> :: <a href="javascript:window.close();">{ipb.lang['fu_close_win']}</a></td>
+		</tr>
+	</table>
+</form>]]></section_content>
+			<func_name>find_user_error</func_name>
+			<func_data><![CDATA[$msg=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<script language="JavaScript" type="text/javascript">
+	<!--
+	function ValidateForm() {
+		document.REPLIER.submit.disabled = true;
+		return true;
+	}
+	-->
+</script>]]></section_content>
+			<func_name>delete_js</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_mod</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle">{ipb.lang['cp_em_title']}: {$profile['name']}</div>
+		<table cellspacing="0">
+			<tr>
+				<td valign="top" width="50%">
+					<fieldset>
+					<legend><b>{ipb.lang['cp_em_sub_main']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td width="40%" class="row1">{ipb.lang['cp_remove_av']}</td>
+								<td width="60%" class="row1">
+									<select name="avatar">
+										<option value="0">{ipb.lang['no']}</option>
+										<option value="1">{ipb.lang['yes']}</option>
+									</select>
+								</td>
+							</tr>
+							<tr>
+								<td class="row1">{ipb.lang['cp_remove_photo']}</td>
+								<td class="row1">
+									<select name="photo">
+										<option value="0">{ipb.lang['no']}</option>
+										<option value="1">{ipb.lang['yes']}</option>
+									</select>
+								</td>
+							</tr>
+							<tr>
+								<td class="row1">{ipb.lang['cp_edit_website']}</td>
+								<td class="row1"><input type="text" size="35" name="website" value="{$profile['website']}" /></td>
+							</tr>
+							<tr>
+								<td class="row1">{ipb.lang['cp_edit_location']}</td>
+								<td class="row1"><input type="text" size="35" name="location" value="{$profile['location']}" /></td>
+							</tr>
+							<tr>
+								<td class="row1" valign="top">{ipb.lang['cp_edit_interests']}</td>
+								<td class="row1"><textarea cols="35" rows="3" name="interests">{$profile['interests']}</textarea></td>
+							</tr>
+							<tr>
+								<td class="row1" valign="top">{ipb.lang['cp_edit_signature']}</td>
+								<td class="row1"><textarea cols="35" rows="5" name="signature">{$profile['signature']}</textarea></td>
+							</tr>
+						</table>
+					</fieldset>
+				</td>
+				<td valign="top" width="50%">
+					<fieldset>
+					<legend><b>{ipb.lang['cp_em_sub_other']}</b></legend>
+						<table cellspacing="0">
+							<tr>
+								<td class="row1" width="40%">{ipb.lang['cp_em_yahoo']}</td>
+								<td class="row1" width="60%"><input type="text" size="35" name="yahoo" value="{$profile['yahoo']}" /></td>
+							</tr>
+							<tr>
+								<td class="row1">{ipb.lang['cp_em_aim']}</td>
+								<td class="row1"><input type="text" size="35" name="aim_name" value="{$profile['aim_name']}" /></td>
+							</tr>
+							<tr>
+								<td class="row1">{ipb.lang['cp_em_icq']}</td>
+								<td class="row1"><input type="text" size="35" name="icq_number" value="{$profile['icq_number']}" /></td>
+							</tr>
+							<tr>
+								<td class="row1">{ipb.lang['cp_em_msn']}</td>
+								<td class="row1"><input type="text" size="35" name="msnname" value="{$profile['msnname']}" /></td>
+							</tr>
+<if="custom_fields != """>
+$custom_fields
+</if>
+
+						</table>
+					</fieldset>
+				</td>
+			</tr>
+		</table>
+		<div class="formsubtitle" align="center"><input type="submit" value="{ipb.lang['cp_em_submit']}" /></div>
+	</div>
+</form>]]></section_content>
+			<func_name>edit_user_form</func_name>
+			<func_data><![CDATA[$profile="",$custom_fields=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_msg</group_name>
+			<section_content><![CDATA[<tr>
+			<td align="right" colspan="5" class="formbuttonrow"><input type="submit" name="delete" value="{ipb.lang['delete_button']}" /> {ipb.lang['selected_msg']}</td>
+		</tr>
+	</table>
+</div>
+</form>]]></section_content>
+			<func_name>trackUNread_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<tr>
+	<td class="row2" valign="top"><b>$title</b></td>
+	<td class="row1">$value</td>
+</tr>]]></section_content>
+			<func_name>custom_field</func_name>
+			<func_data><![CDATA[$title="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_profile</group_name>
+			<section_content><![CDATA[<img src="$show_photo" alt="User Photo" $show_width $show_height />]]></section_content>
+			<func_name>get_photo</func_name>
+			<func_data><![CDATA[$show_photo="",$show_width="",$show_height=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+				<td class="row1"><a href="{ipb.script_url}showuser={$info['id']}">{$info['name']}</a></td>
+				<td align="center" class="row1">$forums</td>
+				<td align="center" class="row1">{$info['location']}</td>
+				<td align="center" class="row1">{$info['msg_icon']}</td>
+			</tr>]]></section_content>
+			<func_name>leader_row</func_name>
+			<func_data><![CDATA[$info="",$forums=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_stats</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="catend" colspan="4"><!-- no content --></td>
+	</tr>
+</table>
+</div>]]></section_content>
+			<func_name>close_strip</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_paypal']}</b>
+</p>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick-subscriptions" />
+<input type="hidden" name="business" value="$paypal_email" />
+<input type="hidden" name="item_name" value="$sub_title" />
+<input type="hidden" name="item_number" value="$new_sub_id" />
+<input type="hidden" name="no_shipping" value="1" />
+<input type="hidden" name="src" value="1" />
+<input type="hidden" name="a1" value="$to_pay" />
+<input type="hidden" name="p1" value="$time_left_to_run" />
+<input type="hidden" name="t1" value="$time_left_unit" />
+<input type="hidden" name="a3" value="$cost" />
+<input type="hidden" name="p3" value="$length" />
+<input type="hidden" name="t3" value="$unit" />
+<input type="hidden" name="invoice" value="{$cur_tran_id}x{$new_sub_id}x{$member_id}" />
+<input type="hidden" name="custom" value="$member_id" />
+<input type="hidden" name="memo" value="upgrade" />
+<input type="hidden" name="notify_url" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=paypal" />
+<input type="hidden" name="currency_code" value="$ccode" />
+<input type="hidden" name="return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+<input type="hidden" name="cancel_return" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=paypal" />
+	<br /><br />
+	<div>
+		<input type="image" src="https://www.paypal.com/images/x-click-but6.gif" name="submit" alt="Make payments with PayPal - it"s fast, free and secure!" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_paypal_upgrade_recurring_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$time_left_to_run="",$time_left_unit="",$unit="",$length="",$cost="",$paypal_email="",$sub_title="",$cur_tran_id="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_subscriptions</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['sc_complete']}</div>
+<p>
+	{ipb.lang['sc_upgrade_explain']}<br /><br />
+	$desc_string<br /><br />
+	<b>{ipb.lang['gw_nochex']}</b>
+</p>
+<form action="https://www.nochex.com/nochex.dll/checkout" method="post">
+<input type="hidden" name="email" value="$nochex_email" />
+<input type="hidden" name="amount" value="$to_pay" />
+<input type="hidden" name="ordernumber" value="{$new_sub_id}x{$member_id}x0" />
+<input type="hidden" name="returnurl" value="{ipb.script_url}act=module&module=subscription&CODE=paydone&type=nochex" />
+<input type="hidden" name="responderurl" value="{ipb.script_url}act=module&module=subscription&CODE=incoming&type=nochex" />
+	<br /><br />
+	<div>
+		<input type="image" src="http://www.nochex.com/web/images/payme4.gif" name="submit" alt="Pay with NOCHEX now" />
+	</div>
+</form>]]></section_content>
+			<func_name>do_nochex_normal_screen</func_name>
+			<func_data><![CDATA[$ccode="",$member_id="",$new_sub_id="",$to_pay="",$nochex_email="",$sub_title="",$desc_string=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_topic</group_name>
+			<section_content><![CDATA[<div class="borderwrap">
+	<div class="maintitle"><{CAT_IMG}>&nbsp;Announcement: {$announce['announce_title']}</div>
+	<table cellspacing="1">
+		<tr>
+			<td valign="middle" class="row2"><span class="normalname"><a href="{ipb.script_url}showuser={$author['id']}">{$author['name']}</a></span></td>
+			<td class="row2" valign="top">
+				<!-- POSTED DATE DIV -->
+				<div class="row2">
+					<span class="postdetails"><b>{$announce['announce_title']}</b>&nbsp; {$announce['running_date']}</span>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" class="post1">
+				<span class="postdetails">
+					{$author['avatar']}<br /><br />
+					{$author['title']}<br />
+					{$author['member_rank_img']}<br /><br />
+					{$author['member_group']}<br />
+					{$author['member_posts']}<br />
+					{$author['member_number']}<br />
+					{$author['member_joined']}<br /><br />
+					{$author['warn_text']} {$author['warn_minus']}{$author['warn_img']}{$author['warn_add']}
+				</span><br />
+				<!--$ author[field_1]-->
+				<img src="{ipb.vars['img_url']}/spacer.gif" alt="" width="160" height="1" /><br /> 
+			</td>
+			<td width="100%" valign="top" class="post1"><div class="postcolor">{$announce['announce_post']}</td>
+		</tr>
+		<tr>
+			<td class="darkrow3">&nbsp;</td>
+			<td class="darkrow3" nowrap="nowrap">
+				<!-- EMAIL / WWW / MSGR -->
+				<div class="darkrow3">
+					{$author['addresscard']}{$author['message_icon']}{$author['email_icon']}
+				</div>
+			</td>
+		</tr>
+	</table>
+</div>]]></section_content>
+			<func_name>announcement_show</func_name>
+			<func_data><![CDATA[$announce="",$author=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<textarea cols="60" rows="5" wrap="soft" name="$name">$value</textarea>]]></section_content>
+			<func_name>field_textarea</func_name>
+			<func_data><![CDATA[$name="",$value=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<tr>
+		<td class="pformleft" valign="top"><b>$title</b><br />$desc</td>
+		<td class="pformright">$content</td>
+	</tr>]]></section_content>
+			<func_name>field_entry</func_name>
+			<func_data><![CDATA[$title="",$desc="",$content=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_ucp</group_name>
+			<section_content><![CDATA[<select name="$name">
+	$options
+</select>]]></section_content>
+			<func_name>field_dropdown</func_name>
+			<func_data><![CDATA[$name="",$options=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td class="mcelltoday">
+	<div class="calday">$month_day</div>
+</td>]]></section_content>
+			<func_name>mini_cal_date_cell_today</func_name>
+			<func_data><![CDATA[$month_day="",$events=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="divpad">&middot; <a href="{ipb.script_url}act=calendar&amp;$link">$text</a></div>]]></section_content>
+			<func_name>cal_events_wrap</func_name>
+			<func_data><![CDATA[$link="",$text=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[</div>]]></section_content>
+			<func_name>cal_events_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="calevents">]]></section_content>
+			<func_name>cal_events_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td width="14%" class="subtitle">$day</td>]]></section_content>
+			<func_name>cal_day_bit</func_name>
+			<func_data><![CDATA[$day=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<a href="javascript:deleteEvent($id)"><b>Delete Event</b></a> / <a href="{ipb.script_url}act=calendar&amp;code=edit&amp;eventid=$id"><b>Edit Event</b></a>]]></section_content>
+			<func_name>cal_edit_del_button</func_name>
+			<func_data><![CDATA[$id=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td class="celltoday">
+	<div class="calday">$month_day</div>
+	$events
+</td>]]></section_content>
+			<func_name>cal_date_cell_today</func_name>
+			<func_data><![CDATA[$month_day="",$events=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td class="celldate">
+	<div class="calday">$month_day</div>
+	$events
+</td>]]></section_content>
+			<func_name>cal_date_cell</func_name>
+			<func_data><![CDATA[$month_day="",$events=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[</ul>
+</div>]]></section_content>
+			<func_name>cal_birthday_end</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<li><a href="{ipb.script_url}showuser=$uid">$uname</a> ($age)</li>]]></section_content>
+			<func_name>cal_birthday_entry</func_name>
+			<func_data><![CDATA[$uid="",$uname="",$age=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<div class="formsubtitle">{ipb.lang['cal_birthdays']}</div>
+<div class="tablepad">
+	<ul>]]></section_content>
+			<func_name>cal_birthday_start</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_calendar</group_name>
+			<section_content><![CDATA[<td class="cellblank"><!-- no content --><br /></td>]]></section_content>
+			<func_name>cal_blank_cell</func_name>
+			<func_data></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<img src='{ipb.vars['img_url']}/stat_time.gif' border='0' style='vertical-align:middle' /> {$time}sec
+&nbsp;&nbsp;<img src='{ipb.vars['img_url']}/stat_load.gif' border='0' style='vertical-align:middle' /> $load
+&nbsp;&nbsp;<img src='{ipb.vars['img_url']}/stat_sql.gif' border='0' style='vertical-align:middle' /> $sql <a href='{ipb.script_url}{$_SERVER['QUERY_STRING']}&amp;debug=1' style='color:white;font-size:10px'>queries</a>
+&nbsp;&nbsp;<img src='{ipb.vars['img_url']}/stat_gzip.gif' border='0' style='vertical-align:middle' /> $gzip
+<br />]]></section_content>
+			<func_name>global_quick_stats</func_name>
+			<func_data><![CDATA[$time="",$gzip="",$load="",$sql=""]]></func_data>
+		</template>
+
+		<template>
+			<group_name>skin_global</group_name>
+			<section_content><![CDATA[<form action="{ipb.vars['board_url']}/index.{ipb.vars['php_ext']}" method="post">
+	<input type="hidden" name="act" value="Login" />
+	<input type="hidden" name="CODE" value="01" />
+	<input type="hidden" name="s" value="{ipb.session_id}" />
+	<input type="hidden" name="referer" value="$q_string" />
+	<input type="hidden" name="CookieDate" value="1" />
+	<h4>{ipb.lang['er_log_in_title']}</h4>
+	<div class="fieldwrap">
+<if="ipb.vars['converge_login_method'] == 'username'">
+<h4>{ipb.lang['erl_enter_name']}</h4>
+		<input type="text" size="20" maxlength="64" name="UserName" />
+</if>
+<else>
+<h4>{ipb.lang['erl_email']}</h4>
+		<input type="text" size="20" maxlength="128" name="UserName" />
+</else>
+
+		<h4>{ipb.lang['erl_enter_pass']}</h4>
+		<input type="password" size="20" name="PassWord" />
+		<p class="formbuttonrow1"><input class="button" type="submit" name="submit" value="{ipb.lang['erl_log_in_submit']}" /></p>
+	</div>
+</form>]]></section_content>
+			<func_name>error_log_in</func_name>
+			<func_data><![CDATA[$q_string=""]]></func_data>
+		</template>
+	</templategroup>
+
+</templateexport>
\ No newline at end of file
diff --git a/upload/ipchat.php b/upload/ipchat.php
index edc38fb1..e2a10f1e 100644
--- a/upload/ipchat.php
+++ b/upload/ipchat.php
@@ -2,48 +2,128 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.1
+|   Invision Power Board v2.0.0
 |   ========================================
 |   by Matthew Mecham
-|   (c) 2001,2002 Invision Power Services, Inc
-|   http://www.ibforums.com
+|   (c) 2004 Invision Power Services, Inc
+|   http://www.invisionpower.com
 |   ========================================
-|   Web: http://www.ibforums.com
-|   Email: phpboards@ibforums.com
-|   Licence Info: phpib-licence@ibforums.com
+|   Web: http://www.invisionpower.com
 +---------------------------------------------------------------------------
 |
 |   > IP Chat => IPB Bridge Script
 |   > Script written by Matt Mecham
-|   > Date started: 17th February 2003
+|   > Date started: 17th February 2003 (Updated: 1 July 2004)
 |
 +--------------------------------------------------------------------------
 */
 
-$root_path = './';
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+// Root path
+
+define( 'ROOT_PATH'  , "./" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+
+$CACHE     = array();
 
 //----------------------------------------------
 // END OF USER EDITABLE COMPONENTS
 //---------------------------------------------
 
-require $root_path."conf_global.php";
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+require ROOT_PATH."conf_global.php";
 
 define( 'DENIED', 0 );
 define( 'ACCESS', 1 );
 define( 'ADMIN' , 2 );
 
-$db_info = array();
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
 
-$db_info['host']       = $INFO['sql_host'];
-$db_info['user']       = $INFO['sql_user'];
-$db_info['pass']       = $INFO['sql_pass'];
-$db_info['database']   = $INFO['sql_database'];
-$db_info['tbl_prefix'] = $INFO['sql_tbl_prefix'];
+$INFO['sql_driver'] = ! $INFO['sql_driver'] ? 'mysql' : strtolower($INFO['sql_driver']);
+
+require ( KERNEL_PATH.'class_db_'.$INFO['sql_driver'].".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['use_shutdown']     = 0;
+
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+//--------------------------------
+// Make CONSTANT
+//--------------------------------
+
+define( 'SQL_PREFIX', $DB->obj['sql_tbl_prefix'] );
+define( 'SQL_DRIVER', $INFO['sql_driver']        );
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( 'settings', 'group_cache', 'systemvars' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$INFO[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$CACHE[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$CACHE[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
 
 $allowed_groups        = $INFO['chat_admin_groups'];
 $access_groups         = $INFO['chat_access_groups'];
 $autologin             = 0;
-$allow_guest_access    = $INFO['chat_allow_guest'] == 1 ? ACCESS : DENIED;
+$allow_guest_access    = strstr( ','.$INFO['chat_access_groups'].',', ','.$INFO['guest_group'].',' ) ? ACCESS : DENIED;
 
 // Stupid PHP changing it's mind on HTTP args
 
@@ -77,34 +157,16 @@ $output_int  = $allow_guest_access;
 $output_name = "";
 
 
-
-$DB = @mysql_connect( $db_info['host'], $db_info['user'], $db_info['pass'] );
-
-if ( ! @mysql_select_db( $db_info['database'] ) )
-{
-	die_nice();
-	
-	//-- script exits --//
-}
-
 //------------------------------
 // Attempt to find the user
 //------------------------------
 
-if ( ! $autologin )
-{
-	$md5_password = md5($password);
-}
-else
-{
-	$md5_password = $password;
-}
+$DB->query( "SELECT m.mgroup, m.name, m.id, c.*  FROM ".SQL_PREFIX."members m
+			 LEFT JOIN ".SQL_PREFIX."members_converge c ON (m.id=c.converge_id)
+			 WHERE m.name='".$DB->add_slashes($username)."'" );
 
-$query_id = @mysql_query("SELECT m.mgroup, m.password, m.name, m.id  FROM {$db_info['tbl_prefix']}members m
-						  WHERE m.name='".addslashes($username)."' LIMIT 1"
-						 , $DB );
 						
-if ( ! $query_id )
+if ( ! $member = $DB->fetch_row() )
 {
 	die_nice();
 	
@@ -112,7 +174,7 @@ if ( ! $query_id )
 }
 
 
-if ( ! $member = @mysql_fetch_array( $query_id, MYSQL_ASSOC ) )
+if ( ! $member['id'] )
 {
 	// No member found - allow guest access?
 	
@@ -122,8 +184,18 @@ if ( ! $member = @mysql_fetch_array( $query_id, MYSQL_ASSOC ) )
 }
 
 
-@mysql_close();
+//------------------------------
+// Update passy
+//------------------------------
 
+if ( ! $autologin )
+{
+	$md5_password = md5( md5( $member['converge_pass_salt'] ) . md5($password) );
+}
+else
+{
+	$md5_password = $password;
+}
 
 //------------------------------
 // Check password - member exists
@@ -133,7 +205,7 @@ if ( $password != "" )
 {
 	// Password was entered..
 	
-	if ( $md5_password != $member['password'] )
+	if ( $md5_password != $member['converge_pass_hash'] )
 	{
 		// Password incorrect..
 		
diff --git a/upload/ips_kernel/class_converge.php b/upload/ips_kernel/class_converge.php
new file mode 100644
index 00000000..07127107
--- /dev/null
+++ b/upload/ips_kernel/class_converge.php
@@ -0,0 +1,217 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Converge methods (KERNEL)
+|   > Module written by Matt Mecham
+|   > Date started: 15th March 2004
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+class class_converge
+{
+	var $current_db = "";
+	var $member     = array();
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function class_converge(&$DB)
+	{
+		$this->current_db = $DB;
+		
+		// Temp code!
+		$this->converge_db = $DB;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Test for converge row
+	/*-------------------------------------------------------------------------*/
+	
+	function converge_check_for_member_by_email( $email )
+	{
+		$test = $this->converge_db->simple_exec_query( array( 'select' => 'converge_id', 'from' => 'members_converge', 'where' => "converge_email='$email'" ) );
+		
+		if ( $test['converge_id'] )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Update converge row (password)
+	/*-------------------------------------------------------------------------*/
+	
+	function converge_update_password( $new_md5_pass, $email )
+	{
+		if ( ! $email or ! $new_md5_pass )
+		{
+			return FALSE;
+		}
+		
+		if ( $email != $this->member['converge_email'] )
+		{
+			$temp_member = $this->converge_db->simple_exec_query( array( 'select' => '*', 'from' => 'members_converge', 'where' => "converge_email='$email'" ) );
+		}
+		else
+		{
+			$temp_member = $this->member;
+		}
+		
+		$new_pass = md5( md5( $temp_member['converge_pass_salt'] ) . $new_md5_pass );
+		
+		$this->converge_db->do_update( 'members_converge', array( 'converge_pass_hash' => $new_pass ), 'converge_id='.$temp_member['converge_id'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Update converge row
+	/*-------------------------------------------------------------------------*/
+	
+	function converge_update_member($curr_email, $new_email)
+	{
+		if ( ! $curr_email or ! $new_email )
+		{
+			return FALSE;
+		}
+		
+		if ( ! $this->member['converge_id'] )
+		{
+			$this->converge_load_member( $curr_email );
+			
+			if ( ! $this->member['converge_id'] )
+			{
+				return FALSE;
+			}
+		}
+		
+		$this->converge_db->do_update( 'members_converge', array( 'converge_email' => $new_email ), 'converge_id='.$this->member['converge_id'] );
+		
+		return TRUE;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get converge row
+	/*-------------------------------------------------------------------------*/
+	
+	function converge_load_member($email)
+	{
+		if ( ! $email )
+		{
+			$this->member = array();
+		}
+		else
+		{
+			$this->member = $this->converge_db->simple_exec_query( array( 'select' => '*', 'from' => 'members_converge', 'where' => "converge_email='$email'" ) );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get converge row (based on ID)
+	/*-------------------------------------------------------------------------*/
+	
+	function converge_load_member_by_id($id)
+	{
+		$id = intval($id);
+		
+		if ( ! $id )
+		{
+			$this->member = array();
+		}
+		else
+		{
+			$this->member = $this->converge_db->simple_exec_query( array( 'select' => '*', 'from' => 'members_converge', 'where' => "converge_id='$id'" ) );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Authenticate password
+	/*-------------------------------------------------------------------------*/
+	
+	function converge_authenticate_member( $md5_once_password )
+	{
+		if ( ! $this->member['converge_pass_hash'] )
+		{
+			return FALSE;
+		}
+		
+		if ( $this->member['converge_pass_hash'] == $this->generate_compiled_passhash( $this->member['converge_pass_salt'], $md5_once_password ) )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate password
+	/*-------------------------------------------------------------------------*/
+	
+	function generate_compiled_passhash($salt, $md5_once_password)
+	{
+		return md5( md5( $salt ) . $md5_once_password );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate SALT
+	/*-------------------------------------------------------------------------*/
+	
+	function generate_password_salt($len=5)
+	{
+		$salt = '';
+		
+		srand( (double)microtime() * 1000000 );
+		
+		for ( $i = 0; $i < $len; $i++ )
+		{
+			$num   = rand(33, 126);
+			
+			if ( $num == '92' )
+			{
+				$num = 93;
+			}
+			
+			$salt .= chr( $num );
+		}
+		
+		return $salt;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate auto log in key (MD5 hash of random 60 char string
+	/*-------------------------------------------------------------------------*/
+	
+	function generate_auto_log_in_key($len=60)
+	{
+		$pass = $this->generate_password_salt( 60 );
+		
+		return md5($pass);
+	}
+	
+
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/ips_kernel/class_db_mysql.php b/upload/ips_kernel/class_db_mysql.php
new file mode 100644
index 00000000..71d70cd6
--- /dev/null
+++ b/upload/ips_kernel/class_db_mysql.php
@@ -0,0 +1,1054 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > mySQL DB abstraction module
+|   > Module written by Matt Mecham
+|   > Date started: 14th February 2002
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+
+class db_driver {
+
+    var $obj = array ( "sql_database"     => ""         ,
+                       "sql_user"         => "root"     ,
+                       "sql_pass"         => ""         ,
+                       "sql_host"         => "localhost",
+                       "sql_port"         => ""         ,
+                       "persistent"       => "0"        ,
+                       "sql_tbl_prefix"   => "ibf_"     ,
+                       "cached_queries"   => array()    ,
+                       'shutdown_queries' => array()    ,
+                       'debug'            => 0          ,
+                       'use_shutdown'     => 1          ,
+                       'query_cache_file' => ''         ,
+                     );
+     
+     var $error             = "";
+     var $sql               = "";
+     var $cur_query         = "";
+     var $query_id          = "";
+     var $connection_id     = "";
+     var $query_count       = 0;
+     var $return_die        = 0;
+     var $failed            = 0;
+     var $manual_addslashes = 0;
+     var $is_shutdown       = 0;
+     var $prefix_changed    = 0;
+     var $record_row        = array();
+     var $loaded_classes    = array();
+     var $connect_vars      = array();
+     var $force_data_type   = array();
+     
+	function db_driver()
+	{
+		//--------------------------
+		// Set up any required connect
+		// vars here:
+		// Will be populated by obj
+		// caller
+		//--------------------------
+		
+     	$this->connect_vars = array();
+	}
+     
+    /*========================================================================*/
+    // Connect to the database  
+    /*========================================================================*/  
+                   
+	function connect()
+	{
+		//--------------------------
+     	// Done SQL prefix yet?
+     	//--------------------------
+     	
+     	if ( ! defined( 'SQL_PREFIX' ) )
+     	{
+     		$this->obj['sql_tbl_prefix'] = $this->obj['sql_tbl_prefix'] ? $this->obj['sql_tbl_prefix'] : 'ibf_';
+     		
+     		define( 'SQL_PREFIX', $this->obj['sql_tbl_prefix'] );
+     	}
+     	
+    	//--------------------------
+    	// Load query file
+    	//--------------------------
+    	
+    	if ( $this->obj['query_cache_file'] )
+     	{
+     		require_once( $this->obj['query_cache_file'] );
+     	
+     		$this->sql = new sql_queries( &$this );
+     	}
+     	
+     	//--------------------------
+     	// Connect
+     	//--------------------------
+     	
+    	if ($this->obj['persistent'])
+    	{
+    	    $this->connection_id = mysql_pconnect( $this->obj['sql_host'] ,
+												   $this->obj['sql_user'] ,
+												   $this->obj['sql_pass'] 
+												);
+        }
+        else
+        {
+			$this->connection_id = mysql_connect( $this->obj['sql_host'] ,
+												  $this->obj['sql_user'] ,
+												  $this->obj['sql_pass'] 
+												);
+		}
+		
+		if ( ! $this->connection_id )
+		{
+			$this->fatal_error();
+			return FALSE;
+		}
+		
+        if ( ! mysql_select_db($this->obj['sql_database'], $this->connection_id) )
+        {
+        	$this->fatal_error();
+        	return FALSE;
+        }
+        
+        return TRUE;
+    }
+    
+    /*========================================================================*/
+    // Set debug mode
+    /*========================================================================*/
+    
+    function set_debug_mode( $int=0 )
+    {
+    	$this->obj['debug'] = intval($int);
+    	
+    	//--------------------------
+     	// If debug, no shutdown....
+     	//--------------------------
+     	
+     	if ( $this->obj['debug'] )
+     	{
+     		$this->obj['use_shutdown'] = 0;
+     	}
+     }
+    
+    /*========================================================================*/
+    // Load extra query cache file
+    /*========================================================================*/
+    
+    function load_cache_file( $filepath, $classname='sql_extra_queries' )
+    {
+    	if ( ! file_exists( $filepath ) )
+    	{
+    		print "Cannot locate $filepath - exiting!";
+    		exit();
+    	}
+    	else
+    	{
+    		require_once( $filepath );
+    		{
+    			$this->$classname       = new $classname( &$this );
+    			$this->loaded_classes[] = $classname;
+    		}
+    	}
+    }
+    
+    /*========================================================================*/
+    // Process cached query
+    /*========================================================================*/
+    
+    function cache_add_query( $q="", $args=array(), $method='sql_queries' )
+    {
+    	if ( $this->obj['query_cache_file'] and $method == 'sql_queries' )
+    	{
+    		$this->cur_query .= $this->sql->$q( $args );
+    	}
+    	else if ( in_array( $method, $this->loaded_classes ) )
+    	{
+    		$this->cur_query .= $this->$method->$q( $args );
+    	}
+    }
+    
+    function cache_exec_query()
+    {
+    	return $this->simple_exec();
+    }
+    
+    function cache_shutdown_exec()
+    {
+    	if ( ! $this->obj['use_shutdown'] )
+    	{
+    		$this->is_shutdown = 1;
+    		return $this->simple_exec();
+    	}
+    	else
+    	{
+    		$this->obj['shutdown_queries'][] = $this->cur_query;
+    		$this->cur_query = "";
+    	}
+    }
+    
+    /*========================================================================*/
+    // Quick function
+    /*========================================================================*/
+    
+    function do_update( $tbl, $arr, $where="" )
+    {
+    	$dba = $this->compile_db_update_string( $arr );
+    	
+    	$query = "UPDATE ".SQL_PREFIX."$tbl SET $dba";
+    	
+    	if ( $where )
+    	{
+    		$query .= " WHERE ".$where;
+    	}
+    	
+    	$ci = $this->query( $query );
+    	
+    	return $ci;
+    
+    }
+    
+    function do_insert( $tbl, $arr )
+    {
+    	$dba = $this->compile_db_insert_string( $arr );
+    	
+    	$ci = $this->query("INSERT INTO ".SQL_PREFIX."$tbl ({$dba['FIELD_NAMES']}) VALUES({$dba['FIELD_VALUES']})");
+    	
+    	return $ci;
+    }
+    
+    /*========================================================================*/
+    // Shutdown update / insert
+    /*========================================================================*/
+    
+    //------------------------------------
+    // SHUTDOWN UPDATE
+    //------------------------------------
+    
+    function do_shutdown_update( $tbl, $arr, $where="" )
+    {
+    	$dba = $this->compile_db_update_string( $arr );
+    	
+    	$query = "UPDATE ".SQL_PREFIX."$tbl SET $dba";
+    	
+    	if ( $where )
+    	{
+    		$query .= " WHERE ".$where;
+    	}
+    	
+    	if ( ! $this->obj['use_shutdown'] )
+    	{
+    		$this->is_shutdown = 1;
+    		return $this->query( $query );
+    	}
+    	else
+    	{
+    		$this->obj['shutdown_queries'][] = $query;
+    		$this->cur_query = "";
+    	}
+    }
+    
+    //------------------------------------
+    // SHUTDOWN INSERT
+    //------------------------------------
+    
+    function do_shutdown_insert( $tbl, $arr )
+    {
+    	$dba = $this->compile_db_insert_string( $arr );
+    	
+    	$query = "INSERT INTO ".SQL_PREFIX."$tbl ({$dba['FIELD_NAMES']}) VALUES({$dba['FIELD_VALUES']})";
+    	
+    	if ( ! $this->obj['use_shutdown'] )
+    	{
+    		$this->is_shutdown = 1;
+    		return $this->query( $query );
+    	}
+    	else
+    	{
+    		$this->obj['shutdown_queries'][] = $query;
+    		$this->cur_query = "";
+    	}
+    }
+    
+    //------------------------------------
+    // SHUTDOWN STORE QUERY
+    //------------------------------------
+    
+    function simple_shutdown_exec()
+    {
+    	if ( ! $this->obj['use_shutdown'] )
+    	{
+    		$this->is_shutdown = 1;
+    		return $this->simple_exec();
+    	}
+    	else
+    	{
+    		$this->obj['shutdown_queries'][] = $this->cur_query;
+    		$this->cur_query = "";
+    	}
+    }
+    
+    /*========================================================================*/
+    // Simple elements
+    /*========================================================================*/
+    
+    function simple_construct( $a )
+    {
+    	if ( $a['select'] )
+    	{
+    		$this->simple_select( $a['select'], $a['from'], $a['where'] );
+    	}
+    	
+    	if ( $a['update'] )
+    	{
+    		$this->simple_update( $a['update'], $a['set'], $a['where'], $a['lowpro'] );
+    	}
+    	
+    	if ( $a['delete'] )
+    	{
+    		$this->simple_delete( $a['delete'], $a['where'] );
+    	}
+    	
+    	if ( $a['order'] )
+    	{
+    		$this->simple_order( $a['order'] );
+    	}
+    	
+    	if ( is_array( $a['limit'] ) )
+    	{
+    		$this->simple_limit( $a['limit'][0], $a['limit'][1] );
+    	}
+    }
+    
+    //------------------------------------
+    // UPDATE
+    //------------------------------------
+    
+    function simple_update( $tbl, $set, $where, $low_pro )
+    {
+    	if ( $low_pro )
+    	{
+    		$low_pro = ' LOW_PRIORITY ';
+    	}
+    	
+    	$this->cur_query .= "UPDATE ". $low_pro . SQL_PREFIX."$tbl SET $set";
+    	
+    	if ( $where )
+    	{
+    		$this->cur_query .= " WHERE $where";
+    	}
+    }
+    
+    //------------------------------------
+    // DELETE
+    //------------------------------------
+    
+    function simple_delete( $tbl, $where )
+    {
+    	$this->cur_query .= "DELETE FROM ".SQL_PREFIX."$tbl";
+    	
+    	if ( $where )
+    	{
+    		$this->cur_query .= " WHERE $where";
+    	}
+    }
+    
+    //------------------------------------
+    // EXEC QUERY
+    //------------------------------------
+    
+    function simple_exec()
+    {
+    	if ( $this->cur_query != "" )
+    	{
+    		$ci = $this->query( $this->cur_query );
+    	}
+    	
+    	$this->cur_query   = "";
+    	$this->is_shutdown = 0;
+    	return $ci;
+    }
+    
+    //------------------------------------
+    // Exec and return simple row
+    //------------------------------------
+    
+    function simple_exec_query( $a )
+    {
+    	$this->simple_construct( $a );
+    	
+    	$ci = $this->simple_exec();
+    	
+    	if ( $a['select'] )
+    	{
+    		return $this->fetch_row( $ci );
+    	}
+    }
+    
+    //------------------------------------
+    // ORDER
+    //------------------------------------
+    
+    function simple_order( $a )
+    {
+    	if ( $a )
+    	{
+    		$this->cur_query .= ' ORDER BY '.$a;
+    	}
+    }
+    
+    //------------------------------------
+    // LIMIT
+    //------------------------------------
+    
+    function simple_limit_with_check( $offset, $limit="" )
+    {
+    	if ( ! preg_match( "#LIMIT\s+?\d+,#i", $this->cur_query ) )
+		{
+			$this->simple_limit( $offset, $limit );
+		}
+    }
+    
+    function simple_limit( $offset, $limit="" )
+    {
+    	if ( $limit )
+    	{
+    		$this->cur_query .= ' LIMIT '.$offset.','.$limit;
+    	}
+    	else
+    	{
+    		$this->cur_query .= ' LIMIT '.$offset;
+    	}
+    }
+    
+    //------------------------------------
+    // SELECT
+    //------------------------------------
+    
+    function simple_select( $get, $table, $where="" )
+    {
+    	$this->cur_query .= "SELECT $get FROM ".SQL_PREFIX."$table";
+    	
+    	if ( $where != "" )
+    	{
+    		$this->cur_query .= " WHERE ".$where;
+    	}
+    }
+   
+    
+    /*========================================================================*/
+    // Process a manual query
+    /*========================================================================*/
+    
+    function query($the_query, $bypass=0) {
+    	
+    	//--------------------------------------
+        // Change the table prefix if needed
+        //--------------------------------------
+        
+        if ($bypass != 1)
+        {
+			if ( $this->obj['sql_tbl_prefix'] != "ibf_" and ! $this->prefix_changed )
+			{
+			   $the_query = preg_replace("/\sibf_(\S+?)([\s\.,]|$)/", " ".$this->obj['sql_tbl_prefix']."\\1\\2", $the_query);
+			}
+        }
+        
+        if ($this->obj['debug'])
+        {
+    		global $Debug, $ibforums;
+    		
+    		$Debug->startTimer();
+    	}
+    	
+        $this->query_id = mysql_query($the_query, $this->connection_id);
+      	
+      	//--------------------------------------
+      	// Reset array...
+      	//--------------------------------------
+      	
+      	$this->force_data_type = array();
+      	
+        if (! $this->query_id )
+        {
+            $this->fatal_error("mySQL query error: $the_query");
+        }
+        
+        //--------------------------------------
+        // Debug?
+        //--------------------------------------
+        
+        if ($this->obj['debug'])
+        {
+        	$endtime  = $Debug->endTimer();
+        	
+        	$shutdown = $this->is_shutdown ? 'SHUTDOWN QUERY: ' : '';
+        	
+        	if ( preg_match( "/^select/i", $the_query ) )
+        	{
+        		$eid = mysql_query("EXPLAIN $the_query", $this->connection_id);
+        		
+        		$ibforums->debug_html .= "<table width='95%' border='1' cellpadding='6' cellspacing='0' bgcolor='#FFE8F3' align='center'>
+										   <tr>
+										   	 <td colspan='8' style='font-size:14px' bgcolor='#FFC5Cb'><b>{$shutdown}Select Query</b></td>
+										   </tr>
+										   <tr>
+										    <td colspan='8' style='font-family:courier, monaco, arial;font-size:14px;color:black'>$the_query</td>
+										   </tr>
+										   <tr bgcolor='#FFC5Cb'>
+											 <td><b>table</b></td><td><b>type</b></td><td><b>possible_keys</b></td>
+											 <td><b>key</b></td><td><b>key_len</b></td><td><b>ref</b></td>
+											 <td><b>rows</b></td><td><b>Extra</b></td>
+										   </tr>\n";
+				while( $array = mysql_fetch_array($eid) )
+				{
+					$type_col = '#FFFFFF';
+					
+					if ($array['type'] == 'ref' or $array['type'] == 'eq_ref' or $array['type'] == 'const')
+					{
+						$type_col = '#D8FFD4';
+					}
+					else if ($array['type'] == 'ALL')
+					{
+						$type_col = '#FFEEBA';
+					}
+					
+					$ibforums->debug_html .= "<tr bgcolor='#FFFFFF'>
+											 <td>$array[table]&nbsp;</td>
+											 <td bgcolor='$type_col'>$array[type]&nbsp;</td>
+											 <td>$array[possible_keys]&nbsp;</td>
+											 <td>$array[key]&nbsp;</td>
+											 <td>$array[key_len]&nbsp;</td>
+											 <td>$array[ref]&nbsp;</td>
+											 <td>$array[rows]&nbsp;</td>
+											 <td>$array[Extra]&nbsp;</td>
+										   </tr>\n";
+				}
+				
+				$this->sql_time += $endtime;
+				
+				if ($endtime > 0.1)
+				{
+					$endtime = "<span style='color:red'><b>$endtime</b></span>";
+				}
+				
+				$ibforums->debug_html .= "<tr>
+										  <td colspan='8' bgcolor='#FFD6DC' style='font-size:14px'><b>MySQL time</b>: $endtime</b></td>
+										  </tr>
+										  </table>\n<br />\n";
+			}
+			else
+			{
+			  $ibforums->debug_html .= "<table width='95%' border='1' cellpadding='6' cellspacing='0' bgcolor='#FEFEFE'  align='center'>
+										 <tr>
+										  <td style='font-size:14px' bgcolor='#EFEFEF'><b>{$shutdown}Non Select Query</b></td>
+										 </tr>
+										 <tr>
+										  <td style='font-family:courier, monaco, arial;font-size:14px'>$the_query</td>
+										 </tr>
+										 <tr>
+										  <td style='font-size:14px' bgcolor='#EFEFEF'><b>MySQL time</b>: $endtime</span></td>
+										 </tr>
+										</table><br />\n\n";
+			}
+		}
+		
+		$this->query_count++;
+        
+        $this->obj['cached_queries'][] = $the_query;
+        
+        return $this->query_id;
+    }
+    
+    
+    /*========================================================================*/
+    // Fetch a row based on the last query
+    /*========================================================================*/
+    
+    function fetch_row($query_id = "") {
+    
+    	if ($query_id == "")
+    	{
+    		$query_id = $this->query_id;
+    	}
+    	
+        $this->record_row = mysql_fetch_array($query_id, MYSQL_ASSOC);
+        
+        return $this->record_row;
+        
+    }
+
+	
+	
+	/*========================================================================*/
+    // Test to see if a field exists by forcing and trapping an error.
+    // It ain't pretty, but it do the job don't it, eh?
+    // Posh my ass.
+    // Return 1 for exists, 0 for not exists and jello for the naked guy
+    // Fun fact: The number of times I spelt 'field' as 'feild'in this part: 104
+    /*========================================================================*/
+    
+    function field_exists($field, $table) {
+		
+		$this->return_die = 1;
+		$this->error = "";
+		
+		$this->query("SELECT COUNT($field) as count FROM $table");
+		
+		$return = 1;
+		
+		if ( $this->failed )
+		{
+			$return = 0;
+		}
+		
+		$this->error = "";
+		$this->return_die = 0;
+		$this->error_no   = 0;
+		$this->failed     = 0;
+		
+		return $return;
+	}
+	
+	/*========================================================================*/
+	// DROP TABLE
+	/*========================================================================*/
+	
+	function sql_drop_table( $table )
+	{
+		$this->query( "DROP TABLE if exists ".SQL_PREFIX."{$table}" );
+	}
+	
+	/*========================================================================*/
+	// DROP FIELD
+	/*========================================================================*/
+	
+	function sql_drop_field( $table, $field )
+	{
+		$this->query( "ALTER TABLE ".SQL_PREFIX."{$table} DROP $field" );
+	}
+	
+	/*========================================================================*/
+	// ADD FIELD
+	/*========================================================================*/
+	
+	function sql_add_field( $table, $field_name, $field_type, $field_default="''" )
+	{
+		$this->query( "ALTER TABLE ".SQL_PREFIX."{$table} ADD $field_name $field_type default {$field_default}" );
+	}
+	
+	/*========================================================================*/
+	// OPTIMIZE FIELD
+	/*========================================================================*/
+	
+	function sql_optimize_table( $table )
+	{
+		$this->query( "OPTIMIZE TABLE ".SQL_PREFIX."{$table}" );
+	}
+	
+	/*========================================================================*/
+	// ADD FULLTEXT INDEX
+	/*========================================================================*/
+	
+	function sql_add_fulltext_index( $table, $field )
+	{
+		$this->query( "alter table ".SQL_PREFIX."{$table} ADD FULLTEXT({$field})" );
+	}
+	
+	/*========================================================================*/
+	// GET TABLE SCHEMATIC
+	/*========================================================================*/
+	
+	function sql_get_table_schematic( $table )
+	{
+		$this->query( "SHOW CREATE TABLE ".SQL_PREFIX."{$table}" );
+		return $this->fetch_row();
+	}
+	
+	/*========================================================================*/
+	// IS ALREADY TABLE FULLTEXT?
+	/*========================================================================*/
+	
+	function sql_is_currently_fulltext( $table )
+	{
+		$result = $this->sql_get_table_schematic( $table );
+		
+		if ( preg_match( "/FULLTEXT KEY/i", $result['Create Table'] ) )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	/*========================================================================*/
+	// Return the version number of the SQL server
+	// Should return 'true' version string (ie: 3.23.0)
+	// And formatted string (ie: 3230 )
+	/*========================================================================*/
+	
+	function sql_get_version()
+	{
+		if ( ! $this->mysql_version and ! $this->true_version )
+		{
+			$this->query("SELECT VERSION() AS version");
+			
+			if ( ! $row = $this->fetch_row() )
+			{
+				$this->query("SHOW VARIABLES LIKE 'version'");
+				$row = $this->fetch_row();
+			}
+			
+			$this->true_version = $row['version'];
+			
+			$no_array = explode( '.', preg_replace( "/^(.+?)[-_]?/", "\\1", $row['version']) );
+			
+			$one   = (!isset($no_array) || !isset($no_array[0])) ? 3  : $no_array[0];
+			$two   = (!isset($no_array[1]))                      ? 21 : $no_array[1];
+			$three = (!isset($no_array[2]))                      ? 0  : $no_array[2];
+			
+			$this->mysql_version = (int)sprintf('%d%02d%02d', $one, $two, intval($three));
+   		}
+	}
+	
+	/*========================================================================*/
+	// sql_can_fulltext
+	// returns whether SQL engine has fulltext abilities
+	// returns TRUE or FALSE
+	/*========================================================================*/
+	
+	function sql_can_fulltext()
+	{
+		$this->sql_get_version();
+		
+		if ( $this->mysql_version >= 32323 )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	/*========================================================================*/
+	// sql_can_fulltext_boolean
+	// returns whether SQL engine has boolean fulltext abilities
+	// (+word -word, etc)
+	// returns TRUE or FALSE
+	/*========================================================================*/
+	
+	function sql_can_fulltext_boolean()
+	{
+		$this->sql_get_version();
+		
+		if ( $this->mysql_version >= 40010 )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	
+	/*========================================================================*/
+	// Flushes the in memory query string
+	/*========================================================================*/
+	
+	function flush_query()
+	{
+		$this->cur_query = "";
+	}
+	
+	/*========================================================================*/
+    // Fetch the number of rows affected by the last query
+    /*========================================================================*/
+    
+    function get_affected_rows() {
+        return mysql_affected_rows($this->connection_id);
+    }
+    
+    /*========================================================================*/
+    // Fetch the number of rows in a result set
+    /*========================================================================*/
+    
+    function get_num_rows() {
+        return mysql_num_rows($this->query_id);
+    }
+    
+    /*========================================================================*/
+    // Fetch the last insert id from an sql autoincrement
+    /*========================================================================*/
+    
+    function get_insert_id() {
+        return mysql_insert_id($this->connection_id);
+    }  
+    
+    /*========================================================================*/
+    // Return the amount of queries used
+    /*========================================================================*/
+    
+    function get_query_cnt() {
+        return $this->query_count;
+    }
+    
+    /*========================================================================*/
+    // Free the result set from mySQLs memory
+    /*========================================================================*/
+    
+    function free_result($query_id="") {
+    
+   		if ($query_id == "") {
+    		$query_id = $this->query_id;
+    	}
+    	
+    	@mysql_free_result($query_id);
+    }
+    
+    /*========================================================================*/
+    // Shut down the database
+    /*========================================================================*/
+    
+    function close_db()
+    { 
+    	if ( $this->connection_id )
+    	{
+        	return @mysql_close( $this->connection_id );
+        }
+    }
+    
+    /*========================================================================*/
+    // Return an array of tables
+    /*========================================================================*/
+    
+    function get_table_names() {
+    
+		$result     = mysql_list_tables($this->obj['sql_database']);
+		$num_tables = @mysql_numrows($result);
+		for ($i = 0; $i < $num_tables; $i++)
+		{
+			$tables[] = mysql_tablename($result, $i);
+		}
+		
+		mysql_free_result($result);
+		
+		return $tables;
+   	}
+   	
+   	/*========================================================================*/
+    // Return an array of fields
+    /*========================================================================*/
+    
+    function get_result_fields($query_id="") {
+    
+   		if ($query_id == "")
+   		{
+    		$query_id = $this->query_id;
+    	}
+    
+		while ($field = mysql_fetch_field($query_id))
+		{
+            $Fields[] = $field;
+		}
+		
+		//mysql_free_result($query_id);
+		
+		return $Fields;
+   	}
+    
+    /*========================================================================*/
+    // Basic error handler
+    /*========================================================================*/
+    
+    function fatal_error($the_error="")
+    {
+    	// Are we simply returning the error?
+    	
+    	if ($this->return_die == 1)
+    	{
+    		$this->error    = mysql_error();
+    		$this->error_no = mysql_errno();
+    		$this->failed   = 1;
+    		return;
+    	}
+    	
+    	$the_error .= "\n\nmySQL error: ".mysql_error()."\n";
+    	$the_error .= "mySQL error code: ".$this->error_no."\n";
+    	$the_error .= "Date: ".date("l dS of F Y h:i:s A");
+    	
+    	$out = "<html><head><title>Invision Power Board Database Error</title>
+    		   <style>P,BODY{ font-family:arial,sans-serif; font-size:11px; }</style></head><body>
+    		   &nbsp;<br><br><blockquote><b>There appears to be an error with the database.</b><br>
+    		   You can try to refresh the page by clicking <a href=\"javascript:window.location=window.location;\">here</a>.
+    		   <br><br><b>Error Returned</b><br>
+    		   <form name='mysql'><textarea rows=\"15\" cols=\"60\">".htmlspecialchars($the_error)."</textarea></form><br>We apologise for any inconvenience</blockquote></body></html>";
+    		   
+    
+        echo($out);
+        die("");
+    }
+    
+    /*========================================================================*/
+    // Create an array from a multidimensional array returning formatted
+    // strings ready to use in an INSERT query, saves having to manually format
+    // the (INSERT INTO table) ('field', 'field', 'field') VALUES ('val', 'val')
+    /*========================================================================*/
+    
+    function compile_db_insert_string($data) {
+    
+    	$field_names  = "";
+		$field_values = "";
+		
+		foreach ($data as $k => $v)
+		{
+			if ( ! $this->manual_addslashes )
+			{
+				$v = preg_replace( "/'/", "\\'", $v );
+			}
+			
+			$field_names  .= "$k,";
+			
+			//-----------------------------------------
+			// Forcing data type?
+			//-----------------------------------------
+			
+			if ( $this->force_data_type[ $k ] )
+			{
+				if ( $this->force_data_type[ $k ] == 'string' )
+				{
+					$field_values .= "'$v',";
+				}
+				else if ( $this->force_data_type[ $k ] == 'int' )
+				{
+					$field_values .= intval($v).",";
+				}
+				else if ( $this->force_data_type[ $k ] == 'float' )
+				{
+					$field_values .= floatval($v).",";
+				}
+			}
+			
+			//-----------------------------------------
+			// No? best guess it is then..
+			//-----------------------------------------
+			
+			else
+			{
+				if ( is_numeric( $v ) and intval($v) == $v )
+				{
+					$field_values .= $v.",";
+				}
+				else
+				{
+					$field_values .= "'$v',";
+				}
+			}
+		}
+		
+		$field_names  = preg_replace( "/,$/" , "" , $field_names  );
+		$field_values = preg_replace( "/,$/" , "" , $field_values );
+		
+		return array( 'FIELD_NAMES'  => $field_names,
+					  'FIELD_VALUES' => $field_values,
+					);
+	}
+	
+	/*========================================================================*/
+    // Create an array from a multidimensional array returning a formatted
+    // string ready to use in an UPDATE query, saves having to manually format
+    // the FIELD='val', FIELD='val', FIELD='val'
+    /*========================================================================*/
+    
+    function compile_db_update_string($data) {
+		
+		$return_string = "";
+		
+		foreach ($data as $k => $v)
+		{
+			if ( ! $this->manual_addslashes )
+			{
+				$v = preg_replace( "/'/", "\\'", $v );
+			}
+			
+			//-----------------------------------------
+			// Forcing data type?
+			//-----------------------------------------
+			
+			if ( $this->force_data_type[ $k ] )
+			{
+				if ( $this->force_data_type[ $k ] == 'string' )
+				{
+					$return_string .= $k . "='".$v."',";
+				}
+				else if ( $this->force_data_type[ $k ] == 'int' )
+				{
+					$return_string .= $k . "=".intval($v).",";
+				}
+				else if ( $this->force_data_type[ $k ] == 'float' )
+				{
+					$return_string .= $k . "=".floatval($v).",";
+				}
+			}
+			
+			//-----------------------------------------
+			// No? best guess it is then..
+			//-----------------------------------------
+			
+			else
+			{
+				if ( is_numeric( $v ) and intval($v) == $v )
+				{
+					$return_string .= $k . "=".$v.",";
+				}
+				else
+				{
+					$return_string .= $k . "='".$v."',";
+				}
+			}
+		}
+		
+		$return_string = preg_replace( "/,$/" , "" , $return_string );
+		
+		return $return_string;
+	}
+	
+	/*========================================================================*/
+	// Use different escape method for different SQL engines
+	/*========================================================================*/
+	
+	function add_slashes( $t )
+	{
+		//--------------------------
+		// MSSQL?
+		//--------------------------
+		
+		// return str_replace( "'", "''", $t )
+		
+		return preg_replace( "/'/", "\\'", $t );
+	}
+    
+} // end class
+
+
+?>
\ No newline at end of file
diff --git a/upload/ips_kernel/class_image.php b/upload/ips_kernel/class_image.php
new file mode 100644
index 00000000..215492d9
--- /dev/null
+++ b/upload/ips_kernel/class_image.php
@@ -0,0 +1,457 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > GD / IMAGE handling methods (KERNEL)
+|   > Module written by Matt Mecham
+|   > Date started: 2nd Feb. 2004
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+class class_image
+{
+	var $in_type          = 'file';
+	var $out_type         = 'file';
+	var $out_file_name    = '';
+	var $out_file_dir     = '';
+	var $in_file_dir      = '.';
+	var $in_file_name     = '';
+	var $in_file_complete = '';
+	var $desired_width    = 0;
+	var $desired_height   = 0;
+	var $gd_version       = 2;
+	var $image_type       = '';
+	var $file_extension   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function class_image()
+	{
+		//-----------------------------------
+		// Full path?
+		//-----------------------------------
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Clean paths
+	/*-------------------------------------------------------------------------*/
+	
+	function clean_paths()
+	{
+		$this->in_file_dir  = preg_replace( "#/$#", "", $this->in_file_dir );
+		$this->out_file_dir = preg_replace( "#/$#", "", $this->out_file_dir );
+		
+		if ( $this->in_file_dir and $this->in_file_name )
+		{
+			$this->in_file_complete = $this->in_file_dir.'/'.$this->in_file_name;
+		}
+		else
+		{
+			$this->in_file_complete = $this->in_file_name;
+		}
+		
+		if ( ! $this->out_file_dir )
+		{
+			$this->out_file_dir = $this->in_file_dir;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// GENERATE THUMBNAIL
+	/*-------------------------------------------------------------------------*/
+	
+	function generate_thumbnail()
+	{
+		$return = array();
+		$image  = "";
+		$thumb  = "";
+		
+		//-----------------------------------
+		// Set up paths
+		//-----------------------------------
+		
+		$this->clean_paths();
+		
+		$remap  = array( 1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP' );
+		
+		if ( $this->desired_width and $this->desired_height )
+		{
+			//----------------------------------------------------
+			// Tom Thumb!
+			//----------------------------------------------------
+			
+			$img_size = array();
+			
+			if ( $this->in_type == 'file' )
+			{
+				$img_size = @GetImageSize( $this->in_file_complete );
+			}
+			
+			if ( $img_size[0] < 1 and $img_size[1] < 1 )
+			{
+				$img_size    = array();
+				$img_size[0] = $this->desired_width;
+				$img_size[1] = $this->desired_height;
+				
+				$return['thumb_width']    = $this->desired_width;
+				$return['thumb_height']   = $this->desired_height;
+				
+				if ( $this->out_type == 'file' )
+				{
+					$return['thumb_location'] = $this->in_file_name;
+					return $return;
+				}
+				else
+				{
+					//----------------------------------------------------
+					// Show image
+					//----------------------------------------------------
+					
+					$this->show_non_gd();
+				}
+				
+			}
+			
+			//----------------------------------------------------
+			// Do we need to scale?
+			//----------------------------------------------------
+			
+			if ( ( $img_size[0] > $this->desired_width ) OR ( $img_size[1] > $this->desired_height ) )
+			{ 
+				
+				$im = $this->scale_image( array(
+												 'max_width'  => $this->desired_width,
+												 'max_height' => $this->desired_height,
+												 'cur_width'  => $img_size[0],
+												 'cur_height' => $img_size[1]
+										)      );
+									   
+				$return['thumb_width']   = $im['img_width'];
+				$return['thumb_height']  = $im['img_height'];
+				
+				//-----------------------------------------------
+				// May as well scale properly.
+				//-----------------------------------------------
+				
+				if ( $im['img_width'] )
+				{
+					$this->desired_width = $im['img_width'];
+				}
+				
+				if ( $im['img_height'] )
+				{
+					$this->desired_height = $im['img_height'];
+				}
+				
+				//-----------------------------------------------
+				// GD functions available?
+				//-----------------------------------------------
+				
+				if ( $remap[ $img_size[2] ] == 'GIF' )
+				{
+					if ( function_exists( 'imagecreatefromgif') )
+					{
+						if ( $image = @imagecreatefromgif( $this->in_file_complete ) )
+						{
+							$this->image_type = 'gif';
+						}
+						else
+						{
+							if ( $this->out_type == 'file' )
+							{
+								$return['thumb_width']    = $this->desired_width;
+								$return['thumb_height']   = $this->desired_height;
+								$return['thumb_location'] = $this->in_file_name;
+							}
+							else
+							{
+								//-----------------------------------------------
+								// Show Image..
+								//-----------------------------------------------
+								
+								$this->show_non_gd();
+								
+							}
+						}
+					}
+				}
+				else if ( $remap[ $img_size[2] ] == 'PNG' )
+				{
+					if ( function_exists( 'imagecreatefrompng') )
+					{
+						if ( $image = @imagecreatefrompng( $this->in_file_complete ) )
+						{
+							$this->image_type = 'png';
+						}
+						else
+						{
+							if ( $this->out_type == 'file' )
+							{
+								$return['thumb_width']    = $this->desired_width;
+								$return['thumb_height']   = $this->desired_height;
+								$return['thumb_location'] = $this->in_file_name;
+							}
+							else
+							{
+								//-----------------------------------------------
+								// Show Image..
+								//-----------------------------------------------
+								
+								$this->show_non_gd();
+								
+							}
+						}
+					}
+				}
+				else if ( $remap[ $img_size[2] ] == 'JPG' )
+				{
+					if ( function_exists( 'imagecreatefromjpeg') )
+					{ 
+						if ( $image = @imagecreatefromjpeg( $this->in_file_complete ) )
+						{
+							$this->image_type = 'jpg';
+						}
+						else
+						{
+							if ( $this->out_type == 'file' )
+							{
+								$return['thumb_width']    = $this->desired_width;
+								$return['thumb_height']   = $this->desired_height;
+								$return['thumb_location'] = $this->in_file_name;
+							}
+							else
+							{
+								//-----------------------------------------------
+								// Show Image..
+								//-----------------------------------------------
+								
+								$this->show_non_gd();
+								
+							}
+						}
+					}
+				}
+				
+				//----------------------------------------------------
+				// Did we get a return from imagecreatefrom?
+				//----------------------------------------------------
+				
+				if ( $image )
+				{
+					if ( $this->gd_version == 1 )
+					{
+						$thumb = @imagecreate( $im['img_width'], $im['img_height'] );
+						@imagecopyresized( $thumb, $image, 0, 0, 0, 0, $im['img_width'], $im['img_height'], $img_size[0], $img_size[1] );
+					}
+					else
+					{
+						$thumb = @imagecreatetruecolor( $im['img_width'], $im['img_height'] );
+						@imagecopyresampled($thumb, $image, 0, 0, 0, 0, $im['img_width'], $im['img_height'], $img_size[0], $img_size[1] );
+					}
+					
+					//-----------------------------------------------
+					// Saving?
+					//-----------------------------------------------
+					
+					if ( $this->out_type == 'file' )
+					{
+						if ( ! $this->out_file_name )
+						{
+							//-----------------------------------------------
+							// Remove file extension...
+							//-----------------------------------------------
+							
+							$this->out_file_name = preg_replace( "/^(.*)\..+?$/", "\\1", $this->in_file_name ) . '_thumb';
+						}
+						
+						if ( function_exists( 'imagejpeg' ) )
+						{
+							$this->file_extension = 'jpg';
+							@imagejpeg( $thumb, $this->out_file_dir."/".$this->out_file_name.'.jpg' );
+							@chmod( $this->out_file_dir."/".$this->out_file_name.'.jpg', 0777 );
+							@imagedestroy( $thumb );
+							@imagedestroy( $image );
+							$return['thumb_location'] = $this->out_file_name.'.jpg';
+							return $return;
+						}
+						else if ( function_exists( 'imagepng' ) )
+						{
+							$this->file_extension = 'png';
+							@imagepng( $thumb, $this->out_file_dir."/".$this->out_file_name.'.png' );
+							@chmod( $this->out_file_dir."/".$this->out_file_name.'.png', 0777 );
+							@imagedestroy( $thumb );
+							@imagedestroy( $image );
+							$return['thumb_location'] = $this->out_file_name.'.png';
+							return $return;
+						}
+						else
+						{
+							//--------------------------------------
+							// Can't save...
+							//--------------------------------------
+							
+							$return['thumb_width']    = $this->desired_width;
+							$return['thumb_height']   = $this->desired_height;
+							$return['thumb_location'] = $this->in_file_name;
+							
+							return $return;
+						}
+					}
+					else
+					{
+						//-----------------------------------------------
+						// Show image
+						//-----------------------------------------------
+						
+						$this->show_image( $thumb, $this->image_type );
+					
+					}
+				}
+				else
+				{
+					//----------------------------------------------------
+					// Could not GD, return..
+					//----------------------------------------------------
+					
+					if ( $this->out_type == 'file' )
+					{
+						$return['thumb_width']    = $this->desired_width;
+						$return['thumb_height']   = $this->desired_height;
+						$return['thumb_location'] = $this->in_file_name;
+					}
+					else
+					{
+						//-----------------------------------------------
+						// Show Image..
+						//-----------------------------------------------
+						
+						$this->show_non_gd();
+						
+					}
+				
+					return $return;
+				}
+			}
+			//----------------------------------------------------
+			// No need to scale..
+			//----------------------------------------------------
+			else
+			{ 
+				if ( $this->out_type == 'file' )
+				{
+					$return['thumb_width']    = $img_size[0];
+					$return['thumb_height']   = $img_size[1];
+					
+					return $return;
+				}
+				else
+				{
+					//-----------------------------------------------
+					// Show Image..
+					//-----------------------------------------------
+					
+					$this->show_non_gd();
+					
+				}
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Show GD image
+	/*-------------------------------------------------------------------------*/
+	
+	function show_image( $thumb, $type )
+	{
+		flush();
+		
+		if ( $type == 'gif' )
+		{
+			@header('Content-type: image/gif');
+		}
+		else if ( $type == 'png' )
+		{
+			@header('Content-Type: image/png' );
+		}
+		else
+		{
+			@header('Content-Type: image/jpeg' );
+		}
+		
+		print $data;
+		
+		exit();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Show non GD image
+	/*-------------------------------------------------------------------------*/
+	
+	function show_non_gd()
+	{
+		$file_extension = preg_replace( ".*\.(\w+)$", "\\1", $this->in_file_name );
+		$file_extension = strtolower( $file_extension );
+		$file_extension = $file_extension == 'jpeg' ? 'jpg' : $file_extension;
+		
+		if ( strstr( ' gif jpg png ', ' '.$file_extension.' ' ) )
+		{
+			if ( $data = @file_get_contents( $this->in_file_complete ) )
+			{
+				$this->show_thumbnail( $data, $file_extension );
+			}
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// Return scaled down image
+	/*-------------------------------------------------------------------------*/
+	
+	function scale_image($arg)
+	{
+		// max_width, max_height, cur_width, cur_height
+		
+		$ret = array(
+					  'img_width'  => $arg['cur_width'],
+					  'img_height' => $arg['cur_height']
+					);
+		
+		if ( $arg['cur_width'] > $arg['max_width'] )
+		{
+			$ret['img_width']  = $arg['max_width'];
+			$ret['img_height'] = ceil( ( $arg['cur_height'] * ( ( $arg['max_width'] * 100 ) / $arg['cur_width'] ) ) / 100 );
+			$arg['cur_height'] = $ret['img_height'];
+			$arg['cur_width']  = $ret['img_width'];
+		}
+		
+		if ( $arg['cur_height'] > $arg['max_height'] )
+		{
+			$ret['img_height']  = $arg['max_height'];
+			$ret['img_width']   = ceil( ( $arg['cur_width'] * ( ( $arg['max_height'] * 100 ) / $arg['cur_height'] ) ) / 100 );
+		}
+		
+	
+		return $ret;
+	}
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/ips_kernel/class_template.php b/upload/ips_kernel/class_template.php
new file mode 100644
index 00000000..c895c3d0
--- /dev/null
+++ b/upload/ips_kernel/class_template.php
@@ -0,0 +1,465 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Template Engine module (KERNEL)
+|   > Module written by Matt Mecham
+|   > Date started: 5th January 2004
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+|   New template module to build, rebuild and generate caches of templates
+|   which include the new IPB HTML Logic system.
+|   Example:
+|   
+|    <if="ibf.vars['threaded_per_page'] == 10">
+|      html here
+|    </if>
+|    <else if="ibf.vars['threaded_per_page'] >= 100 or some_var == 'this'">
+|      html here
+|    </if>
+|    <else if="show['this'] > 100">
+|      html here
+|    </if>
+|    <else>
+|     html here
+|    </else>
+|   
++--------------------------------------------------------------------------
+*/
+
+class class_template
+{
+	var $root_path   = './';
+	var $cache_dir   = 'skin_cache';
+	var $cache_id    = '1';
+	var $database_id = '1';
+	
+	var $cache_path  = '';
+	
+	function class_template()
+	{
+		$this->cache_path = $this->root_path . $this->cache_dir . '/cacheid_' . $this->cache_id;
+	}
+	
+	//===================================================
+	// Convert HTML to PHP cache file
+	//===================================================
+	
+	function convert_html_to_php($func_name, $func_data, $func_html)
+	{
+		//-------------------------------
+		// Make sure we have ="" on each
+		// func data
+		//-------------------------------
+		
+		$func_data = preg_replace( "#".'\$'."(\w+)(,|$)#i", "\$\\1=\"\"\\2", str_replace( " ", "", $func_data ) );
+		
+		$top    = "//===========================================================================\n".
+			      "// {$func_name}\n".
+			      "//===========================================================================\n";
+			      
+		$start  = "function {$func_name}($func_data) {\nglobal \$ibforums;\n\$IPBHTML = \"\";\n//--starthtml--//\n";
+		$middle = $this->build_section_html_to_php($func_html);
+		$end    = "\n//--endhtml--//\nreturn \$IPBHTML;\n}\n";
+		
+		return $top.$start.$middle.$end;
+	}
+	
+	//===================================================
+	// Alias: Convert PHP to HTML
+	//===================================================
+	
+	function convert_php_to_html($php)
+	{
+		return $this->_convert_php_to_html($php);
+	}
+	
+	//===================================================
+	// Build Section: PHP to HTML
+	// - Updates HTML database with PHP cache file
+	//===================================================
+	
+	function build_section_php_to_html($php="")
+	{
+	
+	}
+	
+	//===================================================
+	// Build Section: HTML to PHP
+	// - Makes PHP cache of raw HTML
+	//===================================================
+	
+	function build_section_html_to_php($html="")
+	{
+		
+		if ( preg_match( "#<if=[\"'].+?[\"']>#si", $html ) )
+		{
+			//----------------------------------------
+			// Does it have logic sections?
+			//----------------------------------------
+			
+			$html = $this->_convert_html_to_php($html);
+			
+			//----------------------------------------
+			// Non-logic from top?
+			//----------------------------------------
+			
+			$html = preg_replace( "#^(.+?)(//startif)#ise", "\$this->_wrap_in_php('\\1', '\\2');", $html );
+			
+			//----------------------------------------
+			// Non-logic from between?
+			//----------------------------------------
+			
+			$html = preg_replace( "#(}//endif|}//endelse)(.+?)(//startif|else)#ise", "\$this->_wrap_in_php('\\2', '\\3', '\\1');", $html );
+			
+			//$html = str_replace( "}//endif//startif", "}//endif\n//startif", $html );
+			
+			//----------------------------------------
+			// Non-logic from after? ENDELSE
+			//----------------------------------------
+			
+			if ( preg_match( "#^(.*)(}//endelse)(.+?)$#is", $html, $match ) )
+			{
+				if ( $match[1] and $match[2] and ( ! strstr( $match[3], "<<<EOF\n" ) ) )
+				{
+					$html = preg_replace( "#^(.*}//endelse)(.+?)$#ise", "\$this->_wrap_in_php('\\2', '', '\\1');", $html );
+				}
+			}
+			
+			//----------------------------------------
+			// Non-logic from after? ENDIF
+			//----------------------------------------
+			
+			if ( preg_match( "#^(.*)(}//endif)(.+?)$#is", $html, $match ) )
+			{
+				if ( $match[1] and $match[2] and ( ! strstr( $match[3], "<<<EOF\n" ) ) )
+				{	
+					$html = preg_replace( "#^(.*}//endif)(.+?)$#ise", "\$this->_wrap_in_php('\\2', '', '\\1');", $html );
+				}
+			}
+		}
+		else
+		{
+			$html = $this->_wrap_in_php( $html );
+		}
+		
+		//----------------------------------------
+		// Unconvert special tags
+		//----------------------------------------
+		
+		$html = $this->unconvert_tags($html);
+		
+		return $html;
+	}
+	
+	//===================================================
+	// Convert special tags into HTML safe versions
+	//===================================================
+	
+	function convert_tags($t="")
+	{
+		$t = preg_replace( "/{?\\\$ibforums->base_url}?/"             , "{ipb.script_url}" , $t );
+		$t = preg_replace( "/{?\\\$ibforums->session_id}?/"           , "{ipb.session_id}" , $t );
+		$t = preg_replace( "#\\\$ibforums->(member|vars|skin|lang|input)#i" , "ipb.\\1"          , $t );
+		
+		//----------------------------------------
+		// Make some tags safe..
+		//----------------------------------------
+		
+		$t = preg_replace( "/\{ipb\.vars\[(['\"])?(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)(['\"])?\]\}/", "" , $t );
+				
+		return $t;
+	}
+	
+	//===================================================
+	// Uncovert them back again
+	//===================================================
+	
+	function unconvert_tags($t="")
+	{
+		//----------------------------------------
+		// Make some tags safe..
+		//----------------------------------------
+		
+		$t = preg_replace( "/\{ipb\.vars\[(['\"])?(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)(['\"])?\]\}/", "" , $t );
+		
+		$t = preg_replace( "/{ipb\.script_url}/i"           , '{$ibforums->base_url}'  , $t);
+		$t = preg_replace( "/{ipb\.session_id}/i"           , '{$ibforums->session_id}', $t);
+		$t = preg_replace( "#ipb\.(member|vars|skin|lang|input)#i", '$ibforums->\\1'         , $t );
+		
+		return $t;
+	}
+	
+	//===================================================
+	// Wrap HTML into PHP
+	//===================================================
+	
+	function _wrap_in_php( $html, $after="", $before="" )
+	{
+		$html = $this->_trim_newlines($this->_trim_slashes($html));
+		
+		$before = $this->_trim_slashes($before);
+		$after  = $this->_trim_slashes($after);
+		
+		if ( ! strstr( $before, "\n" ) )
+		{
+			$before .= "\n";
+		}
+		
+		if ( ! trim($html) )
+		{
+			return $before.$html.$after;
+		}
+			
+		return $before."\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n".$after;
+	}
+	
+	
+	//===================================================
+	// Convert: HTML Logic to PHP logic
+	//===================================================
+	
+	function _convert_html_to_php($html)
+	{
+		$html = $this->_trim_slashes($html);
+		$html = preg_replace( "#(?:\s+?)?<if=[\"'](.+?)[\"']>(.+?)</if>#ise", "\$this->_statement_if('\\1', '\\2')", $html );
+		$html = preg_replace( "#(?:\s+?)?<else if=[\"'](.+?)[\"']>(.+?)</if>#ise", "\$this->_statement_elseif('\\1', '\\2')", $html );
+		$html = preg_replace( "#(?:\s+?)?<else>(.+?)</else>#ise", "\$this->_statement_else('\\1')", $html );
+		
+		return $html;
+	}
+	
+	//===================================================
+	// Convert: PHP logic to HTML logic
+	//===================================================
+	
+	function _convert_php_to_html($php)
+	{
+		$php = preg_replace( "#else if\s+?\((.+?)\)\s+?{(.+?)}//endif(\n)?#ise", "\$this->_reverse_if('\\1', '\\2', 'else if')", $php );
+		$php = preg_replace( "#//startif\nif\s+?\((.+?)\)\s+?{(.+?)}//endif(\n)?#ise", "\$this->_reverse_if('\\1', '\\2', 'if')", $php );
+		$php = preg_replace( "#else\s+?{(.+?)}//endelse(\n)?#ise", "\$this->_reverse_else( '\\1' )", $php );
+		
+		//----------------------------------------
+		// Parse raw sections
+		//----------------------------------------
+		
+		$php = $this->_reverse_ipbhtml($php);
+		
+		//----------------------------------------
+		// Convert ipb-htmllogic tags
+		//----------------------------------------
+		
+		//$php = preg_replace( "#//start-htmllogic#i" , "<ipb-htmllogic>", $php );
+		//$php = preg_replace( "#//end-htmllogic#i", "</ipb-htmllogic>"  , $php );
+		
+		//----------------------------------------
+		// Remove start ifs
+		//----------------------------------------
+		
+		$php = str_replace( "//startif\n", "\n", $php );
+		
+		//----------------------------------------
+		// Remove extra spaces
+		//----------------------------------------
+		
+		$php = preg_replace( "#(</if>|</else>)\s+?(<if|<else)#is", "\\1\n\\2", $php );
+		
+		//----------------------------------------
+		// Make safe special $Ibforums vars
+		//----------------------------------------
+		
+		$php = $this->convert_tags($php);
+		
+		return $php;
+	}
+	
+	//===================================================
+	// Reverse: PHP IF to HTML IF
+	//===================================================
+	
+	function _reverse_if( $code, $php, $start='if' )
+	{
+		$code = $this->_trim_slashes(trim($code));
+		$code = preg_replace( "/(^|and|or)(\s+)(.+?)(\s|$)/ise", "\$this->_reverse_prep_left('\\3', '\\1', '\\2', '\\4')", ' '.$code );
+		
+		$php = $this->_reverse_ipbhtml($php);
+		
+		return "<".$start."=\"".trim($code)."\">\n".$php."\n</if>\n";
+	
+	}
+	
+	//===================================================
+	// Reverse: PHP else to HTML else
+	//===================================================
+	
+	function _reverse_else( $php )
+	{
+		$php = $this->_trim_slashes(trim($php));
+		
+		$php = $this->_reverse_ipbhtml($php);
+		
+		return "<else>\n".$php."\n</else>\n";
+	
+	}
+	
+	//===================================================
+	// Reverse: $IPBHTML to normal $HTML
+	//===================================================
+	
+	function _reverse_ipbhtml( $code )
+	{
+		$code = $this->_trim_slashes($code);
+		
+		$code = preg_replace("/".'\$'."IPBHTML\s+?\.?=\s+?<<<EOF(.+?)EOF;\s?/si", "\\1", $code );
+		
+		$code = trim($code);
+		$code = $this->_trim_newlines($code);
+		
+		return $code;
+	}
+	
+	//===================================================
+	// Reverse PHP IF code to HTML code
+	//===================================================
+	
+	function _reverse_prep_left($left, $andor="", $fs="", $ls="")
+	{
+		$left = trim($this->_trim_slashes($left));
+		
+		if ( preg_match( "/".'\$'."ibforums->/", $left ) )
+		{
+			$left = preg_replace( "/".'\$'."ibforums->(.+?)$/", 'ipb.'."\\1", $left );
+		}
+		else
+		{
+			$left = str_replace( '$', '', $left );
+		}
+		
+		return $andor.$fs.$left.$ls;
+	}
+
+	//===================================================
+	// Statement: Return PHP 'IF' statement
+	//===================================================
+	
+	function _statement_if( $code, $html )
+	{
+		$html = $this->_func_prep_html($html);
+		$code = $this->_func_prep_if($code);
+		
+		return "\n//startif\nif ( $code )\n{\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n}//endif\n";
+	}
+	
+	//===================================================
+	// Statement: Return PHP 'ELSE IF' statement
+	//===================================================
+	
+	function _statement_elseif( $code, $html )
+	{
+		$html = $this->_func_prep_html($html);
+		$code = $this->_func_prep_if($code);
+		
+		return "\nelse if ( $code )\n{\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n}//endif\n";
+	}
+	
+	//===================================================
+	// Statement: Return PHP 'ELSE' statement
+	//===================================================
+	
+	function _statement_else( $html )
+	{
+		$html = $this->_func_prep_html($html);
+		
+		return "\nelse\n{\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n}//endelse\n";
+	}
+	
+	
+	//===================================================
+	// Strip leading newlines, etc
+	//===================================================
+	
+	function _func_prep_html($html)
+	{
+		$html = trim($this->_trim_slashes($html));
+		
+		//$html = preg_replace( '/"/', '\\"', $html );
+		
+		return $html;
+	}
+	
+	//===================================================
+	// Sort out left bit of comparison
+	//===================================================
+	
+	function _func_prep_left($left, $andor="", $fs="", $ls="")
+	{
+		$left = trim($this->_trim_slashes($left));
+		
+		if ( preg_match( "/^ipb\./", $left ) )
+		{
+			$left = preg_replace( "/^ipb\.(.+?)$/", '$ibforums->'."\\1", $left );
+		}
+		else
+		{
+			$left = '$'.$left;
+		}
+		
+		return $andor.$fs.$left.$ls;
+	}
+	
+	//===================================================
+	// Statement: Prep AND OR, etc
+	//===================================================
+	
+	function _func_prep_if( $code )
+	{
+		$code = $this->_trim_slashes($code);
+		
+		$code = preg_replace( "/(^|and|or)(\s+)(.+?)(\s|$)/ise", "\$this->_func_prep_left('\\3', '\\1', '\\2', '\\4')", ' '.$code );
+		
+		return trim($code);
+	}
+	
+	//===================================================
+	// Remove leading and trailing newlines
+	//===================================================
+	
+	function _trim_newlines($code)
+	{
+		$code = preg_replace("/^\n{1,}/s", "", $code );
+		$code = preg_replace("/\n{1,}$/s", "", $code );
+		return $code;
+	}
+	
+	//===================================================
+	// Remove preg_replace/e slashes
+	//===================================================
+	
+	function _trim_slashes($code)
+	{
+		$code = str_replace( '\"' , '"', $code );
+		$code = str_replace( "\\'", "'", $code );
+		return $code;
+	}
+
+	
+}
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/ips_kernel/class_upload.php b/upload/ips_kernel/class_upload.php
new file mode 100644
index 00000000..edbae26a
--- /dev/null
+++ b/upload/ips_kernel/class_upload.php
@@ -0,0 +1,270 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > UPLOAD handling methods (KERNEL)
+|   > Module written by Matt Mecham
+|   > Date started: 15th March 2004
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+| ERRORS:
+| 1: No upload
+| 2: Not valid upload type
+| 3: Upload exceeds $max_file_size
+| 4: Could not move uploaded file, upload deleted
++--------------------------------------------------------------------------
+*/
+
+
+class class_upload
+{
+	// name of upload form field
+	var $upload_form_field = 'FILE_UPLOAD';
+	
+	// Out filename *without* extension
+	// (Leave blank to retain user filename)
+	var $out_file_name    = '';
+	
+	// Out dir (./upload) - no trailing slash
+	var $out_file_dir     = './';
+	
+	// maximum file size of this upload
+	var $max_file_size    = 0;
+	
+	// Forces PHP, CGI, etc to text
+	var $make_script_safe = 1;
+	
+	// Force non-img file extenstion (leave blank if not) (ex: 'ibf'a makes upload.doc => upload.ibf)
+	var $force_data_ext   = '';
+	
+	// Allowed file extensions array( 'gif', 'jpg', 'jpeg'..)
+	var $allowed_file_ext = array();
+	
+	// Array of IMAGE file extensions
+	var $image_ext        = array( 'gif', 'jpeg', 'jpg', 'png' );
+	
+	
+	// Returns current file extension	
+	var $file_extension   = '';
+	
+	// If force_data_ext == 1, this will return the 'real' extension
+	// and $file_extension will return the 'force_data_ext'
+	var $real_file_extension = '';
+	
+	// Returns error number	
+	var $error_no         = 0;
+	
+	// Returns if upload is img or not
+	var $is_image         = 0;
+	
+	// Returns file name as was uploaded by user
+	var $original_file_name = "";
+	
+	// Returns final file name as is saved on disk. (no path info)
+	var $parsed_file_name = "";
+	
+	// Returns final file name with path info
+	var $saved_upload_name = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function class_upload()
+	{
+		
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// PROCESS THE UPLOAD
+	/*-------------------------------------------------------------------------*/
+	
+	function upload_process()
+	{
+		$this->_clean_paths();
+		
+		//-------------------------------------------------
+		// Set up some variables to stop carpals developing
+		//-------------------------------------------------
+		
+		$FILE_NAME = $_FILES[ $this->upload_form_field ]['name'];
+		$FILE_SIZE = $_FILES[ $this->upload_form_field ]['size'];
+		$FILE_TYPE = $_FILES[ $this->upload_form_field ]['type'];
+		
+		//-------------------------------------------------
+		// Naughty Opera adds the filename on the end of the
+		// mime type - we don't want this.
+		//-------------------------------------------------
+		
+		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
+		
+		//-------------------------------------------------
+		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
+		// I love universal languages that aren't universal.
+		//-------------------------------------------------
+		
+		if ($_FILES[ $this->upload_form_field ]['name'] == ""
+		or !$_FILES[ $this->upload_form_field ]['name']
+		or !$_FILES[ $this->upload_form_field ]['size']
+		or ($_FILES[ $this->upload_form_field ]['name'] == "none") )
+		{
+			$this->error_no = 1;
+			return;
+		}
+		
+		//-------------------------------------------------
+		// De we have allowed file_extensions?
+		//-------------------------------------------------
+		
+		if ( ! is_array( $this->allowed_file_ext ) or ! count( $this->allowed_file_ext ) )
+		{
+			$this->error_no = 2;
+			return;
+		}
+		
+		//-------------------------------------------------
+		// Get file extension
+		//-------------------------------------------------
+		
+		$this->file_extension = $this->_get_file_extension( $FILE_NAME );
+		
+		if ( ! $this->file_extension )
+		{
+			$this->error_no = 2;
+			return;
+		}
+		
+		$this->real_file_extension = $this->file_extension;
+		
+		//-------------------------------------------------
+		// Valid extension?
+		//-------------------------------------------------
+		
+		if ( ! in_array( $this->file_extension, $this->allowed_file_ext ) )
+		{
+			$this->error_no = 2;
+			return;
+		}
+		
+		//-------------------------------------------------
+		// Check the file size
+		//-------------------------------------------------
+		
+		if ( ( $this->max_file_size ) and ( $FILE_SIZE > $this->max_file_size ) )
+		{
+			$this->error_no = 3;
+			return;
+		}
+		
+		//-------------------------------------------------
+		// Make the uploaded file safe
+		//-------------------------------------------------
+		
+		$FILE_NAME = preg_replace( "/[^\w\.]/", "_", $FILE_NAME );
+		
+		$this->original_file_name = $FILE_NAME;
+		
+		//-------------------------------------------------
+		// Is it an image?
+		//-------------------------------------------------
+		
+		if ( is_array( $this->image_ext ) and count( $this->image_ext ) )
+		{
+			if ( in_array( $this->file_extension, $this->image_ext ) )
+			{ 
+				$this->is_image = 1;
+			}
+		}
+		
+		//-------------------------------------------------
+		// Convert file name?
+		// In any case, file name is WITHOUT extension
+		//-------------------------------------------------
+		
+		if ( $this->out_file_name )
+		{
+			$this->parsed_file_name = $this->out_file_name;
+		}
+		else
+		{
+			$this->parsed_file_name = str_replace( '.'.$this->file_extension, "", $FILE_NAME );
+		}
+		
+		//-------------------------------------------------
+		// Make safe?
+		//-------------------------------------------------
+		
+		if ( $this->make_script_safe )
+		{
+			if ( preg_match( "/\.(cgi|pl|js|asp|php|html|htm|jsp|jar)/", $FILE_NAME ) )
+			{
+				$FILE_TYPE                 = 'text/plain';
+				$this->file_extension      = 'txt';
+			}
+		}
+		
+		//-------------------------------------------------
+		// Add on the extension...
+		//-------------------------------------------------
+		
+		if ( $this->force_data_ext and ! $this->is_image )
+		{
+			$this->file_extension = str_replace( ".", "", $this->force_data_ext ); 
+		}
+		
+		$this->parsed_file_name .= '.'.$this->file_extension;
+		
+		//-------------------------------------------------
+		// Copy the upload to the uploads directory
+		//-------------------------------------------------
+		
+		$this->saved_upload_name = $this->out_file_dir.'/'.$this->parsed_file_name;
+		
+		if ( ! @move_uploaded_file( $_FILES[ $this->upload_form_field ]['tmp_name'], $this->saved_upload_name) )
+		{
+			$this->error_no = 4;
+			return;
+		}
+		else
+		{
+			@chmod( $this->saved_upload_name, 0777 );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Get file extension
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_file_extension($file)
+	{
+		return strtolower( str_replace( ".", "", substr( $file, strrpos( $file, '.' ) ) ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Clean paths
+	/*-------------------------------------------------------------------------*/
+	
+	function _clean_paths()
+	{
+		$this->out_file_dir = preg_replace( "#/$#", "", $this->out_file_dir );
+	}
+
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/ips_kernel/class_xml.php b/upload/ips_kernel/class_xml.php
new file mode 100644
index 00000000..8bf5127a
--- /dev/null
+++ b/upload/ips_kernel/class_xml.php
@@ -0,0 +1,400 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > XML handling methods (KERNEL)
+|   > Module written by Matt Mecham
+|   > Date started: 25th February
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+
+<productlist name="myname" version="1.0">
+ <productgroup name="thisgroup">
+  <product id="1.0">
+   <description>This is a descrption</description>
+   <title>Baked Beans</title>
+   <room store="1">103</room>
+  </product>
+ </productgroup>
+</productlist>
+
+# Set the root tag
+$xml->xml_set_root( 'productlist', array( 'name' => 'myname', 'version' => '1.0' ) );
+
+# Add a group
+$xml->xml_add_group( 'productgroup', array( 'name' => 'thisgroup' ) );
+
+# Build entry content
+$content[] = $xml->xml_build_simple_tag( 'description', "This is a descrption" );
+$content[] = $xml->xml_build_simple_tag( 'title'      , "Baked Beans"          );
+$content[] = $xml->xml_build_simple_tag( 'room'       , '103'         , array( 'store' => 1 ) );
+
+# Build entry
+$entry[]   = $xml->xml_build_entry( 'product', $content, array( 'id' => '1.0' ) );
+
+# Add to group 'productlist'
+$xml->xml_add_entry_to_group( 'productgroup', $entry );
+				
+# Format..
+$xml->xml_format_document();
+
+# Get XML document
+$filecontents = $xml->xml_document;
+
+# Parse XML document
+$xml->xml_parse_document( $filecontents );
+
+# Show XML array
+print_r( $xml->xml_array );
+
+# print "Baked Beans";
+print $xml->xml_array['productlist']['productgroup']['product'][0]['title']['VALUE'];		  
+
+# print "1";
+print $xml->xml_array['productlist']['productgroup']['product'][0]['room']['ATTRIBUTES']['store'];	
+
+*/
+
+
+class class_xml
+{
+	var $header            = '<?xml version="1.0" encoding="ISO-8859-1"?>';
+	var $root_tag          = '';
+	var $root_attributes   = "";
+	var $entries           = array();
+	var $xml_document      = "";
+	var $depth             = 0;
+	var $tmp_doc           = "";
+	var $groups            = "";
+	var $index_numeric     = 0;
+	var $collapse_dups     = 1;
+	var $xml_array         = array();
+	var $collapse_newlines = 1;
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function class_xml()
+	{
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Parse an XML document into arrays
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_parse_document( $xml )
+	{
+		$parser = xml_parser_create();
+		
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE  , 0);
+		xml_parse_into_struct($parser, $xml, $vals, $index); 
+		xml_parser_free($parser);
+		
+		$i = -1;
+		
+		$this->xml_array = $this->_xml_get_children($vals, $i);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Format the XML document
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_format_document( $entry=array() )
+	{
+		$this->xml_document = $this->header ? $this->header."\n" : '';
+		
+		$this->xml_document .= "<".$this->root_tag.$this->root_attributes.">\n";
+		
+		$this->xml_document .= $this->tmp_doc;
+		
+		$this->xml_document .= "\n</".$this->root_tag.">";
+		
+		$this->tmp_doc       = "";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Set the root tags
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_set_root($tag, $attributes=array() )
+	{
+		$this->root_tag        = $tag;
+		$this->root_attributes = $this->_xml_build_attribute_string( $attributes );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Add entries to the group
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_add_entry_to_group($tag, $entry=array() )
+	{
+		$this->tmp_doc .= "\t".$this->groups[ $tag ];
+		
+		if ( is_array( $entry ) and count( $entry ) )
+		{
+			foreach( $entry as $e )
+			{
+				$this->tmp_doc .=  "\n\t\t".$e."\n";
+			}
+		}
+		
+		$this->tmp_doc .= "\t</".$tag.">\n";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Builds an entry
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_build_entry( $tag, $content=array(), $attributes=array() )
+	{
+		$entry = "<" . $tag . $this->_xml_build_attribute_string($attributes) . ">\n";
+		
+		if ( is_array( $content ) and count( $content ) )
+		{
+			foreach( $content as $c )
+			{
+				$entry .= "\t\t\t".$c."\n";
+			}
+		}
+		
+		$entry .= "\t\t</" . $tag . ">";
+		
+		return $entry;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Add a group
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_add_group( $tag, $attributes=array() )
+	{
+		$this->groups[ $tag ] = "<" . $tag . $this->_xml_build_attribute_string($attributes) . ">";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Builds a simple <tag [key="value"]>content</tag> structure
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_build_simple_tag( $tag, $description="", $attributes=array() )
+	{
+		return "<" . $tag . $this->_xml_build_attribute_string($attributes) . ">" . $this->_xml_encode_string($description) . "</" . $tag . ">";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Build tree node
+	// Based on code found at http://php.net/manual/en/function.xml-parse-into-struct.php
+	// And http://eric.pollmann.net/work/public_domain/
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_build_tag( $thisvals, $vals, &$i, $type )
+	{
+		$tag = array();
+		
+		if ( isset($thisvals['attributes']) )
+		{
+			$tag['ATTRIBUTES'] = $this->_xml_decode_attribute($thisvals['attributes']); 
+		}
+		
+		if ( $type === 'complete' )
+		{
+			$tag['VALUE'] = $thisvals['value'];
+		}
+		else
+		{
+			$tag = array_merge( $tag, $this->_xml_get_children($vals, $i) );
+		}
+		
+		return $tag;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Build a nested array of children
+	// Based on code found at http://php.net/manual/en/function.xml-parse-into-struct.php
+	// And http://eric.pollmann.net/work/public_domain/
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_get_children($vals, &$i)
+	{
+		$children = array();
+		
+		//-----------------------------------
+		// CDATA before children
+		//-----------------------------------
+		
+		if ( $i > -1 && isset( $vals[$i]['value'] ) )
+		{
+			$children['VALUE'] = $vals[$i]['value'];
+		}
+		
+		//-----------------------------------
+		// Loopy loo
+		//-----------------------------------
+		
+		while( ++$i < count( $vals ) )
+		{ 
+			$type = $vals[$i]['type'];
+			
+			//-----------------------------------
+			// CDATA after children
+			//-----------------------------------
+			
+			if ($type === 'cdata')
+			{
+				$children['VALUE'] .= $vals[$i]['value'];
+			}
+			
+			//-----------------------------------
+			// COMPLETE: At end of current branch
+			// OPEN:    Node has children, recurse
+			//-----------------------------------
+			
+			else if ( $type === 'complete' OR $type === 'open' )
+			{
+				$tag = $this->_xml_build_tag( $vals[$i], $vals, $i, $type );
+				
+				if ( $this->index_numeric )
+				{
+					$tag['TAG'] = $vals[$i]['tag'];
+					$children[] = $tag;
+				}
+				else
+				{
+					$children[$vals[$i]['tag']][] = $tag;
+				}
+			}
+			
+			//-----------------------------------
+			// End of node?
+			//-----------------------------------
+			
+			else if ($type === 'close')
+			{
+				break;
+			}
+		}
+		
+		if ( $this->collapse_dups )
+		{
+			foreach( $children as $key => $value )
+			{
+				if ( is_array($value) && (count($value) == 1) )
+				{
+					$children[$key] = $value[0];
+				}
+			}
+		}
+			
+		return $children;
+	} 
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Builds attribute string
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_build_attribute_string( $array = array() )
+	{
+		if ( is_array( $array ) and count( $array ) )
+		{
+			$string = array();
+			
+			foreach( $array as $k => $v )
+			{
+				$v = trim( $this->_xml_encode_attribute($v) );
+				
+				$string[] = $k.'="'.$v.'"';
+			}
+			
+			return ' ' . implode( " ", $string );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Encodes an attribute string
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_encode_attribute( $t )
+	{
+		$t = preg_replace("/&(?!#[0-9]+;)/s", '&amp;', $t );
+		$t = str_replace( "<", "&lt;"  , $t );
+		$t = str_replace( ">", "&gt;"  , $t );
+		$t = str_replace( '"', "&quot;", $t );
+		$t = str_replace( "'", '&#039;', $t );
+		
+		return $t;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Encodes an attribute string
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_decode_attribute( $t )
+	{
+		$t = str_replace( "&amp;" , "&", $t );
+		$t = str_replace( "&lt;"  , "<", $t );
+		$t = str_replace( "&gt;"  , ">", $t );
+		$t = str_replace( "&quot;", '"', $t );
+		$t = str_replace( "&#039;", "'", $t );
+		
+		return $t;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Encodes a string to make it safe (uses cdata)
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_encode_string( $v )
+	{
+		if ( preg_match( "/['\"\[\]<>&]/", $v ) )
+		{
+			$v = "<![CDATA[" . $this->_xml_convert_safecdata($v) . "]]>";
+		}
+		
+		if ( $this->collapse_newlines )
+		{
+			$v = str_replace( "\r\n", "\n", $v );
+		}
+		
+		return $v;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Ensures no embedding of cdata
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_convert_safecdata( $v )
+	{
+		$v = str_replace( "<![CDATA[", "<!¢|CDATA|", $v );
+		$v = str_replace( "]]>"      , "|¢]>"      , $v );
+		return $v;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Uncoverts safe embedding
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_unconvert_safecdata( $v )
+	{
+		$v = str_replace( "<!¢|CDATA|", "<![CDATA[", $v );
+		$v = str_replace( "|¢]>"      , "]]>"      , $v );
+		return $v;
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/ips_kernel/class_xmlarchive.php b/upload/ips_kernel/class_xmlarchive.php
new file mode 100644
index 00000000..95022e90
--- /dev/null
+++ b/upload/ips_kernel/class_xmlarchive.php
@@ -0,0 +1,431 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > XML ARCHIVE CLASS: Handling methods (KERNEL)
+|   > Module written by Matt Mecham
+|   > Date started: 25th February
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+USAGE:
+
+$xmlarchive = new class_xmlarchive();
+
+$xmlarchive->xml_add_file( 'some/dir/filename.html' );
+$xmlarchive->xml_add_file_contents( $data, 'some/dir/filename.html' );
+
+$xmlarchive->xml_add_file( 'some/dir/filename.html', array( 'custom_tag' => $value ) );
+$xmlarchive->xml_add_file_contents( $data, 'some/dir/filename.html', array( 'custom_tag' => $value ) );
+
+$xmlarchive->xml_add_directory( 'some/dir' );
+$xmlarchive->xml_create_archive();
+
+$xmlarchive->xml_save( 'filename.xml' );
+$xmlarchive->xml_save_gzip( 'filename.xml.gz' );
+
+$contents = $xmlarchive->xml_get_contents();
+
+$xmlarchive->xml_read_archive( 'filename.xml' );
+$xmlarchive->xml_read_archive_data( $xml_data );
+
+ERROR NUMBERS:
+--------------
+001: No such directory or file
+002: Not a directory
+003: Could not write archive to disk
+004: No XML document to save
+005: Could not load xml data
+*/
+
+class class_xmlarchive
+{
+	var $xml           = "";
+	var $file_array    = array();
+	var $error_number  = 0;
+	var $error_message = "";
+	var $workfiles     = array();
+	var $non_binary    = 'txt htm html xml css js cgi php php3';
+	var $strip_path    = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function class_xmlarchive()
+	{
+		$tmp = "";
+		
+		//-----------------------------------
+		// Get the XML class
+		//-----------------------------------
+		
+		require_once( 'class_xml.php' );
+		
+		$this->xml = new class_xml();
+		
+		$this->error_number = 0;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// READ Archive from disk
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_read_archive( $filename )
+	{
+		if ( file_exists( $filename ) )
+		{
+			if ( strstr( $filename, '.gz' ) )
+			{
+				if ( $FH = @gzopen( $filename, 'r' ) )
+				{
+					$data = @gzread( $FH, $filename );
+					@gzclose( $FH );
+				}
+				else
+				{
+					$this->error_number = '005';
+				}
+			}
+			else
+			{
+				if ( $FH = @fopen( $filename, 'r' ) )
+				{
+					$data = @fread( $FH, filesize( $filename ) );
+					@fclose( $FH );
+				}
+				else
+				{
+					$this->error_number = '005';
+				}
+			}
+			
+			$this->xml_read_archive_data( $data );
+		}
+		else
+		{
+			$this->error_number = '001';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// READ Archive from data
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_read_archive_data( $data )
+	{
+		if ( $data )
+		{
+			$this->xml->xml_parse_document( $data );
+			
+			if ( is_array( $this->xml->xml_array ) )
+			{
+				$this->file_array = array();
+				
+				foreach( $this->xml->xml_array['xmlarchive']['fileset']['file'] as $idx => $entry )
+				{
+					$this_array = array();
+					
+					foreach ( $entry as $k => $v )
+					{
+						if ( $k == 'content' )
+						{
+							$v['VALUE'] = base64_decode( preg_replace( "/\s/", "", $entry['content']['VALUE'] ) );
+						}
+						
+						$this_array[ $k ] = $v['VALUE'];
+					}
+					
+					$this->file_array[] = $this_array;
+				}
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SAVE XML to disk
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_save_gzip( $filename )
+	{
+		if ( $this->xml->xml_document )
+		{
+			if ( $FH = @gzopen( $filename, 'wb' ) )
+			{
+				@gzwrite( $FH, $this->xml->xml_document, strlen( $this->xml->xml_document ) );
+				@gzclose( $FH );
+			}
+			else
+			{
+				$this->error_number = '003';
+			}
+		}
+		else
+		{
+			$this->error_number = '004';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SAVE XML to disk
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_save( $filename )
+	{
+		if ( $this->xml->xml_document )
+		{
+			if ( $FH = @fopen( $filename, 'wb' ) )
+			{
+				@fwrite( $FH, $this->xml->xml_document, strlen( $this->xml->xml_document ) );
+				@fclose( $FH );
+			}
+			else
+			{
+				$this->error_number = '003';
+			}
+		}
+		else
+		{
+			$this->error_number = '004';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// XML get contents
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_get_contents()
+	{
+		return $this->xml->xml_document;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Create the XML archive
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_create_archive()
+	{
+		$this->xml->xml_set_root( 'xmlarchive', array( 'generator' => 'IPB', 'created' => time() ) );
+		$this->xml->xml_add_group( 'fileset' );
+		
+		$entry = array();
+		
+		foreach( $this->file_array as $f )
+		{
+			$content = array();
+			
+			foreach ( $f as $k => $v )
+			{
+				if ( $k == 'content' )
+				{
+					$v = chunk_split(base64_encode($v));
+				}
+				
+				$content[] = $this->xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[]   = $this->xml->xml_build_entry( 'file', $content );
+		}
+		
+		$this->xml->xml_add_entry_to_group( 'fileset', $entry );
+		
+		$this->xml->xml_format_document();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Add directory contents
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_add_directory( $dir )
+	{
+		$this->error_number = "";
+		
+		//-----------------------------------
+		// Got dir?
+		//-----------------------------------
+		
+		if ( ! is_dir($dir) )
+		{
+			$this->error_number = '001';
+			return FALSE;
+		}
+		
+		//-----------------------------------
+		// Populate this->workfiles
+		//-----------------------------------
+		
+		$this->workfiles = array();
+		$this->_xml_get_dir_contents( $dir );
+		
+		//-----------------------------------
+		// Add them into the file array
+		//-----------------------------------
+		
+		foreach ( $this->workfiles as $f )
+		{
+			$this->xml_add_file( $f );
+		}
+		
+		$this->workfiles = array();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Add File (interface to file_contents)
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_add_file( $filename, $extra_tags=array() )
+	{
+		//-----------------------------------
+		// Kill OS X hidden files
+		//-----------------------------------
+		
+		if ( preg_match( "/\.ds_store/i", $filename ) )
+		{
+			return;
+		}
+		
+		if ( file_exists( $filename ) )
+		{
+			if ( $FH = @fopen( $filename, 'rb' ) )
+			{
+				$data = @fread( $FH, filesize( $filename ) );
+				@fclose( $FH );
+			}
+			
+			$this->xml_add_file_contents( $data, $filename, $extra_tags );
+		}
+		else
+		{
+			$this->error_number = '001';
+		}
+	}
+
+	
+	/*-------------------------------------------------------------------------*/
+	// Add File Contents
+	/*-------------------------------------------------------------------------*/
+	
+	function xml_add_file_contents( $data, $filename, $extra_tags=array() )
+	{
+		$ext = preg_replace( "/.*\.(.+?)$/", "\\1", $filename );
+		
+		$binary = 1;
+		
+		//-----------------------------------
+		// ASCII?
+		//-----------------------------------
+		
+		if ( strstr( ' '.$this->non_binary.' ', ' '.$ext.' ' ) )
+		{
+			$binary = 0;
+		}
+		
+		//-----------------------------------
+		// Get dir / filename
+		//-----------------------------------
+		
+		$dir_path = array();
+		$dir_path = explode( "/", $filename );
+		
+		if ( count( $dir_path ) )
+		{
+			$real_filename = array_pop( $dir_path );
+		}
+		
+		$real_filename = $real_filename ? $real_filename : $filename;
+		
+		$path = implode( "/", $dir_path );
+		
+		if ( $this->strip_path )
+		{
+			$path = preg_replace( "#". preg_quote($this->strip_path, '#')."/?#", "", $path );
+		}
+		
+		$this_array = array(
+							'filename' => $real_filename,
+							'content'  => $data,
+							'path'     => $path,
+							'binary'   => $binary
+						  );
+						  
+		foreach( $extra_tags as $k => $v )
+		{
+			if ( $k and ! in_array( $k, array_keys($this_array) ) )
+			{
+				$this_array[ $k ] = $v;
+			}
+		}
+		
+		$this->file_array[] = $this_array;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTERNAL: Get directory contents
+	/*-------------------------------------------------------------------------*/
+	
+	function _xml_get_dir_contents( $dir )
+	{
+		$dir = preg_replace( "#/$#", "", $dir );
+		
+		if ( file_exists($dir) )
+		{
+			if ( is_dir($dir) )
+			{
+				$handle = opendir($dir);
+				
+				while (($filename = readdir($handle)) !== false)
+				{
+					if (($filename != ".") && ($filename != ".."))
+					{
+						if ( is_dir( $dir."/".$filename ) )
+						{
+							//-----------------------------------
+							// Recurse
+							//-----------------------------------
+							
+							$this->_xml_get_dir_contents($dir."/".$filename);
+						}
+						else
+						{
+							//-----------------------------------
+							// Add file to list
+							//-----------------------------------
+							
+							$this->workfiles[] = $dir."/".$filename;
+						}
+					}
+				}
+				
+				closedir($handle);
+			}
+			else
+			{
+				$this->error_number = '002';
+				return FALSE;
+			}
+		}
+		else
+		{
+			$this->error_number = '001';
+			return;
+		}
+	}
+
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/Skin/s1/index.html b/upload/ips_kernel/index.html
similarity index 100%
rename from upload/Skin/s1/index.html
rename to upload/ips_kernel/index.html
diff --git a/upload/html/ibfcode.js b/upload/jscripts/ipb_bbcode.js
similarity index 53%
rename from upload/html/ibfcode.js
rename to upload/jscripts/ipb_bbcode.js
index 8dda8c12..a50ad81d 100644
--- a/upload/html/ibfcode.js
+++ b/upload/jscripts/ipb_bbcode.js
@@ -1,10 +1,6 @@
 //--------------------------------------------
 // Set up our simple tag open values
 //--------------------------------------------
-//
-// Modified by Volker Puttrich to allow IE 4+
-// on windows to use cursor position for inserting
-// tags / smilies
 
 var B_open = 0;
 var I_open = 0;
@@ -16,74 +12,66 @@ var HTML_open = 0;
 
 var bbtags   = new Array();
 
-// Determine browser type and stuff.
-// Borrowed from http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+var fombj    = document.REPLIER;
 
-var myAgent   = navigator.userAgent.toLowerCase();
-var myVersion = parseInt(navigator.appVersion);
-
-var is_ie   = ((myAgent.indexOf("msie") != -1)  && (myAgent.indexOf("opera") == -1));
-var is_nav  = ((myAgent.indexOf('mozilla')!=-1) && (myAgent.indexOf('spoofer')==-1)
-                && (myAgent.indexOf('compatible') == -1) && (myAgent.indexOf('opera')==-1)
-                && (myAgent.indexOf('webtv') ==-1)       && (myAgent.indexOf('hotjava')==-1));
-
-var is_win   =  ((myAgent.indexOf("win")!=-1) || (myAgent.indexOf("16bit")!=-1));
-var is_mac    = (myAgent.indexOf("mac")!=-1);
-
-// Set the initial radio button status based on cookies
-
-var allcookies = document.cookie;
-var pos = allcookies.indexOf("bbmode=");
+//==========================================
+// prep and set up
+//==========================================
 
 prep_mode();
 
 function prep_mode()
 {
-	if (pos != 1) {
-		var cstart = pos + 7;
-		var cend   = allcookies.indexOf(";", cstart);
-		if (cend == -1) { cend = allcookies.length; }
-		cvalue = allcookies.substring(cstart, cend);
-		
-		if (cvalue == 'ezmode') {
-			document.REPLIER.bbmode[0].checked = true;
-		} else {
-			document.REPLIER.bbmode[1].checked = true;
-		}
-	} 
-	else {
-		// default to normal mode.
-		document.REPLIER.bbmode[1].checked = true;
+	cvalue = my_getcookie( "bbmode" );
+	
+	if (cvalue == 'ezmode')
+	{
+		fombj.bbmode[0].checked = true;
+	}
+	else
+	{
+		fombj.bbmode[1].checked = true;
 	}
 }
 
+//==========================================
+// Set BBCode mode
+//==========================================
+
 function setmode(mVal)
 {
-	document.cookie = "bbmode="+mVal+"; path=/; expires=Wed, 1 Jan 2020 00:00:00 GMT;";
+	my_setcookie( 'bbmode', mVal, 1 );
 }
 
+
 function get_easy_mode_state()
 {
+	//--------------------------------------------
 	// Returns true if we've chosen easy mode
+	//--------------------------------------------
 	
-	if (document.REPLIER.bbmode[0].checked) {
+	if ( fombj.bbmode[0].checked )
+	{
 		return true;
 	}
-	else {
+	else
+	{
 		return false;
 	}
 }
 
-//--------------------------------------------
+//==========================================
 // Set the help bar status
-//--------------------------------------------
+//==========================================
 
 function hstat(msg)
 {
-	document.REPLIER.helpbox.value = eval( "help_" + msg );
+	fombj.helpbox.value = eval( "help_" + msg );
 }
 
+//==========================================
 // Set the number of tags open box
+//==========================================
 
 function cstat()
 {
@@ -97,98 +85,68 @@ function cstat()
 		c = 0;
 	}
 	
-	document.REPLIER.tagcount.value = c;
-}
-
-//--------------------------------------------
-// Get stack size
-//--------------------------------------------
-
-function stacksize(thearray)
-{
-	for (i = 0 ; i < thearray.length; i++ ) {
-		if ( (thearray[i] == "") || (thearray[i] == null) || (thearray == 'undefined') ) {
-			return i;
-		}
-	}
-	
-	return thearray.length;
-}
-
-//--------------------------------------------
-// Push stack
-//--------------------------------------------
-
-function pushstack(thearray, newval)
-{
-	arraysize = stacksize(thearray);
-	thearray[arraysize] = newval;
-}
-
-//--------------------------------------------
-// Pop stack
-//--------------------------------------------
-
-function popstack(thearray)
-{
-	arraysize = stacksize(thearray);
-	theval = thearray[arraysize - 1];
-	delete thearray[arraysize - 1];
-	return theval;
+	fombj.tagcount.value = c;
 }
 
 
-//--------------------------------------------
+//==========================================
 // Close all tags
-//--------------------------------------------
+//==========================================
 
 function closeall()
 {
-	if (bbtags[0]) {
-		while (bbtags[0]) {
+	if (bbtags[0])
+	{
+		while (bbtags[0])
+		{
 			tagRemove = popstack(bbtags)
-			document.REPLIER.Post.value += "[/" + tagRemove + "]";
+			fombj.Post.value += "[/" + tagRemove + "]";
 			
+			//--------------------------------------------
 			// Change the button status
 			// Ensure we're not looking for FONT, SIZE or COLOR as these
 			// buttons don't exist, they are select lists instead.
+			//--------------------------------------------
 			
 			if ( (tagRemove != 'FONT') && (tagRemove != 'SIZE') && (tagRemove != 'COLOR') )
 			{
-				eval("document.REPLIER." + tagRemove + ".value = ' " + tagRemove + " '");
+				eval("fombj." + tagRemove + ".value = ' " + tagRemove + " '");
 				eval(tagRemove + "_open = 0");
 			}
 		}
 	}
 	
+	//--------------------------------------------
 	// Ensure we got them all
-	document.REPLIER.tagcount.value = 0;
+	//--------------------------------------------
+	
+	fombj.tagcount.value = 0;
 	bbtags = new Array();
-	document.REPLIER.Post.focus();
+	fombj.Post.focus();
 }
 
-//--------------------------------------------
+//==========================================
 // EMOTICONS
-//--------------------------------------------
+//==========================================
 
 function emoticon(theSmilie)
 {
 	doInsert(" " + theSmilie + " ", "", false);
 }
 
-//--------------------------------------------
+//==========================================
 // ADD CODE
-//--------------------------------------------
+//==========================================
 
 function add_code(NewCode)
 {
-    document.REPLIER.Post.value += NewCode;
-    document.REPLIER.Post.focus();
+    fombj.Post.value += NewCode;
+    fombj.Post.focus();
 }
 
-//--------------------------------------------
+//==========================================
 // ALTER FONT
-//--------------------------------------------
+//==========================================
 
 function alterfont(theval, thetag)
 {
@@ -198,18 +156,18 @@ function alterfont(theval, thetag)
 	if(doInsert("[" + thetag + "=" + theval + "]", "[/" + thetag + "]", true))
 		pushstack(bbtags, thetag);
 	
-    document.REPLIER.ffont.selectedIndex  = 0;
-    document.REPLIER.fsize.selectedIndex  = 0;
-    document.REPLIER.fcolor.selectedIndex = 0;
+    fombj.ffont.selectedIndex  = 0;
+    fombj.fsize.selectedIndex  = 0;
+    fombj.fcolor.selectedIndex = 0;
     
     cstat();
 	
 }
 
 
-//--------------------------------------------
+//==========================================
 // SIMPLE TAGS (such as B, I U, etc)
-//--------------------------------------------
+//==========================================
 
 function simpletag(thetag)
 {
@@ -223,22 +181,30 @@ function simpletag(thetag)
 			doInsert("[" + thetag + "]" + inserttext + "[/" + thetag + "] ", "", false);
 		}
 	}
-	else {
+	else
+	{
 		if (tagOpen == 0)
 		{
 			if(doInsert("[" + thetag + "]", "[/" + thetag + "]", true))
 			{
 				eval(thetag + "_open = 1");
+				
+				//--------------------------------------------
 				// Change the button status
-				eval("document.REPLIER." + thetag + ".value += '*'");
+				//--------------------------------------------
+				
+				eval("fombj." + thetag + ".value += '*'");
 		
 				pushstack(bbtags, thetag);
 				cstat();
 				hstat('click_close');
 			}
 		}
-		else {
+		else
+		{
+			//--------------------------------------------
 			// Find the last occurance of the opened tag
+			//--------------------------------------------
 			lastindex = 0;
 			
 			for (i = 0 ; i < bbtags.length; i++ )
@@ -249,16 +215,22 @@ function simpletag(thetag)
 				}
 			}
 			
+			//--------------------------------------------
 			// Close all tags opened up to that tag was opened
+			//--------------------------------------------
+			
 			while (bbtags[lastindex])
 			{
 				tagRemove = popstack(bbtags);
 				doInsert("[/" + tagRemove + "]", "", false)
 				
+				//--------------------------------------------
 				// Change the button status
+				//--------------------------------------------
+				
 				if ( (tagRemove != 'FONT') && (tagRemove != 'SIZE') && (tagRemove != 'COLOR') )
 				{
-					eval("document.REPLIER." + tagRemove + ".value = ' " + tagRemove + " '");
+					eval("fombj." + tagRemove + ".value = ' " + tagRemove + " '");
 					eval(tagRemove + "_open = 0");
 				}
 			}
@@ -268,6 +240,9 @@ function simpletag(thetag)
 	}
 }
 
+//==========================================
+// List tag
+//==========================================
 
 function tag_list()
 {
@@ -289,6 +264,10 @@ function tag_list()
 	}
 }
 
+//==========================================
+// URL tag
+//==========================================
+
 function tag_url()
 {
     var FoundErrors = '';
@@ -310,6 +289,19 @@ function tag_url()
 	doInsert("[URL="+enterURL+"]"+enterTITLE+"[/URL]", "", false);
 }
 
+//==========================================
+// Insert attachment tag
+//==========================================
+
+function insert_attach_to_textarea(aid)
+{
+	doInsert( "[attachmentid="+aid+"]" );
+}
+
+//==========================================
+// Image tag
+//==========================================
+
 function tag_image()
 {
     var FoundErrors = '';
@@ -352,16 +344,21 @@ function tag_email()
 function doInsert(ibTag, ibClsTag, isSingle)
 {
 	var isClose = false;
-	var obj_ta = document.REPLIER.Post;
-
-	if ( (myVersion >= 4) && is_ie && is_win) // Ensure it works for IE4up / Win only
+	var obj_ta = fombj.Post;
+	
+	//----------------------------------------
+	// It's IE!
+	//----------------------------------------
+	if ( (ua_vers >= 4) && is_ie && is_win)
 	{
-		if(obj_ta.isTextEdit){ // this doesn't work for NS, but it works for IE 4+ and compatible browsers
+		if (obj_ta.isTextEdit)
+		{
 			obj_ta.focus();
 			var sel = document.selection;
 			var rng = sel.createRange();
 			rng.colapse;
-			if((sel.type == "Text" || sel.type == "None") && rng != null){
+			if((sel.type == "Text" || sel.type == "None") && rng != null)
+			{
 				if(ibClsTag != "" && rng.text.length > 0)
 					ibTag += rng.text + ibClsTag;
 				else if(isSingle)
@@ -370,25 +367,77 @@ function doInsert(ibTag, ibClsTag, isSingle)
 				rng.text = ibTag;
 			}
 		}
-		else{
+		else
+		{
 			if(isSingle)
+			{
 				isClose = true;
-	
+			}
+			
 			obj_ta.value += ibTag;
 		}
 	}
+	//----------------------------------------
+	// It's MOZZY!
+	//----------------------------------------
+	
+	else if ( obj_ta.selectionEnd )
+	{ 
+		var ss = obj_ta.selectionStart;
+		var st = obj_ta.scrollTop;
+		var es = obj_ta.selectionEnd;
+		
+		if (es <= 2)
+		{
+			es = obj_ta.textLength;
+		}
+		
+		var start  = (obj_ta.value).substring(0, ss);
+		var middle = (obj_ta.value).substring(ss, es);
+		var end    = (obj_ta.value).substring(es, obj_ta.textLength);
+		
+		//-----------------------------------
+		// text range?
+		//-----------------------------------
+		
+		if (obj_ta.selectionEnd - obj_ta.selectionStart > 0)
+		{
+			middle = ibTag + middle + ibClsTag;
+		}
+		else
+		{
+			middle = ibTag + middle;
+			
+			if (isSingle)
+			{
+				isClose = true;
+			}
+		}
+		
+		obj_ta.value = start + middle + end;
+		
+		var cpos = ss + (middle.length);
+		
+		obj_ta.selectionStart = cpos;
+		obj_ta.selectionEnd   = cpos;
+		obj_ta.scrollTop      = st;
+
+
+	}
+	//----------------------------------------
+	// It's CRAPPY!
+	//----------------------------------------
 	else
 	{
-		if(isSingle)
+		if (isSingle)
+		{
 			isClose = true;
-
+		}
+		
 		obj_ta.value += ibTag;
 	}
-
-	obj_ta.focus();
 	
-	// clear multiple blanks
-//	obj_ta.value = obj_ta.value.replace(/  /, " ");
+	obj_ta.focus();
 
 	return isClose;
 }	
diff --git a/upload/jscripts/ipb_board.js b/upload/jscripts/ipb_board.js
new file mode 100644
index 00000000..0b115f06
--- /dev/null
+++ b/upload/jscripts/ipb_board.js
@@ -0,0 +1,14 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// Boards JS File
+// (c) 2003 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+
+
+function waitforme()
+{
+
+}
\ No newline at end of file
diff --git a/upload/jscripts/ipb_centerdiv.js b/upload/jscripts/ipb_centerdiv.js
new file mode 100644
index 00000000..6dad0363
--- /dev/null
+++ b/upload/jscripts/ipb_centerdiv.js
@@ -0,0 +1,108 @@
+resetposition = function()
+{
+	if ( document.getElementById )
+	{
+		var div = document.getElementById( divToCenter );
+		var divWidth  = div.offsetWidth  ? div.offsetWidth  : div.style.width   ? parseInt( div.style.width )  : 0;
+		var divHeight = div.offsetHeight ? div.offsetHeight :  div.style.height ? parseInt( div.style.height ) : 0;
+		
+		var sx = getwidth();
+		var sy = getheight();
+		
+		var scrolly = getYscroll();
+		
+		var setX = ( sx - divWidth ) / 2;
+		var setY = ( sy - divHeight) / 2 + scrolly;
+		
+		if( setX < 0 ) setX = 0;
+		if( setY < 0 ) setY = 0;
+		
+		div.style.left = setX + "px";
+		div.style.top  = setY + "px";
+		div.style.visibility = "visible";
+	}
+};
+
+
+function getwidth()
+{
+	var width = 0;
+	
+	if( document.documentElement && document.documentElement.clientWidth )
+	{
+		width = document.documentElement.clientWidth;
+	}
+	else if( document.body && document.body.clientWidth )
+	{
+		width = document.body.clientWidth;
+	}
+	else if( window.innerWidth )
+	{
+		width = window.innerWidth - 18;
+	}
+	
+	return width;
+}
+
+function getheight()
+{
+	var height = 0;
+	if( document.documentElement && document.documentElement.clientHeight )
+	{
+		height = document.documentElement.clientHeight;
+	}
+	else if( document.body && document.body.clientHeight )
+	{
+		height = document.body.clientHeight;
+	}
+	else if( window.innerHeight )
+	{
+		height = window.innerHeight - 18;
+	}
+	
+	return height;
+}
+
+function getXscroll()
+{
+	var scrollX = 0;
+	if( document.documentElement && document.documentElement.scrollLeft )
+	{
+		scrollX = document.documentElement.scrollLeft;
+	}
+	else if( document.body && document.body.scrollLeft )
+	{
+		scrollX = document.body.scrollLeft;
+	}
+	else if( window.pageXOffset )
+	{
+		scrollX = window.pageXOffset;
+	}
+	else if( window.scrollX )
+	{
+		scrollX = window.scrollX;
+	}
+	return scrollX;
+}
+
+function getYscroll()
+{
+	var scrollY = 0;
+	if( document.documentElement && document.documentElement.scrollTop )
+	{
+		scrollY = document.documentElement.scrollTop;
+	}
+	else if( document.body && document.body.scrollTop )
+	{
+		scrollY = document.body.scrollTop;
+	}
+	else if( window.pageYOffset )
+	{
+		scrollY = window.pageYOffset;
+	}
+	else if( window.scrollY )
+	{
+		scrollY = window.scrollY;
+	}
+	return scrollY;
+}
\ No newline at end of file
diff --git a/upload/jscripts/ipb_finduser.js b/upload/jscripts/ipb_finduser.js
new file mode 100644
index 00000000..efa82801
--- /dev/null
+++ b/upload/jscripts/ipb_finduser.js
@@ -0,0 +1,75 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// Find User JS File
+// (c) 2004 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+
+
+function add_to_form()
+{
+	var name = document.finduser.username.options[document.finduser.username.selectedIndex].value;
+	
+	if (separator == 'line')
+	{
+		separator = '\n';
+	}
+	
+	if (separator == 'none')
+	{
+		separator = '';
+	}
+	
+	if (entry == 'textarea')
+	{
+		// Where shall we put the separator?
+		
+		var tbox     = eval('opener.document.REPLIER.'+in_name+'.value');
+		var tboxSize = eval('opener.document.REPLIER.'+in_name+'.value.length');
+		
+		// Remove leading spaces...
+		
+		while ( tbox.slice(0,1) == " " )
+		{
+			tbox        = tbox.substr(1, tboxSize - 1);
+			tboxSize = tboxSize;
+		}
+		
+		// Remove trailing spaces...
+		
+		while ( tbox.slice(tboxSize - 1, tboxSize) == " " )
+		{
+			tbox = tbox.substr(0, tboxSize - 1);
+			tboxSize = tboxSize;
+		}
+		
+		// Do we have a leading comma?
+		
+		while ( tbox.slice(0,1) == "\n" )
+		{
+			tbox = tbox.substr(1, tboxSize - 1);
+			tboxSize = tboxSize;
+		}
+		
+		// Do we have a trailing comma?...
+		
+		while ( tbox.slice(tboxSize - 1, tboxSize) == "\n" )
+		{
+			tbox = tbox.substr(0, tboxSize - 1);
+			tboxSize = tboxSize;
+		}
+		
+		// First in box?
+		
+		if ( tboxSize == 0)
+		{
+			eval('opener.document.REPLIER.'+in_name+'.value += name');
+		}
+		else
+		{
+			eval('opener.document.REPLIER.'+in_name+'.value += separator + name');
+		}
+	}
+}
\ No newline at end of file
diff --git a/upload/jscripts/ipb_forum.js b/upload/jscripts/ipb_forum.js
new file mode 100644
index 00000000..921e7d48
--- /dev/null
+++ b/upload/jscripts/ipb_forum.js
@@ -0,0 +1,109 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// Forums JS File
+// (c) 2004 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+
+//==========================================
+// Who posted
+//==========================================
+
+function who_posted(tid)
+{
+	window.open("index.php?act=Stats&CODE=who&t="+tid, "WhoPosted", "toolbar=no,scrollbars=yes,resizable=yes,width=230,height=300");
+}
+
+//==========================================
+// Check delete
+//==========================================
+
+function checkdelete()
+{
+	if ( ! document.modform.selectedtids.value )
+	{
+		return false;
+	}
+	
+	isDelete = document.modform.tact.options[document.modform.tact.selectedIndex].value;
+	
+	if (isDelete == 'delete')
+	{
+		formCheck = confirm( lang_suredelete );
+		
+		if (formCheck == true)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+
+//==========================================
+// Toggle selection
+//==========================================
+
+function forum_toggle_tid( tid )
+{
+	saved = new Array();
+	clean = new Array();
+	add   = 1;
+	
+	//-----------------------------------
+	// Get form info
+	//-----------------------------------
+	
+	tmp = document.modform.selectedtids.value;
+	
+	saved = tmp.split(",");
+	
+	//-----------------------------------
+	// Remove bit if exists
+	//-----------------------------------
+	
+	for( i = 0 ; i < saved.length; i++ )
+	{
+		if ( saved[i] != "" )
+		{
+			if ( saved[i] == tid )
+			{
+				 add = 0;
+			}
+			else
+			{
+				clean[clean.length] = saved[i];
+			}
+		}
+	}
+	
+	//-----------------------------------
+	// Add?
+	//-----------------------------------
+	
+	if ( add )
+	{
+		clean[ clean.length ] = tid;
+		eval("document.img"+tid+".src=selectedbutton");
+	}
+	else
+	{
+		eval(" document.img"+tid+".src=unselectedbutton");
+	}
+	
+	newvalue = clean.join(',');
+	
+	my_setcookie( 'modtids', newvalue, 0 );
+	
+	document.modform.selectedtids.value = newvalue;
+	
+	newcount = stacksize(clean);
+	
+	document.modform.gobutton.value = lang_gobutton + '(' + newcount + ')';
+	
+	return false;
+}
\ No newline at end of file
diff --git a/upload/jscripts/ipb_global.js b/upload/jscripts/ipb_global.js
new file mode 100644
index 00000000..77b3f3cf
--- /dev/null
+++ b/upload/jscripts/ipb_global.js
@@ -0,0 +1,415 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// Global JS File
+// (c) 2003 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+//==========================================
+// Set up
+//==========================================
+
+// Sniffer based on http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+
+var uagent    = navigator.userAgent.toLowerCase();
+var is_safari = ( (uagent.indexOf('safari') != -1) || (navigator.vendor == "Apple Computer, Inc.") );
+var is_ie     = ( (uagent.indexOf('msie') != -1) && (!is_opera) && (!is_safari) && (!is_webtv) );
+var is_ie4    = ( (is_ie) && (uagent.indexOf("msie 4.") != -1) );
+var is_moz    = (navigator.product == 'Gecko');
+var is_ns     = ( (uagent.indexOf('compatible') == -1) && (uagent.indexOf('mozilla') != -1) && (!is_opera) && (!is_webtv) && (!is_safari) );
+var is_ns4    = ( (is_ns) && (parseInt(navigator.appVersion) == 4) );
+var is_opera  = (uagent.indexOf('opera') != -1);
+var is_kon    = (uagent.indexOf('konqueror') != -1);
+var is_webtv  = (uagent.indexOf('webtv') != -1);
+
+var is_win    =  ( (uagent.indexOf("win") != -1) || (uagent.indexOf("16bit") !=- 1) );
+var is_mac    = ( (uagent.indexOf("mac") != -1) || (navigator.vendor == "Apple Computer, Inc.") );
+var ua_vers   = parseInt(navigator.appVersion);
+
+//==========================================
+// Get cookie
+//==========================================
+
+function my_getcookie( name )
+{
+	cname = ipb_var_cookieid + name + '=';
+	cpos  = document.cookie.indexOf( cname );
+	
+	if ( cpos != -1 )
+	{
+		cstart = cpos + cname.length;
+		cend   = document.cookie.indexOf(";", cstart);
+		
+		if (cend == -1)
+		{
+			cend = document.cookie.length;
+		}
+		
+		return unescape( document.cookie.substring(cstart, cend) );
+	}
+	
+	return null;
+}
+
+//==========================================
+// Set cookie
+//==========================================
+
+function my_setcookie( name, value, sticky )
+{
+	expire = "";
+	domain = "";
+	path   = "/";
+	
+	if ( sticky )
+	{
+		expire = "; expires=Wed, 1 Jan 2020 00:00:00 GMT";
+	}
+	
+	if ( ipb_var_cookie_domain != "" )
+	{
+		domain = '; domain=' + ipb_var_cookie_domain;
+	}
+	
+	if ( ipb_var_cookie_path != "" )
+	{
+		path = ipb_var_cookie_path;
+	}
+	
+	document.cookie = ipb_var_cookieid + name + "=" + value + "; path=" + path + expire + domain + ';';
+}
+
+//==========================================
+// Pop up MyAssistant window
+//==========================================
+
+function buddy_pop()
+{
+	window.open( ipb_var_base_url + 'act=buddy','BrowserBuddy','width=250,height=500,resizable=yes,scrollbars=yes');
+}
+
+//==========================================
+// Pop up chat window
+//==========================================
+
+function chat_pop(cw,ch)
+{
+	window.open( ipb_var_base_url + 'act=chat&pop=1','Chat','width='+cw+',height='+ch+',resizable=yes,scrollbars=yes');
+}
+
+//==========================================
+// Multi Page jumps
+//==========================================
+
+function multi_page_jump( url_bit, total_posts, per_page )
+{
+	pages = 1;
+	cur_st = ipb_var_st;
+	cur_page  = 1;
+	
+	if ( total_posts % per_page == 0 )
+	{
+		pages = total_posts / per_page;
+	}
+	else
+	{
+		pages = Math.ceil( total_posts / per_page );
+	}
+	
+	msg = ipb_lang_tpl_q1 + " " + pages;
+	
+	if ( cur_st > 0 )
+	{
+		cur_page = cur_st / per_page; cur_page = cur_page -1;
+	}
+	
+	show_page = 1;
+	
+	if ( cur_page < pages )
+	{
+		show_page = cur_page + 1;
+	}
+	
+	if ( cur_page >= pages )
+	{
+		show_page = cur_page - 1;
+	}
+ 	else
+ 	{
+ 		show_page = cur_page + 1;
+ 	}
+ 	
+	userPage = prompt( msg, show_page );
+	
+	if ( userPage > 0  )
+	{
+		if ( userPage < 1 )     {    userPage = 1;  }
+		if ( userPage > pages ) { userPage = pages; }
+		if ( userPage == 1 )    {     start = 0;    }
+		else { start = (userPage - 1) * per_page; }
+	
+		window.location = url_bit + "&st=" + start;
+	}
+}
+
+//==========================================
+// Hide / Unhide menu elements
+//==========================================
+
+function ShowHide(id1, id2)
+{
+	if (id1 != '') toggleview(id1);
+	if (id2 != '') toggleview(id2);
+}
+	
+//==========================================
+// Get element by id
+//==========================================
+
+function my_getbyid(id)
+{
+	itm = null;
+	
+	if (document.getElementById)
+	{
+		itm = document.getElementById(id);
+	}
+	else if (document.all)
+	{
+		itm = document.all[id];
+	}
+	else if (document.layers)
+	{
+		itm = document.layers[id];
+	}
+	
+	return itm;
+}
+
+//==========================================
+// Show/hide toggle
+//==========================================
+
+function toggleview(id)
+{
+	if ( ! id ) return;
+	
+	if ( itm = my_getbyid(id) )
+	{
+		if (itm.style.display == "none")
+		{
+			my_show_div(itm);
+		}
+		else
+		{
+			my_hide_div(itm);
+		}
+	}
+}
+
+//==========================================
+// Set DIV ID to hide
+//==========================================
+
+function my_hide_div(itm)
+{
+	if ( ! itm ) return;
+	
+	itm.style.display = "none";
+}
+
+//==========================================
+// Set DIV ID to show
+//==========================================
+
+function my_show_div(itm)
+{
+	if ( ! itm ) return;
+	
+	itm.style.display = "";
+}
+
+//==========================================
+// Change cell colour
+//==========================================
+
+function change_cell_color( id, cl )
+{
+	itm = my_getbyid(id);
+	
+	if ( itm )
+	{
+		itm.className = cl;
+	}
+}
+
+//==========================================
+// Toggle category
+//==========================================
+
+function togglecategory( fid, add )
+{
+	saved = new Array();
+	clean = new Array();
+
+	//-----------------------------------
+	// Get any saved info
+	//-----------------------------------
+	
+	if ( tmp = my_getcookie('collapseprefs') )
+	{
+		saved = tmp.split(",");
+	}
+	
+	//-----------------------------------
+	// Remove bit if exists
+	//-----------------------------------
+	
+	for( i = 0 ; i < saved.length; i++ )
+	{
+		if ( saved[i] != fid && saved[i] != "" )
+		{
+			clean[clean.length] = saved[i];
+		}
+	}
+	
+	//-----------------------------------
+	// Add?
+	//-----------------------------------
+	
+	if ( add )
+	{
+		clean[ clean.length ] = fid;
+		my_show_div( my_getbyid( 'fc_'+fid  ) );
+		my_hide_div( my_getbyid( 'fo_'+fid  ) );
+	}
+	else
+	{
+		my_show_div( my_getbyid( 'fo_'+fid  ) );
+		my_hide_div( my_getbyid( 'fc_'+fid  ) );
+	}
+	
+	my_setcookie( 'collapseprefs', clean.join(','), 1 );
+}
+
+//==========================================
+// locationjump
+//==========================================
+
+function locationjump(url)
+{
+	window.location = ipb_var_base_url + url;
+}
+
+//==========================================
+// CHOOSE SKIN
+//==========================================
+
+function chooseskin(obj)
+{
+	choosebox = obj.options[obj.selectedIndex].value;
+	extravars = '';
+	
+	if ( choosebox != -1 && ! isNaN( choosebox ) )
+	{
+		if ( document.skinselectorbox.skinurlbits.value )
+		{
+			extravars = '&' + document.skinselectorbox.skinurlbits.value;
+		}
+		
+		locationjump( 'setskin=1&skinid=' + choosebox + extravars );
+	}
+}
+
+//==========================================
+// CHOOSE LANG
+//==========================================
+
+function chooselang(obj)
+{
+	choosebox = obj.options[obj.selectedIndex].value;
+	extravars = '';
+	
+	if ( document.langselectorbox.langurlbits.value )
+	{
+		extravars = '&' + document.langselectorbox.langurlbits.value;
+	}
+	
+	locationjump( 'setlanguage=1&langid=' + choosebox + extravars );
+}
+
+//==========================================
+// pop up window
+//==========================================
+
+function PopUp(url, name, width,height,center,resize,scroll,posleft,postop)
+{
+	showx = "";
+	showy = "";
+	
+	if (posleft != 0) { X = posleft }
+	if (postop  != 0) { Y = postop  }
+	
+	if (!scroll) { scroll = 1 }
+	if (!resize) { resize = 1 }
+	
+	if ((parseInt (navigator.appVersion) >= 4 ) && (center))
+	{
+		X = (screen.width  - width ) / 2;
+		Y = (screen.height - height) / 2;
+	}
+	
+	if ( X > 0 )
+	{
+		showx = ',left='+X;
+	}
+	
+	if ( Y > 0 )
+	{
+		showy = ',top='+Y;
+	}
+	
+	if (scroll != 0) { scroll = 1 }
+	
+	var Win = window.open( url, name, 'width='+width+',height='+height+ showx + showy + ',resizable='+resize+',scrollbars='+scroll+',location=no,directories=no,status=no,menubar=no,toolbar=no');
+}
+
+//==========================================
+// Array: Get stack size
+//==========================================
+
+function stacksize(thearray)
+{
+	for (i = 0 ; i < thearray.length; i++ )
+	{
+		if ( (thearray[i] == "") || (thearray[i] == null) || (thearray == 'undefined') )
+		{
+			return i;
+		}
+	}
+	
+	return thearray.length;
+}
+
+//==========================================
+// Array: Push stack
+//==========================================
+
+function pushstack(thearray, newval)
+{
+	arraysize = stacksize(thearray);
+	thearray[arraysize] = newval;
+}
+
+//==========================================
+// Array: Pop stack
+//==========================================
+
+function popstack(thearray)
+{
+	arraysize = stacksize(thearray);
+	theval = thearray[arraysize - 1];
+	delete thearray[arraysize - 1];
+	return theval;
+}
\ No newline at end of file
diff --git a/upload/jscripts/ipb_pm.js b/upload/jscripts/ipb_pm.js
new file mode 100644
index 00000000..4e6ef3fa
--- /dev/null
+++ b/upload/jscripts/ipb_pm.js
@@ -0,0 +1,178 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// PM JS File
+// (c) 2003 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+//==========================================
+// Check All boxes
+//==========================================
+
+function CheckAll(fmobj)
+{
+	for (var i=0;i<fmobj.elements.length;i++)
+	{
+		var e = fmobj.elements[i];
+		if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled))
+		{
+			e.checked = fmobj.allbox.checked;
+		}
+	}
+}
+
+//==========================================
+// Check all or uncheck all?
+//==========================================
+
+function CheckCheckAll(fmobj)
+{	
+	var TotalBoxes = 0;
+	var TotalOn = 0;
+	for (var i=0;i<fmobj.elements.length;i++)
+	{
+		var e = fmobj.elements[i];
+		if ((e.name != 'allbox') && (e.type=='checkbox'))
+		{
+			TotalBoxes++;
+			if (e.checked)
+			{
+				TotalOn++;
+			}
+		}
+	}
+	
+	if (TotalBoxes==TotalOn)
+	{
+		fmobj.allbox.checked=true;
+	}
+	else
+	{
+		fmobj.allbox.checked=false;
+	}
+}
+
+//==========================================
+// INBOX FUNCTIONS
+//==========================================
+
+var ie  = document.all  ? 1 : 0;
+//var ns4 = document.layers ? 1 : 0;
+
+//==========================================
+// highlite
+//==========================================
+
+function hl(cb)
+{
+	if (ie)
+	{ 
+		while (cb.tagName != "TR")
+		{
+			cb = cb.parentElement;
+		}
+	}
+	else
+	{
+		 while (cb.tagName != "TD")
+		 {
+			 cb = cb.parentNode;
+		 }
+	}
+		 
+	cb.className = 'row1';
+   
+}
+
+//==========================================
+// down-lite
+//==========================================
+
+function dl(cb)
+{
+   if (ie)
+   {
+	   while (cb.tagName != "TR")
+	   {
+		   cb = cb.parentElement;
+	   }
+   }
+   else
+   {
+	   while (cb.tagName != "TD")
+	   {
+		   cb = cb.parentNode;
+	   }
+   }
+   cb.className = 'row2';
+}
+
+//==========================================
+// Boxes checked?
+//==========================================
+
+function cca(cb)
+{
+   if (cb.checked)
+   {
+	   hl(cb);
+   }
+   else
+   {
+	   dl(cb);
+   }
+}
+
+//==========================================
+// Inbox check all
+//==========================================
+
+function InboxCheckAll(cb)
+{
+	var fmobj = document.mutliact;
+	for (var i=0;i<fmobj.elements.length;i++)
+	{
+		var e = fmobj.elements[i];
+		if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled))
+		{
+			e.checked = fmobj.allbox.checked;
+			if (fmobj.allbox.checked)
+			{
+			   hl(e);
+			}
+			else
+			{
+			   dl(e);
+			}
+		}
+	}
+}
+
+function select_read()
+{	
+	var fmobj = document.mutliact;
+	for (var i=0;i<fmobj.elements.length;i++)
+	{
+		var e = fmobj.elements[i];
+		if ((e.type=='hidden') && (e.value == 1) && (! isNaN(e.name) ))
+		{
+			eval("fmobj.msgid_" + e.name + ".checked=true;");
+			hl(e);
+		}
+	}
+}
+
+function unselect_all()
+{	
+	var fmobj = document.mutliact;
+	for (var i=0;i<fmobj.elements.length;i++)
+	{
+		var e = fmobj.elements[i];
+		if (e.type=='checkbox')
+		{
+			e.checked=false;
+			dl(e);
+		}
+	}
+}
diff --git a/upload/jscripts/ipb_register.js b/upload/jscripts/ipb_register.js
new file mode 100644
index 00000000..e10c348a
--- /dev/null
+++ b/upload/jscripts/ipb_register.js
@@ -0,0 +1,40 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// Register JS File
+// (c) 2004 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+
+
+function Validate()
+{
+	//------------------------------------------
+	// Check for Empty fields
+	//------------------------------------------
+	
+	if (document.REG.UserName.value == "" || document.REG.PassWord.value == "" || document.REG.PassWord_Check.value == "" || document.REG.EmailAddress.value == "")
+	{
+		alert ( ipb_lang_js_blanks );
+		return false;
+	}
+}
+
+function get_more_info()
+{
+	var chosenid = document.REG.subspackage.options[document.REG.subspackage.selectedIndex].value;
+	
+	if ( ! chosenid )
+	{
+		chosenid = 0;
+	}
+	
+	//------------------------------------------
+	// Toggle view...
+	//------------------------------------------
+	
+	eval("document.REG.pkdesc.value=subsdesc_"+chosenid);
+	
+	toggleview('subspkdiv');
+}
\ No newline at end of file
diff --git a/upload/jscripts/ipb_topic.js b/upload/jscripts/ipb_topic.js
new file mode 100644
index 00000000..a148c213
--- /dev/null
+++ b/upload/jscripts/ipb_topic.js
@@ -0,0 +1,192 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// Topics JS File
+// (c) 2003 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+//==========================================
+// Link to a post
+//==========================================
+
+function link_to_post(pid)
+{
+	temp = prompt( ipb_lang_tt_prompt, ipb_var_base_url + "showtopic=" + ipb_input_t + "&view=findpost&p=" + pid );
+	return false;
+}
+
+//==========================================
+// Delete post
+//==========================================
+
+function delete_post(theURL)
+{
+	if (confirm( ipb_lang_js_del_1 ))
+	{
+		window.location.href=theURL;
+	}
+	else
+	{
+		alert ( ipb_lang_js_del_2 );
+	} 
+}
+
+//==========================================
+// Multi quote
+//==========================================
+
+function multiquote_add(id)
+{
+	saved = new Array();
+	clean = new Array();
+	add   = 1;
+	
+	//-----------------------------------
+	// Get any saved info
+	//-----------------------------------
+	
+	if ( tmp = my_getcookie('mqtids') )
+	{
+		saved = tmp.split(",");
+	}
+	
+	//-----------------------------------
+	// Remove bit if exists
+	//-----------------------------------
+	
+	for( i = 0 ; i < saved.length; i++ )
+	{
+		if ( saved[i] != "" )
+		{
+			if ( saved[i] == id )
+			{
+				 add = 0;
+			}
+			else
+			{
+				clean[clean.length] = saved[i];
+			}
+		}
+	}
+	
+	//-----------------------------------
+	// Add?
+	//-----------------------------------
+	
+	if ( add )
+	{
+		clean[ clean.length ] = id;
+		eval("document.mad_"+id+".src=removequotebutton");
+	}
+	else
+	{
+		eval(" document.mad_"+id+".src=addquotebutton");
+	}
+	
+	my_setcookie( 'mqtids', clean.join(','), 0 );
+	
+	return false;
+}
+
+//==========================================
+// Check delete
+//==========================================
+
+function checkdelete()
+{
+	if ( ! document.modform.selectedpids.value )
+	{
+		return false;
+	}
+	
+	isDelete = document.modform.tact.options[document.modform.tact.selectedIndex].value;
+	
+	if (isDelete == 'delete')
+	{
+		formCheck = confirm( lang_suredelete );
+		
+		if (formCheck == true)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+
+
+//==========================================
+// Toggle selection
+//==========================================
+
+function topic_toggle_pid( pid )
+{
+	//-----------------------------------
+	// Got a number?
+	//-----------------------------------
+	
+	if ( isNaN( pid ) )
+	{
+		return false;
+	}
+	
+	saved = new Array();
+	clean = new Array();
+	add   = 1;
+	
+	//-----------------------------------
+	// Get form info
+	//-----------------------------------
+	
+	tmp = document.modform.selectedpids.value;
+	
+	saved = tmp.split(",");
+	
+	//-----------------------------------
+	// Remove bit if exists
+	//-----------------------------------
+	
+	for( i = 0 ; i < saved.length; i++ )
+	{
+		if ( saved[i] != "" )
+		{
+			if ( saved[i] == pid )
+			{
+				 add = 0;
+			}
+			else
+			{
+				clean[clean.length] = saved[i];
+			}
+		}
+	}
+	
+	//-----------------------------------
+	// Add?
+	//-----------------------------------
+	
+	if ( add )
+	{
+		clean[ clean.length ] = pid;
+		eval("document.img"+pid+".src=selectedbutton");
+	}
+	else
+	{
+		eval(" document.img"+pid+".src=unselectedbutton");
+	}
+	
+	newvalue = clean.join(',');
+	
+	my_setcookie( 'modpids', newvalue, 0 );
+	
+	document.modform.selectedpids.value = newvalue;
+	
+	newcount = stacksize(clean);
+	
+	document.modform.gobutton.value = lang_gobutton + ' (' + newcount + ')';
+	
+	return false;
+}
\ No newline at end of file
diff --git a/upload/lang/en/lang_boards.php b/upload/lang/en/lang_boards.php
index 9ad9f5ec..7729f764 100644
--- a/upload/lang/en/lang_boards.php
+++ b/upload/lang/en/lang_boards.php
@@ -2,6 +2,13 @@
 
 $lang = array (
 
+// added in 2.0
+
+'enter_search_words' => "Enter words to search...",
+'sub_forum_title' => "Subforums",
+
+//
+
 'whoschatting_total' => "Members Talking in",
 'whoschatting_loadchat' => "Live Chat",
 'whoschatting_none'  => "There are no members talking in live chat at the moment",
@@ -24,7 +31,7 @@ by					=>	"By",
 
 'newslink'           => "latest news: ",
 
-'welcome_back_text'  => "Welcome back; your last visit was on",
+'welcome_back_text'  => "Welcome back; your last visit was",
 
 'sm_today_posters'   => "Today's top 10 posters",
 'sm_all_posters'     => "Overall top 10 posters",
diff --git a/upload/lang/en/lang_calendar.php b/upload/lang/en/lang_calendar.php
index baf7c398..c04c886d 100644
--- a/upload/lang/en/lang_calendar.php
+++ b/upload/lang/en/lang_calendar.php
@@ -2,6 +2,10 @@
 
 $lang = array (
 
+'bd_birthday'      => "'s Birthday",
+'aa_add_new_event' => "Add New Event",
+'aa_cur_month'     => "View Current Month",
+'aa_view_week'     => "View Current Week",
 // 1.2
 
 'fv_single' => "Event On/Starts",
diff --git a/upload/lang/en/email_content.php b/upload/lang/en/lang_email_content.php
similarity index 65%
rename from upload/lang/en/email_content.php
rename to upload/lang/en/lang_email_content.php
index a5a2f109..364b3f98 100644
--- a/upload/lang/en/email_content.php
+++ b/upload/lang/en/lang_email_content.php
@@ -2,9 +2,9 @@
 
 //----- SET UP CUSTOM HEADERS AND FOOTERS HERE --//
 
-$EMAIL['header'] = "";
+$lang['header'] = "";
 
-$EMAIL['footer'] = <<<EOF
+$lang['footer'] = <<<EOF
 
 Regards,
 
@@ -13,8 +13,15 @@ The <#BOARD_NAME#> team.
 
 EOF;
 
-$SUBJECT['new_topic_queue_notify'] = 'New Topic Awaiting Approval';
-$EMAIL['new_topic_queue_notify'] = <<<EOF
+
+
+//-------------------------------
+// NEW MOD __TOPIC__
+//-------------------------------
+
+
+$lang['subject__new_topic_queue_notify'] = 'New Topic Awaiting Approval';
+$lang['new_topic_queue_notify'] = <<<EOF
 Hello!
 
 This email has been sent from: <#BOARD_NAME#>.
@@ -38,10 +45,172 @@ removing your email address from the forum settings options.
 
 EOF;
 
+//-------------------------------
+// NEW MOD __POST__
+//-------------------------------
 
 
-$SUBJECT['pm_notify'] = 'You have a new personal message';
-$EMAIL['pm_notify'] = <<<EOF
+$lang['subject__new_post_queue_notify'] = 'New Post Awaiting Approval';
+$lang['new_post_queue_notify'] = <<<EOF
+Hello!
+
+This email has been sent from: <#BOARD_NAME#>.
+
+A new post has been entered into the moderation queue and is awaiting
+approval.
+
+----------------------------------
+Topic: <#TOPIC#>
+Forum: <#FORUM#>
+Author: <#POSTER#>
+Time: <#DATE#>
+Manage Queue: <#LINK#>
+----------------------------------
+
+If you no longer require notification, you can stop these emails by simply
+removing your email address from the forum settings options.
+
+<#BOARD_ADDRESS#>
+
+
+EOF;
+
+//-------------------------------
+// FORUM: WEEKLY
+//-------------------------------
+
+
+$lang['subject__digest_forum_weeky'] = 'Your weekly new topics digest';
+$lang['digest_forum_weeky'] = <<<EOF
+<#NAME#>,
+
+This is the digest of posts in topic "<#TITLE#>" for this week.
+
+----------------------------------------------------------------------
+
+
+
+<#CONTENT#>
+
+
+
+
+----------------------------------------------------------------------
+
+The topic can be found here:
+<#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
+
+Unsubscribing:
+--------------
+
+You can unsubscribe at any time by logging into your control panel and clicking on the "View Subscriptions" link.
+
+EOF;
+
+//-------------------------------
+// FORUM: DAILY
+//-------------------------------
+
+
+$lang['subject__digest_forum_daily'] = 'Your daily new topics digest';
+$lang['digest_forum_daily'] = <<<EOF
+<#NAME#>,
+
+This your daily new topics digest!
+
+----------------------------------------------------------------------
+
+
+
+<#CONTENT#>
+
+
+
+
+----------------------------------------------------------------------
+
+The forum can be found here:
+<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
+
+Unsubscribing:
+--------------
+
+You can unsubscribe at any time by logging into your control panel and clicking on the "View Subscriptions" link.
+
+EOF;
+
+
+//-------------------------------
+// TOPIC: WEEKLY
+//-------------------------------
+
+
+$lang['subject__digest_topic_weeky'] = 'Your weekly new posts digest';
+$lang['digest_topic_weeky'] = <<<EOF
+<#NAME#>,
+
+This your weekly new topics digest!
+
+----------------------------------------------------------------------
+
+
+
+<#CONTENT#>
+
+
+
+
+----------------------------------------------------------------------
+
+The forum can be found here:
+<#BOARD_ADDRESS#>?showforum=<#FORUM_ID#>
+
+Unsubscribing:
+--------------
+
+You can unsubscribe at any time by logging into your control panel and clicking on the "View Subscriptions" link.
+
+EOF;
+
+//-------------------------------
+// TOPIC: DAILY
+//-------------------------------
+
+
+$lang['subject__digest_topic_daily'] = 'Your daily new posts digest';
+$lang['digest_topic_daily'] = <<<EOF
+<#NAME#>,
+
+This is the digest of posts in topic "<#TITLE#>" for today.
+
+----------------------------------------------------------------------
+
+
+
+<#CONTENT#>
+
+
+
+
+----------------------------------------------------------------------
+
+The topic can be found here:
+<#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>&view=getnewpost
+
+Unsubscribing:
+--------------
+
+You can unsubscribe at any time by logging into your control panel and clicking on the "View Subscriptions" link.
+
+EOF;
+
+
+
+//----------
+
+
+$lang['subject__pm_notify'] = 'You have a new personal message';
+$lang['pm_notify'] = <<<EOF
 <#NAME#>,
 
 <#POSTER#> has sent you a new personal message entitled "<#TITLE#>".
@@ -55,7 +224,7 @@ EOF;
 
 
 
-$EMAIL['send_text']	= <<<EOF
+$lang['send_text']	= <<<EOF
 I thought you might be interested in reading this web page: <#THE LINK#>
 
 From,
@@ -65,11 +234,11 @@ From,
 EOF;
 
 
-$EMAIL['report_post'] = <<<EOF
+$lang['report_post'] = <<<EOF
 
 <#MOD_NAME#>,
 
-You have been sent this email from <#USERNAME#> via the "Report this post to a moderator" link.
+You have been sent this communication from <#USERNAME#> via the "Report this post to a moderator" link.
 
 ------------------------------------------------
 Topic: <#TOPIC#>
@@ -86,7 +255,7 @@ EOF;
 
 
 
-$EMAIL['pm_archive'] = <<<EOF
+$lang['pm_archive'] = <<<EOF
 
 <#NAME#>,
 This email has been sent from <#BOARD_ADDRESS#>.
@@ -96,7 +265,7 @@ file and has been attached to this message.
 
 EOF;
 
-$EMAIL['reg_validate'] = <<<EOF
+$lang['reg_validate'] = <<<EOF
 
 <#NAME#>,
 This email has been sent from <#BOARD_ADDRESS#>.
@@ -147,7 +316,7 @@ Thank you for registering and enjoy your stay!
 
 EOF;
 
-$EMAIL['admin_newuser'] = <<<EOF
+$lang['admin_newuser'] = <<<EOF
 
 Hello Mr. Admin Sir!
 
@@ -161,7 +330,7 @@ Have a super day!
 
 EOF;
 
-$EMAIL['lost_pass'] = <<<EOF
+$lang['lost_pass'] = <<<EOF
 
 <#NAME#>,
 This email has been sent from <#BOARD_ADDRESS#>.
@@ -223,7 +392,7 @@ IP address of sender: <#IP_ADDRESS#>
 
 EOF;
 
-$EMAIL['newemail'] = <<<EOF
+$lang['newemail'] = <<<EOF
 
 <#NAME#>,
 This email has been sent from <#BOARD_ADDRESS#>.
@@ -279,7 +448,7 @@ If the error persists, please contact an administrator to rectify the problem.
 
 EOF;
 
-$EMAIL['forward_page'] = <<<EOF
+$lang['forward_page'] = <<<EOF
 
 <#TO_NAME#>
 
@@ -293,9 +462,9 @@ contents of this message.
 
 EOF;
 
-$SUBJECT['subs_with_post'] = 'Topic Subscription Reply Notification';
+$lang['subject__subs_with_post'] = 'Topic Subscription Reply Notification';
 
-$EMAIL['subs_with_post'] = <<<EOF
+$lang['subs_with_post'] = <<<EOF
 <#NAME#>,
 
 <#POSTER#> has just posted a reply to a topic that you have subscribed to titled "<#TITLE#>".
@@ -319,12 +488,16 @@ You can unsubscribe at any time by logging into your control panel and clicking
 
 EOF;
 
-$SUBJECT['subs_new_topic'] = 'Forum Subscription New Topic Notification';
-$EMAIL['subs_new_topic'] = <<<EOF
+$lang['subject__subs_new_topic'] = 'Forum Subscription New Topic Notification';
+$lang['subs_new_topic'] = <<<EOF
 <#NAME#>,
 
 <#POSTER#> has just posted a new topic entitled "<#TITLE#>" in forum "<#FORUM#>".
 
+----------------------------------------------------------------------
+<#POST#>
+----------------------------------------------------------------------
+
 The topic can be found here:
 <#BOARD_ADDRESS#>?showtopic=<#TOPIC_ID#>
 
@@ -337,11 +510,13 @@ Unsubscribing:
 --------------
 
 You can unsubscribe at any time by logging into your control panel and clicking on the "View Subscriptions" link.
+If you are not subscribed to any forums and wish to stop receiving notification, uncheck the setting
+"Send me any updates sent by the board administrator" found in 'My Controls' under 'Email Settings'.
 
 EOF;
 
-$SUBJECT['subs_no_post'] = 'Topic Subscription Reply Notification';
-$EMAIL['subs_no_post'] = <<<EOF
+$lang['subject__subs_no_post'] = 'Topic Subscription Reply Notification';
+$lang['subs_no_post'] = <<<EOF
 <#NAME#>,
 
 <#POSTER#> has just posted a reply to a topic that you have subscribed to titled "<#TITLE#>".
@@ -361,7 +536,7 @@ EOF;
 
 
 
-$EMAIL['email_member'] = <<<EOF
+$lang['email_member'] = <<<EOF
 <#MEMBER_NAME#>,
 
 <#FROM_NAME#> has sent you this email from <#BOARD_ADDRESS#>.
@@ -377,7 +552,7 @@ contents of this message.
 
 EOF;
 
-$EMAIL['complete_reg'] = <<<EOF
+$lang['complete_reg'] = <<<EOF
 
 Success!
 
diff --git a/upload/lang/en/lang_error.php b/upload/lang/en/lang_error.php
index 3eeb1c28..1a261930 100644
--- a/upload/lang/en/lang_error.php
+++ b/upload/lang/en/lang_error.php
@@ -2,6 +2,18 @@
 
 $lang = array (
 
+// 2.0
+
+'erl_email'   => 'Your email address',
+
+'reg_no_agree'         => "You did not click the 'I agree' checkbox. If you do agree to the terms and conditions, please ensure you check the box before continuing. If you do not agree to the terms and conditions, please click <a href='<#EXTRA#>'>here</a> to cancel.",
+
+'no_upload_permission' => "You do not have permission to upload files",
+
+
+//
+
+
 // added in 1.2.1
 
 'banned_email' => "Sorry, you are not allowed to use that email address for your account. Please use another email address.",
@@ -76,7 +88,7 @@ $lang = array (
 'no_name_search_results' => "The member name you chose to filter by cannot be found, please go back and try again.",
 
 
-'split_not_enough' => "You must choose at least one post to split!",
+'split_not_enough' => "You must choose at least one post to split or move!",
 
 'mt_no_topic'  => "We could not find a topic in the database that matches the URL you entered, please try again and double check the information entered",
 'mt_same_topic' => "You cannot merge the same topic, that's just silly",
@@ -244,7 +256,7 @@ no_email_stored					=>	"Sorry, but we could not find that email address in our r
 topictitle_too_long					=>	"The topic title you entered is too long",
 no_such_msg					=>	"That message does not exist",
 wrong_name					=>	"Sorry, we could not find a membername matching your input (this could have been from a log in form, or a session authentication).",
-too_many_emoticons					=>	"You have posted a message with more emoticons that this board allows. Please reduce the number of emoticons you've added to the message",
+too_many_emoticons					=>	"You have posted a message with more emoticons than this board allows. Please reduce the number of emoticons you've added to the message",
 no_topic_title					=>	"You must enter a topic title",
 guest_abuse					=>	"We could not determine your posting status. Please try logging back in, or if you are a guest - please try again",
 password_no_match					=>	"The password is not the same as the data entered",
@@ -254,7 +266,7 @@ no_permission					=>	"Sorry, but you do not have permission to use this feature.
 server_too_busy					=>	"Sorry, the server is too busy to handle your request, please try again in a moment",
 loc_too_long					=>	"Your Location entry is too long.",
 poll_you_created					=>	"You created this poll",
-no_usepm_member					=>	"This message can not be sent because the recipient does not have permission to use the personal messenger.",
+no_usepm_member					=>	"This message can not be sent because the recipient does not have permission to use the personal messenger or their personal messenger inbox is full.",
 go_back					=>	"Please go back and correct this error",
 log_in_no					=>	"You are NOT logged in",
 pass_too_short					=>	"The password entered was too short",
diff --git a/upload/lang/en/lang_forum.php b/upload/lang/en/lang_forum.php
index 04de5424..1e82958b 100644
--- a/upload/lang/en/lang_forum.php
+++ b/upload/lang/en/lang_forum.php
@@ -2,14 +2,43 @@
 
 $lang = array (
 
+'announce_row'         => "Announcement",
+'mod_showallinvisible' => 'Show All Invisible Topics',
+'mod_showallposts'     => 'Show All Topics With Invisible Posts',
+'mod_resync'           => 'Resynchronize Forum',
+'mod_prune'            => 'Prune / Mass Move',
+
+'click_for_mod' => 'Click to select this topic for bulk moderation',
+
+'back_to_forum' => 'Return to the forum',
+'cpt_close'     => "Close Topics",
+'cpt_open'      => "Open Topics",
+'cpt_pin'       => "Pin Topics",
+'cpt_unpin'     => "Unpin Topics",
+'cpt_move'      => "Move Topics",
+'cpt_delete'    => "Delete Topics",
+'cpt_merge'     => "Merge Topics",
+'cpt_approve'   => "Set Visible (Approve)",
+'cpt_unapprove' => "Set Invisible (Unapprove)",
+'f_go'      => "With Selected",
+'cp_js_delete'  => "Are you sure you wish to delete these topics?",
+'mm_title'  => "Multi Moderation",
+'topic_attach' => 'attachment(s): View',
+'attach_title' => 'Attachment',
+'attach_size'  => 'Size',
+'attach_post'  => 'Post #',
+'attach_page_title' => "Attachments",
+'attach_post_date' => 'Posted on',
+
 //1.2
 
-'post_modq'  => "This forum has topics/posts awaiting moderation.",
-'post_click' => "Go to your Mod CP?",
+//'post_modq'  => "This forum has topics/posts awaiting moderation.",
+//'post_click' => "Go to your Mod CP?",
 //---
 
 'pinned_start' => "Important Topics",
 'regular_topics' => "Forum Topics",
+'announce_start' => "Announcements",
 
 'ft_title'  => "Subscribe to this forum",
 
@@ -19,11 +48,24 @@ $lang = array (
 
 
 'enter_keywords' => "Enter Keywords",
-'search_forum'   => "Search this forum:",
-'search_go'      => "Go",
+'search_forum'   => "Search forum",
+
+
+pm_open_new					=>	"New Replies",
+pm_open_no					=>	"No New Replies",
+
+
+pm_hot_no					=>	"Hot Topic (No New)",
+pm_hot_new					=>	"Hot Topic (New)",
+
+pm_poll					    =>	"Poll (New)",
+pm_poll_no					=>	"Poll (No New)",
+
+pm_locked					=>	"Locked Topic",
+pm_moved					=>	"Moved Topic",
+
+last_post_by					=>	"Last post by:",
 
-last_post_by					=>	"Last Post by:",
-pm_open_new					=>	"Open Topic (new replies)",
 h_topic_title					=>	"Topic Title",
 last_updated					=>	"Last Updated:",
 logged_in					=>	"You have been authorised to access this forum",
@@ -32,49 +74,71 @@ re_order_forum					=>	"Reorder this forum",
 h_last_action					=>	"Last Action",
 no_topics					=>	"No topics were found. This is either because there are no topics in this forum, or the topics are older than the current age cut-off.",
 topic_sp_pages					=>	"Pages",
-pm_hot_new					=>	"Hot Topic (new replies)",
-show_25_days					=>	"the last 25 days",
-mark_as_read					=>	"Mark this forum as read",
-show_20_days					=>	"the last 20 days",
 
-sort_by_date					=>	"last post date",
-sort_by_last_poster					=>	"last poster",
-pm_open_no					=>	"Open Topic (no new replies)",
-single_page_forum					=>	"&nbsp;",
+
+mark_as_read					=>	"Mark this forum as read",
+
+show_today					=>	"From: Today",
+show_5_days					=>	"From: 5 days",
+show_15_days				=>	"From: 15 days",
+show_25_days				=>	"From: 25 days",
+show_20_days				=>	"From: 20 days",
+show_10_days				=>	"From: 10 days",
+show_60_days				=>	"From: 60 days",
+show_30_days				=>	"From: 30 days",
+show_90_days				=>	"From: 90 days",
+show_year					=>	"From: 365 days",
+show_all					=>	"Show All",
+show_7_days					=>	"From: 7 days",
+
+
+sort_by_date				    =>	"Order: Last Post",
+sort_by_last_poster				=>	"Order: Last Poster",
+sort_by_poster					=>	"Order: Topic Starter",
+sort_by_replies					=>	"Order: Replies",
+sort_by_topic					=>	"Order: Topic Title",
+sort_by_start					=>	"Order: Topic Started",
+sort_by_attach					=>  "Order: Attachments",
+sort_by_views					=>	"Order: Views",
+
+descending_order				=>	"Z-A",
+ascending_order					=>	"A-Z",
+
+'topicfilter_all'               => 'Topics: All',
+'topicfilter_open'              => 'Topics: Open',
+'topicfilter_hot'               => 'Topics: Hot',
+'topicfilter_poll'              => 'Topics: Polls',
+'topicfilter_locked'            => 'Topics: Locked',
+'topicfilter_moved'             => 'Topics: Moved',
+'topicfilter_istarted'          => 'Topics: I Started',
+'topicfilter_ireplied'          => 'Topics: I Replied',
+
+
+single_page_forum			   =>	"&nbsp;",
 h_topic_starter					=>	"Topic Starter",
-f_pass_submit					=>	"Check my authorisation",
-sort_text					=>	"sorted by <#SORT_KEY_HTML#> in <#ORDER_HTML#> from <#PRUNE_HTML#>",
-sort_by_views					=>	"number of views",
+f_pass_submit					=>	"PROCEED",
+
 enter_pass					=>	"Forum Password",
-show_all					=>	"the beginning",
-showing_text					=>	"Showing <#MATCHED_TOPICS#> of <#TOTAL_TOPICS#> topics ",
-pm_locked					=>	"Locked Topic",
-pm_moved					=>	"Moved Topic",
+
+
 need_password					=>	"Please enter the Forum Password",
-show_year					=>	"the last year",
-need_password_txt					=>	"This forum is protected by a password. Please do not attempt to enter a password unless you are authorised. All failed attempts are logged and you may have your posting rights removed upon repetitive failure.<br /><br />Please ensure that your browser is capable of storing temporary cookies",
-show_90_days					=>	"the last 90 days",
-back_to_forum					=>	"Go back to the forum",
-pm_poll					=>	"Poll (new votes)",
-pm_hot_no					=>	"Hot Topic (no new replies)",
-show_today					=>	"today",
-show_15_days					=>	"the last 15 days",
+
+need_password_txt					=>	"<b>This forum is protected by a password!</b><br/ >You must enter the correct forum password to gain access to this forum. Please ensure that your browser is capable of storing temporary cookies",
+
+
+
 topic_started_on					=>	"This topic was started:",
-show_10_days					=>	"the last 10 days",
-sort_by_poster					=>	"topic starter",
-show_60_days					=>	"the last 60 days",
-pm_poll_no					=>	"Poll (no new votes)",
-show_5_days					=>	"the last 5 days",
+
+
+
 h_replies					=>	"Replies",
-sort_by_replies					=>	"number of replies",
+
 multi_page_forum					=>	"Pages:",
 h_hits					=>	"Views",
-show_30_days					=>	"the last 30 days",
-descending_order					=>	"descending order",
-ascending_order					=>	"ascending order",
-sort_submit					=>	"Go!",
-show_7_days					=>	"the last week",
-sort_by_topic					=>	"topic title",
-sort_by_start					=>	"topic start date",
+
+
+sort_submit					=>	"Go",
+
+
 );
 ?>
\ No newline at end of file
diff --git a/upload/lang/en/lang_global.php b/upload/lang/en/lang_global.php
index ffaab55e..0a41af06 100644
--- a/upload/lang/en/lang_global.php
+++ b/upload/lang/en/lang_global.php
@@ -2,6 +2,32 @@
 
 $lang = array (
 
+
+//2.0
+
+'pmp_title' => "You have a new personal message from",
+'pmp_read_in_window' => "Read in this window",
+'pmp_read_new_window' => 'Read in a new window',
+'pmp_part1' => 'is a member of the',
+'pmp_part2' => 'group and has',
+'pmp_part3' => 'posts.',
+
+'global_lofi' => "Lo-Fi Version",
+'global_timeisnow' => "Time is now",
+'global_skinselector' => "Skin Selector",
+'global_language'     => "Language",
+'gallery'    => "Gallery",
+'time_today' => "Today",
+'time_yesterday' => "Yesterday",
+'tpl_gotolast' => 'Go to last page',
+'tpl_gotofirst' => 'Go to first page',
+'tpl_next' => "Next page",
+'tpl_prev' => "Previous Page",
+'resend_val' => 'Resend Validation',
+'email_address' => 'Email Address',
+
+///
+
 //rc1
 
 'fj_redirect' => " (Redirect Forum)",
@@ -11,7 +37,7 @@ $lang = array (
 
 'tpl_jump'       => "Jump to page...",
 'tpl_q1'         => "Please enter a page number to jump to between 1 and",
-'tpl_pages'      => "Pages:",
+'tpl_pages'      => "Pages",
 
 'sf_bytes' => "bytes",
 'sf_mb'    => "mb",
diff --git a/upload/lang/en/lang_help.php b/upload/lang/en/lang_help.php
index 241e82dc..c89e5a06 100644
--- a/upload/lang/en/lang_help.php
+++ b/upload/lang/en/lang_help.php
@@ -1,18 +1,17 @@
 <?php
 
-$lang = array (
 
-topic_text					=>	"Here is the topic you chose to view",
-results_title					=>	"Your Help Search Results",
-choose_file					=>	"Choose a topic",
-help_txt					=>	"Welcome to the help database.<br /><br />Simply choose from one of the titles to learn more about how this board works. Or, simply search for help files",
-submit					=>	"Search!",
-search_txt					=>	"Enter keywords to search for",
-search_results					=>	"Search Results",
-results_txt					=>	"Here are the results of the search you performed.",
-help_topics					=>	"Help Topics",
-no_results					=>	"Sorry, we could not find any help topics that matched your search criteria, please try again",
-help_topic					=>	"Help Topic",
-page_title					=>	"Help Files",
-);
+$lang['topic_text']  = "Here is the topic you chose to view";
+$lang['results_title']  = "Your Help Search Results";
+$lang['choose_file']  = "Choose a Topic";
+$lang['help_txt']  = "Choose a topic from the list, or search for a topic";
+$lang['submit']  = "Search!";
+$lang['search_txt']  = "Enter keywords to search for";
+$lang['search_results']  = "Search Results";
+$lang['results_txt']  = "Here are the results of the search you performed.";
+$lang['help_topics']  = "Help Topics";
+$lang['no_results']  = "Sorry, we could not find any help topics that matched your search criteria, please try again";
+$lang['help_topic']  = "Help Topic";
+$lang['page_title']  = "Search Help Topics";
+
 ?>
\ No newline at end of file
diff --git a/upload/lang/en/lang_login.php b/upload/lang/en/lang_login.php
index 54c480df..954a6841 100644
--- a/upload/lang/en/lang_login.php
+++ b/upload/lang/en/lang_login.php
@@ -14,11 +14,13 @@ $lang = array (
 'pass_log_in' => "Your password change has been approved, returning you to the board index",
 'pass_not_log_in' => "Your password change has been approved, taking you to the log in form",
 
+'need_validation' => "Sorry, you have not validated your account yet.<br />Please check your email for the validation information before attempting to log in.<br /><strong><a href='index.php?act=reg&CODE=reval'>Resend the validation email</a></strong>",
+
 
 login_text => "You must already have registered for an account before you can log in.<br />If you do not have an account, you may register by clicking the 'register' link near the top of the screen",
 
 force_login					=>	"The board administrator requires that all members log in before viewing the board",
-wrong_name					=>	"Sorry, we could not find a member called <#NAME#>, are you sure it's correct?",
+wrong_name					=>	"Sorry, we could not find a member using those log in details.",
 please_log_in					=>	"Please enter your details below to log in",
 cookie_no					=>	"No",
 
@@ -26,7 +28,7 @@ options					=>	"Options",
 wrong_pass					=>	"Sorry, the password was wrong. All passwords are case sensitive",
 admin_force_log_in					=>	"The board administrator requires all members to log in",
 log_in_submit					=>	"Log me in",
-anon_name					=>	"Don't add me to the active users list",
+
 add_name					=>	"Yes, add my name to the active users list",
 errors_found					=>	"The following errors were found:",
 thanks_for_logout					=>	"You are now logged out",
@@ -36,11 +38,17 @@ forgot_pass					=>	"I've forgotten my password!",
 thanks_for_login					=>	"you are now logged in as:",
 
 log_out					=>	"Log Out",
-enter_name					=>	"Please enter your name",
 
-cookies					=>	"<b>Remember me?</b><br />If enabled, you will be automatically logged in again when you visit.<br />This is not recommended for shared computers.",
+enter_name					=>	"Enter your user name",
+enter_pass					=>	"Enter your password",
+'enter_email'               =>  "Enter your email address",
+
+'rememberme'					=>	"Remember me?",
+'notrecommended' => "This is not recommended for shared computers",
+'form_invisible' => "Log in as invisible",
+'anon_name'					=>	"Don't add me to the active users list",
+
 
-enter_pass					=>	"Please enter your password",
 pass_link					=>	"Click here!",
 
 privacy					=>	"<b>Privacy</b>, do you want to appear on the active users list?",
diff --git a/upload/lang/en/lang_mlist.php b/upload/lang/en/lang_mlist.php
index 2d161137..c15610a5 100644
--- a/upload/lang/en/lang_mlist.php
+++ b/upload/lang/en/lang_mlist.php
@@ -2,25 +2,56 @@
 
 $lang = array (
 
+'button_quickjump' => 'Name begins with...',
+'toggle_more'      => 'Toggle More Options...',
+'s_aim'   => 'AIM Identity contains',
+'s_yahoo' => 'Yahoo! Identity contains',
+'s_icq'   => 'ICQ Number contains',
+'s_msn'   => 'MSN Identity contains',
+
+'s_posts'     => 'Post count is',
+'s_joined'    => 'Join date is',
+'s_lastpost'  => 'Last post is',
+'s_lastvisit' => 'Last visit is',
+
+'photo_only' => "Members with a photo only?",
+
+'s_signature' => 'Signature contains',
+
+
+'s_homepage'  => 'Home page contains',
+
+'s_name'     => 'Member name',
+
+
+
+'s_dateformat' => '(MM-DD-YYYY)',
+'title_search' => "Search and Filter Options",
+'title_messengers' => 'Messengers',
+'title_date'   => 'Post & Date Ranges',
+'title_options' => "Additional Options",
+'s_morethan' => 'more than',
+'s_lessthan' => 'less than',
+'s_begins'     => "begins with",
+'s_contains'   => "contains",
+'s_any'       => 'Any...',
 //added 1.2
 
 'member_photo'  => "Photo",
 
-'ch_begins'     => "Name begins with",
-'ch_contains'   => "Name contains",
-'ch_all'        => "Search All Available",
+
 'qs_go'         => "Go!",
 'pages'         => "Pages:",
-'photo_only' => "Show matches with photo only?",
+'no_results'    => 'No Results',
 
 
 
 member_group					=>	"Group",
-member_aol					=>	"AOL",
+
 sort_by_name					=>	"Member Name",
 member_joined					=>	"Joined",
-member_icq					=>	"ICQ",
-sorting_text					=>	"Showing <#FILTER#> by <#SORT_KEY#> in <#SORT_ORDER#> with <#MAX_RESULTS#> results per page",
+
+sorting_text					=>	"<#FILTER#> by <#SORT_KEY#> in <#SORT_ORDER#> with <#MAX_RESULTS#> results per page",
 member_name					=>	"Name",
 member_posts					=>	"Posts",
 multi_pages					=>	"Multiple Pages",
@@ -33,8 +64,6 @@ sort_submit					=>	"Go!",
 show_all					=>	"All Members",
 member_email					=>	"Email",
 sort_by_joined					=>	"Join Date",
-sort_by_level					=>	"Member Level",
-show_staff					=>	"Board Staff",
 page_title					=>	"Member List",
 );
 ?>
\ No newline at end of file
diff --git a/upload/lang/en/lang_mod.php b/upload/lang/en/lang_mod.php
index 99a704b8..f6c67808 100644
--- a/upload/lang/en/lang_mod.php
+++ b/upload/lang/en/lang_mod.php
@@ -2,6 +2,83 @@
 
 $lang = array (
 
+'cp_remove_photo' => "Remove member's photo?",
+'cp_remove_av'     => "Remove member's avatar?",
+'cp_edit_website'  => "Website",
+'cp_edit_location' => "Location",
+'cp_edit_signature' => "Signature",
+'cp_edit_interests' => "Interests",
+'cp_em_title'       => "Editing Member",
+'cp_vp_title'       => 'Profile',
+'cp_em_sub_main'    => "Main Member Information",
+'cp_em_sub_other'   => "Other Member Information",
+'cp_em_yahoo'       => 'Yahoo! Identity',
+'cp_em_aim'         => 'AIM Identity',
+'cp_em_icq'         => 'ICQ Identity',
+'cp_em_msn'         => 'MSN Identity',
+'cp_em_submit'      => 'Edit Member',
+
+'cm_title' => 'Merging Posts',
+'cm_post'  => 'Final Merged Post Date',
+'cm_author'  => 'Final Merged Post Author',
+'cm_text'    => 'Final Merged Post Content',
+'cm_submit'  => 'Merge Posts',
+'cm_attach'  => 'Final Merged Post Attachments',
+'cm_attach2' => 'Select which attachments you wish to keep',
+'cm_keep'    => 'Keep',
+'cm_delete'  => 'Delete',
+'cmp_title'  => "Move Posts",
+'cmp_topic'  => 'Enter topic ID',
+'cmp_topic2' => 'This is the ID of the topic these posts will be moved into.<br />(Tip: You can simply copy the URL from your browser address bar when viewing the topic and paste it here)',
+'cmp_submit' => 'Move Posts',
+'cmp_notopic' => 'That is not a valid topic to move these posts into. Please try again and check the input carefully',
+
+
+'redirect_modified' => 'Modified Topic',
+'cp_redirect_posts' => "Posts updated, returning to the topic",
+'cp_results'        => "Result",
+'cp_result_move'    => "Number of topics moved: ",
+'cp_result_del'     => "Number of topics deleted: ",
+
+'cp_redirect_topics' => "Topics updated, returning to the topic list",
+'cp_tmove_start' => "Moving topics from forum:",
+'cp_tmove_to'    => "Select a destination forum",
+'cp_tmove_end'   => "Move selected topics",
+'cp_ttitle'      => "Moving Topics",
+'cp_resync'      => "Forum Resynchronized",
+'mpt_title' => "Prune Settings",
+'mpt_help'  => "Prune Help",
+'mpt_confirm' => "Prune Confirm",
+'mps_ignorepin' => "Leave Pinned Topics?",
+
+'cpp_close'    => "Close this window",
+
+'cp_prune_domove'    => "Move the topics!",
+'cp_prune_dorem'     => "Remove the topics!",
+
+'cp_prune'  => "Manage Topics in forum: ",
+'cp_prune_days' => "<b>Prune topics with no new posts over [x] days.</b><br />(x = value entered)",
+'cp_prune_type' => "<b>Prune which type of topic?</b>",
+'cp_pday_open'  => "Open Topics only",
+'cp_pday_closed' => "Locked Topics only",
+'cp_pday_link'   => "Move linked Topics only",
+'cp_pday_all'    => "Any type of topic",
+'cp_prune_replies' => "<b>With less than [x] replies</b><br />(Leave this blank to prune topics regardless of replies)",
+'cp_prune_member' => "<b>Started by member</b><br />(Leave blank to prune regardless of topic starter)",
+'cp_prune_sub1'   => "Check Form Submission",
+'cp_prune_sub2'   => "Prune this forum!",
+'cp_action'       => "<b>Prune Action</b>",
+'cp_ac_prune'     => "PRUNE ONLY, DON'T MOVE",
+'cp_prune_text'   => "You may remove topics or move topics to another forum based on your criteria. To move topics, choose a destination forum from the drop down menu. To simply remove the topics, choose 'PRUNE ONLY' from the forums drop down menu. Moving topics will not leave moved links in the source forum",
+'cp_pages'        => "Page: ",
+'cp_error_no_mem' => "We could not locate a member by that name, please try again",
+'cp_error_no_topics' => "There are no topics left in the moderation queue in this forum.",
+'cp_total_topics'    => "Total topics in this forum",
+'cp_total_match'     => "Total topics to (re)move",
+'cp_check_result'    => "Form Check Results",
+'cp_check_text'      => "Continue only if satisfied with the results, clicking the link below WILL carry out the action. If you need to make any changes, please adjust the form below and re-check the submission.",
+
+
 // Added 1.2
 'w_v_pages'   => "Pages",
 'w_v_warnby'  => "Warned by",
@@ -130,14 +207,27 @@ $lang = array (
 'pd_redirect' => "Poll Removed",
 
 
-post_deleted               => "Post deleted",
-top_open					=>	"Opening a topic in ",
-top_edit					=>	"Editing Topic ",
-submit_move					=>	"Move this topic",
-UNPIN_TOPIC					=>	"UnPin Topics",
+/*UNPIN_TOPIC					=>	"UnPin Topics",
 OPEN_TOPIC					=>	"Open this topic",
 DELETE_TOPIC					=>	"Delete this topic",
+top_open					=>	"Opening a topic in ",
 top_close					=>	"Closing a topic in ",
+MOVE_TOPIC					=>	"Move this topic",
+CLOSE_TOPIC					=>	"Close this topic",
+final_rebuild					=>	"<#DELETE_COUNT#> duplicate posts removed. The new reply counter has been set to <#REPLY_COUNT#>",
+close_topic					=>	"<b>NOTE:</b> You do not have to post a message - it is optional",
+post_optional					=>	"<b>NOTE:</b> You do not have to post a message - it is optional",
+PIN_TOPIC					=>	"Pin Topics",
+DELETE_POST					=>	"Delete Posts",
+submit_open					=>	"Open this topic",
+delete_old					=>	"Source forum option:",*/
+
+
+post_deleted               => "Post deleted",
+
+top_edit					=>	"Editing Topic ",
+submit_move					=>	"Move this topic",
+
 t_open					=>	"Open Topic",
 t_edit					=>	"Edit Topic",
 p_moved					=>	"Topic Moved",
@@ -145,30 +235,23 @@ p_pinned					=>	"Topic Pinned",
 t_delete					=>	"Delete Topic",
 top_move					=>	"Move Topic ",
 p_edited					=>	"Topic Edited",
-MOVE_TOPIC					=>	"Move this topic",
+
 edit_f_desc					=>	"Topic Description",
-CLOSE_TOPIC					=>	"Close this topic",
+
 t_close					=>	"Close Topic",
 delete_topic					=>	"Deleting Topic, only continue if you wish to delete this topic, there will be no other confirmation screens.",
 move_from					=>	"Move this topic from",
 p_deleted					=>	"Topic Deleted",
 t_move					=>	"Move Topic",
 edit_f_title					=>	"Topic Title",
-final_rebuild					=>	"<#DELETE_COUNT#> duplicate posts removed. The new reply counter has been set to <#REPLY_COUNT#>",
 to					=>	"to",
-close_topic					=>	"<b>NOTE:</b> You do not have to post a message - it is optional",
 submit_close					=>	"Close this topic",
-post_optional					=>	"<b>NOTE:</b> You do not have to post a message - it is optional",
 p_closed					=>	"Topic Closed",
 top_delete					=>	"Deleting Topic ",
 p_opened					=>	"Topic Opened",
 edit_topic					=>	"Editing Topic Details",
 p_pdeleted					=>	"Post Deleted",
-delete_old					=>	"Source forum option:",
-PIN_TOPIC					=>	"Pin Topics",
 post_icon					=>	"<b>Post Icons</b>",
-DELETE_POST					=>	"Delete Posts",
-submit_open					=>	"Open this topic",
 submit_edit					=>	"Edit this topic",
 submit_delete					=>	"Delete this topic",
 p_unpinned					=>	"Topic Unpinned",
diff --git a/upload/lang/en/lang_modcp.php b/upload/lang/en/lang_modcp.php
deleted file mode 100644
index afba154c..00000000
--- a/upload/lang/en/lang_modcp.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-$lang = array (
-
-// rc1/b3
-
-'cp_remove_photo' => "Remove member's photo?",
-
-//1.2
-
-'mm_title'  => "Multi Moderation",
-'mm_redirect' => "multi moderation applied, returning you to the topic list",
-'iph_title' => "IP Tools: Help",
-
-'mpt_title' => "Prune Settings",
-'mpt_help'  => "Prune Help",
-'mpt_confirm' => "Prune Confirm",
-'mps_ignorepin' => "Leave Pinned Topics?",
-//
-
-'cp_error_move' => "Please ensure that the source and destination forums exist, are able to accept topics (not sub forums only), you have permission to move them into that forum and that the source forum isn't the same as the destination forum",
-
-'cp_tmove_start' => "Moving topics from forum:",
-'cp_tmove_to'    => "Select a destination forum",
-'cp_tmove_end'   => "Move selected topics",
-
-'cp_js_delete'  => "Are you sure you wish to delete these topics?",
-
-'cp_redirect_topics' => "Topics updated, returning to the topic list",
-
-'cp_err_no_topics' => "Please ensure that you check at least one box before continuing",
-
-'new_show_forum' => "Show normal forum view in new window",
-
-'fv_no_topics' => "There are no topics to display or this forum is unable to receive new topics",
-
-'cp_redirect_mod_topics'  => "Topics/Posts have been approved or deleted - redirecting back to check for more...",
-
-'cp_prune'  => "Manage Topics in forum: ",
-'cp_prune_days' => "<b>(Re)move topics with no new posts over [x] days.</b><br />(x = value entered)",
-'cp_prune_type' => "<b>(Re)move which type of topic?</b>",
-'cp_pday_open'  => "Open Topics only",
-'cp_pday_closed' => "Locked Topics only",
-'cp_pday_link'   => "Move linked Topics only",
-'cp_pday_all'    => "Any type of topic",
-'cp_prune_replies' => "<b>..with less than [x] replies</b><br />(Leave this blank to remove topics regardless of replies)",
-'cp_prune_member' => "<b>...started by member</b><br />(Leave blank to (re)move regardless of topic starter)",
-'cp_prune_sub1'   => "Check Form Submission",
-'cp_prune_sub2'   => "Prune this forum!",
-'cp_action'       => "<b>Prune Action</b>",
-'cp_ac_prune'     => "PRUNE ONLY, DON'T MOVE",
-'cp_prune_text'   => "You may remove topics or move topics to another forum based on your criteria. To move topics, choose a destination forum from the drop down menu. To simply remove the topics, choose 'PRUNE ONLY' from the forums drop down menu. Moving topics will not leave moved links in the source forum",
-'cp_pages'        => "Page: ",
-'cp_error_no_mem' => "We could not locate a member by that name, please try again",
-'cp_error_no_topics' => "There are no topics left in the moderation queue in this forum.",
-'cp_total_topics'    => "Total topics in this forum",
-'cp_total_match'     => "Total topics to (re)move",
-'cp_check_result'    => "Form Check Results",
-'cp_check_text'      => "Continue only if satisfied with the results, clicking the link below WILL carry out the action. If you need to make any changes, please adjust the form below and re-check the submission.",
-'cp_mod_topics_title2' => "Moderating New Topics in: ",
-'cp_mod_posts_title2' => "Moderating New Posts in: ",
-'cp_prune_domove'    => "Move the topics!",
-'cp_prune_dorem'     => "Remove the topics!",
-'cp_same_forum'      => "You cannot move into the same forum",
-'cp_no_forum'        => "That is not a valid destination forum",
-'cp_3_title'         => "Topic Title",
-'cp_3_replies'       => "Queued Replies",
-'cp_3_approveall'    => "Approve All",
-'cp_3_viewall'       => "Manage Queued",
-'cp_3_postno'        => "Post #",
-
-'cp_err_no_f'        => "No forum was chosen or the forum chosen does not exist, please go back and try again",
-'cp_err_no_p'        => "You do not have permission to view the topics in this forum",
-
-'cp_error_no_subforum' => "You cannot choose a sub category as a destination forum",
-
-'cp_1_approve'   => "Approve",
-'cp_1_remove'    => "Delete",
-'cp_1_leave'     => "Leave",
-'cp_1_selected'  => "selected posts",
-'cp_1_go'        => "Manage these posts",
-
-'cp_results'        => "Result",
-'cp_result_move'    => "Number of topics moved: ",
-'cp_result_del'     => "Number of topics deleted: ",
-
-'cp_edit_user' => "Edit a users profile",
-'cp_find_user' => "Enter part, or all of the username you wish to edit",
-'cp_find_submit' => "Find user",
-'cp_find_2_user' => "Please select a member from the matches",
-'cp_find_2_submit' => "Edit users profile",
-'cp_no_matches'    => "There was no data returned from your search input, please try again",
-'cp_admin_user'    => "You cannot edit an administrators profile from this control panel",
-'cp_no_perms'      => "You do not have permission for this action.",
-
-'cp_remove_av'     => "Remove member's avatar?",
-'cp_edit_website'  => "Website",
-'cp_edit_location' => "Location",
-'cp_edit_signature' => "Signature",
-'cp_edit_interests' => "Interests",
-
-
-
-'cp_mod_in'  => "Current Forum",
-'cp_topics_wait' => "Topics Pending Moderation",
-'cp_posts_wait'  => "Posts Pending Moderation",
-
-'cp_modcp_ptitle' => "Moderators Control Panel",
-
-'cp_modcp_home'  => "Moderators CP Home",
-
-'cp_error'       =>  "Control Panel Message",
-'cp_welcome'     =>  "Welcome!",
-'cp_welcome_text' => "Welcome to your moderators control panel.<br />From here you will be able to process moderated topics and posts, mass move topics and prune posts. Simply choose an option from the left menu bar to proceed.",
-
-
-'cp_mod_topics'        => "Moderate New Topic Queue",
-'cp_mod_posts'         => "Moderate New Post Queue",
-
-'cpt_close'  => "Close Topics",
-'cpt_open'   => "Open Topics",
-'cpt_pin'    => "Pin Topics",
-'cpt_unpin'  => "Unpin Topics",
-'cpt_move'   => "Move Topics",
-'cpt_delete' => "Delete Topics",
-
-
-'cp_prune_posts'       => "Mass Move /Prune Topics",
-
-
-'cp_user_edit'         => "Edit Users Profile",
-
-'title_manage_forums'  => "Manage Your Forums",
-
-'f_q_posts'            => "Queued Posts",
-'f_q_topics'           => "Queued Topics",
-'f_select'             => "Select",
-
-'f_w_selected'         => "With selected forum:",
-'t_w_selected'         => "With selected topics:",
-'f_go'                 => "Go!",
-
-'menu_forums' => "Manage Your Forums",
-'menu_users'  => "Manage Members",
-'menu_ip'     => "IP Address Tools",
-
-'mod_opts'    => "Moderation Options",
-
-'ip_desc_text' => "<b>The following options are available to you</b><br /><br /><b><u>Resolve</u> IP Address</b>: This option will allow you to look up an IP address for more information (note, you must enter all 4 parts of the IP address to use this tool)<br /><b><u>Find Posts</u> with this IP</b>: This option will run a search for all posts associated with this IP address<br /><b><u>Find members</u> who registered with this IP</b>: This tool will run a seach for all members who registered with the entered IP address",
-'ip_warn_text' => "<b>Please Note</b>: You may enter a wildcard '*' (without quotes) as the last part of the IP address.<br />For example, 127.*.*.* will match all IP address that start with 127.<br />127.1.0.* will match all IP addresses that start with 127.1.0.<br />An error will occur if you attempt to use a wildcard in the middle of the IP address. For example, 127.*.0.1 will return an error.",
-'ip_enter'     => "<b>Enter the IP address</b>",
-'ip_submit'    => "Run Tool",
-
-'ip_resolve'   => "Resolve",
-'ip_posts'     => "Find Posts",
-'ip_members'   => "Find Members",
-
-'cp_error_ip'  => "Please ensure that at least the first two IP address fields are completed and that the wildcard '*' is not in the middle of the IP address",
-'cp_error_resolveip' => "You must enter the complete IP address to use this tool",
-'ip_resolve_result' => "The host name for %s is <b>%s</b><br /><br />Try visiting <a href='http://www.nic.com/cgi-bin/whois.cgi' target='_blank'>nic.com</a> to get more information by running this match via WHOIS.",
-
-'cp_safe_fail' => "This operation failed or no data was returned. If you are running PHP in safe mode, you may not be able to use all the tools provided",
-
-'cp_no_matches' => "No matching results were found, please go back and review the search criteria",
-
-'ipm_title'  => "IP Address Member Search Results",
-'ipm_name'   => "Name",
-'ipm_ip'     => "IP Address",
-'ipm_posts'  => "Posts",
-'ipm_reg'    => "Date Registered",
-'ipm_options' => "Options",
-
-'ipm_edit'  => "Edit Member",
-'ipm_view'  => "View Profile",
-
-'ipp_found' => "Your search returned the following number of matching posts:",
-'ipp_click' => "Click here to view the results in a new window",
-
-
-
-
-
-
-
-'leave_link'   => "Leave a link to the new topic in the source forum?",
-
-'yes' => "Yes",
-'no'  => "No",
-
-'move_exp' => "Please select the destination forum and method of moving",
-
-
-
-
-
-);
-?>
\ No newline at end of file
diff --git a/upload/lang/en/lang_msg.php b/upload/lang/en/lang_msg.php
index 700e8ec2..8b1983ec 100644
--- a/upload/lang/en/lang_msg.php
+++ b/upload/lang/en/lang_msg.php
@@ -2,6 +2,9 @@
 
 $lang = array (
 
+'pma_title' => "Private Message Archive",
+'cc_hide_users' => 'Hide CC recipients from others?',
+
 // Added in 1.2
 
 'arch_new' => "and newer",
@@ -93,7 +96,7 @@ $lang = array (
 'pmp_thiswindow' => "Open in this window",
 
 'carbon_copy_title' => "Carbon copy to other members",
-'carbon_copy_desc'  => "<b>You may enter up to %s names in the carbon copy box</b>.<br /><br />One line per name.",
+'carbon_copy_desc'  => "<b>You may enter up to %s names in the carbon copy box</b>.<br /><br />One name per line.",
 
 
 'forum_jump'  => "Forum Jump",
@@ -146,7 +149,7 @@ move_button					=>	"move to",
 a_msg_no_new					=>	"You have no new messages",
 can_contact					=>	"Message Allow",
 'send'					=>	"Send New Message",
-sent_text					=>	"Your message '<#MESSAGE_TITLE#>' has been sent to <#TO_MEMBER#>. They will now be informed that they have a new message.",
+sent_text					=>	"Your message '<#MESSAGE_TITLE#>' has been sent. They will now be informed that they have a new message.",
 'welcome'					=>	"Welcome to your messenger",
 cannot_contact					=>	"Message Ban",
 member_name					=>	"Member Name",
diff --git a/upload/lang/en/lang_online.php b/upload/lang/en/lang_online.php
index 6bff90fa..4887ed59 100644
--- a/upload/lang/en/lang_online.php
+++ b/upload/lang/en/lang_online.php
@@ -13,27 +13,26 @@ $lang = array (
 's_show_mem_reg' => "Show Registered Only",
 's_show_mem_all'    => "Show All Users",
 's_go' => "Update",
-WHERE_SF					=>	"Viewing Forum:",
-WHERE_SR					=>	"Viewing Forum Rules:",
-WHERE_ST					=>	"Viewing Topic:",
-WHERE_Login				=>	"Logging in...",
-WHERE_Post				=>	"Posting in forum:",
-WHERE_Reg	 				=>	"Registering...",
-WHERE_Online				=>	"Viewing Online List",
-WHERE_Members				=>	"Viewing the Members List",
-WHERE_Help				=>	"Viewing the Help Files",
-WHERE_Search				=>	"Searching...",
-WHERE_Print				=>	"Printing a topic",
-WHERE_Forward				=>	"Emailing topic:",
-WHERE_Msg				=>	"Using Personal Messenger",
-WHERE_UserCP				=>	"Using User CP",
-WHERE_Mail	 				=>	"Contacting member via email",
-WHERE_Invite				=>	"Inviting a friend to the board",
-WHERE_ICQ	 				=>	"Contacting member via ICQ",
-WHERE_AOL 				=>	"Contacting member via AIM",
-WHERE_Profile				=>	"Viewing Members Profile",
-WHERE_Stats				=>	"Viewing Stats",
-WHERE_ModCP				=>	"Using Moderators CP:",
+WHERE_sf					=>	"Viewing Forum:",
+WHERE_sr					=>	"Viewing Forum Rules:",
+WHERE_st					=>	"Viewing Topic:",
+WHERE_login				=>	"Logging in...",
+WHERE_post				=>	"Posting in forum:",
+WHERE_reg	 				=>	"Registering...",
+WHERE_online				=>	"Viewing Online List",
+WHERE_members				=>	"Viewing the Members List",
+WHERE_help				=>	"Viewing the Help Files",
+WHERE_search				=>	"Searching...",
+WHERE_print				=>	"Printing a topic",
+WHERE_forward				=>	"Emailing a topic",
+WHERE_msg				=>	"Using Personal Messenger",
+WHERE_usercp				=>	"Using User CP",
+WHERE_mail	 				=>	"Contacting member via email",
+WHERE_invite				=>	"Inviting a friend to the board",
+WHERE_icq	 				=>	"Contacting member via ICQ",
+WHERE_aol 				=>	"Contacting member via AIM",
+WHERE_profile				=>	"Viewing Members Profile",
+WHERE_stats				=>	"Viewing Stats",
 member_name				=>	"Member Name",
 guest						=>	"Guest",
 board_index					=>	"Viewing Board Index",
diff --git a/upload/lang/en/lang_csite.php b/upload/lang/en/lang_portal.php
similarity index 91%
rename from upload/lang/en/lang_csite.php
rename to upload/lang/en/lang_portal.php
index 94a85c06..a79fe59a 100644
--- a/upload/lang/en/lang_csite.php
+++ b/upload/lang/en/lang_portal.php
@@ -2,7 +2,7 @@
 
 $lang = array (
 
-'wbox_pm_string' => "You have %s personal messages waiting to be read",
+'wbox_pm_string' => "You have %s new personal messages",
 'wbox_last_visit' => "You last visited our website on %s",
 'wbox_guest_reg'  => "You have to %s before you can post to our site",
 'wbox_register'   => "register",
@@ -12,8 +12,8 @@ $lang = array (
 'wbox_guest_name' => "visitor",
 'wbox_welcome'    => "Welcome",
 'wbox_getnewposts' => "View new posts",
-'wbox_mycontrols'  => "MyControls",
-'wbox_myassistant' => "MyAssistant",
+'wbox_mycontrols'  => "My Controls",
+'wbox_myassistant' => "My Assistant",
 'wbox_logout'      => "Log out",
 'pm_title'         => "Personal Messages",
 'search_title'     => "Search Website",
diff --git a/upload/lang/en/lang_post.php b/upload/lang/en/lang_post.php
index 0615d513..1386fa82 100644
--- a/upload/lang/en/lang_post.php
+++ b/upload/lang/en/lang_post.php
@@ -2,6 +2,28 @@
 
 $lang = array (
 
+
+//v2.0
+
+'upload_text'       =>	"<b>Attachments</b><br />Global Space Left:",
+'upload_unlimited'  => "<em>unlimited space</em>",
+'invalid_mime_type' =>	"Upload failed. You are not permitted to upload a file with that file extension.",
+'upload_to_big'     => "The total filespace required to upload all the attached files is greater than your per post or global limit. Please reduce the number of attachments or the size of the attachments.",
+
+'pp_nohtml'   => 'HTML Off',
+'pp_html1'    => 'HTML On - Raw Linebreak Mode',
+'pp_html2'    => 'HTML On - Auto Linebreak Mode',
+
+'button_add_attachment' => "Add This Attachment",
+'attach_remove'     => 'Remove',
+'attach_space_left' => "You have used %s of attachment space for this post.<br />You have %s left for this post.",
+'remove_attach'     => "Are you sure you wish to remove this attachment?",
+'custom_tags_incorrect' => "There is an error with your BBCode, the number of opening tags do not meet the number of closing tags.",
+'custom_tags_incorrect2' => "There is an error with your BBCode. It is possible that you have incorrectly used a tag such as [TAG] when it is meant to be used as [TAG=] or vice-versa.",
+
+
+//
+
 // v1.2
 'enable_track' => "<strong>Enable</strong> email notification of replies?",
 'already_sub'  => "You are currently receiving email notification of replies",
@@ -79,7 +101,7 @@ mod_nowt  => "( Do Nothing )",
 'tt_subject'   => "Topic Subscription Reply Notification",
 'ft_subject'   => "Forum Subscription New Topic Notification",
 
-'upload_failed' => "The requested file upload failed. This is either because it was not in the correct format, or the file size was larger than that allowed. Please check the file you wish to upload and try again.",
+'upload_failed' => "The requested file upload failed because suitable permissions have not been enabled on the 'uploads' directory. Please contact the board administrator and inform them of this error.",
 
 stat_flash					=>	"Flash Movie posting: ",
 poll_vote_added					=>	"Your vote has been added",
@@ -120,7 +142,7 @@ jscode_error_no_title					=>	"You must enter a title",
 poll_null_vote					=>	"View Results (Null Vote)",
 poll_s_votes					=>	"Votes",
 moderate_topic					=>	"Your new topic will be previewed by a moderator before it is added into this forum",
-upload_text					=>	"You may attach a file to this message.<br />Maximum file size:",
+
 invalid_ext					=>	"You are not allowed to use that image extension on this board. A valid format is: http://www.domain.com/picture.gif, an invalid format is: http://www.domain.com/picture.one.gif",
 reg_username					=>	"Your Registered Username",
 upload_title					=>	"File Attachments",
@@ -168,7 +190,7 @@ too_many_img					=>	"Sorry, but you have posted more images than you are allowed
 topic_desc					=>	"Topic Description",
 unlimited					=>	"( Not restricted )",
 no_dynamic					=>	"Sorry, dynamic pages in the [IMG] tags are not allowed",
-invalid_mime_type					=>	"You cannot upload this type of file",
+
 post_options					=>	"Post Options",
 jscode_text_flash_height					=>	"Enter the Height of the movie in pixels. Maximum Height= ",
 post_to_quote					=>	"Original Post to Quote",
@@ -183,7 +205,7 @@ new_post_added					=>	"Your new post has been added",
 top_txt_reply					=>	"Replying to",
 jscode_text_enter_url_name					=>	"Enter the title of the webpage",
 poll_only					=>	"<b>Make Poll Only?</b><br />(No replies allowed)",
-posted_on					=>	"Posted on",
+posted_on					=>	"Posted",
 post					=>	"Enter your Post",
 poll_not_enough					=>	"A Poll is a choice, 1 entry is not a choice",
 post_rules					=>	"Posting Rules",
diff --git a/upload/lang/en/lang_profile.php b/upload/lang/en/lang_profile.php
index 286f214c..4cfb0944 100644
--- a/upload/lang/en/lang_profile.php
+++ b/upload/lang/en/lang_profile.php
@@ -2,13 +2,27 @@
 
 $lang = array (
 
-//added 1.2 b3
-'integ_msg'    => "Integrity Messenger",
+// 2.0
+'profile_options' => "Profile Options",
+'find_member_topics' => "Find member's topics",
+'website_addr' => 'Website',
+'supmod_edit_member' => 'Edit Member',
+'ignore_user' => 'Ignore User',
+'last_active' => 'Last Active',
+'last_click'  => 'Status',
+'online_offline' => "Offline",
+
+'wol_index'   => 'Reading Board Index',
+'wol_topic'   => 'Active in topic',
+'wol_forum'   => 'Active in forum',
+'wol_ucp'     => 'Active in User Control Panel / PM Center',
+'wol_profile' => 'Reading a profile',
+'wol_search'  => "Searching",
 
 // 1.2
 
 'rating_level' => "Rating",
-'warn_level'   => "Warn Level",
+'warn_level'   => "Warn",
 'photo_title'  => "Photo",
 'ac_close'     => "Close card",
 'ac_download'  => "Download this card",
@@ -19,7 +33,7 @@ $lang = array (
 
 
 'user_local_time' => "User's local time",
-
+'head_addit'   => "Additional Information",
 'head_title'   => "Viewing Profile",
 
 'head_contact' => "Contact Details",
@@ -37,28 +51,26 @@ $lang = array (
 
 'total_posts'   => "Total Cumulative Posts",
 'joined'        => "Joined",
-'posts_per_day'  => "Posts per day",
+'posts_per_day'  => "posts per day",
 'total_percent'  => "of total forum posts",
 'fav_forum'      => "Most active in",
-'fav_posts'      => "posts in this forum",
+'fav_posts'      => "posts",
 'fav_percent'    => "of this member's active posts",
 
 'communicate'    => "Communicate",
 "info"           => "Information",
 'post_detail'    => "Posting Details",
 
-"back"  => "back",
-
-'email'   => "Email",
+'email'   => "Send an Email",
 'aim'     => "AIM Name",
 'icq'     => "ICQ Number",
 'yahoo'   => "Yahoo Identity",
 'msn'     => "MSN Identity",
-'pm'      => "Personal Message",
+'pm'      => "Send a Personal Message",
 
 'page_title' => "Viewing Profile",
 
-'find_posts'  => "Find all posts by this member",
+'find_posts'  => "Find member's posts",
 'add_to_contact' => "Add to contact list",
 
 'edit_my_sig'    => "Edit my Signature",
diff --git a/upload/lang/en/lang_register.php b/upload/lang/en/lang_register.php
index 59f70120..d6953d7a 100644
--- a/upload/lang/en/lang_register.php
+++ b/upload/lang/en/lang_register.php
@@ -2,6 +2,61 @@
 
 $lang = array (
 
+'subsm_title' => 'Subscription Packages',
+'subsm_none'  => '--NONE--',
+'subsm_na'    => 'N/A',
+'subsm_more'  => 'More Info...',
+'subsm_no_desc' => "No package selected to purchase",
+'subsm_close'   => "Close",
+'tc_title' => "Registration Terms & Rules",
+'tc_text'  => 'In order to proceed, you must agree to the following:',
+'tc_regbut' => "Register",
+'op_email_title' => "Receiving Email",
+'op_email_text' => "Now and again, the administrators and other members might wish to contact you via email through this board.",
+'op_email_ad'   => "Receive email from administrators",
+'op_email_mem' => "Receive email from other members",
+'op_tz_title'   => "Time Zone Settings",
+'op_tz_text'   => "You can adjust the default time zone setting below",
+'op_tz_dst'    => 'Observing Daylight Saving Time?',
+'submit_text' => "I agree to the terms of this registration and wish to proceed.",
+
+'cf_optional'     => "Optional Information",
+
+
+'las_title'    => "Security Code Confirmation",
+'las_img'      => 'Your unique security code',
+'las_img_text' => 'If you do not see any numbers, or see broken images, please contact a board administrator to rectify the problem.',
+'las_input'    => 'Confirm security code',
+'las_input_text' => "Please enter the 6 digit numerical code shown in the image.",
+
+
+'las_numbers'  => "<b>Your unique security code</b><br />If you do not see any numbers, or see broken images, please contact a board administrator to rectify the problem.",
+'las_text'     => "<b>Confirm security code</b><br />Please enter the 6 digit code shown above in image format.<br />Note: Only numbers are allowed, a '0' is a numerical zero, not the alphabetical 'O'.",
+
+
+
+'user_name_title'          => "Username:",
+'user_name'					=> "Enter your Username",
+'user_name_text'            => "Usernames must be between 3 and 32 characters long",
+
+'password_title'   => "Password:",
+'password'		   =>	"Enter your password",
+'password_text'    => "Passwords must be between 3 and 32 characters long",
+'password_confirm' => "Confirm Password",
+'password_confirm_text' =>	"Please re-enter your password: It must match exactly",
+
+'email_address_title' => "Email Address:",
+'email_address_text'  => "Make sure you enter a valid email address",
+'email_address_confirm' => "Confirm Email Address",
+'email_address_confirm_text' => "Please re-enter your email address: It must match exactly",
+
+'email_address'	=>	"Enter your Email Address",
+
+
+'err_complete_form' => "You must complete all the required sections of the form",
+'err_cf_to_long'    => "One of the input fields contains more data than is allowed",
+'err_invalid'       => "One of the input fields contains invalid data, please check and adjust.",
+
 // added RC2
 
 'incorrect_thing_name' => "Incorrect name for the %s. This may be because it contains illegal characters",
@@ -22,6 +77,7 @@ $lang = array (
 'lpf_pass2'   => "Re-enter your new password",
 'lpf_pass22' => "It must match exactly",
 
+'err_user_start_zero' => "Your chosen username must not begin with a zero (0)",
 'errors_found' => "The Following Errors Were Found",
 'err_email_address_match' => "The email addresses entered did not match",
 'err_no_username'  => "You must enter a valid username between 3 and 32 characters",
@@ -40,10 +96,6 @@ $lang = array (
 'ras_text'     => "<b>Confirm registration code</b><br />To prevent mass registration programs from registering accounts, please enter the 6 digit code shown above in image format.<br />Note: Only numbers are allowed, a '0' is a numerical zero, not the alphabetical 'O'.",
 
 
-'las_title'    => "Security Code Confirmation",
-'las_numbers'  => "<b>Your unique security code</b><br />If you do not see any numbers, or see broken images, please contact a board administrator to rectify the problem.",
-'las_text'     => "<b>Confirm security code</b><br />Please enter the 6 digit code shown above in image format.<br />Note: Only numbers are allowed, a '0' is a numerical zero, not the alphabetical 'O'.",
-
 
 
 'coppa_title'     => "COPPA Registration",
@@ -77,16 +129,19 @@ $lang = array (
 'cpf_phone'       => "Phone Number",
 'cpf_date'        => "Date",
 
-'cf_optional'     => "Optional Information",
 
 'lost_pass_form'   => "Lost Password Form",
 'lp_header'        => "How to reset your password",
 
 'lp_text'          => "Enter your account username in the field below. The username is case <b>in</b>sensitive.<br />Once you have submitted the form, you will receive an email asking for validation of this request to ensure that no malicious use has occured. This email will also contain a link that you must click.<br />You will be presented with a form that will allow you to enter a new password to use for this account.",
 
+'lp_text_email'    => "Enter your account email address in the field below. The email address is case <b>in</b>sensitive.<br />Once you have submitted the form, you will receive an email asking for validation of this request to ensure that no malicious use has occured. This email will also contain a link that you must click.<br />You will be presented with a form that will allow you to enter a new password to use for this account.",
+
+
 'lp_send'          => "Proceed",
 
 'lp_user_name'     => "Enter your account username",
+'lp_email_address' => "Enter your email address",
 
 'lp_subject'       => "Password recovery information from",
 
@@ -107,13 +162,13 @@ done_reg_2					=>	"Your account has been activated! Proceeding to log in",
 board_rules					=>	"Board Rules",
 dumb_text					=>	"Please ensure that you complete the form fully. The information you need will be in the email that was sent to you.",
 registration_agree					=>	"Registration Agreement",
-agree_submit					=>	"I agree",
-email_address					=>	"<b>Please enter your email address</b><br />You will need to enter a <i>real</i> email address",
+agree_submit					=>	"I have read, understood and agree to these rules and conditions",
 std_text					=>	"Please ensure that you complete all the fields fully, taking particular care over the password fields.",
-user_name					=>	"<b>Please choose a Username</b><br />Usernames must be between 3 and 32 characters long",
+
+
+
+
 reg_success					=>	"Registration Successful",
-pass_word					=>	"<b>Please choose a Password</b><br />Passwords must be between 3 and 32 characters long",
-re_enter_pass					=>	"<b>Please re-enter your password</b><br />It must match <i>exactly</i>",
 thank_you					=>	"Thank you",
 registration_process					=>	"Registration Process",
 preview_reg_text					=>	"Your registration has been successful. The administrator wishes to preview all new registered accounts before posting permissions are granted. The administrator has been notified of your registration.",
@@ -128,9 +183,6 @@ dumb_header					=>	"Account Activation",
 'val_key'  => "Validation Key:",
 'user_id'  => "User ID:",
 
-terms_service					=>	"Terms of Service",
-terms_service_text				=>	"Please read fully and check the 'I agree' box ONLY if you agree to the terms",
-
 
 email_address_two  => "<b>Please re-enter your email address</b>",
 
diff --git a/upload/lang/en/lang_search.php b/upload/lang/en/lang_search.php
index b4a6cf50..ca05e099 100644
--- a/upload/lang/en/lang_search.php
+++ b/upload/lang/en/lang_search.php
@@ -2,6 +2,20 @@
 
 $lang = array (
 
+'active_start'  => 'Get active topics for:',
+'active_today'  => 'today',
+'active_week'   => 'this week',
+'active_week2'  => 'past 2 weeks',
+'active_month'  => 'this month',
+'active_month3' => 'past 3 months',
+'active_year'   => 'this year',
+'active_go'     => 'Go',
+'no_search_topics'     => "There are no topics to show for those search parameters",
+
+'you_search_for' => "You searched for:",
+'no_results_so_there_ha_ha' => "Unfortunately your search didn't return any results.<br />Try broadening the search parameters by searching by different keywords or altering the format of your search.<br />Remember to use the wildcard '*' to increase the number of matches. Apple* will match 'apple' and 'apples'.",
+'search_again' => "Search Again?",
+
 'mark_search_as_read' => "Mark all forums as read and return to index",
 'your_results' => "Your topics",
 
@@ -65,7 +79,7 @@ $lang = array (
 
 'nav_since_lv' => "Posts since your last visit",
 'nav_lt'       => "Your last ten posts",
-
+'nav_au'       => "Active Topics",
 
 'results_post'   => "Show results as posts",
 'results_topics' => "Show results as topics",
@@ -127,22 +141,6 @@ $lang = array (
 
 'order'  => 'order',
 
-'active_topics' => "Active Topics",
-
-'active_no_topics'   => "There were no active topics during those date ranges",
-
-'active_js_error' => "You cannot search for active topics using those dates. That'd just be silly. The first date MUST be older than the second date.",
-
-'active_st_text' => 'Show me active topics posted...',
-'active_mid_text' => 'From',
-'active_end_text' => "To",
-"active_label"    => "Submit form and get the requested active topics",
-
-'active_yesterday' => "Yesterday",
-'active_today'     => "Today",
-'active_week'      => "Last Week",
-'active_month'     => "Last Month",
-'active_days'      => "days ago",
 
 );
 ?>
\ No newline at end of file
diff --git a/upload/lang/en/lang_subscriptions.php b/upload/lang/en/lang_subscriptions.php
index 2c182bb0..710cf5b3 100644
--- a/upload/lang/en/lang_subscriptions.php
+++ b/upload/lang/en/lang_subscriptions.php
@@ -3,6 +3,15 @@
 $lang = array (
 
 
+'no_expire' => "Lifetime (Never Expires)",
+'msg_reg_title' => "Thanks for registering!",
+'msg_reg_text'  => "During registration, you opted to purchase a subscription package.<br />Please review the details below and select from the payment methods below to confirm your choice.",
+'msg_gen_title'  => "Subscription Packages",
+'msg_gen_text'   => "Thanks for visiting our subscription packages screen.<br />Please select from a package below to proceed to choose from the available payment options.",
+
+'msg_force_title' => "Please Purchase a Subscriptions Package",
+'msg_force_text'  => "We require that you purchase a subscriptions package before you are granted full access to this forum.",
+
 'cc_currency_in' => "All prices in",
 'cc_change'      => "Change",
 
@@ -19,13 +28,15 @@ $lang = array (
 
 
 'gw_upgrade' => "Upgrade",
+'gw_protx'  => "Click the button below to complete this order via Protx's website",
 
 'gw_paypal'  => "Click the button below to complete this order via PayPal's website. All costs will be converted into USD for PayPal's website",
 'gw_nochex'  => "Click the button below to complete this order via NOCHEX's website. All costs will be converted into GBP for NOCHEX's website",
-
+'gw_safshop'  => "Click the button below to complete this order via Safshop's website. All costs will be converted into USD for Safshop's website",
+'gw_authorize' => "Click the button below to complete this order via our secure online payment page.",
 
 'post_manual' => "You have selected to pay by post. When you click the button below, your order will be marked as 'Pending' and a new window will open containing a ticket you can print off and include with the payment. This means that you will not be able to use the subscription until your payment has been received and manually verified.",
-'post_manual_more' => "Please send the above amount in the correct currency (USD) to:<br /><b>%s<br />%s<br />%s<br />%s<br />%s</b><br /><br />If you require currency conversion, please visit <a href='http://www.xe.com'>this website</a>.",
+'post_manual_more' => "Please send the above amount in the correct currency to:<br /><b>%s<br />%s<br />%s<br />%s<br />%s</b><br /><br />If you require currency conversion, please visit <a href='http://www.xe.com'>this website</a>.",
 
 'gw_manual'  => "Click here to continue...",
 
@@ -77,10 +88,12 @@ $lang = array (
 'time_y'      => "Year",
 'time_m'      => "Month",
 'time_d'      => "Day",
+'time_w'      => "Week",
 
 'timep_y'     => "Years",
 'timep_m'     => "Months",
 'timep_d'     => "Days",
+'timep_w'     => "Weeks",
 
 
 );
diff --git a/upload/lang/en/lang_topic.php b/upload/lang/en/lang_topic.php
index a77524f8..40a118de 100644
--- a/upload/lang/en/lang_topic.php
+++ b/upload/lang/en/lang_topic.php
@@ -2,6 +2,42 @@
 
 $lang = array (
 
+// 2.0
+'ip_private' => 'Private',
+'tom_outline' => 'Outline',
+'tom_standard' => 'Standard',
+'tom_linear'   => 'Linear+',
+
+'tom_replies'   => "Replies",
+'announce_both' => "Announcement started %s and ends %s",
+'announce_start' => "Announcement started %s",
+'announce_end'   => "Announcement ends %s",
+
+'cpt_approve'   => "Set Visible (Approve Post)",
+'cpt_unapprove' => "Set Invisible (Unapprove Post)",
+'cpt_approvet'   => "Set Visible (Approve Topic)",
+'cpt_unapprovet' => "Set Invisible (Unapprove Topic)",
+'cpt_merge'     => 'Merge Posts',
+'cpt_delete'    => "Delete Posts",
+'cpt_split'     => "Split Topic",
+'cpt_move'      => "Move Posts",
+'cp_js_delete'  => "Are you sure you wish to delete these posts?",
+'enter_keywords' => "Enter Keywords",
+'search_topic'   => "Search Topic",
+'f_go'      => "With Selected",
+
+'m_location' => "From:",
+
+'tt_reply_to_post' => "Reply directly to this post",
+
+
+'attach_thumbs' => 'Attached thumbnail(s)',
+'attach_images' => 'Attached image(s)',
+'attach_normal' => 'Attached File(s)',
+'attach_ahits'   => 'Downloads:',
+'attach_size'   => 'Size:',
+'mq_title'      => 'Toggle multiquote addition',
+
 'tt_link' => "Show the link to this post",
 'tt_prompt' => "Manually copy the direct link to this post below to store the link in your computer's clipboard",
 
@@ -24,7 +60,9 @@ $lang = array (
 'show_emo' => "Show Smilies Pop Up Window",
 'pl_show_results' => "Show Results",
 'pl_show_vote' => "Show Vote Options",
+
 'pic_attach_thumb' => "Attached Image (Click thumbnail to expand)",
+
 'attached_file'  => "Attached File",
 'qr_title' => "Fast Reply",
 'qr_open'  => "Open Fast Reply Window",
@@ -60,7 +98,7 @@ $lang = array (
 'active_users_members' => "%s Members:",
 
 'go_new_post' => "Go to first unread post",
-'edited_by'   => "This post has been edited by <b>%s</b> on %s",
+'edited_by'   => "This post has been edited by <b>%s</b>: %s",
 
 'UNSUBBIT'   => "Unsubscribe all from topic",
 
@@ -96,7 +134,7 @@ single_page_topic					=>	"&nbsp;",
 PIN_TOPIC					=>	"Pin this Topic",
 'print'					=>	"Print this topic",
 topic					=>	"Topic",
-posted_on					=>	"Posted:",
+posted_on					=>	"Post",
 attach_dl					=>	"Download attachment",
 DELETE_POST					=>	"Delete Posts",
 t_old					=>	"Next Oldest",
diff --git a/upload/lang/en/lang_ucp.php b/upload/lang/en/lang_ucp.php
index 9945b265..2f6fa66d 100644
--- a/upload/lang/en/lang_ucp.php
+++ b/upload/lang/en/lang_ucp.php
@@ -3,6 +3,143 @@
 $lang = array (
 
 
+//2.0
+
+'announce_delete' => "Delete",
+'announce_edit'   => "Edit",
+'announce_by'     => "By:",
+'conv_email_warning_title' => "EMAIL WARNING",
+'conv_email_warning' => "Your email address has been changed because it was in use by another account. This means that all email will NOT go to your correct email address - this could include lost password notifcations, etc.<br />PLEASE change your email address immediately.",
+
+'attach_topicmoved'  => '<i>This topic has been moved</i>',
+'attach_inpm'        =>'Personal Message',
+'m_gallery'          => 'Invision Gallery',
+'m_gallery_albums'   => 'Your Albums',
+'m_gallery_favs'     => 'Your Favorites',
+'m_gallery_controls' => 'Your Controls',
+'auto_track'      => "<b>Enable 'Email Notification' by default?<br />If ticked, choose default type:</b>",
+'auto_track_desc' => "Enabling this option will automatically subscribe you to any topic you start or reply to.",
+
+'subs_c_title'     => 'Subscription Information',
+'subs_c_forum'     => 'Forum Subscription:',
+'subs_c_topic'     => 'Topic Subscription:',
+'subs_c_type'      => 'Type',
+'subs_exp_text'    => 'Please choose your notification method.<br />Forum subscriptions will notify when new topics have been made and topic subscriptions notify when a reply has been made.',
+'subs_delayed'     => 'Delayed Emailed Notification',
+'subs_delayed_desc'   => "This option will send out a notification if a new topic or reply has been made and you're not active on the board.",
+'subs_immediate'      => 'Immediate Email Notification',
+'subs_immediate_desc' => 'This option will send out a notification immediately after a new topic or reply has been made regardless of your activity.',
+'subs_daily'       => 'Daily Email Digest',
+'subs_daily_desc'  => 'This option will send out a daily digest showing all new replies or topics for that day',
+'subs_weekly'      => 'Weekly Email Digest',
+'subs_weekly_desc' => 'This option will send out a weekly digest showing all new replies or topics for that week',
+'subs_none_title'  => 'No Email Notification',
+'subs_none_desc'   => 'This option will not send out any email notification but will retain the topic or forum in your subscriptions panel.',
+'subs_submit'      => 'Proceed',
+
+'subs_c_change'   => "Change to:",
+
+'announce_page_disabled' => "(Not Active)",
+'announce_del1' => "Are you sure you wish to delete this announcement?",
+'announce_del2' => "Ok, no action taken!",
+'announce_error_date'  => "The start or end date is not a real date, please check the dates entered.",
+'announce_error_title' => "You must enter a title and content for this announcement.",
+'announce_error_forums' => "You must choose at least one forum for this announcement.",
+'announce_title'       => "Title",
+'announce_author'      => "Author",
+'announce_end'         => "Ends",
+'announce_starts'      => "Starts",
+'announce_forums'      => "Forums",
+'announce_current'     => "Current Announcements",
+'announce_add'         => "Add Announcement",
+'announce_none'        => "There are no announcements",
+'announce_button_add'  => "Add Announcement",
+'announce_button_edit' => "Edit Announcement",
+'announce_form_title'  => "Announcement Title",
+'announce_form_start'  => "Start Date (MM-DD-YYYY)",
+'announce_form_end'  => "End Date (MM-DD-YYYY)",
+'announce_form_startdesc' => "Leave blank to not use a start date",
+'announce_form_enddesc' => "Leave blank to not use an end date",
+'announce_form_content' => "Announcement Content",
+'announce_form_forums'  => "Activate in Forums",
+'announce_form_forums2' => "You may choose more than one",
+'announce_form_allforums' => "-- All Forums --",
+'announce_use_html'       => "Enable HTML?",
+'announce_form_options'   => "Options",
+'announce_page_allforums' => "All Forums",
+'announce_page_numbforums' => "Forums...",
+'announce_form_enable'     => "Enable this announcement",
+
+'menu_announcements' => "Manage Announcements",
+'mfm_title_result' => 'Member Search Results',
+'cp_edit_user' => "Member Look-up",
+'cp_find_user' => "Enter part, or all of the username you wish to edit",
+'cp_find_submit' => "Find user",
+'cp_find_2_user' => "Please select a member from the matches",
+'cp_find_2_submit' => "Edit users profile",
+'cp_admin_user'    => "You cannot edit an administrators profile from this control panel",
+'cp_no_perms'      => "You do not have permission for this action.",
+
+
+'ipp_found' => "Your search returned the following number of matching posts:",
+'ipp_click' => "Click here to view the results in a new window",
+'ip_desc_text' => "<b><u>Resolve</u> IP Address</b>: This option will allow you to look up an IP address for more information (note, you must enter all 4 parts of the IP address to use this tool)<br /><b><u>Find Posts</u> with this IP</b>: This option will run a search for all posts associated with this IP address<br /><b><u>Find members</u> who registered with this IP</b>: This tool will run a seach for all members who registered with the entered IP address",
+'ip_warn_text' => "<b>Please Note</b>: You may enter a wildcard '*' (without quotes) as the last part of the IP address.<br />For example, 127.*.*.* will match all IP address that start with 127.<br />127.1.0.* will match all IP addresses that start with 127.1.0.<br />An error will occur if you attempt to use a wildcard in the middle of the IP address. For example, 127.*.0.1 will return an error.",
+'ip_enter'     => "<b>Enter the IP address</b>",
+'ip_submit'    => "Run Tool",
+'ip_resolve_result' => "The host name for %s is <b>%s</b><br /><br />Try visiting <a href='http://www.nic.com/cgi-bin/whois.cgi' target='_blank'>nic.com</a> to get more information by running this match via WHOIS.",
+'cp_no_matches'    => "There was no data returned from your search input, please try again",
+
+'ip_resolve'   => "Resolve",
+'ip_posts'     => "Find Posts",
+'ip_members'   => "Find Members",
+'ipm_title'  => "Member Search Results",
+'ipm_name'   => "Name",
+'ipm_ip'     => "IP Address",
+'ipm_posts'  => "Posts",
+'ipm_reg'    => "Date Registered",
+'ipm_options' => "Options",
+'ipm_group'  => "Group",
+'ipm_edit'  => "Edit Member",
+'ipm_view'  => "View Profile",
+
+'menu_title_mod' => 'Moderator Tools',
+'menu_ipsearch' => 'IP Address Look-up Tool',
+'menu_memsearch' => 'Member Look-up Tool',
+
+'m_attach'  => 'Manage Your Attachments',
+'attach_title' => 'Attachment',
+'attach_topic'  => 'Topic',
+'attach_date'  => 'Date',
+'attach_hsize'  => 'Size',
+'attach_delete' => 'Delete Selected',
+
+'attach_space_count' => "You have %s attachments (%s&#037; used)",
+'attach_space_used'  => 'You have used %s of %s',
+'attach_space_unl'   => 'You have used %s of global upload space.',
+
+'splash_last5'  => "Recently Read Topics",
+'splash_nopost' => 'No topics to show',
+'splash_attach' => 'Recent Attachments',
+'splash_noattach' => 'No recent attachments to display',
+
+'m_ignore_users' => "Manage Ignored Users",
+'mi5_title'      => "Manage your ignored users",
+'mi5_text'       => "This section allows you to set up your ignored users list.<br />When you add a user to your ignore list, any posts they make will be masked until you specify that you wish to read them. You may not be able to ignore users if they are in a member group which doesn't allow them to be added.",
+'mi5_norows'     => "Your ignore list is currently empty - you can add members below",
+'mi5_name' => "Name",
+'mi5_group' => "Group",
+'mi5_posts' => "Posts",
+'mi5_remove' => "Remove",
+'mi5_edit'   => "Update Ignored Users",
+'mi5_finduser' => "Find User",
+'mi5_addem' => 'Add new users to your list',
+'mi5_error' => "Error",
+'mi5_cantfind' => "Couldn't add the following: %s. This could be because they are already in your list or they are not affected by the ignore list or the member name does not exist.",
+
+///
+
+
 'pph_max2'     => "Photos must be no bigger than %s pixels by %s pixels.",
 'pph_max'      => "All photos must be no larger than %s kB.<br />",
 
@@ -38,7 +175,7 @@ $lang = array (
 'av_text_upload'  => "Uploaded avatars from your computer must be no larger than %s KB.",
 'av_allowed_files' => "The following file types are allowed: <strong>%s</strong>",
 'av_t_upload'  => "Uploaded File",
-'av_t_url'     => "URL Location",
+'av_t_url'     => "Offsite File",
 'av_t_gallery' => "Gallery Avatar",
 'av_t_na'      => "No avatar selected",
 'av_text_url'  => "Your avatar must be no bigger than %s pixels by %s pixels in size.",
@@ -98,11 +235,9 @@ $lang = array (
 'ft_forum' => "Forum",
 'ft_posts' => "Replies",
 'ft_topics' => "Topics",
-'ft_unsub'  => "Unsubscribe",
 'ft_newpost'  => "Start New Topic",
 'ft_last_post' => "Last Post",
 
-'ft_unsub_all' => "Unsubscribe from all forums",
 
 'subs_today'    => "Last day",
 'subs_day'       => "Last %s days",
@@ -115,7 +250,6 @@ $lang = array (
 'auto_prune'     => "Note: Subscriptions are pruned if there is no reply to the topic after %s days",
 'no_auto_prune'  => "Subscription auto pruning is switched off at present",
 
-'auto_track'      => "<b>Enable 'Email Notification' by default?</b><br />Enabling this option will automatically subscribe you to any topic you start or reply to.",
 
 'cf_required'     => "Required Information, this section must be completed",
 
@@ -124,7 +258,7 @@ $lang = array (
 'pp_use_default'   => "Use forum default",
 
 'mess_saved'   => "Saved (Unsent) PMs",
-'dst_box' => "<b>Is daylight savings time in effect?</b><br />(If you have selected the correct time zone and the clock appears an hour out, check or uncheck box to suit)",
+'dst_box' => "<b>Is daylight saving time in effect?</b><br />(If you have selected the correct time zone and the clock appears an hour out, check or uncheck box to suit)",
 
 
 
@@ -167,7 +301,6 @@ $lang = array (
 
 'm_email_opt' => "Email Settings",
 'm_board_opt' => "Board Settings",
-'m_skin_lang' => "Skin and Languages",
 'm_email_change' => "Change Email Address",
 'm_passy_opt'    => "Change Password",
 
@@ -219,7 +352,7 @@ $lang = array (
 
 //----------------------
 
-'cp_skin_preview'  => "Preview this skin",
+
 
 
 total_posts					=>	"Total Posts",
@@ -291,7 +424,6 @@ avatar_pre_title					=>	"Pre-installed avatars",
 month8					=>	"August",
 lp_redirect					=>	"Email dispatched",
 month9					=>	"September",
-settings_lang_txt					=>	"Please select a language for the board interface",
 settings_hour					=>	"Hours",
 edit_profile					=>	"Edit your profile",
 messenger_url					=>	"Go to your messenger",
@@ -320,7 +452,6 @@ account					=>	"Modify Account",
 month12					=>	"December",
 hide_email					=>	"<b>Hide my email address from other members</b><br />Enabling this option will deny other members sending you an email via the board.",
 account_email_txt					=>	"Your Email Address",
-settings_skin					=>	"Board 'Skin'",
 account_pass_new2					=>	"Please confirm your NEW password",
 website					=>	"<b>Your website url</b>",
 account_pass_title					=>	"Your Password",
@@ -356,7 +487,7 @@ submit_profile					=>	"Amend my profile",
 avatar_click					=>	"Click on one of the avatars in this list to add it into the 'Your Avatar' box.",
 location					=>	"<b>Your Location</b>",
 avatar_url_ext					=>	"The following file types are allowed: ",
-email_address					=>	"Your registered email address",
+email_address					=>	"Email address",
 pm_reminder					=>	"<b>Send a confirmation email when I receive a new private message</b><br />Enabling this option will send an email confirmation of any new private messages sent to you.",
 subs_last_post					=>	"Last Post",
 email					=>	"Email Settings",
@@ -365,9 +496,8 @@ settings					=>	"Account Options",
 photo					=>	"<b>You may enter a URL for a personal photograph</b><br />[This will only be displayed on your profile - not with your posts]",
 js_so_far					=>	"characters so far",
 email_help					=>	"This is where you can change your email settings",
-settings_dopopup					=>	"Do you wish to get a pop up notification when you get a new private message?",
+settings_dopopup					=>	"Do you wish to get a board notification when you get a new personal message?",
 settings_display					=>	"Board Display Settings",
-settings_skin_txt					=>	"You may choose a 'skin' to use.<br />This will change the way the board looks",
 send_full_msg					=>	"<b>Include a copy of the post when emailing me from a subscribed topic</b><br />Enabling this option will send a plain text version of the post in the subscription email.",
 member_title					=>	"Custom member title",
 yes					=>	"Yes",
@@ -380,7 +510,7 @@ settings_lang					=>	"Board Interface Language",
 pixels					=>	"pixels",
 t_welcome					=>	"Welcome to your control panel",
 personal					=>	"Personal Info",
-daily_average					=>	"Average number of posts per day",
+daily_average					=>	"Average posts per day",
 account_pass_submit					=>	"Change my Password",
 stats_header					=>	"Your account summary",
 settings_time					=>	"Time Zone",
@@ -389,9 +519,9 @@ no_posts					=>	"You've yet to post",
 subs					=>	"Topic Tracker",
 subs_deleted					=>	"The subscription has been deleted",
 msn					=>	"<b>Your MSN Messenger identity</b>",
-registered					=>	"You registered on ",
+registered					=>	"Registered on ",
 subs_by					=>	"By:",
-number_posts					=>	"Total number of posts to date",
+number_posts					=>	"Posts",
 account_pass_old					=>	"Enter your CURRENT password",
 js_characters					=>	"characters",
 account_email_req					=>	"You will receive an email asking you to verify this change",
@@ -411,29 +541,29 @@ $lang['time_-9']  = "(GMT - 9:00 hours) Alaska";
 $lang['time_-8']  = "(GMT - 8:00 hours) Pacific Time (US &amp; Canada)";
 $lang['time_-7']  = "(GMT - 7:00 hours) Mountain Time (US &amp; Canada)";
 $lang['time_-6']  = "(GMT - 6:00 hours) Central Time (US &amp; Canada), Mexico City";
-$lang['time_-5']  = "(GMT - 5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito";
+$lang['time_-5']  = "(GMT - 5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima";
 $lang['time_-4']  = "(GMT - 4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
 $lang['time_-3.5'] = "(GMT - 3:30 hours) Newfoundland";
-$lang['time_-3']   = "(GMT - 3:00 hours) Brazil, Buenos Aires, Georgetown, Falkland Is.";
+$lang['time_-3']   = "(GMT - 3:00 hours) Brazil, Buenos Aires, Falkland Is.";
 $lang['time_-2']   = "(GMT - 2:00 hours) Mid-Atlantic, Ascention Is., St Helena";
 $lang['time_-1']   = "(GMT - 1:00 hours) Azores, Cape Verde Islands";
-$lang['time_0']    = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
-$lang['time_1']    = "(GMT + 1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome";
+$lang['time_0']    = "(GMT) Casablanca, Dublin, London, Lisbon, Monrovia";
+$lang['time_1']    = "(GMT + 1:00 hours) Brussels, Copenhagen, Madrid, Paris";
 $lang['time_2']    = "(GMT + 2:00 hours) Kaliningrad, South Africa, Warsaw";
 $lang['time_3']    = "(GMT + 3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
 $lang['time_3.5']  = "(GMT + 3:30 hours) Tehran";
 $lang['time_4']    = "(GMT + 4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi";
 $lang['time_4.5']  = "(GMT + 4:30 hours) Kabul";
-$lang['time_5']    = "(GMT + 5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
+$lang['time_5']    = "(GMT + 5:00 hours) Ekaterinburg, Karachi, Tashkent";
 $lang['time_5.5']  = "(GMT + 5:30 hours) Bombay, Calcutta, Madras, New Delhi";
 $lang['time_6']    = "(GMT + 6:00 hours) Almaty, Colomba, Dhakra";
 $lang['time_7']    = "(GMT + 7:00 hours) Bangkok, Hanoi, Jakarta";
-$lang['time_8']    = "(GMT + 8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
+$lang['time_8']    = "(GMT + 8:00 hours) Hong Kong, Perth, Singapore, Taipei";
 $lang['time_9']    = "(GMT + 9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
 $lang['time_9.5']  = "(GMT + 9:30 hours) Adelaide, Darwin";
-$lang['time_10']   = "(GMT + 10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok";
-$lang['time_11']   = "(GMT + 11:00 hours) Magadan, New Caledonia, Solomon Islands";
-$lang['time_12']   = "(GMT + 12:00 hours) Auckland, Wellington, Fiji, Marshall Island";
+$lang['time_10']   = "(GMT + 10:00 hours) Melbourne, Papua New Guinea, Sydney";
+$lang['time_11']   = "(GMT + 11:00 hours) Magadan, New Caledonia, Solomon Is.";
+$lang['time_12']   = "(GMT + 12:00 hours) Auckland, Fiji, Marshall Island";
 
 
 
diff --git a/upload/lofiversion/index.php b/upload/lofiversion/index.php
new file mode 100644
index 00000000..35308aa9
--- /dev/null
+++ b/upload/lofiversion/index.php
@@ -0,0 +1,833 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2003 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > LO-FI VERSION!
+|   > Script written by Matt Mecham
+|   > Date started: 11th March 2004
+|   > Interesting fact: Wrote this while listening to the Stereophonic's
+|   > 'Performance and Cocktails' CD. That was when they were good.
+|   > Lo-fi feature took about 1.5 days to write. That's a lot of CD
+|   > repeating...
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+define( 'LOFI_NAME'  , 'lofiversion' );
+
+if ( substr(PHP_OS, 0, 3) == 'WIN' OR php_sapi_name() == 'cgi' OR php_sapi_name() == 'apache2filter' )  
+{
+	define( 'THIS_PATH', str_replace( '\\', '/', dirname( __FILE__ ) ) .'/' );
+	define( 'ROOT_PATH', str_replace( LOFI_NAME, '', THIS_PATH ) );
+	define( 'SERVER'   , 'WIN' );
+}
+else
+{
+	define( 'THIS_PATH', './'  );
+	define( 'ROOT_PATH', '../' );
+	define( 'SERVER'   , 'UNX' );
+}
+
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define ( 'IN_IPB', 1 );
+define ( 'IN_DEV', 0 );
+ 
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+//===========================================================================
+// DEBUG CLASS
+//===========================================================================
+
+class Debug
+{
+    function startTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $starttime = $mtime;
+    }
+    function endTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $endtime = $mtime;
+        $totaltime = round (($endtime - $starttime), 5);
+        return $totaltime;
+    }
+}
+
+//===========================================================================
+// INFO CLASS
+//===========================================================================
+
+class info {
+
+	var $member       = array();
+	var $input        = array();
+	var $session_id   = "";
+	var $base_url     = "";
+	var $vars         = "";
+	var $lang_id      = "en";
+	var $skin         = "";
+	var $lang         = "";
+	var $server_load  = 0;
+	var $version    = "v2.0.0 ";
+	var $lastclick    = "";
+	var $location     = "";
+	var $debug_html   = "";
+	var $perm_id      = "";
+	var $forum_read   = array();
+	var $topic_cache  = "";
+	var $session_type = "";
+	var $skin_global  = "";
+	var $loaded_templates = array();
+    
+	function info()
+	{
+		global $sess, $std, $DB, $INFO;
+		
+		$this->vars = &$INFO;
+		
+		$this->vars['AVATARS_URL']     = 'style_avatars';
+		$this->vars['EMOTICONS_URL']   = 'style_emoticons/<#EMO_DIR#>';
+		$this->vars['mime_img']        = 'style_images/<#IMG_DIR#>/folder_mime_types';
+
+	}
+}
+
+//===========================================================================
+// MAIN PROGRAM
+//===========================================================================
+
+//--------------------------------
+// Import $INFO, now!
+//--------------------------------
+
+$INFO = array();
+
+require ROOT_PATH."conf_global.php";
+
+//--------------------------------
+// The clocks a' tickin'
+//--------------------------------
+		
+$Debug = new Debug;
+$Debug->startTimer();
+
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
+
+$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mysql' : $INFO['sql_driver'];
+
+require ( KERNEL_PATH.'class_db_'.strtolower($INFO['sql_driver']).".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['use_shutdown']     = 0;
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.strtolower($INFO['sql_driver']).'_queries.php';
+$DB->obj['debug']            = 0;
+
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+//--------------------------------
+// Wrap it all up in a nice easy to
+// transport super class
+//--------------------------------
+
+$ibforums = new info();
+
+//--------------------------------
+// Require our global functions
+//--------------------------------
+
+require ROOT_PATH."sources/functions.php";
+require ROOT_PATH."sources/classes/class_display.php";
+require ROOT_PATH."sources/classes/class_session.php";
+require ROOT_PATH."sources/classes/class_forums.php";
+
+$std    = new FUNC;
+$print  = new display();
+$sess   = new session();
+$forums = new forum_functions();
+
+//--------------------------------
+//  Set up our vars
+//--------------------------------
+
+$ibforums->input = $std->parse_incoming();
+
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( ".$choice[ strtolower($ibforums->input['act']) ][2]."'attachtypes','bbcode', 'multimod','ranks','profilefields','banfilters', 'settings', 'group_cache', 'systemvars', 'skin_id_cache', 'forum_cache', 'moderators', 'stats', 'languages' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$tmp = unserialize(stripslashes($r['cs_value']));
+		
+		if ( is_array( $tmp ) and count( $tmp ) )
+		{
+			foreach( $tmp as $k => $v )
+			{
+				$ibforums->vars[ $k ] = $v;
+			}
+		}
+		
+		unset( $tmp );
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$ibforums->cache[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$ibforums->cache[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+//--------------------------------
+//  The rest :D
+//--------------------------------
+
+$ibforums->member     = $sess->authorise();
+$std->load_skin();
+
+$ibforums->vars['display_max_topics'] = 150;
+$ibforums->vars['display_max_posts']  = 50;
+
+//--------------------------------
+//  Initialize the FUNC
+//--------------------------------
+
+$std->FUNC_init();
+
+//--------------------------------
+//  Initialize the forums
+//--------------------------------
+
+$forums->strip_invisible = 1;
+$forums->forums_init();
+
+$ibforums->session_id = "";
+$ibforums->base_url   = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?';
+
+//--------------------------------
+//  Do we have permission to view
+//  the board?
+//--------------------------------
+
+if ($ibforums->member['g_view_board'] != 1)
+{ 
+	$std->boink_it( $ibforums->base_url );
+}
+
+//--------------------------------
+//  Is the board offline?
+//--------------------------------
+
+if ($ibforums->vars['board_offline'] == 1)
+{
+	if ($ibforums->member['g_access_offline'] != 1)
+	{
+		$std->boink_it( $ibforums->base_url );
+	}
+}
+
+//--------------------------------
+//  Is log in enforced?
+//--------------------------------
+
+if ( (! $ibforums->member['id']) and ($ibforums->vars['force_login'] == 1) )
+{
+	$std->boink_it( $ibforums->base_url );
+	
+}
+
+//===========================================================================
+// DO STUFF!
+//===========================================================================
+
+//--------------------------------
+// Require 'skin'
+//--------------------------------
+
+require_once( THIS_PATH.'lofi_skin.php' );
+
+//--------------------------------
+// Not index.php/ ? Redirect
+// We do this so we can use relative
+// links...
+//--------------------------------
+
+$main_string = $_SERVER['REQUEST_URI'] ? $_SERVER['REQUEST_URI'] : $_SERVER['PHP_SELF'];
+
+if ( SERVER == 'WIN' )
+{
+	$winpath     = $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php?';
+	$main_string = $_SERVER['QUERY_STRING'];
+}
+else
+{
+	if ( strpos( $main_string, '/'.LOFI_NAME.'/index.php/' ) === FALSE  )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php/' );
+	}
+	
+	if ( strstr( $main_string, "/" ) )
+	{
+		$main_string = str_replace( "/", "", strrchr( $main_string, "/" ) );
+	}
+}
+
+$main_string = str_replace( ".html", "", $main_string );
+
+$action = 'index';
+$id    = 0;
+$st    = 0;
+
+//--------------------------------
+// Pages?
+//--------------------------------
+
+if ( strstr( $main_string, "-" ) )
+{
+	list( $main, $start ) = explode( "-", $main_string );
+	
+	$main_string = $main;
+	$st          = $start;
+}
+
+$st = intval($st);
+
+//--------------------------------
+// What we doing?
+//--------------------------------
+
+if ( strstr( $main_string, 't' ) )
+{
+	$action = 'topic';
+	$id    = intval( str_replace( "t", "", $main_string ) );
+}
+else if ( strstr( $main_string, 'f' ) )
+{
+	$action = 'forum';
+	$id    = intval( str_replace( "f", "", $main_string ) );
+}
+
+//--------------------------------
+// Do it!
+//--------------------------------
+
+$output = "";
+
+switch ( $action )
+{
+	case 'forum':
+		$ibforums->real_link = $ibforums->base_url.'showforum='.$id;
+		$output = get_forum_page($id, $st);
+		break;
+	case 'topic':
+		$ibforums->real_link = $ibforums->base_url.'showtopic='.$id;
+		$output = get_topic_page($id, $st);
+		break;
+	default:
+		$ibforums->real_link = $ibforums->base_url;
+		$output = get_index_page();
+		break;
+}
+
+print_it($output);
+
+
+//--------------------------------
+// Board index
+//--------------------------------
+
+function get_index_page()
+{
+	global $ibforums, $std, $DB, $forums, $LOFISKIN;
+	
+	return LOFISKIN_forums( _get_forums() );
+}
+
+//--------------------------------
+// Forums index
+//--------------------------------
+
+function get_forum_page($id, $st)
+{
+	global $ibforums, $std, $DB, $forums, $LOFISKIN, $navarray, $winpath;
+	
+	$output = "";
+	
+	if ( $std->check_perms($forums->forum_by_id[$id]['read_perms']) != TRUE and ( ! $forums->forum_by_id[$id]['permission_showtopic'] ) )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php' );
+	}
+	
+	//--------------------------------
+	// Passy?
+	//--------------------------------
+	
+	if ( $forums->forum_by_id[$id]['password'] != '' )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php' );
+	}
+	
+	//--------------------------------
+	// Nav array...
+	//--------------------------------
+	
+	$navarray = _get_nav_array($id);
+	
+	$ibforums->title = $forums->forum_by_id[ $id ]['name'];
+	
+	if ( ! $forums->forum_by_id[ $id ]['sub_can_post'] )
+	{
+		//--------------------------------
+		// Show forums?
+		//--------------------------------
+		
+		if ( is_array($forums->forum_cache[ $id ]) and count($forums->forum_cache[ $id ]) )
+		{
+			$html_string .= LOFISKIN_forums_entry_first($forums->forum_by_id[ $id ]);
+			
+			$depth_guide = "";
+			
+			foreach( $forums->forum_cache[ $id ] as $cid => $forum_data )
+			{
+				$forum_data['total_posts'] = intval( $forum_data['topics'] + $forum_data['posts'] );
+				
+				$html_string .= LOFISKIN_forums_entry($depth_guide, $forum_data, $winpath );
+				
+				$html_string = _get_forums_internal( $forum_data['id'], $html_string, "   ".$depth_guide );
+			}
+			
+			$html_string .= LOFISKIN_forums_entry_end($depth_guide);
+		}
+		
+		$output = $html_string;
+		
+		//--------------------------------
+		// Return..
+		//--------------------------------
+	
+		return LOFISKIN_forums($output);
+	}
+	else
+	{
+		//--------------------------------
+		// Show topics...
+		//--------------------------------
+		
+		$ibforums->pages = _get_pages( $forums->forum_by_id[ $id ]['topics'], $ibforums->vars['display_max_topics'], 'f'.$id );
+		
+		if ( ! $ibforums->member['g_other_topics'])
+		{
+			$query = " and starter_id=".$ibforums->member['id'];
+		}
+		
+		//--------------------------------
+		// Topics...
+		//--------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'topics',
+									  'where'  => "approved=1 and forum_id=$id".$query,
+									  'order'  => 'pinned desc, last_post desc',
+									  'limit'  => array( $st, $ibforums->vars['display_max_topics'] )
+							 )      );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			if ( $r['pinned'] )
+			{
+				$r['_prefix'] = 'Pinned: ';;
+			}
+			else
+			{
+				$r['_prefix'] = "";
+			}
+			
+			if ($r['state'] == 'link')
+			{
+				$t_array = explode("&", $r['moved_to']);
+				$r['tid']       = $t_array[0];
+				$r['forum_id']  = $t_array[1];
+				$r['title']     = $r['title'];
+				$r['posts']     = '--';
+				$r['_prefix']   = 'Moved: ';
+			}
+			
+			$output .= LOFISKIN_topics_entry($r, $winpath);
+		}
+		
+		//--------------------------------
+		// Return..
+		//--------------------------------
+	
+		return LOFISKIN_topics($output);
+	}
+}
+
+//--------------------------------
+// Topics index
+//--------------------------------
+
+function get_topic_page($id, $st)
+{
+	global $ibforums, $std, $DB, $forums, $LOFISKIN, $navarray, $winpath;
+	
+	$output = "";
+	
+	//--------------------------------
+	// Get post_parser
+	//--------------------------------
+	
+	require_once( ROOT_PATH."sources/lib/post_parser.php" );
+	$parser = new post_parser();
+	
+	//--------------------------------
+	// get topic
+	//--------------------------------
+	
+	$topic = $DB->simple_exec_query( array( 'select' => '*', 'from'   => 'topics', 'where'  => "tid=".$id." and approved=1" ) );
+						
+	if ( ! $topic['tid'] )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php/' );
+	}
+	
+	if ( ! $forums->forum_by_id[ $topic['forum_id'] ] )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php/' );
+	}
+	
+	if ( $forums->forums_check_access( $topic['forum_id'], 0 ) )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php/' );
+	}
+	
+	if ( $forums->read_topic_only )
+	{
+		$std->boink_it( $ibforums->vars['board_url'].'/'.LOFI_NAME.'/index.php/' );
+	}
+	
+	$ibforums->pages = _get_pages( $topic['posts'], $ibforums->vars['display_max_posts'], 't'.$id );
+	
+	$ibforums->title = $topic['title'];
+	
+	//--------------------------------
+	// get posts...
+	//--------------------------------
+	
+	$DB->simple_construct( array( 'select' => '*',
+								  'from'   => 'posts',
+								  'where'  => "topic_id={$id} AND queued <> 1",
+								  'order'  => 'pid',
+								  'limit'  => array( $st, $ibforums->vars['display_max_posts'] )
+						 )     );
+						  
+	$DB->simple_exec();
+	
+	while( $r = $DB->fetch_row() )
+	{
+		$r['post']      = nl2br( $parser->strip_all_tags_to_formatted( $r['post'] ) );
+		$r['post_date'] = $std->get_date( $r['post_date'], 'LONG', 1 );
+		
+		$parser->pp_do_html  = ( $forums->forum_by_id[ $topic['forum_id'] ]['use_html'] and $ibforums->cache['group_cache'][ $poster['mgroup'] ]['g_dohtml'] and $r['post_htmlstate'] ) ? 1 : 0;
+		$parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+		$parser->pp_nl2br    = $r['post_htmlstate'] == 2 ? 1 : 0;
+		
+		$r['post'] = $parser->post_db_parse( $r['post'] );
+		
+		$output .= LOFISKIN_posts_entry($r, $winpath);
+	}
+	
+	//--------------------------------
+	// Nav array...
+	//--------------------------------
+	
+	
+	$navarray   = _get_nav_array( $topic['forum_id'] );
+	
+	return $output;
+	
+}
+
+//--------------------------------
+// Print it
+//--------------------------------
+
+function print_it($content, $title='')
+{
+	global $ibforums, $std, $DB, $forums, $LOFISKIN, $navarray, $print;
+	
+	$fullurl   = $ibforums->vars['board_url'].'/'.LOFI_NAME.'/';
+	
+	$copyright = "Invision Power Board &copy; 2001-".date("Y")." <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>";
+	
+	if ( $ibforums->vars['ips_cp_purchase'] )
+	{
+		$copyright = "";
+	}
+        
+	//--------------------------------
+	// Nav
+	//--------------------------------
+	
+	$nav = "<a href='./'>".$ibforums->vars['board_name']."</a>";
+	
+	if ( count($navarray) )
+	{
+		$nav .= " &gt; " . implode( " &gt; ", $navarray );
+	}
+	
+	$title = $ibforums->title ? $ibforums->vars['board_name'].' &gt; '.$ibforums->title : $ibforums->vars['board_name'];
+	
+	$pages = "";
+	
+	if ( $ibforums->pages )
+	{
+		$pages = LOFISKIN_pages( $ibforums->pages );
+	}
+	
+	$output = str_replace( '<% TITLE %>'    , $title    , $LOFISKIN['wrapper'] );
+	$output = str_replace( '<% CONTENT %>'  , $content  , $output );
+	$output = str_replace( '<% FULL_URL %>' , $fullurl  , $output );
+	$output = str_replace( '<% COPYRIGHT %>', $copyright, $output );
+	$output = str_replace( '<% NAV %>'      , $nav      , $output );
+	$output = str_replace( '<% LINK %>'     , $ibforums->real_link, $output );
+	$output = str_replace( '<% LARGE_TITLE %>', $ibforums->title ? $ibforums->title : $ibforums->vars['board_name'], $output );
+	$output = str_replace( '<% PAGES %>'     , $pages, $output );
+	
+	//-----------------------------------------
+	// Macros
+	//-----------------------------------------
+	
+	$print->_unpack_macros();
+	
+	if ( is_array( $print->macros ) )
+	{
+		foreach( $print->macros as $i => $row )
+		{
+			if ( $row['macro_value'] != "" )
+			{
+				$output = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $output );
+			}
+		}
+	}
+	
+	$output = preg_replace( "#([^/])style_images/(<\#IMG_DIR\#>|".preg_quote($ibforums->skin['_imagedir'], '/').")#is", "\\1".$ibforums->vars['board_url']."/style_images/\\2", $output );
+	$output = str_replace( "style_emoticons/", $ibforums->vars['board_url']."/style_emoticons/", $output );
+		
+	$output = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $output );
+	$output = str_replace( "<#EMO_DIR#>", $ibforums->skin['_emodir']  , $output );
+	
+	
+		
+	print $output;
+}
+
+
+
+
+
+
+//--------------------------------
+// Recursively get forums
+//--------------------------------
+
+function _get_forums()
+{
+	global $ibforums, $forums, $LOFISKIN, $winpath;
+	
+	foreach( $forums->forum_cache['root'] as $id => $forum_data )
+	{
+		if ( is_array($forums->forum_cache[ $forum_data['id'] ]) and count($forums->forum_cache[ $forum_data['id'] ]) )
+		{
+			$html_string .= LOFISKIN_forums_entry_first($forum_data, $winpath);
+			
+			$depth_guide = "";
+			
+			if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+			{
+				foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+				{
+					if ( ! $forum_data['redirect_on'] )
+					{
+						$forum_data['total_posts'] = intval( $forum_data['topics'] + $forum_data['posts'] );
+						
+						$html_string .= LOFISKIN_forums_entry($depth_guide, $forum_data, $winpath );
+						
+						$html_string = _get_forums_internal( $forum_data['id'], $html_string, "   ".$depth_guide );
+					}
+				}
+			}
+			
+			$html_string .= LOFISKIN_forums_entry_end($depth_guide);
+		}
+	}
+	
+	return $html_string;
+}
+
+function _get_forums_internal($root_id, $html_string="", $depth_guide="")
+{
+	global $ibforums, $forums, $LOFISKIN, $winpath;
+	
+	if ( is_array( $forums->forum_cache[ $root_id ] ) )
+	{
+		$html_string .=  LOFISKIN_forums_entry_start($depth_guide);
+	
+		foreach( $forums->forum_cache[ $root_id ] as $id => $forum_data )
+		{
+			if ( ! $forum_data['redirect_on'] )
+			{
+				$forum_data['total_posts'] = intval( $forum_data['topics'] + $forum_data['posts'] );
+				
+				$html_string .= LOFISKIN_forums_entry($depth_guide, $forum_data, $winpath );
+				
+				$html_string = _get_forums_internal( $forum_data['id'], $html_string, "    ".$depth_guide );
+			}
+		}
+		
+		$html_string .= LOFISKIN_forums_entry_end($depth_guide);
+	}
+	
+	return $html_string;
+}
+
+
+
+function _get_nav_array($id)
+{
+	global $ibforums, $forums, $LOFISKIN, $winpath;
+	
+	$navarray[] = "<a href='{$winpath}f{$id}.html'>{$forums->forum_by_id[$id]['name']}</a>";
+	
+	$ids = $forums->forums_get_parents( $id );
+	
+	if ( is_array($ids) and count($ids) )
+	{
+		foreach( $ids as $id )
+		{
+			$data = $forums->forum_by_id[$id];
+		
+			$navarray[] = "<a href='{$winpath}f{$data['id']}.html'>{$data['name']}</a>";
+		}
+	}
+	
+	return array_reverse($navarray);
+}
+
+
+function _get_pages( $total, $pp, $id )
+{
+	global $ibforums, $forums, $LOFISKIN, $navarray;
+	
+	$page_array = array();
+	
+	//-----------------------------------------------
+	// Get the number of pages
+	//-----------------------------------------------
+	
+	$pages = ceil( $total / $pp );
+	
+	$pages = $pages ? $pages : 1;
+	
+	if ( $pages < 2 )
+	{
+		return "";
+	}
+	
+	//-----------------------------------------------
+	// Loppy loo
+	//-----------------------------------------------
+	
+	if ($pages > 1)
+	{
+		for( $i = 0; $i <= $pages - 1; ++$i )
+		{
+			$RealNo = $i * $pp;
+			$PageNo = $i+1;
+			
+			$page_array[] = "<a href='{$id}-{$RealNo}.html'>{$PageNo}</a>";
+		}
+		
+	}
+	
+	return implode( ", ", $page_array );
+}
+
+//+-------------------------------------------------
+// GLOBAL ROUTINES
+//+-------------------------------------------------
+
+function fatal_error($message="", $help="")
+{
+	echo("$message<br><br>$help");
+	exit;
+}
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/lofiversion/lofi_skin.php b/upload/lofiversion/lofi_skin.php
new file mode 100644
index 00000000..4b31f08e
--- /dev/null
+++ b/upload/lofiversion/lofi_skin.php
@@ -0,0 +1,111 @@
+<?php
+
+$LOFISKIN['wrapper'] = <<<EOF
+<!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" xml:lang="en" lang="en">
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+	<meta name="robots" content="index,follow" />
+	<link rel="stylesheet" rev="stylesheet" href="<% FULL_URL %>lofiscreen.css" media="screen" />
+	<link rel="stylesheet" rev="stylesheet" href="<% FULL_URL %>lofihandheld.css" media="handheld" />
+	<link rel="stylesheet" rev="stylesheet" href="<% FULL_URL %>lofiprint.css" media="print" />
+	<title><% TITLE %></title>
+</head>
+<body>
+<div id='ipbwrapper'>
+  <div class='ipbnavsmall'>
+   <a href='{$ibforums->base_url}act=Help'>Help</a> -
+   <a href='{$ibforums->base_url}act=Search'>Search</a> -
+   <a href='{$ibforums->base_url}act=Members'>Member List</a> -
+   <a href='{$ibforums->base_url}act=calendar'>Calendar</a>
+  </div>
+  <div id='largetext'>Full Version: <a href='<% LINK %>'><% LARGE_TITLE %></a></div>
+  <div class='ipbnav'><% NAV %></div>
+  <% PAGES %>
+  <div id='ipbcontent'>
+  <% CONTENT %>
+  </div>
+  <div class='smalltext'>This is a "lo-fi" version of our main content. To view the full version with more information, formatting and images, please <a href='<% LINK %>'>click here</a>.</div>
+</div>
+<div id='ipbcopyright'><% COPYRIGHT %></div>
+</body>
+</html>
+EOF;
+
+
+function LOFISKIN_forums($forums="") {
+return <<<EOF
+<div class='forumwrap'>
+<ul>
+$forums
+</ul>
+</div>
+EOF;
+}
+
+function LOFISKIN_forums_entry($depth_guide, $forum_data, $win_path="" ) {
+return <<<EOF
+\n{$depth_guide}<li><a href='{$win_path}f{$forum_data['id']}.html'>{$forum_data['name']}</a> <span class='desc'>({$forum_data['total_posts']} posts)</span></li>
+EOF;
+}
+
+
+function LOFISKIN_forums_entry_end($depth_guide) {
+return <<<EOF
+\n{$depth_guide}</ul></li>
+EOF;
+}
+
+function LOFISKIN_forums_entry_start($depth_guide) {
+return <<<EOF
+\n{$depth_guide}<li><ul>
+EOF;
+}
+
+function LOFISKIN_forums_entry_first($forum_data, $win_path="") {
+return <<<EOF
+\n<li><strong><a href='{$win_path}f{$forum_data['id']}.html'>{$forum_data['name']}</a></strong></li>\n<ul>
+EOF;
+}
+
+
+function LOFISKIN_topics($topics="") {
+return <<<EOF
+<div class='topicwrap'>
+<ol>
+$topics
+</ol>
+</div>
+EOF;
+}
+
+function LOFISKIN_topics_entry($r, $win_path="") {
+return <<<EOF
+\n<li>{$r['_prefix']}<a href='{$win_path}t{$r['tid']}.html'>{$r['title']}</a> <span class='desc'>({$r['posts']} replies)</span></li>
+EOF;
+}
+
+function LOFISKIN_posts_entry($r) {
+return <<<EOF
+<div class='postwrapper'>
+ <div class='posttopbar'>
+  <div class='postname'>{$r['author_name']}</div>
+  <div class='postdate'>{$r['post_date']}</div>
+ </div>
+ <div class='postcontent'>
+  {$r['post']}
+ </div>
+</div>
+EOF;
+}
+
+function LOFISKIN_pages($pages="") {
+return <<<EOF
+<div class='ipbpagespan'>
+Pages: $pages
+</div>
+EOF;
+}
+
+?>
\ No newline at end of file
diff --git a/upload/lofiversion/lofihandheld.css b/upload/lofiversion/lofihandheld.css
new file mode 100644
index 00000000..714ce4d9
--- /dev/null
+++ b/upload/lofiversion/lofihandheld.css
@@ -0,0 +1,8 @@
+/*=============================================*/
+/* LO-FI SCREEN CSS FILE                       */
+/* (c) 2004 Invision Power Services, Inc.      */
+/* This CSS by: Matthew Mecham                 */
+/*=============================================*/
+
+@import url(lofiscreen.css);
+
diff --git a/upload/lofiversion/lofiprint.css b/upload/lofiversion/lofiprint.css
new file mode 100644
index 00000000..714ce4d9
--- /dev/null
+++ b/upload/lofiversion/lofiprint.css
@@ -0,0 +1,8 @@
+/*=============================================*/
+/* LO-FI SCREEN CSS FILE                       */
+/* (c) 2004 Invision Power Services, Inc.      */
+/* This CSS by: Matthew Mecham                 */
+/*=============================================*/
+
+@import url(lofiscreen.css);
+
diff --git a/upload/lofiversion/lofiscreen.css b/upload/lofiversion/lofiscreen.css
new file mode 100644
index 00000000..669ebb48
--- /dev/null
+++ b/upload/lofiversion/lofiscreen.css
@@ -0,0 +1,208 @@
+/*=============================================*/
+/* LO-FI SCREEN CSS FILE                       */
+/* (c) 2004 Invision Power Services, Inc.      */
+/* This CSS by: Matthew Mecham                 */
+/*=============================================*/
+
+BODY
+{ 
+	background-color: #FFF;
+	color: #000;
+	font-family: Verdana, Tahoma, Arial, Trebuchet MS, Sans-Serif, Georgia, Courier, Times New Roman, Serif;
+	font-size: 1em;
+	margin: 20px;
+	padding: 0px;
+}
+
+.ipbnav
+{
+	font-size: 11px;
+	font-weight: bold;
+	border:1px solid gray;
+	padding:10px;
+}
+
+.ipbpagespan
+{
+	font-size: 11px;
+	font-weight: bold;
+	border:1px solid gray;
+	padding:10px;
+	margin-top: 10px;
+}
+
+.ipbnavsmall
+{
+	font-size: 10px;
+	font-weight: bold;
+	border:1px dotted lightgray;
+	padding:8px 8px 8px 8px;
+	text-align:center;
+	width:350px;
+	float:right;
+}
+
+#largetext
+{
+	font-size: 1.0em;
+	font-weight: bold;
+	margin-bottom: 10px;
+	padding-top: 3px;
+	width:auto;
+}
+
+#ipbwrapper
+{
+
+}
+
+#ipbcopyright
+{
+	margin-top: 10px;
+	font-size: 10px;
+	text-align:center;
+}
+
+#ipbcontent
+{
+	padding: 10px;
+	margin-top:10px;
+	border:1px solid gray;
+}
+
+
+
+.topicwrap,
+.forumwrap
+{
+	line-height:130%;
+}
+
+.topicwrap ul,
+.forumwrap ul
+{
+	list-style-type: none;
+}
+
+.topicwrap li,
+.forumwrap li
+{
+	font-size: 1em;
+}
+
+.forumwrap strong
+{
+	font-size: 1.1em;
+	font-weight: bold;
+}
+
+.desc
+{
+	color: gray;
+	font-size: 10px;
+}
+
+.smalltext
+{
+	color: gray;
+	font-size: 10px;
+	text-align:center;
+	padding:10px;
+}
+
+/*---------------------------------------*/
+/* Post view */
+/*---------------------------------------*/
+
+
+.postwrapper
+{
+	border:1px solid #E6E3E4;
+	padding:1px;
+	margin-bottom: 15px;
+}
+
+.posttopbar
+{
+	background-color: #E6E3E4;
+	padding: 6px;
+}
+
+.postname
+{
+	font-weight: bold;
+	font-size: 0.8em;
+	width: auto;
+	float:left;
+}
+
+.postdate
+{
+	width:auto;
+	font-size: 0.8em;
+	color: gray;
+	text-align:right;
+}
+
+.postcontent
+{
+	padding: 6px;
+	font-size: 0.8em;
+}
+
+/*---------------------------------------*/
+/* NEW QUOTE / CODE WRAPPERS             */
+/*---------------------------------------*/
+
+.quotetop
+{
+	color: #000;
+	margin: 8px auto 0px auto;
+	font-weight:bold;
+	font-size:10px;
+	padding: 8px;
+	background-color:#E4EAF2;
+	border-left: 4px solid #8394B2;
+	border-top: 1px dotted #000;
+	border-right: 1px dotted #000;
+}
+.quotemain
+{
+	color: #465584;
+	background-color: #FAFCFE;
+	border-left: 4px solid #8394B2;
+	border-right: 1px dotted #000;
+	/*border-top: 1px dotted #000;*/
+	border-bottom: 1px dotted #000;
+	padding: 4px;
+	margin: 0px auto 8px auto;
+}
+
+.codetop,
+.sqltop,
+.htmltop
+{
+	width:98%;
+	color: #000;
+	margin: 0px auto 0px auto;
+	font-weight:bold;
+	padding: 3px;
+	background-color:#FDDBCC;
+	background-repeat: no-repeat;
+}
+.codemain,
+.sqlmain,
+.htmlmain
+{
+	font-family: Courier, Courier New, Verdana, Arial;
+	color: #465584;
+	background-color: #FAFCFE;
+	border: 1px dotted #000;
+	padding: 2px;
+	width:98%;
+	margin: 0px auto 0px auto;
+	/*overflow: auto;
+	height: 200px;*/
+}
+
+
diff --git a/upload/modules/mod_hivemail.php b/upload/modules/mod_hivemail.php
deleted file mode 100644
index d5efb009..00000000
--- a/upload/modules/mod_hivemail.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.2 Module File
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|   > Hive Mail Module
-|   > Module written by Matt Mecham
-|   > Date started: 8th July 2003
-|
-+--------------------------------------------------------------------------
-*/
-
-//=====================================
-// Define class, this must be the same
-// in all modules
-//=====================================
-
-class module extends module_loader
-{
-
-	var $class  = "";
-	var $module = "";
-	var $html   = "";
-	
-	var $result = "";
-	var $hive   = "";
-	var $hiveid = "";
-	
-	function module()
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		//-------------------------------------------
-		// Load skin / lang stuff
-		//-------------------------------------------
-			
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_register', $ibforums->lang_id);
-        $this->html     = $std->load_template('skin_register');
-        
-        //-------------------------------------------
-		// Are we a hivemail member?
-		//-------------------------------------------
-		
-        $DB->query("SELECT id, hiveuserid FROM ibf_member_extra WHERE id={$ibforums->member['id']}");
-			
-		$r = $DB->fetch_row();
-			
-		$this->hiveid = intval($r['hiveuserid']);
-			
-        //-------------------------------------------
-		// Load Hivemail plug in
-		//-------------------------------------------
-		
-        define('IPB_PLUGIN', true);
-		require_once('../mail/includes/invision_plugin.php');
-			
-		$this->hive = new invision_plugin();
-		
-		//-------------------------------------------
-		// If we're not a member...
-		//-------------------------------------------
-		
-		if ( ! $ibforums->member['id'] )
-		{
-			$std->boink_it( $ibforums->base_url );
-		}
-		
-		//-------------------------------------------
-		// Do we already have a hivemail membership?
-		//-------------------------------------------
-		
-		if ( $this->hiveid AND $hiveuser = $this->hive->DB_Hive->query_first("SELECT userid FROM ".HIVE_TBL."user WHERE userid = {$this->hiveid}"))
-		{
-			$this->hive->destructor();
-			$std->boink_it( $ibforums->base_url );
-		}
-		
-		//-------------------------------------------
-		// Whatcha doin'? Yes - you?
-		//-------------------------------------------
-		
-		switch( $ibforums->input['show'] )
-		{
-			case 'forumform':
-				$this->show_forumform();
-				break;
-			case 'addmail':
-				$this->add_mail();
-				
-			default:
-				$this->show_forumform();
-				break;
-		}
-		
-	}
-	
-	function add_mail()
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		$hive_username = trim($ibforums->input['hive_username']);
-		
-		//------------------------------------------
-		// Check for errors
-		//------------------------------------------
-		
-		if ( $hive_username == "" )
-		{
-			$this->show_forumform('js_blanks');
-		}
-
-		$this->hive->hivemail_register_user($ibforums->member, false);
-			
-		if ( $this->hive->hive_error != "" )
-		{
-			$ibforums->lang['thing_name_taken']     = sprintf( $ibforums->lang['thing_name_taken']    , 'Board Email Address' );
-			$ibforums->lang['incorrect_thing_name'] = sprintf( $ibforums->lang['incorrect_thing_name'], 'Board Email Address' );
-	
-			$this->show_forumform($this->hive->hive_error);
-			$this->error = 1;
-			$this->hive->destructor();
-			return;
-		}
-		
-		$this->hive->destructor();
-		
-		$print->redirect_screen("your email account has been created, forwarding you to the email log-in page", "/mail/index.php", 1);
-		
-	}
-	
-	//------------------------------------------
-	// Show Forum Form
-	// 
-	// Show the already reg'd member's mail form
-	//
-	//------------------------------------------
-	
-	function show_forumform($errors="")
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		$this->page_title = "Sign up for your email account";
-		
-		$hidden = "";
-		$action = $ibforums->base_url.'act=module&amp;module=hivemail&amp;show=addmail';
-		
-		$content = $this->html->field_entry('Account Name:',
-		                                    'The password for your email account will be the same as your forum account.<br />Letters and numbers only please.',
-		                                    $this->html->field_textinput('hive_username', $ibforums->input['hive_username'])."&nbsp;<select name='hive_userdomain' class='forminput'>".$this->hive->hive_domainname_options."</select>"
-		                                   );
-		                                   
-		if ($errors != "")
-    	{
-    		$this->output .= $this->html->errors( $ibforums->lang[$errors] );
-    	}
-		                                   
-		$this->output .= $this->html->tmpl_form($action, $hidden, $this->page_title, $content );
-		
-		$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-		
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/retail/chatauth.php b/upload/retail/chatauth.php
new file mode 100644
index 00000000..caad3cf6
--- /dev/null
+++ b/upload/retail/chatauth.php
@@ -0,0 +1,346 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2003 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB CHAT 2004 INTEGRATION
+|   > Script written by Matt Mecham
+|   > Date started: 20th April 2004
+|   > Interesting fact: Radiohead rock
+|   > Which Radiohead track features the words "In a city of the future"?
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+define( 'ROOT_PATH'  , "../" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define ( 'IN_IPB', 0 );
+define ( 'IN_DEV', 0 );
+ 
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+//===========================================================================
+// DEBUG CLASS
+//===========================================================================
+
+class Debug
+{
+    function startTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $starttime = $mtime;
+    }
+    function endTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $endtime = $mtime;
+        $totaltime = round (($endtime - $starttime), 5);
+        return $totaltime;
+    }
+}
+
+//===========================================================================
+// INFO CLASS
+//===========================================================================
+
+class info {
+
+	var $member       = array();
+	var $input        = array();
+	var $session_id   = "";
+	var $base_url     = "";
+	var $vars         = "";
+	var $lang_id      = "en";
+	var $skin         = "";
+	var $lang         = "";
+	var $server_load  = 0;
+    
+	function info()
+	{
+		global $sess, $std, $DB, $INFO;
+		
+		$this->vars = &$INFO;
+	}
+}
+
+//===========================================================================
+// MAIN PROGRAM
+//===========================================================================
+
+//--------------------------------
+// Import $INFO, now!
+//--------------------------------
+
+$INFO = array();
+
+require ROOT_PATH."conf_global.php";
+
+//--------------------------------
+// The clocks a' tickin'
+//--------------------------------
+		
+$Debug = new Debug;
+$Debug->startTimer();
+
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
+
+$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mysql' : $INFO['sql_driver'];
+
+require ( KERNEL_PATH.'class_db_'.strtolower($INFO['sql_driver']).".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['use_shutdown']     = 0;
+$DB->obj['debug']            = 0;
+
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+//--------------------------------
+// Wrap it all up in a nice easy to
+// transport super class
+//--------------------------------
+
+$ibforums = new info();
+
+//--------------------------------
+// Require our global functions
+//--------------------------------
+
+require ROOT_PATH."sources/functions.php";
+require KERNEL_PATH."class_converge.php";
+
+$std    = new FUNC;
+
+//--------------------------------
+//  Set up our vars
+//--------------------------------
+
+$ibforums->input = $std->parse_incoming();
+
+//--------------------------------
+//  Set converge
+//--------------------------------
+
+$ibforums->converge = new class_converge( $DB );
+
+//===========================================================================
+// Get cache...
+//===========================================================================
+
+$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key IN ( ".$choice[ strtolower($ibforums->input['act']) ][2]."'banfilters', 'settings', 'group_cache', 'systemvars', 'skin_id_cache', 'forum_cache', 'moderators', 'stats', 'languages' )" ) );
+$DB->simple_exec();
+
+while ( $r = $DB->fetch_row() )
+{
+	if ( $r['cs_key'] == 'settings' )
+	{
+		$ibforums->vars = $ibforums->vars + unserialize(stripslashes($r['cs_value']));
+	}
+	else
+	{
+		if ( $r['cs_array'] )
+		{
+			$ibforums->cache[ $r['cs_key'] ] = unserialize(stripslashes($r['cs_value']));
+		}
+		else
+		{
+			$ibforums->cache[ $r['cs_key'] ] = $r['cs_value'];
+		}
+	}
+}
+
+//===========================================================================
+// AUTHORIZE...
+//===========================================================================
+
+$reply_success = 'Result=Success';
+$reply_nouser  = 'Result=UserNotFound';
+$reply_nopass  = 'Result=WrongPassword';
+$reply_error   = 'Result=Error';
+
+$in_user       = $std->clean_value(urldecode(trim($_GET['user'])));
+$in_pass       = $std->clean_value(urldecode(trim($_GET['pass'])));
+$in_cookie     = $std->clean_value(urldecode(trim($_GET['cookie'])));
+$access_groups = $ibforums->vars['chat04_access_groups'];
+$in_md5_pass   = "";
+$nametmp       = "";
+
+//----------------------------------------------
+// Did we pass a "pretend" cookie to unord?
+//----------------------------------------------
+
+if ( $in_cookie )
+{
+	foreach( explode( '_', $in_cookie ) as $ord )
+	{
+		$nametmp .= chr( intval($ord) );
+	}
+	
+	$in_user = $nametmp;
+}
+
+//----------------------------------------------
+// Continue..
+//----------------------------------------------
+
+if ( $in_user and ! $in_pass )
+{
+	show_message( $reply_nopass );
+	//## EXIT ##
+}
+
+if ( $in_user and $in_pass )
+{
+	//------------------------------------------
+	// Attempt to get member...
+	//------------------------------------------
+	
+	$DB->query("SELECT m.mgroup, m.name, m.id, c.*  FROM ibf_members m
+				LEFT JOIN ibf_members_converge c ON (m.id=c.converge_id)
+				WHERE lower(m.name)='".strtolower(addslashes($in_user))."'");
+	
+	$member = $DB->fetch_row();
+	
+	if ( ! $member['id'] )
+	{
+		//--------------------------------------
+		// Guest...
+		//--------------------------------------
+		
+		test_for_guest();
+	}
+	
+	//------------------------------------------
+	// Test for MD5 (future proof)
+	//------------------------------------------
+	
+	if ( preg_match( "/^md5pass\((.+?)\)$/", $in_pass, $match ) )
+	{
+		$in_md5_pass = $match[1];
+	}
+	else
+	{
+		$in_md5_pass = md5( md5( $member['converge_pass_salt'] ) . md5($in_pass) );
+	}
+	
+	//------------------------------------------
+	// PASSWORD?
+	//------------------------------------------
+	
+	if ( $in_pass and ($in_md5_pass == $member['converge_pass_hash']) )
+	{
+		//--------------------------------------
+		// Check for access
+		//--------------------------------------
+		
+		if ( ! preg_match( "/(^|,)".$member['mgroup']."(,|$)/", $access_groups ) )
+		{
+			show_message( $reply_error );
+			//## EXIT ##
+		}
+		else
+		{
+			show_message( $reply_success );
+			//## EXIT ##
+		}
+	}
+	else
+	{
+		show_message( $reply_nopass );
+		//## EXIT ##
+	}
+}
+else
+{
+	//------------------------------------------
+	// Guest...
+	//------------------------------------------
+	
+	test_for_guest();
+}
+
+//===========================================================================
+// YES TO GUEST OR NO TO PASS GO
+//===========================================================================
+
+function test_for_guest()
+{
+	global $reply_nouser, $reply_error;
+	
+	if ( $ibforums->vars['chat04_allow_guest'] )
+	{
+		show_message( $reply_nouser );
+		//## EXIT ##
+	}
+	else
+	{
+		show_message( $reply_error );
+		//## EXIT ##
+	}
+}
+
+//===========================================================================
+// SHOW MESSAGE
+//===========================================================================
+
+function show_message($msg="Result=Error")
+{
+	@flush();
+	echo $msg;
+	exit;
+}
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/retail/chatservice.php b/upload/retail/chatservice.php
new file mode 100644
index 00000000..5070c52f
--- /dev/null
+++ b/upload/retail/chatservice.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2003 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB CHAT 2004 INTEGRATION
+|   > Script written by Matt Mecham
+|   > Date started: 5th August 2004
++--------------------------------------------------------------------------
+*/
+
+$CHAT_SERVER = array(
+
+'advanced' => 'chat3.invisionsitetools.com',
+'premium'  => 'chat4.invisionsitetools.com',
+
+);
+
+$CHAT_FOLDER = array(
+
+'advanced' => 'pca',
+'premium'  => 'pcp',
+
+);
+
+$CHAT_ONLINELIST = array(
+
+'advanced' => 'cgi-bin/userlist/advanced/group.cgi?group=',
+'premium'  => 'cgi-bin/userlist/premium/group.cgi?group=',
+
+);
+
+
+?>
\ No newline at end of file
diff --git a/upload/fonts/index.html b/upload/retail/index.html
similarity index 100%
rename from upload/fonts/index.html
rename to upload/retail/index.html
diff --git a/upload/retail/regkey.php b/upload/retail/regkey.php
new file mode 100644
index 00000000..b0c368c7
--- /dev/null
+++ b/upload/retail/regkey.php
@@ -0,0 +1,4 @@
+<?php
+$customer_reg_key='';
+$customer_copy_key='';
+?>
\ No newline at end of file
diff --git a/upload/show.php b/upload/show.php
deleted file mode 100644
index d5bfbfee..00000000
--- a/upload/show.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
-
-Script Name: show.php
-Script Author: Matt Mecham
-Package: Invision Board
-Date: 16th September 2002
--------------------------
-What is this?
--------------------------
-It's a little "add-on" that simply allows for a neater / easier to read
-URL to an invision board URL.
-Example: http://www.domain.com/forums/show.php/act/ST/f/3/t/45
-Resolves to: http://www.domain.com/forums/index.php?act=ST&f=3&t=45
-
-It's not used in Invision Board itself, but might come in handy in your
-own projects (such as a search engine friendly menu, etc).
-
-Probably only works with PHP 4.1+
-
-*/
-
-$base_url = 'http://localhost/invboard/index.php';  //Edit this to suit
-
-$redirect = "";
-
-if ( $_SERVER['PATH_INFO'] != "" )
-{
-	$c = 0;
-	
-	foreach( explode( "/", $_SERVER['PATH_INFO'] ) as $bit)
-	{
-		if ($bit != "")
-		{
-			if ($c == 0)
-			{
-				$c++;
-				$redirect .= $bit.'=';
-			}
-			else
-			{
-				$c = 0;
-				$redirect .= $bit.'&';
-			}
-		}
-	}
-}
-
-header("Location: $base_url?".$redirect);
-
-exit();
-
-?>
-
diff --git a/upload/skin_acp/IPB2_Standard/acp_check.gif b/upload/skin_acp/IPB2_Standard/acp_check.gif
new file mode 100644
index 0000000000000000000000000000000000000000..09b2bdad62e905a8d11d7a0a64e2e38a535f6e87
GIT binary patch
literal 309
zcmZ?wbhEHb6krfwxN5<0`qJ&~`;M=hyY$h9Z3kPr*34ac?&`g3%*?M$P0wDrdx(MI
z{I&ZJoScrGy|!lQ+A}9F?d+WJ*wyW%i0Hkmch6kDb1y4r6AQ~tb@e+(&g@`eIoLhv
zb$#<A28N5CJ_mXy-<vjTznsE5W8-zLJ(mOpFPfUYEw9?T=jev*2cGv&*~7<wmVx2$
z#Oa4wSRSn1ygE4i0yFcD-A6u1%iQgruvcE;E(61b>kqCoFdRC0>Hq)#4A_9;PZmZ7
z1`7rqkR-@Y3~WITa|%3kr20=hR*Td*D&(W6btLlY3}zNzCPs;9qdO`|%%V(fkJ<|>
xL->r{4|pFb3DLi#p~?|3K}v^9Qc11EgGEeFoj1@z&cM9SiF@+2>C+q;tO2-gf2aTe

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/acp_css.css b/upload/skin_acp/IPB2_Standard/acp_css.css
new file mode 100644
index 00000000..944f6a48
--- /dev/null
+++ b/upload/skin_acp/IPB2_Standard/acp_css.css
@@ -0,0 +1 @@
+/* ======================================== */
/* GLOBAL ELEMENTS */
/* ======================================== */

BODY
{
	font-size: 10px;
	font-family: Verdana, Arial, Sans-Serif;
	color:#000;
	padding:0px;
	margin:0px 3px 0px 3px;
}
	  
TABLE, TD, TR
{
	font-family: Verdana,Arial, Sans-Serif;
	color:#000;
	font-size: 10px;
}
	  
a:link,
a:visited,
a:active 
{
	color:#000055;
}

a:hover
{
	color:#333377;
	text-decoration:underline
}

form  { display:inline        }
input { vertical-align:middle }

img   { vertical-align:middle }

/* ======================================== */
/* Page links
/* ======================================== */

.pagelink
{
	background-color: #F0F5FA;
	border: 1px solid #072A66;
	padding:1px 3px 1px 3px;
	color: #000;
	font-weight:normal;
}

.pagelinklast
{
	background-color: #DFE6EF;
	border: 1px solid #072A66;
	padding:1px 3px 1px 3px;
	color: #000;
	font-weight:normal;
}

.pagecurrent
{
	background-color: #FFC9A5;
	border: 1px solid #072A66;
	padding:1px 3px 1px 3px;
	color: #000;
	font-weight:normal;
}


.pagelink a:active,
.pagelink a:visited,
.pagelink a:link,
.pagelinklast a:active,
.pagelinklast a:visited,
.pagelinklast a:link,
.pagecurrent a:active,
.pagecurrent a:visited,
.pagecurrent a:link
{
	text-decoration:none;
	color: #000;
	font-weight:normal;
}

/* ======================================== */
/* MENU STYLES   */
/* ======================================== */


.menulinkwrap
{
	font-size:9px;
	background-color:#EEF2F7;
	padding:2px 0px 2px 0px;
	line-height:1.7em;
}

.menulinkwrap a:link, 
.menulinkwrap a:visited, 
.menulinkwrap a:active
{
	color: #000;
	border-left:2px solid #EEF2F7;
}

.menulinkon
{
	background-color:#DFE6EF;
	border-right:2px solid #3860BB;
	border-left:2px solid #3860BB;
}

.menulinkoff
{
	border-left:2px solid #EEF2F7;
	background-color:#EEF2F7;
}

.descbox
{
	padding:4px;
	border:1px solid #CCC;
	position:absolute;
	background-color:#FAFFAF;
	font-size:10px;
	font-weight:normal;
	color: #000;
	width: 120px;
}

.menumaintopon
{
	font-size:10px;
	vertical-align:middle;
	font-weight:bold;
	color:#FFF;
	padding:6px;
	background-image: url(tile_cat.gif);
	background-color:#5176B5;
}

.menumaintopoff
{
	font-size:10px;
	vertical-align:middle;
	font-weight:bold;
	color:#FFF;
	padding:5px 0px 8px 5px;
	background-image: url(menu_collapsed.gif);
	background-color:#5176B5;
}

.menumaintopon a:link,
.menumaintopon a:visited,
.menumaintopon a:active,
.menumaintopoff a:link,
.menumaintopoff a:visited,
.menumaintopoff a:active
{
	text-decoration: none;
	color: #FFF
}

.menumaintopon a:hover,
.menumaintopoff a:hover
{
	text-decoration: underline
}



/* ======================================== */
/* BOARD NAVIGATION STYLES */
/* ======================================== */

.navstrip
{ 
	background-color: transparent;
	color: #999;
	font-size: 12px;
	font-weight: bold;
	padding: 6px 0px 6px 0px; 
}

.navstrip a:link, 
.navstrip a:visited, 
.navstrip a:active
{ 
	background-color: transparent; 
	color: #222;
	text-decoration: none;
}

.navstrip a:hover
{
	background-color: transparent; 
	color: #5176B5; 
	text-decoration: none;
}

#logostrip
{ 
	background-color: #3860BB;
	background-image: url(tile_back.gif);
	border-bottom: 5px solid #072A66;
	border-left: 1px solid #072A66;
	border-right: 1px solid #072A66;
	border-top: 1px solid #072A66;
	height: 52px;
	margin: 0px;
	padding: 0px;
}

#logostripinner
{
	background-color: transparent;
	background-image: url(logobg.gif);
	background-position: right;
	background-repeat: no-repeat;
	height: 52px;
	margin: 0px;
	padding: 0px;
}

#submenu
{
	border:1px solid #BCD0ED;
	background-color: #DFE6EF;
	font-size:10px;
	margin:3px 0px 3px 0px;
	color:#3A4F6C;
	font-weight:bold;
}

#submenu a:link,
#submenu a:visited,
#submenu a:active
{
	font-weight:bold;
	font-size:10px;
	text-decoration: none;
	color: #3A4F6C;
}

.offdiv
{
	font-size:12px;
	font-weight:bold
}


/* ======================================== */
/* TITLE ELEMENTS */
/* ======================================== */

.maintitle
{
	font-size:12px;
	vertical-align:middle;
	font-weight:bold;
	color:#FFF;
	padding:8px;
	background-image: url(tile_cat.gif);
	background-color:##345487;
}

.maintitle a:link,
.maintitle a:visited,
.maintitle a:active
{
	text-decoration: none;
	color: #FFF
}

.maintitle a:hover
{
	text-decoration: underline
}

.titlemedium
{
	border:1px solid #FFF;
	font-weight:bold;
	color:#3A4F6C;
	padding:5px 0px 8px 2px;
	background-image: url(tile_sub.gif)
}

.titlemedium a:link,
.titlemedium a:visited,
.titlemedium a:active
{
	text-decoration: underline;
	color: #3A4F6C
}

#maintop
{
	font-size:14px;
	color:#FFF;
	font-weight:bold;
	letter-spacing:-1px;
	padding:5px 5px 8px 5px;
	border:1px solid #345487;
	background-image: url(tile_cat.gif);
	background-color:#5176B5;
}


.pformstrip
{
	background-color: #D1DCEB;
	color:#3A4F6C;
	font-weight:bold;
	padding:5px;
	margin-top:1px
}

#normal
{
	font: 10px Verdana;
	color:#333333
}

#detail
{
	font-family: Arial;
	font-size:11px;
	color: #333333
}

#subtitle
{
	font-family: Arial,Verdana;
	font-size:16px;
	color:#FF9900;
	font-weight:bold
}

#smalltitle
{
	font-family: Arial,Verdana;
	font-size:11px;
	color:#FF9900;
	font-weight:bold
}

/* ======================================== */
/* TABLE AND TD ELEMENTS */
/* ======================================== */

.tdfset
{
	background-color:#EEF2F7;
}


.tableborder
{
	border:1px solid #345487;
	background-color:#FFF;
}

#table1
{
	background-color:#FFFFFF;
	width:100%;
	border:1px solid black
}

.tdrow1shaded
{
	background-color:#EFE6EA;
	border-bottom:1px solid #D1DCEB;
	border-right:1px solid #D1DCEB ;
	border-top:1px solid #FFF;
	border-left:1px solid #FFF;
}

.tdrow2shaded
{
	background-color:#F6ECF0;
	border-bottom:1px solid #D1DCEB;
	border-right:1px solid #D1DCEB;
	border-top:1px solid #FFF;
	border-left:1px solid #FFF;
}

.tdrow1
{
	background-color:#EEF2F7;
	border-bottom:1px solid #D1DCEB;
	border-right:1px solid #D1DCEB ;
	border-top:1px solid #FFF;
	border-left:1px solid #FFF;
}

.tdrow2
{
	background-color:#F5F9FD;
	border-bottom:1px solid #D1DCEB;
	border-right:1px solid #D1DCEB;
	border-top:1px solid #FFF;
	border-left:1px solid #FFF;
}
		
.tdrow3
{
	background-color:#E4EAF2;
	border-bottom:1px solid #D1DCEB;
	border-right:1px solid #D1DCEB ;
	border-top:1px solid #FFF;
	border-left:1px solid #FFF;
}

.tablepad
{
	background-color:#F5F9FD;
	padding:3px;
}

.subforum
{
	background-color:#DFE6EF
}

.catrow
{
	font-weight:bold;
	height:24px;
	line-height:150%;
	color:#4C77B6;
	background-image: url(tile_sub.gif);
}

.catrow2
{
	font-size:11px;
	font-weight:bold;
	line-height:150%;
	color:#4C77B6;
	background-color:#D3DFEF;
}

.copy
{
	color:#000;
	font-size:10px;
	border-top:1px solid #000;
	margin-bottom:10px;
	padding:6px;
	margin-left:auto;
	margin-right:auto;
	text-align:center;
}

#nav
{
color:#000000;
font-size:9px
}

#description
{
color:#434951;
font-size:10px
}

#memgroup
{
border:1px solid #777777
}

#mgred
{
border:1px solid #777777;
background-color: #f5cdcd
}

#mggreen
{
border:1px solid #777777;
background-color: #caf2d9
}

#mgblue
{
border:1px solid #777777;
background-color: #DFE6EF
}

#mgyellow
{
border:1px solid #777777;
background-color: #FFF7E8
}

#green
{
background-color: #caf2d9
}

#red
{
background-color: #f5cdcd
}

#button
{
border:1px solid #4C77B6;
background-color: #DFE6EF;
font-family:Verdana, Arial;
font-size:11px
}

#editbutton
{
background-color: #DDDDDD;
color: #000;
font-family:Verdana, Arial;
font-size:9px
}

.fauxbutton
{
	border:1px solid #4C77B6;
	background-color: #DFE6EF;
	font-family:Verdana, Arial;
	font-size:10px;
	font-weight:bold;
	padding:3px;
	margin:6px;
}
			  
.realbutton
{
	border:1px solid #4C77B6;
	background-color: #DFE6EF;
	font-family:Verdana, Arial;
	font-size:10px;
	font-weight:bold;
	padding:2px;
}

.realwhitebutton
{
	border:1px solid #4C77B6;
	background-color: #FFF;
	font-family:Verdana, Arial;
	font-size:10px;
	font-weight:bold;
	padding:3px;
}

.realdarkbutton
{
	border:1px solid #4C77B6;
	background-color: #B1BECE;
	font-family:Verdana, Arial;
	font-size:10px;
	font-weight:bold;
	padding:2px;
}
				  
.darkbg
{
	background-color:#5176B5;
}
			  
.darksep
{
	background-color: #B1BECE;
	color:#4C77B6;
	height:5px
}

.fauxbutton a:link,
.fauxbutton a:visited,
.fauxbutton a:active
{
	font-size:10px;
	font-weight:bold;
	text-decoration: none;
}

.textinput
{
	background-color: #FFF;
	color:Ê#000;
	font-size:10px;
	font-family: Verdana,Arial, Sans-Serif;
	padding:2px;
	border:2px inset #BCD0ED;
}

.dropdown
{
	background-color: #FFF;
	color:Ê#000;
	font-size:10px;
	font-family: Verdana,Arial, Sans-Serif;
	padding:2px;
	border:2px inset #BCD0ED;
}

.smalldropdown
{
	background-color: #FFF;
	color:Ê#000;
	font-size:9px;
	font-family: Verdana,Arial, Sans-Serif;
	border:1px inset #BCD0ED;
}

.multitext
{
	background-color: #FFF;
	color:Ê#000;
	font-size:10px;
	font-family: Verdana,Arial, Sans-Serif;
	padding:2px;
	border:2px inset #BCD0ED;
}

.jmenu,
.jmenubutton
{
	vertical-align:middle;
	background-color: #FFF;
	border:1px solid #345487;
	font-size:11px;
}

					 
#jwrap
{
	border:1px solid #BCD0ED;
	background-color: #DFE6EF;
	font-size:10px;
	margin:3px 0px 3px 0px;
	color:#3A4F6C;
	font-weight:bold;
	padding:8px
}

.graytext
{
	color: gray;
}

.graytext a:link,
.graytext a:active,
.graytext a:visited
{
	color: gray;
}

.skineditortopstrip
{
	height:21px;
	background-image: url(skineditor_slice.gif);
	background-repeat: repeat-x;
	background-position: left bottom;
	padding:2px;
}
\ No newline at end of file
diff --git a/upload/html/sys-img/acp_delete.gif b/upload/skin_acp/IPB2_Standard/acp_delete.gif
similarity index 100%
rename from upload/html/sys-img/acp_delete.gif
rename to upload/skin_acp/IPB2_Standard/acp_delete.gif
diff --git a/upload/html/sys-img/acp_edit.gif b/upload/skin_acp/IPB2_Standard/acp_edit.gif
similarity index 100%
rename from upload/html/sys-img/acp_edit.gif
rename to upload/skin_acp/IPB2_Standard/acp_edit.gif
diff --git a/upload/skin_acp/IPB2_Standard/acp_js.js b/upload/skin_acp/IPB2_Standard/acp_js.js
new file mode 100644
index 00000000..7bab9e3e
--- /dev/null
+++ b/upload/skin_acp/IPB2_Standard/acp_js.js
@@ -0,0 +1,220 @@
+//------------------------------------------
+// Invision Power Board v2.0
+// ACP Specific JS File
+// (c) 2003 Invision Power Services, Inc.
+//
+// http://www.invisionboard.com
+//------------------------------------------
+
+//==========================================
+// POP UP YA WINDA
+//==========================================
+
+
+function pop_win(theUrl, winName, theWidth, theHeight)
+{
+	if (winName == '') { winName = 'Preview'; }
+	if (theHeight == '') { theHeight = 400; }
+	if (theWidth == '') { theWidth = 400; }
+	
+	window.open(ipb_var_base_url+'&'+theUrl,winName,'width='+theWidth+',height='+theHeight+',resizable=yes,scrollbars=yes');
+}
+
+//==========================================
+// Toggle div
+//==========================================
+
+function togglediv( did, show )
+{
+	//-----------------------------------
+	// Add?
+	//-----------------------------------
+	
+	if ( show )
+	{
+		my_show_div( my_getbyid( did ) );
+		
+	}
+	else
+	{
+		my_hide_div( my_getbyid( did ) );
+	}
+	
+	return false;
+	
+}
+
+
+//==========================================
+// Toggle menu categories
+//==========================================
+
+function togglemenucategory( fid, add )
+{
+	saved = new Array();
+	clean = new Array();
+
+	//-----------------------------------
+	// Get any saved info
+	//-----------------------------------
+	
+	if ( tmp = my_getcookie('acpcollapseprefs') )
+	{
+		saved = tmp.split(",");
+	}
+	
+	//-----------------------------------
+	// Remove bit if exists
+	//-----------------------------------
+	
+	for( i = 0 ; i < saved.length; i++ )
+	{
+		if ( saved[i] != fid && saved[i] != "" )
+		{
+			clean[clean.length] = saved[i];
+		}
+	}
+	
+	//-----------------------------------
+	// Add?
+	//-----------------------------------
+	
+	if ( add )
+	{
+		clean[ clean.length ] = fid;
+		my_show_div( my_getbyid( 'fo_'+fid  ) );
+		my_hide_div( my_getbyid( 'fc_'+fid  ) );
+	}
+	else
+	{
+		my_show_div( my_getbyid( 'fc_'+fid  ) );
+		my_hide_div( my_getbyid( 'fo_'+fid  ) );
+	}
+	
+	my_setcookie( 'acpcollapseprefs', clean.join(','), 1 );
+	
+	tmp = clean.join(',');
+}
+
+//==========================================
+// Expand all (remove cookie)
+//==========================================
+
+function expandmenu()
+{
+	my_setcookie( 'acpcollapseprefs', menu_ids, 1 );
+	window.location=window.location;
+}
+
+//==========================================
+// Expand all (remove cookie)
+//==========================================
+
+function collapsemenu()
+{
+	my_setcookie( 'acpcollapseprefs', '', 1 );
+	window.location=window.location;
+}
+
+//==========================================
+// Change text editor size
+//==========================================
+
+function changefont()
+{
+	savearray   = new Array();
+	idarray     = new Array();
+	
+	if ( template_bit_ids )
+	{
+		idarray  = template_bit_ids.split(",");
+	}
+	
+	if ( tmp = my_getcookie('acpeditorprefs') )
+	{
+		savearray = tmp.split(",");
+	}
+	
+	chosenfont  = document.theform.fontchange.options[document.theform.fontchange.selectedIndex].value;
+	chosensize  = document.theform.sizechange.options[document.theform.sizechange.selectedIndex].value;
+	chosenback  = document.theform.backchange.options[document.theform.backchange.selectedIndex].value;
+	fontcolor   = document.theform.fontcolor.options[document.theform.fontcolor.selectedIndex].value;
+	widthchange = document.theform.widthchange.options[document.theform.widthchange.selectedIndex].value;
+	highchange  = document.theform.highchange.options[document.theform.highchange.selectedIndex].value;
+	
+	if ( idarray.length )
+	{
+		for (i = 0 ; i < idarray.length; i++ )
+		{
+			id = idarray[i];
+				
+			itm = my_getbyid(id);
+			
+			if ( chosenfont != '-' )
+			{
+				itm.style.fontFamily = chosenfont;
+				savearray[0]         = chosenfont;
+			}
+			if ( chosensize != '-' )
+			{
+				itm.style.fontSize   = chosensize;
+				savearray[1]         = chosensize;
+			}
+			if ( chosenback != '-' )
+			{
+				itm.style.backgroundColor = chosenback;
+				savearray[2]              = chosenback;
+			}
+			if ( fontcolor != '-' )
+			{
+				itm.style.color = fontcolor;
+				savearray[3]    = fontcolor;
+			}
+			if ( widthchange != '-' )
+			{
+				itm.style.width = widthchange;
+				savearray[4]    = widthchange;
+			}
+			if ( highchange != '-' )
+			{
+				itm.style.height = highchange;
+				savearray[5]     = highchange;
+			}
+		}
+	}
+	
+	my_setcookie( 'acpeditorprefs', savearray.join(','), 1 );
+}
+
+//==========================================
+// Auto jump menu
+//==========================================
+
+function autojumpmenu(fobj)
+{
+	urljump = fobj.options[fobj.selectedIndex].value;
+	
+	if ( urljump != "" && urljump != "-" )
+	{
+		window.location = urljump;
+	}
+}
+
+function maincheckdelete(url, msg)
+{
+	if ( ! msg )
+	{
+		msg = 'PLEASE CONFIRM:\nOK to proceed with delete?';
+	}
+	
+	if (confirm( msg ))
+	{
+		window.location.href = url;
+	}
+	else
+	{
+		alert ( 'OK, action cancelled!' );
+	} 
+}
+
+
diff --git a/upload/html/sys-img/acp_resync.gif b/upload/skin_acp/IPB2_Standard/acp_resync.gif
similarity index 100%
rename from upload/html/sys-img/acp_resync.gif
rename to upload/skin_acp/IPB2_Standard/acp_resync.gif
diff --git a/upload/html/sys-img/acp_rules.gif b/upload/skin_acp/IPB2_Standard/acp_rules.gif
similarity index 100%
rename from upload/html/sys-img/acp_rules.gif
rename to upload/skin_acp/IPB2_Standard/acp_rules.gif
diff --git a/upload/html/sys-img/acp_search.gif b/upload/skin_acp/IPB2_Standard/acp_search.gif
similarity index 100%
rename from upload/html/sys-img/acp_search.gif
rename to upload/skin_acp/IPB2_Standard/acp_search.gif
diff --git a/upload/skin_acp/IPB2_Standard/acp_trashcan.gif b/upload/skin_acp/IPB2_Standard/acp_trashcan.gif
new file mode 100644
index 0000000000000000000000000000000000000000..baf31e7eab0e6a7c0e8adb337b4cde9d5869b4ed
GIT binary patch
literal 1194
zcmb_b>rYb$9K99h(5Yz@A2>E}lK5f<mu$h!EX70xA4xTc!m<qr4$O3+MvanXQ9ufU
z@(cqNR)LhlpaohgqdW>jHw0^2TKl-Yuii`VEp6#b3fRY8{U3HdoG-tV^WmJ|Igxfe
z`Ebq-U>mSZ0W?hug+h}FGMP+)038g{@7~cyBkuEs84QJJold7#tDR0~Mn;CwNSI9U
z!oq^xPPeqQ7z}0<#r%HSVzEf2vc|?nl6*&!B#NRi3_}p2*F$2l^x3m#D=T4*4T7-2
zLD|w04T2z!;~I@duQ$0|^y(@-KR;ht`M_$m78DeyRC7*eAQ<o)44A<HTdkDG<EgH$
z20^%~sWme*lOViiGv41Xg<(ro)x-Mw-vokwx0^-~#P5Hbm6bL7T5C2tAqcI1)Q00u
z9QW94;p@We>}xKUE0M_B+B!+nUsF?CTU)oh98N%FG@5VS`gLslIYq4^h_$=B+u@+Q
zx_TWBKZdy)1*2-UinPdjL}H5tAqZ41mk$jMX|>u=FrZYb1_p){3PopU7mj26ff){m
zbK}O%&Q8A3I6pnDLlE1-f@^kGB@lGK(n20ju(h@Q#fw+o<+;+*dn9SmYOyzOpz`tx
zepip#>=g?8+-~>e<O{icYHVz5X(>e0!LqUnF898};jr876BAP)h<H2!4yVxT4HCrL
zy1KeYyw2OVFDVqW9uF-Ri!ls?VH=KnVQ3tN(b3W8AZUglTYi24iaKq!Re~TyBC$>f
zX*7M))6@7oWiS}6R-Z^TP*_+P3I&zQmw9=4Zg=3~#Y_-1!Em@xSRnXQEFPB0<bi-c
zFE89i7D=v<q_3w(R99F3drOBzBB7|2r%yYC!d|D->vFkzWitq3Z*FeBcJ11Q3z<Hj
zZ)9YYqWoiH<5H<qt)A=c6?(n&q6>Na_=!;1Pm-Qfr%n$K55okwxERps40=7P*Bj_i
z$m<R9`3*|tT=;K+{{y>LBN+fd0g3O;-fsekq5;*q*wjAWL<#jvBB*RH`8cXg(Uel!
zhZcYPbt{j_IuIR`AzPas{V&$YKLY?Y2R!6=(jS%ORYwl}6Z>SN(3iAj3z=GzxZ!va
zJK@;5@}tii^7gmid-w-$D<=m?$!-+I{JfLFbYIdm)&7+<m0LTI2%IV^8Z0_{mQ`^z
zD!So3>(1scuI^haVNpJ2T*NkDZ<2g+8}n#v+vhB5*UPOjQOxMQ*^`lpCvIl}JD6DZ
znjaW!&d%Js^7~s;yCd%d@hROUOk*U|a;!KiV)LVh&wgrW+*!YU(|T9!m1)Vo`5l*)
zZ0^Z~OCKChPhL5B9yoY}b(fJ}UXi?gx9cJo`)ZLln4?Sm(trKR%qM%|K2@#Ub(|Y2
zQNxjJH#*Uk^kMeXHPJU?nN{(XF{LFRRVJ|i-XG0QDnFQ(ynBifm!O_VxqLk$YA1R6
z=$dthr&tdX<#%{xhxW!38#ipS10}Jqn{rDd2Gfhv_I!Wq+}VgLrAaAkV@|Wrtgjg<
PoCGEw5FIHD2Jp>)Vn@S=

literal 0
HcmV?d00001

diff --git a/upload/html/sys-img/add.gif b/upload/skin_acp/IPB2_Standard/add.gif
similarity index 100%
rename from upload/html/sys-img/add.gif
rename to upload/skin_acp/IPB2_Standard/add.gif
diff --git a/upload/html/sys-img/bar.gif b/upload/skin_acp/IPB2_Standard/bar.gif
similarity index 100%
rename from upload/html/sys-img/bar.gif
rename to upload/skin_acp/IPB2_Standard/bar.gif
diff --git a/upload/html/sys-img/bar_left.gif b/upload/skin_acp/IPB2_Standard/bar_left.gif
similarity index 100%
rename from upload/html/sys-img/bar_left.gif
rename to upload/skin_acp/IPB2_Standard/bar_left.gif
diff --git a/upload/html/sys-img/bar_right.gif b/upload/skin_acp/IPB2_Standard/bar_right.gif
similarity index 100%
rename from upload/html/sys-img/bar_right.gif
rename to upload/skin_acp/IPB2_Standard/bar_right.gif
diff --git a/upload/html/sys-img/blank.gif b/upload/skin_acp/IPB2_Standard/blank.gif
similarity index 100%
rename from upload/html/sys-img/blank.gif
rename to upload/skin_acp/IPB2_Standard/blank.gif
diff --git a/upload/html/sys-img/clickinfo.gif b/upload/skin_acp/IPB2_Standard/clickinfo.gif
similarity index 100%
rename from upload/html/sys-img/clickinfo.gif
rename to upload/skin_acp/IPB2_Standard/clickinfo.gif
diff --git a/upload/skin_acp/IPB2_Standard/colorselect.png b/upload/skin_acp/IPB2_Standard/colorselect.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe7533591aff03f1ca2737c5e0c707be30014033
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1SGfcUswyISkfJR9T^yIGCN)KUkKzYBzpw;
zGBD)zFff!9GBA8mVPI%E&%lry&%p2^hk?PSn}I<(;*^&BEuh-To-U3d6?2kycv~@W
zD6koQVPFvm>EBo=WyrBeLZLyR>fdrnXMqW44L;kmG#)+gAP~dvz%X$!yF$Z>i_8KJ
zPksPd0#)yf3>*Yb%)84Yz>>0j>D)$z9dZo}O73u_AAu~z*4y=L98TPa?;0>%2Wfr5
o$e~aKvd{7#h;_*nV(<Y5v$OvMjxR2~2y`BUr>mdKI;Vst0Ar<3v;Y7A

literal 0
HcmV?d00001

diff --git a/upload/html/sys-img/colours.gif b/upload/skin_acp/IPB2_Standard/colours.gif
similarity index 100%
rename from upload/html/sys-img/colours.gif
rename to upload/skin_acp/IPB2_Standard/colours.gif
diff --git a/upload/skin_acp/IPB2_Standard/colours.html b/upload/skin_acp/IPB2_Standard/colours.html
new file mode 100644
index 00000000..ecf86479
--- /dev/null
+++ b/upload/skin_acp/IPB2_Standard/colours.html
@@ -0,0 +1 @@
+<head>
<title>Invision Power Board Colour Picker</title>
<script language="JavaScript" type='text/javascript'>

var theColour = "";
var initcol   = "";

if ( opener.document.theAdminForm.initcol.value )
{
	initcol = opener.document.theAdminForm.initcol.value;
}

function showColor(val)
{
	document.colorform.hexval.value = val;
    theColour = val;
}

function keepColor()
{
    document.colorform.keepcolour.value = theColour;
}

function initpicker()
{
	if ( initcol )
	{
		document.colorform.keepcolour.value = initcol;
	}
}

function endwrite()
{
	if ( opener.document.theAdminForm.initformval.value )
	{
		theColour = document.colorform.keepcolour.value;
		
		eval("opener.document.theAdminForm.f"+opener.document.theAdminForm.initformval.value+".value = theColour");
		
		itm = my_openergetbyid( opener.document.theAdminForm.initformval.value );
		
		if ( itm )
		{
			itm.style.backgroundColor = theColour;
		}
		
	}
}

function my_openergetbyid(id)
{
	itm = null;
	
	if (opener.document.getElementById)
	{
		itm = opener.document.getElementById(id);
	}
	else if (opener.document.all)
	{
		itm = opener.document.all[id];
	}
	else if (opener.document.layers)
	{
		itm = opener.document.layers[id];
	}
	
	return itm;
}


</script>
</head>

<body bgcolor='#FFFFFF' onload='initpicker()'>
<font face='arial' size='2' color='#000000'>
<center>
<form name="colorform">
<b>Invision Power Board Color Picker<br><br>Simply roll your mouse over the desired colour to get the Hex value and a colour preview
<br>
<map name="colmap">
<area shape="rect" style='hover:cursor:hand' coords="1,1,7,10" onMouseOut="javascript:showColor('')"  onMouseOver="javascript:showColor('#00FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,1,15,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,1,23,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,1,31,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,1,39,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,1,47,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,1,55,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,1,63,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,1,71,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,1,79,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,1,87,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,1,95,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,1,103,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,1,111,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,1,119,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,1,127,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,1,135,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,1,143,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,1,151,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,1,159,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,1,167,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,1,175,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,1,183,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,1,191,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99FFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,1,199,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,1,207,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,1,215,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,1,223,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,1,231,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,1,239,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCFFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,1,247,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF00')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,1,255,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF33')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,1,263,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF66')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,1,271,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFF99')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,1,279,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFFCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,1,287,10" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFFFFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,12,7,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,12,15,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,12,23,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,12,31,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,12,39,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,12,47,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#00CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,12,55,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,12,63,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,12,71,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,12,79,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,12,87,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,12,95,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#33CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,12,103,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,12,111,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,12,119,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,12,127,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,12,135,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,12,143,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#66CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,12,151,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,12,159,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,12,167,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,12,175,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,12,183,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,12,191,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#99CCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,12,199,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,12,207,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,12,215,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,12,223,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,12,231,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,12,239,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CCCCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,12,247,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC00')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,12,255,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC33')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,12,263,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC66')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,12,271,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCC99')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,12,279,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCCCC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,12,287,21" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FFCCFF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,23,7,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009900')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,23,15,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009933')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,23,23,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009966')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,23,31,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#009999')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,23,39,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0099CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,23,47,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0099FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,23,55,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339900')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,23,63,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339933')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,23,71,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339966')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,23,79,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#339999')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,23,87,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3399CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,23,95,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3399FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,23,103,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669900')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,23,111,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669933')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,23,119,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669966')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,23,127,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#669999')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,23,135,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6699CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,23,143,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6699FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,23,151,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999900')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,23,159,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999933')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,23,167,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999966')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,23,175,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#999999')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,23,183,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9999CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,23,191,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9999FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,23,199,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9900')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,23,207,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9933')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,23,215,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9966')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,23,223,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC9999')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,23,231,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC99CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,23,239,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC99FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,23,247,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9900')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,23,255,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9933')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,23,263,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9966')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,23,271,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF9999')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,23,279,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF99CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,23,287,32" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF99FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,34,7,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006600')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,34,15,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006633')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,34,23,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006666')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,34,31,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#006699')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,34,39,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0066CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,34,47,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0066FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,34,55,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336600')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,34,63,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336633')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,34,71,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336666')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,34,79,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#336699')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,34,87,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3366CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,34,95,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3366FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,34,103,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666600')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,34,111,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666633')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,34,119,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666666')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,34,127,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#666699')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,34,135,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6666CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,34,143,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6666FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,34,151,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996600')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,34,159,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996633')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,34,167,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996666')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,34,175,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#996699')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,34,183,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9966CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,34,191,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9966FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,34,199,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6600')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,34,207,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6633')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,34,215,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6666')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,34,223,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC6699')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,34,231,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC66CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,34,239,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC66FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,34,247,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6600')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,34,255,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6633')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,34,263,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6666')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,34,271,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF6699')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,34,279,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF66CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,34,287,43" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF66FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,45,7,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003300')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,45,15,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003333')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,45,23,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003366')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,45,31,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#003399')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,45,39,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0033CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,45,47,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0033FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,45,55,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333300')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,45,63,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333333')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,45,71,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333366')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,45,79,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#333399')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,45,87,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3333CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,45,95,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3333FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,45,103,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663300')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,45,111,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663333')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,45,119,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663366')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,45,127,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#663399')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,45,135,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6633CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,45,143,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6633FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,45,151,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993300')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,45,159,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993333')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,45,167,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993366')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,45,175,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#993399')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,45,183,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9933CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,45,191,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9933FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,45,199,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3300')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,45,207,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3333')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,45,215,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3366')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,45,223,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC3399')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,45,231,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC33CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,45,239,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC33FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,45,247,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3300')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,45,255,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3333')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,45,263,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3366')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,45,271,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF3399')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,45,279,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF33CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,45,287,54" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF33FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="1,56,7,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000000')" onClick="javascript:keepColor()">
<area shape="rect" coords="9,56,15,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000033')" onClick="javascript:keepColor()">
<area shape="rect" coords="17,56,23,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000066')" onClick="javascript:keepColor()">
<area shape="rect" coords="25,56,31,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#000099')" onClick="javascript:keepColor()">
<area shape="rect" coords="33,56,39,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0000CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="41,56,47,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#0000FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="49,56,55,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330000')" onClick="javascript:keepColor()">
<area shape="rect" coords="57,56,63,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330033')" onClick="javascript:keepColor()">
<area shape="rect" coords="65,56,71,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330066')" onClick="javascript:keepColor()">
<area shape="rect" coords="73,56,79,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#330099')" onClick="javascript:keepColor()">
<area shape="rect" coords="81,56,87,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3300CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="89,56,95,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#3300FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="97,56,103,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660000')" onClick="javascript:keepColor()">
<area shape="rect" coords="105,56,111,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660033')" onClick="javascript:keepColor()">
<area shape="rect" coords="113,56,119,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660066')" onClick="javascript:keepColor()">
<area shape="rect" coords="121,56,127,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#660099')" onClick="javascript:keepColor()">
<area shape="rect" coords="129,56,135,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6600CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="137,56,143,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#6600FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="145,56,151,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990000')" onClick="javascript:keepColor()">
<area shape="rect" coords="153,56,159,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990033')" onClick="javascript:keepColor()">
<area shape="rect" coords="161,56,167,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990066')" onClick="javascript:keepColor()">
<area shape="rect" coords="169,56,175,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#990099')" onClick="javascript:keepColor()">
<area shape="rect" coords="177,56,183,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9900CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="185,56,191,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#9900FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="193,56,199,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0000')" onClick="javascript:keepColor()">
<area shape="rect" coords="201,56,207,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0033')" onClick="javascript:keepColor()">
<area shape="rect" coords="209,56,215,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0066')" onClick="javascript:keepColor()">
<area shape="rect" coords="217,56,223,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC0099')" onClick="javascript:keepColor()">
<area shape="rect" coords="225,56,231,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC00CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="233,56,239,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#CC00FF')" onClick="javascript:keepColor()">
<area shape="rect" coords="241,56,247,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0000')" onClick="javascript:keepColor()">
<area shape="rect" coords="249,56,255,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0033')" onClick="javascript:keepColor()">
<area shape="rect" coords="257,56,263,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0066')" onClick="javascript:keepColor()">
<area shape="rect" coords="265,56,271,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF0099')" onClick="javascript:keepColor()">
<area shape="rect" coords="273,56,279,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF00CC')" onClick="javascript:keepColor()">
<area shape="rect" coords="281,56,287,65" onMouseOut="javascript:showColor('')" onMouseOver="javascript:showColor('#FF00FF')" onClick="javascript:keepColor()">
</map><br><br>
<a><img usemap="#colmap" src="colours.gif" border=0 width=289 height=67></a>
<br>
<br>
The Hexidecimal Value<br><br>
[ &nbsp;<input type='text' name='hexval' size=7 readonly='readonly' style='border:0px;font-family:verdana;font-size:12pt;font-weight:bold'> ]
<br><br />
Click a swatch to add the hex here
<br><br>
<input type='text' name='keepcolour' size='15' readonly>
<script type='text/javascript'>
if ( opener.document.theAdminForm.initformval.value )
{
	document.write("<input type='button' value='Save' onclick='endwrite(); return false;' />");
}
</script>
</form>
</center>
</body>
</html>
\ No newline at end of file
diff --git a/upload/html/sys-img/css.html b/upload/skin_acp/IPB2_Standard/css.html
similarity index 100%
rename from upload/html/sys-img/css.html
rename to upload/skin_acp/IPB2_Standard/css.html
diff --git a/upload/skin_acp/IPB2_Standard/editor_closed.gif b/upload/skin_acp/IPB2_Standard/editor_closed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44813995a63ad5eb40c4ec3b1939f594ed45c4dd
GIT binary patch
literal 1700
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

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/editor_open.gif b/upload/skin_acp/IPB2_Standard/editor_open.gif
new file mode 100644
index 0000000000000000000000000000000000000000..eab44ed5ea43b5a5a4f0296c895bdc3bfaa7f975
GIT binary patch
literal 2213
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

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/emo_delete.gif b/upload/skin_acp/IPB2_Standard/emo_delete.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bb8e372d7d097f55ccf1a6c4a3dc40ce4cb7b2e6
GIT binary patch
literal 410
zcmZ?wbhEHb)MemjxXQqA|Ji$=@@?hS^-ET+FOK8<^~3bdA(;!;??=WYY}&E^;PLZs
zZp&n37d)M;-qzL6z`(%E$auG0^4UV^J0~vOIexw(itAd>#D-w*yRDKujEuMUAOCdO
z;Mor8>Ts?oPR@I`AAh>2fA`X@Z%>VG?>gAx&;9M0(Y4M#pgGh6ia%MvM(Kb^ke?XX
zwjXFH@X(R!Kas+4AjfL{g%u`RbE4KqIGCQ!%~E4%lGydO$a$G}qHjf>X!AivhJJaG
zvo19Ywtr{$mF1PrX3h1DW-4Uj>?&jO<*BaXD4JC0!@{a0r@+t6)*j`}Fu{jsna|3V
ztJeC>VpZjpVO!X-WHr;S2`f2v@vYm(bRe-+KtgDnPp1$2F2B|O%ht@~o-Zk=;@7$R
q+-|Nz%!e-fJYK(*O;k*Id)m9iWO<Rd@4x0P`S#Q6_n*Ix4AubEVve-{

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/emoticon_folder.gif b/upload/skin_acp/IPB2_Standard/emoticon_folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..16f2f598e6fc27756e5d4171a415a439052bbc19
GIT binary patch
literal 624
zcmZ?wbhEHb6l4%&coxJ^9LM?Vhw1n4Kf1en-W-ydIdkTNfB%;(Ui$w1`!}~`7#J9y
z{QbXq^XAE$pPe~#X7=U(M~@!4^7nt!-k(R_|9}7g|E!%a_UzsN{rA5aa~3VzbEu}O
za?Xu!o1gxF@$A8xcmFSZ`M>Pgr)3+qZr`+F#hw2^aO&g#j`q%H&z?m_Meo|NW8aaJ
z&)<K{YFpZQ;=}bfe>YtFG2_nvWrt7p?E2KP_Su^szoy*$vTn_WuD#E${`j9&)Nt<Q
zzpwxQuetcMdBKq#umA73{<mlE_v??|&pmbR?(Lh&<<lybo-W_>b;Zgx1+{IxTVLJ2
zerwMC|1Iqk_TK+H<HEDHIos!L-oE)Z(2V~;uMGyE_>+Z^fgy-N2jmz~oG`GTZ3t>=
zZfR}d<6~tN;ArCMmug{U=VRhv>f(`Qnj_}n7{oqj+F~XF0e@R#X{#V+4i0BAc6LR{
zKz$npQ6s%|DgqK(+9uo<_Pcp`9h%llh>MG`$@?-~J0)~hR?(X6o;(BNBL>f#>%0O)
zxL-ef^!OPwpX5EZw_J=|oGc7yH4OzBZg*bZzJ4aJqN<wDhUpHBjZN$LEFK;>c$|ZQ
zQ_613wKWdi><aQaj2{Z_Pjpn{l4yK*@Nk=w%bJhMOB`K#rFDvAED|#U7)5-lq_|iZ
FtO4=A|I`2g

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/file.gif b/upload/skin_acp/IPB2_Standard/file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..48c1ab1f57983b83b6d187fb01d2aaabb149a9b0
GIT binary patch
literal 179
zcmZ?wbhEHb6l4%$*v!fB|Nnn(J{j-S+uL?r+p%K@0|P@^TH1$i|CcRW29yGF(SYJl
z7DfgJP6i#2ILHhJmIQ;7p4z+?uM?Opni+Z+8bcW+x)yg92uG}0^V{o{&YMLuJ)08}
zPbBvy>}g6c;FjWGVbIwaY&2KprHX=t8E@p;Bb$qz&Od5l-@wv-`E_~OE6dv#ODZka
Qt6wy4P#0?!5oE9i0K+LhNB{r;

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/folder.gif b/upload/skin_acp/IPB2_Standard/folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c73dabb04c6e26e4c85e163c60a653a8b290e934
GIT binary patch
literal 652
zcma*kUr$m29Dw0t14E|<XzRk*%G8B9GqbYHHp~38(#=ho>8zZsHP>9ZnO4>e5K(E>
zQYT4_5>N|}Izx%XTyYGInN~`sC2MvB6^}9$)Zo|r2EF&s)ti=)nsBs;hR_fkLC)nD
zbk0HfOM9j4lTauG0D13w{s<5RVZ|*C4T6qN1z(9PM%Nm;?Zp+%CX>m$;6W!>3<MMj
z@oRT@_fUc->d|Snb;hN7J<hFtxZqyLFvHy!){?Snt=ZG_T5a({<AhT_;FvW3u&;VC
z7qpu_(l%MEZmd+{WE(-L!OXu2vBB{e#YNv&OL($J-SaJ?=Y57jG1@arESJA>3Qf>4
z1#JD=HxIZryaEi+KhQFQ&v?KDFl_Vcr#)4-Zay6v=XKfSYEAp_M(bB-G<!J`gFxr#
z)xRrwW~=C3dGf~Egst;y>wZp7sK?zdms=ocL{YS53hry>#@wKt2LfOPpvwYHeU95o
zy9{#)^e(n;5y$ZnCvY^gibarr7*r|LnqMFubl=ea9a;wEFo>qX>$3&<?{=?|$RWse
zBzjY9K0&tHs>y5)w}wlll1K~+JMY11E{REHQCRhPek@Ve_82l#)ZE5mFm{{`IB<&W
zPod;wF`4PU^xVMk>`a=9%!og9WM^{0uD7wV#gQsXd{R<j*yR*m_E2Jy$}jzVm}M+*
z|G|L#M7Dp#;lkv_(v*ygL1}4L71h@gRuFvQYG!ohl4TEr7k`{C&f}b{uZb-Z&!o2x
z@LT<YwN=@1sr|wJ`+}rrd}cmwi#b-d&_Bw<=y6eBXhw-tPESbqZ0u0?*Grfr$)#jY
h<UsY-P?0-4C)_{@j5{ISTYQD;gM>!qMubq1#D8(1SRw!b

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/folder_with_page.gif b/upload/skin_acp/IPB2_Standard/folder_with_page.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f79335693833518e75b0ab0ffe7212e731a6f250
GIT binary patch
literal 660
zcmbV}+fPz)0DyleazrJCvZ2l?&Rb>Xcqp4~v1Ped5B5;=QfoH1obh12v|4Qr2}NDC
zX$}gT^TK*C#yV?~Nf*PW&LskgiW({&F`;un&P{_~`Y-hT0pGsuE4z51_;igB2mvMs
zwKbJA&9t?(`?fZ<TCF<*`}+oP9A~KQsi~<B6hl$e6NY1BmREN8@`G3ZJ;>4_ht28;
z!~WiG{mAH}hYu_`q<15KcUg2D?l2S;!hbT*v;{}Zp9g1H972t*m!Y?5GBEfDdNH@&
z_+B?h+3hxyGaL-yEpIXNukey<UZoqdhG451BOx4mXC$|Y?#Wq~bK#R^;x#&Cw@t5m
zR-CIi6(ZE*#25|tph$uygTp2h%Y-HaaCv!gd1+ynWdeksrh<OoZ`4KF?K6JgX6Jm!
zVV`MutkQp*Fbo<itE%shkbWv+oMmW|@NQrVGs{rHrXI_iMfhVgqHKQd^o2E6OtT2v
z&2&q%+Q;nF-)pQ_4Q$|n_Tk_TOU*eQu7&x%4Di25SS|+uIVji{>^}iWpi!=9Qa(}g
z`CP65QN%wxtmN|e9E8&vpUcr@l$XePx~@KsKyaeEApeFu3PB1pc)YyiOV=`!66<an
z&I+<l-L6eYKl(8)?$%WUk|h>PVv3FrCr(x>qH^=3G44ZP%_DN1ES4l}fs~YJVhxMp
zC%a?PL2R0^EZSpGmTF~I1RTgNCK~DK7oDl4h1UrHTDp#9+cN9&zW}iy^-KdNskT(a
z6()%}?p9eMQk3pZlV**olFwH>mB?}~t3~<1DwFo8MFn>%sx&LvDy@_UyyYF|Mi1s5
TsSs&abG~NY^^9MM<${ub+Td8I

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/icon_can_write.gif b/upload/skin_acp/IPB2_Standard/icon_can_write.gif
new file mode 100644
index 0000000000000000000000000000000000000000..08ab7e75a3630c5b6214c3fc0a55d2c916cca797
GIT binary patch
literal 555
zcmZ?wbhEHb6k`x$xXQrL)YQblz|h>>{PE+*zkmP!|IhH@!-x0p-~a#r|IeR4uU@^n
zd-v{_FJFHB`t|PJyRTor{`>du+qZ8|pFVx`=+VQ64`082{rU6fJ9qB9c=6)<_wR4t
zzWwy+)AQ%g-@JKq>(;FY4<0;w_U!iU+yB#yuV26Z`0?X=_wGG;^5p*g`#*mCICt*c
zl`B_%{`~p!<;#|qmYX+k{{H>@+O=z^PoKVU;lhm@H{QK_f9cXCp!4tm#h)x-Ssf4w
z@)HBwe}{$w3lWYEcjb+f6a;1kq?<VUO0=l<9xgPH*%iC~;O(~oEgL63-;~hqw0uH(
zVV1tlhA9DJi)PrV2+Io#tB8mQx3`E_F=&YkE2t<4sZ9}LoGCM1)znE#SVl%dM`D=_
zqtYry37M(N3{1)@TwJ1Cx5>_2y-i0*&RtH3PwHqCA0sR4Oh$HDQJD=)dJ3{f;^R-A
zVvJ#zk}!6Y<6>h@PQG>f*)uL~H*qd@=Fig1FB!i`n}~|LadR>2aBP{7ceAZgTI7px
zz@jEbHXb>H9qbz)u^GF0Su{vIbYw|mRO+a4_~gi1&Lmcn(4geZCUPdmt>C9oQ#1cR
z8JCO;39ii^J~p+Vp8QNWz^SbMMv%etXy;`$eX|ESA0INZutaRmx+`_Cg<+MLkb?ww
lqeG;6@?571hlBELm7kwY?e;EjXcBPmcyV`jxrYFQH2^Z}{$c<C

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/icon_cannot_write.gif b/upload/skin_acp/IPB2_Standard/icon_cannot_write.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7f77bace8f175b65720307f59c44b80fc670f807
GIT binary patch
literal 795
zcmZ?wbhEHb6k`x$c*ejmd-m+VfBzaA8_$_D=kw>!U%!6+`Sa(OFJC@=`t<+*|BoL(
ze*5<A$&)7^K74rj^5xT~PrrZv{_o$vw{PD*fByXO<Hv8_ym|QW;k$S5UcY|*`}gmE
zA|fwdy!iF&*RyBO{s{^`di3bkt5@&ezyB{P`d>m~?b@~X@8AD@;>163@pbFg{aL>J
z$B!R>&Y%CVZQJi9Oa2N7+`M`7$B7dq%E}*BuKd4f(YC_EzY7<BoigS6_3Lk!E}c7f
z?$7h*zn?hqW#7KX+S;FX?0E3t!K-!a?%cWaXYt|~P0bez7Tmjc@6Vq<H?6F0+_+Ju
zr1WOPhCiaBSFc_@n3(wLz=2t_X5GGh`}MMAaT*$*SFHGX^5o`{l7I8&t!--hw0!xu
zrAxmqU;cIH&bxQ-{@u5afi6JtCkxmf9S{kM69)GG4ep@~EiKG#tqkqV?JXv9v5b=@
zPnkN2r6o`<nu~>F-aL*)^SHR!d4(DLeO&Y$ctm*Q<@x2sc=$K)h`E}#=*wH^dGSfh
z3iI&^3rkC%kQVW1cNCE}lGBmklThGex-Tkmi$9<xMp#rd;)alrD3gYY3e&^8s$Hsl
z;^K<IQg(_`HOh@n4J~X!1`!r1j4e%UOSfb^P(0Akn9n3&v!)>5!MTIWCH11hQHJ(z
zDM5ul2TwGyFtKt7SU4!OaR`gC9?>ayz{Kn(qE}*7(6GEg#Jp5Uw?To0)s08*fX;>m
z4zA1|?ILS$eSX=%&YPguu;Ia~Mir?torq`#(Z%c>6)RRrbO$oDh)E^%v|eavRAS>2
zi#YT1?4!HFA%0pf7(y9acqA=Sey~|?5>!+UbFldEK$nq`@l_O8fO2sodzaOUjtL94
zzP`RLz30Ni1cyF8RwkDlvX0+XuI*)xuzdJLfSGgtv{O?&H*1_{Hk%gX>9Tj%A}8M}
I7A6L30OZ3{t^fc4

literal 0
HcmV?d00001

diff --git a/upload/html/emoticons/index.html b/upload/skin_acp/IPB2_Standard/index.html
similarity index 100%
rename from upload/html/emoticons/index.html
rename to upload/skin_acp/IPB2_Standard/index.html
diff --git a/upload/html/sys-img/item.gif b/upload/skin_acp/IPB2_Standard/item.gif
similarity index 100%
rename from upload/html/sys-img/item.gif
rename to upload/skin_acp/IPB2_Standard/item.gif
diff --git a/upload/skin_acp/IPB2_Standard/logo4.gif b/upload/skin_acp/IPB2_Standard/logo4.gif
new file mode 100644
index 0000000000000000000000000000000000000000..84421a18cd7d92bf2a0a6b20d6073e8c40d64476
GIT binary patch
literal 5476
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
TXrOi)xW5K@Nwa7`26p}*E3g#;

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/logobg.gif b/upload/skin_acp/IPB2_Standard/logobg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8ec25f76721f915fc8a15e53a9bf25901b43b8c
GIT binary patch
literal 3295
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

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_changename.gif b/upload/skin_acp/IPB2_Standard/memsearch_changename.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4bfe19cc8254b3fe9ec193de399a14ac01219fb7
GIT binary patch
literal 571
zcmZ?wbhEHb6ky<Cc;?LT=<>fCNB(~J@FCZ2Tao+0M~@yoeE6`;{al&**;lV#ef;?G
z$&)7s7W_H0>2Idn$`+5$mv;S4cUzj_w(QjUzb~J?&v)P1S-AE2?SF+)Ggj69DUO+6
z;J&BL<H!5=@3Y-DEXe<z?Y6$!{r1b3FZay)b9nLJd0mIsxBl7K@u$fB(2Ex@UcdNo
z<Hn6^*REAWuP+YVbY%CHnQi+|9=zFFxT>{a)vUGyD<@rUO*wS#*uB=2!_S^Qd;a`+
zY3PQ^==CcnUHSa^b4lQ)ve1nW9y~a@=j#9e{~3lLQ2fcl$iU#tpaXI{C{7sIXEZoB
zHMdx5Fzd8*HL<ers`Ih7XqoD9NU@0uFfd9AIW~z{D2mJIv+$_QQI;2MQe|gQGhs3k
zQ<x)XBhlm_%)oEX#3U;{hnb5>larZ|L0XAZ(~zG**jmY1LRapbf|#+aff@t5DwDII
zyz)5}9u_AVaYZu`E@w6&$#VjttWq3xUjiN`UtnTamlBBB;Bm2wQKQ5}MudaG8URxJ
BuvGv6

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_delete.gif b/upload/skin_acp/IPB2_Standard/memsearch_delete.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8d869cfd8b4f7e38523e0bec295f149608919123
GIT binary patch
literal 282
zcmZ?wbhEHbWM$xCxXQrr-<DzjjvXJ28TN16_S=r(qXENzM~3rf&g>KBd9KN@R9mCZ
z#c`pW$Qm`JZ)OY|)m7&Q_*V!Ee3WCjEXJ@$h~d(O3l9|;9zS~Y_U+pvDiUv`8O};E
zw5uppX{v8pzWk;HLyN1+e-DP06DI5y<oIvOQ19+GK}_JfJj3l<w<cSd9NoUX*4}mv
zAH#Yf)+w18bF;Gc>ZzVOdUWfwX>B~LzZDtQ@G@Li;%XETTt02ue|ZK>p!kyoET{t_
zL4IOjGj|X@Gi{<Riz3sahYS*K6Id235Xfa%etn_qBAx(E?!`@o8^xwGEKfVsXlHVA
St;xwurHxnDJmzF#um%9?e`I?A

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_edit.gif b/upload/skin_acp/IPB2_Standard/memsearch_edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f35560c873160d96cae8966f599838dc9f4efc76
GIT binary patch
literal 525
zcmZ?wbhEHb<YnMtcoxL4@9(~j7wtul3OLHy8NwNi_vqK$u4YJN;A`fsxmi_vvv%px
zrB&Oj_T1Zj^#767H&&VKG+Oq3na&)oxo_vpzc|nLl9%cR<&4{Dp4;5z7Dz|mjQsfV
zqx?!)p<aRX&1u{IZZqDk-~6(%`Dx?K&oe7;mGSm)2kr{k`*+Wg8%HLdo~W~4D`$VU
z&=di|4u08gnTmVmp*MmT9b2^a&RWJ4#<hReIB#@Zc50buhlqHO`0@WI5^l!j-p$_j
zXq)dkANEqVJI`---S1?GWDsu?*O;xg;m>--e8unIzniQu?s(N6ax6$}sz~MLO7m@|
zc2{h2R^)^o4vRk;%hSO1|Nno6!2uM1vM@3*1TpA<oCAsz2KKCmpr+;)Rt1}u79%kR
zb(zj4el0#rf9(mplEU%<wm~B9n$0>~f^4cyUJh!q_Hw4mjJnOvE+(87fl7)(-pxE5
wDjxb0OrCa~X3W;&R#Hxe&C*SNdIq9C#uI|v*advexo-z)II_4-Xk@Sk0J!j-V*mgE

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_email.gif b/upload/skin_acp/IPB2_Standard/memsearch_email.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1893e5bb27794546bf8713bd647d27e00f0177e5
GIT binary patch
literal 543
zcmZ?wbhEHb6ky<Hc*ejmKbz_Ok;rqiS+6gX`v3do-`DGY-S7Buqx$FFwyziSem$A;
zV3Xme%azNDx$bXrf4)25-}`mzYJ^`LiaWo+?D|UkZ+F^{P1oJmr}E=Q&AqLG+ghbR
zpGrJDS>?f2-~D}ZFAv3E+Y)|xrOV5sY3JsO?CxN>w<rGhqY3Bd$*w5nezrg6?t0Us
zllks#4ft`d^WswdJ8Sj6Kb*XyO?XGU=*P3!UoMxdEa&}nx%}PfoKthPU!Jdeb0&X#
zo8*m^+DE3U?&+34I*Ix6GP?s4Bo6dRoR}$deT6#1Py>oTS-?)#0g<3MVPLOmU~Fn`
zX=UW+5@6}>=@sDO=MxfTojPs0s1TnBmn09{f`tosB-uoS)pQlj+1IX9RWPs=7USSB
zlauG%&8cI%%}PvM!o*q2PF7mlLB>W;LP=c8*wKYs-_TUUiJM#9LQ_i6NSXQB^B3CI
Yg1q)j?>~Heufogl?fZ|P42=xd007;hQ2+n{

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_group.gif b/upload/skin_acp/IPB2_Standard/memsearch_group.gif
new file mode 100644
index 0000000000000000000000000000000000000000..546101d4ab169b5092d3f275de7a2e47844b48a0
GIT binary patch
literal 1036
zcmZ?wbhEHb<YN$E_`a9n(Y3=3%l?O@E^l1&|HuL#Q!`7KZl{d;|C`ru{{7=qTJ2vC
zzx2sR{s+cQIy^(Opz~$g(S)vTzn4|;)nBW;y0hZ#qa(NWr1vg-xnb|y<u8|)EC}!l
z{n4`W-~Idd{`~%N{MfPL-dDypcQ?0*9=modxAXt4!_Dz-EV;EC_$Tro{BgMZM)%oE
zX9IQx*e$i3alS7m=lcKu@3QL-WHr8idv{}2TD^#5_sP@eZXN0S{A9y|8kZZ_Z{*};
zBuzMZajkb!>%y`rZzjdFO-<$MDHO4>kB=|E>lfs;Y*K@_UubY?%c^<>s|qU%+XH51
zPOZ;-?j0;jt$FAg@JDN-&X4ckWus)bw<~=6_D!Kp{@JtZ-TQV2C4Vyr(N_sl2``oQ
zKkuvIqfs^Uf84~_)3YSo*Zp66=zq()|5Fd&PCb@<>sV)T|NoUWJk|4mn_6DJzQ5}5
zp~DfmHyrZpZM@F3bj>*Q_h?%ntIk}V%a<?5ZI3xT-Q?5x^m9v$H>}z)w}}7$j~&Hl
zia$I#Y~yOP@b%oXXU(leO8cJdUAb+gV@Rm`S~suYp0)|=-0D-le*c#mk@WQ3^x6e~
zGjk?%Z2E1v!7^{^_K3_MsZLyvuOBREf01!Gy|VYJf%)`f{|_GgcjD2-WiG*cmsZFr
zY0ot_vHte)aX^5dwcAG5d5#~RUkbdIaQXeErT1q4{`IwY-+%3CnnxD;_8<Bmp8fLw
z|Nr`J`r7)>T>QGE`lOD|(&^m%J1U4f<w9amO#kLJn;#snFj!$=Kf(U>!&5-T48sB_
z{$ycfVA#u`1M&?hPcU%2WT@tpxxpRMZ&0Zv;A7A{aef?2*g`AirYR2mB59U|1<Cx<
z5*CvJgidImRSQ>DdGey=dEWwUCPtQ%M~^oNh;LP!c_G1TfrzrhiZc%{sa{yAwsa9s
zkjXQqUe~^gDJPeB`f+)e88j#y?s8nkICTTVsf5#KR(RVVxzP2Y<8ZTwaL5az6oq5L
zN{m-bij)ttx7d}$HCi4#d0AX2BWsVtrKY3n%#{U>3Y9LH%H+c<w6bYQ%Y*|KOq&i&
zELlB4RAkeZH3Aur1*Ql{i-~+RN<A$v%k-Kjk~#b2M1GEfmzlw?3GD&%XNcTzEJ$!*
Gum%91AFC|@

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_head.gif b/upload/skin_acp/IPB2_Standard/memsearch_head.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e30ca82a5444fa33cddd4e9d1fa5ea36744a8966
GIT binary patch
literal 349
zcmZ?wbhEHb6k`x)xT?bd1dNP~92^`kUc3+#6x7tz3=R%XNlEGM?v9U-kBEp!OiW~B
zW9#VX$ji$+dh}>OK!Avd$lbel_4W13%F3*)tPUMIl#`QVXlTg9#3Upn#LCKQYHBJi
zEuEjA@8{=NUtd3W?%eeBbX8T=2@@trNlCT0w?BUTc+HwM+S=Og?(QpBuKfT1Kgb<q
z0mYvzj0_AqKnMgNKQXXXIZP|?(2??Y3v*&%2$4Fur1j<+sYR}?rQ8mQ?W}pFA4Q9f
zoX!5(%%*Z`jq7Zt@U4mkfw!6Yw}uz!M8&W(H*zF#G&&`QDt9|2iKj9PspawoGV`;u
s<oYrSO1LUW%}-*|bW-72p24W9BfBnFT9|Rm`guDuBzNpda%8Xu0I0QIX8-^I

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_ip.gif b/upload/skin_acp/IPB2_Standard/memsearch_ip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..914e1c04dfaf7b086b990bf2c267642b2687d3a1
GIT binary patch
literal 1070
zcmc(eTTfaC0Dw<7*Qk|_HrlOAA9Oyg-9y_ni*8vro32`^#(QH|wd&NWwWErH4lhVW
z5v!mm6%bGkaJVRVKm}3czySnNF4Y3Fn;YV?&L(rqvSo>hYk$SQKk$7oU;51(DXHaH
z01NyR0NDIlPiU9W&aG`4QNp$w{7^N1sH~(FR2VJp?fmR-Y6<M`9t+7mA`(Tgu<YsR
z6-6QuLI+o4@U5)AK;1it*%FStnnyP2!}2-Prdo%}l*?Ani(oL+)h`8AXylhyE6(qi
z9l`b<A+omJ_^{Jr^EG};rZE+vP)IXp?-`UglQ|pyA7R7#-u{8r?&or+L78TEH*B%{
zHiF?^rmUof;c|J`Lt*KRozf4YsI8+<j5^jOVu;kzMd_EQbWSb22x%N`M4DV<%PMSp
zD%3qBjZN?;-JVcR9+5Yxot%=E-FYO3;1Ryg{rqR6X>}S#Dk>-$H)>eJVzYa@l`3o`
zk89xt6S~#Z&W8;f9HG9cX+Wwn@xVnEPxr;AMccdk9*>thrC+dYH4sNB^eO6qL<ytD
zWee?zY+C22Bd`&~+S$dGD2(}~-E<}-SDV#38=-?IkRintR7j0f<C#nL(5%tl(#7v)
zK<jRITWd!zOJ%jJg?~M;IG&I4)Jup*B38RxzCd8h<@sU7yjs~XSYFQ<;lWDSdAoox
zF$u4%nAX;VcHd56G1=?!f+}ldZ_kMM1=3~ixWMQL%r7~6X$-R?WH9J)nGFp@4vEk=
zYw+?x{r+z+zpm<YZ0yV~`h*g_M(-Kos3)b`8az`r>u#Y4$DS&)ZsF5&iJ~c3C5J_j
z5rPy2*;OJ4nE>^)$IOCK>fnIDXbm<KhnqVmbn`X_dj^8tRrL%$xL|UH#yOBLu$OkN
zZX>uWmcnTnk2oUz?|=NIS@c^Sn@bjN?yWNV$js5v5%52e^l#KL00;mdzwy6$0*F2W
z)G_h*k!PZuFE3;6lCn<5CSO03&>z0g7fZv%uWC@xPJbU|7w%tT;>J@6pXjdP)8nRU
z%UfFY^D&vzXMkYPzyfcBapy9|^|X5br5tP~i==(4n0ob{izTU*3OeOJKt8w!M2`aJ
zhW@^oPXL@_ck7l?ynmj*E=W0%`1#w_wy~(I4XT9XsN)|n%C+o6%ZIALu6HM{B-9d)
zp{G8oJdM$Rg&W0QZp(JwnS0Q!Ou|DLJUh84w$y$&fMp%0UdiqCs_6J9d5JeWUu&Nw
z;bMwPq7ShdR_95K^MToWDltv-UO^rvK5G9&4=$g3R`HVslS~u84zOBZrj4FmJdcTs
H20r@_Eh-a@

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_posts.gif b/upload/skin_acp/IPB2_Standard/memsearch_posts.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cd62631f3e89395790975608e0845989f75f8a0b
GIT binary patch
literal 396
zcmZ?wbhEHb6krfwxXQrr|Nnmm28O$L@9y5c`|sbsA3uJaIdkTpKY#xH`}g6)hugPr
zzkmP!!Gi~9(ilQRL(iN!^YG!r`}gm^d-v|nojZ>nJ-T`G=DmCO{{KJoe<s7%uV2rd
zJ9p#8jVo8KJbChjfkE)rty_;DKb~pKFw@xh?c29A(-=;lKK=Rg=b6T7|Nqate*Jn{
zn(_a%v{0ZkW~RM<{rb(DH~(iEU$}7L+qZ8oUc5LnbLJUi<1}OASFc`Ox^xNXPE4Tq
zlLaiO10q3wVqjb8aJ|t%LaOta^C6>29%7xWB2vD46qa5|S9+i&B6!sO!hwt=E{}G`
zMFtuo0!td1GA!Em#QE<#;AA1g(A?6(D=xvyC@syv$IRE-E}<gFBr4j>*lKE`qsYiS
zooiN$l90BR95XY&u-MXObzQTCYnTK#^iQ0%Z4JL5lMvGpCjO&GkMjsJo;`Q|JP(f~
kN9(m_qii*Hj=LNz_g(Hv3NRUSv%Y-E`Rb)Pmm`BU0BT;hO8@`>

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/memsearch_suspend.gif b/upload/skin_acp/IPB2_Standard/memsearch_suspend.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1bd5e72ef0d45d4a0215248d7a91d87d17573147
GIT binary patch
literal 573
zcmZ?wbhEHb<YwSwc*el+|Nnn0D=P;FhYue<ynp|`si|ql`nl64c3!@Gxu&LO=FFMf
zCh2{7b^i3})2mjk+P81ti<_$}D=S@GT;A{56T`r8eD~5b3=E#0p3`y|8X_5P-@d(h
z^X4Z{o;-j4{O*w>H*Vbc{rmT)PoIAL_;L08`6EY;Y}~kU3IoHTLx&zdeAv^|bK$~;
z=H})Vvm58lo40$*(s%FPt*Bynw|n>YO)Iu<-(Fr`zG1_LTj}Wq-VA&8?73fAX>4q~
zt*UBrTh5(3cjlJy?4Km?ysvN5rcFh@49k`+tE#FxckY~rhsUvF$9C-4v3vLK$&)AV
zoxt4`#c==9r3F<A6T`#v^Ya%iTC{cR*0i*=je2_B-Q8#T_%3YUK700TYisLbUxuYi
zmrgE_FD@>=dEh`pLqlhpV7?c_k-2lPU%$S7{rcJ@JsTUF)?AzUjkf2{pWnB9`Sj`2
zFI~D+SXlV|`}g@(3UlVn>FVlYAQ~wCWC5$y0g<3MVPK!tz`(%M)YQ@>U~iCbWToe4
z=Pkf3A(?2ysAKMvz#Ze1&d$oo%AOjPA<8CbDrf1NBFH8x8{p0?EM}-5WWwyBDWm8h
zCd{ItZCqGjkz*|qVixYD%Ngy=?=PYjmJ}M1?V=^GoE4Ysnj2^vDb4E{pULa!CZ)tD
o#Ko_w&c(==$HB2fK%t?fDUGE;LSX?n1B;3P!we+`2L%Re04uZa?f?J)

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/menu_collapsed.gif b/upload/skin_acp/IPB2_Standard/menu_collapsed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dc0d365b829e22e265a1d988f592ce51d63871ca
GIT binary patch
literal 429
zcmV;e0aE@)Nk%w1VJQG60K@<QQGU8#lFu+!l`>hGS&GItVWC}+%wUz$UXso+SC=nT
zlr~?VT8qazW~MV+n>1aWIb@_RQ<6Vzu3?taJZY&_gTG&t&{u}SK5MI7j>=bu!&88}
zTaC$6g1!I%00000A^8LV00000EC2ui04V?_000I5;3SS@X`X0#tZeJPaO_%iZQppV
z-$C#Hz@TtQEE<nLgmTGjI-k&{VM?u9uh^`1%k5S(;IMd1E}O@kw0g~MyWebvd`_?1
z@Ax`l&+q&HfPsR8goS+?h>41ejE#<q7m<>al$Dm3logtroSmMZpq(9~q@|{(sHvtK
ztgWuEu(7hQ0JXNaxVgH!yuH4^z`??{62->H$jQpf$QaJg(9zP<)X@~z*xB0K+}+v@
z;Njxq<mKk$5b5gc?CtLF>;>}k^!4`l`1$(#{PYX|00RmfNU)&52M7}?T*$DY!-Wna
zN}NcsqQ#382WZ^Lv7^V2AVZ2ANs?oNlPFUvs$9vkrAh%XW6GRKv!>0PICJWhsi3FN
XpFo2O9SSsp(W6L{DqYGnX$Sy2bkW_B

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/menu_shortcut.gif b/upload/skin_acp/IPB2_Standard/menu_shortcut.gif
new file mode 100644
index 0000000000000000000000000000000000000000..79c5d12c2d55f06539fd63208103fbdc45a823f1
GIT binary patch
literal 833
zcmZ?wbhEHbWM^P!_|D8QXAT1peE<F(M2&*c5Ex-0p!k!8k%57kK?me-P@Z7mkYixv
jkom#i(9q1zt@cOVA<?moPf*L{#)tVwyZ<vWF<1itxKtBF

literal 0
HcmV?d00001

diff --git a/upload/html/sys-img/minus.gif b/upload/skin_acp/IPB2_Standard/minus.gif
similarity index 100%
rename from upload/html/sys-img/minus.gif
rename to upload/skin_acp/IPB2_Standard/minus.gif
diff --git a/upload/html/sys-img/nav.gif b/upload/skin_acp/IPB2_Standard/nav.gif
similarity index 100%
rename from upload/html/sys-img/nav.gif
rename to upload/skin_acp/IPB2_Standard/nav.gif
diff --git a/upload/html/sys-img/plus.gif b/upload/skin_acp/IPB2_Standard/plus.gif
similarity index 100%
rename from upload/html/sys-img/plus.gif
rename to upload/skin_acp/IPB2_Standard/plus.gif
diff --git a/upload/html/sys-img/remove.gif b/upload/skin_acp/IPB2_Standard/remove.gif
similarity index 100%
rename from upload/html/sys-img/remove.gif
rename to upload/skin_acp/IPB2_Standard/remove.gif
diff --git a/upload/skin_acp/IPB2_Standard/settings_folder.gif b/upload/skin_acp/IPB2_Standard/settings_folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3ad5ffdcbc3469d2ef457b480ed8843d39f73839
GIT binary patch
literal 1177
zcmd7RYfoAS0LJknD5G{xI~m|+Hal-|F-xbhVzw9P8b=#zYuEHevlvX5Et#6ksY|n(
zjG+l?-PCCt=WK>37H<fM)lID+7LIrn6h&_1A_u_($X&(j?6=tS34Sl0{}<N_NqJ>>
z01xcTfwQx-y}doR+kJR=XtUYucDvsn2#3Q6f`r3|V`F1(_pa4yotm23-{0TfwtKz4
zU@&Af8t3OFLqkJHM@LSllgVUSVcYQV2%pbasZ{DsO(+x+2n0Kb6Ix!D$z(G#Gr76B
z91h3saICGZLD2HS!9i_pEgp|&v)N5eO<J8{Zf?%uaFmyqd%fPSt}egd9}EWT>guF2
zP$UvbrP7?794>c^)i*#O5FiLrsn!OEMl@P|D6}V)$%28v(h|hy@j(#W)aa_Kt34hM
z48y&>EUi|jT;0%U^me<0N~Olc#H^hgH#fVxyIn4q&*xi$AhX5V(fM?YH}*&OpDw3c
zwV_^FQOrv~pU)cz1hiW1&JOag(JYZjC=|-+>8V&e|NJ>8K0cnoVCeOFczYYRZ6i(>
zY_nUoth*jhUS3|yZ*2|)QLEMC!WSExnia)b`|q8*yB^iL`k(1(o!%r8i#;CS@$qp<
zNr}a>RaRC8E-p<>2+d|Q2rjW$EV~1-J9aucI%Tp&zF_?2oH%?K)*FmgtL@pdXJYZI
zg#~Fa5bWvcvBI!Ixt^V!Z8C3}Oy+rsRH<C;>t~xxCZox`v7z2|pQF5Hv*qOE#0J|c
zD=WENZcR<~qenj>=Wdr<wZ17|Qqbx2kx}mO@NjW)v2s<V)9C~L;G!H_URjx)ofQg&
zD+(27a1dHn&dk0X9UYyVoYd)!3WaKVdfH$xl$Mqb3=Fikw#()6ii(Q!cLD$JT@FV^
z0Dv6Ge9e5_1b{sQo?J+z@R;KIHy*^b#Q_#^1nPa<!|Y}NV4%@S58G4n8}7woX@57i
zVNe$%fV+)k1dS=Gr{G&kn9XS5TMX$6j~V%tG7$;hy$W~I&;Tli*p>uD-XnsP{1oZB
zC?OsONZ$id(dbyxuY=<m3c`(aA}NjnN!z0%P&JgKUXX`L?4CiM4Bo-Upf2}Ty-LO2
zN{cI^iQc(Ld5jmn8@hc(DN9a&vDc~GayHQ4OYn-Sk{cHArRaoyZR+4n!quPCG}lx6
zaFMrg0#{NNuYTl%d6G9G{{f~x1J}}YpJi`m(;39tXncAn;p-27xS4g0-73lY>p1hr
z`&2RwgU_V)dug9YMq@7ldGv|GFLA`C&)!TuxW-@=)G!4%-ue#mKfXj5p+*&?8LEo1
zGFq4@9J7J<3pV8|KdJ!Bp)VwUg!`OECRG3}C_)mhFececZhRYk!CZj;7&Ny<eS^J2
S&W~~k3ed!;jN4@3)BgY~gjq2F

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_default.gif b/upload/skin_acp/IPB2_Standard/skin_default.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6b31d245ca4d571d6cfdeb29c841883cd28481d6
GIT binary patch
literal 710
zcmV;%0y+IhNk%w1VHE%r0OkMyOn0{5=I{Ui|FYiy(9zd)evG{2|HjJ6f~?|1NKJyV
z?fG?bkh8^^%IxFZ*j0DE#peF?{QtDz|4UC(ilx@%<m9B({&APno}r}Y{{M1#ders*
z=Is2|+2L`T*K2lp%jxcAimRW`{eQ0PiMZWmad~%((vp>!mdX6>|NnfW!^`jg&+-57
z`u|5vQg4;ecc|H((f<1U{+yqqairI|-u^~=u3l?)y5jA5soLxR|G&S#(c92|vg2ZJ
zdV-VToU_5N-R-Ncv%90J$K$o!;OV-qmHXJU)a?J&?e6uivU7%>Oo6(j;&WGw#q;FK
z%+ArqzQ={O_N>UDM^~5mx;Bup*kx&L+VAgeqSdF{|6Os+>+taH^ZPkIL!zmwR9<MR
zxu{Kkx!uF1x#|DN=fab<>tB1Rk(=Dh%Jjt2`{2mQ_uAKLj=ikM>7=FS>F(~i(&~GU
zqlt!!kCd2RXQxY0Rdk)(L`G0NWsLLj{;S*nbf(#bmZRYB@7}DeA^8LV00000EC2ui
z02Kff000O7fB=GngoTCx0f~x>jEjN+Ck}sW4r2~HQ#=)$n>%v>k6&yHN>5csWlcl^
ztgHtvpok{~Ls3vh2M1vX9laezLKCq81s)z37stpKFU>D^XRwb;3L_&5Qq|Vm*lp5?
zawy^!dln++=qNEN!jF9h1Mvp)67>@CWDIu0Gcpk^88)zBv7+D#77#W7X@>|yD*-8V
z=*W;EMG7}2e$>G;%wel895_UX5QoBp2V1CceB@D2nm1@nP_W`ej13!1@+9CFfrA<|
z2>8&*LIVbj965S~*!iem3nVq-)u>?rf>j7C7ItJ6A)tYK_bgb5p+&{F0CeDR@q;A^
s2oN|Ua0F>Uf<%K5UWOIWpy5N`z8^{mzH!3`m@C5?DQ0x2@u5HfJ0GNig#Z8m

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_folder.gif b/upload/skin_acp/IPB2_Standard/skin_folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e6bccfffbada6113737dcd1beb2ba9b7e015a29
GIT binary patch
literal 805
zcmV+=1KRvYNk%w1VH5xr0OkMy|NsAXdDqm~{_O1Rxy91v?9+01<*lx_pQgv@=klkw
z`EQI@UT|Wyy2gHj>ci9i!NJ3ssQR0lnvSS($I97#g|F4s)W*fjqN1XQjr!u{@Yd`9
z%*@MVWvBA;@~o|{>-PVDipjmay|~8wa&x7#v$KVcvhnfy-QC@*v&D&ur`_D=goN#j
zitCJ${CIotczV3Myy@!d<X>R3m6Pn%*3He<;kC!=<@5jH;o*~#jAmuKY-{hGpX%D$
z+UDlxw6wXJnU{{3{<^xi`1tr~a`c~`@6F-=?D6;c{Qt|!#g>(k-tqs&#JtbX&7!EU
zkD9oWl%U(%*4fzapP<;CrJ!(ezxw+8w#|h6`}>WMhQ`Lj(%`uD_W!1)ulM%#J4!%Y
ze?GF%Z;+4Zpr^mDwA9Yj^55dwy~N*(k*J}c%#n}0mY1=(x3<F8n#jk?#@V5&si=UD
z@rsA;)6wUKk?z{p;{5#lhL`m2;^l~#@ZjL)+}qfelI4w!$%~ELA^8LV00000EC2ui
z02BZf000O7fB=GmC>J?{D2Z_&A{Qu#7m*ijG601a7#NsNN&rL`K_xyOL;#W(5IF-f
z7F(Do5}pG&i559u0~R7)Y-@ghE)o_4KD8VWA_rs$R6Rz|G#NnvIZh%#2MrW9W)CAV
zF%)WjV;K@z*c2KkNJtv*dp;I5Dl{$9171l<NGLx!t=g0r;$#a68gtB{XaE9)jS^0V
zK(O#5ft>_SNVH%fL|6kHI4DRMfX2*;E++>3P(or33jq>15MY9X00s|Jx&Zi+N6QwL
zEF8dmgJuJh1~(HVsKS5&7!D#jym$c<!i^&vQp6eXWI~uQ3nrY2BbBNIs}GKl!SKV4
z7%XstxD=2PX9kZV0)jM9FyaA}AU_Js9iUQ16T5hq?B#1h!VeEW_-y&0f`pY984Q?N
zk|II`1r?e|`4FW7i~t5+u&{Dr$_dVRTnGt~ra}lg83OE}a^b`v06NIX5#qUyg8-2z
jT)6UEkd88X9PEIx=E4d9cbfmkbb-!=J=((q2m}B-z~rP&

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_folder_children.gif b/upload/skin_acp/IPB2_Standard/skin_folder_children.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4e026cbde323d392dfb730f8cf971b9609bf4a57
GIT binary patch
literal 799
zcmV+)1K|8eNk%w1VH5xr0OoxF#>dFr-QAj+n(XZC|NsBg)YRtY=Axpa<m&FS!q1|#
z#o^)My1&5Z=H<@K&BVjQgN&5T(bK`g!o0k^n3tF4>g%bfsHnKe>g(>k&DQer^2OBK
zs=3O!#nZF8ys^K|@AdW3-Qu&ev#hPHl#`OMva{Lb=kN3LxyaM1v9y(@w%Ot3+S=O7
z%gglk_l=mIqP4~3;@il_#+{_BsJzISt-iv*zqq%z#?{#1>+I9o+K!r~w#Ct$vBC29
z_h@NT;o{?om!yG@p0~EP!OF_W(A0T_kg2Pz%F@}Bn4Oxez?Y}6=I`(J_4T#3x9alo
z-{a@_`1p{Ij+T{!vb@E5h?Zt*Wc&R5`TF~|#L&pd$)T&YyTiwpnVZ_%-mA2^#>2Bf
zL_d_9p8Naz($K_=i;1ee%G1)&d3tEVzpmNX*Q~nArmCu}z{}X%->$*T-{0Kd;p5ub
z*{!<Clbxcqv7DcxpRKgKrnJGYsgCOA>7JvfoTsY)|Nj6000000A^8LW004aeEC2ui
z02BZf000O7fPI330RRgGhyjWgBNG4t1cU&S07DG~g#ZT!nhr9N02CrD8c_t401^uW
z4FwOH0RjY30}F};3rzzB6GwY9TX;MI1p_R%EfNzYDPL4s9nl{N6a)(n6HX-z5jra-
zAxKCOcXMkA0%O_{6)q<y74bkU1!qYg9Ml6xS63$i1{Sy)BI1UF2N3X~3&6mK4;>;L
z+>lVf00u7@96;c30R=GzAV5SAFrdf^7g$^jFd$>&1q1?G5P1TE$N>#dun=gXr_6(v
z7hu5DQiRD91~)Nauw%tam=+U^C{O@X0*)L^JXjdOX3CErXr{oiAeE{Bt0r=!IA9=6
zo;qNB$i!%1p^B0o2q-Yv5W)l>3I<}#9k8;24ZC<r?Bz>GfB_8#<UAOW1VRu632Lk$
z;UPnY4KHk{8PVm%4iz;NTnGXHN*~T|c%WD!=EV{k2~-H70$`9JDJf{6@N5Q#ib)ZA
d`~J<P4GbYWW&nt@yt*a;ZU6wO&b?0{06XgSmj(a;

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_folder_hidden.gif b/upload/skin_acp/IPB2_Standard/skin_folder_hidden.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4456250d02800184283b85498af97c7493092941
GIT binary patch
literal 803
zcmV+;1Kj*aNk%w1VH5xr0Oo!G;^O7*?(WUZ%=Pv4|NsB$>gn?G^U%=H>FfUR@bKE)
z;={)LyS?|!%*){5;ojZexVh5w^zq~5?Be3#=jZ0k)BN!A_xSku!NK<Q^Z3)-{M6Lb
z;pzUq!1T(>$o2U9#>@V`!q>XI>+<#K)!E|N+1cgf;_~_b`1t(K)8FRl_}k+B&(8Pk
z?CjRo+vVlu)z;R^$@S9G*Tlrr#mN1;yxr#T|G&iKwYB%%-SqYP|J>Z$t-qex+1%>&
z|Jvj9#l-cmui5(g|F^i`-r?`h&+D<W)7;|dva;R8!}iA0xZB&>`}_Om>hSye`t0lX
zw7B`WyYk}U-LAK=@9*--$i@8q|H#MP?)d+|$N2B??83<Q;Ofk`#jDWM*Tu%|+UCLS
z?d!_O^2*ED!p7Lw+3DElx5CT${r&yu@7vJN<?Zb1?(Or&$HL>|<;Tq1&(h=S>gMe0
z@W{!}!^`)@$kWc!&z+>7>FD#u#^m<!^5X2!$H()|&-DNQ{{R30A^8LW004dfEC2ui
z02BZf000O7fPR940RRaEhyjWlFb@C$1bzdB0F_G-1e6B{00$H%kpK-PEf-7#m6Z+&
z0}%xiodE&_Oalpu1qn_A1rIV~S9xDF0tEvtxGxS5E-7$DeJs*33k?Jb6c0Tv3KC5!
z94k3F5^7?63j%1{5*8>Q9~SadEd_BiF+kM=GFDa}0SqK~wWP!j3KJm2NRlpq0v$S<
zl%TM~K>-69<Yb@#0SE>V#T1-4Awj?ZA}UY_K{3F92?$9rAQ1542$mB^4qSL5gn$!0
zZ6>_L&|#(<B0jJv(3v5Fohei9ym(-Q0fU(ie%SCqV#5G0N_g<-qD0Gvs#gVM<zOSl
z0Rvos%z)XGW<-PyL2y7p&_IEP6&&6)FfhXIfR+)Y<lXDR?_V+k3|ue}W&(^E5QZ>V
z5JiOt5)~?F2q9$+j5#4{h={@f!w>*Z{Cqw`1H_FwA#P+@AOcAd0D}ZoNs$Fa=q(*Y
hRFVKZxbQM`Iv}ZW1ppi8*gFBh1Aq$l?|uRS06R+G$YKBh

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_folder_master.gif b/upload/skin_acp/IPB2_Standard/skin_folder_master.gif
new file mode 100644
index 0000000000000000000000000000000000000000..75016438c15e5d403bfb04dd160b6e6e8a0cd320
GIT binary patch
literal 802
zcmV+-1Ks>bNk%w1VH5xr0Oo!G%)`Uo-QAj-n*aa*?Ck8+)zzY+qUYx3%CWuS;o<+&
z;QxZ5|7nVrnwYU>cD=p4!p6nj!_DIB>CDg0!@$Av^78ZE=clTu|CGA_a*p)m<o}_@
z+S=O9@bdq{-;kG-#+j_HtF8ZOjO|~5%cZ#gfR_K|`26qk|BbG*v$MIXum6st!_3M5
zwbS|O^ZLcux^auk%*_A!{r_Hxwz|2sxVDOvkz}8>|8|bLv$XX0_5aQ5<&vcTTYC1W
z(*NH0TUvC?Xn(GPjK+kH=e5cIiKqW^p)YQZv81Q}c98S1ztLTF|JL)`Zj`oEY4p<9
z=icD>`1shf%>V29&rxaR$lJzCW&ic~|5$>#$ilLptV(^D)|8&E;OSV_=A(|4{EMah
zdXn#WlGlHcw~v_6m8-6VmFd~r*W%>W+}XT(l$6@$%h=bQo2S8rq0Gj{IyX(+rnv0P
z&;NCwgOHNf-P-?qsf^g<<ki%3(cb6r-~0Ug_<oW9d8q&Y{{R30A^8LW004dfEC2ui
z02BZf000O7fPR940RRaDhyjWhArAln1B3vR05uW=g#ZQyniDLM01YV|6;T6}02B!X
z5(N;N0RjV21PO`-2|5G?4@hJ~V`4=D1q2+oF%%CfAZ0vYE72tj4Fd@i4>>9b5mhf9
zElNreTzp{*0(;sK7AGz)7V%IV1#ChkNz?>LGBPd!2NJldk%Gnq2o6f%Ko<bPlqpqG
zOrSxbzyS?-G)!=iBm)X!2uzrWAb<do7bmWqAaH<%0~{F?2#6u&hY2YLDm=L|K!+YW
z5L{*uA@dCpCO;75)S#ga5Fl`3JaEE*flLZMb}%7vfq<49M~-Z{f#w2Ls{*ik*a5=8
zfjeG*@~r97LBa(qJ!U9qfM7!l4{jP9=unpcO9@%<>iy8yuNnadDjcW-A%qYIOBgJ`
z^5O#t3>Y@R$dV?+7Z^cCU}2D934kYlJliRPqKO$8O^hrUL4^l^L4s_6FoFW~91$ZX
gMfeRoc$_{Ws00}T;7s%DngGZF0Oh)OKY;)MJFy6sRR910

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_forums.gif b/upload/skin_acp/IPB2_Standard/skin_forums.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4a97bcba9fe48b05e3bcbd78610ecf82980b55a
GIT binary patch
literal 667
zcmV;M0%ZM1Nk%w1VHE%r0OkMy-{$X3cea7F@u;%IsI$aOW|UZdypO~FRC%pad%IYH
zz^JpuSb@P_eXUl3!BcpxQ+v8yiN>wM;aPsXb*JZetLvGx+<vw9dY;izYLb1g?54fm
zrn}oqXO!dV@pY-`zQ@*KkI;^**ItLlZI;h$nAJ*bq~7G~Vv^NUda_Y@vwN=Ww8!II
zg~dy3qgsW*RDQo%fWVN%|9Y_TRDZx*fV^&<+o`|dOnkzR#Q&|s;)S~RVT{a7Z>Ly;
zyjp#)Pj#(Pc(8?~(~7CroV3`p#^8sj*np<lmZrgor`3(F+EabLf3fXWf4P^i)mnwc
zps&Vopx|16v|@?FOlX!_hsoaK>Uyo~xXI*Ge7046wu+aml%TVkwAs7F(7eRZX_(n;
zn%H@&=Wd<cOKzxvvF=)e!J@j|R)D!pcesS2&su)EPj;|ii_2z?$cMfAcc$Y=W|vrk
zzD{zgs=?t+a;$Qi(RZBDe4o)}lhS&x@UFw+O?J0<tn8k)*-LJxA^8LV00000EC2ui
z02Kff000O0fB}MogoTCy0Evo=jEjPekd2Q39#9Pr2$`A)4-H5jiIX5dJ2D5Ss0TT3
zQXrv-01G}B0=2fb7ZD4ui34aeOjjBo6)O}gWqL0IyZ{4QeQ+2g7D{#&M`9In%m9-E
zDHLNIYD7*&ejGLwP2Jx?QDGZG5@#DMSS3+e?yv+vU_#ItvS&(?8#;`jP(h#>fjN1q
zh`@jc#~le>+=O7$(3`&=Jf19pK_dbUK4~1Zsnc=N0uv(?$ehWbW(zXAJSHOG!VH82
zK!YZL5aUlvSYN2DnP8x)Qv(xf#PQPX1eXjQ3TWM`HNzGw%_51NBsS8avxfo!06XaW
BOr8J$

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_icon_email.gif b/upload/skin_acp/IPB2_Standard/skin_icon_email.gif
new file mode 100644
index 0000000000000000000000000000000000000000..41ab6931531bfd2f8febc595bd131c5243a58002
GIT binary patch
literal 662
zcmV;H0%`q6Nk%w1VG;lm0Oo%HwY9apzQXqT{k^@tprD}T=ITvNO~=Q{#KgX;sjK4R
z;<~%N#Kgt6x47x)>E7Ss=;!PD`uft+)9~={&d$=nz{1nh*68T$@$>e&ySuWnv)|v}
zq@<+4!NkME#N6KE^Yit1d3nOa#!*sJ(9qDy%FD~k%elF{?Ck9C@9*yK^Z)<<wzavE
zl9KlK`^m}4^78WQ>+bID@zm4PySSe7^7v+IX|J!ZR##Ws+t|Uz?4hEh<m2Py<m8Ty
zj?&79_xSmknVjwI^WELx@bdNU?e6aH=hM{J)z#JS@bbdM#|{t=z`wj5ARh7b{i>_3
zud%YOt*WM`sj{)8SXo)Wy{*~W-o?YUuCKC1Nkz)b&)w9GqM(+(!r-#4i{s<vwz7)l
z<>Qx^m*D09!NSGk<L<1k!S(g{_4fMe?C<vV`OeSR^YZbyy1w@I_Uq)O=i;r%$Gn-D
znZUooo1LD=#H;P?@%s79?(gxpyT0-9_Po2l`uhC*{QR}Ix&QzFA^8LW004ggEC2ui
z01^Na000N`fPaF6goTEMFg+3nC5M6&JTnI#2Nn<|4u(jS7GD!U5qw1tB!(3rKrS%_
zDntSp7XuN5eFqN>Dl2FYR$5Rc0}3w$f++|&6cid6918#}6+<^I27+~4MrHs3EJ}NG
z9SLn>Avl6@KX+XN2LUG{c~4|515^@%Fja6mQ9CDoSVXMQQz3*LLOf`s2yo<r5H&9B
zK*%tnK_MnH*2pMOBMk&17M29DNNB?X3JX3Yx$wY&jV2)G6q?ZBObj*<%DADEMM?(^
wh8o~;GDbic4kJP&Fri=;AqESsyaB`Ii2)9d{uCiG#R~!y8+>FPTPP3!JCjRx5dZ)H

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_invisible.gif b/upload/skin_acp/IPB2_Standard/skin_invisible.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6a12403524a121366b48595a88e19ccd90a6a122
GIT binary patch
literal 380
zcmV-?0fYWWNk%w1VHE%r0M!5h-{$X3ceb*)zuV#H#>>*-=kC?p;?dXM(bnDG<m<u5
z&ePc6z{Skg+vC~Z<<8UExxU7;xxmoY-Mhia&eYqtyu{Yr<IvUJ!^qId&eqM-+S%Xc
z;pXnt+2Fjw$-TnLxW2{D)Z4tl$hyDB#mmy%;_2Sy?!w5=zQfAQ(%Hny(cR+e;O6bn
z)!gCc?ZCy&xV^-}$IrjT%+lE3%+cA%&DGlA=gZL7;^*()<Llhv=-c4uwYtH^%+ufH
z>;M1&A^8LV00000EC2ui02Kff000J=z<_W_EE)rVq;knz3Y*a8GfD+atI%sQfp`$U
zsY9;dL@FC93dLeDAZWc!c}Y4vFfdSskXgh!N?HvQ0s<dA5dsVo5*mSK04_B%0w*km
z0thlFE00SK4kDNW5e5q*b4nZ~I0}Uj0|ON;sYwMMHx@QK2_X;%WS&b27YYn73KBlS
aCP`XKI<W&$&sf6NOx4)h)<@n)K>#~*sLi$j

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_item.gif b/upload/skin_acp/IPB2_Standard/skin_item.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c30c3be30ec1d7e3aa40c97a7e403b8a717fea29
GIT binary patch
literal 662
zcmV;H0%`q6Nk%w1VG;lm0Oo%H)!*iZhKBUlh2zbe>FMe4@bLNh`RKxB?(Xl^;p*$_
z>(<uR+S=Rd?C#0Q%D0k2;NalQ+U3Q?#r*vJsi~>Cxw`-V|I^dc^YioD+uXOexANJM
z=;-Lu)7013*rB1J>FVtL{r<<t$#!;juCA_{nwo-wg1WlB<mBY$=H~6~?X0Y<@!qMh
zu(0vmp^9~U>gwy8yWWb1edgofeQZJL@AG<kdg|!w%E!m(#K(|-hwHR+kB^VT#KwSi
zV#><Q)X>i6<>tM~%joFo(9qDFoSf?F>cr07mzS7_fR1UH%<Jdm;^O2*jKIjoy@R&s
z?Ca}8Lqx8ts`S!y&*ARu@bbpu_KMK<Ba6xA=I!s*p@Ov9y~xpZfSj+AQ2D=V;K+~V
zzFXU+l%u1hr>CaD!NH$^iNV6e`QVxJ;-vB7w79gby}iB7&CY^;Zr0z+&(_@M*R6GL
zWaQ@O!_wNn#>K?Q!MeuHig!=3(CO*p(eCHe*ub8vtE-fhl>h(#A^8LW004ggEC2ui
z01^Na000N`fPaF6goTEM2p&HUJ%@h^7a}4*P&Zi(AVU_LgFP7pCI%r0O;|BXM>%2!
zgJ+^q86gc@S5{9E6)zlvCm0nJBNIVMU1mB?U~a5`3m+;K6G%U8I6yN?0|#q^Wi3nr
z4h#V>9t;pn8(s^81S=N?1~my)7zG7;0yG4K8YdBXc7!BAphAI~19DOjDli5BogI9r
zC?LRL!vivX3Vi^e<;#FL1Qh6*f`<r?LJ~T>L6gSC91bkP$S6Pp0ig^U?$qG|rvU;1
w4|o&_0D%wz3icpT2*Ae&2@ggL`6*#zgozRvq)2e|2L%c?B#Lq!dngb9JDs6xW&i*H

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_item_altered.gif b/upload/skin_acp/IPB2_Standard/skin_item_altered.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c66621a21f90aab087a85482653647c9f87a8bf7
GIT binary patch
literal 166
zcmZ?wbhEHb<X~WDIKsg2M?~bhpkO~Y_uu&VKf1bq6cnBc3H`CO+|JMcHznn7Qqm<s
z!M~oK7X<~62?#tF5?aK|`^U`ekGS|!AVXfh3#ifCyPcbx0S8e0$pV(q0g)g(8CaDc
qgmNxn(48#2=3uY_n*#Gu#`9Zb&zC9-IykjBZsh4>c2#0wum%92n=3N_

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_item_inherited.gif b/upload/skin_acp/IPB2_Standard/skin_item_inherited.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a8367901706ec127c77230e8d4c6b5cd17faeb22
GIT binary patch
literal 463
zcmZ?wbhEHb<X~WDc*el6_m9Y;>w?+++?W2wANiwu@Q=cpr$Wd7Saxmazw$Tb^53L+
zmjuuJ^_+WAaOyFEb<c&W7V#ecW47;)c+FDY1ApW*y138&^-gQ&W*7xzg@EEu7O*}Y
z5DAJC26mkWaZ#ogCIN0?KE`fFepU`PhDi*p>=PzWnKp6qR9+#L1uTL*B4W(TnYlO{
G8LR=DF*Qp7

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_item_unaltered.gif b/upload/skin_acp/IPB2_Standard/skin_item_unaltered.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1494c2d118c40c03eec7d899a1f3d18c10cb52ba
GIT binary patch
literal 166
zcmZ?wbhEHb<X~WDIKseiYR{hin>SxLeE95v1Gg_;T(xM?rQ^pBZ{NOc&6?|H&Rjcv
z`qHsucP?LEziip*y?gg<+O&7mrnCF^uUN3)&ZSGc)~`RZefx@q3pXrZ&VU0b{$v5m
y=zvI&oeZqX3sOW=F4~BTu5mO~U{_#nW<0+|_Pps64u^wIf}R3>Eu6|M4AuZvP(+jf

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_line_double.gif b/upload/skin_acp/IPB2_Standard/skin_line_double.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cd88de4a03961cf6dc267aba9481e7872cca1f87
GIT binary patch
literal 97
zcmZ?wbhEHbRALZiXkcVGeDL7^|Nj+#vM@3*Ff!;c00Bsbfyu(9Z)L{ow@D43F3ehY
zrK0S&<{ja*hY<^tPR`N!v2x;_eI{p^ex3XNJ(~Ggi(b-mbr+_oW{)p+YBDfb0|4@n
BD2o69

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_line_double_t.gif b/upload/skin_acp/IPB2_Standard/skin_line_double_t.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d605500d272f5dab5c6b5dc9b7c0293778df967f
GIT binary patch
literal 98
zcmZ?wbhEHbRALZiXkcVGeDL7^|Nj+#vM@3*Ff!;c00BsbfyvUPZ)L{ow@D43F3ehY
zrK0S&<{ja*hY<^tPR`N!v2x;_eI{p^ex3XNU8=gW$t-;03}dy4OYfgQ5|YHlU=08w
Chbh(o

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_line_l.gif b/upload/skin_acp/IPB2_Standard/skin_line_l.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f926494d0d8a64bf569d6a1fe798bd7ec2ed8cd2
GIT binary patch
literal 71
zcmZ?wbhEHb<Yy3NXkcVGeDL7^|Nj+#vM@3*Ff!;c00Bsbfl1D#Z|1VvHzGY5ml87j
ZZh!sed7Wv>v&z0#r?$Q0KF-Qu4FE9C8lC_E

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_line_single.gif b/upload/skin_acp/IPB2_Standard/skin_line_single.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f399db6fb9e3ffe4b24c298d6c0d284ea00e537b
GIT binary patch
literal 84
zcmZ?wbhEHbRALZiXkcVGeDL7^|Nj+#vM@3*Ff!;c00Bsbfl1q?Z{_JM-o=wm_H|u8
mTlx7_ZIFgj%E>t|w)Cz2J!_-Q@~yR-Ef*d8`#T$`+8O}Q%^~vu

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_line_t.gif b/upload/skin_acp/IPB2_Standard/skin_line_t.gif
new file mode 100644
index 0000000000000000000000000000000000000000..441554916668ffa5be4f50a3373b5beb67403c0e
GIT binary patch
literal 75
zcmZ?wbhEHb<Yy3NXkcVGeDL7^|Nj+#vM@3*Ff!;c00Bsbfl0}wZ|1VvHzGY5ml87j
dZh!sed7Wv>v(CP$zc$Q}*86bgm<J<+H2|V59Bu#r

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_notdefault.gif b/upload/skin_acp/IPB2_Standard/skin_notdefault.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0dd52cfb4ea5b80c20fe51bd05ca329fe239aa12
GIT binary patch
literal 717
zcmWlWTS!xJ0LIU1wlz&`S$H>Hf{2KQ(L{(D<}|xXSXog@6ww6@LIcZXrZWS56!jq?
zqQZv^@hPOK)7|eoXXmz^vvb+bIqKQ|PX$5g_wc>_;N$lh+gkJu-AAEZh=-sH{mU_4
z<|N?4cVG?#XkfAV?63f{z~+kt<A7iVir;n<+kpt>!9*Vg0{9NX0Xzv%4%kuAfk{?3
zjq!j;0?VckqY|tLHoZuM2aZ5AE&*Bszc##fL<|r-P74SNEdDr|kSPh+U;*W2haZh4
zWh}~52@qldOz$p{R|71w%O+)<PCHTF8lb%}=?n=ZyX~jt4NoL40!9QRvt@@xA}%sX
z;3iTbk|qV<B@z@T`QWHCOu1od!yRV$<hqaB4AJYM1f5JXI1?Ar5tJqqAQq!sxXgOt
zAO|}T3F8=y=VMgDO-NC0CxB8c>9E+zHD@S{Gb`(^6&G&zAsC<b1aT)O*%5(d#V{4)
z7{=;NMsU&<-m--_FS4rz2{FLxLHrRah|x#_&?1NmfMSIh7AFK?ho!PVN@y?Dd$soo
zr21!qhTo378-*0(?<YP?3@aL1U)^c#9L#*0nKe6G^GGo{@Z?6v#qMXfZ{FIsuuxd=
z(cE_ST1`c7Va2&ZgQ2nU?)?Lcic+2Kv1&-AYHD&-RdwmVPnKTak2W7dN$h#pd_ITO
zs5Kdan4>wpHrcLKs@2+(5}*X?mqyv#um78xe|UK`>xlM}&9tE&A5s)8X`%9Fb8eZz
zWS-Y~G7hhwSf0^x8LEQ15`7<N$+8*C$0Fuh<K~>|%7Zz5-I}YtIs5g`>93!M{hDLd
zU#<pCU9H(?zD*nMt&S))c|Uq=sj0lY&ianumg5SAV&9A0N>iV%=u^R|s;(u&n;xqs
o|Kvb@YL#ir@2U38wbc&vj;$4M`GmUBgNrRw`NcDXl{rx3e^c<i&;S4c

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_notforums.gif b/upload/skin_acp/IPB2_Standard/skin_notforums.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8bb2f86d8be999096d4890a78bedcc3341d97d9
GIT binary patch
literal 658
zcmcJM%TLpA0LOn_K%5(FkO6@O0vPc{6ypmb8lncqL=zH;4^BIJ<K~r@zyu-*CPJbS
z1ricXR1SuCk+t1}ZQb^3yRO?>x|OZ7?H-JHA@LyiKlnX-^ErJ#hi`9RPe-S%8km3t
zfFKq6pMR&h3<lFUDPbWoDD3;W0uIwOC!v1c8_Q!b<)kuUA?u6hz0n*RN<mI__<4#~
zUGy(cMBQey7{Mhn1%JGNlWA6vvCyvXkf{s~Q*1)<u`(JI9f5=^EYmw#M<B^0a(=Ez
z3t4|uCHSHs<z18n<BEroecT=fC7hDnbcTvcFe(LNiaRXhP!!U6BBli6Dh_v@P(%Ys
zG?+vQp4!P0QP~w%d=Ys&B9olzB-1FATu>x-ic~xkN#vMB)<N*W!zo7fMr1T3`eHdx
zL<umWhfzpQ!O0ZC$~3QHq!frMA$Ax1|1=+z{FAgD_0cDwtT2L%jZeIoM1cL}%<RnA
z-2B`tP}grQU0hnab*;|6(A?Q}Y;|qz-p%Is(?DZBTlQ^Z<5IcilU@6yvEE?N>3$mO
z8!u}&fmW|GwzOAu^;DgIs5864g0{g}V|x1d;)C9y8e<b1E3F;8eW$|IdglJ4TD|;P
zb8_I+x$6}dek=}u9k)ykMfVX$5wTWQ_N{izcdy{4iG`9s>wC5>P*=Wrce;BSJwAJ2
zxzc2`fzdbZ=C|vk{XnbHcPYO;BU{?n_Kp%{ba{PX#nL+5&7iu;(<eS!2iuYH>IP5C
Qvv;dk$q!$qGzhry7j(`>oB#j-

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_pkg.gif b/upload/skin_acp/IPB2_Standard/skin_pkg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..41ab6931531bfd2f8febc595bd131c5243a58002
GIT binary patch
literal 662
zcmV;H0%`q6Nk%w1VG;lm0Oo%HwY9apzQXqT{k^@tprD}T=ITvNO~=Q{#KgX;sjK4R
z;<~%N#Kgt6x47x)>E7Ss=;!PD`uft+)9~={&d$=nz{1nh*68T$@$>e&ySuWnv)|v}
zq@<+4!NkME#N6KE^Yit1d3nOa#!*sJ(9qDy%FD~k%elF{?Ck9C@9*yK^Z)<<wzavE
zl9KlK`^m}4^78WQ>+bID@zm4PySSe7^7v+IX|J!ZR##Ws+t|Uz?4hEh<m2Py<m8Ty
zj?&79_xSmknVjwI^WELx@bdNU?e6aH=hM{J)z#JS@bbdM#|{t=z`wj5ARh7b{i>_3
zud%YOt*WM`sj{)8SXo)Wy{*~W-o?YUuCKC1Nkz)b&)w9GqM(+(!r-#4i{s<vwz7)l
z<>Qx^m*D09!NSGk<L<1k!S(g{_4fMe?C<vV`OeSR^YZbyy1w@I_Uq)O=i;r%$Gn-D
znZUooo1LD=#H;P?@%s79?(gxpyT0-9_Po2l`uhC*{QR}Ix&QzFA^8LW004ggEC2ui
z01^Na000N`fPaF6goTEMFg+3nC5M6&JTnI#2Nn<|4u(jS7GD!U5qw1tB!(3rKrS%_
zDntSp7XuN5eFqN>Dl2FYR$5Rc0}3w$f++|&6cid6918#}6+<^I27+~4MrHs3EJ}NG
z9SLn>Avl6@KX+XN2LUG{c~4|515^@%Fja6mQ9CDoSVXMQQz3*LLOf`s2yo<r5H&9B
zK*%tnK_MnH*2pMOBMk&17M29DNNB?X3JX3Yx$wY&jV2)G6q?ZBObj*<%DADEMM?(^
wh8o~;GDbic4kJP&Fri=;AqESsyaB`Ii2)9d{uCiG#R~!y8+>FPTPP3!JCjRx5dZ)H

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skin_visible.gif b/upload/skin_acp/IPB2_Standard/skin_visible.gif
new file mode 100644
index 0000000000000000000000000000000000000000..74fe41e197a0ba7341a9244622f0103d7a685727
GIT binary patch
literal 583
zcmZ?wbhEHb6lD-$c*ekR|Ji$=@@)(Z3<(Jdr%#`L{rdIv>C<P=p1pD7#{K*ED<~+e
zUAxxF$?49WI|~;s?C9ta6BB#(?3tgR--#0^rcIkRYt}4TS=o8>=5cd#o0yoiwzj@{
z^-5b?ySKM@>eQ)k-@et=)s>Qx>gwv!)6+Y9_N=O^s;8&tix)4lv$N~#>mNLL5D*Y>
z^XAPnXU;r-{`}<0lLZ9@&d$ykFJ5$Xbc~FQ3<?U0jg38b?%cX{>zJ9DSy@>R9z1yE
z$`wOH!%34SH8nMPd3p8p^laL+Y1y)6zP`S<Zr!r5u&Au8OiD`HvSka<UxOSd{$v5W
zPzOYU;)H>HNdse3b4zO*BSU9bcTaay?}Xm|iBlLRPn|Hmlb4O3dA>cn4r^aW7l(<G
zqZ2nbo2G~L(rz<Rep5v;0cHa}7w4{795PHyk`k6oJPLAB2bVGEX^1mv3m#=+Gj_8%
z-_6OXe1pl#f=_jGm%5R>!%;34T>-n7ozk}Mp2GUBvRv#-_UL96I50I!sA;U=(3o(M
bmx;y0<x<PaIM;4*;lMK$D;_U&V6X-NxRa-V

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_bigger.gif b/upload/skin_acp/IPB2_Standard/skineditor_bigger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2e64d5d2fa2072dbe98f9f15dd8afaad6571ec9f
GIT binary patch
literal 117
zcmZ?wbhEHb<Y(Y#Si}GV8+RY=pS$+S>raPIU0Sk!_tyO<*KRwY_>%=JsRJTGY8jZV
zICkAJF!0j2qG0hlNS-r6qUf4>*OKx@cc1FK6y4*PW41t6FFBiy?ZCqDC_&rSB}F%d
PEanG1&*t)AV6X-N{RAr!

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_close.gif b/upload/skin_acp/IPB2_Standard/skineditor_close.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8cb74c35d54cd9c7e3a69d33854bde388036dcd0
GIT binary patch
literal 118
zcmZ?wbhEHb<Y(Y#Sj51varaRM28RB*YoEOSv}FD6!>2BtVq^r0DE?#tk_-$wAOfV8
zf!SJO*BwIxFO4f27TH1Zj0qA&*U~!<cvd~Q+4Nd;o}NJc=8ETE=RMojx8~cYg$ak4
T5>MuEv0hjq@@j>i5Q8-UaxE<r

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_enlarge.gif b/upload/skin_acp/IPB2_Standard/skineditor_enlarge.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c86708db51f1b372e4c62de57f9da10f11b56526
GIT binary patch
literal 121
zcmZ?wbhEHb<Y(Y#Si}GV8+RY=pS$+S>rd_N?Mv40K78sDP*CwF3s_PIM1s^ZFxzqL
zx?^DArE$f;;&sq`&IE~~YwmM21SiBT=+dg*xlpS7^Xm0G4qn-FiN8cxFUawH!4++b
S`2lkhyw>{3-f(4Num%AB)+~?!

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_float.gif b/upload/skin_acp/IPB2_Standard/skineditor_float.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5e3a181d70519273e22552cb30ac702ea39820ce
GIT binary patch
literal 125
zcmZ?wbhEHb<Y(Y#Si}GV8+RXl^7>Q%+_g*A?>>C$QcFwAvSrH@f3kojbwDIYEd#R?
z$F4gH23{6ZG%T`%;yDu}ioy!#Xn0jA7?*|bmiQvYo|kar*}*y1H`r4ISiKi2eLN9$
XDa)y;#H*Ee-HkU_55}r6FjxZs;pr|%

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_slice.gif b/upload/skin_acp/IPB2_Standard/skineditor_slice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..35c92ef8ecb8fb61c38b3d4e9c453116076e67e9
GIT binary patch
literal 52
zcmZ?wbhEHbWMmL!n8?6z=FFM9ckf=ia^>B-cZxq*7(hS=M1bTOm{?o-D}{m?tO4*+
B5GDWs

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_smaller.gif b/upload/skin_acp/IPB2_Standard/skineditor_smaller.gif
new file mode 100644
index 0000000000000000000000000000000000000000..815bd0913084d10e1e7a04dc80d5b63726f66033
GIT binary patch
literal 113
zcmZ?wbhEHb<Y(Y#Si}GV8+RXl^7>Q%+_g*A?>>C$5?G8u@h1zIp#vg8Y8jZ#ICkAp
zFz~XNqG6F86wjF;QFKkcYl%8jMtSS$7qfV0?BlBz-??f2TA_e2C5e8I>j@`w^s4u=
HFjxZs)juUp

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/skineditor_tick.gif b/upload/skin_acp/IPB2_Standard/skineditor_tick.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca9f253f95fad14a3aa0e4b9c9875d1bbd1b058c
GIT binary patch
literal 119
zcmZ?wbhEHb<Y(Y#Si}GV8+RXl^7>Q%+_g*A?>>C$(%NkYfP#uYSwM0OIv@h1mVw!Z
zW7i!8122my8W!0>@tg?~Mc353mXtR+Oo&_ksI1`ht@rAu6Y6f;&eFVK)YGy$x${7d
QRc7;w5~<P%aZUzn0MAV<I{*Lx

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/task_cron.gif b/upload/skin_acp/IPB2_Standard/task_cron.gif
new file mode 100644
index 0000000000000000000000000000000000000000..536bdd2875eeb9c18da35848bc444e243bc81031
GIT binary patch
literal 686
zcmV;f0#W@(Nk%w1VG;lm0OooC#>U3Iy}iT3#O>|vxw*N{&d#;9xWB-_RbFPXva;Xb
z-;R!u^78UNMNEBufsvAxE-*N>w6)OC&`ncanx3K6)z!APw#UcF@9*%tyS(M)<=NTU
zsj91ehmn+(mUnu7XlH7rrKpC6iG_uSWMyY>b$V1^YiMzNeT0wd>gp918UO$PG&Vhe
zfPzIwOU%s7VQ+il;^L&FrPtTkR8&||QdD_*eaXnk$jHZLZ+6?;+nSr6jG3dYt*zA5
z)NgTgDJm`K=;)!LqH%F^aCd;Oud!xudBnuT+}+;7!oqBCb5~kiR$*$>)YXWLmMkzf
zNl8t}$H-G+aX&~?EHyv(_xIe~+>w!!WovM1c7v&`uiDz#At)?JS74u>o};6rJ3&cw
zc6gVUncm&qSXf+wf`wpZYkZ5Aa)678i;U;z=y!dCcz=XqZF8HOo3O92frpN4aC%{9
zab0S6e1C*SQeC2?rb0wVj*ydBUu^&X{{R30000000000000000A^8LW004RbEC2ui
z01^Na000O7fO>+1goTAT1OgTXhK&b0R$BxBHxC~UN(&(dga8E!1`l{P6Kip16D%MD
zg8~u?4j*hM9dJ1a6JQjC0ssId6iz574L>6w5D$bBJ^*qkL?&D|Z#{M`KdgckiU>w|
z5HvzZFBBFL6@xJ|0bNoiE-eOE3qAo7G75qk010(4Fv1MkaG(YW0T-}n5tQOZ00d|{
zjGz%9!;L#dVtCjg2tx(}ZFukyL52f?ATv@h@W7#C5&${QWGUfA#|8}y)C?fONDqSq
z37E{80^v)53PF%W*s)|#6&wc|P-(D01QZu;dei`NVbF>w4xZ3yqGv!EASzU_2tjDY
Um^2X!3Kftc20){`h5`WqI~XA*eE<Le

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/task_run.gif b/upload/skin_acp/IPB2_Standard/task_run.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2c835b8b8a81d902d742ff2f4ceed637a6b50bf4
GIT binary patch
literal 680
zcmV;Z0$2S<Nk%w1VG;lm0OooCxYXU4!Oo<})Muo(J8XQQ#?rIV+c;--lfKN);^>#b
z&OB{>ug}?*z|FPO+&XG`n!?Xfl&a_O^T^)iTb!}r?C@Hgv5UFLc&@)aaDbx6)4<u`
zyw=~R%GFVotIOZ!^7r|<)!s&clbgfP+34-W+v84;q>sGHIA(RN&e-hq_DF=6aH+d}
zu)%<{!|U_)+v)B)YI;0we#YJ8_xk(L<LUGG`B$2+K5>G9v%_YiwoQ$qUY@gEow9|s
z#r^*Nki5!_xyVkAqu=cCw$t2Lo3KiVoXOth*yrrz@A5x%h34?{%;4vQwZ--M`m)g4
zdauB}*WmX0`|kDk=<)Qy+2K~1uQz0KZKt}b%-4yy$NK#IrpncJtiHO{-sA4_*XQi9
z(Aw(q^{&p?#oXiX_4jV5x{<xhh`7gNp|$({{i(~=pT*IKx5iA1pWf^5tIXF_n65Ts
zaz}!dezC$xg_xYf&}pT(M17BIrn&$B{{R30000000000000000A^8LW004RbEC2ui
z01^Na000O7fO>+1goTEJA1pT!RxANShk^qucP&9|0s&nDhi(H62tW!x1pqZ!0fjjf
zDF+V^04Pcr00{tLgJ3cO3<@zQ9XcX06cZ!?RDxJ$ObrVG2M7>RX#@>#H5`H~UQ=^*
zArL2a8ze>%ATJDpaw;k&Xdo2;0Ae%>CO=LFf(H^ddCqJpb7Vsj8Uk)evEe|_jw)&_
z2$=z(00Ry%JVaO`A%&n87%GfdV4;JC2@6KZ(2`(62thCiIQT$;fCvj@GCXim0?CCJ
zgD}M5LIetqD<v`zI55M&lR`y2ASj@rNdX55Dj0xp=mMS|bWW@>0H@8ENP50p7{FtI
O3jq=Z(8?tg2mm{gg;FH|

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/task_run_now.gif b/upload/skin_acp/IPB2_Standard/task_run_now.gif
new file mode 100644
index 0000000000000000000000000000000000000000..323c18d93fe31a669707a2a60ffb7a60ef72c84a
GIT binary patch
literal 680
zcmV;Z0$2S<Nk%w1VG;lm0OooC?yRQghJNamjhZGL?x&#LO+o38h?654=Ye?bp_|}f
zR@5~o+CDMpg?;$r;qIrR<#=xN$HVA}f!RMY=Y)Ls+t`~Y9rC`qmn9tGXkGEUwfX1f
z>578&$i(WBi=8JO^TWR4YGCS^k^T1d@2#iz*3$g&@ZMKU^1Qg1CmipwtJpd%ye%TP
zEg|~o=kT?#%rYhR($AkK9n~}@=6rLKB^&(k?(CkJqA4EUR7&!}y!hGI?3<L{Qby>E
zgXDB;%QPnAZ)LtNBJ7}=+(<m@mXPhHpW<m=<auxFnv?Livg2}R@w>O(PD9x{F8JQv
z+Cw$6D<F;|8TsGb`|9c3OhDmeS^Mnk-c(5b`umS08t<>E`QqTiFC+HQ&H3cw;9yks
z(a!L)tm159<$ZMIa%tv%b=yQX$}=VHqn-Tn^5t`C_t@6%siej+CFqWa**YxPH!1!3
z`noP6`sd~S^Yiq?zwDis{`~x=DIWj-{{R30000000000000000A^8LW004RbEC2ui
z01^Na000O7fO>+1goTEJASWvea3=vfhk^wxO&LgU0s&wGhi(NF2xJXQ1^^vA0fl1|
zHwPFP05y3E01*IbgI*s32@NSVB2_IZ6BjW7UxHXUb`%x?2M7{kL<1CT9V&t>TU2vG
zBoZ_}FEL#UHX8|oQZ6nqYc>@C0CXb_FnDSNf(H&JJ<Q0tqT|Jr5dv1!G4VhU8YNj6
z06_u3KmrvdW-Q?1;D(?K3Mz20z(9nD3l=zh_z~d(2|*<WJOD9aKnn&;WMBxPAq<2K
zgA~Lm(#8r7EgEDDIDmqHkwQ*pATZz|h=B(YDiDxx2tpJnM`$D=aHq_WNP4C~C~&4g
O2muZS(8?tg2mm{fAULT2

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/te_html.gif b/upload/skin_acp/IPB2_Standard/te_html.gif
new file mode 100644
index 0000000000000000000000000000000000000000..137eff26d9265611f812f87cd5e0a8fee4ad3ce6
GIT binary patch
literal 645
zcmV;00($*NNk%w1VG;lm0OoxF+1cCL+ume`vXq>%D|6I5g3?Tl<7At~=jZ6Lw8HZ8
z^5Ed&)6>?)#>dvy*Nc>;lA5Y=lg~PP$!K_@MUUbC|NldQ#!HIPMQN)+d(1*}y7>6`
zV5<4Kyudwv#Y~&+W3%by<>o_fxHnp)TdV&;h~(<(>O+IeG<?fge5^Bd$|Y~g!o<nK
z!^XYD%O_g3TbItAsJWq`v|W6^N{GiegWHjmt%91mi<zoXYoBGS<cF1{lA*IVdc$Uj
zsx4u$IfmmgZoV&g&ToOAt+l>To$ED+=|g?NN_4^zXV*xO=8cY}LS3n2g33dO)NqEX
zTzH?~-`}FBux+~kUy{UPx&MBLq&RfIQ=aiTWv*3`#$AWLONz+f;NmT8wMCTgD{s9e
za>*-Yy*hKZGlADMgy6Qey28oOYk|DM!NYouuA-{9T$<fVlHP@mpGS$>bd9AqSe<K(
z%NcOnqpY^7tiIph;YNzpWu43R_V!GN%4f6pQ<2vH|Nj6000000A^8LW004aeEC2ui
z01^Na000N#fPI34goTEOf&pqN0$qrG3k(Y~OC10mM1~4BXmSw|O;!jMeJ+J|OeJGp
zWGEhQ8Y~+Ogc~DsP#8u9Ks8`tF93xDNe?*$ZVqNyP97^0gcTYP6J>D@0SH3{dIdj(
z2y_DkJrV}zN?05uUjc*xVkjq9M>Jeo2l-UOgHJ*hcSe{9p@2c11PB!j3K4|Dg%c|V
z<XM1$fQk|+2*t=Cf&?E48D=0+VWG{17K8){03f2uo+2MUaG1hIN}(+``j~hC0|W>i
fc;GZJ#Djv1GixBEY0)6cqa8kQuy{n3Y9IhR{%J6i

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/te_previewoff.gif b/upload/skin_acp/IPB2_Standard/te_previewoff.gif
new file mode 100644
index 0000000000000000000000000000000000000000..eb7e8fc61fa9060304079b4b28b7c209380aa763
GIT binary patch
literal 688
zcmV;h0#E%%Nk%w1VHE%r0OkMy-{$X3cea$2lz)GJetv$etgLu=c$}P^+S=NVj*isS
z)P{zJg@uKOhli4ql7WGNqobqY;o-Ttxr>X7n3$Nv#Kh&9pPHJQeSLk2iHX@GBj@Mm
zlarIGs;Z5RjsO4ubaZr}prFRa#)O1~k&%&}o}S{w%YuS}*4Eahrlxmyci`aQnSFhl
zl9JaXB=IC9#l^+ulasYXM5LsowzjsoxVV;<mY<)Wd1YnJARvr^fzvfL*Dfw`adGnU
z^2y1`kdTn&;^OQmD3FMV<&l@}8XKabqT;;6ZEbCjkB@I}Z<&;osi~=oii(tmhPhc;
zy)rWFIy~nW7vAOWw>UV;tE;&`KhG~O$U{TqpQYT{+2bcC=^`SAb8~=rc!_v;!otGY
z8XEYLl1_HCt*x!xd3><2u;m#U+}zx}yu4~^YMGgtot>S)Gc&KRuh1$g=^7gM-rnvV
z9*c&C;=aa}m6i7P_Ii4H?p9XqT3X-V-<zA8m41GVjEr@4b+oj!A^8LV00000EC2ui
z02Kff000O7fB}MogoTCy0Evo=jEPwmf{l^_ClfJ6N0E{d3K1P^X$WO-CIFg?HynE*
zAvPo%VlP#RrvNK{4hB680}ntlTyYAth>A#e7zRlV2^myjI0zraiVz?a1_KT#HBcH~
zDh!I69|R=~O=>7wc`iB=4NBw18wC&p7!ON3JS|2AWG<kgrU=A<243D=nd3o#LlOuG
z0`Nd!#E=|#g7{GIM}o(Bid1lLqM;20I}x%GaBu=7fC3A;Y{BwiL4pMp1th32h2R7}
zLadl^!{)$&0yGXVS)_@@nKA$<2uP7)28BK%7)3H6<w=Df1xkRaAVQBML3HF0sng&B
W3`trI14OX^x2~Wuhw>5%1OPiYmOsV-

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/te_previewon.gif b/upload/skin_acp/IPB2_Standard/te_previewon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..afed0a3a41e44e3c461bd5c73e1e68af459e5792
GIT binary patch
literal 671
zcmV;Q0$}||Nk%w1VHE%r0OkMy-{$X3cedHt+yDRn)6>@H=jbbQ)ZpOal$^4$w8CVD
zvOI#)OpW7Yo5g5&qCI}aTdV(zl%++F;X{GOa+A+RX{*}X-a&iJH(I1ZbGp66%UFD@
zON!CL#K}yX?YX?bW3%a!nyUEt_+YB}L5SofZ^|@$%QJP#LxamYd&$Md$HK$LLvFa%
z*4M$o!*q?Mk(8}1VX-xb={SSip`o-&h{s)gzhi>R-{0R%hsv$BzVh<&Q=aiSbig-Q
zojGN$H+sWnh^p%9>TiLcFL=&{j-NS(<8X$mN_4_Sl<!cT>uZe5Lx<EyiQ0{hrM9-Z
zRguPmn!4ZM;z*F@QEQ)En%!->|1oa9lA*Ixk=Etq=HBJ*qpY?|ipYzZs!EdHG=$)O
zhooY;|0i0tWu42SsIZ-=xe;gATbIs8iq&0*zAI(DXS4TZtK^53q{7M2I&-&cfxH=T
z+cSaJ-{0YSjjp1qw?bX1s;s_Tc%MUk!6kCZD{sB__V!<r#4T*KA^8LV00000EC2ui
z02Kff000O4fB}MogoTCy0Evo=jEjPekaZghQi+d{2LuN+P9FjvI+loxFmX#16gOc7
z10outi*$D+aDQ_q4^0^zA_TCC7;<?PG7CmCe0yU81HS+WXAx8eMJ-Q1Ob;avikAZ!
zAr4?ZEfxhs3pooh-J=Cu2nIkY4E0kyBM?az&H!sBD0=9r(FIC_gMI`!J3?ea8Vo|T
z>>z+AfyH);u1Mg3q6C6I2PzmiL1F_&0A?<*fRH7{1sh0CO!&fK#g<<R6bN7;hK&*r
z9!6NHQpV9JHBk~pKm!6q8!|6cFuH_Af`&JCLbzC=0tci^0Ne!e(gD)cQD)N~T6-uE
F06POBKqCME

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/te_remove.gif b/upload/skin_acp/IPB2_Standard/te_remove.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0875d0212f85f2f3886434655d19a040c377920d
GIT binary patch
literal 333
zcmZ?wbhEHb)L{@{IKsg2|IwrW3=A$dHoKQC>!_@Jclj~{1B0=y?%g9t(xRefc612x
z^Ot94hI)IS*}7FpPHxro=|Ba<1I3>#V8uEh5@aU>>!}2VzLd;)8C+{}UhgaT(^Zsv
z|I6C<*>OA$N4Pk27}(qx4jq&-nCht^c$1q)p6Q_TjuTun*bc2yWDwzNcV}Wq+`!kG
z_id(h$IVAYuNRzW65`TsU|`qg;AN=NE#-9JZDe=RW@=^TN$q0o;PhdcFex;gDN(zq
zmZgk&hHh$Zi`z1t(j=bpuE}MqyEw92+9w-_xhJtkck0bp&BDpbF|n!nxZY-Mu57j&
pOJ-DR^RRI@Y74M=-dw_9Y4ghH<?DCdhu(jBq51XOcO^vzYXDAhXubdd

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/te_revert.gif b/upload/skin_acp/IPB2_Standard/te_revert.gif
new file mode 100644
index 0000000000000000000000000000000000000000..700c8a28a31d301bcd8f33c05064aa30159bb387
GIT binary patch
literal 333
zcmZ?wbhEHb)L{@{IKsg2|Is6#@@>19EpxH4>8PxHclolht}X)u!<nsH?;bf)o|%~z
z6{RF6w`%(InH?R1{QRNb-auL6f#OdVuwoq$39^%c^;CjFUrOe@46ZdfulE)F=_<;-
z|7Gp_>^KgGBU+3sVnVE9LV+R-9S2w*Tz|tF#&j&<KmY?r+gpZ<AJ*}(e*7jaXCu||
zHktPXCx_1A>o+giD>5+avD9ShH0hLaJMdMpv^Z#UJF)OJx=xwE!riW07F9eYw<DDy
zqcJHiftj7#Q@bN9qJpWeMW2ncp|RPIC2hmJaE5Yiu8Qq?+}zXl=$>S&Ik)LZMKBL5
p3;S*MYrO31*W4+uVcNK{^svoqBg;4M_1=B>toilZcV$HeYXC)vY%2f&

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/te_text.gif b/upload/skin_acp/IPB2_Standard/te_text.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5fab67ddd374147e472fe130c1a56d847fbb334d
GIT binary patch
literal 651
zcmZ?wbhEHb6k-r!coxBM?AS3?Rn_0We{bBl@%HW8_wV0-{`~p(@83Uu{P^b0n_s_v
ztzW<X+qZ9z9zA;S;K90e>+amS^ZNDcg9i`3eEIU>!-tnIU%q?y?z?yI-oJmpdiCm#
zj*br>K1`iD_1w90d-m*k{P?khgF|m`@5PH3Z{51}^XJbmU%veK@#Edwca@cuXU?3F
zlat%9VMB9s^PfL|Zr;4PXwjl)&z`MZxpLR8U2osMy>a8lm(QP<ELk#t{`>_C7A#w~
z?7)Eo+qP}nzkh#cXJ>6~?dj8}Crz64>C>m9M~@ype0cHV#WQElymsx{@#Dwm%$c)v
z>C$P_rcIeLWyOjW_wL<$_3G83Lx*<n-hJfAkryvs%$_~_{Q2|OuV3G}bLZ8oSO5S2
z&oB@`@h1x-149IZ4#;v)oG`GzXozTPZfR{*mSu1fVm8wbV_<8GaMojCanlsCv|{BJ
zX=7j!6A&<wwee(PmE>z>VC7?F_0`jqVp`2F*uuaoFV8E&7iuA8=dEwDmyIoi#ZQ!1
z*<G7kMrf}fr;9$HxvL?+C<AxEUU3OdC1EyB196UU2J5}j()?0BiZU9KMj~1~8^l{0
zTZN4|WF{~vIyE;oGbm_$WabnQ3%1cnY*b`&ab(~#h`9bP)`msGE{QS0>0q;*;g6q_
z1DP7V7`UP&Tvik?wJ@88xMfb%p3cOo;xR*DXTt?y0WBtvxmuyD9Q>0viE*(oSOWk<
CR0anC

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/tile_back.gif b/upload/skin_acp/IPB2_Standard/tile_back.gif
new file mode 100644
index 0000000000000000000000000000000000000000..330833bbb36e28d9eab84af313264885b39be08c
GIT binary patch
literal 488
zcmZ?wbhEHb<Yq8oxXQo~Shlrk>!+5TUn`b9YT5BMqVZsC=gEdm?_)Yn1eR|rTk@cK
z&5MNIvr#RFlO|k9o^&a(|9tcIFCo>t>ejywuiqEma3H8+d(*bhRjZ#jZvGJ8bEahB
z-I%sx(XB^=Dt81|?X2JUu59uB+I6p*cYF;f+uFG0W9h=XAvL>e*1nAEIvrZOr+n$d
z$fiS;D<0Qvd|S8SP1DwoVRd_}Rz77Q4k-R)0V~u2ksv=Yu>E&vEbtH!=sTg3cqGTl
zed3A|shtt)Z+Iu1e#@5dV1q=M*6j03d#cW!lezcd2cygS+m7q@)V;6z`M*J5xVfcO
zSgE74OG%@*uU~_E(&Q=J64PhQlrWkzci#L3M!JiaEY)RRv2qo&_S$vpwYfHJ-omB0
zeaB8kwLN?HsYxF^bXc1I*zptme5cQx<rBDY@sa?~)oa&zq;B25Bc*x&!9z{9Cr_WT
zalCx>nnUK@`wud*pTB&S<^A#V7q8CWfB$v3IAlCFIJ7o%2!|~=uwkJym!Xo^90}*v
zqummrb8ej2_?VMZ!MSV7hlNW{PL{V>5p(iVbL(`2<R}k^&CAZRFciJI!`aYso^`&1
JCkrEkH2{)V;TQk_

literal 0
HcmV?d00001

diff --git a/upload/skin_acp/IPB2_Standard/tile_cat.gif b/upload/skin_acp/IPB2_Standard/tile_cat.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33c467f9abffa5b7dc36deaa0e14721b934ac5ba
GIT binary patch
literal 2760
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
Ou0t%4y=+<p1OPh(a4*vU

literal 0
HcmV?d00001

diff --git a/upload/html/sys-img/tile_sub.gif b/upload/skin_acp/IPB2_Standard/tile_sub.gif
similarity index 100%
rename from upload/html/sys-img/tile_sub.gif
rename to upload/skin_acp/IPB2_Standard/tile_sub.gif
diff --git a/upload/html/sys-img/top_cell.gif b/upload/skin_acp/IPB2_Standard/top_cell.gif
similarity index 100%
rename from upload/html/sys-img/top_cell.gif
rename to upload/skin_acp/IPB2_Standard/top_cell.gif
diff --git a/upload/archive_out/index.html b/upload/skin_acp/index.html
similarity index 100%
rename from upload/archive_out/index.html
rename to upload/skin_acp/index.html
diff --git a/upload/html/avatars/index.html b/upload/skin_cache/index.html
similarity index 100%
rename from upload/html/avatars/index.html
rename to upload/skin_cache/index.html
diff --git a/upload/sm_install.php b/upload/sm_install.php
deleted file mode 100644
index a6226342..00000000
--- a/upload/sm_install.php
+++ /dev/null
@@ -1,2028 +0,0 @@
-<?php
-
-
-/*
-+--------------------------------------------------------------------------
-|   INVISION POWER BOARD SAFE MODE INSTALL SCRIPT v1.3
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.ibforums.com
-|   Email: phpboards@ibforums.com
-|   Licence Info: phpib-licence@ibforums.com
-+---------------------------------------------------------------------------
-|
-|   > Script written by Matthew Mecham
-|   > Date started: 30th March 2002
-|   > Update started: 17th October 2002
-|
-+--------------------------------------------------------------------------
-*/
-
-error_reporting  (E_ERROR | E_WARNING | E_PARSE);
-set_magic_quotes_runtime(0);
-
-//+---------------------------------------
-// ENTER YOUR PATH TO THE DIRECTORY THIS SCRIPT
-// IS IN.
-//
-// Tips:
-//
-// If you are using Windows and Apache, do not
-// use backslashes, use normal forward slashes.
-// You may need to remove the drive letter also
-// Example: C:\apache\htdocs\ibforums\ will need
-// to be: /apache/htdocs/ibforums/
-//
-// If you are using Windows and IIS, then you will 
-// need to enter double backslashes.
-//
-// In all cases, please enter a trailing slash (or
-// trailing backslashes...)
-//+---------------------------------------
-
-$root = "./";
-
-
-
-//+---------------------------------------
-
-$template = new template;
-$std      = new installer;
-
-$VARS = $std->parse_incoming();
-
-//+---------------------------------------
-// What are we doing then? Eh? I'm talking to you!
-//+---------------------------------------
-
-if ( file_exists($root.'install.lock') )
-{
-	install_error("This installer is locked!<br>Please (via FTP) remove the 'install.lock' file in this directory");
-	exit();
-}
-
-
-switch($VARS['a'])
-{
-	case '1':
-		do_setup_form();
-		break;
-		
-	case '2':
-		do_install();
-		break;
-		
-	case 'templates':
-		do_templates();
-		break;
-		
-	case '3':
-		do_finish();
-		break;
-		
-	default:
-		do_intro();
-		break;
-}
-
-function do_finish()
-{
-	global $std, $template, $root, $VARS, $SQL;
-	
-	// Attempt to lock the install..
-	
-	if ($FH = @fopen( $root.'install.lock', 'w' ) )
-	{
-		@fwrite( $FH, 'bleh', 4 );
-		@fclose($FH);
-		
-		@chmod( $root.'install.lock', 0666 );
-		
-		$template->print_top('Success!');
-	
-		$msg="Although the installer is now locked (to re-install, remove the file 'install.lock'), for added security, please remove the sm_install.php program before continuing.
-			 <br><br>
-			 <center><b><a href='index.php?act=Login&CODE=00'>CLICK HERE TO LOG IN!</a></center>";
-	}
-	else
-	{
-		$template->print_top('Success!');
-		
-		$msg = "PLEASE REMOVE THE INSTALLER ('sm_install.php') BEFORE CONTINUING!<br>Failure to do so will enable ANYONE to delete your board at any time!
-				<br><br>
-				<center><b><a href='index.php?act=Login&CODE=00'>CLICK HERE TO LOG IN!</a></center>";
-	}
-	
-	$template->contents .= "
-	<div class='centerbox'>
-	<div class='tableborder'>
-	<div class='maintitle'>Success</div>
-	<div class='tablepad'>
-	<b>The installation is now complete!</b>
-	<br><br>
-	$msg
-	</div>
-	</div>
-	</div>";
-						 
-	$template->output();
-	
-	
-	
-}
-
-
-//+---------------------------------------
-// Install the template files, woohoo and stuff
-//+---------------------------------------
-
-
-function do_templates()
-{
-	global $std, $template, $root, $VARS, $HTTP_POST_VARS;
-	
-	//-----------------------------------
-	// IMPORT $INFO!
-	//-----------------------------------
-	
-	if ($root == './')
-	{
-		$root = str_replace( '\\', '/', getcwd() ) . '/';
-	}
-	
-	$require = $root."conf_global.php";
-	
-	if ( ! file_exists($require) )
-	{
-		install_error("Could not locate '$require'. You may need to enter a value for the root path in this installer script, to do this, simply open up this script in a text editor and enter a value in \$root - remember to add a trailing slash. NT users will need to use double backslashes");
-	}
-	
-	include($require);
-	
-	//-----------------------------------
-	// Attempt a DB connection..
-	//-----------------------------------
-	
-	if ( ! $connect_id = mysql_connect( $INFO['sql_host'],$INFO['sql_user'],$INFO['sql_pass'] ) )
-	{
-		install_error("Could not create a mySQL connection, please check that the file 'conf_global.php' exists in the same directory as this file and that the installer has updated the file properly.");
-	}
-	
-		
-	if ( ! mysql_select_db($INFO['sql_database'], $connect_id) )
-	{
-		install_error("mySQL could not locate a database called '{$VARS['sql_database']}'. Please contact our technical support if a re-install does not solve this problem");
-	}
-	
-	//-----------------------------------
-	// Lets open the style file
-	//-----------------------------------
-	
-	$style_file = $root.'install_templates.txt';
-	
-	if ( ! file_exists($style_file) )
-	{
-		install_error("Could not locate '$style_file'. <br><br>Check to ensure that this file exists in the same location as this script.<br><br>You may need to enter a value for the root path in this installer script, to do this, simply open up this script in a text editor and enter a value in \$root - remember to add a trailing slash. NT users will need to use double backslashes");
-	}
-	
-	if ( $fh = fopen( $style_file, 'r' ) )
-	{
-		$data = fread($fh, filesize($style_file) );
-		fclose($fh);
-	}
-	else
-	{
-		install_error("Could open '$style_file'");
-	}
-	
-	if (strlen($data) < 100)
-	{
-		install_error("Err 1:'$style_file' is incomplete, please re-upload a fresh copy over the existing copy on the server'");
-	}
-	
-	// Chop up the data file.
-	
-	$template_rows = explode( "||~&~||", $data );
-	
-	$crows = count($template_rows);  //we're counting crows :o
-	
-	if ( $crows < 100 )
-	{
-		install_error("Err2: (Found $crows rows) '$style_file' is incomplete, please re-upload a fresh copy over the existing copy on the server'");
-	}
-	
-	//-----------------------------------
-	// Lets populate the database!
-	//-----------------------------------
-	
-	foreach( $template_rows as $q )
-	{
-
-	   $q = trim($q);
-	   
-	   if (strlen($q) < 5)
-	   {
-	       continue;
-	   }
-	   
-	   $query = "INSERT INTO ".$INFO['sql_tbl_prefix']."skin_templates (set_id, group_name, section_content, func_name, func_data, updated, can_remove) VALUES $q";
-		   
-	   if ( ! mysql_query($query, $connect_id) )
-	   {
-		   install_error("mySQL Error: ".mysql_error());
-	   }
-   }
-   
-   
-   // ARE WE DONE? REALLY? COOL!!
-   
-   $template->print_top('Success!');
-   
-   $template->contents .= "
-	<div class='centerbox'>
-	<div class='tableborder'>
-	<div class='maintitle'>Success</div>
-	<div class='tablepad'>
-	<b>Template files installed!</b>
-	<br><br>
-	The installation process is now complete.
-	<br>
-	Click the link below to clean up the installer and related files
-	<br><br>
-	<center><b><a href='sm_install.php?a=3'>CLICK HERE TO FINISH</a></center>
-	</div>
-	</div>
-	</div>";
-   
-	$template->output();
-	
-}
-
-//+---------------------------------------
-
-
-function do_install()
-{
-	global $std, $template, $root, $VARS, $HTTP_POST_VARS;
-	
-	// Ok, lets check for blankies...
-	
-	$NEW_INFO = array();
-	
-	$need = array('board_url','sql_host','sql_database','sql_user','adminname','adminpassword','adminpassword2','email');
-	
-	//-----------------------------------
-	
-	foreach($need as $greed)
-	{
-		if ($VARS[ $greed ] == "")
-		{
-			install_error("You must complete all of the form with the sole exception of 'SQL Table prefix'");
-		}
-	}
-	
-	//-----------------------------------
-	
-	$VARS['board_url'] = preg_replace( "#/$#", "", $VARS['board_url'] );
-	
-	if ($VARS['sql_tbl_prefix'] == "")
-	{
-		$VARS['sql_tbl_prefix'] = 'ibf_';
-	}
-	
-	//-----------------------------------
-	// Did the admin passy and passy2 match?
-	//-----------------------------------
-	
-	if ($VARS['adminpassword2'] != $VARS['adminpassword'])
-	{
-		install_error("Your passwords did not match");
-	}
-	
-	/*if ( ! preg_match( "!^http://!", $VARS['board_url'] ) )
-	{
-		install_error("The board URL must start with 'http://'");
-	}*/
-	
-	//-----------------------------------
-	// IMPORT $INFO!
-	//-----------------------------------
-	
-	if ($root == './')
-	{
-		$root = str_replace( '\\', '/', getcwd() ) . '/';
-	}
-	
-	$require = $root."conf_global.php";
-	
-	if ( ! file_exists($require) )
-	{
-		install_error("Could not locate '$require'. You may need to enter a value for the root path in this installer script, to do this, simply open up this script in a text editor and enter a value in \$root - remember to add a trailing slash. NT users will need to use double backslashes");
-	}
-	
-	//@chmod( "conf_global.php", 0666 );
-	
-	include($require);
-	
-	//echo("here");
-	//exit();
-	
-	if ( count($INFO) < 1 )
-	{
-		install_error("Possible corruption in 'conf_global.php' ({$VARS['base_dir']}conf_global.php), please re-upload in ASCII format");
-	}
-	
-	//-----------------------------------
-	// Attempt a DB connection..
-	//-----------------------------------
-	
-	if ( ! $connect_id = mysql_connect( $VARS['sql_host'],$HTTP_POST_VARS['sql_user'],$HTTP_POST_VARS['sql_pass'] ) )
-	{
-		install_error("Could not create a mySQL connection, please check the SQL values entered");
-	}
-	
-		
-	if ( ! mysql_select_db($VARS['sql_database'], $connect_id) )
-	{
-		install_error("mySQL could not locate a database called '{$VARS['sql_database']}' please check the value entered for this");
-	}
-	
-	//-----------------------------------
-	// Attempt to write the config file.
-	//-----------------------------------
-	
-    $new  = array( 'base_dir'       => $root,
-				   'board_url'      => $VARS['board_url'],
-				   'sql_host'       => $VARS['sql_host'],
-				   'sql_database'   => $VARS['sql_database'],
-				   'sql_user'       => $HTTP_POST_VARS['sql_user'],
-				   'sql_pass'       => $HTTP_POST_VARS['sql_pass'],
-				   'sql_tbl_prefix' => $VARS['sql_tbl_prefix'],
-				   
-				   'html_dir'       => $root."html/",
-				   'html_url'       => $VARS['board_url']."/html",
-				   'upload_dir'     => $root."uploads",
-				   'upload_url'     => $VARS['board_url']."/uploads",
-				   'email_in'       => $VARS['email'],
-				   'email_out'      => $VARS['email'],
-				   'ban_names'      => "",
-				   'ban_email'      => "",
-				   'ban_ip'         => "",
-				   'force_login'    => 0,
-				   'load_limit'     => "",
-				   'board_start'    => time(),
-				   'installed'      => 1,
-				   'guests_ava'     => 1,
-				   'guests_img'		=> 1,
-				   'guests_sig'		=> 1,
-				   'print_headers'  => 0,
-				   'guest_name_pre' => "Guest_",
-				 );
-					 
-	 foreach( $new as $k => $v )
-	 {
-		 // Update the old...
-		 
-		 $v = preg_replace( "/'/", "\\'" , $v );
-		 $v = preg_replace( "/\r/", ""   , $v );
-		 
-		 $INFO[ $k ] = $v;
-	 }
-	 
-	 $file_string = "<?php\n";
-		
-	 foreach( $INFO as $k => $v )
-	 {
-		 if ($k == 'skin' or $k == 'languages')
-		 {
-			continue;
-		 }
-		 $file_string .= '$INFO['."'".$k."'".']'."\t\t\t=\t'".$v."';\n";
-	 }
-	 
-	 $file_string .= "\n".'?'.'>';   // Question mark + greater than together break syntax hi-lighting in BBEdit 6 :p
-	 
-	 if ( $fh = fopen( $require, 'w' ) )
-	 {
-		 fputs($fh, $file_string, strlen($file_string) );
-		 fclose($fh);
-	 }
-	 else
-	 {
-		 install_error("Could not write to 'conf_global.php'");
-	 }
-	 
-	 //-----------------------------------
-	 // What MySQL version are we running?
-	 //-----------------------------------
-	 
-	 $a = mysql_query("SELECT VERSION() AS version", $connect_id);
-		
-	 if ( ! $row = mysql_fetch_array($a) )
-	 {
-		 $b = mysql_query("SHOW VARIABLES LIKE 'version'", $connect_id);
-		 $row = mysql_fetch_array($b);
-	 }
-	 
-	 $mysql_version = 32100;
-	 
-	 $no_array = explode( '.', preg_replace( "/^(.+?)[-_]?/", "\\1", $row['version']) );
-	 
-	 $one   = (!isset($no_array) || !isset($no_array[0])) ? 3  : $no_array[0];
-	 $two   = (!isset($no_array[1]))                      ? 21 : $no_array[1];
-	 $three = (!isset($no_array[2]))                      ? 0  : $no_array[2];
-	 
-	 $mysql_version = (int)sprintf('%d%02d%02d', $one, $two, intval($three));
-	 
-	 //-----------------------------------
-	 // Lets populate the database!
-	 //-----------------------------------
-	 
-	 $SQL = get_sql();
-	 
-	 foreach( $SQL as $q )
-	 {
-	 	if ($VARS['sql_tbl_prefix'] != "ibf_")
-        {
-           $q = preg_replace("/ibf_(\S+?)([\s\.,]|$)/", $VARS['sql_tbl_prefix']."\\1\\2", $q);
-        }
-        
-        $q = str_replace( "<%time%>", time(), $q );
-        
-        if ( preg_match("/CREATE TABLE (\S+) \(/", $q, $match) )
-        {
-        	if ($match[1])
-        	{
-        		$the_query = "DROP TABLE if exists ".$match[1];
-        		
-        		if (! mysql_query($the_query, $connect_id) )
-        		{
-        			install_error("mySQL Error: ".mysql_error());
-        		}
-        	}
-        }
-        
-        if ( $mysql_version < 32323 )
-        {
-        	$q = str_replace( "KEY forum_id (forum_id,approved,pinned),FULLTEXT KEY title (title)", 'KEY forum_id (forum_id,approved,pinned)', $q );
-        	$q = str_replace( "KEY forum_id (forum_id,post_date),FULLTEXT KEY post (post)"        , 'KEY forum_id (forum_id,post_date)'      , $q );
-        }
-        	
-        if ( ! mysql_query($q, $connect_id) )
-        {
-        	install_error("mySQL Error: ".mysql_error()."<br /><b>Query:</b>".$q);
-        }
-	}
-	
-	// Insert the admin...
-	
-	$passy = md5($VARS['adminpassword']);
-	$time  = time();
-	
-	$query = "INSERT INTO ".$VARS['sql_tbl_prefix']."members (id, name, mgroup, password, email, joined, ip_address, posts, title, last_visit, last_activity) ".
-		     "VALUES(1, '{$VARS['adminname']}', 4, '$passy', '{$VARS['email']}', '$time', '127.0.0.1', '0', 'Administrator', '$time', '$time')";
-		     
-	if ( ! mysql_query($query, $connect_id) )
-	{
-		install_error("mySQL Error: ".mysql_error());
-		
-	}
-	
-	// ARE WE DONE? REALLY? COOL!!
-	
-	$template->print_top('Success!');
-	
-	$template->contents .= "
-	<div class='centerbox'>
-	<div class='tableborder'>
-	<div class='maintitle'>Success</div>
-	<div class='tablepad'>
-	<b>Your board has now been installed!</b>
-	<br><br>
-	The installation process is almost complete.
-	<br>
-	The next and final step will install the template files into your database
-	<br><br>
-	<center><b><a href='sm_install.php?a=templates'>CLICK HERE TO CONTINUE</a></center>
-	</div>
-	</div>
-	</div>";
-						 
-	$template->output();
-	
-}
-
-
-
-
-function do_setup_form()
-{
-	global $std, $template, $root, $HTTP_SERVER_VARS;
-	
-	$template->print_top('Set Up form');
-	
-	//--------------------------------------------------
-	
-	$this_url = str_replace( "/sm_install.php", "", $HTTP_SERVER_VARS['HTTP_REFERER']);
-	
-	if ( ! $this_url )
-	{
-		$this_url = substr($HTTP_SERVER_VARS['SCRIPT_NAME'],0, -15);
-		
-    	if ($this_url == '')
-    	{
-    		$this_url == '/';
-    	}
-    	$this_url = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].$this_url; 
-    } 
-	
-	
-	//--------------------------------------------------
-	
-	$template->contents .= "
-	
-	<form action='sm_install.php' method='POST'>
-	<input type='hidden' name='a' value='2'>
-	<div class='centerbox'>
-	
-	<div class='tableborder'>
-	<div class='maintitle'>Your Server Environment</div>
-	<div class='pformstrip'>This section requires you to enter the paths and URL's for the board.</div>
-	<table width='100%' cellspacing='1'>
-	<tr>
-	  <td class='pformleftw'><b>The script URL</b><br>This is the URL (must start with http://) to the directory that this script is in</td>
-	  <td class='pformright'><input type='text' id='textinput' name='board_url' value='$this_url'></td>
-	</tr>
-	</table>
-	</div>
-	<div class='fade'>&nbsp;</div>
-	
-	<br />
-	
-	<div class='tableborder'>
-	<div class='maintitle'>Your SQL Environment</div>
-	<div class='pformstrip'>This section requires you to enter your SQL information. If in doubt, please check with your webhost before asking for support. You may choose to enter an existing database name,if not - you must create a new database before continuing.</div>
-	<table width='100%' cellspacing='1'>
-	<tr>
-	  <td class='pformleftw'><b>SQL Host</b><br>(localhost is usually sufficient)</td>
-	  <td class='pformright'><input type='text' id='textinput' name='sql_host' value='localhost'></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>SQL Database Name</b></td>
-	  <td class='pformright'><input type='text' id='textinput' name='sql_database' value=''></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>SQL Username</b></td>
-	  <td class='pformright'><input type='text' id='textinput' name='sql_user' value=''></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>SQL Password</b></td>
-	  <td class='pformright'><input type='text' id='textinput' name='sql_pass' value=''></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>SQL Table Prefix</b>(You can leave this blank)</td>
-	  <td class='pformright'><input type='text' id='textinput' name='sql_tbl_prefix' value=''></td>
-	</tr>
-	</table>
-	</div>
-	<div class='fade'>&nbsp;</div>
-	
-	<br />
-	
-	<div class='tableborder'>
-	<div class='maintitle'>Your Admin Account</div>
-	<div class='pformstrip'>This section requires information to create your administration account. Please enter the data carefully!</div>
-	<table width='100%' cellspacing='1'>
-	<tr>
-	  <td class='pformleftw'><b>Username</b></td>
-	  <td class='pformright'><input type='text' id='textinput' name='adminname' value=''></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>Password</b></td>
-	  <td class='pformright'><input type='password' id='textinput' name='adminpassword' value=''></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>Retype your password</b></td>
-	  <td class='pformright'><input type='password' id='textinput' name='adminpassword2' value=''></td>
-	</tr>
-	
-	<tr>
-	  <td class='pformleftw'><b>Email Address</b></td>
-	  <td class='pformright'><input type='text' id='textinput' name='email' value=''></td>
-	</tr>
-	</table>
-	<div align='center' class='pformstrip'  style='text-align:center'><input type='image' src='html/sys-img/install_proceed.gif'></div>
-	</div>
-	<div class='fade'>&nbsp;</div>
-	</div>
-	</form>";
-						 
-	$template->output();
-						 
-}
-
-//+---------------------------------------
-
-function do_intro()
-{
-	global $std, $template, $root;
-	
-	$template->print_top('Welcome');
-	
-	$template->contents .= "<table width='80%' border='0' cellpadding='0' cellspacing='0' align='center'>
-							<tr>
-							 <td valign='top'><img src='html/sys-img/install_face.jpg' border='0' alt='Intro'></td>
-							 <td><img src='html/sys-img/install_text.gif' border='0' alt='Welcome to IPB'>
-							  <br /><br />
-							   Before we go any further, please ensure that all the files have been uploaded, and that the 
-							   file 'conf_global.php' has suitable permissions to allow this script to write to it ( 0666 should be sufficient ).
-							   <br><br>
-							   You will also need the following information that your webhost can provide:
-							   <ul>
-							   <li>Your MySQL database name</li>
-							   <li>Your MySQL username</li>
-							   <li>Your MySQL password</li>
-							   <li>Your MySQL host address (usually localhost)</li>
-							   </ul>
-							   <br />
-							   Once you have clicked on proceed, you will be taken to a form to enter information the installer needs to set up your board.
-							   <br><br>
-							   <b>PLEASE NOTE: USING THIS INSTALLER WILL DELETE ANY CURRENT INVISION POWER BOARD DATABASE IF YOU ARE USING THE SAME TABLE PREFIX</b>
-							   ";
-						 
-	// Check to make sure that the config file is there and it's got suitable permissions to write to:
-	
-	$file = $root."conf_global.php";
-	
-	$style_file = $root."install_templates.txt";
-	
-	$warnings = array();
-	
-	if ( ! file_exists($style_file) )
-	{
-		$warnings[] = "Cannot locate the file 'install_templates.txt'. This should be uploaded into the same directory as this script!";
-	}
-	
-	if ( ! file_exists($file) )
-	{
-		$warnings[] = "Cannot locate the file 'conf_global.php'. This should be uploaded into the same directory as this script!";
-	}
-	
-	if ( ! is_writeable($file) )
-	{
-		$warnings[] = "Cannot write to 'conf_global.php'. Please adjust the permissions to allow this script to write to the file. if in doubt, CHMOD via FTP to 0777";
-	}
-	
-	$phpversion = phpversion();
-	
-	if ($phpversion < '4.0.0') {
-		$warnings[] = "You cannot install Invision Power Board. Invision Power Board requires PHP Version 4.0.0 or better.";
-	}
-	
-	if ( count($warnings) > 0 )
-	{
-	
-		$err_string = "<ul><li>".implode( "<li>", $warnings )."</ul>";
-	
-		$template->contents .= "<br /><br />
-							    <div class='warnbox'>
-							     <strong>Warning!</strong>
-							     <b>The following errors must be rectified before continuing!</b>
-								 <br><br>
-								 $err_string
-							    </div>";
-	}
-	else
-	{
-		$template->contents .= "<br /><br /><div align='center'><a href='sm_install.php?a=1'><img src='html/sys-img/install_proceed.gif' border='0' alt='proceed'></a></div>";
-	}
-	
-	$template->contents .= " </td>
-							  </tr>
-							 </table>";
-	
-	$template->output();
-}
-
-
-
-function install_error($msg="")
-{
-	global $std, $template, $root;
-	
-	$template->print_top('Warning!');
-	
-
-	
-	$template->contents .= "<div class='warnbox'>
-						     <strong style='font-size:16px;color:#F00'>Warning!</strong>
-						     <br /><br />
-						     <b>The following errors must be rectified before continuing!</b><br>Please go back and try again!
-						     <br><br>
-						     $msg
-						    </div>";
-	
-	
-	
-	$template->output();
-}
-
-//+--------------------------------------------------------------------------
-// CLASSES
-//+--------------------------------------------------------------------------
-
-
-
-class template
-{
-	var $contents = "";
-	
-	function output()
-	{
-		echo $this->contents;
-		echo "   
-				 
-				 <br><br><br><br><center><span id='copy'><a href='http://www.invisionboard.com'>Invision Power Board</a> &copy; 2003 <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a></span></center>
-				 
-				 </body>
-				 </html>";
-		exit();
-	}
-	
-	//--------------------------------------
-
-	function print_top($title="")
-	{
-	
-		$this->contents = "<html>
-		          <head><title>Invision Power Board Set Up :: $title </title>
-		          <style type='text/css'>
-		          	
-		          	BODY		          	
-		          	{
-		          		font-size: 11px;
-		          		font-family: Verdana, Arial;
-		          		color: #000;
-		          		margin: 0px;
-		          		padding: 0px;
-		          		background-image: url(html/sys-img/fadebg.jpg);
-		          		background-repeat: no-repeat;
-		          		background-position: right bottom;
-		          	}
-		          	
-		          	TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 11px; color:#000 }
-					
-					a:link, a:visited, a:active  { color:#000055 }
-					a:hover                      { color:#333377;text-decoration:underline }
-					
-					.centerbox { margin-right:10%;margin-left:10%;text-align:left }
-					
-					.warnbox {
-							   border:1px solid #F00;
-							   background: #FFE0E0;
-							   padding:6px;
-							   margin-right:10%;margin-left:10%;text-align:left;
-							 }
-					
-					.tablepad    { background-color:#F5F9FD;padding:6px }
-
-					.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px;text-align:left }
-					.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-					.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
-
-					.tableborder { border:1px solid #345487;background-color:#FFF; padding:0px; margin:0px; width:100% }
-
-					.maintitle { text-align:left;vertical-align:middle;font-weight:bold; color:#FFF; letter-spacing:1px; padding:8px 0px 8px 5px; background-image: url(html/sys-img/tile_back.gif) }
-					.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-					.maintitle a:hover { text-decoration: underline }
-					
-					#copy { font-size:10px }
-										
-					#button   { background-color: #4C77B6; color: #FFFFFF; font-family:Verdana, Arial; font-size:11px }
-					
-					#textinput { background-color: #EEEEEE; color:Ê#000000; font-family:Verdana, Arial; font-size:10px; width:100% }
-					
-					#dropdown { background-color: #EEEEEE; color:Ê#000000; font-family:Verdana, Arial; font-size:10px }
-					
-					#multitext { background-color: #EEEEEE; color:Ê#000000; font-family:Courier, Verdana, Arial; font-size:10px }
-					
-					#logostrip {
-								 padding: 0px;
-								 margin: 0px;
-								 background: #7AA3D0;
-							   }
-							   
-					.fade					
-					{
-						background-image: url(html/sys-img/fade.jpg);
-						background-repeat: repeat-x;
-					}
-					
-				  </style>
-				  </head>
-				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>
-				 
-				 <div id='logostrip'><img src='html/sys-img/title.gif' border='0' alt='Invision Power Board Installer' /></div>
-				 <div class='fade'>&nbsp;</div>
-				 <br />
-				 ";
-				  	   
-	}
-
-
-}
-
-
-class installer
-{
-
-	function parse_incoming()
-    {
-    	global $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_CLIENT_IP, $REQUEST_METHOD, $REMOTE_ADDR, $HTTP_PROXY_USER, $HTTP_X_FORWARDED_FOR;
-    	$return = array();
-    	
-		if( is_array($HTTP_GET_VARS) )
-		{
-			while( list($k, $v) = each($HTTP_GET_VARS) )
-			{
-				//$k = $this->clean_key($k);
-				if( is_array($HTTP_GET_VARS[$k]) )
-				{
-					while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
-					{
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
-					}
-				}
-				else
-				{
-					$return[$k] = $this->clean_value($v);
-				}
-			}
-		}
-		
-		// Overwrite GET data with post data
-		
-		if( is_array($HTTP_POST_VARS) )
-		{
-			while( list($k, $v) = each($HTTP_POST_VARS) )
-			{
-				//$k = $this->clean_key($k);
-				if ( is_array($HTTP_POST_VARS[$k]) )
-				{
-					while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
-					{
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
-					}
-				}
-				else
-				{
-					$return[$k] = $this->clean_value($v);
-				}
-			}
-		}
-		
-		return $return;
-	}
-    
-    function clean_key($key) {
-    
-    	if ($key == "")
-    	{
-    		return "";
-    	}
-    	
-    	$key = preg_replace( "/\.\./"           , ""  , $key );
-    	$key = preg_replace( "/\_\_(.+?)\_\_/"  , ""  , $key );
-    	$key = preg_replace( "/^([\w\.\-\_]+)$/", "$1", $key );
-    	return $key;
-    }
-    
-    function clean_value($val) {
-    
-    	if ($val == "")
-    	{
-    		return "";
-    	}
-    	
-    	$val = preg_replace( "/&/"         , "&amp;"         , $val );
-    	$val = preg_replace( "/<!--/"      , "&#60;&#33;--"  , $val );
-    	$val = preg_replace( "/-->/"       , "--&#62;"       , $val );
-    	$val = preg_replace( "/<script/i"  , "&#60;script"   , $val );
-    	$val = preg_replace( "/>/"         , "&gt;"          , $val );
-    	$val = preg_replace( "/</"         , "&lt;"          , $val );
-    	$val = preg_replace( "/\"/"        , "&quot;"        , $val );
-    	$val = preg_replace( "/\|/"        , "&#124;"        , $val );
-    	$val = preg_replace( "/\n/"        , "<br>"          , $val ); // Convert literal newlines
-    	$val = preg_replace( "/\\\$/"      , "&#036;"        , $val );
-    	$val = preg_replace( "/\r/"        , ""              , $val ); // Remove literal carriage returns
-    	$val = preg_replace( "/!/"         , "&#33;"         , $val );
-    	$val = preg_replace( "/'/"         , "&#39;"         , $val ); // IMPORTANT: It helps to increase sql query safety.
-    	$val = stripslashes($val);                                     // Swop PHP added backslashes
-    	$val = preg_replace( "/\\\/"       , "&#092;"        , $val ); // Swop user inputted backslashes
-    	return $val;
-    }
-   
-}
-
-
-
-// DATA AND STUFF, ETC
-
-function get_sql()
-{
-
-$SQL = array();
-
-$SQL[] = "CREATE TABLE ibf_admin_logs (
-  id bigint(20) NOT NULL auto_increment,
-  act varchar(255) default NULL,
-  code varchar(255) default NULL,
-  member_id int(10) default NULL,
-  ctime int(10) default NULL,
-  note text,
-  ip_address varchar(255) default NULL,
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_admin_sessions (
-  ID varchar(32) NOT NULL default '',
-  IP_ADDRESS varchar(32) NOT NULL default '',
-  MEMBER_NAME varchar(32) NOT NULL default '',
-  MEMBER_ID varchar(32) NOT NULL default '',
-  SESSION_KEY varchar(32) NOT NULL default '',
-  LOCATION varchar(64) default 'index',
-  LOG_IN_TIME int(10) NOT NULL default '0',
-  RUNNING_TIME int(10) NOT NULL default '0',
-  PRIMARY KEY  (ID)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_badwords (
-  wid int(3) NOT NULL auto_increment,
-  type varchar(250) NOT NULL default '',
-  swop varchar(250) default NULL,
-  m_exact tinyint(1) default '0',
-  PRIMARY KEY  (wid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_cache_store (
-  cs_key varchar(255) NOT NULL default '',
-  cs_value text NOT NULL,
-  cs_extra varchar(255) NOT NULL default '',
-  PRIMARY KEY  (cs_key)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_calendar_events (
-  eventid mediumint(8) NOT NULL auto_increment,
-  userid mediumint(8) NOT NULL default '0',
-  year int(4) NOT NULL default '2002',
-  month int(2) NOT NULL default '1',
-  mday int(2) NOT NULL default '1',
-  title varchar(254) NOT NULL default 'no title',
-  event_text text NOT NULL,
-  read_perms varchar(254) NOT NULL default '*',
-  unix_stamp int(10) NOT NULL default '0',
-  priv_event tinyint(1) NOT NULL default '0',
-  show_emoticons tinyint(1) NOT NULL default '1',
-  rating smallint(2) NOT NULL default '1',
-  event_ranged tinyint(1) NOT NULL default '0',
-  event_repeat tinyint(1) NOT NULL default '0',
-  repeat_unit char(2) NOT NULL default '',
-  end_day int(2) default NULL,
-  end_month int(2) default NULL,
-  end_year int(4) default NULL,
-  end_unix_stamp int(10) default NULL,
-  event_bgcolor varchar(32) NOT NULL default '',
-  event_color varchar(32) NOT NULL default '',
-  PRIMARY KEY  (eventid),
-  KEY unix_stamp (unix_stamp)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_categories (
-  id smallint(5) NOT NULL default '0',
-  position tinyint(3) default NULL,
-  state varchar(10) default NULL,
-  name varchar(128) NOT NULL default '',
-  description text,
-  image varchar(128) default NULL,
-  url varchar(128) default NULL,
-  PRIMARY KEY  (id),
-  KEY id (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_contacts (
-  id mediumint(8) NOT NULL auto_increment,
-  contact_id mediumint(8) NOT NULL default '0',
-  member_id mediumint(8) NOT NULL default '0',
-  contact_name varchar(32) NOT NULL default '',
-  allow_msg tinyint(1) default NULL,
-  contact_desc varchar(50) default NULL,
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_css (
-  cssid int(10) NOT NULL auto_increment,
-  css_name varchar(128) NOT NULL default '',
-  css_text text,
-  css_comments text,
-  updated int(10) default '0',
-  PRIMARY KEY  (cssid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_email_logs (
-  email_id int(10) NOT NULL auto_increment,
-  email_subject varchar(255) NOT NULL default '',
-  email_content text NOT NULL,
-  email_date int(10) NOT NULL default '0',
-  from_member_id mediumint(8) NOT NULL default '0',
-  from_email_address varchar(250) NOT NULL default '',
-  from_ip_address varchar(16) NOT NULL default '127.0.0.1',
-  to_member_id mediumint(8) NOT NULL default '0',
-  to_email_address varchar(250) NOT NULL default '',
-  topic_id int(10) NOT NULL default '0',
-  PRIMARY KEY  (email_id),
-  KEY from_member_id (from_member_id),
-  KEY email_date (email_date)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_emoticons (
-  id smallint(3) NOT NULL auto_increment,
-  typed varchar(32) NOT NULL default '',
-  image varchar(128) NOT NULL default '',
-  clickable smallint(2) NOT NULL default '1',
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_faq (
-  id mediumint(8) NOT NULL auto_increment,
-  title varchar(128) NOT NULL default '',
-  text text,
-  description text NOT NULL,
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_forum_perms (
-  perm_id int(10) NOT NULL auto_increment,
-  perm_name varchar(250) NOT NULL default '',
-  PRIMARY KEY  (perm_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_forum_tracker (
-  frid mediumint(8) NOT NULL auto_increment,
-  member_id varchar(32) NOT NULL default '',
-  forum_id smallint(5) NOT NULL default '0',
-  start_date int(10) default NULL,
-  last_sent int(10) NOT NULL default '0',
-  PRIMARY KEY  (frid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_forums (
-  id smallint(5) NOT NULL default '0',
-  topics mediumint(6) default NULL,
-  posts mediumint(6) default NULL,
-  last_post int(10) default NULL,
-  last_poster_id mediumint(8) NOT NULL default '0',
-  last_poster_name varchar(32) default NULL,
-  name varchar(128) NOT NULL default '',
-  description text,
-  position tinyint(2) default NULL,
-  use_ibc tinyint(1) default NULL,
-  use_html tinyint(1) default NULL,
-  status varchar(10) default NULL,
-  start_perms varchar(255) NOT NULL default '',
-  reply_perms varchar(255) NOT NULL default '',
-  read_perms varchar(255) NOT NULL default '',
-  password varchar(32) default NULL,
-  category tinyint(2) NOT NULL default '0',
-  last_title varchar(128) default NULL,
-  last_id int(10) default NULL,
-  sort_key varchar(32) default NULL,
-  sort_order varchar(32) default NULL,
-  prune tinyint(3) default NULL,
-  show_rules tinyint(1) default NULL,
-  upload_perms varchar(255) default NULL,
-  preview_posts tinyint(1) default NULL,
-  allow_poll tinyint(1) NOT NULL default '1',
-  allow_pollbump tinyint(1) NOT NULL default '0',
-  inc_postcount tinyint(1) NOT NULL default '1',
-  skin_id int(10) default NULL,
-  parent_id mediumint(5) default '-1',
-  subwrap tinyint(1) default '0',
-  sub_can_post tinyint(1) default '1',
-  quick_reply tinyint(1) default '0',
-  redirect_url varchar(250) default '',
-  redirect_on tinyint(1) NOT NULL default '0',
-  redirect_hits int(10) NOT NULL default '0',
-  redirect_loc varchar(250) default '',
-  rules_title varchar(255) NOT NULL default '',
-  rules_text text NOT NULL,
-  has_mod_posts tinyint(1) NOT NULL default '0',
-  topic_mm_id varchar(250) NOT NULL default '',
-  notify_modq_emails text default '',
-  PRIMARY KEY  (id),
-  KEY category (category),
-  KEY id (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_groups (
-  g_id int(3) unsigned NOT NULL auto_increment,
-  g_view_board tinyint(1) default NULL,
-  g_mem_info tinyint(1) default NULL,
-  g_other_topics tinyint(1) default NULL,
-  g_use_search tinyint(1) default NULL,
-  g_email_friend tinyint(1) default NULL,
-  g_invite_friend tinyint(1) default NULL,
-  g_edit_profile tinyint(1) default NULL,
-  g_post_new_topics tinyint(1) default NULL,
-  g_reply_own_topics tinyint(1) default NULL,
-  g_reply_other_topics tinyint(1) default NULL,
-  g_edit_posts tinyint(1) default NULL,
-  g_delete_own_posts tinyint(1) default NULL,
-  g_open_close_posts tinyint(1) default NULL,
-  g_delete_own_topics tinyint(1) default NULL,
-  g_post_polls tinyint(1) default NULL,
-  g_vote_polls tinyint(1) default NULL,
-  g_use_pm tinyint(1) default NULL,
-  g_is_supmod tinyint(1) default NULL,
-  g_access_cp tinyint(1) default NULL,
-  g_title varchar(32) NOT NULL default '',
-  g_can_remove tinyint(1) default NULL,
-  g_append_edit tinyint(1) default NULL,
-  g_access_offline tinyint(1) default NULL,
-  g_avoid_q tinyint(1) default NULL,
-  g_avoid_flood tinyint(1) default NULL,
-  g_icon varchar(64) default NULL,
-  g_attach_max bigint(20) default NULL,
-  g_avatar_upload tinyint(1) default '0',
-  g_calendar_post tinyint(1) default '0',
-  prefix varchar(250) default NULL,
-  suffix varchar(250) default NULL,
-  g_max_messages int(5) default '50',
-  g_max_mass_pm int(5) default '0',
-  g_search_flood mediumint(6) default '20',
-  g_edit_cutoff int(10) default '0',
-  g_promotion varchar(10) default '-1&-1',
-  g_hide_from_list tinyint(1) default '0',
-  g_post_closed tinyint(1) default '0',
-  g_perm_id varchar(255) NOT NULL default '',
-  g_photo_max_vars varchar(200) default '',
-  g_dohtml tinyint(1) NOT NULL default '0',
-  g_edit_topic tinyint(1) NOT NULL default '0',
-  g_email_limit varchar(15) NOT NULL default '10:15',
-  PRIMARY KEY  (g_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_languages (
-  lid mediumint(8) NOT NULL auto_increment,
-  ldir varchar(64) NOT NULL default '',
-  lname varchar(250) NOT NULL default '',
-  lauthor varchar(250) default NULL,
-  lemail varchar(250) default NULL,
-  PRIMARY KEY  (lid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_macro (
-  macro_id smallint(3) NOT NULL auto_increment,
-  macro_value varchar(200) default NULL,
-  macro_replace text,
-  can_remove tinyint(1) default '0',
-  macro_set smallint(3) NOT NULL default '',
-  PRIMARY KEY  (macro_id),
-  KEY macro_set (macro_set)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_macro_name (
-  set_id smallint(3) NOT NULL default '0',
-  set_name varchar(200) default NULL,
-  PRIMARY KEY  (set_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_member_extra (
-  id mediumint(8) NOT NULL default '0',
-  notes text,
-  links text,
-  bio text,
-  ta_size char(3) default NULL,
-  photo_type varchar(10) default '',
-  photo_location varchar(255) default '',
-  photo_dimensions varchar(200) default '',
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_members (
-  id mediumint(8) NOT NULL default '0',
-  name varchar(255) NOT NULL default '',
-  mgroup smallint(3) NOT NULL default '0',
-  password varchar(32) NOT NULL default '',
-  email varchar(60) NOT NULL default '',
-  joined int(10) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '',
-  avatar varchar(128) default NULL,
-  avatar_size varchar(9) default NULL,
-  posts mediumint(7) default '0',
-  aim_name varchar(40) default NULL,
-  icq_number varchar(40) default NULL,
-  location varchar(128) default NULL,
-  signature text,
-  website varchar(70) default NULL,
-  yahoo varchar(32) default NULL,
-  title varchar(64) default NULL,
-  allow_admin_mails tinyint(1) default NULL,
-  time_offset varchar(10) default NULL,
-  interests text,
-  hide_email varchar(8) default NULL,
-  email_pm tinyint(1) default NULL,
-  email_full tinyint(1) default NULL,
-  skin smallint(5) default NULL,
-  warn_level int(10) default NULL,
-  warn_lastwarn int(10) NOT NULL default '0',
-  language varchar(32) default NULL,
-  msnname varchar(64) default NULL,
-  last_post int(10) default NULL,
-  restrict_post varchar(100) NOT NULL default '0',
-  view_sigs tinyint(1) default '1',
-  view_img tinyint(1) default '1',
-  view_avs tinyint(1) default '1',
-  view_pop tinyint(1) default '1',
-  bday_day int(2) default NULL,
-  bday_month int(2) default NULL,
-  bday_year int(4) default NULL,
-  new_msg tinyint(2) default NULL,
-  msg_from_id mediumint(8) default NULL,
-  msg_msg_id int(10) default NULL,
-  msg_total smallint(5) default NULL,
-  vdirs text,
-  show_popup tinyint(1) default NULL,
-  misc varchar(128) default NULL,
-  last_visit int(10) default '0',
-  last_activity int(10) default '0',
-  dst_in_use tinyint(1) default '0',
-  view_prefs varchar(64) default '-1&-1',
-  coppa_user tinyint(1) default '0',
-  mod_posts varchar(100) NOT NULL default '0',
-  auto_track tinyint(1) default '0',
-  org_perm_id varchar(255) default '',
-  org_supmod tinyint(1) default '0',
-  integ_msg varchar(250) default '',
-  temp_ban varchar(100) default NULL,
-  sub_end int(10) NOT NULL default '0',
-  PRIMARY KEY  (id),
-  KEY name (name),
-  KEY mgroup (mgroup),
-  KEY bday_day (bday_day),
-  KEY bday_month (bday_month)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_messages (
-  msg_id int(10) NOT NULL auto_increment,
-  msg_date int(10) default NULL,
-  read_state tinyint(1) default NULL,
-  title varchar(128) default NULL,
-  message text,
-  from_id mediumint(8) NOT NULL default '0',
-  vid varchar(32) default NULL,
-  member_id mediumint(8) NOT NULL default '0',
-  recipient_id mediumint(8) NOT NULL default '0',
-  attach_type tinyint(128) default NULL,
-  attach_file tinyint(128) default NULL,
-  cc_users text,
-  tracking tinyint(1) default '0',
-  read_date int(10) default NULL,
-  PRIMARY KEY  (msg_id),
-  KEY member_id (member_id),
-  KEY vid (vid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_moderator_logs (
-  id int(10) NOT NULL auto_increment,
-  forum_id int(5) default '0',
-  topic_id int(10) NOT NULL default '0',
-  post_id int(10) default NULL,
-  member_id mediumint(8) NOT NULL default '0',
-  member_name varchar(32) NOT NULL default '',
-  ip_address varchar(16) NOT NULL default '0',
-  http_referer varchar(255) default NULL,
-  ctime int(10) default NULL,
-  topic_title varchar(128) default NULL,
-  action varchar(128) default NULL,
-  query_string varchar(128) default NULL,
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_moderators (
-  mid mediumint(8) NOT NULL auto_increment,
-  forum_id int(5) NOT NULL default '0',
-  member_name varchar(32) NOT NULL default '',
-  member_id mediumint(8) NOT NULL default '0',
-  edit_post tinyint(1) default NULL,
-  edit_topic tinyint(1) default NULL,
-  delete_post tinyint(1) default NULL,
-  delete_topic tinyint(1) default NULL,
-  view_ip tinyint(1) default NULL,
-  open_topic tinyint(1) default NULL,
-  close_topic tinyint(1) default NULL,
-  mass_move tinyint(1) default NULL,
-  mass_prune tinyint(1) default NULL,
-  move_topic tinyint(1) default NULL,
-  pin_topic tinyint(1) default NULL,
-  unpin_topic tinyint(1) default NULL,
-  post_q tinyint(1) default NULL,
-  topic_q tinyint(1) default NULL,
-  allow_warn tinyint(1) default NULL,
-  edit_user tinyint(1) NOT NULL default '0',
-  is_group tinyint(1) default '0',
-  group_id smallint(3) default NULL,
-  group_name varchar(200) default NULL,
-  split_merge tinyint(1) default '0',
-  can_mm tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (mid),
-  KEY forum_id (forum_id),
-  KEY group_id (group_id),
-  KEY member_id (member_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_pfields_content (
-  member_id mediumint(8) NOT NULL default '0',
-  updated int(10) default '0',
-  PRIMARY KEY  (member_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_pfields_data (
-  fid smallint(5) NOT NULL auto_increment,
-  ftitle varchar(200) NOT NULL default '',
-  fdesc varchar(250) default '',
-  fcontent text,
-  ftype varchar(250) default 'text',
-  freq tinyint(1) default '0',
-  fhide tinyint(1) default '0',
-  fmaxinput smallint(6) default '250',
-  fedit tinyint(1) default '1',
-  forder smallint(6) default '1',
-  fshowreg tinyint(1) default '0',
-  PRIMARY KEY  (fid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_polls (
-  pid mediumint(8) NOT NULL auto_increment,
-  tid int(10) NOT NULL default '0',
-  start_date int(10) default NULL,
-  choices text,
-  starter_id mediumint(8) NOT NULL default '0',
-  votes smallint(5) NOT NULL default '0',
-  forum_id smallint(5) NOT NULL default '0',
-  poll_question varchar(255) default NULL,
-  PRIMARY KEY  (pid)
-) TYPE=MyISAM;";
-
-
-$SQL[] = "CREATE TABLE ibf_posts (
-  pid int(10) NOT NULL auto_increment,
-  append_edit tinyint(1) default '0',
-  edit_time int(10) default NULL,
-  author_id mediumint(8) NOT NULL default '0',
-  author_name varchar(32) default NULL,
-  use_sig tinyint(1) NOT NULL default '0',
-  use_emo tinyint(1) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '',
-  post_date int(10) default NULL,
-  icon_id smallint(3) default NULL,
-  post text,
-  queued tinyint(1) default NULL,
-  topic_id int(10) NOT NULL default '0',
-  forum_id smallint(5) NOT NULL default '0',
-  attach_id varchar(64) default NULL,
-  attach_hits int(10) default NULL,
-  attach_type varchar(128) default NULL,
-  attach_file varchar(255) default NULL,
-  post_title varchar(255) default NULL,
-  new_topic tinyint(1) default '0',
-  edit_name varchar(255) default NULL,
-  PRIMARY KEY  (pid),
-  KEY topic_id (topic_id,author_id),
-  KEY author_id (author_id),
-  KEY forum_id (forum_id,post_date),FULLTEXT KEY post (post)
-) TYPE=MyISAM;";
-
-
-$SQL[] = "CREATE TABLE ibf_reg_antispam (
-  regid varchar(32) NOT NULL default '',
-  regcode varchar(8) NOT NULL default '',
-  ip_address varchar(32) default NULL,
-  ctime int(10) default NULL,
-  PRIMARY KEY  (regid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_search_results (
-  id varchar(32) NOT NULL default '',
-  topic_id text NOT NULL,
-  search_date int(12) NOT NULL default '0',
-  topic_max int(3) NOT NULL default '0',
-  sort_key varchar(32) NOT NULL default 'last_post',
-  sort_order varchar(4) NOT NULL default 'desc',
-  member_id mediumint(10) default '0',
-  ip_address varchar(64) default NULL,
-  post_id text,
-  post_max int(10) NOT NULL default '0',
-  query_cache text
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_sessions (
-  id varchar(32) NOT NULL default '0',
-  member_name varchar(64) default NULL,
-  member_id mediumint(8) NOT NULL default '0',
-  ip_address varchar(16) default NULL,
-  browser varchar(64) default NULL,
-  running_time int(10) default NULL,
-  login_type tinyint(1) default NULL,
-  location varchar(40) default NULL,
-  member_group smallint(3) default NULL,
-  in_forum smallint(5) NOT NULL default '0',
-  in_topic int(10) default NULL,
-  PRIMARY KEY  (id),
-  KEY in_topic (in_topic),
-  KEY in_forum (in_forum)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_skin_templates (
-  suid int(10) NOT NULL auto_increment,
-  set_id int(10) NOT NULL default '0',
-  group_name varchar(255) NOT NULL default '',
-  section_content mediumtext,
-  func_name varchar(255) default NULL,
-  func_data text,
-  updated int(10) default NULL,
-  can_remove tinyint(4) default '0',
-  PRIMARY KEY  (suid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_skins (
-  uid int(10) NOT NULL auto_increment,
-  sname varchar(100) NOT NULL default '',
-  sid int(10) NOT NULL default '0',
-  set_id int(5) NOT NULL default '0',
-  tmpl_id int(10) NOT NULL default '0',
-  macro_id int(10) NOT NULL default '1',
-  css_id int(10) NOT NULL default '1',
-  img_dir varchar(200) default '1',
-  tbl_width varchar(250) default NULL,
-  tbl_border varchar(250) default NULL,
-  hidden tinyint(1) NOT NULL default '0',
-  default_set tinyint(1) NOT NULL default '0',
-  css_method varchar(100) default 'inline',
-  PRIMARY KEY  (uid),
-  KEY tmpl_id (tmpl_id),
-  KEY css_id (css_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_spider_logs (
-  sid int(10) NOT NULL auto_increment,
-  bot varchar(255) NOT NULL default '',
-  query_string text NOT NULL,
-  entry_date int(10) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '',
-  PRIMARY KEY  (sid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_stats (
-  TOTAL_REPLIES int(10) NOT NULL default '0',
-  TOTAL_TOPICS int(10) NOT NULL default '0',
-  LAST_MEM_NAME varchar(32) default NULL,
-  LAST_MEM_ID mediumint(8) NOT NULL default '0',
-  MOST_DATE int(10) default NULL,
-  MOST_COUNT int(10) default '0',
-  MEM_COUNT mediumint(8) NOT NULL default '0'
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_subscriptions (
- sub_id smallint(5) NOT NULL auto_increment,
- sub_title varchar(250) NOT NULL default '',
- sub_desc text,
- sub_new_group mediumint(8) NOT NULL default 0,
- sub_length smallint(5) NOT NULL default '1',
- sub_unit varchar(2) NOT NULL default 'm',
- sub_cost decimal(10,2) NOT NULL default '0.00',
- sub_run_module varchar(250) NOT NULL default '',
- PRIMARY KEY (sub_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_subscription_extra (
- subextra_id smallint(5) NOT NULL auto_increment,
- subextra_sub_id smallint(5) NOT NULL default '0',
- subextra_method_id smallint(5) NOT NULL default '0',
- subextra_product_id varchar(250) NOT NULL default '0',
- subextra_can_upgrade tinyint(1) NOT NULL default '0',
- subextra_recurring tinyint(1) NOT NULL default '0',
- subextra_custom_1 text,
- subextra_custom_2 text,
- subextra_custom_3 text,
- subextra_custom_4 text,
- subextra_custom_5 text,
- PRIMARY KEY(subextra_id)
-) TYPE=MyISAM;";
-
-
-$SQL[] = "CREATE TABLE ibf_subscription_trans (
- subtrans_id int(10) NOT NULL auto_increment,
- subtrans_sub_id smallint(5) NOT NULL default '0',
- subtrans_member_id mediumint(8) NOT NULL default '0',
- subtrans_old_group smallint(5) NOT NULL default '0',
- subtrans_paid decimal(10,2) NOT NULL default '0.00',
- subtrans_cumulative decimal(10,2) NOT NULL default '0.00',
- subtrans_method varchar(20) NOT NULL default '',
- subtrans_start_date int(11) NOT NULL default '0',
- subtrans_end_date int(11) NOT NULL default '0',
- subtrans_state varchar(200) NOT NULL default '',
- subtrans_trxid varchar(200) NOT NULL default '',
- subtrans_subscrid varchar(200) NOT NULL default '',
- subtrans_currency varchar(10) NOT NULL default 'USD',
- PRIMARY KEY (subtrans_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_subscription_logs (
- sublog_id int(10) NOT NULL auto_increment,
- sublog_date int(10) NOT NULL default '',
- sublog_member_id mediumint(8) NOT NULL default '0',
- sublog_transid int(10) NOT NULL default '',
- sublog_ipaddress varchar(16) NOT NULL default '',
- sublog_data text,
- sublog_postdata text,
- PRIMARY KEY (sublog_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_subscription_methods (
- submethod_id smallint(5) NOT NULL auto_increment,
- submethod_title varchar(250) NOT NULL default '',
- submethod_name varchar(20) NOT NULL default '',
- submethod_email varchar(250) NOT NULL default '',
- submethod_sid text,
- submethod_custom_1 text,
- submethod_custom_2 text,
- submethod_custom_3 text,
- submethod_custom_4 text,
- submethod_custom_5 text,
- submethod_is_cc tinyint(1) NOT NULL default '0',
- submethod_is_auto tinyint(1) NOT NULL default '0',
- submethod_desc text,
- submethod_logo text,
- submethod_active tinyint(1) NOT NULL default '',
- submethod_use_currency varchar(10) NOT NULL default 'USD',
- PRIMARY KEY (submethod_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_subscription_currency (
- subcurrency_code varchar(10) NOT NULL,
- subcurrency_desc varchar(250) NOT NULL default '',
- subcurrency_exchange decimal(10, 8) NOT NULL,
- subcurrency_default tinyint(1) NOT NULL default '0',
- PRIMARY KEY(subcurrency_code)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_templates (
-  tmid int(10) NOT NULL auto_increment,
-  template mediumtext,
-  name varchar(128) default NULL,
-  PRIMARY KEY  (tmid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_titles (
-  id smallint(5) NOT NULL auto_increment,
-  posts int(10) default NULL,
-  title varchar(128) default NULL,
-  pips varchar(128) default NULL,
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_tmpl_names (
-  skid int(10) NOT NULL auto_increment,
-  skname varchar(60) NOT NULL default 'Invision Board',
-  author varchar(250) default '',
-  email varchar(250) default '',
-  url varchar(250) default '',
-  PRIMARY KEY  (skid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_topic_mmod (
-  mm_id smallint(5) NOT NULL auto_increment,
-  mm_title varchar(250) NOT NULL default '',
-  mm_enabled tinyint(1) NOT NULL default '0',
-  topic_state varchar(10) NOT NULL default 'leave',
-  topic_pin varchar(10) NOT NULL default 'leave',
-  topic_move smallint(5) NOT NULL default '0',
-  topic_move_link tinyint(1) NOT NULL default '0',
-  topic_title_st varchar(250) NOT NULL default '',
-  topic_title_end varchar(250) NOT NULL default '',
-  topic_reply tinyint(1) NOT NULL default '0',
-  topic_reply_content text NOT NULL,
-  topic_reply_postcount tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (mm_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_topics (
-  tid int(10) NOT NULL auto_increment,
-  title varchar(250) NOT NULL default '',
-  description varchar(70) default NULL,
-  state varchar(8) default NULL,
-  posts int(10) default NULL,
-  starter_id mediumint(8) NOT NULL default '0',
-  start_date int(10) default NULL,
-  last_poster_id mediumint(8) NOT NULL default '0',
-  last_post int(10) default NULL,
-  icon_id tinyint(2) default NULL,
-  starter_name varchar(32) default NULL,
-  last_poster_name varchar(32) default NULL,
-  poll_state varchar(8) default NULL,
-  last_vote int(10) default NULL,
-  views int(10) default NULL,
-  forum_id smallint(5) NOT NULL default '0',
-  approved tinyint(1) default NULL,
-  author_mode tinyint(1) default NULL,
-  pinned tinyint(1) default NULL,
-  moved_to varchar(64) default NULL,
-  rating text,
-  total_votes int(5) NOT NULL default '0',
-  PRIMARY KEY  (tid),
-  KEY last_post (last_post),
-  KEY forum_id (forum_id,approved,pinned),FULLTEXT KEY title (title)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_tracker (
-  trid mediumint(8) NOT NULL auto_increment,
-  member_id mediumint(8) NOT NULL default '0',
-  topic_id bigint(20) NOT NULL default '0',
-  start_date int(10) default NULL,
-  last_sent int(10) NOT NULL default '0',
-  PRIMARY KEY  (trid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_validating (
-  vid varchar(32) NOT NULL default '',
-  member_id mediumint(8) NOT NULL default '0',
-  real_group smallint(3) NOT NULL default '0',
-  temp_group smallint(3) NOT NULL default '0',
-  entry_date int(10) NOT NULL default '0',
-  coppa_user tinyint(1) NOT NULL default '0',
-  lost_pass tinyint(1) NOT NULL default '0',
-  new_reg tinyint(1) NOT NULL default '0',
-  email_chg tinyint(1) NOT NULL default '0',
-  ip_address varchar(16) NOT NULL default '0',
-  PRIMARY KEY  (vid),
-  KEY new_reg (new_reg)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_voters (
-  vid int(10) NOT NULL auto_increment,
-  ip_address varchar(16) NOT NULL default '',
-  vote_date int(10) NOT NULL default '0',
-  tid int(10) NOT NULL default '0',
-  member_id varchar(32) default NULL,
-  forum_id smallint(5) NOT NULL default '0',
-  PRIMARY KEY  (vid)
-) TYPE=MyISAM;";
-
-$SQL[] = "CREATE TABLE ibf_warn_logs (
-  wlog_id int(10) NOT NULL auto_increment,
-  wlog_mid mediumint(8) NOT NULL default '0',
-  wlog_notes text NOT NULL,
-  wlog_contact varchar(250) NOT NULL default 'none',
-  wlog_contact_content text NOT NULL,
-  wlog_date int(10) NOT NULL default '0',
-  wlog_type varchar(6) NOT NULL default 'pos',
-  wlog_addedby mediumint(8) NOT NULL default '0',
-  PRIMARY KEY  (wlog_id)
-) TYPE=MyISAM;";
-
-$SQL[] = "INSERT INTO ibf_categories (id, position, state, name, description, image, url) VALUES (-1, NULL, NULL, '-', NULL, NULL, NULL)";
-$SQL[] = "INSERT INTO ibf_categories (id, position, state, name, description, image, url) VALUES (1, 1, '1', 'A Test Category', '', '', '')";
-
-$SQL[] = "INSERT INTO ibf_css (cssid, css_name, css_text, css_comments, updated) VALUES (1, 'IPB Default CSS', '".get_main_css()."', NULL, ".time()." )";
-
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (1, ':mellow:', 'mellow.gif', 0)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (2, ':huh:', 'huh.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (3, '^_^', 'happy.gif', 0)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (4, ':o', 'ohmy.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (5, ';)', 'wink.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (6, ':P', 'tongue.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (7, ':D', 'biggrin.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (8, ':lol:', 'laugh.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (9, 'B)', 'cool.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (10, ':rolleyes:', 'rolleyes.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (11, '-_-', 'sleep.gif', 0)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (12, '&lt;_&lt;', 'dry.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (13, ':)', 'smile.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (14, ':wub:', 'wub.gif', 0)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (15, ':angry:', 'mad.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (16, ':(', 'sad.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (17, ':unsure:', 'unsure.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (18, ':wacko:', 'wacko.gif', 0)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (19, ':blink:', 'blink.gif', 1)";
-$SQL[] = "INSERT INTO ibf_emoticons (id, typed, image, clickable) VALUES (20, ':ph34r:', 'ph34r.gif', 1)";
-
-$SQL[] = "INSERT INTO ibf_faq VALUES (1, 'Registration benefits', 'To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br>\r<br>During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br>\r<br>In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br>\r<br>Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br>\r<br>For more information on these items, please see the relevant sections in this documentation.', 'How to register and the added benefits of being a registered member.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (3, 'Recovering lost or forgotten passwords', 'Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br>This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br>\r<br>To do this, click on the <a href=\'index.php?act=Reg&CODE=10\'>Lost Password link</a> found on the log in page.\r<br>\r<br>Further instruction is available from there.', 'How to reset your password if you\'ve forgotten it.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (4, 'Your Control Panel (My Controls)', 'Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br>\r<br><b>Subscriptions</b>\r<br>\r<br>This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br>\r<br><b>Edit Profile Info</b>\r<br>\r<br>This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br>\r<br><b>Edit Signature</b>\r<br>\r<br>A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br>\r<br><b>Edit Avatar Settings</b>\r<br>\r<br>An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br>\r<br><b>Change Personal Photo</b>\r<br>\r<br>This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br>\r<br><b>Email Settings</b>\r<br>\r<br><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br>\r<br><b>Board Settings</b>\r<br>\r<br>From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br>You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br>You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br>\r<br><b>Skins and Languages</b>\r<br>\r<br>If available, you can choose a skin style and language choice. This affects how the board is displayed so you may wish to preview the skin before submitting the form.\r<br>\r<br><b>Change Email Address</b>\r<br>\r<br>At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br>\r<br><b>Change Password</b>\r<br>\r<br>You may change your password from this section. Please note that you will need to know your current password before you can change your password.', 'Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (5, 'Email Notification of new messages', 'This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br>\r<br>There are three ways to subscribe to a topic:\r<br>\r<br><li>Click the \'Track This Topic\' link at the top of the topic that you wish to track\r<br><li> On the posting screen when replying to or creating a topic, check the \'Enable email notification of replies?\' checkbox\r<br><li> From the E-Mail settings section of your User CP (My Controls) check the \'Enable Email Notification by default?\' option, this will automatically subscribe you to any topic that you make a reply to\r<br>\r<br>Please note that to avoid multiple emails being sent to your email address, you will only get one e-mail for each topic you are subscribed to until the next time you visit the board.\r<br>\r<br>You are also able to subscribe to each individual forum on the board, to be notified when a new topic is created in that particular forum. To enable this, click the \'Subscribe to this forum\' link at the bottom of the forum that you wish to subscribe to.\r<br>\r<br>To unsubscribe from any forums or topics that you are subscribed to - just go to the \'Subscriptions\' section of \'My Controls\' and you can do this from there.', 'How to get emailed when a new reply is added to a topic.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (6, 'Your Personal Messenger', 'Your personal messenger acts much like an email account in that you can send and receive messages and store messages in folders.\r<br>\r<br><b>Send a new PM</b>\r<br>\r<br>This will allow you to send a message to another member. If you have names in your contact list, you can choose a name from it - or you may choose to enter a name in the relevant form field. This will be automatically filled in if you clicked a \'PM\' button on the board (from the member list or a post). If allowed, you may also be able to enter in multiple names in the box provided, will need to add one username per line.\r<br>If the administrator allows, you may use BB Code and HTML in your private message. If you choose to check the \'Add a copy of this message to you sent items folder\' box, a copy of the message will be saved for you for later reference. If you tick the \'Track this message?\' box, then the details of the message will be available in your \'Message Tracker\' where you will be able to see if/when it has been read.\r<br>\r<br><b>Go to Inbox</b>\r<br>\r<br>Your inbox is where all new messages are sent to. Clicking on the message title will show you the message in a similar format to the board topic view. You can also delete or move messages from your inbox.\r<br>\r<br><b>Empty PM Folders</b>\r<br>\r<br>This option provides you with a quick and easy way to clear out all of your PM folders.\r<br>\r<br><b>Edit Storage Folders</b>\r<br>\r<br>You may rename, add or remove folders to store messages is, allowing you to organise your messages to your preference. You cannot remove \'Sent Items\' or \'Inbox\'.\r<br>\r<br><b>PM Buddies/Block List</b>\r<br>\r<br>You may add in users names in this section, or edit any saved entries. You can also use this as a ban list, denying the named member the ability to message you.\r<br>Names entered in this section will appear in the drop down list when sending a new PM, allowing you to quickly choose the members name when sending a message.\r<br>\r<br><b>Archive Messages</b>\r<br>\r<br>If your messenger folders are full and you are unable to receive new messages, you can archive them off. This compiles the messages into a single HTML page or Microsoft © Excel Format. This page is then emailed to your registered email address for your convenience.\r<br>\r<br><b>Saved (Unsent) PMs</b>\r<br>\r<br>This area will allow you to go back to any PM\'s that you have chosen to save to be sent later.\r<br>\r<br><b>Message Tracker</B>\r<br>\r<br>This is the page that any messages that you have chosen to track will appear. Details of if and when they have been read by the recipient will appear here. This also gives you the chance to delete any messages that you have sent and not yet been read by the intended recipient.', 'How to send personal messages, track them, edit your messenger folders and archive stored messages.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (7, 'Contacting the moderating team & reporting posts', '<b>Contacting the moderating team</b>\r<br>\r<br>If you need to contact a moderator or simply wish to view the complete administration team, you can click the link \'The moderating team\' found at the bottom of the main board page (the first page you see when visiting the board), or from \'My Assistant\'.\r<br>\r<br>This list will show you administrators (those who have administration control panel access), global moderators (those who can moderate in all forums) and the moderators of the individual forums.\r<br>\r<br>If you wish to contact someone about your member account, then contact an administrator - if you wish to contact someone about a post or topic, contact either a global moderator or the forum moderator.\r<br>\r<br><b>Reporting a post</b>\r<br>\r<br>If the administrator has enabled this function on the board, you\'ll see a \'Report\' button in a post, next to the \'Quote\' button. This function will let you report the post to the forum moderator (or the administrator(s), if there isn\'t a specific moderator available). You can use this function when you think the moderator(s) should be aware of the existance of that post. However, <b>do not use this to chat with the moderator(s)!</b>. You can use the email function or the Personal Messenger function for that.', 'Where to find a list of the board moderators and administrators.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (8, 'Viewing members profile information', 'You can view a members profile at any time by clicking on their name when it is underlined (as a link) or by clicking on their name in a post within a topic.\r<br>\r<br>This will show you their profile page which contains their contact information (if they have entered some) and their \'active stats\'.\r<br>\r<br>You can also click on the \'Mini Profile\' button underneath their posts, this will show up a mini \'e-card\' with their contact information and a photograph if they have chosen to have one.', 'How to view members contact information.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (9, 'Viewing active topics and new posts', 'You can view which new topics have new replies today by clicking on the \'Today\'s Active Topics\' link found at the bottom of the main board page (the first page you see when visiting the board). You can set your own date criteria, choosing to view all topics  with new replies during several date choices.\r<br>\r<br>The \'View New Posts\' link in the member bar at the top of each page, will allow you to view all of the topics which have new replies in since your last visit to the board.', 'How to view all the topics which have a new reply today and the new posts made since your last visit.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (10, 'Searching Topics and Posts', 'The search feature is designed to allow you to quickly find topics and posts that contain the keywords you enter.\r<br>\r<br>There are two types of search form available, simple search and advanced search. You may switch between the two using the \'More Options\' and \'Simple Mode\' buttons.\r<br>\r<br><b>Simple Mode</b>\r<br>\r<br>All you need to do here is enter in a keyword into the search box, and select a forum(s) to search in. (to select multiple forums, hold down the control key on a PC, or the Shift/Apple key on a Mac) choose a sorting order and search.\r<br>\r<br><b>Advanced Mode</b>\r<br>\r<br>The advanced search screen, will give you a much greater range of options to choose from to refine your search. In addition to searching by keyword, you are able to search by a members username or a combination of both. You can also choose to refine your search by selecting a date range, and there are a number of sorting options available. There are also two ways of displaying the search results, can either show the post text in full or just show a link to the topic, can choose this using the radio buttons available.\r<br>\r<br>If the administrator has enabled it, you may have a minimum amount of time to wait between searches, this is known as search flood control.\r<br>\r<br>There are also search boxes available at the bottom of each forum, to allow you to carry out a quick search of all of the topics within that particular forum.', 'How to use the search feature.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (11, 'Logging in and out', 'If you have chosen not to remember your log in details in cookies, or you are accessing the board on another computer, you will need to log into the board to access your member profile and post with your registered name.\r<br>\r<br>When you log in, you have the choice to save cookies that will log you in automatically when you return. Do not use this option on a shared computer for security.\r<br>\r<br>You can also choose to hide - this will keep your name from appearing in the active users list.\r<br>\r<br>Logging out is simply a matter of clicking on the \'Log Out\' link that is displayed when you are logged in. If you find that you are not logged out, you may need to manually remove your cookies. See the \'Cookies\' help file for more information.', 'How to log in and out from the board and how to remain anonymous and not be shown on the active users list.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (13, 'My Assistant', 'This feature is sometimes referred to as a \'Browser Buddy\'. \r<br>\r<br>At the top it tells you how many posts have been made since you last visited the board.. Also underneath this the number of posts with replies that have been made in topics that the individual has also posted in.\r<br>Click on the \'View\' link on either of the two sentences to see the posts.\r<br>\r<br>The next section is five links to useful features:\r<br>\r<br><li>The link to the moderating team is basically a quick link to see all those that either administrate or moderate certain forums on the message board.\r<br><li> The link to \'Today\'s Active Topics\' shows you all the topics that have been created in the last 24 hours on the board.\r<br><li>Today\'s Top 10 Posters link shows you exactly as the name suggests. It shows you the amount of posts by the members and also their total percentage of the total posts made that day.\r<br><li>The overall Top 10 Posters link shows you the top 10 posters for the whole time that the board has been installed.\r<br><li>My last 10 posts links to the latest topics that you have made on the board. These are shortened on the page, to save space, and are linked to if you require to read more of them.\r<br>\r<br>The two search features allow you to search the whole board for certain words in a whole topic. It isn\'t as featured as the normal search option so it is not as comprehensive.\r<br>\r<br>The Help Search is just as comprehensive as the normal help section\'s search function and allows for quick searching of all the help topics on the board.', 'A comprehensive guide to use this handy little feature.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (12, 'Posting', 'There are three different posting screens available. The new topic button, visible in forums and in topics allows you to add a new topic to that particular forum. The new poll button (if the admin has enabled it) will also be viewable in topics and forums allowing you to create a new poll in the forum. When viewing a topic, there will be an add reply button, allowing you to add a new reply onto that particular topic. \r\n<br>\r\n<br><b>Posting new topics and replying</b>\r\n<br>\r\n<br>When making a post, you will most likely have the option to use IBF code when posting. This will allow you to add various types of formatting to your messages. For more information on this, click the \'BB Code Help\' link under the emoticon box to launch the help window.\r\n<br>\r\n<br>On the left of the text entry box, there is the clickable emoticons box - you can click on these to add them to the content of your message (these are sometimes known as \'smilies\').\r\n<br>\r\n<br>There are three options available when making a post or a reply. \'Enable emoticons?\' if this is unchecked, then any text that would normally be converted into an emoticon will not be. \'Enable signature?\' allows you to choose whether or not you would like your signature to appear on that individual post. \'Enable email notification of replies?\' ticking this box will mean that you will receive e-mail updates to the topic, see the \'Email Notification of new messages\' help topic for more information on this.\r\n<br>\r\n<br>You also have the option to choose a post icon for the topic/post when creating one. This icon will appear next to the topic name on the topic listing in that forum, or will appear next to the date/time of the message if making a reply to a topic.\r\n<br>\r\n<br>If the admin has enabled it, you will also see a file attachments option, this will allow you to attach a file to be uploaded when making a post. Click the browse button to select a file from your computer to be uploaded. If you upload an image file, it may be shown in the content of the post, all other file types will be linked to.\r\n<br>\r\n<br><b>Poll Options</b>\r\n<br>\r\n<br>If you have chosen to post a new poll, there will be an extra two option boxes at the top of the help screen. The first input box will allow you to enter the question that you are asking in the poll. The text field underneath is where you will input the choices for the poll. Simply enter a different option on each line. The maximum number of choices is set by the board admin, and this figure is displayed on the left.\r\n<br>\r\n<br><b>Quoting Posts</b>\r\n<br>\r\n<br>Displayed above each post in a topic, there is a \'Quote\' button. Pressing this button will allow you to reply to a topic, and have the text from a particular reply quoted in your own reply. When you choose to do this, an extra text field will appear below the main text input box to allow you to edit the content of the post being quoted.\r\n<br>\r\n<br><b>Editing Posts</b>\r\n<br>\r\n<br>Above any posts that you have made, you may see an \'Edit\' button. Pressing this will allow you to edit the post that you had previously made. \r\n<br>\r\n<br>When editing you may see an option to \'Add the \'Edit by\' line in this post?\'. If you tick this then it will show up in the posts that it has been edited and the time at which it was edited. If this option does not appear, then the edit by line will always be added to the post.\r\n<br>\r\n<br>If you are unable to see the edit button displayed on each post that you have made, then the administrator may have prevented you from editing posts, or the time limit for editing may have expired.\r\n<br>\r\n<br><b>Fast Reply</b>\r\n<br>\r\n<br>Where it has been enabled, there will be a fast reply button on each topic. Clicking this will open up a posting box on the topic view screen, cutting down on the time required to load the main posting screen. Click the fast reply button to expand the reply box and type the post inside of there. Although the fast reply box is not expanded by default, you can choose the option to have it expanded by default, from the board settings section of your control panel. Pressing the \'More Options\' button will take you to the normal posting screen.', 'A guide to the features avaliable when posting on the boards.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (14, 'Member List', 'The member list, accessed via the \'Members\' link at the top of each page, is basically a listing of all of the members that have registered on the board. \r\n<br>\r\n<br>If you are looking to search for a particular member by all/part of their username, then in the drop down box at the bottom of the page, change the selection from \'Search All Available\' to \'Name Begins With\' or \'Name Contains\' and input all/part of their name in the text input field and press the \'Go!\' button. \r\n<br>\r\n<br>Also, at the bottom of the member list page, there are a number of sorting options available to alter the way in which the list is displayed. \r\n<br>\r\n<br>If a member has chosen to add a photo to their profile information, then a camera icon will appear next to their name, and you may click this to view the photo.', 'Explaining the different ways to sort and search through the list of members.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (15, 'Topic Options', 'At the bottom of each topic, there is a \'Topic Options\' button. Pressing this button will expand the topic options box. \r\n<br>\r\n<br>From this box, you can select from the following options: \r\n<br>\r\n<br><li>Track this topic - this option will allow you to receive e-mail updates for the topic, see the \'Email Notification of new messages\' help file for more information on this \r\n<br><li>Subscribe to this forum - will allow you to receive e-mail updates for any new topics posted in the forum, see the Notification of new messages\' help file for more information on this \r\n<br><li>Download / Print this Topic - will show the topic in a number of different formats. \'Printer Friendly Version\' will display a version of the topic that is suitable for printing out. \'Download HTML Version\' will download a copy of the topic to your hard drive, and this can then be viewed in a web browser, without having to visit the board. \'Download Microsoft Word Version\' will allow you to download the file to your hard drive and open it up in the popular word processing application, Microsoft Word, for viewing offline.', 'A guide to the options avaliable when viewing a topic.');";
-$SQL[] = "INSERT INTO ibf_faq VALUES (16, 'Calendar', 'This board features it\'s very own calendar feature, which can be accessed via the calendar link at the top of the board.\r\n<br>\r\n<br>You are able to add your own personal events to the calendar - and these are only viewable by yourself. To add a new event, use the \'Add New Event\' button to be taken to the event posting screen. There are three types of events that you can now add:\r\n<br>\r\n<br><li>A single day/one off event can be added using the first option, by just selecting the date for it to appear on.\r\n<br><li>Ranged Event - is an event that spans across multiple days, to do this in addition to selecting the start date as above, will need to add the end date for the event. There are also options available  to highlight the message on the calendar, useful if there is more than one ranged event being displayed at any one time.\r\n<br><li>Recurring Event - is a one day event, that you can set to appear at set intervals on the calendar, either weekly, monthly or yearly.\r\n<br>\r\n<br>If the admistrator allows you, you may also be able to add a public event, that will not just be shown to yourself, but will be viewable by everyone.\r\n<br>\r\n<br>Also, if the admistrator has chosen,  there will be a link to all the birthdays happening on a particular day displayed on the calendar, and your birthday will appear if you have chosen to enter a date of birth in the Profile Info section of your control panel.', 'More information on the boards calendar feature.');";
-
-$SQL[] = "INSERT INTO ibf_forums (id, topics, posts, last_post, last_poster_id, last_poster_name, name, description, position, use_ibc, use_html, status, start_perms, reply_perms, read_perms, password, category, last_title, last_id, sort_key, sort_order, prune, show_rules, upload_perms, preview_posts, allow_poll, allow_pollbump, inc_postcount, skin_id, parent_id, subwrap, sub_can_post) VALUES (1, 1, 1, <%time%>, 1, 'Invision Power Board Team', 'A Test Forum', 'A test forum that may be removed at any time', 1, 1, 0, '1', '*', '*', '*', '', 1, 'Welcome', 1, 'last_post', 'Z-A', 30, 0, '', 0, 0, 1, 1, NULL, -1, 0, 1)";
-
-$SQL[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_post_closed, g_perm_id) VALUES (4, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 'Admin', 0, 1, 1, 1, 1, '', 50000, 1, 1, '', '', 50, 6, 0, 5, '-1&-1', 0, 1, 4)";
-$SQL[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_perm_id) VALUES (2, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 'Guests', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 0, 2)";
-$SQL[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_perm_id) VALUES (3, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 'Members', 0, 1, 0, 0, 0, '', 0, 1, 0, '', '', 50, 0, 20, 0, '-1&-1', 0, 3)";
-$SQL[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_perm_id) VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Validating', 0, 1, 0, 0, 0, NULL, 0, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 0, 1)";
-$SQL[] = "INSERT INTO ibf_groups (g_id, g_view_board, g_mem_info, g_other_topics, g_use_search, g_email_friend, g_invite_friend, g_edit_profile, g_post_new_topics, g_reply_own_topics, g_reply_other_topics, g_edit_posts, g_delete_own_posts, g_open_close_posts, g_delete_own_topics, g_post_polls, g_vote_polls, g_use_pm, g_is_supmod, g_access_cp, g_title, g_can_remove, g_append_edit, g_access_offline, g_avoid_q, g_avoid_flood, g_icon, g_attach_max, g_avatar_upload, g_calendar_post, prefix, suffix, g_max_messages, g_max_mass_pm, g_search_flood, g_edit_cutoff, g_promotion, g_hide_from_list, g_perm_id) VALUES (5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Banned', 0, 0, 0, 0, 0, NULL, NULL, 0, 0, NULL, NULL, 50, 0, 20, 0, '-1&-1', 1, 5)";
-
-$SQL[] = "INSERT INTO ibf_forum_perms SET perm_name='Validating Forum Mask', perm_id=1";
-$SQL[] = "INSERT INTO ibf_forum_perms SET perm_name='Member Forum Mask', perm_id=3";
-$SQL[] = "INSERT INTO ibf_forum_perms SET perm_name='Guest Forum Mask', perm_id=2";
-$SQL[] = "INSERT INTO ibf_forum_perms SET perm_name='Admin Forum Mask', perm_id=4";
-$SQL[] = "INSERT INTO ibf_forum_perms SET perm_name='Banned Forum Mask', perm_id=5";
-
-
-$SQL[] = "INSERT INTO ibf_languages (lid, ldir, lname, lauthor, lemail) VALUES (1, 'en', 'English', 'Invision Power Board', 'languages@invisionboard.com')";
-
-$SQL[] = "INSERT INTO ibf_macro VALUES (1, 'A_LOCKED_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'Closed Topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (2, 'A_MOVED_B', '<img src=\'style_images/<#IMG_DIR#>/t_moved.gif\' border=\'0\'  alt=\'Moved Topic\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (3, 'A_POLLONLY_B', '<img src=\'style_images/<#IMG_DIR#>/t_closed.gif\' border=\'0\'  alt=\'Poll Only\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (4, 'A_POST', '<img src=\'style_images/<#IMG_DIR#>/t_new.gif\' border=\'0\'  alt=\'Start new topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (5, 'A_REPLY', '<img src=\'style_images/<#IMG_DIR#>/t_reply.gif\' border=\'0\'  alt=\'Reply to this topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (6, 'A_POLL', '<img src=\'style_images/<#IMG_DIR#>/t_poll.gif\' border=\'0\'  alt=\'Start Poll\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (7, 'A_STAR', '<img src=\'style_images/<#IMG_DIR#>/pip.gif\' border=\'0\'  alt=\'*\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (8, 'B_HOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot.gif\' border=\'0\'  alt=\'Hot topic\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (9, 'B_HOT_NN', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no.gif\' border=\'0\'  alt=\'No new\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (10, 'B_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/f_closed.gif\' border=\'0\'  alt=\'Closed\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (11, 'B_MOVED', '<img src=\'style_images/<#IMG_DIR#>/f_moved.gif\' border=\'0\'  alt=\'Moved\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (12, 'B_NEW', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (13, 'B_NORM', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (14, 'B_PIN', '<img src=\'style_images/<#IMG_DIR#>/f_pinned.gif\' border=\'0\'  alt=\'Pinned\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (15, 'B_POLL', '<img src=\'style_images/<#IMG_DIR#>/f_poll.gif\' border=\'0\'  alt=\'Poll\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (16, 'B_POLL_NN', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no.gif\' border=\'0\'  alt=\'No new votes\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (17, 'B_HOT_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_dot.gif\' border=\'0\' alt=\'New Posts\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (18, 'B_NEW_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_dot.gif\' border=\'0\' alt=\'No New Posts\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (19, 'B_HOT_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_hot_no_dot.gif\' border=\'0\' alt=\'No New Posts*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (20, 'B_NORM_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no_dot.gif\' border=\'0\' alt=\'No New Posts*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (21, 'B_POLL_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_dot.gif\' border=\'0\' alt=\'Poll*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (22, 'B_POLL_NN_DOT', '<img src=\'style_images/<#IMG_DIR#>/f_poll_no_dot.gif\' border=\'0\' alt=\'No New Votes*\'>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (23, 'C_LOCKED', '<img src=\'style_images/<#IMG_DIR#>/bf_readonly.gif\' border=\'0\'  alt=\'Read Only Forum\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (24, 'C_OFF', '<img src=\'style_images/<#IMG_DIR#>/bf_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (25, 'C_OFF_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (26, 'C_OFF_RES', '<img src=\'style_images/<#IMG_DIR#>/br_nonew.gif\' border=\'0\'  alt=\'No New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (27, 'C_ON', '<img src=\'style_images/<#IMG_DIR#>/bf_new.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (28, 'C_ON_CAT', '<img src=\'style_images/<#IMG_DIR#>/bc_new.gif\' border=\'0\'  alt=\'New Posts\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (29, 'C_ON_RES', '<img src=\'style_images/<#IMG_DIR#>/br_new.gif\' border=\'0\'  alt=\'New Posts\'  />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (30, 'F_ACTIVE', '<img src=\'style_images/<#IMG_DIR#>/user.gif\' border=\'0\'  alt=\'Active Users\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (31, 'F_NAV_SEP', '&nbsp;-&gt;&nbsp;', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (32, 'F_NAV', '<img src=\'style_images/<#IMG_DIR#>/nav.gif\' border=\'0\'  alt=\'&gt;\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (33, 'F_STATS', '<img src=\'style_images/<#IMG_DIR#>/stats.gif\' border=\'0\'  alt=\'Board Stats\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (34, 'NO_PHOTO', '<img src=\'style_images/<#IMG_DIR#>/nophoto.gif\' border=\'0\'  alt=\'No Photo\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (35, 'CAMERA', '<img src=\'style_images/<#IMG_DIR#>/camera.gif\' border=\'0\'  alt=\'Photo\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (36, 'M_READ', '<img src=\'style_images/<#IMG_DIR#>/f_norm_no.gif\' border=\'0\'  alt=\'Read Msg\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (37, 'M_UNREAD', '<img src=\'style_images/<#IMG_DIR#>/f_norm.gif\' border=\'0\'  alt=\'Unread Msg\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (38, 'P_AOL', '<img src=\'style_images/<#IMG_DIR#>/p_aim.gif\' border=\'0\'  alt=\'AOL\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (39, 'P_DELETE', '<img src=\'style_images/<#IMG_DIR#>/p_delete.gif\' border=\'0\'  alt=\'Delete Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (40, 'P_EDIT', '<img src=\'style_images/<#IMG_DIR#>/p_edit.gif\' border=\'0\'  alt=\'Edit Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (41, 'P_EMAIL', '<img src=\'style_images/<#IMG_DIR#>/p_email.gif\' border=\'0\'  alt=\'Email Poster\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (42, 'P_ICQ', '<img src=\'style_images/<#IMG_DIR#>/p_icq.gif\' border=\'0\'  alt=\'ICQ\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (43, 'P_MSG', '<img src=\'style_images/<#IMG_DIR#>/p_pm.gif\' border=\'0\'  alt=\'PM\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (44, 'P_QUOTE', '<img src=\'style_images/<#IMG_DIR#>/p_quote.gif\' border=\'0\'  alt=\'Quote Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (45, 'P_WEBSITE', '<img src=\'style_images/<#IMG_DIR#>/p_www.gif\' border=\'0\'  alt=\'Users Website\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (46, 'P_YIM', '<img src=\'style_images/<#IMG_DIR#>/p_yim.gif\' border=\'0\' alt=\'Yahoo\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (47, 'P_REPORT', '<img src=\'style_images/<#IMG_DIR#>/p_report.gif\' border=\'0\'  alt=\'Report Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (48, 'P_MSN', '<img src=\'style_images/<#IMG_DIR#>/p_msn.gif\' border=\'0\' alt=\'MSN\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (49, 'CAT_IMG', '<img src=\'style_images/<#IMG_DIR#>/nav_m.gif\' border=\'0\'  alt=\'&gt;\' width=\'8\' height=\'8\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (50, 'NEW_POST', '<img src=\'style_images/<#IMG_DIR#>/newpost.gif\' border=\'0\'  alt=\'Goto last unread\' title=\'Goto last unread\' hspace=2>', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (51, 'LAST_POST', '<img src=\'style_images/<#IMG_DIR#>/lastpost.gif\' border=\'0\'  alt=\'Last Post\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (52, 'BR_REDIRECT', '<img src=\'style_images/<#IMG_DIR#>/br_redirect.gif\' border=\'0\'  alt=\'Redirect\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (53, 'INTEGRITY_MSGR', '<img src=\'style_images/<#IMG_DIR#>/p_im.gif\' border=\'0\'  alt=\'Integrity Messenger IM\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (54, 'ADDRESS_CARD', '<img src=\'style_images/<#IMG_DIR#>/addresscard.gif\' border=\'0\'  alt=\'Mini Profile\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (55, 'T_QREPLY', '<img src=\'style_images/<#IMG_DIR#>/t_qr.gif\' border=\'0\'  alt=\'Fast Reply\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (56, 'T_OPTS', '<img src=\'style_images/<#IMG_DIR#>/t_options.gif\' border=\'0\'  alt=\'Topic Options\' />', 1, 1);";
-$SQL[] = "INSERT INTO ibf_macro VALUES (57, 'CAL_NEWEVENT', '<img src=\'style_images/<#IMG_DIR#>/cal_newevent.gif\' border=\'0\'  alt=\'Add New Event\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (58, 'F_RULES', '<img src=\'style_images/<#IMG_DIR#>/forum_rules.gif\' border=\'0\'  alt=\'Forum Rules\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (59, 'WARN_0', '<img src=\'style_images/<#IMG_DIR#>/warn0.gif\' border=\'0\'  alt=\'-----\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (60, 'WARN_1', '<img src=\'style_images/<#IMG_DIR#>/warn1.gif\' border=\'0\'  alt=\'X----\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (61, 'WARN_2', '<img src=\'style_images/<#IMG_DIR#>/warn2.gif\' border=\'0\'  alt=\'XX---\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (62, 'WARN_3', '<img src=\'style_images/<#IMG_DIR#>/warn3.gif\' border=\'0\'  alt=\'XXX--\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (63, 'WARN_4', '<img src=\'style_images/<#IMG_DIR#>/warn4.gif\' border=\'0\'  alt=\'XXXX-\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (64, 'WARN_5', '<img src=\'style_images/<#IMG_DIR#>/warn5.gif\' border=\'0\'  alt=\'XXXXX\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (65, 'WARN_ADD', '<img src=\'style_images/<#IMG_DIR#>/warn_add.gif\' border=\'0\'  alt=\'+\' />', 1, 1)";
-$SQL[] = "INSERT INTO ibf_macro VALUES (66, 'WARN_MINUS', '<img src=\'style_images/<#IMG_DIR#>/warn_minus.gif\' border=\'0\'  alt=\'-\' />', 1, 1)";
-
-
-$SQL[] = "INSERT INTO ibf_macro_name (set_id, set_name) VALUES (1, 'IPB Default Macro Set')";
-
-$SQL[] = "INSERT INTO ibf_members VALUES (0, 'Guest', 2, '', 'test@localhost.com', 0, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, '0', 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', 1052787402, 1052787402, 0, '-1&-1', 0, '0', 0, '0', 0, '', '','0');";
-
-$SQL[] = "INSERT INTO ibf_posts (append_edit, edit_time, pid, author_id, author_name, use_sig, use_emo, ip_address, post_date, icon_id, post, queued, topic_id, forum_id, attach_id, attach_hits, attach_type, attach_file, post_title, new_topic, edit_name) VALUES (0, NULL, 1, 1, 'Invision Power Board Team', '0', '1', '127.0.0.1', <%time%>, 0, 'Welcome to your new Invision Power Board!<br>This is simply a test message confirming that the installation was successful.<br>You can remove this message, topic, forum or even category at any time.', 0, 1, 1, '', 0, '', '', NULL, 1, NULL)";
-
-
-$SQL[] = "INSERT INTO ibf_skins (uid, sname, sid, set_id, tmpl_id, macro_id, css_id, img_dir, tbl_width, tbl_border, hidden, default_set) VALUES (1, 'Invision Power Board', 0, 1, 1, 1, 1, '1', '95%', '#999999', 0, 1)";
-
-$SQL[] = "INSERT INTO ibf_stats (TOTAL_REPLIES, TOTAL_TOPICS, LAST_MEM_NAME, LAST_MEM_ID, MOST_DATE, MOST_COUNT, MEM_COUNT) VALUES (0, 1, '', '1', <%time%>, 1, 1)";
-
-$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='USD', subcurrency_desc='United States Dollars', subcurrency_exchange='1.00', subcurrency_default=1;";
-$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='GBP', subcurrency_desc='United Kingdom Pounds', subcurrency_exchange=' 0.630776', subcurrency_default=0;";
-$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='CAD', subcurrency_desc='Canada Dollars', subcurrency_exchange='1.37080', subcurrency_default=0;";
-$SQL[] = "insert into ibf_subscription_currency SET subcurrency_code='EUR', subcurrency_desc='Euro', subcurrency_exchange='0.901517', subcurrency_default=0;";
-
-$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (1, 'PayPal', 'paypal', '', '', '', '', '', '', '', 0, 1, 'All major credit cards accepted. See <a href=\"https://www.paypal.com/affil/pal=9DJEWQQKVB6WL\" target=\"_blank\">PayPal</a> for more information.', '', 1, 'USD');";
-$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (2, 'NOCHEX', 'nochex', '', '', '', '', '', '', '', 0, 1, 'UK debit and credit cards, such as Switch, Solo and VISA Delta. All prices will be convereted into GBP (UK Pounds) upon ordering.', NULL, 1, 'GBP');";
-$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (3, 'Post Service', 'manual', '', '', '', '', '', '', '', 0, 0, 'You can use this method if you wish to send us a check, postal order or international money order.', NULL, 1, 'USD');";
-$SQL[] = "INSERT INTO ibf_subscription_methods VALUES (4, '2CheckOut', '2checkout', '', '', '', '', '', '', '', 1, 1, 'All major credit cards accepted. See <a href=\'http://www.2checkout.com/cgi-bin/aff.2c?affid=28376\' target=\'_blank\'>2CheckOut</a> for more information.', NULL, 1, 'USD');";
-
-
-$SQL[] = "INSERT INTO ibf_templates VALUES (1, '".get_main_wrapper()."', 'Invision Board Standard');";
-
-$SQL[] = "INSERT INTO ibf_titles (id, posts, title, pips) VALUES (1, 0, 'Newbie', '1')";
-$SQL[] = "INSERT INTO ibf_titles (id, posts, title, pips) VALUES (2, 10, 'Member', '2')";
-$SQL[] = "INSERT INTO ibf_titles (id, posts, title, pips) VALUES (4, 30, 'Advanced Member', '3')";
-
-$SQL[] = "INSERT INTO ibf_tmpl_names (skid, skname, author, email, url) VALUES (1, 'Invision Power Board Template Set', 'Invision Power Board', 'skins@invisionboard.com', 'http://www.invisionboard.com')";
-
-$SQL[] = "INSERT INTO ibf_topics (tid, title, description, state, posts, starter_id, start_date, last_poster_id, last_post, icon_id, starter_name, last_poster_name, poll_state, last_vote, views, forum_id, approved, author_mode, pinned, moved_to, rating, total_votes) VALUES (1, 'Welcome', '', 'open', 0, '-1', <%time%>, '0', <%time%>, 0, 'Invision Power Board Team', 'Invision Power Board Team', '0', 0, 0, 1, 1, 0, 0, NULL, NULL, 0)";
-
-return $SQL;
-}
-
-
-function get_main_css()
-{
-return "/* FIX IE6 Scrollbars bug - Leave this in! */
-/* FIX IE6 Scrollbars bug - Leave this in! */
-html { overflow-x: auto; } 
-
-/* Body entry, change forum page background colour, default font, font size, etc. Leave text-align:center to center board content
-   #ipwrapper will set text-align back to left for the forum. Any other tables / divs you use must use text-align:left to re-align
-   the content properly. This is a work around to a known Internet Explorer bug */
-BODY { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; margin:0px;padding:0px;background-color:#FFF; text-align:center }
-TABLE, TR, TD { font-family: Verdana, Tahoma, Arial, sans-serif; font-size: 11px; color: #000; }
-
-/* MAIN WRAPPER: Adjust forum width here. Leave margins alone to auto-center content */
-#ipbwrapper { text-align:left; width:95%; margin-left:auto;margin-right:auto }
-
-a:link, a:visited, a:active { text-decoration: underline; color: #000 }
-a:hover { color: #465584; text-decoration:underline }
-
-fieldset.search { padding:6px; line-height:150% }
-label      { cursor:pointer; }
-form       { display:inline; }
-img        { vertical-align:middle; border:0px }
-img.attach { border:2px outset #EEF2F7;padding:2px }
-
-.googleroot  { padding:6px; line-height:130% }
-.googlechild { padding:6px; margin-left:30px; line-height:130% }
-.googlebottom, .googlebottom a:link, .googlebottom a:visited, .googlebottom a:active { font-size:11px; color: #3A4F6C; }
-.googlish, .googlish a:link, .googlish a:visited, .googlish a:active { font-size:14px; font-weight:bold; color:#00D; }
-.googlepagelinks { font-size:1.1em; letter-spacing:1px }
-.googlesmall, .googlesmall a:link, .googlesmall a:active, .googlesmall a:visited { font-size:10px; color:#434951 }
-
-li.helprow { padding:0px; margin:0px 0px 10px 0px }
-ul#help    { padding:0px 0px 0px 15px }
-
-option.cat { font-weight:bold; }
-option.sub { font-weight:bold;color:#555 }
-.caldate   { text-align:right;font-weight:bold;font-size:11px;color:#777;background-color:#DFE6EF;padding:4px;margin:0px }
-
-.warngood { color:green }
-.warnbad  { color:red }
-
-#padandcenter { margin-left:auto;margin-right:auto;text-align:center;padding:14px 0px 14px 0px }
-
-#profilename { font-size:28px; font-weight:bold; }
-#calendarname { font-size:22px; font-weight:bold; }
-
-#photowrap { padding:6px; }
-#phototitle { font-size:24px; border-bottom:1px solid black }
-#photoimg   { text-align:center; margin-top:15px } 
-
-#ucpmenu    { line-height:150%;width:22%; border:1px solid #345487;background-color: #F5F9FD }
-#ucpmenu p  { padding:2px 5px 6px 9px;margin:0px; }
-#ucpcontent { background-color: #F5F9FD; border:1px solid #345487;line-height:150%; width:auto }
-#ucpcontent p  { padding:10px;margin:0px; }
-
-#ipsbanner { position:absolute;top:1px;right:5%; }
-#logostrip { border:1px solid #345487;background-color: #3860BB;background-image:url(style_images/<#IMG_DIR#>/tile_back.gif);padding:0px;margin:0px; }
-#submenu   { border:1px solid #BCD0ED;background-color: #DFE6EF;font-size:10px;margin:3px 0px 3px 0px;color:#3A4F6C;font-weight:bold;}
-#submenu a:link, #submenu  a:visited, #submenu a:active { font-weight:bold;font-size:10px;text-decoration: none; color: #3A4F6C; }
-#userlinks { border:1px solid #C2CFDF; background-color: #F0F5FA }
-
-#navstrip  { font-weight:bold;padding:6px 0px 6px 0px; }
-
-.activeuserstrip { background-color:#BCD0ED; padding:6px }
-
-/* Form stuff (post / profile / etc) */
-.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px }
-.pformleft  { background-color: #F5F9FD; padding:6px; margin-top:1px;width:25%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:40%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
-.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
-
-/* Topic View elements */
-.signature   { font-size: 10px; color: #339; line-height:150% }
-.postdetails { font-size: 10px }
-.postcolor   { font-size: 12px; line-height: 160% }
-
-.normalname { font-size: 12px; font-weight: bold; color: #003 }
-.normalname a:link, .normalname a:visited, .normalname a:active { font-size: 12px }
-.unreg { font-size: 11px; font-weight: bold; color: #900 }
-
-.post1 { background-color: #F5F9FD }
-.post2 { background-color: #EEF2F7 }
-.postlinksbar { background-color:#D1DCEB;padding:7px;margin-top:1px;font-size:10px; background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif) }
-
-/* Common elements */
-.row1 { background-color: #F5F9FD }
-.row2 { background-color: #DFE6EF }
-.row3 { background-color: #EEF2F7 }
-.row4 { background-color: #E4EAF2 }
-
-.darkrow1 { background-color: #C2CFDF; color:#4C77B6; }
-.darkrow2 { background-color: #BCD0ED; color:#3A4F6C; }
-.darkrow3 { background-color: #D1DCEB; color:#3A4F6C; }
-
-.hlight { background-color: #DFE6EF }
-.dlight { background-color: #EEF2F7 }
-
-.titlemedium { font-weight:bold; color:#3A4F6C; padding:7px; margin:0px; background-image: url(style_images/<#IMG_DIR#>/tile_sub.gif) }
-.titlemedium  a:link, .titlemedium  a:visited, .titlemedium  a:active  { text-decoration: underline; color: #3A4F6C }
-
-/* Main table top (dark blue gradient by default) */
-.maintitle { vertical-align:middle;font-weight:bold; color:#FFF; padding:8px 0px 8px 5px; background-image: url(style_images/<#IMG_DIR#>/tile_back.gif) }
-.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-.maintitle a:hover { text-decoration: underline }
-
-/* tableborders gives the white column / row lines effect */
-.plainborder { border:1px solid #345487;background-color:#F5F9FD }
-.tableborder { border:1px solid #345487;background-color:#FFF; padding:0; margin:0 }
-.tablefill   { border:1px solid #345487;background-color:#F5F9FD;padding:6px;  }
-.tablepad    { background-color:#F5F9FD;padding:6px }
-.tablebasic  { width:100%; padding:0px 0px 0px 0px; margin:0px; border:0px }
-
-.wrapmini    { float:left;line-height:1.5em;width:25% }
-.pagelinks   { float:left;line-height:1.2em;width:35% }
-
-.desc { font-size:10px; color:#434951 }
-.edit { font-size: 9px }
-
-
-.searchlite { font-weight:bold; color:#F00; background-color:#FF0 }
-
-#QUOTE { white-space:normal; font-family: Verdana, Arial; font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-#CODE  { white-space:normal; font-family: Courier, Courier New, Verdana, Arial;  font-size: 11px; color: #465584; background-color: #FAFCFE; border: 1px solid #000; padding-top: 2px; padding-right: 2px; padding-bottom: 2px; padding-left: 2px }
-
-.copyright { font-family: Verdana, Tahoma, Arial, Sans-Serif; font-size: 9px; line-height: 12px }
-
-.codebuttons  { font-size: 10px; font-family: verdana, helvetica, sans-serif; vertical-align: middle }
-.forminput, .textinput, .radiobutton, .checkbox  { font-size: 11px; font-family: verdana, helvetica, sans-serif; vertical-align: middle }
-
-.thin { padding:6px 0px 6px 0px;line-height:140%;margin:2px 0px 2px 0px;border-top:1px solid #FFF;border-bottom:1px solid #FFF }
-
-.purple { color:purple;font-weight:bold }
-.red    { color:red;font-weight:bold }
-.green  { color:green;font-weight:bold }
-.blue   { color:blue;font-weight:bold }
-.orange { color:#F90;font-weight:bold }";
-}
-
-function get_main_wrapper()
-{
-return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
-<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"> 
-<head> 
-<title><% TITLE %></title> 
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
-<% GENERATOR %> 
-<% CSS %> 
-<% JAVASCRIPT %> 
-</head> 
-<body>
-<div id="ipbwrapper">
-<% BOARD HEADER %> 
-<% NAVIGATION %> 
-<% BOARD %> 
-<% STATS %> 
-<% COPYRIGHT %>
-</div>
-</body> 
-</html>';
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_adminlogs.php b/upload/sources/Admin/ad_adminlogs.php
deleted file mode 100644
index d2c93b9c..00000000
--- a/upload/sources/Admin/ad_adminlogs.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Logs Stuff
-|   > Module written by Matt Mecham
-|   > Date started: 11nd September 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-
-$idx = new ad_adlogs();
-
-
-class ad_adlogs {
-
-	var $base_url;
-	var $colours = array();
-
-	function ad_adlogs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-		
-		// Make sure we're a root admin, or else!
-		
-		if ($MEMBER['mgroup'] != $INFO['admin_group'])
-		{
-			$ADMIN->error("Sorry, these functions are for the root admin group only");
-		}
-		
-		
-		$this->colours  = array(
-								"cat"      => "green",
-								"forum"    => "darkgreen",
-								"mem"      => "red",
-								'group'    => "purple",
-								'mod'      => 'orange',
-								'op'       => 'darkred',
-								'help'     => 'darkorange',
-								'modlog'   => 'steelblue',
-				   			   );
-		
-
-		switch($IN['code'])
-		{
-		
-			case 'view':
-				$this->view();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function view()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$start = $IN['st'] ? $IN['st'] : 0;
-		
-		$ADMIN->page_detail = "Viewing all actions by a administrator";
-		$ADMIN->page_title  = "Administration Logs Manager";
-	
-		if ($IN['search_string'] == "")
-		{
-			$DB->query("SELECT COUNT(id) as count FROM ibf_admin_logs WHERE member_id='".$IN['mid']."'");
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=adminlog&mid={$IN['mid']}&code=view";
-			
-			$DB->query("SELECT m.*, mem.id, mem.name FROM ibf_admin_logs m, ibf_members mem
-					    WHERE m.member_id='".$IN['mid']."' AND m.member_id=mem.id ORDER BY m.ctime DESC LIMIT $start, 20");
-			
-		}
-		else
-		{
-			$IN['search_string'] = urldecode($IN['search_string']);
-			
-			$dbq = "m.".$IN['search_type']." LIKE '%".$IN['search_string']."%'";
-		
-			$DB->query("SELECT COUNT(m.id) as count FROM ibf_admin_logs m WHERE $dbq");
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=adminlog&code=view&search_type={$IN['search_type']}&search_string=".urlencode($IN['search_string']);
-			
-			$DB->query("SELECT m.*, mem.id, mem.name FROM ibf_admin_logs m, ibf_members mem
-					    WHERE m.member_id=mem.id AND $dbq ORDER BY m.ctime DESC LIMIT $start, 20");
-		
-		
-		}
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
-											   'PER_PAGE'    => 20,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Pages: ",
-											   'BASE_URL'    => $ADMIN->base_url.$query,
-											 )
-									  );
-									  
-		$ADMIN->page_detail = "You may view and remove actions performed by your administrators";
-		$ADMIN->page_title  = "Administrator Logs Manager";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Member Name"            , "20%" );
-		$SKIN->td_header[] = array( "Action Perfomed"        , "40%" );
-		$SKIN->td_header[] = array( "Time of action"         , "20%" );
-		$SKIN->td_header[] = array( "IP address"             , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Admin Logs" );
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'center', 'pformstrip');
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['ctime'] = $ADMIN->get_date( $row['ctime'], 'LONG' );
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$row['name']}</b>",
-														  "<span style='color:{$this->colours[$row['act']]}'>{$row['note']}</span>",
-														  "{$row['ctime']}",
-														  "{$row['ip_address']}",
-												 )      );
-			
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'center', 'pformstrip');
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You did not select a member ID to remove by!");
-		}
-		
-		$DB->query("DELETE FROM ibf_admin_logs WHERE member_id='".$IN['mid']."'");
-		
-		$std->boink_it($ADMIN->base_url."&act=adminlog");
-		exit();
-	
-	
-	}
-	
-	
-
-	
-	
-	//-------------------------------------------------------------
-	// SHOW ALL LANGUAGE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You may view and remove actions performed by your administrators in mission critical areas of the administration CP (such as forum control, member control, group control, help files and moderator log management).";
-		$ADMIN->page_title  = "Administration Logs Manager";
-		
-		//+-------------------------------
-		// LAST FIVE ACTIONS
-		//+-------------------------------
-		
-		
-		$DB->query("SELECT m.*, mem.id, mem.name FROM ibf_admin_logs m, ibf_members mem
-					    WHERE m.member_id=mem.id ORDER BY m.ctime DESC LIMIT 0, 5");
-		
-		$SKIN->td_header[] = array( "Member Name"            , "20%" );
-		$SKIN->td_header[] = array( "Action Perfomed"        , "40%" );
-		$SKIN->td_header[] = array( "Time of action"         , "20%" );
-		$SKIN->td_header[] = array( "IP address"             , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Last 5 Admin Actions" );
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['ctime'] = $ADMIN->get_date( $row['ctime'], 'LONG' );
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$row['name']}</b>",
-														  "<span style='color:{$this->colours[$row['act']]}'>{$row['note']}</span>",
-														  "{$row['ctime']}",
-														  "{$row['ip_address']}",
-												 )      );
-			
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Member Name"            , "30%" );
-		$SKIN->td_header[] = array( "Actions Perfomed"       , "20%" );
-		$SKIN->td_header[] = array( "View all by member"     , "20%" );
-		$SKIN->td_header[] = array( "Remove all by member"   , "30%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Admininstration Logs" );
-		
-		$DB->query("SELECT m.*, mem.name, count(m.id) as act_count FROM ibf_admin_logs m, ibf_members mem WHERE m.member_id=mem.id GROUP BY m.member_id ORDER BY act_count DESC");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$r['name']}</b>",
-													  "<center>{$r['act_count']}</center>",
-													  "<center><a href='".$SKIN->base_url."&act=adminlog&code=view&mid={$r['member_id']}'>View</a></center>",
-													  "<center><a href='".$SKIN->base_url."&act=adminlog&code=remove&mid={$r['member_id']}'>Remove</a></center>",
-											 )      );
-		}
-			
-		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'view'     ),
-												  2 => array( 'act'   , 'adminlog'       ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Search Admin Logs" );
-		
-		$form_array = array(
-							  0 => array( 'note'      , 'Action Performed' ),
-							  1 => array( 'ip_address',  'IP Address'  ),
-							  2 => array( 'member_id' , 'Member ID' ),
-							  3 => array( 'act'        , 'ACT Setting'  ),
-							  4 => array( 'code'       , 'CODE Setting'  ),
-						   );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search for...</b>" ,
-										  		  $SKIN->form_input( "search_string")
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search in...</b>" ,
-										  		  $SKIN->form_dropdown( "search_type", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Search");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_categories.php b/upload/sources/Admin/ad_categories.php
deleted file mode 100644
index 2b6be071..00000000
--- a/upload/sources/Admin/ad_categories.php
+++ /dev/null
@@ -1,728 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Category functions
-|   > Module written by Matt Mecham
-|   > Date started: 1st march 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_cat();
-
-
-class ad_cat {
-
-	var $base_url;
-
-	function ad_cat() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'new':
-				$this->new_form();
-				break;
-			case 'donew':
-				$this->do_new();
-				break;
-			//+-------------------------
-			case 'edit':
-				$this->show_cats();
-				break;
-			case 'doeditform':
-				$this->edit_form();
-				break;
-			case 'doedit':
-				$this->do_edit();
-				break;
-			//+-------------------------
-			case 'remove':
-				$this->remove_form();
-				break;
-			case 'doremove':
-				$this->do_remove();
-				break;
-			//+-------------------------
-			case 'reorder':
-				$this->reorder_form(); //Get it? No... ok.
-				break;
-			case 'doreorder':
-				$this->do_reorder();
-				break;
-			
-			default:
-				$this->show_cats();
-				break;
-		}
-		
-	}
-	
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// RE-ORDER CATEGORY
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function reorder_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Category Re Order";
-		$ADMIN->page_detail  = "To re-order the categories, simply choose the position number from the drop down box next to each category title, when you are satisfied with the ordering, simply hit the submit button at the bottom of the form";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doreorder'),
-												  2 => array( 'act'   , 'cat'     ),
-											) );
-		
-		
-		$SKIN->td_header[] = array( "&nbsp;"       , "10%" );
-		$SKIN->td_header[] = array( "Forum Name"   , "60%" );
-		$SKIN->td_header[] = array( "Posts"        , "15%" );
-		$SKIN->td_header[] = array( "Topics"       , "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Your Categories and Forums" );
-		
-		$cats   = array();
-		$forums = array();
-		
-		$DB->query("SELECT * from ibf_categories WHERE id > 0 ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			$cats[] = $r;
-		}
-		
-		$DB->query("SELECT * from ibf_forums ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			$forums[] = $r;
-		}
-		
-		
-		// Build up the drop down box
-		
-		$form_array = array();
-		
-		for ($i = 1 ; $i <= count($cats) ; $i++ )
-		{
-			$form_array[] = array( $i , $i );
-		}
-		
-		
-		$last_cat_id = -1;
-		
-		foreach ($cats as $c)
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_row( array(  $SKIN->form_dropdown( 'POS_'.$c['id'], $form_array, $c['position'] ),
-													   $c['name'],
-													   '&nbsp;',
-													   '&nbsp;',
-											 ), 'pformstrip'     );
-			$last_cat_id = $c['id'];
-			
-			
-			foreach($forums as $r)
-			{	
-			
-				if ($r['category'] == $last_cat_id)
-				{
-					$ADMIN->html .= $SKIN->add_td_row( array(
-															   '&nbsp;',
-															   "<b>".$r['name']."</b>",
-															   $r['posts'],
-															   $r['topics'],
-													 )      );
-				}
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_form("Adjust Category Ordering");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function do_reorder() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$cat_query = $DB->query("SELECT id from ibf_categories");
-		
-		while ( $r = $DB->fetch_row($cat_query) )
-		{
-			$order_query = $DB->query("UPDATE ibf_categories SET position='".$IN[ 'POS_' . $r['id'] ]."' WHERE id='".$r['id']."'");
-		}
-		
-		$ADMIN->save_log("Re-ordered categories");
-		
-		$ADMIN->done_screen("Category Ordering Adjusted", "Category Control", "act=cat" );
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// REMOVE CATEGORY
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function remove_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-		
-		if ($IN['c'] == "")
-		{
-			$ADMIN->error("Could not determine the category ID to update.");
-		}
-		
-		$DB->query("SELECT id, name FROM ibf_categories WHERE id > 0 ");
-		
-		//+-------------------------------
-		// Make sure we have more than 1
-		// category..
-		//+-------------------------------
-		
-		if ($DB->get_num_rows() < 2)
-		{
-			$ADMIN->error("Can not remove this category, please create another before attempting to remove this one");
-		}
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($r['id'] == $IN['c'])
-			{
-				continue;
-			}
-			
-			$form_array[] = array( $r['id'] , $r['name'] );
-		}
-		
-		//+-------------------------------
-		// Get the details for this category...
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_categories WHERE id='".$IN['c']."'");
-		$cat = $DB->fetch_row();
-		
-		//+-------------------------------
-		
-		$ADMIN->page_title = "Removing category '{$cat['name']}'";
-		
-		$ADMIN->page_detail = "Before we remove this category, we need to determine what to do with any forums you may have left in this category.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doremove'),
-												  2 => array( 'act'   , 'cat'     ),
-												  3 => array( 'c'     , $IN['c']  ),
-												  4 => array( 'name'  , $cat['name'] ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Required" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category to remove: </b>" , $cat['name'] )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Move all <i>existing forums in this category</i> to which category?</b>" ,
-												  $SKIN->form_dropdown( "MOVE_ID", $form_array )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Move forums and delete this category");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function do_remove() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['c'] == "")
-		{
-			$ADMIN->error("Could not determine the source category ID.");
-		}
-		
-		if ($IN['MOVE_ID'] == "")
-		{
-			$ADMIN->error("Could not determine the destination category ID.");
-		}
-		
-		
-		$DB->query("UPDATE ibf_forums SET category='".$IN['MOVE_ID']."' WHERE category='".$IN['c']."'");
-		
-		$DB->query("DELETE FROM ibf_categories WHERE id='".$IN['c']."'");
-		
-		$ADMIN->save_log("Removed category '{$IN['name']}'");
-		
-		$ADMIN->done_screen("Category Removed", "Category Control", "act=cat" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// EDIT CATEGORY
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function edit_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$subcats = array();
-		
-		$DB->query("SELECT id, name FROM ibf_categories WHERE id > 0");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($r['id'] == $IN['c'])
-			{
-				continue;
-			}
-			
-			$subcats[] = array( $r['id'] , $r['name'] );
-		}
-		
-		$DB->query("SELECT * FROM ibf_categories WHERE id='".$IN['c']."'");
-		$cat = $DB->fetch_row();
-		
-		$ADMIN->page_title = "Edit a category";
-		
-		$ADMIN->page_detail = "This section will allow you to edit a new category.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doedit'),
-												  2 => array( 'VIEW'  , '*'    ),
-												  3 => array( 'act'   , 'cat'  ),
-												  4 => array( 'c'     , $IN['c'] ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "30%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Required" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category Name</b>" ,
-												  $SKIN->form_input("CAT_NAME", $cat['name'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category State</b><br />Unless disabled, categories will show in search selection box" ,
-												  $SKIN->form_dropdown( "CAT_STATE",
-																			array( 
-																					0 => array( 1, 'Visible' ),
-																					1 => array( 0, 'Disable'  ),
-																					2 => array( 2, 'Hidden from forumhome list - can access via URL and forum jump'  ),
-																					3 => array( 3, 'Hidden from forumhome list - can access via URL - removed from forum jump'  ),
-																				 ),
-												  						$cat['state']
-												  					  )
-									     )      );
-									     
-		/*$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "30%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Optional" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category Sponsor Image</b><br>(Example: http://www.domain.com/image.gif)" ,
-												  $SKIN->form_input("IMAGE", $cat['image'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category Sponsor Link</b><br>(Example: http://www.domain.com/)" ,
-												  $SKIN->form_input("URL", $cat['url'])
-									     )      );*/
-									     
-		$ADMIN->html .= $SKIN->end_form("Amend this category");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-	//+---------------------------------------------------------------------------------
-	
-	function do_edit() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$IN['CAT_NAME'] = trim($IN['CAT_NAME']);
-		
-		if ($IN['CAT_NAME'] == "")
-		{
-			$ADMIN->error("You must enter a category title");
-		}
-		
-		if ($IN['c'] == "")
-		{
-			$ADMIN->error("Could not determine the category ID to update.");
-		}
-		
-		$db_string = $DB->compile_db_update_string( array (
-															'state'         => $IN['CAT_STATE'],
-															'name'          => $IN['CAT_NAME'],
-															'description'   => $IN['CAT_DESC'],
-															'image'         => $IN['IMAGE'],
-															'url'           => $IN['URL'],
-												  )       );
-												  
-		$DB->query("UPDATE ibf_categories SET $db_string WHERE id='".$IN['c']."'");
-		
-		$ADMIN->save_log("Edited Category '{$IN['CAT_NAME']}'");
-		
-		$ADMIN->done_screen("Category '{$IN['CAT_NAME']}' Edited", "Category Control", "act=cat" );
-		
-	}
-
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// SHOW CATS
-	// Renders a complete listing of all the forums and categories.
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function show_cats() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title   = "Category and Forums Overview";
-		$ADMIN->page_detail  = "<img src='{$SKIN->img_url}/acp_rules.gif' border='0'> <b>Forum Rules</b> This allows you to add/edit or remove rules for this forum
-							   <br /><img src='{$SKIN->img_url}/acp_edit.gif' border='0'> <b>Skin Options</b> This allows you to add/edit or remove a skin for this forum
-							   <br /><img src='{$SKIN->img_url}/acp_resync.gif' border='0'> <b>Resynchronise</b> This allows you to recount the forum posts, topics and last post information";
-		
-		$cats     = array();
-		$forums   = array();
-		$children = array();
-		$skins    = array();
-		
-		$DB->query("SELECT * from ibf_categories WHERE id > 0 ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			$cats[$r['id']] = $r;
-		}
-		
-		$DB->query("SELECT * from ibf_forums ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			
-			if ($r['parent_id'] > 0)
-			{
-				$children[ $r['parent_id'] ][] = $r;
-			}
-			else
-			{
-				$forums[] = $r;
-			}
-			
-		}
-		
-		$DB->query("SELECT uid, sname, sid FROM ibf_skins");
-		while ($s = $DB->fetch_row())
-		{
-			$skins[$s['sid']] = $s['sname'];
-		}
-		
-		$SKIN->td_header[] = array( "{none}", "40%" );
-		$SKIN->td_header[] = array( "{none}", "20%" );
-		$SKIN->td_header[] = array( "{none}", "15%" );
-		$SKIN->td_header[] = array( "{none}", "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table("Your Categories and Forums");
-		
-		$last_cat_id = -1;
-		
-		foreach ($cats as $c)
-		{
-			
-		
-			$ADMIN->html .= $SKIN->add_td_row( array(
-													   "<a href='{$INFO['board_url']}/index.php?c={$c['id']}' target='_blank'>".$c['name']."</a>",
-													   "<center><a href='{$ADMIN->base_url}&act=cat&code=doeditform&c={$c['id']}'>Edit</a></center>",
-													   '&nbsp;',
-													   "<center><a href='{$ADMIN->base_url}&act=cat&code=remove&c={$c['id']}'>Delete</a></center>",
-											 ), 'pformstrip'     );
-			$last_cat_id = $c['id'];
-			
-			
-			foreach($forums as $r)
-			{	
-			
-				if ($r['category'] == $last_cat_id)
-				{
-					
-					if ( ($r['skin_id'] != "") and ($r['skin_id'] >= 0) )
-					{
-						$skin_stuff = "<br>[ "."Using Skin Set: ".$skins[$r['skin_id']]." ]";
-					}
-					else
-					{
-						$skin_stuff = "";
-					}
-					
-					$redirect =  ($r['redirect_on'] == 1) ? ' (Redirect Forum)' : '';
-				
-					if ($r['subwrap'] == 1)
-					{
-					
-						if ($r['sub_can_post'])
-						{
-							$ADMIN->html .= $SKIN->add_td_row( array(
-																	   " - <b>".$r['name']."</b>$redirect $skin_stuff",
-																	   "<center><b><a href='{$ADMIN->base_url}&act=forum&code=subedit&f={$r['id']}'>Settings</a></b>".
-																	   " | <a href='{$ADMIN->base_url}&act=forum&code=pedit&f={$r['id']}'>Permissions</a></center>",
-																	   
-																	   "<center><a href='{$ADMIN->base_url}&act=forum&code=frules&f={$r['id']}'><img src='{$SKIN->img_url}/acp_rules.gif' border='0' title='Forum Rules'></a>&nbsp;&nbsp;".
-																	   "<a href='{$ADMIN->base_url}&act=forum&code=skinedit&f={$r['id']}'><img src='{$SKIN->img_url}/acp_edit.gif' border='0' title='Skin Options'></a>&nbsp;&nbsp;".
-																	   "<a href='{$ADMIN->base_url}&act=forum&code=recount&f={$r['id']}'><img src='{$SKIN->img_url}/acp_resync.gif' border='0' title='Resynchronise'></a></center>",
-																	   
-																	   "<center><a href='{$ADMIN->base_url}&act=forum&code=subdelete&f={$r['id']}'>Delete</a>".
-																	   " | <b><a href='{$ADMIN->base_url}&act=forum&code=empty&f={$r['id']}'>Empty Forum</a></b></center>",
-															 )  , 'subforum'  );
-						}
-						else
-						{
-							$ADMIN->html .= $SKIN->add_td_row( array(
-																	   " - <b>".$r['name']."</b>$redirect $skin_stuff",
-																	   "<a href='{$ADMIN->base_url}&act=forum&code=subedit&f={$r['id']}'>Edit</a>",
-																	   "<a href='{$ADMIN->base_url}&act=forum&code=skinedit&f={$r['id']}'>Skin Options</a>",
-																	   "<a href='{$ADMIN->base_url}&act=forum&code=subdelete&f={$r['id']}'>Delete</a>",
-															 )   , 'subforum' );
-						}
-					}
-					else
-					{
-						$ADMIN->html .= $SKIN->add_td_row( array(
-																   "<b>".$r['name']."</b>$redirect $skin_stuff<br>",
-																   "<center><b><a href='{$ADMIN->base_url}&act=forum&code=edit&f={$r['id']}'>Settings</a></b>".
-																   " | <a href='{$ADMIN->base_url}&act=forum&code=pedit&f={$r['id']}'>Permissions</a></center>",
-																   
-																   "<center><a href='{$ADMIN->base_url}&act=forum&code=frules&f={$r['id']}'><img src='{$SKIN->img_url}/acp_rules.gif' border='0' title='Forum Rules'></a>&nbsp;&nbsp;".
-																   "<a href='{$ADMIN->base_url}&act=forum&code=skinedit&f={$r['id']}'><img src='{$SKIN->img_url}/acp_edit.gif' border='0' title='Skin Options'></a>&nbsp;&nbsp;".
-																   "<a href='{$ADMIN->base_url}&act=forum&code=recount&f={$r['id']}'><img src='{$SKIN->img_url}/acp_resync.gif' border='0' title='Resynchronise'></a></center>",
-																   
-																   "<center><a href='{$ADMIN->base_url}&act=forum&code=delete&f={$r['id']}'>Delete</a>".
-																   " | <b><a href='{$ADMIN->base_url}&act=forum&code=empty&f={$r['id']}'>Empty Forum</a></b></center>",
-														 )      );
-					}
-													 
-					if ( ( isset($children[ $r['id'] ]) ) and ( count ($children[ $r['id'] ]) > 0 ) )
-					{
-						foreach($children[ $r['id'] ] as $idx => $rd)
-						{
-						
-							if ( ($rd['skin_id'] != "") and ($rd['skin_id'] >= 0) )
-							{
-								$skin_stuff = "<br>[ "."Using Skin Set: ".$skins[$rd['skin_id']]." ]";
-							}
-							else
-							{
-								$skin_stuff = "";
-							}
-							
-							$redirect =  ($rd['redirect_on'] == 1) ? ' (Redirect Forum)' : '';
-					
-							$ADMIN->html .= $SKIN->add_td_row( array(
-															   " +-- <b>".$rd['name']."</b>$redirect $skin_stuff<br>",
-															   "<center><b><a href='{$ADMIN->base_url}&act=forum&code=edit&f={$rd['id']}'>Settings</a></b>".
-															   " | <a href='{$ADMIN->base_url}&act=forum&code=pedit&f={$rd['id']}'>Permissions</a></center>",
-															   "<center><a href='{$ADMIN->base_url}&act=forum&code=frules&f={$rd['id']}'><img src='{$SKIN->img_url}/acp_rules.gif' border='0' title='Forum Rules'></a>&nbsp;&nbsp;".
-															   "<a href='{$ADMIN->base_url}&act=forum&code=skinedit&f={$rd['id']}'><img src='{$SKIN->img_url}/acp_edit.gif' border='0' title='Skin Options'></a>&nbsp;&nbsp;".
-															   "<a href='{$ADMIN->base_url}&act=forum&code=recount&f={$rd['id']}'><img src='{$SKIN->img_url}/acp_resync.gif' border='0' title='Resynchronise'></a></center>",
-															   "<center><a href='{$ADMIN->base_url}&act=forum&code=delete&f={$rd['id']}'>Delete</a>".
-															   " | <b><a href='{$ADMIN->base_url}&act=forum&code=empty&f={$rd['id']}'>Empty Forum</a></b></center>",
-													 ) , 'subforum' );
-						}
-					}					 
-												
-				}
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// NEW CATEGORY
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function new_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
-		
-		$cat_name = "";
-		
-		if ($HTTP_GET_VARS['name'] != "")
-		{
-			$cat_name = $std->txt_stripslashes(urldecode($HTTP_GET_VARS['name']));
-		}
-		
-		$ADMIN->page_title = "Add a new category";
-		
-		$ADMIN->page_detail = "This section will allow you to add a new category to your forums.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'donew'),
-												  2 => array( 'act'   , 'cat'  ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "30%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Required" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category Name</b>" ,
-												  $SKIN->form_input("CAT_NAME", $cat_name)
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category State</b><br />Unless disabled, categories will show in search selection box" ,
-												  $SKIN->form_dropdown( "CAT_STATE",
-																			array( 
-																					0 => array( 1, 'Visible' ),
-																					1 => array( 0, 'Disable'  ),
-																					2 => array( 2, 'Hidden from forumhome list - can access via URL and forum jump'  ),
-																					3 => array( 3, 'Hidden from forumhome list - can access via URL - removed from forum jump'  ),
-																				 ),
-												  						"1"
-												  					  )
-									     )      );
-									     
-		/*$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "30%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Optional" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category Sponsor Image</b><br>(Example: http://www.domain.com/image.gif)" ,
-												  $SKIN->form_input("IMAGE")
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Category Sponsor Link</b><br>(Example: http://www.domain.com/)" ,
-												  $SKIN->form_input("URL")
-									     )      );*/
-		
-		$ADMIN->html .= $SKIN->end_form("Create this category");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-
-	//+---------------------------------------------------------------------------------
-	
-	function do_new() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$IN['CAT_NAME'] = trim($IN['CAT_NAME']);
-		
-		if ($IN['CAT_NAME'] == "")
-		{
-			$ADMIN->error("You must enter a category title");
-		}
-		
-		// Get the new cat id. We could use auto_incrememnt, but we need the ID to use as the default
-		// category position...
-		
-		$DB->query("SELECT MAX(id) as top_cat FROM ibf_categories");   //ooh, top cat - he's the leader of our gang..
-		$row = $DB->fetch_row();
-		
-		if ($row['top_cat'] < 1) $row['top_cat'] = 0;
-		
-		$row['top_cat']++;
-		
-		$db_string = $DB->compile_db_insert_string( array (
-															'id'            => $row['top_cat'],
-															'position'      => $row['top_cat'],
-															'state'         => $IN['CAT_STATE'],
-															'name'          => $IN['CAT_NAME'],
-															'description'   => $IN['CAT_DESC'],
-															'image'         => $IN['IMAGE'],
-															'url'           => $IN['URL'],
-												  )       );
-												  
-		$DB->query("INSERT INTO ibf_categories (".$db_string['FIELD_NAMES'].") VALUES (".$db_string['FIELD_VALUES'].")");
-		
-		$ADMIN->save_log("Added Category '{$IN['CAT_NAME']}'");
-		
-		$ADMIN->done_screen("Category {$IN['CAT_NAME']} created", "Category Control", "act=cat" );
-		
-		
-		
-	}
-
-
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_emaillogs.php b/upload/sources/Admin/ad_emaillogs.php
deleted file mode 100644
index 07d5ca11..00000000
--- a/upload/sources/Admin/ad_emaillogs.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Email Logs Stuff
-|   > Module written by Matt Mecham
-|   > Date started: 11nd September 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_emaillogs();
-
-
-class ad_emaillogs
-{
-
-	var $base_url;
-	var $colours = array();
-
-	function ad_emaillogs()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-		
-		// Make sure we're a root admin, or else!
-		
-		if ($MEMBER['mgroup'] != $INFO['admin_group'])
-		{
-			$ADMIN->error("Sorry, these functions are for the root admin group only");
-		}
-		
-
-		switch($IN['code'])
-		{
-		
-			case 'list':
-				$this->list_current();
-				break;
-				
-			case 'remove':
-				$this->remove_entries();
-				break;
-				
-		    case 'viewemail':
-		    	$this->view_email();
-		    	break;
-				
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//---------------------------------------------
-	// View a single email.
-	//---------------------------------------------
-	
-	function view_email()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the email ID, please try again");
-		}
-		
-		$id = intval($IN['id']);
-		
-		$DB->query("SELECT email.*, m.id, m.name, mem.id as to_id, mem.name as to_name FROM ibf_email_logs email
-					 LEFT JOIN ibf_members m ON (m.id=email.from_member_id)
-					 LEFT JOIN ibf_members mem ON (mem.id=email.to_member_id)
-				    WHERE email.email_id=$id");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the email ID, please try again ($id)");
-		}
-		
-		$SKIN->td_header[] = array( "&nbsp;" , "100%" );
-		
-		$ADMIN->html .= $SKIN->start_table( $row['email_subject'] );
-	
-		
-		
-		$row['email_date'] = $ADMIN->get_date( $row['email_date'], 'LONG' );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array(
-													"<strong>From:</strong> {$row['name']} &lt;{$row['from_email_address']}&gt;
-													<br /><strong>To:</strong> {$row['to_name']} &lt;{$row['to_email_address']}&gt;
-													<br /><strong>Sent:</strong> {$row['email_date']}
-													<br /><strong>From IP:</strong> {$row['from_ip_address']}
-													<br /><strong>Subject:</strong> {$row['email_subject']}
-													<hr>
-													<br />{$row['email_content']}
-												    "
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->print_popup();
-	}
-	
-
-	
-	//---------------------------------------------
-	// Remove row(s)
-	//---------------------------------------------
-	
-	function remove_entries()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ( $IN['type'] == 'all' )
-		{
-			$DB->query("DELETE FROM ibf_email_logs");
-		}
-		else
-		{
-			$ids = array();
-		
-			foreach ($IN as $k => $v)
-			{
-				if ( preg_match( "/^id_(\d+)$/", $k, $match ) )
-				{
-					if ($IN[ $match[0] ])
-					{
-						$ids[] = $match[1];
-					}
-				}
-			}
-			
-			//-------------------
-			
-			if ( count($ids) < 1 )
-			{
-				$ADMIN->error("You did not select any email log entries to approve or delete");
-			}
-			
-			$DB->query("DELETE FROM ibf_email_logs WHERE email_id IN (".implode(',', $ids ).")");
-		}
-		
-		$ADMIN->save_log("Removed email log entries");
-		
-		$std->boink_it($ADMIN->base_url."&act=emaillog");
-		exit();
-	
-	
-	}
-	
-	
-
-	
-	
-	//-------------------------------------------------------------
-	// SHOW ALL LANGUAGE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->html .= $SKIN->js_pop_win();
-		
-		$form_array = array();
-		
-		$start = intval($IN['st']);
-	
-		$ADMIN->page_detail = "Stored email logs";
-		$ADMIN->page_title  = "Email Logs Manager";
-		
-		//+-------------------------------
-		// Check URL parameters
-		//+-------------------------------
-		
-		$url_query = array();
-		$db_query  = array();
-		
-		if ( $IN['type'] != "" )
-		{
-			$ADMIN->page_title .= " (Search Results)";
-		
-			switch( $IN['type'] )
-			{
-				case 'fromid':
-					$url_query[] = 'type=fromid';
-					$url_query[] = 'id='.intval($IN['id']);
-					$db_query[]  = 'email.from_member_id='.intval($IN['id']);
-					break;
-				case 'toid':
-					$url_query[] = 'type=toid';
-					$url_query[] = 'id='.intval($IN['id']);
-					$db_query[]  = 'email.to_member_id='.intval($IN['id']);
-					break;
-				case 'subject':
-					$string = urldecode($IN['string']);
-					if ( $string == "" )
-					{
-						$ADMIN->error("You must enter something to search by");
-					}
-					$url_query[] = 'type='.$IN['type'];
-					$url_query[] = 'string='.urlencode($string);
-					$db_query[]  = $IN['match'] == 'loose' ? "email.email_subject LIKE '%{$string}%'" : "email.email_subject='{$string}'";
-					break;
-				case 'content':
-					$string = urldecode($IN['string']);
-					if ( $string == "" )
-					{
-						$ADMIN->error("You must enter something to search by");
-					}
-					$url_query[] = 'type='.$IN['type'];
-					$url_query[] = 'string='.urlencode($string);
-					$db_query[]  = $IN['match'] == 'loose' ? "email.email_content LIKE '%{$string}%'" : "email.email_content='{$string}'";
-					break;
-				case 'email_from':
-					$string = urldecode($IN['string']);
-					if ( $string == "" )
-					{
-						$ADMIN->error("You must enter something to search by");
-					}
-					$url_query[] = 'type='.$IN['type'];
-					$url_query[] = 'string='.urlencode($string);
-					$db_query[]  = $IN['match'] == 'loose' ? "email.from_email_address LIKE '%{$string}%'" : "email.from_email_address='{$string}'";
-					break;
-				case 'email_to':
-					$string = urldecode($IN['string']);
-					if ( $string == "" )
-					{
-						$ADMIN->error("You must enter something to search by");
-					}
-					$url_query[] = 'type='.$IN['type'];
-					$url_query[] = 'string='.urlencode($string);
-					$db_query[]  = $IN['match'] == 'loose' ? "email.to_email_address LIKE '%{$string}%'" : "email.to_email_address='{$string}'";
-					break;
-				case 'name_from':
-					$string = urldecode($IN['string']);
-					if ( $string == "" )
-					{
-						$ADMIN->error("You must enter something to search by");
-					}
-					
-					if ( $IN['match'] == 'loose' )
-					{
-						$DB->query("SELECT id,name FROM ibf_members WHERE name LIKE '%{$string}%'");
-						
-						if ( ! $DB->get_num_rows() )
-						{
-							$ADMIN->error("No matches found in the email logs");
-						}
-						
-						$ids = array();
-						
-						while ( $r = $DB->fetch_row() )
-						{
-							$ids[] = $r['id'];
-						}
-						
-						$db_query[] = 'email.from_member_id IN('.implode( ',', $ids ).')';
-					}
-					else
-					{
-						$DB->query("SELECT id,name FROM ibf_members WHERE name='{$string}'");
-						
-						if ( ! $DB->get_num_rows() )
-						{
-							$ADMIN->error("No matches found in the email logs");
-						}
-						
-						$r = $DB->fetch_row();
-						
-						$db_query[] = 'email.from_member_id IN('.$r['id'].')';
-					}
-					
-					$url_query[] = 'type='.$IN['type'];
-					$url_query[] = 'string='.urlencode($string);
-					break;
-				case 'name_to':
-					$string = urldecode($IN['string']);
-					if ( $string == "" )
-					{
-						$ADMIN->error("You must enter something to search by");
-					}
-					
-					if ( $IN['match'] == 'loose' )
-					{
-						$DB->query("SELECT id,name FROM ibf_members WHERE name LIKE '%{$string}%'");
-						
-						if ( ! $DB->get_num_rows() )
-						{
-							$ADMIN->error("No matches found in the email logs");
-						}
-						
-						$ids = array();
-						
-						while ( $r = $DB->fetch_row() )
-						{
-							$ids[] = $r['id'];
-						}
-						
-						$db_query[] = 'email.to_member_id IN('.implode( ',', $ids ).')';
-					}
-					else
-					{
-						$DB->query("SELECT id,name FROM ibf_members WHERE name='{$string}'");
-						
-						if ( ! $DB->get_num_rows() )
-						{
-							$ADMIN->error("No matches found in the email logs");
-						}
-						
-						$r = $DB->fetch_row();
-						
-						$db_query[] = 'email.to_member_id IN('.$r['id'].')';
-					}
-					
-					$url_query[] = 'type='.$IN['type'];
-					$url_query[] = 'string='.urlencode($string);
-					break;
-				default:
-					//
-					break;
-			}
-		}
-		
-		//+-------------------------------
-		// LIST 'EM
-		//+-------------------------------
-		
-		$dbe = "";
-		$url = "";
-		
-		if ( count($db_query) > 0 )
-		{
-			$dbe = ' WHERE '.implode(' AND ', $db_query );
-		}
-		
-		if ( count($url_query) > 0 )
-		{
-			$url = '&'.implode( '&', $url_query);
-		}
-		
-		$DB->query("SELECT count(email.email_id) as cnt FROM ibf_email_logs email".$dbe);
-		
-		$count = $DB->fetch_row();
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['cnt'],
-											   'PER_PAGE'    => 25,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Pages: ",
-											   'BASE_URL'    => $ADMIN->base_url.'&act=emaillog'.$url,
-											 )
-									  );
-		
-		
-		$DB->query("SELECT email.*, m.id, m.name, mem.id as to_id, mem.name as to_name FROM ibf_email_logs email
-					 LEFT JOIN ibf_members m ON (m.id=email.from_member_id)
-					 LEFT JOIN ibf_members mem ON (mem.id=email.to_member_id) $dbe
-					ORDER BY email_date DESC LIMIT $start,25");
-					
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'remove'     ),
-												  2 => array( 'act'   , 'emaillog'       ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"         , "5%" );
-		$SKIN->td_header[] = array( "From Member"    , "20%" );
-		$SKIN->td_header[] = array( "Subject"        , "30%" );
-		$SKIN->td_header[] = array( "To Member"      , "20%" );
-		$SKIN->td_header[] = array( "Sent Time"      , "25%" );
-
-		$ADMIN->html .= $SKIN->start_table( "Logged Emails" );
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['email_date'] = $ADMIN->get_date( $row['email_date'], 'SHORT' );
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( 
-														  "<center><input type='checkbox' class='checkbox' name='id_{$row['email_id']}' value='1' /></center>",
-														  "<a href='{$ADMIN->base_url}&act=emaillog&code=list&type=fromid&id={$row['id']}' title='Show all from this member'><img src='{$SKIN->img_url}/acp_search.gif' border='0' alt='..by id'></a>&nbsp;<b><a href='{$INFO['board_url']}/index.{$INFO['php_ext']}?act=Profile&MID={$row['id']}' title='Members profile (new window)' target='blank'>{$row['name']}</a></b>",
-														  "<a href='javascript:pop_win(\"&act=emaillog&code=viewemail&id={$row['email_id']}\",400,400)' title='Read email'>{$row['email_subject']}</a>",
-														  "<a href='{$ADMIN->base_url}&act=emaillog&code=list&type=toid&id={$row['to_id']}' title='Show all sent to this member'><img src='{$SKIN->img_url}/acp_search.gif' border='0' alt='..by id'></a>&nbsp;<a href='{$INFO['board_url']}/index.{$INFO['php_ext']}?act=Profile&MID={$row['to_id']}'  title='Members profile (new window)' target='blank'>{$row['to_name']}</a>",
-														  "{$row['email_date']}",
-												 )      );
-			
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic('<div style="float:left;width:auto"><input type="submit" value="Remove Checked" id="button" />&nbsp;<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;Remove all?</div><div align="right">'.$links.'</div></form>', 'left', 'pformstrip');
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'list'     ),
-												  2 => array( 'act'   , 'emaillog'       ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Search Email Logs" );
-		
-		$form_array = array(
-							  0 => array( 'subject'    , 'Email Subject'    ),
-							  1 => array( 'content'    , 'Email Body' ),
-							  2 => array( 'email_from' , 'From Email Address' ),
-							  3 => array( 'email_to'   , 'To Email Address'   ),
-							  4 => array( 'name_from'  , 'From Member Name'),
-							  5 => array( 'name_to'    , 'To Member Name' ),
-						   );
-						   
-		$type_array = array(
-							  0 => array( 'exact'      , 'is exactly' ),
-							  1 => array( 'loose'      , 'contains'   ),
-						   );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search where</b> &nbsp;"
-												  . $SKIN->form_dropdown( "type", $form_array) ." "
-												  . $SKIN->form_dropdown( "match", $type_array) ." "
-												  . $SKIN->form_input( "string"),
-										  		
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->end_form("Search");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->nav[] = array( 'act=emaillog', 'Email Logs (Show all)' );
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_forums.php b/upload/sources/Admin/ad_forums.php
deleted file mode 100644
index ab9adb2e..00000000
--- a/upload/sources/Admin/ad_forums.php
+++ /dev/null
@@ -1,2220 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Forum functions
-|   > Module written by Matt Mecham
-|   > Date started: 1st march 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-
-$idx = new ad_forums();
-
-
-class ad_forums {
-
-	var $base_url;
-
-	function ad_forums() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'new':
-				$this->new_form();
-				break;
-			case 'donew':
-				$this->do_new();
-				break;
-			//+-------------------------
-			case 'edit':
-				$this->edit_form();
-				break;
-			case 'doedit':
-				$this->do_edit();
-				break;
-			//+-------------------------
-			case 'pedit':
-				$this->perm_edit_form();
-				break;
-			case 'pdoedit':
-				$this->perm_do_edit();
-				break;
-			//+-------------------------
-			case 'reorder':
-				$this->reorder_form();
-				break;
-			case 'doreorder':
-				$this->do_reorder();
-				break;
-			//+-------------------------
-			case 'delete':
-				$this->delete_form();
-				break;
-			case 'dodelete':
-				$this->do_delete();
-				break;
-			//+-------------------------
-			case 'recount':
-				$this->recount();
-				break;
-			//+-------------------------
-			case 'empty':
-				$this->empty_form();
-				break;
-			case 'doempty':
-				$this->do_empty();
-				break;
-			//+-------------------------
-			case 'frules':
-				$this->show_rules();
-				break;
-			case 'dorules':
-				$this->do_rules();
-				break;
-			//+-------------------------
-			case 'newsp':
-				$this->new_form();
-				break;
-			case 'donewsplash':
-				$this->donew_splash();
-				break;
-			case 'donewsub':
-				$this->add_sub();
-				break;
-			//+-------------------------
-			case 'subedit':
-				$this->subedit();
-				break;
-			case 'doeditsub':
-				$this->doeditsub();
-				break;
-				
-			case 'subdelete':
-				$this->subdeleteform();
-				break;
-			case 'dosubdelete':
-				$this->dosubdelete();
-				break;
-			//+-------------------------
-			case 'skinedit':
-				$this->skin_edit();
-				break;
-			case 'doskinedit':
-				$this->do_skin_edit();
-				break;
-			//+-------------------------	
-			default:
-				$this->new_form();
-				break;
-		}
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Edit forum skins
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function skin_edit() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to empty.");
-		}
-		
-		$DB->query("SELECT id, name, skin_id FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		//+-------------------------------
-		// Make sure we have a legal forum
-		//+-------------------------------
-		
-		if ( !$DB->get_num_rows() )
-		{
-			$ADMIN->error("Could not resolve that forum ID");
-		}
-		
-		$forum = $DB->fetch_row();
-		
-		if ( ($forum['skin_id'] == "") or ($forum['skin_id'] == -1) )
-		{
-			$forum['skin_id'] = 'n';
-		}
-		
-		$form_array = array();
-		
-		$form_array[] = array( 'n', '-- NONE --' );
-		
-		$DB->query("SELECT sid, sname FROM ibf_skins");
-		
-		while ($r = $DB->fetch_row())
-		{
-			$form_array[] = array( $r['sid'], $r['sname'] );
-		}
-		
-		
-		//+-------------------------------
-		
-		$ADMIN->page_title = "Forum Skin Options";
-		$ADMIN->page_detail  = "You may choose to either add or remove a skin set to this forum. The skin choice will override the users choice.";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doskinedit'),
-												  2 => array( 'act'   , 'forum'  ),
-												  3 => array( 'f'     , $IN['f'] ),
-											) );
-		
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Skin choices for forum: {$forum['name']}" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Apply which skin?</b>" ,
-												  $SKIN->form_dropdown("fsid", $form_array, $forum['skin_id'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit forum skin options");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	function do_skin_edit() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to empty.");
-		}
-		
-		$DB->query("SELECT id, name, skin_id FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		$forum = $DB->fetch_row();
-		
-		//+-------------------------------
-		// Make sure we have a legal forum
-		//+-------------------------------
-		
-		if ( !$DB->get_num_rows() )
-		{
-			$ADMIN->error("Could not resolve that forum ID");
-		}
-		
-		if ($IN['fsid'] == 'n')
-		{
-			$DB->query("UPDATE ibf_forums SET skin_id='-1' WHERE id='".$IN['f']."'");
-			$ADMIN->rebuild_config( array( 'forum_skin_'.$IN['f'] => "" ) );
-		}
-		else
-		{
-			$DB->query("UPDATE ibf_forums SET skin_id='".$IN['fsid']."' WHERE id='".$IN['f']."'");
-			$ADMIN->rebuild_config( array( 'forum_skin_'.$IN['f'] => $IN['fsid'] ) );
-		}
-		
-		$ADMIN->save_log("Edited a skin setting for forum '{$forum['name']}'");
-		
-		$std->boink_it($ADMIN->base_url."&act=cat" );
-		exit();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Sub Cat Delete Form
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function subdeleteform() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to delete.");
-		}
-		
-		$cats = array();
-		
-		$name = "";
-		
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT c.id, c.name, f.id as forum_id, f.subwrap, f.name as forum_name, f.parent_id, f.category FROM ibf_categories c, ibf_forums f WHERE c.id > 0 ORDER BY c.position, f.position");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-		
-			if ($last_cat_id != $r['id'])
-			{
-				$cats[] = array( "c_".$r['id'] , "Category: ".$r['name'] );
-				
-				$last_cat_id = $r['id'];
-			}
-			
-			if ($r['parent_id'] > 0)
-			{
-				continue;
-			}
-			
-			if ($r['forum_id'] == $IN['f'])
-			{
-				$name = $r['forum_name'];
-				continue;
-			}
-			
-			if ($r['subwrap'] != 1)
-			{
-				continue;
-			}
-			
-			if ($r['category'] == $r['id'])
-			{
-			
-				$cats[] = array( "f_".$r['forum_id'], "Sub Category Forum: ".$r['forum_name'] );
-			}
-			
-		}
-		
-		//+-------------------------------
-		// Make sure we have more than 1
-		// forum..
-		//+-------------------------------
-		
-		if ($DB->get_num_rows() < 2)
-		{
-			$ADMIN->error("Can not remove this forum, please create another category or sub cat forum before attempting to remove this one");
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->page_title = "Removing Sub Category forum '$name'";
-		
-		$ADMIN->page_detail = "Before we remove this forum, we need to determine what to do with any sub forums you have in the sub category.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dosubdelete'),
-												  2 => array( 'act'   , 'forum'     ),
-												  3 => array( 'f'     , $IN['f']  ),
-												  4 => array( 'name'  , $name ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Required" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum to remove: </b>" , $name )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Move all <i>existing forums</i> to which parent?</b>" ,
-												  $SKIN->form_dropdown( "MOVE_ID", $cats )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Move sub forums and remove this forum");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	
-	function dosubdelete() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the source forum ID.");
-		}
-		
-		if ($IN['MOVE_ID'] == "")
-		{
-			$ADMIN->error("Could not determine the destination parent ID.");
-		}
-		
-		$cat    = -1;
-		$parent = -1;
-		
-		if ( preg_match( "/^c_(\d+)$/", $IN['MOVE_ID'], $match ) )
-		{
-			$cat = $match[1];
-		}
-		else
-		{
-			$parent = preg_replace( "/^f_/", "", $IN['MOVE_ID'] );
-		}
-		
-		// Move sub forums...
-		
-		$DB->query("UPDATE ibf_forums SET category='$cat', parent_id='$parent' WHERE parent_id='".$IN['f']."'");
-		
-		$DB->query("DELETE FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		// Delete any moderators, if any..
-		
-		$DB->query("DELETE FROM ibf_moderators WHERE forum_id='".$IN['f']."'");
-		
-		$ADMIN->save_log("Removed sub-forum '{$IN['name']}'");
-		
-		$ADMIN->done_screen("Forum Removed", "Forum Control", "act=cat" );
-		
-	}
-	
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Show forum rules
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function show_rules() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to empty.");
-		}
-		
-		$DB->query("SELECT id, name, show_rules, rules_title, rules_text FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		//+-------------------------------
-		// Make sure we have a legal forum
-		//+-------------------------------
-		
-		if ( !$DB->get_num_rows() )
-		{
-			$ADMIN->error("Could not resolve that forum ID");
-		}
-		
-		$forum = $DB->fetch_row();
-		
-		//+-------------------------------
-		
-		$ADMIN->page_title = "Forum Rules";
-		$ADMIN->page_detail  = "You may edit, add, remove or change the state of the forum rules display";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dorules'),
-												  2 => array( 'act'   , 'forum'  ),
-												  3 => array( 'f'     , $IN['f'] ),
-											) );
-		
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Rules set up" );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Display method</b>" ,
-												  $SKIN->form_dropdown( "show_rules",
-																		array( 
-																				0 => array( '0' , 'Don\'t Show' ),
-																				1 => array( '1' , 'Show Link Only' ),
-																				2 => array( '2' , 'Show full text' )
-																			 ),
-												  						$forum['show_rules']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Rules Title</b>" ,
-												  $SKIN->form_input("title", $std->txt_stripslashes(str_replace( "'", '&#039;', $forum['rules_title'])))
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Rules Text</b><br>(HTML Editing Mode)" ,
-												  $SKIN->form_textarea( "body", $std->txt_stripslashes($forum['rules_text']), 65, 20 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit forum rules");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	
-	function do_rules() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to empty.");
-		}
-		
-		$rules = array( 
-						'rules_title'    => $ADMIN->make_safe($std->txt_stripslashes($HTTP_POST_VARS['title'])),
-						'rules_text'     => $ADMIN->make_safe($std->txt_stripslashes($HTTP_POST_VARS['body'])),
-						'show_rules'     => $IN['show_rules']
-					  );
-					  
-		$dbs = $DB->compile_db_update_string($rules);
-		
-		$DB->query("UPDATE ibf_forums SET $dbs WHERE id='".$IN['f']."'");
-		
-		$ADMIN->done_screen("Forum Rules Updated", "Forum Control", "act=cat" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// RECOUNT FORUM: Recounts topics and posts
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function recount($f_override="") {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($f_override != "")
-		{
-			// Internal call, remap
-			
-			$IN['f'] = $f_override;
-		}
-		
-		$DB->query("SELECT name FROM ibf_forums WHERE id='".$IN['f']."'");
-		$forum = $DB->fetch_row();
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to resync.");
-		}
-		
-		// Get the topics..
-		
-		$DB->query("SELECT COUNT(tid) as count FROM ibf_topics WHERE approved=1 and forum_id='".$IN['f']."'");
-		$topics = $DB->fetch_row();
-		
-		// Get the posts..
-		
-		$DB->query("SELECT COUNT(pid) as count FROM ibf_posts WHERE queued <> 1 and forum_id='".$IN['f']."'");
-		$posts = $DB->fetch_row();
-		
-		// Get the forum last poster..
-		
-		$DB->query("SELECT tid, title, last_poster_id, last_poster_name, last_post FROM ibf_topics WHERE approved=1 and forum_id='".$IN['f']."' ORDER BY last_post DESC LIMIT 0,1");
-		$last_post = $DB->fetch_row();
-		
-		// Reset this forums stats
-		
-		$postc = $posts['count'] - $topics['count'];
-		
-		if ($postc < 0)
-		{
-			$postc = 0;
-		}
-		
-		$db_string = $DB->compile_db_update_string( array (
-															 'last_poster_id'   => $last_post['last_poster_id'],
-															 'last_poster_name' => $last_post['last_poster_name'],
-															 'last_post'        => $last_post['last_post'],
-															 'last_title'       => $last_post['title'],
-															 'last_id'          => $last_post['tid'],
-															 'topics'           => $topics['count'],
-															 'posts'            => $postc
-												 )        );
-												 
-		$DB->query("UPDATE ibf_forums SET $db_string WHERE id='".$IN['f']."'");
-		
-		// Override? then return..
-		
-		if ($f_override != "")
-		{
-			return TRUE;
-		}
-		
-		$ADMIN->save_log("Recounted posts in forum '{$forum['name']}'");
-		
-		$ADMIN->done_screen("Forum Resynchronised", "Forum Control", "act=cat" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// EMPTY FORUM: Removes all topics and posts, etc.
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function empty_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to empty.");
-		}
-		
-		$DB->query("SELECT id, name FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		//+-------------------------------
-		// Make sure we have a legal forum
-		//+-------------------------------
-		
-		if ( !$DB->get_num_rows() )
-		{
-			$ADMIN->error("Could not resolve that forum ID");
-		}
-		
-		$forum = $DB->fetch_row();
-		
-		//+-------------------------------
-		
-		$ADMIN->page_title = "Empty Forum '{$forum['name']}'";
-		
-		$ADMIN->page_detail = "This WILL DELETE ALL TOPICS, POSTS AND POLLS.<br>The forum itself will not be deleted - please ensure you wish to carry out this action before continuing.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doempty'),
-												  2 => array( 'act'   , 'forum'     ),
-												  3 => array( 'f'     , $IN['f']  ),
-												  4 => array( 'name' , $forum['name'] ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Empty Forum '{$forum['name']}" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum to empty: </b>" , $forum['name'] )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Empty this forum");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function do_empty() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the source forum ID.");
-		}
-		
-		// Check to make sure its a valid forum.
-		
-		$DB->query("SELECT id, posts, topics FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		if ( ! $forum = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not get the forum details for the forum to empty");
-		}
-		
-		// Delete topics...
-		
-		$DB->query("DELETE FROM ibf_topics WHERE forum_id='".$IN['f']."'");
-		
-		// Move posts...
-		
-		$DB->query("DELETE FROM ibf_posts WHERE forum_id='".$IN['f']."'");
-		
-		// Move polls...
-		
-		$DB->query("DELETE FROM ibf_polls WHERE forum_id='".$IN['f']."'");
-		
-		// Move voters...
-		
-		$DB->query("DELETE FROM ibf_voters WHERE forum_id='".$IN['f']."'");
-		
-		// Clean up the stats
-		
-		$DB->query("UPDATE ibf_forums SET posts='0', topics='0', last_post='', last_poster_id='', last_poster_name='', last_title='', last_id='' WHERE id='".$IN['f']."'");
-		
-		$DB->query("UPDATE ibf_stats SET TOTAL_TOPICS=TOTAL_TOPICS-".$forum['topics'].", TOTAL_REPLIES=TOTAL_REPLIES-".$forum['posts']);
-		
-		$ADMIN->save_log("Emptied forum '{$IN['name']}' of all posts");
-		
-		$ADMIN->done_screen("Forum Emptied", "Forum Control", "act=cat" );
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// RE-ORDER CATEGORY
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function reorder_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Forum Re-Order";
-		$ADMIN->page_detail  = "To re-order the forums, simply choose the position number from the drop down box next to each forum title, when you are satisfied with the ordering, simply hit the submit button at the bottom of the form";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doreorder'),
-												  2 => array( 'act'   , 'forum'     ),
-											) );
-		
-		
-		$SKIN->td_header[] = array( "&nbsp;"       , "10%" );
-		$SKIN->td_header[] = array( "Forum Name"   , "60%" );
-		$SKIN->td_header[] = array( "Posts"        , "15%" );
-		$SKIN->td_header[] = array( "Topics"       , "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Your Categories and Forums" );
-		
-		$cats        = array();
-		$forums       = array();
-		$forum_in_cat = array();
-		$children = array();
-		
-		$DB->query("SELECT * from ibf_categories WHERE id > 0 ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			$cats[$r['id']] = $r;
-		}
-		
-		$DB->query("SELECT * from ibf_forums ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			
-			if ($r['parent_id'] > 0)
-			{
-				$children[ $r['parent_id'] ][] = $r;
-			}
-			else
-			{
-				$forums[] = $r;
-				$forum_in_cat[ $r['category'] ]++;
-			}
-			
-		}
-		
-		$i = 1;
-		
-		$last_cat_id = -1;
-		
-		foreach ($cats as $c)
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_row( array(  '&nbsp;',
-													   $c['name'],
-													   '&nbsp;',
-													   '&nbsp;',
-											 ), 'pformstrip'     );
-			$last_cat_id = $c['id'];
-			
-			
-			foreach($forums as $r)
-			{	
-			
-				if ($r['category'] == $last_cat_id)
-				{
-				
-					
-					$form_array = array();
-				
-					for ($c = 1 ; $c <= $forum_in_cat[ $r['category'] ] ; $c++ )
-					{
-						$i++;
-						
-						$form_array[] = array( $c, $c );
-					}
-					
-					if ($r['subwrap'] == 1)
-					{
-					
-						$ADMIN->html .= $SKIN->add_td_row( array(  $SKIN->form_dropdown( 'POS_'.$r['id'], $form_array, $r['position'] ),
-																   $r['name'],
-																   '&nbsp;',
-																   '&nbsp;',
-														 ), 'catrow2'     );
-					}
-					else
-					{
-					
-				
-						$ADMIN->html .= $SKIN->add_td_row( array(
-																   $SKIN->form_dropdown( 'POS_'.$r['id'], $form_array, $r['position'] ),
-																   "<b>".$r['name']."</b>",
-																   $r['posts'],
-																   $r['topics'],
-														 )      );
-					}
-					
-													 
-					if ( ( isset($children[ $r['id'] ]) ) and ( count ($children[ $r['id'] ]) > 0 ) )
-					{
-						foreach($children[ $r['id'] ] as $idx => $rd)
-						{
-							$form_array = array();
-					
-							for ($c = 1 ; $c <= count($children[ $r['id'] ]) ; $c++ )
-							{
-								$i++;
-								
-								$form_array[] = array( $c, $c );
-							}
-							
-						
-							$ADMIN->html .= $SKIN->add_td_row( array(
-																	   $SKIN->form_dropdown( 'POS_'.$rd['id'], $form_array, $rd['position'] ),
-																	   "<b>".$rd['name']."</b>",
-																	   $rd['posts'],
-																	   $rd['topics'],
-															 ), 'subforum'      );
-						}
-					}					 
-				}
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_form("Adjust Forum Ordering");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function do_reorder() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$cat_query = $DB->query("SELECT id from ibf_forums");
-		
-		while ( $r = $DB->fetch_row($cat_query) )
-		{
-			$order_query = $DB->query("UPDATE ibf_forums SET position='".$IN[ 'POS_' . $r['id'] ]."' WHERE id='".$r['id']."'");
-		}
-		
-		$ADMIN->save_log("Reordered Forums");
-		
-		$ADMIN->done_screen("Forum Ordering Adjusted", "Forum Control", "act=cat" );
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// REMOVE FORUM
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function delete_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the forum ID to delete.");
-		}
-		
-		$DB->query("SELECT id, name FROM ibf_forums ORDER BY position");
-		
-		//+-------------------------------
-		// Make sure we have more than 1
-		// forum..
-		//+-------------------------------
-		
-		if ($DB->get_num_rows() < 2)
-		{
-			$ADMIN->error("Can not remove this forum, please create another before attempting to remove this one");
-		}
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($r['id'] == $IN['f'])
-			{
-				$name = $r['name'];
-				continue;
-			}
-			
-			$form_array[] = array( $r['id'] , $r['name'] );
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->page_title = "Removing forum '$name'";
-		
-		$ADMIN->page_detail = "Before we remove this forum, we need to determine what to do with any topics and posts you may have left in this forum.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dodelete'),
-												  2 => array( 'act'   , 'forum'     ),
-												  3 => array( 'f'     , $IN['f']  ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Required" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum to remove: </b>" , $name )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Move all <i>existing topics and posts in this forum</i> to which forum?</b>" ,
-												  $SKIN->form_dropdown( "MOVE_ID", $form_array )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Move topics and delete this forum");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function do_delete() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$DB->query("SELECT * FROM ibf_forums WHERE id='".$IN['f']."'");
-		$forum = $DB->fetch_row();
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("Could not determine the source forum ID.");
-		}
-		
-		if ($IN['MOVE_ID'] == "")
-		{
-			$ADMIN->error("Could not determine the destination forum ID.");
-		}
-		
-		// Move topics...
-		
-		$DB->query("UPDATE ibf_topics SET forum_id='".$IN['MOVE_ID']."' WHERE forum_id='".$IN['f']."'");
-		
-		// Move posts...
-		
-		$DB->query("UPDATE ibf_posts SET forum_id='".$IN['MOVE_ID']."' WHERE forum_id='".$IN['f']."'");
-		
-		// Move polls...
-		
-		$DB->query("UPDATE ibf_polls SET forum_id='".$IN['MOVE_ID']."' WHERE forum_id='".$IN['f']."'");
-		
-		// Move voters...
-		
-		$DB->query("UPDATE ibf_voters SET forum_id='".$IN['MOVE_ID']."' WHERE forum_id='".$IN['f']."'");
-		
-		// Delete the forum
-		
-		$DB->query("DELETE FROM ibf_forums WHERE id='".$IN['f']."'");
-		
-		// Delete any moderators, if any..
-		
-		$DB->query("DELETE FROM ibf_moderators WHERE forum_id='".$IN['f']."'");
-		
-		
-		$this->recount($IN['MOVE_ID']);
-		
-		// Have we moved this forum from a sub cat forum?
-		// If so, are there any forums left in this sub cat forum?
-		
-		if ($forum['parent_id'] > 0)
-		{
-			$DB->query("SELECT id FROM ibf_forums WHERE parent_id='{$forum['parent_id']}'");
-			
-			if ( ! $DB->get_num_rows() )
-			{
-				// No, there are no more forums that have a parent id the same as the one we've just moved it from
-				// So, make that forum a normal forum then!
-				
-				$DB->query("UPDATE ibf_forums SET subwrap=0 WHERE id='{$forum['parent_id']}'");
-			}
-		}
-		
-		$ADMIN->save_log("Removed forum '{$forum['name']}'");
-		
-		$ADMIN->done_screen("Forum Removed", "Forum Control", "act=cat" );
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// NEW FORUM
-	//
-	//+---------------------------------------------------------------------------------
-	
-	
-	function new_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
-		
-		$f_name = "";
-		
-		if ($HTTP_GET_VARS['name'] != "")
-		{
-			$f_name = $std->txt_stripslashes(urldecode($HTTP_GET_VARS['name']));
-		}
-		
-		$cats = array();
-		$seen = array();
-		
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT c.id, c.name, f.id as forum_id, f.subwrap, f.name as forum_name, f.subwrap, f.parent_id, f.category FROM ibf_categories c, ibf_forums f WHERE c.id > 0 ORDER BY c.position, f.position");
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				if ($r['parent_id'] > 0)
-				{
-					continue;
-				}
-					
-				if ($last_cat_id != $r['id'])
-				{
-					$cats[] = array( "c_".$r['id'] , "Category: ".$r['name'] );
-					
-					$seen[$r['id']] = 1;
-					
-					$last_cat_id = $r['id'];
-				}
-				
-				if ($r['category'] == $r['id'])
-				{
-					if ($r['forum_id'] != $IN['f'])
-					{
-						$cats[] = array( "f_".$r['forum_id'], "---- ".$r['forum_name'] );
-					}
-				}
-				
-			}
-		
-		}
-		else
-		{
-			// No forums, get cats only..
-			
-			$DB->query("SELECT * from ibf_categories WHERE id > 0");
-			
-			while ($r = $DB->fetch_row())
-			{
-				$cats[] = array( "c_".$r['id'] , "Category: ".$r['name'] );
-			}
-			
-		}
-		
-		$ADMIN->page_title = "Add a new Forum";
-		
-		$ADMIN->page_detail = "This section will allow you to add a new forum to an existing category. Please ensure you select the correct category to insert
-							   the new forum into. If you do make a mistake, clicking on \"Edit Settings\" will allow you to make any changes after the forum has
-							   been created.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'donew'  ),
-												  2 => array( 'act'   , 'forum'  ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Basic Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Add to which parent?</b><br>" ,
-												  $SKIN->form_dropdown("CATEGORY", $cats)
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum State</b>" ,
-												  $SKIN->form_dropdown( "FORUM_STATUS",
-																			array( 
-																					0 => array( 1, 'Active' ),
-																					1 => array( 0, 'Read Only Archive'  ),
-																				 ),
-												  						"1"
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum Name</b>" ,
-												  $SKIN->form_input("FORUM_NAME", $f_name)
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum Description</b><br>You may use HTML - linebreaks are converted 'Auto-Magically'" ,
-												  $SKIN->form_textarea("FORUM_DESC")
-									     )      );
-									     
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Root Forum Option: allow posting in this forum?" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow new topics and posts in this forum?</b><br>If yes, any sub-forums will be displayed above the normal topic list, if there are no sub-forums to show, it will display the topic list as normal<br><b>If 'no' you can skip the rest of this form as the settings will have no effect and this forum will act like a category.</b>" ,
-												  $SKIN->form_yes_no("sub_can_post", 1)."<br><b>NOTE</b> This option will have no effect if you use another forum as a parent for this new forum",
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Redirect Options" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>URL to redirect this forum to</b>" ,
-												  $SKIN->form_input("redirect_url")
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Target to redirect to?</b><br>Leave blank or use '_self' to load in same browser window" ,
-												  $SKIN->form_input("redirect_loc")
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Switch on the URL redirect?</b><br>If 'yes' you can skip to the forum permission as the settings will have no effect and this forum will act like as a redirect link. Current posts will not be accessible when on." ,
-												  $SKIN->form_yes_no("redirect_on", 0)
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Redirect clicks to date</b>" ,
-												  $SKIN->form_input("redirect_hits", 0)
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Postable Forum Options" );
-		
-		//+-------------------------------
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow use of the [doHTML] tag?</b><br />This will allow HTML to be posted and executed" ,
-												  $SKIN->form_yes_no("FORUM_HTML", 0 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow IBF CODE to be posted?</b>" ,
-												  $SKIN->form_yes_no("FORUM_IBC", 1 )
-									     )      );
-									     
-		//-----------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Turn on the Quick Reply Box?</b>" ,
-												  $SKIN->form_yes_no("quick_reply", 0 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow Polls in this forum (when allowed)?</b>" ,
-												  $SKIN->form_yes_no("allow_poll", 1 )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow votes to bump a topic?</b>" ,
-												  $SKIN->form_yes_no("allow_pollbump", 0 )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Posts in this forum increase member's cumulative post count?</b>" ,
-												  $SKIN->form_yes_no("inc_postcount", 1 )
-									     )      );
-									     
-		//-----------
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderate postings?</b><br>(Requires a moderator to manually add posts/topics to the forum)" ,
-												  $SKIN->form_dropdown("MODERATE", array(
-												  									 0 => array( 0, 'No' ),
-												  									 1 => array( 1, 'Moderate all new topics and all replies' ),
-												  									 2 => array( 2, 'Moderate new topics but don\'t moderate replies' ),
-												  									 3 => array( 3, 'Moderate replies but don\'t moderate new topics' ),
-												  									   ),
-												  							    0 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email addresses to send new topic awaiting approval notification?</b><br>(Leave this box empty if you do not require this)<br />Separate many with a comma (add@ress1.com,add@ress2.com)" ,
-												  $SKIN->form_input("notify_modq_emails", $forum['notify_modq_emails'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Require password access?<br>Enter the password here</b><br>(Leave this box empty if you do not require this)" ,
-												  $SKIN->form_input("FORUM_PROTECT")
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default date cut off for topic display</b>" ,
-												  $SKIN->form_dropdown( "PRUNE_DAYS",
-																			array( 
-																					0 => array( 1, 'Today' ),
-																					1 => array( 5, 'Last 5 days'  ),
-																					2 => array( 7, 'Last 7 days'  ),
-																					3 => array( 10, 'Last 10 days' ),
-																					4 => array( 15, 'Last 15 days' ),
-																					5 => array( 20, 'Last 20 days' ),
-																					6 => array( 25, 'Last 25 days' ),
-																					7 => array( 30, 'Last 30 days' ),
-																					8 => array( 60, 'Last 60 days' ),
-																					9 => array( 90, 'Last 90 days' ),
-																					10=> array( 100,'Show All'     ),
-																				 ),
-												  						"30"
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sort key</b>" ,
-												  $SKIN->form_dropdown( "SORT_KEY",
-																			array( 
-																					0 => array( 'last_post', 'Date of the last post' ),
-																					1 => array( 'title'    , 'Topic Title' ),
-																					2 => array( 'starter_name', 'Topic Starters Name' ),
-																					3 => array( 'posts'    , 'Topic Posts' ),
-																					4 => array( 'views'    , 'Topic Views' ),
-																					5 => array( 'start_date', 'Date topic started' ),
-																					6 => array( 'last_poster_name'   , 'Name of the last poster' ),
-																				 ),
-												  						"last_post"
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sort order</b>" ,
-												  $SKIN->form_dropdown( "SORT_ORDER",
-																			array( 
-																					0 => array( 'Z-A', 'Descending (Z - A, 0 - 10)' ),
-																					1 => array( 'A-Z', 'Ascending (A - Z, 10 - 0)' ),
-																				 ),
-												  						"Z-A"
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-											
-		$SKIN->td_header[] = array( "Name"  , "40%" );
-		$SKIN->td_header[] = array( "Read"  , "15%" );
-		$SKIN->td_header[] = array( "Reply" , "15%" );
-		$SKIN->td_header[] = array( "Start" , "15%" );
-		$SKIN->td_header[] = array( "Upload", "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table("Permission Access Levels");
-		
-		$ADMIN->html .= $SKIN->build_group_perms($forum['read_perms'], $forum['start_perms'], $forum['reply_perms'], $forum['upload_perms']);
-		
-		$ADMIN->html .= $SKIN->end_form("Create this forum");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-
-	//------------------------------------------------------------------------------------------------
-	//------------------------------------------------------------------------------------------------
-	
-	function do_new() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$IN['FORUM_NAME'] = trim($IN['FORUM_NAME']);
-		
-		if ($IN['FORUM_NAME'] == "")
-		{
-			$ADMIN->error("You must enter a forum title");
-		}
-		
-		// Get the new forum id. We could use auto_incrememnt, but we need the ID to use as the default
-		// forum position...
-		
-		$DB->query("SELECT MAX(id) as top_forum FROM ibf_forums");
-		$row = $DB->fetch_row();
-		
-		if ($row['top_forum'] < 1) $row['top_forum'] = 0;
-		
-		$row['top_forum']++;
-		
-		$perms = $ADMIN->compile_forum_perms();
-		
-		$cat    = -1;
-		$parent = -1;
-		
-		if ( preg_match( "/^c_(\d+)$/", $IN['CATEGORY'], $match ) )
-		{
-			$cat = $match[1];
-		}
-		else
-		{
-			$parent = preg_replace( "/^f_/", "", $IN['CATEGORY'] );
-			
-			$DB->query("SELECT category FROM ibf_forums WHERE id='$parent'");
-			
-			if ($forum_result = $DB->fetch_row())
-			{
-				$cat = $forum_result['category'];
-			}
-		}
-		
-		$db_string = $DB->compile_db_insert_string( array (
-															'id'               => $row['top_forum'],
-															'position'         => $row['top_forum'],
-															'topics'           => 0,
-															'posts'            => 0,
-															'last_post'        => "",
-															'last_poster_id'   => "",
-															'last_poster_name' => "",
-															'name'             => $IN['FORUM_NAME'],
-															'description'      => $std->my_nl2br( $std->txt_stripslashes($HTTP_POST_VARS['FORUM_DESC']) ),
-															'use_ibc'          => $IN['FORUM_IBC'],
-															'use_html'         => $IN['FORUM_HTML'],
-															'status'           => $IN['FORUM_STATUS'],
-															'start_perms'      => $perms['START'],
-															'reply_perms'      => $perms['REPLY'],
-															'read_perms'       => $perms['READ'],
-															'upload_perms'     => $perms['UPLOAD'],
-															'password'         => $IN['FORUM_PROTECT'],
-															'category'         => $cat,
-															'last_id'          => "",
-															'last_title'       => "",
-															'sort_key'         => $IN['SORT_KEY'],
-															'sort_order'       => $IN['SORT_ORDER'],
-															'prune'            => $IN['PRUNE_DAYS'],
-															'show_rules'       => 0,
-															'preview_posts'    => $IN['MODERATE'],
-															'allow_poll'       => $IN['allow_poll'],
-															'allow_pollbump'   => $IN['allow_pollbump'],
-															'inc_postcount'    => $IN['inc_postcount'],
-															'parent_id'        => $parent,
-															'sub_can_post'     => $IN['sub_can_post'],
-															'quick_reply'      => $IN['quick_reply'],
-															'redirect_on'       => $IN['redirect_on'],
-															'redirect_hits'     => $IN['redirect_hits'],
-															'redirect_url'      => $IN['redirect_url'],
-															'redirect_loc'		=> $IN['redirect_loc'],
-															'notify_modq_emails'=> $IN['notify_modq_emails'],
-															
-												  )       );
-												  
-		$DB->query("INSERT INTO ibf_forums (".$db_string['FIELD_NAMES'].") VALUES (".$db_string['FIELD_VALUES'].")");
-		
-		if ($parent != -1)
-		{
-			$DB->query("UPDATE ibf_forums SET subwrap=1 WHERE id='$parent'");
-		}
-		
-		$ADMIN->save_log("Forum '{$IN['FORUM_NAME']}' created");
-		
-		$ADMIN->done_screen("Forum {$IN['FORUM_NAME']} created", "Forum Control", "act=cat" );
-		
-		
-		
-	}
-	
-	//------------------------------------------------------------------------------------------------
-	//------------------------------------------------------------------------------------------------
-	
-	
-
-	//+---------------------------------------------------------------------------------
-	//
-	// EDIT FORUM
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function edit_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("You didn't choose a forum to edit, duh!");
-		}
-		
-		$cats = array();
-		$seen = array();
-		
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT c.id, c.name, f.subwrap, f.id as forum_id, f.name as forum_name, f.subwrap, f.parent_id, f.category FROM ibf_categories c, ibf_forums f WHERE c.id > 0 ORDER BY c.position, f.position");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			
-			if ($r['parent_id'] > 0)
-			{
-				continue;
-			}
-				
-			if ($last_cat_id != $r['id'])
-			{
-				$cats[] = array( "c_".$r['id'] , "Category: ".$r['name'] );
-				
-				$seen[$r['id']] = 1;
-				
-				$last_cat_id = $r['id'];
-			}
-			
-			if ($r['category'] == $r['id'])
-			{
-				if ($r['forum_id'] != $IN['f'])
-				{
-					$cats[] = array( "f_".$r['forum_id'], "---- ".$r['forum_name'] );
-				}
-			}
-			
-		}
-		
-		$DB->query("SELECT * FROM ibf_forums WHERE id='".$IN['f']."'");
-		$forum = $DB->fetch_row();
-		
-		if ($forum['id'] == "")
-		{
-			$ADMIN->error("Could not retrieve the forum data based on ID {$IN['f']}");
-		}
-		
-		//-------------------------------------
-		
-		$real_parent = "";
-		
-		if ($forum['parent_id'] < 1)
-		{
-			$real_parent = 'c_'.$forum['category'];
-		}
-		else
-		{
-			$real_parent = 'f_'.$forum['parent_id'];
-		}
-		
-		//-------------------------------------
-		
-		$ADMIN->page_title = "Edit a Forum";
-		
-		$ADMIN->page_detail = "This section will allow you to edit an existing forum. If you wish to adjust the forum permissions (who has the ability to
-							   start, reply and read topics) click on 'Edit Permissions on the Forums and Categories overview.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doedit'  ),
-												  2 => array( 'act'   , 'forum'   ),
-												  3 => array( 'f'     , $IN['f']  ),
-												  4 => array( 'name'  , $forum['name'] ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Basic Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Add to which parent?</b><br>" ,
-												  $SKIN->form_dropdown("CATEGORY", $cats, $real_parent)
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum State</b>" ,
-												  $SKIN->form_dropdown( "FORUM_STATUS",
-																			array( 
-																					0 => array( 1, 'Active' ),
-																					1 => array( 0, 'Read Only Archive'  ),
-																				 ),
-												  						$forum['status']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum Name</b>" ,
-												  $SKIN->form_input("FORUM_NAME", $forum['name'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum Description</b><br>You may use HTML - linebreaks 'Auto-Magically' converted to &lt;br&gt;" ,
-												  $SKIN->form_textarea("FORUM_DESC", $std->my_br2nl( $forum['description']) )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Redirect Options" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>URL to redirect this forum to</b>" ,
-												  $SKIN->form_input("redirect_url", $forum['redirect_url'])
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Target to redirect to?</b><br>Leave blank or use '_self' to load in same browser window" ,
-												  $SKIN->form_input("redirect_loc", $forum['redirect_loc'])
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Switch on the URL redirect?</b><br>If 'yes' you can skip the rest of this form as the settings will have no effect and this forum will act like as a redirect link. Current posts will not be accessible when on." ,
-												  $SKIN->form_yes_no("redirect_on",
-												 					 $forum['redirect_on'],
-												  					  array(
-												  					  		  'yes' => " onclick=\"ShowHide('canpost', 'canpostoff');\" ",
-												  					  		  'no'  => " onclick=\"ShowHide('canpost', 'canpostoff');\" "
-												  					  	   )
-												  					 )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Redirect clicks to date</b>" ,
-												  $SKIN->form_input("redirect_hits", $forum['redirect_hits'])
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		
-		if ($forum['parent_id'] > 0)
-		{
-			$extra = "<span id='normal' style='color:red'><br><b>NOTE</b>: This forum is <b>not</b> a root forum, this option will have no effect unless you change the parent to a category</span>";
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$cp2_show = $forum['redirect_on'] == 1 ? 'show' : 'none';
-		$cp_show  = $forum['redirect_on'] == 1 ? 'none' : 'show';
-		
-		$ADMIN->html .= "\n<div id='canpost' style='display:$cp_show'>\n";
-		
-		$ADMIN->html .= $SKIN->start_table( "Root Forum Option: Allow posting in this forum?" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow new topics and posts in this forum?</b><br>If yes, any sub-forums will be displayed above the normal topic list, if there are no sub-forums to show, it will display the topic list as normal<br><b>If 'no' you can skip the rest of this form as the settings will have no effect and this forum will act like a category.</b>" ,
-												  $SKIN->form_yes_no(
-												  					  "sub_can_post",
-												  					  $forum['sub_can_post'],
-												  					  array(
-												  					  		  'yes' => " onclick=\"ShowHide('main_div', 'maindivoff');\" ",
-												  					  		  'no'  => " onclick=\"ShowHide('main_div', 'maindivoff');\" "
-												  					  	   )
-												  					) . $extra
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		
-		$md_show  = $forum['sub_can_post'] == 1 ? 'show' : 'none';
-		$md2_show = $forum['sub_can_post'] == 1 ? 'none' : 'show';
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$ADMIN->html .= "\n<div id='main_div' style='display:$md_show'>\n";
-		
-		$ADMIN->html .= $SKIN->start_table( "Postable Forum Settings" );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow use of the [doHTML] tag?</b><br />This will allow HTML to be posted and executed" ,
-												  $SKIN->form_yes_no("FORUM_HTML", $forum['use_html'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow IBF CODE to be posted?</b>" ,
-												  $SKIN->form_yes_no("FORUM_IBC", $forum['use_ibc'] )
-									     )      );
-									     
-		//-----------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Turn on the Quick Reply Box?</b>" ,
-												  $SKIN->form_yes_no("quick_reply", $forum['quick_reply'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow Polls in this forum (when allowed)?</b>" ,
-												  $SKIN->form_yes_no("allow_poll", $forum['allow_poll'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow votes to bump a topic?</b>" ,
-												  $SKIN->form_yes_no("allow_pollbump", $forum['allow_pollbump'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Posts in this forum increase member's cumulative post count?</b>" ,
-												  $SKIN->form_yes_no("inc_postcount", $forum['inc_postcount'] )
-									     )      );
-									     
-		//-----------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderate postings?</b><br>(Requires a moderator to manually add posts/topics to the forum)" ,
-												  $SKIN->form_dropdown("MODERATE", array(
-												  									 0 => array( 0, 'No' ),
-												  									 1 => array( 1, 'Moderate all new topics and all replies' ),
-												  									 2 => array( 2, 'Moderate new topics but don\'t moderate replies' ),
-												  									 3 => array( 3, 'Moderate replies but don\'t moderate new topics' ),
-												  									   ),
-												  							    $forum['preview_posts'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email addresses to send new topic awaiting approval notification?</b><br>(Leave this box empty if you do not require this)<br />Separate many with a comma (add@ress1.com,add@ress2.com)" ,
-												  $SKIN->form_input("notify_modq_emails", $forum['notify_modq_emails'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Require password access?<br>Enter the password here</b><br>(Leave this box empty if you do not require this)" ,
-												  $SKIN->form_input("FORUM_PROTECT", $forum['password'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default date cut off for topic display</b>" ,
-												  $SKIN->form_dropdown( "PRUNE_DAYS",
-																			array( 
-																					0 => array( 1, 'Today' ),
-																					1 => array( 5, 'Last 5 days'  ),
-																					2 => array( 7, 'Last 7 days'  ),
-																					3 => array( 10, 'Last 10 days' ),
-																					4 => array( 15, 'Last 15 days' ),
-																					5 => array( 20, 'Last 20 days' ),
-																					6 => array( 25, 'Last 25 days' ),
-																					7 => array( 30, 'Last 30 days' ),
-																					8 => array( 60, 'Last 60 days' ),
-																					9 => array( 90, 'Last 90 days' ),
-																					10=> array( 100,'Show All'     ),
-																				 ),
-												  						$forum['prune']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sort key</b>" ,
-												  $SKIN->form_dropdown( "SORT_KEY",
-																			array( 
-																					0 => array( 'last_post', 'Date of the last post' ),
-																					1 => array( 'title'    , 'Topic Title' ),
-																					2 => array( 'starter_name', 'Topic Starters Name' ),
-																					3 => array( 'posts'    , 'Topic Posts' ),
-																					4 => array( 'views'    , 'Topic Views' ),
-																					5 => array( 'start_date', 'Date topic started' ),
-																					6 => array( 'last_poster_name'   , 'Name of the last poster' ),
-																				 ),
-												  						$forum['sort_key']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sort order</b>" ,
-												  $SKIN->form_dropdown( "SORT_ORDER",
-																			array( 
-																					0 => array( 'Z-A', 'Descending (Z - A, 0 - 10)' ),
-																					1 => array( 'A-Z', 'Ascending (A - Z, 10 - 0)' ),
-																				 ),
-												  						$forum['sort_order']
-												  					  )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->html .= "\n<!--END MAIN DIV--></div>\n
-		                   <div id='maindivoff' class='offdiv' style='display:$md2_show'>
-		                     <div class='tableborder'>
-						       <div class='maintitle'><a href=\"javascript:ShowHide('main_div', 'maindivoff');\"><img src='{$SKIN->img_url}/plus.gif'></a>&nbsp;<a href=\"javascript:ShowHide('main_div', 'maindivoff');\">Postable Forum Settings</a></div>
-						     </div>
-		                 </div><br />\n";
-		                 
-		                
-		$ADMIN->html .= "\n<!--END CAN POST DIV--></div>\n
-		                   <div id='canpostoff' style='display:$cp2_show'>
-		                     <div class='tableborder'>
-						       <div class='maintitle'><a href=\"javascript:ShowHide('canpost', 'canpostoff');\"><img src='{$SKIN->img_url}/plus.gif'></a>&nbsp;<a href=\"javascript:ShowHide('main_div', 'maindivoff');\">Postable Forum Settings</a></div>
-						     </div>
-		                 </div><br />\n";
-		
-		$ADMIN->html .= $SKIN->end_form_standalone("Edit this forum");
-		
-		$ADMIN->nav[] = array( 'act=cat', 'Manage Forums' );
-		
-		$ADMIN->output();
-			
-			
-	}
-
-
-	//+---------------------------------------------------------------------------------
-	
-	function do_edit() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$IN['FORUM_NAME'] = trim($IN['FORUM_NAME']);
-		
-		if ($IN['FORUM_NAME'] == "")
-		{
-			$ADMIN->error("You must enter a forum title");
-		}
-		
-		$DB->query("SELECT * from ibf_forums WHERE id='".$IN['f']."'");
-		
-		$old_details = $DB->fetch_row();
-		
-		$cat    = -1;
-		$parent = -1;
-		
-		if ( preg_match( "/^c_(\d+)$/", $IN['CATEGORY'], $match ) )
-		{
-			$cat = $match[1];
-		}
-		else
-		{
-			$parent = preg_replace( "/^f_/", "", $IN['CATEGORY'] );
-			
-			$DB->query("SELECT category FROM ibf_forums WHERE id='$parent'");
-			
-			if ($forum_result = $DB->fetch_row())
-			{
-				$cat = $forum_result['category'];
-			}
-		}
-		
-		$db_string = $DB->compile_db_update_string( array (
-															
-															'name'              => $IN['FORUM_NAME'],
-															'description'       => $std->my_nl2br( $std->txt_stripslashes($HTTP_POST_VARS['FORUM_DESC']) ),
-															'use_ibc'           => $IN['FORUM_IBC'],
-															'use_html'          => $IN['FORUM_HTML'],
-															'status'            => $IN['FORUM_STATUS'],
-															'password'          => $IN['FORUM_PROTECT'],
-															'category'          => $cat,
-															'sort_key'          => $IN['SORT_KEY'],
-															'sort_order'        => $IN['SORT_ORDER'],
-															'prune'             => $IN['PRUNE_DAYS'],
-															'preview_posts'     => $IN['MODERATE'],
-															'allow_poll'        => $IN['allow_poll'],
-															'allow_pollbump'    => $IN['allow_pollbump'],
-															'inc_postcount'     => $IN['inc_postcount'],
-															'parent_id'         => $parent,
-															'sub_can_post'      => $IN['sub_can_post'],
-															'quick_reply'       => $IN['quick_reply'],
-															'redirect_on'       => $IN['redirect_on'],
-															'redirect_hits'     => $IN['redirect_hits'],
-															'redirect_url'      => $IN['redirect_url'],
-															'redirect_loc'		=> $IN['redirect_loc'],
-															'notify_modq_emails'=> $IN['notify_modq_emails'],
-															
-												  )       );
-												  
-		$DB->query("UPDATE ibf_forums SET $db_string WHERE id='".$IN['f']."'");
-		
-		// Update the parent if need be
-		
-		if ($parent != -1)
-		{
-			$DB->query("UPDATE ibf_forums SET subwrap=1 WHERE id='$parent'");
-		}
-		
-		// Have we moved this forum from a sub cat forum?
-		// If so, are there any forums left in this sub cat forum?
-		
-		if (($old_details['parent_id'] > 0) and ($old_details['parent_id'] != $parent))
-		{
-			$DB->query("SELECT id FROM ibf_forums WHERE parent_id='{$old_details['parent_id']}'");
-			
-			if ( ! $DB->get_num_rows() )
-			{
-				// No, there are no more forums that have a parent id the same as the one we've just moved it from
-				// So, make that forum a normal forum then!
-				
-				$DB->query("UPDATE ibf_forums SET subwrap=0 WHERE id='{$old_details['parent_id']}'");
-			}
-		}
-		
-		$ADMIN->save_log("Forum '{$IN['name']}' edited");
-		
-		$ADMIN->done_screen("Forum {$IN['name']} Edited", "Forum Control", "act=cat" );
-		
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Sub Cat Edit Form
-	//
-	//+---------------------------------------------------------------------------------
-	
-	
-	function subedit() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
-		
-		
-		$cats = array();
-		
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT * from ibf_categories WHERE id > 0 ORDER BY position");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$cats[] = array( $r['id'] , "Category: ".$r['name'] );
-		}
-		
-		$DB->query("SELECT * from ibf_forums WHERE subwrap='1' AND id='".$IN['f']."'");
-		
-		if (! $forum = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not find that sub category forum in the database");
-		}
-		
-		if ($forum['password'] == '-1')
-		{
-			$forum['password'] = "";
-		}
-		
-		$ADMIN->page_title = "Editing a Sub Category Forum";
-		
-		$ADMIN->page_detail = "This section will allow you edit a sub category forum.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doeditsub'  ),
-												  2 => array( 'act'   , 'forum'  ),
-												  3 => array( 'f'     , $IN['f'] ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Basic Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Add to which parent?</b><br>" ,
-												  $SKIN->form_dropdown("CATEGORY", $cats, $forum['category'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum Name</b>" ,
-												  $SKIN->form_input("name", $forum['name'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum Description</b>" ,
-												  $SKIN->form_textarea("desc", $forum['description'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forum State</b>" ,
-												  $SKIN->form_dropdown( "FORUM_STATUS",
-																			array( 
-																					0 => array( 1, 'Active' ),
-																					1 => array( 0, 'Read Only Archive'  ),
-																				 ),
-												  						$forum['status']
-												  					  )
-									     )      );
-									     
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Redirect Options" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>URL to redirect this forum to</b>" ,
-												  $SKIN->form_input("redirect_url", $forum['redirect_url'])
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Target to redirect to?</b><br>Leave blank or use '_self' to load in same browser window" ,
-												  $SKIN->form_input("redirect_loc", $forum['redirect_loc'])
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Switch on the URL redirect?</b><br>If 'yes' you can skip the rest of this form as the settings will have no effect and this forum will act like as a redirect link. Current posts will not be accessible when on." ,
-												  $SKIN->form_yes_no("redirect_on",
-												 					 $forum['redirect_on'],
-												  					  array(
-												  					  		  'yes' => " onclick=\"ShowHide('canpost', 'canpostoff');\" ",
-												  					  		  'no'  => " onclick=\"ShowHide('canpost', 'canpostoff');\" "
-												  					  	   )
-												  					 )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Redirect clicks to date</b>" ,
-												  $SKIN->form_input("redirect_hits", $forum['redirect_hits'])
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$cp2_show = $forum['redirect_on'] == 1 ? 'show' : 'none';
-		$cp_show  = $forum['redirect_on'] == 1 ? 'none' : 'show';
-		
-		$ADMIN->html .= "\n<div id='canpost' style='display:$cp_show'>\n";
-		
-		$ADMIN->html .= $SKIN->start_table( "Allow posting in this forum?" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow new topics and posts in this forum?</b><br>If yes, the forums in this sub-forum will be displayed above the normal topic list. <b>If 'no' you can skip the rest of this form as the settings will have no effect</b>" ,
-												  $SKIN->form_yes_no(
-												  					  "sub_can_post",
-												  					  $forum['sub_can_post'],
-												  					  array(
-												  					  		  'yes' => " onclick=\"ShowHide('main_div', 'maindivoff');\" ",
-												  					  		  'no'  => " onclick=\"ShowHide('main_div', 'maindivoff');\" "
-												  					  	   )
-												  					) . $extra
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		
-		$md_show  = $forum['sub_can_post'] == 1 ? 'show' : 'none';
-		$md2_show = $forum['sub_can_post'] == 1 ? 'none' : 'show';
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		$ADMIN->html .= "\n<div id='main_div' style='display:$md_show'>\n";
-		
-		$ADMIN->html .= $SKIN->start_table( "Postable Forum Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow use of the [doHTML] tag?</b><br />This will allow HTML to be posted and executed" ,
-												  $SKIN->form_yes_no("FORUM_HTML", $forum['use_html'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow IBF CODE to be posted?</b>" ,
-												  $SKIN->form_yes_no("FORUM_IBC", $forum['use_ibc'] )
-									     )      );
-									     
-		//-----------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Turn on the Quick Reply Box?</b>" ,
-												  $SKIN->form_yes_no("quick_reply", $forum['quick_reply'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow Polls in this forum (when allowed)?</b>" ,
-												  $SKIN->form_yes_no("allow_poll", $forum['allow_poll'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow votes to bump a topic?</b>" ,
-												  $SKIN->form_yes_no("allow_pollbump", $forum['allow_pollbump'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Posts in this forum increase member's cumulative post count?</b>" ,
-												  $SKIN->form_yes_no("inc_postcount", $forum['inc_postcount'] )
-									     )      );
-									     
-		//-----------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderate postings?</b><br>(Requires a moderator to manually add posts/topics to the forum)" ,
-												  $SKIN->form_dropdown("MODERATE", array(
-												  									 0 => array( 0, 'No' ),
-												  									 1 => array( 1, 'Moderate all new topics and all replies' ),
-												  									 2 => array( 2, 'Moderate new topics but don\'t moderate replies' ),
-												  									 3 => array( 3, 'Moderate replies but don\'t moderate new topics' ),
-												  									   ),
-												  							    $forum['preview_posts'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email addresses to send new topic awaiting approval notification?</b><br>(Leave this box empty if you do not require this)<br />Separate many with a comma (add@ress1.com,add@ress2.com)" ,
-												  $SKIN->form_input("notify_modq_emails", $forum['notify_modq_emails'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Require password access?<br>Enter the password here</b><br>(Leave this box empty if you do not require this)" ,
-												  $SKIN->form_input("FORUM_PROTECT", $forum['password'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default date cut off for topic display</b>" ,
-												  $SKIN->form_dropdown( "PRUNE_DAYS",
-																			array( 
-																					0 => array( 1, 'Today' ),
-																					1 => array( 5, 'Last 5 days'  ),
-																					2 => array( 7, 'Last 7 days'  ),
-																					3 => array( 10, 'Last 10 days' ),
-																					4 => array( 15, 'Last 15 days' ),
-																					5 => array( 20, 'Last 20 days' ),
-																					6 => array( 25, 'Last 25 days' ),
-																					7 => array( 30, 'Last 30 days' ),
-																					8 => array( 60, 'Last 60 days' ),
-																					9 => array( 90, 'Last 90 days' ),
-																					10=> array( 100,'Show All'     ),
-																				 ),
-												  						$forum['prune']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sort key</b>" ,
-												  $SKIN->form_dropdown( "SORT_KEY",
-																			array( 
-																					0 => array( 'last_post', 'Date of the last post' ),
-																					1 => array( 'title'    , 'Topic Title' ),
-																					2 => array( 'starter_name', 'Topic Starters Name' ),
-																					3 => array( 'posts'    , 'Topic Posts' ),
-																					4 => array( 'views'    , 'Topic Views' ),
-																					5 => array( 'start_date', 'Date topic started' ),
-																					6 => array( 'last_poster_name'   , 'Name of the last poster' ),
-																				 ),
-												  						$forum['sort_key']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sort order</b>" ,
-												  $SKIN->form_dropdown( "SORT_ORDER",
-																			array( 
-																					0 => array( 'Z-A', 'Descending (Z - A, 0 - 10)' ),
-																					1 => array( 'A-Z', 'Ascending (A - Z, 10 - 0)' ),
-																				 ),
-												  						$forum['sort_order']
-												  					  )
-									     )      );
-									
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->html .= "\n<!--END MAIN DIV--></div>\n
-		                   <div id='maindivoff' class='offdiv' style='display:$md2_show'>
-		                     <div class='tableborder'>
-						       <div class='maintitle'><a href=\"javascript:ShowHide('main_div', 'maindivoff');\"><img src='{$SKIN->img_url}/plus.gif'></a>&nbsp;<a href=\"javascript:ShowHide('main_div', 'maindivoff');\">Postable Forum Settings</a></div>
-						     </div>
-						 <br />
-		                 </div>\n";
-		                 
-		                
-		$ADMIN->html .= "\n<!--END CAN POST DIV--></div>\n
-		                   <div id='canpostoff' style='display:$cp2_show'>
-		                     <div class='tableborder'>
-						       <div class='maintitle'><a href=\"javascript:ShowHide('canpost', 'canpostoff');\"><img src='{$SKIN->img_url}/plus.gif'></a>&nbsp;<a href=\"javascript:ShowHide('main_div', 'maindivoff');\">Postable Forum Settings</a></div>
-						     </div>
-		                 </div><br />\n";
-		
-		$ADMIN->html .= $SKIN->end_form_standalone("Edit this forum");
-		
-		$ADMIN->nav[] = array( 'act=cat', 'Manage Forums' );
-		
-		$ADMIN->output();
-			
-			
-	}
-	
-	function doeditsub() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$IN['FORUM_NAME'] = trim($IN['name']);
-		
-		if ($IN['FORUM_NAME'] == "")
-		{
-			$ADMIN->error("You must enter a forum title");
-		}
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("No forum id was chosen, please go back and try again");
-		}
-		
-		// Get the new forum id. We could use auto_incrememnt, but we need the ID to use as the default
-		// forum position...
-		
-		$db_string = $DB->compile_db_update_string( array (
-															'name'             => $IN['FORUM_NAME'],
-															'description'      => $std->my_nl2br( $std->txt_stripslashes($HTTP_POST_VARS['desc']) ),
-															'category'         => $IN['CATEGORY'],
-															'subwrap'          => 1,
-															'sub_can_post'     => $IN['sub_can_post'],
-															'use_ibc'           => $IN['FORUM_IBC'],
-															'use_html'          => $IN['FORUM_HTML'],
-															'status'            => $IN['FORUM_STATUS'],
-															'password'          => $IN['FORUM_PROTECT'],
-															'sort_key'          => $IN['SORT_KEY'],
-															'sort_order'        => $IN['SORT_ORDER'],
-															'prune'             => $IN['PRUNE_DAYS'],
-															'preview_posts'     => $IN['MODERATE'],
-															'allow_poll'        => $IN['allow_poll'],
-															'allow_pollbump'    => $IN['allow_pollbump'],
-															'inc_postcount'     => $IN['inc_postcount'],
-															'quick_reply'       => $IN['quick_reply'],
-															'redirect_on'       => $IN['redirect_on'],
-															'redirect_hits'     => $IN['redirect_hits'],
-															'redirect_url'      => $IN['redirect_url'],
-															'redirect_loc'		=> $IN['redirect_loc'],
-															'notify_modq_emails'=> $IN['notify_modq_emails'],
-															
-												  )       );
-												  
-		$DB->query("UPDATE ibf_forums SET $db_string WHERE id='".$IN['f']."'");
-		
-		$ADMIN->save_log("Edited Sub Forum '{$IN['FORUM_NAME']}'");
-		
-		$ADMIN->done_screen("Forum Edited", "Forum Control", "act=cat" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// EDIT FORUM
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function perm_edit_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['f'] == "")
-		{
-			$ADMIN->error("You didn't choose a forum to edit, duh!");
-		}
-		
-		$cats = array();
-		
-		$DB->query("SELECT id,name FROM ibf_categories ORDER BY position");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$cats[] = array( $r['CAT_ID'] , $r['CAT_NAME'] );
-		}
-		
-		$DB->query("SELECT * FROM ibf_forums WHERE id='".$IN['f']."'");
-		$forum = $DB->fetch_row();
-		
-		if ($forum['id'] == "")
-		{
-			$ADMIN->error("Could not retrieve the forum data based on ID {$IN['f']}");
-		}
-		
-		
-		
-		
-		$ADMIN->page_title = "Edit permissions for ".$forum['name'];
-		
-		$ADMIN->page_detail = "<b>Forum access permissions</b><br>(Check box for access, uncheck to not allow access)<br>If you deny read access for a permission mask, they will not see the forum";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'pdoedit'  ),
-												  2 => array( 'act'   , 'forum'   ),
-												  3 => array( 'f'     , $IN['f']  ),
-												  4 => array( 'name'  , $forum['name'] ),
-											) );
-											
-		$SKIN->td_header[] = array( "Name"  , "40%" );
-		$SKIN->td_header[] = array( "Read"  , "15%" );
-		$SKIN->td_header[] = array( "Reply" , "15%" );
-		$SKIN->td_header[] = array( "Start" , "15%" );
-		$SKIN->td_header[] = array( "Upload", "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table("Permission Access Levels");
-		
-		$ADMIN->html .= $SKIN->build_group_perms($forum['read_perms'], $forum['start_perms'], $forum['reply_perms'], $forum['upload_perms']);
-									 
-		$ADMIN->html .= $SKIN->end_form("Edit this forum");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-
-	function perm_do_edit() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$perms = $ADMIN->compile_forum_perms();
-		
-		
-		$db_string = $DB->compile_db_update_string( array (
-															
-															'start_perms' => $perms['START'],
-															'reply_perms' => $perms['REPLY'],
-															'read_perms'  => $perms['READ'],
-															'upload_perms' => $perms['UPLOAD'],
-															
-												  )       );
-												  
-		$DB->query("UPDATE ibf_forums SET $db_string WHERE id='".$IN['f']."'");
-		
-		$ADMIN->save_log("Forum access permission edited in '{$IN['name']}'");
-		
-		$ADMIN->done_screen("Forum Access Permissions Edited", "Forum Control", "act=cat" );
-		
-		
-		
-	}
-	
-		
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_groups.php b/upload/sources/Admin/ad_groups.php
deleted file mode 100644
index 2edbb1d9..00000000
--- a/upload/sources/Admin/ad_groups.php
+++ /dev/null
@@ -1,2246 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Forum functions
-|   > Module written by Matt Mecham
-|   > Date started: 17th March 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_groups();
-
-
-class ad_groups {
-
-	var $base_url;
-
-	function ad_groups() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'doadd':
-				$this->save_group('add');
-				break;
-				
-			case 'add':
-				$this->group_form('add');
-				break;
-				
-			case 'edit':
-				$this->group_form('edit');
-				break;
-			
-			case 'doedit':
-				$this->save_group('edit');
-				break;
-			
-			case 'delete':
-				$this->delete_form();
-				break;
-			
-			case 'dodelete':
-				$this->do_delete();
-				break;
-				
-			//-------------------------	
-				
-			case 'fedit':
-				$this->forum_perms();
-				break;
-				
-			case 'pdelete':
-				$this->delete_mask();
-				break;
-				
-			case 'dofedit':
-				$this->do_forum_perms();
-				break;
-				
-			case 'permsplash':
-				$this->permsplash();
-				break;
-				
-			case 'view_perm_users':
-				$this->view_perm_users();
-				break;
-					
-			case 'remove_mask':
-				$this->remove_mask();
-				break;
-				
-			case 'preview_forums':
-				$this->preview_forums();
-				break;
-				
-			case 'dopermadd':
-				$this->add_new_perm();
-				break;
-				
-			case 'donameedit':
-				$this->edit_name_perm();
-				break;
-			//-------------------------			
-					
-					
-						
-			default:
-				$this->main_screen();
-				break;
-		}
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Member group /forum mask permission form thingy doodle do yes. Viewing Perm users
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function delete_mask()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------------------
-		// Check for a valid ID
-		//+-------------------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
-		}
-		
-		$DB->query("DELETE FROM ibf_forum_perms WHERE perm_id='".$IN['id']."'");
-		
-		$old_id = intval($IN['id']);
-		
-		//+-------------------------------------------
-		// Remove from forums...
-		//+-------------------------------------------
-		
-		$get = $DB->query("SELECT id, read_perms, reply_perms, start_perms, upload_perms FROM ibf_forums");
-				
-		while( $f = $DB->fetch_row($get) )
-		{
-			$d_str = "";
-			$d_arr = array();
-			
-			foreach( array( 'read_perms', 'reply_perms', 'start_perms', 'upload_perms' ) as $perm_bit )
-			{
-				if ($f[ $perm_bit ] != '*')
-				{
-					if ( preg_match( "/(^|,)".$old_id."(,|$)/", $f[ $perm_bit ]) )
-					{
-						$f[ $perm_bit ] = preg_replace( "/(^|,)".$old_id."(,|$)/", "\\1\\2", $f[ $perm_bit ] );
-						
-						$d_arr[ $perm_bit ] = $this->clean_perms( $f[ $perm_bit ] );
-					}
-				}
-			}
-			
-			// Do we have anything to save?
-				
-			if ( count($d_arr) > 0 )
-			{
-				$d_str = $DB->compile_db_update_string( $d_arr );
-				
-				// Sure?..
-				
-				if ( strlen($d_str) > 5)
-				{
-					$save = $DB->query("UPDATE ibf_forums SET $d_str WHERE id={$f['id']}");
-				}
-			}
-		}
-		
-		$this->permsplash();
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	
-	function add_new_perm()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$IN['new_perm_name'] = trim($IN['new_perm_name']);
-		
-		if ($IN['new_perm_name'] == "")
-		{
-			$ADMIN->error("You must enter a name");
-		}
-		
-		$copy_id = $IN['new_perm_copy'];
-		
-		//+-------------------------------------------
-		// UPDATE DB
-		//+-------------------------------------------
-		
-		$DB->query("INSERT INTO ibf_forum_perms SET perm_name='".$IN['new_perm_name']."'");
-		
-		$new_id = $DB->get_insert_id();
-		
-		if ( $copy_id != 'none' )
-		{
-			//+-------------------------------------------
-			// Add new mask to forum accesses
-			//+-------------------------------------------
-		
-			$old_id = intval($copy_id);
-			
-			if ( ($new_id > 0) and ($old_id > 0) )
-			{
-				$get = $DB->query("SELECT id, read_perms, reply_perms, start_perms, upload_perms FROM ibf_forums");
-				
-				while( $f = $DB->fetch_row($get) )
-				{
-					$d_str = "";
-					$d_arr = array();
-					
-					foreach( array( 'read_perms', 'reply_perms', 'start_perms', 'upload_perms' ) as $perm_bit )
-					{
-						if ($f[ $perm_bit ] != '*')
-						{
-							if ( preg_match( "/(^|,)".$old_id."(,|$)/", $f[ $perm_bit ]) )
-							{
-								$d_arr[ $perm_bit ] = $this->clean_perms( $f[ $perm_bit ] ) . ",".$new_id;
-							}
-						}
-					}
-					
-					// Do we have anything to save?
-						
-					if ( count($d_arr) > 0 )
-					{
-						$d_str = $DB->compile_db_update_string( $d_arr );
-						
-						// Sure?..
-						
-						if ( strlen($d_str) > 5)
-						{
-							$save = $DB->query("UPDATE ibf_forums SET $d_str WHERE id={$f['id']}");
-						}
-					}
-				}
-			}
-			
-		
-		}
-		
-		$this->permsplash();
-			
-		
-	}
-	
-	//-_-_-_-_-_-_-_-_-
-	//_-_-_-_-_-_-_-_-_
-	//Now that's pretty
-	
-	function preview_forums()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------------------
-		// Check for a valid ID
-		//+-------------------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
-		}
-		
-		
-		$DB->query("SELECT * FROM ibf_forum_perms WHERE perm_id='".$IN['id']."'");
-		
-		if ( ! $perms = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
-		}
-		
-		//+-------------------------------------------
-		// What we doin'?
-		//+-------------------------------------------
-		
-		switch( $IN['t'] )
-		{
-			case 'start':
-				$human_type = 'Start Topics';
-				$code_word  = 'start_perms';
-				break;
-				
-			case 'reply':
-				$human_type = 'Reply To Topics';
-				$code_word  = 'reply_perms';
-				break;
-				
-			default:
-				$human_type = 'View Forum';
-				$code_word  = 'read_perms';
-				break;
-		}
-		
-		//+-------------------------------------------
-		// Get all members using that ID then!
-		//+-------------------------------------------
-		
-		$SKIN->td_header[] = array( "$human_type" , "100%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Preview using: " . $perms['perm_name'] );
-		
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT f.id as forum_id, f.parent_id, f.subwrap, f.sub_can_post, f.name as forum_name, f.position, f.read_perms, f.start_perms, f.reply_perms, c.id as cat_id, c.name
-				    FROM ibf_forums f
-				     LEFT JOIN ibf_categories c ON (c.id=f.category)
-				    ORDER BY c.position, f.position");
-		
-		
-		$forum_keys = array();
-		$cat_keys   = array();
-		$children   = array();
-		$subs       = array();
-		$the_html   = "";
-		
-		$perm_id    = intval($IN['id']);
-		
-		while ( $i = $DB->fetch_row() )
-		{
-			
-			if ($i['subwrap'] == 1 and $i['sub_can_post'] != 1)
-			{
-				$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "&nbsp;&nbsp;- {$i['forum_name']}\n";
-			}
-			else
-			{
-				if ($i[ $code_word ] == '*')
-				{
-					if ($i['parent_id'] > 0)
-					{
-						$children[ $i['parent_id'] ][] = "&nbsp;&nbsp;---- {$i['forum_name']}\n";
-					}
-					else
-					{
-						$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "&nbsp;&nbsp;- {$i['forum_name']}\n";
-					}
-				}
-				else if (preg_match( "/(^|,)".$perm_id."(,|$)/", $i[ $code_word ]) )
-				{
-					if ($i['parent_id'] > 0)
-					{
-						$children[ $i['parent_id'] ][] = "&nbsp;&nbsp;---- {$i['forum_name']}\n";
-					}
-					else
-					{
-						$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "&nbsp;&nbsp;- {$i['forum_name']}\n";
-					}
-				}
-				else
-				{
-					//-------------------------------------
-					// CAN'T ACCESS
-					//-------------------------------------
-					
-					if ($i['parent_id'] > 0)
-					{
-						$children[ $i['parent_id'] ][] = "<span style='color:gray'>&nbsp;&nbsp;---- {$i['forum_name']}</span>\n";
-					}
-					else
-					{
-						$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "<span style='color:gray'>&nbsp;&nbsp;- {$i['forum_name']}</span>\n";
-					}
-				}
-			}
-			
-			if ($last_cat_id != $i['cat_id'])
-			{
-				
-				// Make sure cats with hidden forums are not shown in forum jump
-				
-				$cat_keys[ $i['cat_id'] ] = "<b>{$i['name']}</b>\n";
-							              
-				$last_cat_id = $i['cat_id'];
-				
-			}
-		}
-		
-		foreach($cat_keys as $cat_id => $cat_text)
-		{
-			if ( is_array( $forum_keys[$cat_id] ) && count( $forum_keys[$cat_id] ) > 0 )
-			{
-				$the_html .= $cat_text;
-				
-				foreach($forum_keys[$cat_id] as $idx => $forum_text)
-				{
-					$the_html .= $forum_text;
-					
-					if (count($children[$idx]) > 0)
-					{
-						foreach($children[$idx] as $ii => $tt)
-						{
-							$the_html .= $tt;
-						}
-					}
-				}
-			}
-		}
-		
-		$the_html = str_replace( "\n", "<br />\n", $the_html );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( $the_html )      );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//----------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'preview_forums' ),
-												  2 => array( 'act'   , 'group'   ),
-												  3 => array( 'id'    , $IN['id']      ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;" , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;" , "40%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Legend & Info" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array(
-													"Can $human_type for this forum",
-													"<input type='text' readonly='readonly' style='border:1px solid black;background-color:black;size=30px' name='blah'>"
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array(
-													"CANNOT $human_type for this forum",
-													"<input type='text' readonly='readonly' style='border:1px solid gray;background-color:gray;size=30px' name='blah'>"
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array(
-													"Test with...",
-													$SKIN->form_dropdown( 't',
-																		array( 0 => array( 'start', 'Start Topics'    ),
-																			   1 => array( 'reply', 'Reply To Topics' ),
-																			   2 => array( 'read' , 'Read Forum'      ),
-																			  ), $IN['t'] )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form( "Update" );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->print_popup();
-							   
-	}
-	
-	//===========================================================================
-	
-	function remove_mask()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------------------
-		// Check for a valid ID
-		//+-------------------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the member ID, please try again");
-		}
-		
-		//+-------------------------------------------
-		// Get, check and reset
-		//+-------------------------------------------
-		
-		$DB->query("SELECT id, name, org_perm_id FROM ibf_members WHERE id=".intval($IN['id']));
-		
-		if ( ! $mem = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the member ID, please try again");
-		}
-		
-		if ( $IN['pid'] == 'all' )
-		{
-			$DB->query("UPDATE ibf_members SET org_perm_id=0 WHERE id=".intval($IN['id']));
-		}
-		else
-		{
-			$IN['pid'] = intval($IN['pid']);
-			
-			$pid_array = explode( ",", $mem['org_perm_id'] );
-			
-			if ( count($pid_array) < 2 )
-			{
-				$DB->query("UPDATE ibf_members SET org_perm_id=0 WHERE id=".intval($IN['id']));
-			}
-			else
-			{
-				$new_arr = array();
-				
-				foreach( $pid_array as $sid )
-				{
-					if ( $sid != $IN['pid'] )
-					{
-						$new_arr[] = $sid;
-					}
-				}
-				
-				$DB->query("UPDATE ibf_members SET org_perm_id='".implode(",",$new_arr)."' WHERE id=".intval($IN['id']));
-			}	
-			
-		}
-			
-		//+-------------------------------------------
-		// Get all members using that ID then!
-		//+-------------------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;" , "100%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Result" );
-		
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "Removed the custom permission mask from <b>{$mem['name']}</b>.",
-										 )      );
-	
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->print_popup();
-							   
-	}
-	
-	//===========================================================================
-	
-	
-	function view_perm_users()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------------------
-		// Check for a valid ID
-		//+-------------------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
-		}
-		
-		
-		$DB->query("SELECT * FROM ibf_forum_perms WHERE perm_id='".$IN['id']."'");
-		
-		if ( ! $perms = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
-		}
-		
-		//+-------------------------------------------
-		// Get all members using that ID then!
-		//+-------------------------------------------
-		
-		$SKIN->td_header[] = array( "User Details" , "50%" );
-		$SKIN->td_header[] = array( "Action"       , "50%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= "<script language='javascript' type='text/javascript'>
-						 <!--
-						  function pop_close_and_stop( id )
-						  {
-						  	opener.location = \"{$SKIN->base_url}&act=mem&code=doform&MEMBER_ID=\" + id;
-						  	self.close();
-						  }
-						  //-->
-						  </script>";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Members using: " . $perms['perm_name'] );
-		
-		$outer = $DB->query("SELECT id, name, email, posts, org_perm_id FROM ibf_members WHERE (org_perm_id IS NOT NULL AND org_perm_id <> 0) ORDER BY name");
-		
-		while( $r = $DB->fetch_row($outer) )
-		{
-			$exp_pid = explode( ",", $r['org_perm_id'] );
-			
-			foreach( explode( ",", $r['org_perm_id'] ) as $pid )
-			{
-				if ( $pid == $IN['id'] )
-				{
-					if ( count($exp_pid) > 1 )
-					{
-						$extra = "<li>Also using: <em style='color:red'>";
-						
-						$DB->query("SELECT * FROM ibf_forum_perms WHERE perm_id IN ({$r['org_perm_id']}) AND perm_id <> {$IN['id']}");
-						
-						while ( $mr = $DB->fetch_row() )
-						{
-							$extra .= $mr['perm_name'].",";
-						}
-						
-						$extra = preg_replace( "/,$/", "", $extra );
-						
-						$extra .= "</em>";
-					}
-					else
-					{
-						$extra = "";
-					}
-					
-					$ADMIN->html .= $SKIN->add_td_row( array( "<div style='font-weight:bold;font-size:11px;padding-bottom:6px;margin-bottom:3px;border-bottom:1px solid #000'>{$r['name']}</div>
-															   <li>Posts: {$r['posts']}
-															   <li>Email: {$r['email']}
-															   $extra" ,
-															  "&#149;&nbsp;<a href='{$SKIN->base_url}&amp;act=group&amp;code=remove_mask&amp;id={$r['id']}&amp;pid=$pid' title='Remove this mask from the user (will not remove all if they have multimasks'>Remove This Mask</a>
-															   <br />&#149;&nbsp;<a href='{$SKIN->base_url}&amp;act=group&amp;code=remove_mask&amp;id={$r['id']}&amp;pid=all' title='Remove all user masks'>Remove All Masks</a>
-															   <br /><br />&#149;&nbsp;<a href='javascript:pop_close_and_stop(\"{$r['id']}\");'>Edit Member</a>",
-													 )      );
-				}
-			}
-		}
-		
-						     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->print_popup();
-							   
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Member group /forum mask permission form thingy doodle do yes.
-	//
-	//+---------------------------------------------------------------------------------
-	
-	
-	function permsplash()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Forum Permission Mask [ HOME ]";
-		
-		$ADMIN->page_detail = "You can manage your forum permission masks from this section.";
-		
-		$ADMIN->page_detail .= "<br /><b>Used by Groups</b> relates to the member groups that use this permission mask
-								<br /><b>Used by Members</b> relates to the number of members that have this permission mask set to over ride the group used permission mask
-							    <br /><b>Preview</b> the forums this mask has access to in a quick, convenient format
-							   ";
-								
-		
-		//+-------------------------------------------
-		// Get the names for the perm masks w/id
-		//+-------------------------------------------
-		
-		$perms = array();
-		
-		$DB->query("SELECT * FROM ibf_forum_perms");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			$perms[ $r['perm_id'] ] = $r['perm_name'];
-		}
-		
-		//+-------------------------------------------
-		// Get the number of members using this mask
-		// as an over ride
-		//+-------------------------------------------
-		
-		$mems = array();
-		
-		$DB->query("SELECT COUNT(id) as count, org_perm_id FROM ibf_members WHERE (org_perm_id IS NOT NULL AND org_perm_id <> 0) GROUP by org_perm_id");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			if ( strstr($r['org_perm_id'] , "," ) )
-			{
-				foreach( explode( ",", $r['org_perm_id'] ) as $pid )
-				{
-					$mems[ $pid ] += $r['count'];
-				}
-			}
-			else
-			{
-				$mems[ $r['org_perm_id'] ] += $r['count'];
-			}
-		}
-		
-		//+-------------------------------------------
-		// Get the member group names and the mask
-		// they use
-		//+-------------------------------------------
-		
-		$groups = array();
-		
-		$DB->query("SELECT g_id, g_title, g_perm_id FROM ibf_groups");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			if ( strstr($r['g_perm_id'] , "," ) )
-			{
-				foreach( explode( ",", $r['g_perm_id'] ) as $pid )
-				{
-					$groups[ $pid ][] = $r['g_title'];
-				}
-			}
-			else
-			{
-				$groups[ $r['g_perm_id'] ][] = $r['g_title'];
-			}
-		}
-		
-		//+-------------------------------------------
-		// Print the splash screen
-		//+-------------------------------------------
-		
-		$SKIN->td_header[] = array( "Mask Name"          , "20%" );
-		$SKIN->td_header[] = array( "Used by Group(s)"   , "20%" );
-		$SKIN->td_header[] = array( "Used by Mem(s)"     , "20%" );
-		$SKIN->td_header[] = array( "Preview"            , "10%" );
-		$SKIN->td_header[] = array( "Edit"               , "15%" );
-		$SKIN->td_header[] = array( "Delete"             , "15%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->js_pop_win();
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Permission Masks" );
-		
-		foreach( $perms as $id => $name )
-		{
-			$groups_used = "";
-			
-			$is_active = 0;
-			
-			if ( is_array( $groups[ $id ] ) )
-			{
-				foreach( $groups[ $id ] as $bleh => $g_title )
-				{
-					$groups_used .= $g_title . "<br />";
-				}
-				
-				$is_active = 1;
-				
-			}
-			else
-			{
-				$groups_used = "<center><i>None</i></center>";
-			}
-			
-			$mems_used = 0;
-			
-			if ( $mems[ $id ] > 0 )
-			{
-				$is_active = 1;
-				$mems_used = $mems[ $id ] . " (<a href='javascript:pop_win(\"&amp;act=group&amp;code=view_perm_users&amp;id=$id\", \"User\", \"500\",\"350\");' title='View the member names of those using this mask in a new window'>View</a>)";
-			}
-			
-			if ( $is_active > 0 )
-			{
-				$delete = "<i>Can't, in use</i>";
-			}
-			else
-			{
-				$delete = "<a href='{$SKIN->base_url}&amp;act=group&amp;code=pdelete&amp;id=$id'>Delete</a>";
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>$name</b>" ,
-													  "$groups_used",
-													  "<center>$mems_used</center>",
-													  "<center><a href='javascript:pop_win(\"&amp;act=group&amp;code=preview_forums&amp;id=$id&amp;t=read\", \"400\",\"350\");' title='See what this group can see..'>Preview</a></center>",
-													  "<center><a href='{$SKIN->base_url}&amp;act=group&amp;code=fedit&amp;id=$id'>Edit</a></center>",
-													  "<center>$delete</center>",
-											 )      );
-		
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$dlist = array();
-		
-		$dlist[] = array( 'none', 'Do not inherit' );
-		
-		foreach( $perms as $id => $name )
-		{
-			$dlist[] = array( $id, $name );
-		}
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dopermadd' ),
-												  2 => array( 'act'   , 'group'   ),
-									     )      );
-									     
-		
-		$SKIN->td_header[] = array( "{none}" , "60%" );
-		$SKIN->td_header[] = array( "{none}" , "40%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Create a new permission mask" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Permission Mask Name</b>" ,
-												  $SKIN->form_input( 'new_perm_name' ),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Inherit forum permission mask from...</b>" ,
-												 $SKIN->form_dropdown( 'new_perm_copy', $dlist ),
-										 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Create");
-						     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		
-		$ADMIN->output();
-			
-			
-	}
-	
-	
-	
-	function forum_perms()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the group ID, please try again");
-		}
-		
-		//+----------------------------------
-		
-		$ADMIN->page_title = "Forum Permission Mask [ EDIT ]";
-		
-		$ADMIN->page_detail = "You can manage your forum permission masks from this section.";
-		
-		$ADMIN->page_detail .= "<br />Simply check the boxes to allow permission for that action, or uncheck the box to deny permission for that action.
-							   <br /><b>Global</b> indicates that all present and future permission masks have access to that action and as such, cannot be changed";
-		
-		//+----------------------------------
-		
-		$DB->query("SELECT * FROM ibf_forum_perms WHERE perm_id='".$IN['id']."'");
-		
-		$group = $DB->fetch_row();
-		
-		$gid   = $group['perm_id'];
-		$gname = $group['perm_name'];
-		
-		//+-------------------------------
-		
-		$cats     = array();
-		$forums   = array();
-		$children = array();
-		
-		$DB->query("SELECT * from ibf_categories WHERE id > 0 ORDER BY position ASC");
-		
-		while ($r = $DB->fetch_row())
-		{
-			$cats[$r['id']] = $r;
-		}
-		
-		$DB->query("SELECT * from ibf_forums ORDER BY position ASC");
-		
-		while ($r = $DB->fetch_row())
-		{
-			
-			if ($r['parent_id'] > 0)
-			{
-				$children[ $r['parent_id'] ][] = $r;
-			}
-			else
-			{
-				$forums[] = $r;
-			}
-			
-		}
-		
-		//+----------------------------------
-		//| EDIT NAME
-		//+----------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'donameedit' ),
-												  2 => array( 'act'   , 'group'   ),
-												  3 => array( 'id'    , $gid      ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Rename Group: ".$group['perm_name'] );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Mask Name</b>" ,
-												  $SKIN->form_input("perm_name", $gname )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit Name");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+----------------------------------
-		//| MAIN FORM
-		//+----------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dofedit' ),
-												  2 => array( 'act'   , 'group'   ),
-												  3 => array( 'id'    , $gid      ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "Forum Name"   , "40%" );
-		$SKIN->td_header[] = array( "Read"         , "15%" );
-		$SKIN->td_header[] = array( "Reply"        , "15%" );
-		$SKIN->td_header[] = array( "Start"        , "15%" );
-		$SKIN->td_header[] = array( "Upload"       , "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Forum Access Permissions for ".$group['perm_name'] );
-		
-		$last_cat_id = -1;
-		
-		foreach ($cats as $c)
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_basic( $c['name'], 'left', 'catrow' );
-													   
-			$last_cat_id = $c['id'];
-			
-			
-			foreach($forums as $r)
-			{	
-			
-				if ($r['category'] == $last_cat_id)
-				{
-				
-					$read   = "";
-					$start  = "";
-					$reply  = "";
-					$upload = "";
-					$global = '<center id="mgblue"><i>Global</i></center>';
-					
-					if ($r['read_perms'] == '*')
-					{
-						$read = $global;
-					}
-					else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['read_perms'] ) )
-					{
-						$read = "<center id='mgblue'><input type='checkbox' name='read_".$r['id']."' value='1' checked></center>";
-					}
-					else
-					{
-						$read = "<center id='mgblue'><input type='checkbox' name='read_".$r['id']."' value='1'></center>";
-					}
-					
-					//---------------------------
-					
-					$global = '<center id="mgred"><i>Global</i></center>';
-					
-					if ($r['start_perms'] == '*')
-					{
-						$start = $global;
-					}
-					else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['start_perms'] ) )
-					{
-						$start = "<center id='mgred'><input type='checkbox' name='start_".$r['id']."' value='1' checked></center>";
-					}
-					else
-					{
-						$start = "<center id='mgred'><input type='checkbox' name='start_".$r['id']."' value='1'></center>";
-					}
-					
-					//---------------------------
-					
-					$global = '<center id="mggreen"><i>Global</i></center>';
-					
-					if ($r['reply_perms'] == '*')
-					{
-						$reply = $global;
-					}
-					else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['reply_perms'] ) )
-					{
-						$reply = "<center id='mggreen'><input type='checkbox' name='reply_".$r['id']."' value='1' checked></center>";
-					}
-					else
-					{
-						$reply = "<center id='mggreen'><input type='checkbox' name='reply_".$r['id']."' value='1'></center>";
-					}
-					
-					//---------------------------
-					
-					$global = '<center id="memgroup"><i>Global</i></center>';
-					
-					if ($r['upload_perms'] == '*')
-					{
-						$upload = $global;
-					}
-					else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['upload_perms'] ) )
-					{
-						$upload = "<center id='memgroup'><input type='checkbox' name='upload_".$r['id']."' value='1' checked></center>";
-					}
-					else
-					{
-						$upload = "<center id='memgroup'><input type='checkbox' name='upload_".$r['id']."' value='1'></center>";
-					}
-					
-					//---------------------------
-					
-					if ($r['subwrap'] == 1 and $r['sub_can_post'] != 1)
-					{
-						$ADMIN->html .= $SKIN->add_td_basic( "&gt; ".$r['name'], 'left', 'catrow2' );
-					}
-					else
-					{
-						$css = $r['subwrap'] == 1 ? 'catrow2' : '';
-						
-						$ADMIN->html .= $SKIN->add_td_row( array(
-															   "<b> - ".$r['name']."</b>",
-															   $read,
-															   $reply,
-															   $start,
-															   $upload
-													 )   , $css   );
-					}
-													 
-					if ( ( isset($children[ $r['id'] ]) ) and ( count ($children[ $r['id'] ]) > 0 ) )
-					{
-						foreach($children[ $r['id'] ] as $idx => $rd)
-						{
-							$read   = "";
-							$start  = "";
-							$reply  = "";
-							$upload = "";
-							$global = "<center id='mgblue'><i>Global</i></center>";
-							
-							if ($rd['read_perms'] == '*')
-							{
-								$read = $global;
-							}
-							else if ( preg_match( "/(^|,)".$gid."(,|$)/", $rd['read_perms'] ) )
-							{
-								$read = "<center id='mgblue'><input type='checkbox' name='read_".$rd['id']."' value='1' checked></center>";
-							}
-							else
-							{
-								$read = "<center id='mgblue'><input type='checkbox' name='read_".$rd['id']."' value='1'></center>";
-							}
-							
-							//---------------------------
-							
-							$global = "<center id='mgred'><i>Global</i></center>";
-							
-							if ($rd['start_perms'] == '*')
-							{
-								$start = $global;
-							}
-							else if ( preg_match( "/(^|,)".$gid."(,|$)/", $rd['start_perms'] ) )
-							{
-								$start = "<center id='mgred'><input type='checkbox' name='start_".$rd['id']."' value='1' checked></center>";
-							}
-							else
-							{
-								$start = "<center id='mgred'><input type='checkbox' name='start_".$rd['id']."' value='1'></center>";
-							}
-							
-							//---------------------------
-							
-							$global = "<center id='mggreen'><i>Global</i></center>";
-							
-							if ($rd['reply_perms'] == '*')
-							{
-								$reply = $global;
-							}
-							else if ( preg_match( "/(^|,)".$gid."(,|$)/", $rd['reply_perms'] ) )
-							{
-								$reply = "<center id='mggreen'><input type='checkbox' name='reply_".$rd['id']."' value='1' checked></center>";
-							}
-							else
-							{
-								$reply = "<center id='mggreen'><input type='checkbox' name='reply_".$rd['id']."' value='1'></center>";
-							}
-							
-							//---------------------------
-							
-							$global = "<center id='memgroup'><i>Global</i></center>";
-							
-							if ($rd['upload_perms'] == '*')
-							{
-								$upload = $global;
-							}
-							else if ( preg_match( "/(^|,)".$gid."(,|$)/", $rd['upload_perms'] ) )
-							{
-								$upload = "<center id='memgroup'><input type='checkbox' name='upload_".$rd['id']."' value='1' checked></center>";
-							}
-							else
-							{
-								$upload = "<center id='memgroup'><input type='checkbox' name='upload_".$rd['id']."' value='1'></center>";
-							}
-							
-							//---------------------------
-					
-							$ADMIN->html .= $SKIN->add_td_row( array(
-															   "<b> --- ".$rd['name']."</b>",
-															   $read,
-															   $reply,
-															   $start,
-															   $upload
-													 ) , 'subforum'     );
-						}
-					}					 
-				}
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_form("Update Forum Permissions");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	
-	function edit_name_perm()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------
-		// Check for legal ID
-		//---------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve that group ID");
-		}
-		
-		if ( $IN['perm_name'] == "" )
-		{
-			$ADMIN->error("You must enter a name");
-		}
-		
-		$gid = $IN['id'];
-		
-		//---------------------------
-		
-		$DB->query("SELECT * FROM ibf_forum_perms WHERE perm_id='".$IN['id']."'");
-		
-		if ( ! $gr = $DB->fetch_row() )
-		{
-			$ADMIN->error("Not a valid group ID");
-		}
-		
-		$DB->query("UPDATE ibf_forum_perms SET perm_name='{$IN['perm_name']}' WHERE perm_id='".$IN['id']."'");
-		
-		$ADMIN->save_log("Forum Access Permissions Name Edited for Mask: '{$gr['perm_name']}'");
-		
-		$ADMIN->done_screen("Forum Access Permissions Updated", "Permission Mask Control", "act=group&code=permsplash" );
-		
-		
-	}
-	
-	
-	
-	function do_forum_perms()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------
-		// Check for legal ID
-		//---------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve that group ID");
-		}
-		
-		$gid = $IN['id'];
-		
-		//---------------------------
-		
-		$DB->query("SELECT * FROM ibf_forum_perms WHERE perm_id='".$IN['id']."'");
-		
-		if ( ! $gr = $DB->fetch_row() )
-		{
-			$ADMIN->error("Not a valid group ID");
-		}
-		
-		//---------------------------
-		// Pull the forum data..
-		//---------------------------
-		
-		$forum_q = $DB->query("SELECT id, read_perms, start_perms, reply_perms, upload_perms FROM ibf_forums ORDER BY position ASC");
-		
-		while ( $row = $DB->fetch_row( $forum_q ) )
-		{
-		
-			$read  = "";
-			$reply = "";
-			$start = "";
-			$upload = "";
-			//---------------------------
-			// Is this global?
-			//---------------------------
-			
-			if ($row['read_perms'] == '*')
-			{
-				$read = '*';
-				
-			}
-			else
-			{
-				//---------------------------
-				// Split the set IDs
-				//---------------------------
-				
-				$read_ids = explode( ",", $row['read_perms'] );
-				
-				if ( is_array($read_ids) )
-				{
-				   foreach ($read_ids as $i)
-				   {
-					   //---------------------------
-					   // If it's the current ID, skip
-					   //---------------------------
-					   
-					   if ($gid == $i)
-					   {
-						   continue;
-					   }
-					   else
-					   {
-						   $read .= $i.",";
-					   }
-				   }
-				}
-				//---------------------------
-				// Was the box checked?
-				//---------------------------
-				
-				if ($IN[ 'read_'.$row['id'] ] == 1)
-				{
-					// Add our group ID...
-					
-					$read .= $gid.",";
-				}
-				
-				// Tidy..
-				
-				$read = preg_replace( "/,$/", "", $read );
-				$read = preg_replace( "/^,/", "", $read );
-				
-			}
-			
-			//---------------------------
-			// Reply topics..
-			//---------------------------
-				
-			if ($row['reply_perms'] == '*')
-			{
-				$reply = '*';
-			}
-			else
-			{
-				$reply_ids = explode( ",", $row['reply_perms'] );
-				
-				if ( is_array($reply_ids) )
-				{
-				
-					foreach ($reply_ids as $i)
-					{
-						if ($gid == $i)
-						{
-							continue;
-						}
-						else
-						{
-							$reply .= $i.",";
-						}
-					}
-				
-				}
-				
-				if ($IN[ 'reply_'.$row['id'] ] == 1)
-				{
-					$reply .= $gid.",";
-				}
-				
-				$reply = preg_replace( "/,$/", "", $reply );
-				$reply = preg_replace( "/^,/", "", $reply );
-			}
-			
-			//---------------------------
-			// Start topics..
-			//---------------------------
-				
-			if ($row['start_perms'] == '*')
-			{
-				$start = '*';
-			}
-			else
-			{
-				$start_ids = explode( ",", $row['start_perms'] );
-				
-				if ( is_array($start_ids) )
-				{
-				
-					foreach ($start_ids as $i)
-					{
-						if ($gid == $i)
-						{
-							continue;
-						}
-						else
-						{
-							$start .= $i.",";
-						}
-					}
-				
-				}
-				
-				if ($IN[ 'start_'.$row['id'] ] == 1)
-				{
-					$start .= $gid.",";
-				}
-				
-				$start = preg_replace( "/,$/", "", $start );
-				$start = preg_replace( "/^,/", "", $start );
-			}
-			
-			//---------------------------
-			// Upload topics..
-			//---------------------------
-				
-			if ($row['upload_perms'] == '*')
-			{
-				$upload = '*';
-			}
-			else
-			{
-				$upload_ids = explode( ",", $row['upload_perms'] );
-				
-				if ( is_array($upload_ids) )
-				{
-				
-					foreach ($upload_ids as $i)
-					{
-						if ($gid == $i)
-						{
-							continue;
-						}
-						else
-						{
-							$upload .= $i.",";
-						}
-					}
-				
-				}
-				
-				if ($IN[ 'upload_'.$row['id'] ] == 1)
-				{
-					$upload .= $gid.",";
-				}
-				
-				$upload = preg_replace( "/,$/", "", $upload );
-				$upload = preg_replace( "/^,/", "", $upload );
-			}
-			
-			//---------------------------
-			// Update the DB...
-			//---------------------------
-			
-			if (! $new_q = $DB->query("UPDATE ibf_forums SET read_perms='$read', reply_perms='$reply', start_perms='$start', upload_perms='$upload' WHERE id='".$row['id']."'") )
-			{
-				die ("Update query failed on Forum ID ".$row['id']);
-			}
-			
-		}
-		
-		$ADMIN->save_log("Forum Access Permissions Edited for Mask: '{$gr['perm_name']}'");
-		
-		$ADMIN->done_screen("Forum Access Permissions Updated", "Permission Mask Control", "act=group&code=permsplash" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Delete a group
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function delete_form()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the group ID, please try again");
-		}
-		
-		if ($IN['id'] < 5)
-		{
-			$ADMIN->error("You can not move the preset groups. You can rename them and edit the functionality");
-		}
-		
-		$ADMIN->page_title = "Deleting a User Group";
-		
-		$ADMIN->page_detail = "Please check to ensure that you are attempting to remove the correct group.";
-		
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT COUNT(id) as users FROM ibf_members WHERE mgroup='".$IN['id']."'");
-		$black_adder = $DB->fetch_row();
-		
-		if ($black_adder['users'] < 1)
-		{
-			$black_adder['users'] = 0;
-		}
-		
-		$DB->query("SELECT g_title FROM ibf_groups WHERE g_id='".$IN['id']."'");
-		$group = $DB->fetch_row();
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups WHERE g_id <> '".$IN['id']."'");
-		
-		$mem_groups = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$mem_groups[] = array( $r['g_id'], $r['g_title'] );
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dodelete'  ),
-												  2 => array( 'act'   , 'group'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-												  4 => array( 'name'  , $group['g_title'] ),
-									     )      );
-									     
-		
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Removal Confirmation: ".$group['g_title'] );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of users in this group</b>" ,
-												  "<b>".$black_adder['users']."</b>",
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Move users in this group to...</b>" ,
-												  $SKIN->form_dropdown("to_id", $mem_groups )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Delete this group");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-	}
-	
-	function do_delete()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the group ID, please try again");
-		}
-		
-		if ($IN['to_id'] == "")
-		{
-			$ADMIN->error("No move to group ID was specified. /me cries.");
-		}
-		
-		// Check to make sure that the relevant groups exist.
-		
-		$DB->query("SELECT g_id FROM ibf_groups WHERE g_id IN(".$IN['id'].",".$IN['to_id'].")");
-		
-		if ( $DB->get_num_rows() != 2 )
-		{
-			$ADMIN->error("Could not resolve the ID's passed to group deletion");
-		}
-		
-		$DB->query("UPDATE ibf_members SET mgroup='".$IN['to_id']."' WHERE mgroup='".$IN['id']."'");
-		
-		$DB->query("DELETE FROM ibf_groups WHERE g_id='".$IN['id']."'");
-		
-		// Look for promotions in case we have members to be promoted to this group...
-		
-		$prq = $DB->query("SELECT g_id FROM ibf_groups WHERE g_promotion LIKE '{$IN['id']}&%'");
-		
-		while ( $row = $DB->fetch_row($prq) )
-		{
-			$nq = $DB->query("UPDATE ibf_groups SET g_promotion='-1&-1' WHERE g_id='".$row['g_id']."'");
-		}
-		
-		// Remove from moderators table
-		
-		$DB->query("DELETE FROM ibf_moderators WHERE is_group=1 AND group_id=".$IN['id']);
-		
-		$ADMIN->save_log("Member Group '{$IN['name']}' removed");
-		
-		$ADMIN->done_screen("Group Removed", "Group Control", "act=group" );
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Save changes to DB
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function save_group($type='edit')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['g_title'] == "")
-		{
-			$ADMIN->error("You must enter a group title.");
-		}
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("Could not resolve the group id");
-			}
-			
-			if ($IN['id'] == $INFO['admin_group'] and $IN['g_access_cp'] != 1)
-			{
-				$ADMIN->error("You can not remove the ability to access the admin control panel for this group");
-			}
-		}
-		
-		//------------------------------------
-		// Sort out the perm mask id things
-		//------------------------------------
-		
-		if ( is_array( $HTTP_POST_VARS['permid'] ) )
-		{
-			$perm_id = implode( ",", $HTTP_POST_VARS['permid'] );
-		}
-		else
-		{
-			$ADMIN->error("No permission masks chosen");
-		}
-		
-		// Build up the hashy washy for the database ..er.. wase.
-		
-		$prefix = preg_replace( "/&#39;/", "'" , $std->txt_safeslashes($HTTP_POST_VARS['prefix']) );
-		$prefix = preg_replace( "/&lt;/" , "<" , $prefix          );
-		$suffix = preg_replace( "/&#39;/", "'" , $std->txt_safeslashes($HTTP_POST_VARS['suffix']) );
-		$suffix = preg_replace( "/&lt;/" , "<" , $suffix          );
-		
-		$promotion_a = '-1'; //id
-		$promotion_b = '-1'; // posts
-		
-		if ($IN['g_promotion_id'] > 0)
-		{
-			$promotion_a = $IN['g_promotion_id'];
-			$promotion_b = $IN['g_promotion_posts'];
-		}
-		
-		//if ($IN['g_max_messages'] == 0)
-		//{
-			//$IN['g_max_messages'] = -1;
-		//}
-		
-		//list($p_max, $p_width, $p_height) = explode( ":", $group['g_photo_max_vars'] );
-		
-		$IN['p_max']    = str_replace( ":", "", $IN['p_max'] );
-		$IN['p_width']  = str_replace( ":", "", $IN['p_width'] );
-		$IN['p_height'] = str_replace( ":", "", $IN['p_height'] );
-		
-		$db_string = array(
-							 'g_view_board'         => $IN['g_view_board'],
-							 'g_mem_info'           => $IN['g_mem_info'],
-							 'g_other_topics'       => $IN['g_other_topics'],
-							 'g_use_search'         => $IN['g_use_search'],
-							 'g_email_friend'       => $IN['g_email_friend'],
-							 'g_invite_friend'      => $IN['g_invite_friend'],
-							 'g_edit_profile'       => $IN['g_edit_profile'],
-							 'g_post_new_topics'    => $IN['g_post_new_topics'],
-							 'g_reply_own_topics'   => $IN['g_reply_own_topics'],
-							 'g_reply_other_topics' => $IN['g_reply_other_topics'],
-							 'g_edit_posts'         => $IN['g_edit_posts'],
-							 'g_edit_cutoff'        => $IN['g_edit_cutoff'],
-							 'g_delete_own_posts'   => $IN['g_delete_own_posts'],
-							 'g_open_close_posts'   => $IN['g_open_close_posts'],
-							 'g_delete_own_topics'  => $IN['g_delete_own_topics'],
-							 'g_post_polls'         => $IN['g_post_polls'],
-							 'g_vote_polls'         => $IN['g_vote_polls'],
-							 'g_use_pm'             => $IN['g_use_pm'],
-							 'g_is_supmod'          => $IN['g_is_supmod'],
-							 'g_access_cp'          => $IN['g_access_cp'],
-							 'g_title'              => trim($IN['g_title']),
-							 'g_can_remove'         => $IN['g_can_remove'],
-							 'g_append_edit'        => $IN['g_append_edit'],
-							 'g_access_offline'     => $IN['g_access_offline'],
-							 'g_avoid_q'            => $IN['g_avoid_q'],
-							 'g_avoid_flood'        => $IN['g_avoid_flood'],
-							 'g_icon'               => trim($IN['g_icon']),
-							 'g_attach_max'         => $IN['g_attach_max'],
-							 'g_avatar_upload'      => $IN['g_avatar_upload'],
-							 'g_calendar_post'      => $IN['g_calendar_post'],
-							 'g_max_messages'       => $IN['g_max_messages'],
-							 'g_max_mass_pm'        => $IN['g_max_mass_pm'],
-							 'g_search_flood'       => $IN['g_search_flood'],
-							 'prefix'               => $prefix,
-							 'suffix'               => $suffix,
-							 'g_promotion'          => $promotion_a.'&'.$promotion_b,
-							 'g_hide_from_list'     => $IN['g_hide_from_list'],
-							 'g_post_closed'        => $IN['g_post_closed'],
-							 'g_perm_id'			=> $perm_id,
-							 'g_photo_max_vars'	    => $IN['p_max'].':'.$IN['p_width'].':'.$IN['p_height'],
-							 'g_dohtml'			    => $IN['g_dohtml'],
-							 'g_edit_topic'			=> $IN['g_edit_topic'],
-							 'g_email_limit'		=> intval($IN['join_limit']).':'.intval($IN['join_flood']),
-							 
-						  );
-						  
-		if ($type == 'edit')
-		{
-			$rstring = $DB->compile_db_update_string( $db_string );
-			
-			$DB->query("UPDATE ibf_groups SET $rstring WHERE g_id='".$IN['id']."'");
-			
-			// Update the title of the group held in the mod table incase it changed.
-			
-			$DB->query("UPDATE ibf_moderators SET group_name='".trim($IN['g_title'])."' WHERE group_id='".$IN['id']."'");
-			
-			$ADMIN->save_log("Edited Group '{$IN['g_title']}'");
-			
-			$ADMIN->done_screen("Group Edited", "Group Control", "act=group" );
-			
-		}
-		else
-		{
-			$rstring = $DB->compile_db_insert_string( $db_string );
-			
-			$DB->query("INSERT INTO ibf_groups (" .$rstring['FIELD_NAMES']. ") VALUES (". $rstring['FIELD_VALUES'] .")");
-			
-			$ADMIN->save_log("Added Group '{$IN['g_title']}'");
-			
-			$ADMIN->done_screen("Group Added", "Group Control", "act=group" );
-		}
-	}
-	
-	function clean_perms($str)
-	{
-		$str = preg_replace( "/,$/", "", $str );
-		$str = str_replace(  ",,", ",", $str );
-		
-		return $str;
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Add / edit group
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function group_form($type='edit')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$all_groups = array( 0 => array ('none', 'Don\'t Promote') );
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("No group id to select from the database, please try again.");
-			}
-			
-			if ( $INFO['admin_group'] == $IN['id'] )
-			{
-				if ( $MEMBER['mgroup'] != $INFO['admin_group'] )
-				{
-					$ADMIN->error("Sorry, you are unable to edit that group as it's the root admin group");
-				}
-			}
-			
-			$form_code = 'doedit';
-			$button    = 'Complete Edit';
-				
-		}
-		else
-		{
-			$form_code = 'doadd';
-			$button    = 'Add Group';
-		}
-		
-		if ($IN['id'] != "")
-		{
-			$DB->query("SELECT * FROM ibf_groups WHERE g_id='".$IN['id']."'");
-			$group = $DB->fetch_row();
-			
-			$query = "SELECT g_id, g_title FROM ibf_groups WHERE g_id <> {$IN['id']} ORDER BY g_title";
-		}
-		else
-		{
-			$group = array();
-			
-			$query = "SELECT g_id, g_title FROM ibf_groups ORDER BY g_title";
-		}
-		
-		//-------------------------------------------
-		// sort out the promotion stuff
-		//-------------------------------------------
-		
-		list($group['g_promotion_id'], $group['g_promotion_posts']) = explode( '&', $group['g_promotion'] );
-		
-		if ($group['g_promotion_posts'] < 1)
-		{
-			$group['g_promotion_posts'] = '';
-		}
-		
-		$DB->query($query);
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ( $r['g_id'] == $INFO['admin_group'] )
-			{
-				continue;
-			}
-			
-			$all_groups[] = array( $r['g_id'], $r['g_title'] );
-		}
-		
-		//-------------------------------------------
-		
-		$perm_masks = array();
-		
-		$DB->query("SELECT * FROM ibf_forum_perms");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$perm_masks[] = array( $r['perm_id'], $r['perm_name'] );
-		}
-		
-		//-------------------------------------------
-		
-		if ($type == 'edit')
-		{
-			$ADMIN->page_title = "Editing User Group ".$group['g_title'];
-		}
-		else
-		{
-			$ADMIN->page_title = 'Adding a new user group';
-			$group['g_title'] = 'New Group';
-		}
-		
-		$guest_legend = "";
-		
-		if ($group['g_id'] == $INFO['guest_group'])
-		{
-			$guest_legend = "</b><br><i>(Does not apply to guests)</i>";
-		}
-		
-		$ADMIN->page_detail = "Please double check the information before submitting the form.";
-		
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= "<script language='javascript'>
-						 <!--
-						  function checkform() {
-						  
-						  	isAdmin = document.forms[0].g_access_cp;
-						  	isMod   = document.forms[0].g_is_supmod;
-						  	
-						  	msg = '';
-						  	
-						  	if (isAdmin[0].checked == true)
-						  	{
-						  		msg += 'Members in this group can access the Admin Control Panel\\n\\n';
-						  	}
-						  	
-						  	if (isMod[0].checked == true)
-						  	{
-						  		msg += 'Members in this group are super moderators.\\n\\n';
-						  	}
-						  	
-						  	if (msg != '')
-						  	{
-						  		msg = 'Security Check\\n--------------\\nMember Group Title: ' + document.forms[0].g_title.value + '\\n--------------\\n\\n' + msg + 'Is this correct?';
-						  		
-						  		formCheck = confirm(msg);
-						  		
-						  		if (formCheck == true)
-						  		{
-						  			return true;
-						  		}
-						  		else
-						  		{
-						  			return false;
-						  		}
-						  	}
-						  }
-						 //-->
-						 </script>\n";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $form_code  ),
-												  2 => array( 'act'   , 'group'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     ) , 'adform', "onSubmit='return checkform()'" );
-									     
-		
-		list($p_max, $p_width, $p_height) = explode( ":", $group['g_photo_max_vars'] );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$prefix = preg_replace( "/'/", "&#39;", $group['prefix'] );
-		$prefix = preg_replace( "/</", "&lt;" , $prefix          );
-		$suffix = preg_replace( "/'/", "&#39;", $group['suffix'] );
-		$suffix = preg_replace( "/</", "&lt;" , $suffix          );
-		
-		$ADMIN->html .= $SKIN->start_table( "Global Settings", "Basic Group Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Group Title</b>" ,
-												  $SKIN->form_input("g_title", $group['g_title'] )
-									     )      );
-									     
-		//+-------------------------------
-		// Sort out default array
-		//+-------------------------------
-		
-		$ADMIN->html .=
-		"<script type='text/javascript'>
-			
-			var show   = '';
-		";
-		
-		foreach ($perm_masks as $id => $d)
-		{
-			$ADMIN->html .= " 		perms_$d[0] = '$d[1]';\n";
-		}
-		
-		$ADMIN->html .=
-		"	
-			var show = '';
-			
-		 	function saveit(f)
-		 	{
-		 		show = '';
-		 		
-		 		for (var i = 0 ; i < f.options.length; i++)
-				{
-					if (f.options[i].selected)
-					{
-						tid  = f.options[i].value;
-						show += '\\n' + eval('perms_'+tid);
-					}
-				}
-			}
-			
-			function show_me()
-			{
-				if (show == '')
-				{
-					show = 'No change detected\\nClick on the multi-select box to activate';
-				}
-				
-				alert('Selected Permission Masks\\n---------------------------------\\n' + show);
-			}
-			
-		</script>";
-		
-		$arr = explode( ",", $group['g_perm_id'] );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Use Forum Permission Access...</b><br>You may choose more than one" ,
-												  $SKIN->form_multiselect("permid[]", $perm_masks, $arr, 5, 'onfocus="saveit(this)"; onchange="saveit(this)";' )."<a href='javascript:show_me();'>Show me selected masks</a>"
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Group Icon</b><br>(Can be omitted)" ,
-												  $SKIN->form_input("g_icon", $group['g_icon'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>POST: Max upload file size (in KB)</b>".$SKIN->js_help_link('mg_upload')."<br>(Leave blank to disallow uploads)" ,
-												  $SKIN->form_input("g_attach_max", $group['g_attach_max'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>PERSONAL PHOTO: Max upload file size (in KB)</b><br>(Leave blank to disallow uploads)" ,
-												  $SKIN->form_input("p_max", $p_max )."<br />"
-												  ."Max Width (px): <input type='text' size='3' name='p_width' value='{$p_width}'> "
-												  ."Max Height (px): <input type='text' size='3' name='p_height' value='{$p_height}'>"
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Online List Format [Prefix]</b><br>(Can be left blank)<br>(Example:&lt;span style='color:red'&gt;)" ,
-												  $SKIN->form_input("prefix", $prefix )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Online List Format [Suffix]</b><br>(Can be left blank)<br>(Example:&lt;/span&gt;)" ,
-												  $SKIN->form_input("suffix", $suffix )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Hide this group from the member list?</b>" ,
-												  $SKIN->form_yes_no("g_hide_from_list", $group['g_hide_from_list'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Global Permissions", "Restricting what this group can do" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can view board?</b>" ,
-												  $SKIN->form_yes_no("g_view_board", $group['g_view_board'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can view OFFLINE board?</b>" ,
-												  $SKIN->form_yes_no("g_access_offline", $group['g_access_offline'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can view member profiles and the member list?</b>" ,
-												  $SKIN->form_yes_no("g_mem_info", $group['g_mem_info'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can view other members topics?</b>" ,
-												  $SKIN->form_yes_no("g_other_topics", $group['g_other_topics'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can use search?</b>" ,
-												  $SKIN->form_yes_no("g_use_search", $group['g_use_search'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of seconds for search flood control</b><br>Stops search abuse, enter 0 or leave blank for no flood control" ,
-												  $SKIN->form_input("g_search_flood", $group['g_search_flood'] )
-									     )      );
-									     
-		list( $limit, $flood ) = explode( ":", $group['g_email_limit'] );					     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can email members from the board?</b><br />Leave bottom section blank to remove limits $guest_legend</b>" ,
-												  $SKIN->form_yes_no("g_email_friend", $group['g_email_friend'] )
-												 ."<br />Only allow ". $SKIN->form_simple_input("join_limit", $limit, 2 )." emails in a 24hr period"
-												 ."<br />...and only allow 1 email every ".$SKIN->form_simple_input("join_flood", $flood, 2 )." minutes"
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can edit own profile info?$guest_legend" ,
-												  $SKIN->form_yes_no("g_edit_profile", $group['g_edit_profile'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can use PM system?$guest_legend" ,
-												  $SKIN->form_yes_no("g_use_pm", $group['g_use_pm'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. Number users allowed to mass PM?$guest_legend<br>(Enter 0 or leave blank to disable mass PM)" ,
-												  $SKIN->form_input("g_max_mass_pm", $group['g_max_mass_pm'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. Number of storable messages?$guest_legend" ,
-												  $SKIN->form_input("g_max_messages", $group['g_max_messages'] )
-									     )      );
-									     						     							     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can Upload avatars?$guest_legend" ,
-												  $SKIN->form_yes_no("g_avatar_upload", $group['g_avatar_upload'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Posting Permissions", "Restrict where this group can post" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can post new topics (where allowed)?</b>" ,
-												  $SKIN->form_yes_no("g_post_new_topics", $group['g_post_new_topics'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can reply to OWN topics?</b>" ,
-												  $SKIN->form_yes_no("g_reply_own_topics", $group['g_reply_own_topics'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can reply to OTHER members topics (where allowed)?</b>" ,
-												  $SKIN->form_yes_no("g_reply_other_topics", $group['g_reply_other_topics'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can edit own posts?$guest_legend" ,
-												  $SKIN->form_yes_no("g_edit_posts", $group['g_edit_posts'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Edit time restriction (in minutes)?$guest_legend<br>Denies user edit after the time set has passed. Leave blank or enter 0 for no restriction" ,
-												  $SKIN->form_input("g_edit_cutoff", $group['g_edit_cutoff'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow user to remove 'Edited by' legend?$guest_legend</b>" ,
-												  $SKIN->form_yes_no("g_append_edit", $group['g_append_edit'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can delete own posts?$guest_legend" ,
-												  $SKIN->form_yes_no("g_delete_own_posts", $group['g_delete_own_posts'] )
-									     )      );
-									     						     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can open/close own topics?$guest_legend" ,
-												  $SKIN->form_yes_no("g_open_close_posts", $group['g_open_close_posts'] )
-									     )      );							     
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can edit own topic title & description?$guest_legend" ,
-												  $SKIN->form_yes_no("g_edit_topic", $group['g_edit_topic'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can delete own topics?$guest_legend" ,
-												  $SKIN->form_yes_no("g_delete_own_topics", $group['g_delete_own_topics'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can start new polls (where allowed)?$guest_legend</b>" ,
-												  $SKIN->form_yes_no("g_post_polls", $group['g_post_polls'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can vote in polls (where allowed)?$guest_legend" ,
-												  $SKIN->form_yes_no("g_vote_polls", $group['g_vote_polls'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can avoid flood control?</b>" ,
-												  $SKIN->form_yes_no("g_avoid_flood", $group['g_avoid_flood'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can avoid moderation queues?</b>" ,
-												  $SKIN->form_yes_no("g_avoid_q", $group['g_avoid_q'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can add events to the calendar?$guest_legend</b>" ,
-												  $SKIN->form_yes_no("g_calendar_post", $group['g_calendar_post'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can use [doHTML] tag?$guest_legend</b><br />".$SKIN->js_help_link('mg_dohtml') ,
-												  $SKIN->form_yes_no("g_dohtml", $group['g_dohtml'] )
-									     )      );
-									     					     							     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Moderation Permissions", "Allow or deny this group moderation abilities" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Is Super Moderator (can moderate anywhere)?$guest_legend" ,
-												  $SKIN->form_yes_no("g_is_supmod", $group['g_is_supmod'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can access the Admin CP?$guest_legend" ,
-												  $SKIN->form_yes_no("g_access_cp", $group['g_access_cp'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow user group to post in 'closed' topics?" ,
-												  $SKIN->form_yes_no("g_post_closed", $group['g_post_closed'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Group Promotion" );
-		
-		if ($group['g_id'] == $INFO['admin_group'])
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose 'Don't Promote' to disable promotions</b><br>".$SKIN->js_help_link('mg_promote') ,
-													  "Feature disable for the root admin group, after all - if you're at the top where can you be promoted to?"
-											 )      );
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose 'Don't Promote' to disable promotions</b>$guest_legend<br>".$SKIN->js_help_link('mg_promote') ,
-													  'Promote members of this group to: '.$SKIN->form_dropdown("g_promotion_id", $all_groups, $group['g_promotion_id'] )
-													 .'<br>when they reach '.$SKIN->form_simple_input('g_promotion_posts', $group['g_promotion_posts'] ).' posts'
-											 )      );
-		}
-		
-									     
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-	//+---------------------------------------------------------------------------------
-	//
-	// Show "Management Screen
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function main_screen()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "User Groups";
-		
-		$ADMIN->page_detail = "User Grouping is a quick and powerful way to organise your members. There are 4 preset groups that you cannot remove (Validating, Guest, Member and Admin) although you may edit these at will. A good example of user grouping is to set up a group called 'Moderators' and allow them access to certain forums other groups do not have access to.<br>Forum access allows you to make quick changes to that groups forum read, write and reply settings. You may do this on a forum per forum basis in forum control.";
-		
-		$g_array = array();
-		
-		$SKIN->td_header[] = array( "Group Title"    , "30%" );
-		$SKIN->td_header[] = array( "Access ACP?"    , "15%" );
-		$SKIN->td_header[] = array( "Super Mod?"     , "15%" );
-		$SKIN->td_header[] = array( "Members"        , "10%" );
-		$SKIN->td_header[] = array( "Edit Group"     , "20%" );
-		$SKIN->td_header[] = array( "Delete"         , "10%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "User Group Management" );
-		
-		$DB->query("SELECT ibf_groups.g_id, ibf_groups.g_access_cp, ibf_groups.g_is_supmod, ibf_groups.g_title,ibf_groups.prefix, ibf_groups.suffix, COUNT(ibf_members.id) as count FROM ibf_groups "
-		          ."LEFT JOIN ibf_members ON (ibf_members.mgroup = ibf_groups.g_id) "
-		          ."GROUP BY ibf_groups.g_id ORDER BY ibf_groups.g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-		
-			$del  = "";
-			$mod  = '&nbsp;';
-			$adm  = '&nbsp;';
-			
-			if ($r['g_id'] > 4)
-			{
-				$del = "<center><a href='{$ADMIN->base_url}&act=group&code=delete&id=".$r['g_id']."'>Delete</a></center>";
-			}
-			//-----------------------------------
-			if ($r['g_access_cp'] == 1)
-			{
-				$adm = '<center><span style="color:red">Yes</span></center>';
-			}
-			//-----------------------------------
-			if ($r['g_is_supmod'] == 1)
-			{
-				$mod = '<center><span style="color:red">Yes</span></center>';
-			}
-			
-			if ($r['g_id'] != 1 and $r['g_id'] != 2)
-			{
-				$total_linkage = "<a href='{$INFO['board_url']}/index.{$INFO['php_ext']}?act=Members&max_results=30&filter={$r['g_id']}&sort_order=asc&sort_key=name&st=0' target='_blank' title='List Users'>".$r['prefix'].$r['g_title'].$r['suffix']."</a>";
-			}
-			else
-			{
-				$total_linkage = $r['prefix'].$r['g_title'].$r['suffix'];
-			}
-			
-			if ( $INFO['admin_group'] == $r['g_id'] )
-			{
-				$is_root = " ( ROOT )";
-			}
-			else
-			{
-				$is_root = "";
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>$total_linkage</b> $is_root" ,
-												      $adm,
-												      $mod,
-												      "<center>".$r['count']."</center>",
-												      "<center><a href='{$ADMIN->base_url}&act=group&code=edit&id=".$r['g_id']."'>Edit Group</a></center>",
-												      $del
-												      
-									     )      );
-									     
-			$g_array[] = array( $r['g_id'], $r['g_title'] );
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic("&nbsp;", "center", "title");
-
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add' ),
-												  2 => array( 'act'   , 'group'     ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Add a new member group" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base new group on...</b>" ,
-												  $SKIN->form_dropdown("id", $g_array, 3 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Set up New Group");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-		
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_help.php b/upload/sources/Admin/ad_help.php
deleted file mode 100644
index d8a395af..00000000
--- a/upload/sources/Admin/ad_help.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Help Control functions
-|   > Module written by Matt Mecham
-|   > Date started: 2nd April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'edit':
-				$this->show_form('edit');
-				break;
-			case 'new':
-				$this->show_form('new');
-				break;
-			
-			case 'doedit':
-				$this->doedit();
-				break;
-				
-			case 'donew':
-				$this->doadd();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-			
-			//-------------------------
-			default:
-				$this->list_files();
-				break;
-		}
-		
-	}
-	
-	//-------------------------------------------------------------
-	// HELP FILE FUNCTIONS
-	//-------------------------------------------------------------
-	
-	function doedit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid emoticon id, silly!");
-		}
-		
-		$text  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['text'] ) );
-		//$title = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['title'] ) );
-		$desc  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['description'] ) );
-		
-		$text  = preg_replace( "/\\\/", "&#092;", $text );
-		
-		$db_string = $DB->compile_db_update_string( array( 'title'       => $IN['title'],
-														   'text'        => $text,
-														   'description' => $desc,
-												  )      );
-												  
-		$DB->query("UPDATE ibf_faq SET $db_string WHERE id='".$IN['id']."'");
-		
-		$ADMIN->save_log("Edited help files");
-		
-		$std->boink_it($SKIN->base_url."&act=help");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	
-	function show_form($type='new')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may add/edit and remove help files below.";
-		$ADMIN->page_title  = "Help File Management";
-		
-		//+-------------------------------
-		
-		if ($type != 'new')
-		{
-		
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("You must pass a valid help file id, silly!");
-			}
-		
-			//+-------------------------------
-		
-			$DB->query("SELECT * FROM ibf_faq WHERE id='".$IN['id']."'");
-		
-			if ( ! $r = $DB->fetch_row() )
-			{
-				$ADMIN->error("We could not find that help file in the database");
-			}
-		
-			//+-------------------------------
-			
-			$button = 'Edit this Help File';
-			$code   = 'doedit';
-		}
-		else
-		{
-			$r = array();
-			$button = 'Add this Help File';
-			$code   = 'donew';
-		}
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $code ),
-												  2 => array( 'act'   , 'help'     ),
-												  3 => array( 'id'    , $IN['id'] ),
-									     )      );
-		
-		
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "80%" );
-		
-		$r['text'] = preg_replace( "/<br>/i", "\n", stripslashes($r['text']) );
- 		
- 		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( $button );
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "Help File Title",
-												  $SKIN->form_input('title'  , stripslashes($r['title']) ),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Help File Description",
-												  $SKIN->form_textarea('description', stripslashes($r['description']) ),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Help File Text",
-												  $SKIN->form_textarea('text', $r['text'], "60", "10" ),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	//=====================================================
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid help file id, silly!");
-		}
-		
-		$DB->query("DELETE FROM ibf_faq WHERE id='".$IN['id']."'");
-		
-		$ADMIN->save_log("Removed a help file");
-		
-		$std->boink_it($SKIN->base_url."&act=help");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	function doadd()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['title'] == "")
-		{
-			$ADMIN->error("You must enter a title, silly!");
-		}
-		
-		
-		
-		$text  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['text'] ) );
-		$title = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['title'] ) );
-		$desc  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['description'] ) );
-		
-		$text  = preg_replace( "/\\\/", "&#092;", $text );
-		
-		$db_string = $DB->compile_db_insert_string( array( 'title'       => $title,
-														   'text'        => $text,
-														   'description' => $desc,
-												  )      );
-												  
-		$DB->query("INSERT INTO ibf_faq (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		$ADMIN->save_log("Added a help file");
-		
-		$std->boink_it($SKIN->base_url."&act=help");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	function list_files()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may add/edit and remove help files below.";
-		$ADMIN->page_title  = "Help File Management";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Title"  , "50%" );
-		$SKIN->td_header[] = array( "Edit"   , "30%" );
-		$SKIN->td_header[] = array( "Remove" , "20%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Current Help Files" );
-		
-		$DB->query("SELECT * from ibf_faq ORDER BY id ASC");
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $r = $DB->fetch_row() )
-			{
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['title'])."</b><br>".stripslashes($r['description']),
-														  "<center><a href='".$SKIN->base_url."&act=help&code=edit&id={$r['id']}'>Edit</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=help&code=remove&id={$r['id']}'>Remove</a></center>",
-												 )      );
-												   
-			
-				
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic("<a href='".$SKIN->base_url."&act=help&code=new'>Add New Help File</a>", "center", "title" );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_imagemacros.php b/upload/sources/Admin/ad_imagemacros.php
deleted file mode 100644
index 6e452ae1..00000000
--- a/upload/sources/Admin/ad_imagemacros.php
+++ /dev/null
@@ -1,890 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Skin -> Image Macro functions
-|   > Module written by Matt Mecham
-|   > Date started: 4th April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'wrapper':
-				$this->list_current();
-				break;
-				
-			case 'add':
-				$this->add_macro_set();
-				break;
-				
-			case 'edit':
-				$this->show_macros();
-				break;
-				
-			case 'doedit':
-				$this->edit_set_name();
-				break;
-				
-			case 'macroedit':
-				$this->macro_form('edit');
-				break;
-				
-			case 'macroadd':
-				$this->macro_form('add');
-				break;
-				
-			case 'macroremove':
-				$this->macro_remove();
-				break;
-				
-			case 'doeditmacro':
-				$this->macro_edit();
-				break;
-				
-			case 'doaddmacro':
-				$this->macro_add();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-			case 'export':
-				$this->export();
-				break;
-			
-			case 'import':
-				$this->import();
-				break;
-			
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	function import()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_FILES;
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") )
-		{
-			// We're adding new templates based on another set
-			
-			$ADMIN->error("No file was chosen to upload, please go back and try again");
-		}
-		
-		if (! is_dir($INFO['upload_dir']) )
-		{
-			$ADMIN->error("Could not locate the uploads directory - make sure the 'uploads' path is set correctly");
-		}
-		
-		//-------------------------------------------------
-		// Copy the upload to the uploads directory
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $INFO['upload_dir']."/".$FILE_NAME) )
-		{
-			$ADMIN->error("The upload failed");
-		}
-		else
-		{
-			@chmod( $INFO['upload_dir']."/".$FILE_NAME, 0777 );
-		}
-		
-		//-------------------------------------------------
-		// Attempt to open the file..
-		//-------------------------------------------------
-		
-		$filename = $INFO['upload_dir']."/".$FILE_NAME;
-		
-		if ( $FH = @fopen( $filename, 'r' ) )
-		{
-			$data = @fread( $FH, filesize($filename) );
-			@fclose($FH);
-			
-			@unlink($filename);
-		}
-		else
-		{
-			$ADMIN->error("Could not open the uploaded file for reading!");
-		}
-		
-		//-------------------------------------------------
-		// If we're here, we'll assume that we've read the
-		// file and the contents are in $data
-		// So, lets make sure its the correct macro file..
-		//-------------------------------------------------
-		
-		if ( ! preg_match( "/~=~/", $data ) )
-		{
-			$ADMIN->error("This file does not appear to be a valid Invision Power Board macro file");
-		}
-		
-		//-------------------------------------
-		// Get the new set_id
-		//-------------------------------------
-		
-		$DB->query("SELECT MAX(set_id) as max FROM ibf_macro_name");
-		
-		$max = $DB->fetch_row();
-		
-		$new_id = $max['max'] + 1;
-		
-		//-------------------------------------
-		// Process data
-		//-------------------------------------
-		
-		$init_array = array();
-		$final_keys = array();
-		
-		$init_array = explode("\n", $data);
-		
-		foreach( $init_array as $l )
-		{
-			if (preg_match( "~=~", $l ) )
-			{
-				// is valid line
-				
-				list($k, $v) = explode( "~=~", $l );
-				
-				$k = trim($k);
-				$v = trim($v);
-				
-				$final_keys[$k] = $v;
-			}
-		}
-		
-		//-------------------------------------
-		// Insert the data in the DB
-		//-------------------------------------
-		
-		foreach( $final_keys as $k => $v)
-		{
-			if ($v == '*UNASSIGNED*')
-			{
-				$v = "";
-			}
-			
-			$row['macro_replace'] = str_replace( '\n', "\n", $v);
-			
-			$str = $DB->compile_db_insert_string( array (
-														'macro_value'   => $std->txt_stripslashes($k),
-														'macro_replace' => $v,
-														'macro_set'     => $new_id,
-														'can_remove'    => 1,
-											)       );
-		
-			$DB->query("INSERT INTO ibf_macro ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-		}
-		
-		//----------------------------------
-		// Insert macro name into DB
-		//----------------------------------
-		
-		$set_name = "New Macro Set (Upload ID: ".substr( time(), -6 ).")";
-		
-		$str = $DB->compile_db_insert_string( array ( 'set_name'     => $set_name,
-													  'set_id'       => $new_id,
-											)       );
-											
-		$DB->query("INSERT INTO ibf_macro_name ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-		
-		$ADMIN->done_screen("Macro Set Import Complete", "Manage Macro Sets", "act=image" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Edit set name
-	//-------------------------------------------------------------
-	
-	function edit_set_name()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing macro set ID, go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_macro WHERE macro_set='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not retrieve the record from the DB");
-		}
-		
-		$DB->query("UPDATE ibf_macro_name SET set_name='{$IN['setname']}' WHERE set_id='".$IN['id']."'");
-		
-		$ADMIN->done_screen("Macro Set Updated", "Manage Macro Set {$row['macro_name']}", "act=image&code=edit&id={$row['macro_set']}" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Apply the edit to the DB
-	//-------------------------------------------------------------
-	
-	function macro_remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify an existing macro ID, go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_macro WHERE macro_id='".$IN['mid']."'");
-		
-		$row = $DB->fetch_row();
-		
-		$DB->query("DELETE FROM ibf_macro WHERE macro_id='".$IN['mid']."'");
-		
-		$ADMIN->done_screen("Macro Removed", "Manage Macro Set {$row['macro_name']}", "act=image&code=edit&id={$row['macro_set']}" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Apply the edit to the DB
-	//-------------------------------------------------------------
-	
-	function macro_edit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify an existing image set ID, go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_macro WHERE macro_id='".$IN['mid']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not retrieve the record from the DB");
-		}
-		
-		$key = str_replace( "'", "\\'", $std->txt_safeslashes($HTTP_POST_VARS['macro_value']) );
-		$val = str_replace( "'", "\\'", $std->txt_UNhtmlspecialchars($std->txt_safeslashes($HTTP_POST_VARS['macro_replace']) ) );
-		
-		$DB->query("UPDATE ibf_macro SET macro_value='$key', macro_replace='$val' WHERE macro_id='".$IN['mid']."'");
-		
-		$ADMIN->done_screen("Macro Updated", "Manage Macro Set {$row['macro_name']}", "act=image&code=edit&id={$row['macro_set']}" );
-		
-	}
-	
-	//------------------------------------------------
-	
-	
-	function macro_add()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing macro set ID, go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_macro WHERE macro_set='".$IN['id']."' LIMIT 0,1");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not retrieve the record from the DB");
-		}
-		
-		$str = $DB->compile_db_insert_string( array (
-														'macro_value'   => $std->txt_safeslashes($HTTP_POST_VARS['macro_value']),
-														'macro_replace' => $std->txt_UNhtmlspecialchars($std->txt_safeslashes($HTTP_POST_VARS['macro_replace'])),
-														'can_remove'    => 1,
-														'macro_set'     => $row['macro_set']
-											)       );
-		
-		$DB->query("INSERT INTO ibf_macro ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-		
-		$ADMIN->done_screen("Macro Added", "Manage Macro Set {$row['macro_name']}", "act=image&code=edit&id={$row['macro_set']}" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Print the edit/add formy wormy
-	//-------------------------------------------------------------
-	
-	function macro_form($type='edit')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		
-		if ($type == 'edit')
-		{
-		
-			if ($IN['mid'] == "")
-			{
-				$ADMIN->error("You must specify an existing macro ID, go back and try again");
-			}
-			
-			//+-------------------------------
-			
-			$DB->query("SELECT m.*, mn.set_name from ibf_macro m, ibf_macro_name mn WHERE macro_id='".$IN['mid']."' AND mn.set_id=m.macro_set");
-			
-			if ( ! $row = $DB->fetch_row() )
-			{
-				$ADMIN->error("Could not query the information from the database");
-			}
-			
-			$button = "Edit this Macro";
-			$title  = "Editing Macro in set <a href='{$SKIN->base_url}&act=image&code=edit&id={$row['macro_set']}'>{$row['set_name']}</a>";
-			$code   = 'doeditmacro';
-		
-		}
-		else
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("You must specify an existing macro set ID, go back and try again");
-			}
-			
-			//+-------------------------------
-			
-			$DB->query("SELECT set_name from ibf_macro_name WHERE set_id='".$IN['id']."'");
-			
-			if ( ! $row = $DB->fetch_row() )
-			{
-				$ADMIN->error("Could not query the information from the database");
-			}
-			
-			$code = 'doaddmacro';
-			$title = "Adding Macro to set <a href='{$SKIN->base_url}&act=image&code=edit&id={$IN['id']}'>{$row['set_name']}</a>";
-			$button = 'Add this Macro';
-		}
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "The macro 'key' will be useable in any wrapper or template file.<br>
-							 <b>Example:</b> If you added a key of 'green_font' and a replacement of '&lt;font color='green'>', each instance of <span style='color:red'><b>&lt;{green_font}&gt;</b></span> would be converted to &lt;font color='green'>
-							 <br><b>&lt;#IMG_DIR#></b> is available to any macro, this is automatically replaced with the name of the image directory you choose when using this macro set in a skin";
-		$ADMIN->page_title  = "Manage Macro Set: {$row['set_name']}";
-		
-		//+-------------------------------
-		
-		
-		$ADMIN->html .= $SKIN->js_no_specialchars();
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $code    ),
-												  2 => array( 'act'   , 'image'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-												  4 => array( 'mid'   , $IN['mid']   ),
-									     )       );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "80%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( $title );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Macro Key",
-													"&lt;{".$SKIN->form_input('macro_value', $row['macro_value'])."}&gt;",
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Macro Replacement",
-													$SKIN->form_textarea('macro_replace', $std->txt_htmlspecialchars($row['macro_replace']) ),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form($button);
-									     
-		$ADMIN->html .= $SKIN->end_table();
-									     
-		$ADMIN->output();
-	}
-	
-	
-	
-	//+-------------------------------
-	
-	
-	function export()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing image set ID, go back and try again");
-		}
-		
-		$DB->query("SELECT set_name FROM ibf_macro_name WHERE set_id='".$IN['id']."'");
-		
-		$name = $DB->fetch_row();
-		
-		//+-------------------------------
-		// Pass file as an attachment, yeah!
-		//+-------------------------------
-		
-		$l_name = preg_replace( "/\s{1,}/", "_", $name['set_name'] );
-		
-		$file_name = "macro-".substr($l_name, 0, 8).".txt";
-		
-		$contents = "";
-		
-		$DB->query("SELECT macro_replace, macro_value FROM ibf_macro WHERE macro_set='".$IN['id']."'");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			if ($row['macro_replace'] == "")
-			{
-				$row['macro_replace'] = "*UNASSIGNED*";
-			}
-			
-			// Fix newlines..
-			
-			$row['macro_replace'] = str_replace( "\n", '\n', str_replace("\r", "\n", $row['macro_replace'] ) );
-			
-			$contents .= $row['macro_value']."~=~".$row['macro_replace']."\n";
-		}
-		
-		@header("Content-type: unknown/unknown");
-		@header("Content-Disposition: attachment; filename=$file_name");
-		
-		print $contents."\n";
-		
-		exit();
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Add images..
-	//-------------------------------------------------------------
-	
-	
-	function add_macro_set()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing macro set ID, go back and try again");
-		}
-		
-		
-		$DB->query("SELECT * FROM ibf_macro_name WHERE set_id='".$IN['id']."'");
-		
-		//-------------------------------------
-		
-		if ( ! $mac = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query that macro set from the DB, so there");
-		}
-		
-		//-------------------------------------
-		
-		$mac['set_name'] = $mac['set_name']." (Copy)";
-		
-		//-------------------------------------
-		// Get the new set_id
-		//-------------------------------------
-		
-		$DB->query("SELECT MAX(set_id) as max FROM ibf_macro_name");
-		
-		$max = $DB->fetch_row();
-		
-		$new_id = $max['max'] + 1;
-		
-		$q1 = $DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set='{$IN['id']}'");
-		
-		while( $row = $DB->fetch_row($q1) )
-		{
-			$str = $DB->compile_db_insert_string( array (
-														'macro_value'   => $std->txt_stripslashes($row['macro_value']),
-														'macro_replace' => $std->txt_stripslashes($row['macro_replace']),
-														'macro_set'     => $new_id,
-														'can_remove'    => 1,
-											)       );
-		
-			$q2 = $DB->query("INSERT INTO ibf_macro ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-			//$q2 = $DB->query("INSERT INTO ibf_macro SET macro_value='{$row['macro_value']}',macro_replace='{$row['macro_replace']}', macro_set='$new_id'");
-		}
-		
-		$DB->query("INSERT INTO ibf_macro_name SET set_id='$new_id', set_name='{$mac['set_name']}'");
-		
-		$ADMIN->done_screen("Macro Set Added", "Manage Macro Sets", "act=image" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// REMOVE WRAPPERS
-	//-------------------------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing macro set ID, go back and try again");
-		}
-		
-		$DB->query("DELETE FROM ibf_macro WHERE macro_set='".$IN['id']."'");
-		
-		$DB->query("DELETE FROM ibf_macro_name WHERE set_id='".$IN['id']."'");
-				
-		$std->boink_it($SKIN->base_url."&act=image");
-	}
-	
-	
-	
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT MACRO SETS
-	//-------------------------------------------------------------
-	
-	function show_macros()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing macro set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT m.*, ms.* from ibf_macro m, ibf_macro_name ms WHERE m.macro_set='".$IN['id']."' AND ms.set_id=m.macro_set LIMIT 0,1");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "To edit a macro, simply click on the 'edit' link of the appropriate macro.
-							 <br>The macro 'key' will be useable in any wrapper or template file.<br>
-							 <b>Example:</b> If you added a key of 'green_font' and a replacement of '&lt;font color='green'>', each instance of <span style='color:red'><b>&lt;{green_font}&gt;</b></span> would be converted to &lt;font color='green'>
-							 <br><b>&lt;#IMG_DIR#></b> is available to any macro, this is automatically replaced with the name of the image directory you choose when using this macro set in a skin";
-		$ADMIN->page_title  = "Manage Macro Set: {$row['set_name']}";
-		
-		//+-------------------------------
-		
-		
-		$ADMIN->html .= $SKIN->js_no_specialchars();
-		$ADMIN->html .= $SKIN->js_checkdelete();
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doedit'    ),
-												  2 => array( 'act'   , 'image'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     ), "theAdminForm", "onSubmit=\"return no_specialchars('images')\""       );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "80%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Edit Macro Set Title" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Macro Set Title",
-													$SKIN->form_input('setname', $row['set_name']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit Macro Title");
-									     
-		$ADMIN->html .= $SKIN->end_table();
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Macro Key"           , "20%" );
-		$SKIN->td_header[] = array( "Macro Replacement"   , "45%" );
-		$SKIN->td_header[] = array( "Preview"             , "15%" );
-		$SKIN->td_header[] = array( "Edit"                , "10%" );
-		$SKIN->td_header[] = array( "Remove"              , "10%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Current Macros ["."<a href='".$SKIN->base_url."&act=image&code=macroadd&id={$row['macro_set']}'>Add a macro</a>"." ]" );
-		
-		// Get img_dir this set is using...
-		
-		$DB->query("SELECT img_dir from ibf_skins WHERE macro_id='".$IN['id']."'");
-		
-		$skin = $DB->fetch_row();
-		
-		$DB->query("SELECT * from ibf_macro WHERE macro_set='".$IN['id']."'");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			
-			$real = str_replace( "<", "&lt;", $row['macro_replace'] );
-			$real = str_replace( ">", "&gt;", $real );
-			
-			if ( strlen($real) > 55 )
-			{
-				$real = substr( $real, 0, 52 ) . '...';
-			}
-			
-			if ( $INFO['preview'] == 0 )
-			{
-				$preview = '<em>Disabled via ACP Prefs</em>';
-			}
-			else
-			{
-				$preview = str_replace( "<#IMG_DIR#>", $skin['img_dir'], $row['macro_replace'] );
-			}
-			
-			$remove = "Cannot remove";
-			
-			if ($row['can_remove'] == 1)
-			{
-				$remove = "<center><a href='javascript:checkdelete(\"act=image&code=macroremove&mid={$row['macro_id']}\")'>Remove</a></center>";
-				
-			}
-			
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-												"<b>{$row['macro_value']}</b>",
-												$real,
-												$preview,
-												"<center><a href='".$SKIN->base_url."&act=image&code=macroedit&mid={$row['macro_id']}'>Edit</a></center>",
-												$remove,
-									 )      );
-		}
-									     
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW WRAPPERS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You may manage your macro sets from this section. This enables you to use text links instead of buttons or flash movies for certain images.";
-		$ADMIN->page_title  = "Manage Macro Sets";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Title"        , "40%" );
-		$SKIN->td_header[] = array( "Allocation"   , "30%" );
-		$SKIN->td_header[] = array( "Export"       , "10%" );
-		$SKIN->td_header[] = array( "Edit"         , "10%" );
-		$SKIN->td_header[] = array( "Remove"       , "10%" );
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT DISTINCT(s.macro_id), i.macro_set, ms.set_name, s.sname from ibf_macro i, ibf_macro_name ms, ibf_skins s WHERE s.macro_id=i.macro_set  AND ms.set_id=i.macro_set ORDER BY ms.set_name ASC");
-		
-		$used_ids = array();
-		$show_array = array();
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			$ADMIN->html .= $SKIN->start_table( "Current Macro sets In Use" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$show_array[ $r['macro_set'] ] .= stripslashes($r['sname'])."<br>";
-			
-				if ( in_array( $r['macro_set'], $used_ids ) )
-				{
-					continue;
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$std->txt_stripslashes($r['set_name'])."</b>",
-														  "<#X-{$r['macro_set']}#>",
-														  "<center><a href='".$SKIN->base_url."&act=image&code=export&id={$r['macro_set']}'>Export</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=image&code=edit&id={$r['macro_set']}'>Edit</a></center>",
-														  "<i>Deallocate before removing</i>",
-												 )      );
-												   
-				$used_ids[] = $r['macro_set'];
-				
-				$form_array[] = array( $r['macro_set'], $r['set_name'] );
-				
-			}
-			
-			foreach( $show_array as $idx => $string )
-			{
-				$string = preg_replace( "/<br>$/", "", $string );
-				
-				$ADMIN->html = preg_replace( "/<#X-$idx#>/", "$string", $ADMIN->html );
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		if ( count($used_ids) > 0 )
-		{
-		
-			$DB->query("SELECT set_id, set_name FROM ibf_macro_name WHERE set_id NOT IN(".implode(",",$used_ids).")");
-		
-			if ( $DB->get_num_rows() )
-			{
-			
-				$SKIN->td_header[] = array( "Title"  , "70%" );
-				$SKIN->td_header[] = array( "Export" , "10%" );
-				$SKIN->td_header[] = array( "Edit"   , "10%" );
-				$SKIN->td_header[] = array( "Remove" , "10%" );
-			
-				$ADMIN->html .= $SKIN->start_table( "Current Unallocated Macro sets" );
-				
-				$ADMIN->html .= $SKIN->js_checkdelete();
-				
-				while ( $r = $DB->fetch_row() )
-				{
-					
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$std->txt_stripslashes($r['set_name'])."</b>",
-															  "<center><a href='".$SKIN->base_url."&act=image&code=export&id={$r['set_id']}'>Export</a></center>",
-															  "<center><a href='".$SKIN->base_url."&act=image&code=edit&id={$r['set_id']}'>Edit</a></center>",
-															  "<center><a href='javascript:checkdelete(\"act=image&code=remove&id={$r['set_id']}\")'>Remove</a></center>",
-													 )      ); 
-													 
-					$form_array[] = array( $r['set_id'], $r['set_name'] );
-													   
-				}
-				
-				$ADMIN->html .= $SKIN->end_table();
-			}
-		}
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add'     ),
-												  2 => array( 'act'   , 'image'    ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Create a New Macro Set" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base the new Macro set on...</b>" ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Create a new Macro set");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'import'     ),
-												  2 => array( 'act'   , 'image'    ),
-												  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
-									     ) , "uploadform", " enctype='multipart/form-data'"     );
-												  
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Import a Macro Set" );
-			
-		//+-------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><u>OR</u> Choose a file from your computer to import</b><br>Note: This must be a valid macro set.",
-												  $SKIN->form_upload(),
-										 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Import Macro Set");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_index.php b/upload/sources/Admin/ad_index.php
deleted file mode 100644
index cda68e9d..00000000
--- a/upload/sources/Admin/ad_index.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin "welcome" screen functions
-|   > Module written by Matt Mecham
-|   > Date started: 1st march 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new index_page();
-
-
-class index_page {
-
-	var $mysql_version = "";
-	
-	function index_page()
-	{
-		global $DB, $IN, $INFO, $ADMIN, $MEMBER, $SKIN, $std, $ibforums;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-		
-		$ADMIN->page_title  = "Welcome to the Invision Power Board Administration CP";
-		$ADMIN->page_detail = "You can set up and customize your board from within this control panel.<br><br>Clicking on one of the links in the left menu pane will show you the relevant options for that administration category. Each option will contain further information on configuration, etc.";
-		
-		
-		//---------------------------------
-		// Get mySQL & PHP Version
-		//---------------------------------
-		
-		$DB->query("SELECT VERSION() AS version");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$DB->query("SHOW VARIABLES LIKE 'version'");
-			$row = $DB->fetch_row();
-		}
-		
-   		$this->mysql_version = $row['version'];
-   		
-   		$phpv = phpversion();
-   		
-		//---------------------------------
-		// Got reg code?
-		//---------------------------------
-		
-		$reg_html = "";
-		$reg_end  = "";
-		
-		$version_info = "<a href='http://www.invisionboard.com/download.cgi' target='_blank'><img border='0' src='http://www.invisionboard.com/acp/versioncheck/?v={$ibforums->acpversion}' vspace='10'></a><br /><b><a href='http://www.php.net' target='_blank'>PHP</a> VERSION:</b> $phpv, <b><a href='http://www.mysql.com' target='_blank'>MySQL</a> VERSION:</b> ".$this->mysql_version;
-		
-		if ( $INFO['ipb_reg_number'] )
-		{
-			list( $a, $b, $c, $d, $e ) = explode( '-', $INFO['ipb_reg_number'] );
-			
-			if ( strlen($e) > 9 )
-			{
-				$reg_end = "Registered until: <span style='color:green'>". $ADMIN->get_date( $e, 'SHORT' )."</span>";
-			}
-			else
-			{
-				$reg_end = "Registered for life";
-			}
-			
-			$reg_html = "<div style='border:1px dotted #555;padding:6px;background-color:#EEF2F7;'>
-							<b style='font-size:12px;color:#336699'>Registered Invision Power Board</b>
-							<br />Thank you for registering your Invision Power Board!
-							<br /><br />Please visit your <a href='http://customer.invisionpower.com' target='_blank'>client area</a> for news, updates and support.
-							<br />$reg_end
-						</div>";
-		}
-		else
-		{
-			$reg_html = "<div style='border:1px dotted #555;padding:6px;background-color:#EEF2F7;'>
-							<b style='font-size:12px;color:#AA0000'>Unregistered Invision Power Board</b>
-							<br />This copy of Invision Power Board is unregistered.
-							<br /><br />Why register? <a href='http://www.invisionboard.com/?whyregister' target='_blank'>click here</a> to find out!
-							<br />Go on, <a href='http://www.invisionboard.com/download.cgi?subc=register' target='_blank'> register today!</a> you know it makes sense!
-						</div>";
-		}
-		
-		//---------------------------------
-		// Notepad
-		//---------------------------------
-		
-		if ( $IN['save'] == 1 )
-		{
-			$DB->query("UPDATE ibf_cache_store SET cs_value='".addslashes($_POST['notes'])."' WHERE cs_key='adminnotes'");
-		}
-		
-		$text = "You can use this section to keep notes for yourself and other admins, etc.";
-		
-		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='adminnotes'");
-		
-		if ( ! $notes = $DB->fetch_row() )
-		{
-			$DB->query("INSERT INTO ibf_cache_store (cs_key,cs_value) VALUES ('adminnotes', '$text')");
-			
-			$notes = array( 'cs_key' => 'adminnotes', 'cs_value' => $text );
-		}
-		
-		$ad_notes = "<form action='{$ADMIN->base_url}&act=index&save=1' method='post'>
-					 <textarea name='notes' style='background-color:#F9FFA2;border:1px solid #CCC;width:95%;font-family:verdana;font-size:10px' rows='7' cols='25'>".stripslashes($notes['cs_value'])."</textarea>
-				     <div align='center'><input type='submit' value='Save Admin Notes' style='background-color:#F9FFA2;border:1px solid #999;;font-family:verdana;font-size:10px' /></div>
-				     </form>";
-		
-		//---------------------------------
-		// Printy-poos
-		//---------------------------------
-		
-		$ADMIN->html .= "<table width='100%' border='0' cellpadding='0' cellspacing='0'>
-						 <tr>
-						  <td width='49%' valign='middle' align='center' style='padding:6px;background-color:#FAFFAF;'>{$ad_notes}</td>
-						  <td style='width:10px'>&nbsp;</td>
-						  <td width='49%' valign='top' align='left'>{$version_info}<br /><br />{$reg_html}</td>
-						 </tr>
-						 </table><br />\n";
-		
-		//---------------------------------
-		// Stats
-		//---------------------------------
-		
-		$DB->query("SELECT * FROM ibf_stats");
-		
-		$row = $DB->fetch_row();
-		
-		if ($row['TOTAL_REPLIES'] < 0) $row['TOTAL_REPLIES'] = 0;
-		if ($row['TOTAL_TOPICS']  < 0) $row['TOTAL_TOPICS']  = 0;
-		if ($row['MEM_COUNT']     < 0) $row['MEM_COUNT']     = 0;
-		
-		$DB->query("SELECT COUNT(*) as reg FROM ibf_validating WHERE lost_pass <> 1");
-		$reg = $DB->fetch_row();
-		
-		if ($reg['reg'] < 1 ) $reg['reg'] = 0;
-		
-		$DB->query("SELECT COUNT(*) as coppa FROM ibf_validating WHERE coppa_user=1");
-		$coppa = $DB->fetch_row();
-		
-		if ($coppa['coppa'] < 1 ) $coppa['coppa'] = 0;
-		
-		//-------------------------------------------------
-		// Make sure the uploads path is correct
-		//-------------------------------------------------
-		
-		$uploads_size = 0;
-		
-		if ($dh = opendir( $INFO['upload_dir'] ))
-		{
-			while ( $file = readdir( $dh ) )
-			{
-				if ( !preg_match( "/^..?$|^index/i", $file ) )
-				{
-					$uploads_size += @filesize( $INFO['upload_dir'] . "/" . $file );
-				}
-			}
-			closedir( $dh );
-		}
-		
-		// This piece of code from Jesse's (jesse@jess.on.ca) contribution
-		// to the PHP manual @ php.net
-		
-		if ($uploads_size >= 1048576)
-		{
-			$uploads_size = round($uploads_size / 1048576 * 100 ) / 100 . " mb";
-		}
-		else if ($uploads_size >= 1024)
-		{
-			$uploads_size = round($uploads_size / 1024 * 100 ) / 100 . " k";
-		}
-		else
-		{
-			$uploads_size = $uploads_size . " bytes";
-		}
-		
-		//+-----------------------------------------------------------
-		// INSTALLER PRESENT?
-		//+-----------------------------------------------------------
-		
-		$sm_install = 0;
-		$lock_file  = 0;
-		
-		if ( @file_exists( ROOT_PATH . 'sm_install.php' ) )
-		{
-			$sm_install = 1;
-		}
-		
-		if ( @file_exists( ROOT_PATH . 'install.lock' ) )
-		{
-			$lock_file = 1;
-		}
-		
-		if ( $sm_install == 1 ) 
-		{
-			if ( $lock_file != 1 )
-			{
-				$ADMIN->html .= "<div style='color:red;border:1px solid red;background:#FFC0C3;padding:10px'>
-				                   <span style='font-size:20px;font-weight:bold'>Warning: Unlocked Installer Still Present</span>
-				                   <br /><br /><span style='font-size:14px;'>Remove <b>sm_install.php</b> from your server at once!
-				                   <br />Leaving it on your server WILL compromise the security of your system.</span></div><br /><br />";
-			}
-			else
-			{
-				$ADMIN->html .= "<div style='color:red;border:1px solid red;background:#FFE1E2;padding:10px'>
-				                   <span style='font-size:14px;font-weight:bold'>Warning: Installer Still Present</span>
-				                   <br /><br /><span style='font-size:10px;'>Although the installer appears to be locked, we recommend you remove it
-				                   from your server for security.
-				                   <br />Simply remove <b>sm_install.php</b> from your installation to remove this message.</span></div><br /><br />";
-			}
-		}
-		
-		
-		//+-----------------------------------------------------------
-		// BOARD OFFLINE?
-		//+-----------------------------------------------------------
-		
-		if ($INFO['board_offline'])
-		{
-			
-			$SKIN->td_header[] = array( "&nbsp;", "100%" );
-			
-			$ADMIN->html .= $SKIN->start_table( "Offline Notice" );
-			
-
-			$ADMIN->html .= $SKIN->add_td_row( array( "Your board is currently offline<br><br>&raquo; <a href='{$ADMIN->base_url}&act=op&code=board'>Turn Board Online</a>"
-											 )      );
-											 
-			$ADMIN->html .= $SKIN->end_table();
-		
-			$ADMIN->html .= $SKIN->add_td_spacer();
-		}
-			
-		//+-----------------------------------------------------------
-		// ADMINS USING CP
-		//+-----------------------------------------------------------
-		
-		$SKIN->td_header[] = array( "Name"           , "20%" );
-		$SKIN->td_header[] = array( "IP Address"     , "20%" );
-		$SKIN->td_header[] = array( "Log In"         , "20%" );
-		$SKIN->td_header[] = array( "Last Click"     , "20%" );
-		$SKIN->td_header[] = array( "Location"       , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Administrators using the CP" );
-		
-		$t_time = time() - 60*10;
-		
-		$DB->query("SELECT MEMBER_NAME, LOCATION, LOG_IN_TIME, RUNNING_TIME, IP_ADDRESS FROM ibf_admin_sessions WHERE RUNNING_TIME > $t_time");
-		
-		$time_now = time();
-		
-		$seen_name = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ( $seen_name[ $r['MEMBER_NAME'] ] == 1 )
-			{
-				continue;
-			}
-			else
-			{
-				$seen_name[ $r['MEMBER_NAME'] ] = 1;
-			}
-			
-			$log_in = $time_now - $r['LOG_IN_TIME'];
-			$click  = $time_now - $r['RUNNING_TIME'];
-			
-			if ( ($log_in / 60) < 1 )
-			{
-				$log_in = sprintf("%0d", $log_in) . " seconds ago";
-			}
-			else
-			{
-				$log_in = sprintf("%0d", ($log_in / 60) ) . " minutes ago";
-			}
-			
-			if ( ($click / 60) < 1 )
-			{
-				$click = sprintf("%0d", $click) . " seconds ago";
-			}
-			else
-			{
-				$click = sprintf("%0d", ($click / 60) ) . " minutes ago";
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array (
-														$r['MEMBER_NAME'],
-														"<center><a href='javascript:alert(\"Host Name: ".@gethostbyaddr($r['IP_ADDRESS'])."\")' title='Get host name'>".$r['IP_ADDRESS']."</a></center>",
-														"<center>".$log_in."</center>",
-														"<center>".$click."</center>",
-														"<center>".$r['LOCATION']."</center>",
-											 )       );
-		}
-		
-		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-----------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_spacer();
-		
-		//+-----------------------------------------------------------
-		
-		
-		if ($MEMBER['mgroup'] == $INFO['admin_group'])
-		{
-			//+-----------------------------------------------------------
-			// LAST 5 Admin Actions
-			//+-----------------------------------------------------------
-			
-			$SKIN->td_header[] = array( "Member Name"            , "20%" );
-			$SKIN->td_header[] = array( "Action Performed"        , "40%" );
-			$SKIN->td_header[] = array( "Time of action"         , "20%" );
-			$SKIN->td_header[] = array( "IP address"             , "20%" );
-			
-			$ADMIN->html .= $SKIN->start_table( "Last 5 Admin Actions" );
-			
-			$DB->query("SELECT m.*, mem.id, mem.name FROM ibf_admin_logs m, ibf_members mem
-						WHERE  m.member_id=mem.id ORDER BY m.ctime DESC LIMIT 0, 5");
-			
-			if ( $DB->get_num_rows() )
-			{
-				while ( $rowb = $DB->fetch_row() )
-				{
-					$rowb['ctime'] = $ADMIN->get_date( $rowb['ctime'] );
-					
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$rowb['name']}</b>",
-															  "{$rowb['note']}",
-															  "{$rowb['ctime']}",
-															  "{$rowb['ip_address']}",
-													 )      );
-				
-				
-				}
-			}
-			else
-			{
-				$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-			
-			//+-----------------------------------------------------------
-			
-			$ADMIN->html .= $SKIN->add_td_spacer();
-		}
-		
-		//+-----------------------------------------------------------
-		// Bots stuff
-		//+-----------------------------------------------------------
-		
-		if ( $INFO['spider_sense'] )
-		{
-			$SKIN->td_header[] = array( "Search Bot"   , "20%" );
-			$SKIN->td_header[] = array( "Date"         , "25%" );
-			$SKIN->td_header[] = array( "Query"        , "20%" );
-			$SKIN->td_header[] = array( "Query"        , "35%" );
-			
-			$ADMIN->html .= $SKIN->start_table( "Last 10 Search Engine Spiders Hits" );
-			
-			$DB->query("SELECT * FROM ibf_spider_logs ORDER BY entry_date DESC LIMIT 0,10");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( "<strong>".$INFO[ 'sp_'.$r['bot'] ]."</strong>",
-														  $ADMIN->get_date( $r['entry_date'], 'SHORT' ),
-														  $r['ip_address'].'&nbsp;',
-														  $r['query_string'].'&nbsp;'
-												 )      );
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-			
-			$ADMIN->html .= $SKIN->add_td_spacer();
-		}
-		
-		//+-----------------------------------------------------------
-		
-		
-		
-		$SKIN->td_header[] = array( "Definition", "25%" );
-		$SKIN->td_header[] = array( "Value"     , "25%" );
-		$SKIN->td_header[] = array( "Definition", "25%" );
-		$SKIN->td_header[] = array( "Value"     , "25%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "System Overview" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "Total Unique Topics" , $row['TOTAL_TOPICS'],
-												  "Total Replies to topics"         , $row['TOTAL_REPLIES']
-		 								 )      );
-		 								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Total Members" , $row['MEM_COUNT'], "Public Upload Folder Size", $uploads_size ) );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<a href='{$SKIN->base_url}&act=mem&code=mod'>Users awaiting validation</a>" , $reg['reg'],
-												  "<a href='{$SKIN->base_url}&act=mem&code=mod'>COPPA Requests</a> from 'Users awaiting validation' total", $coppa['coppa'],
-									     )      );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-----------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_spacer();
-		
-		//+-----------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form();
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "30%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "30%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Quick Clicks" );
-		
-		$ADMIN->html .= "
-				
-					<script language='javascript'>
-					<!--
-					  function edit_member() {
-						
-						if (document.forms[1].username.value == \"\") {
-							alert(\"You must enter a username!\");
-						} else {
-							window.parent.body.location = '{$SKIN->base_url}' + '&act=mem&code=stepone&USER_NAME=' + escape(document.forms[1].username.value);
-						}
-					  }
-					  
-					  function new_cat() {
-						
-						if (document.forms[1].cat_name.value == \"\") {
-							alert(\"You must enter a category name!\");
-						} else {
-							window.parent.body.location = '{$SKIN->base_url}' + '&act=cat&code=new&name=' + escape(document.forms[1].cat_name.value);
-						}
-					  }
-					  
-					  function new_forum() {
-						
-						if (document.forms[1].forum_name.value == \"\") {
-							alert(\"You must enter a forum name!\");
-						} else {
-							window.parent.body.location = '{$SKIN->base_url}' + '&act=forum&code=new&name=' + escape(document.forms[1].forum_name.value);
-						}
-					  }
-					//-->
-					
-					</script>
-					<form name='DOIT' action=''>
-						
-		";
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "Edit Member:",
-												  "<input type='text' style='width:100%' id='textinput' name='username' value='Enter name here' onfocus='this.value=\"\"'>",
-												  "<input type='button' value='Find Member' id='button' onClick='edit_member()'>"
-										 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "Add New Category:",
-												  "<input type='text' style='width:100%' name='cat_name' id='textinput' value='Category title here' onfocus='this.value=\"\"'>",
-												  "<input type='button' value='Add Category' id='button' onClick='new_cat()'>"
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Add New Forum:",
-												  "<input type='text' style='width:100%' name='forum_name' id='textinput' value='Forum title here' onfocus='this.value=\"\"'>",
-												  "<input type='button' value='Add Forum' id='button' onClick='new_forum()'>"
-										 )      );
-		
-		$ADMIN->html .= "</form>";
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_languages.php b/upload/sources/Admin/ad_languages.php
deleted file mode 100644
index cc8c0393..00000000
--- a/upload/sources/Admin/ad_languages.php
+++ /dev/null
@@ -1,1111 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Language functions
-|   > Module written by Matt Mecham
-|   > Date started: 22nd April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_langs();
-
-
-class ad_langs {
-
-	var $base_url;
-
-	function ad_langs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			
-			case 'add':
-				$this->add_language();
-				break;
-				
-			case 'edit':
-				$this->do_form('edit');
-				break;
-				
-			case 'edit2':
-				$this->show_file();
-				break;
-				
-			case 'doadd':
-				$this->save_wrapper('add');
-				break;
-				
-			case 'doedit':
-				$this->save_langfile();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-			case 'editinfo':
-				$this->edit_info();
-				break;
-				
-			case 'export':
-				$this->export();
-				break;
-				
-			case 'import':
-				$this->import();
-				break;
-				
-			case 'doimport':
-				$this->doimport();
-				break;
-				
-			case 'makedefault':
-				$this->make_default();
-				break;
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	
-	//--------------------------------------------
-	
-	function make_default()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
-	
-		$new_dir = stripslashes(urldecode(trim($HTTP_GET_VARS['id'])));
-		
-		if ($new_dir == "")
-		{
-			$ADMIN->error("Could not resolve the new ID for the default lang pack stuff thingy thanks");
-		}
-		
-		// Update conf file 
-		
-		$ADMIN->rebuild_config( array( 'default_language' => $new_dir ) );
-		
-		// Bring it all back to yoooo!
-		
-		$std->boink_it($SKIN->base_url."&act=lang");
-	
-	}
-	
-	
-	//--------------------------------------------
-	
-	
-	
-	
-	function doimport()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['tarball'] == "")
-		{
-			$ADMIN->error("You did not select a tar-chive to import!");
-		}
-		
-		require ROOT_PATH."sources/lib/tar.php";
-		
-		$to_dir = $INFO['base_dir']."lang";
-		
-		$tarname = $IN['tarball'];
-		
-		$from_dir = $INFO['base_dir']."archive_in";
-		
-		$tar = new tar();
-		
-		//------------------------------
-		
-		$real_name = preg_replace( "/^lang-(\S+)\.tar$/", "\\1", $IN['tarball'] );
-		
-		$real_name = preg_replace( "/_/", " ", $real_name );
-		
-		//------------------------------
-		
-		$tar->new_tar( $from_dir, $tarname );
-		
-		$files = $tar->list_files();
-		
-		if (count($files) > 0)
-		{
-			foreach($files as $giles)
-			{
-				if ( ! preg_match( "/^(?:[\.\w\d\+\-\_\/]+)$/", $giles) )
-				{
-					$ADMIN->error("$tarname is possibly corrupted, please re-upload in binary");
-				}
-			}
-		}
-		else
-		{
-			$ADMIN->error("$tarname is not a valid tar-chive");
-		}
-		
-		$DB->query("INSERT INTO ibf_languages (ldir, lname) VALUES('temp', '$real_name (Import)')");
-		
-		$new_id = $DB->get_insert_id();
-		
-		//-------------------------
-		// attempt to make new dir
-		//-------------------------
-		
-		$dest = $to_dir."/".$new_id;
-		
-		if ( ! mkdir($dest, 0777) )
-		{
-			$DB->query("DELETE FROM ibf_languages WHERE lid='$new_id'");
-			
-			$ADMIN->error("Could not create a new directory in $to_dir, please give sufficient CHMOD permissions to allow this");
-		}
-		
-		//------------------------------
-		// Extract the tarball
-		//------------------------------
-		
-		$tar->extract_files($dest);
-		
-		if ($tar->error != "")
-		{
-			$DB->query("DELETE FROM ibf_languages WHERE lid='$new_id'");
-			
-			$ADMIN->error( $tar->error );
-		}
-		
-		$extra = array( 'lauthor' => "", 'lemail' => "" );
-		
-		if (file_exists($dest."/conf.inc"))
-		{
-			require $dest."/conf.inc";
-		
-			$extra['lauthor'] = stripslashes($config['lauthor']);
-			$extra['lemail']  = stripslashes($config['lemail']);
-			
-		}
-		
-		$extra['ldir'] = $new_id;
-		
-		$db_string = $DB->compile_db_update_string($extra);
-		
-		$DB->query("UPDATE ibf_languages SET $db_string WHERE lid='$new_id'");
-		
-		$ADMIN->done_screen("Language Pack Export Imported", "Manage Language Sets", "act=lang" );
-		
-	}
-	
-	//--------------------------------------------
-	
-	function import()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "The tar-chive that you wish to import must reside in 'archive_in' and be a valid tar-chive uploaded in binary format.";
-		$ADMIN->page_title  = "Language Pack Import";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'      , 'doimport'    ),
-												  2 => array( 'act'       , 'lang'      ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;" , "50%" );
-		$SKIN->td_header[] = array( "&nbsp;" , "50%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Choose a tar-chive to import" );
-		
-		$files = $ADMIN->get_tar_names("lang-");
-		
-		$form_array = array();
-		
-		if (count($files) > 0)
-		{
-			foreach($files as $piles)
-			{
-				$form_array[] = array( $piles, $piles );
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Tar-chive to import...</b>" ,
-										  $SKIN->form_dropdown( "tarball", $form_array  )
-								 )      );
-	
-		$ADMIN->html .= $SKIN->end_form("Import!");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	
-	}
-	
-	
-	//--------------------------------------------
-	
-	
-	function export()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing language set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_languages WHERE lid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$archive_dir = $INFO['base_dir']."/archive_out";
-		$lang_dir    = $INFO['base_dir']."/lang/".$row['ldir'];
-		
-		require ROOT_PATH."sources/lib/tar.php";
-		
-		if (!is_dir($archive_dir))
-		{
-			$ADMIN->error("Could not locate $archive_dir, is the directory there?");
-		}
-		
-		if (!is_writeable($archive_dir))
-		{
-			$ADMIN->error("Cannot write in $archive_dir, CHMOD via FTP to 0755 or 0777 to enable this script to write into it. IBF cannot do this for you");
-		}
-		
-		if (!is_dir($lang_dir))
-		{
-			$ADMIN->error("Could not locate $lang_dir, is the directory there?");
-		}
-		
-		//+-------------------------------
-		// Attempt to copy the files to the
-		// working directory...
-		//+-------------------------------
-		
-		$l_name = preg_replace( "/\s{1,}/", "_", $row['lname'] );
-		
-		$new_dir = "lang-".$l_name;
-		
-		if ( ! $ADMIN->copy_dir($lang_dir, $archive_dir."/".$new_dir) )
-		{
-			$ADMIN->error( $ADMIN->errors );
-		}
-		
-		// Generate the config file..
-		
-		$file_content = "<?php\n\n\$config=array('lauthor' => \"".addslashes($row['lauthor'])."\", 'lemail'=>\"".addslashes($row['lemail'])."\")\n\n?".">";
-		
-		$FH = fopen($archive_dir."/".$new_dir."/"."conf.inc", 'w');
-		fwrite($FH, $file_content, strlen($file_content));
-		fclose($FH);
-		
-		// Add files and write tarball
-		
-		$tar = new tar();
-		
-		$tar->new_tar( $archive_dir, $new_dir.".tar" );
-		$tar->add_directory( $archive_dir."/".$new_dir );
-		$tar->write_tar();
-		
-		// Check for errors.
-		
-		if ($tar->error != "")
-		{
-			$ADMIN->error($tar->error);
-		}
-		
-		// remove original unarchived directory
-		
-		$ADMIN->rm_dir($archive_dir."/".$new_dir);
-		
-		$ADMIN->done_screen("Language Pack Export Created<br><br>You can download the tar-chive <a href='archive_out/{$new_dir}.tar'>here</a>", "Manage Language Sets", "act=lang" );
-		
-		
-	}
-	
-	
-	
-	
-	
-	function show_file()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing language set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_languages WHERE lid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$lang_dir = $INFO['base_dir']."lang/".$row['ldir'];
-		
-		$form_array = array();
-		
-		$lang_file = $lang_dir."/".$IN['lang_file'];
-	
-		
-		if ( ! is_writeable($lang_dir) )
-		{
-			$ADMIN->error("Cannot write into '$lang_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-		}
-		
-		if (! file_exists($lang_file) )
-		{
-			$ADMIN->error("Cannot locate {$IN['lang_file']} in '$lang_dir', please go back and check the input");
-		}
-		else
-		{
-			require $lang_file;
-		}
-		
-		if ($IN['lang_file'] == 'email_content.php')
-		{
-			$lang     = $EMAIL;
-			$is_email = 1;
-		}
-		
-		if ( ! is_writeable($lang_file) )
-		{
-			$ADMIN->error("Cannot write to '$lang_file', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-		}
-	
-	
-		$ADMIN->page_detail = "You may edit any of the language information below.";
-		$ADMIN->page_title  = "Edit Language set: ".$row['lname'];
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'      , 'doedit'    ),
-												  2 => array( 'act'       , 'lang'      ),
-												  3 => array( 'id'        , $IN['id']   ),
-												  4 => array( 'lang_file' , $IN['lang_file']   ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Block Name" , "20%" );
-		$SKIN->td_header[] = array( "Content"    , "80%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Language Text: ".$IN['lang_file'] );
-									     
-		foreach($lang as $k => $v)
-		{
-			
-				
-			//+-------------------------------
-			// Swop < and > into ascii entities
-			// to prevent textarea breaking html
-			//+-------------------------------
-			
-			$v = stripslashes($v);
-			
-			$v = preg_replace("/&/", "&#38;", $v );
-			$v = preg_replace("/</", "&#60;", $v );
-			$v = preg_replace("/>/", "&#62;", $v );
-			$v = preg_replace("/'/", "&#39;", $v );
-			
-			if ($IN['lang_file'] == 'email_content.php')
-			{
-				$rows = 15;
-			
-				$cols = 70;
-				
-				if ( isset($SUBJECT[ $k ]) )
-				{
-					$subj = "Subject: &nbsp;".$SKIN->form_input('SS_'.$k, $SUBJECT[ $k ] )."<br />";
-				}
-				else
-				{
-					$subj = "";
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( 
-													"&lt;ibf.lang.<b>".$k."</b>&gt;",
-													$subj.$SKIN->form_textarea('XX_'.$k, $v, $cols, $rows),
-										 )      );
-			}
-			else
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( 
-													"&lt;ibf.lang.<b>".$k."</b>&gt;",
-													$SKIN->form_input('XX_'.$k, $v),
-										 )      );
-			}
-				
-		}
-									     
-
-												 
-		$ADMIN->html .= $SKIN->end_form("Edit this file");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Edit language pack information
-	//-------------------------------------------------------------
-	
-	function edit_info()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing language set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_languages WHERE lid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		$final['lname'] = stripslashes($HTTP_POST_VARS['lname']);
-		
-		if (isset($HTTP_POST_VARS['lname']))
-		{
-			$final['lauthor'] = stripslashes($HTTP_POST_VARS['lauthor']);
-			$final['lemail']  = stripslashes($HTTP_POST_VARS['lemail']);
-		}
-		
-		$db_string = $DB->compile_db_update_string( $final );
-		
-		$DB->query("UPDATE ibf_languages SET $db_string WHERE lid='".$IN['id']."'");
-		
-		$ADMIN->done_screen("Language pack information updated", "Manage language sets", "act=lang" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Add language pack
-	//-------------------------------------------------------------
-	
-	
-	function add_language()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing language set ID, go back and try again");
-		}
-		
-		
-		$DB->query("SELECT * FROM ibf_languages WHERE lid='".$IN['id']."'");
-		
-		//-------------------------------------
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query that language set from the DB, so there");
-		}
-		
-		//-------------------------------------
-		
-		//-------------------------------------
-		
-		if ( ! is_writeable(ROOT_PATH.'lang') )
-		{
-			$ADMIN->error("The directory 'lang' is not writeable by this script. Please check the permissions on that directory. CHMOD to 0777 if in doubt and try again");
-		}
-		
-		//-------------------------------------
-		
-		if ( ! is_dir(ROOT_PATH.'lang/'.$row['ldir']) )
-		{
-			$ADMIN->error("Could not locate the original language set to copy, please check and try again");
-		}
-		
-		//-------------------------------------
-		
-		$row['lname'] = $row['lname'].".2";
-		
-		// Insert a new row into the DB...
-		
-		$final = array();
-		
-		foreach($row as $k => $v)
-		{
-			if ($k == 'lid')
-			{
-				continue;
-			}
-			else
-			{
-				$final[ $k ] = $v;
-			}
-		}
-		
-		$db_string = $DB->compile_db_insert_string( $final );
-		
-		$DB->query("INSERT INTO ibf_languages (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		$new_id = $DB->get_insert_id();
-		
-		//-------------------------------------
-		
-		if ( ! $ADMIN->copy_dir( $INFO['base_dir'].'lang/'.$row['ldir'] , $INFO['base_dir'].'lang/'.$new_id ) )
-		{
-			$DB->query("DELETE FROM ibf_languages WHERE lid='$new_id'");
-			
-			$ADMIN->error( $ADMIN->errors );
-		}
-		else
-		{
-			$DB->query("UPDATE ibf_languages SET ldir='$new_id' WHERE lid='$new_id'");
-		}
-		
-		//-------------------------------------
-		// Pass to edit / add form...
-		//-------------------------------------
-		
-		$this->do_form('add', $new_id);
-	
-	}
-	
-	//-------------------------------------------------------------
-	// REMOVE WRAPPERS
-	//-------------------------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing image set ID, go back and try again");
-		}
-		
-		if ($IN['id'] == 1)
-		{
-			$ADMIN->error("You cannot remove this language pack.");
-		}
-		
-		$DB->query("SELECT * from ibf_languages WHERE lid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the language information from the database");
-		}
-		
-		// Is it default??????????????? ok enuff
-		
-		if ($INFO['default_language'] == "")
-		{
-			$INFO['default_language'] = 'en';
-		}
-		
-		if ($row['ldir'] == $INFO['default_language'])
-		{
-			$ADMIN->error("You cannot remove this language pack while it is the default language directory. Please select another pack to be the default and try again");
-		}
-		
-		$DB->query("UPDATE ibf_members SET language='{$INFO['default_language']}' WHERE language='{$row['ldir']}'");
-		
-		if ( $ADMIN->rm_dir( $INFO['base_dir']."lang/".$row['ldir'] ) )
-		{
-		
-			$DB->query("DELETE FROM ibf_languages WHERE lid='".$IN['id']."'");
-			
-			$std->boink_it($SKIN->base_url."&act=lang");
-			exit();
-		}
-		else
-		{
-			$ADMIN->error("Could not remove the language pack files, please check the CHMOD permissions to ensure that this script has the correct permissions to allow this");
-		}
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT IMAGE SETS
-	//-------------------------------------------------------------
-	
-	function save_langfile()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing language set ID, go back and try again");
-		}
-		
-		if ($IN['lang_file'] == "")
-		{
-			$ADMIN->error("You must specify an existing language filename, go back and try again");
-		}
-	
-		$DB->query("SELECT * from ibf_languages WHERE lid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the language information from the database");
-		}
-		
-		$lang_file = ROOT_PATH."lang/".$row['ldir']."/".$IN['lang_file'];
-		
-		if (! file_exists( $lang_file ) )
-		{
-			$ADMIN->error("Could not locate $lang_file, is it there?");
-		}
-		
-		if (! is_writeable( $lang_file ) )
-		{
-			$ADMIN->error("Cannot write to $lang_file, please chmod to 0666 or better and try again");
-		}
-		
-		$barney = array();
-		
-		foreach ($IN as $k => $v)
-		{
-			if ( preg_match( "/^XX_(\S+)$/", $k, $match ) )
-			{
-				if ( isset($IN[ $match[0] ]) )
-				{
-					$v = preg_replace("/&#39;/", "'", stripslashes($HTTP_POST_VARS[ $match[0] ]) );
-					$v = preg_replace("/&#60;/", "<",  $v );
-					$v = preg_replace("/&#62;/", ">", $v );
-					$v = preg_replace("/&#38;/", "&", $v );
-					$v = preg_replace("/\r/", "", $v );
-				
-					$barney[ $match[1] ] = $v;
-				}
-			}
-		}
-		
-		if ( count($barney) < 1 )
-		{
-			$ADMIN->error("Oopsie, something has gone wrong - did you leave all the fields blank?");
-		}
-		
-		$start = "<?php\n\n";
-		
-		if ($IN['lang_file'] == 'email_content.php')
-		{
-			foreach($barney as $key => $text)
-			{
-				$text = preg_replace("/n{1,}$/", "", $text);
-				
-				if ( $IN['SS_'.$key] != "" )
-				{
-					$start .= "\n".'$SUBJECT['."'$key'".'] = "'.str_replace( '"', "&quot;", stripslashes($HTTP_POST_VARS['SS_'.$key]) )."\";\n";
-				}
-				$start .= "\n".'$EMAIL['."'$key'".'] = <<<EOF'."\n".$text."\nEOF;\n";
-			}
-		}
-		else
-		{
-			foreach($barney as $key => $text)
-			{
-				$start .= "\n".'$lang['."'$key'".']  = "'.addslashes($text).'";';
-			}
-		}
-		
-		$start .= "\n\n?".">";
-		
-		if ($fh = fopen( $lang_file, 'w') )
-		{
-			fwrite($fh, $start, strlen($start) );
-			fclose($fh);
-		}
-		else
-		{
-			$ADMIN->error("Could not write back to $lang_file");
-		}
-		
-		$ADMIN->done_screen("Set updated", "Manage Language Sets", "act=lang" );
-		
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// EDIT SPLASH
-	//-------------------------------------------------------------
-	
-	function do_form( $method='add', $id="" )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		
-		if ($id != "")
-		{
-			$IN['id'] = $id;
-		}
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing language set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_languages WHERE lid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$lang_dir = $INFO['base_dir']."lang/".$row['ldir'];
-		
-		$form_array = array();
-	
-		if ($method != 'add')
-		{
-			if ( ! is_writeable($lang_dir) )
-			{
-				$ADMIN->error("Cannot write into '$lang_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-			}
-		}
-		
-		//+-------------------------------
-		
-		if ( is_dir($lang_dir) )
-		{
-			$handle = opendir($lang_dir);
-			
-			while (($filename = readdir($handle)) !== false)
-			{
-				if (($filename != ".") && ($filename != ".."))
-				{
-					if (preg_match("/^index/", $filename))
-					{
-						continue;
-					}
-					
-					if (preg_match("/\.php$/", $filename))
-					{
-						$form_array[] = array( $filename, preg_replace( "/\.php$/", "", $filename ) );
-					}
-				}
-			}
-				
-			closedir($handle);
-		}
-		
-		if ($row['lauthor'] and $row['lemail'])
-		{
-			$author = "<br><br>This language set <b>'{$row['lname']}'</b> was created by <a href='mailto:{$row['lemail']}' target='_blank'>{$row['lauthor']}</a>";
-		}
-		else if ($row['lauthor'])
-		{
-			$author = "<br><br>This language set <b>'{$row['lname']}'</b> was created by {$row['lauthor']}";
-		}
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "Please choose which language section you wish to edit below.$author $url";
-		$ADMIN->page_title  = "Edit Language set";
-		
-		//+-------------------------------
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'editinfo'    ),
-												  2 => array( 'act'   , 'lang'       ),
-												  3 => array( 'id'    , $IN['id']     ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Edit language set information" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Language Set Name</b>",
-													$SKIN->form_input('lname', $row['lname']),
-									     )      );
-									     
-		if ($method == 'add')
-		{
-									     
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<b>Language set author name:</b>",
-														$SKIN->form_input('lauthor', $row['lauthor']),
-											 )      );
-											 
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<b>Language set author email:</b>",
-														$SKIN->form_input('lemail', $row['lemail']),
-											 )      );
-											 
-		}
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit language set details");
-									     
-		$ADMIN->html .= $SKIN->end_table();
-									     
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'edit2'    ),
-												  2 => array( 'act'   , 'lang'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Edit language files in set '".$row['lname']."'" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Please select a language file to edit</b>",
-													$SKIN->form_dropdown('lang_file', $form_array),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit this language file");
-									     
-		$ADMIN->html .= $SKIN->end_table();
-									     
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW ALL LANGUAGE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($INFO['default_language'] == "")
-		{
-			$INFO['default_language'] = 'en';
-		}
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You can edit, remove and create new language packs from this section";
-		$ADMIN->page_title  = "Manage Language Sets";
-		
-		//+-------------------------------
-		
-		$DB->query("select ibf_languages.*, count(ibf_members.id) as mcount from ibf_languages left join ibf_members on(ibf_members.language=ibf_languages.ldir) where (ibf_members.language is not null or ibf_members.language = 'en') group by ibf_languages.ldir order by ibf_languages.lname");
-		
-		
-		$used_ids = array();
-		$show_array = array();
-		
-		$ADMIN->html .= $SKIN->js_checkdelete();
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			$SKIN->td_header[] = array( "Title"        , "40%" );
-			$SKIN->td_header[] = array( "Members"      , "30%" );
-			$SKIN->td_header[] = array( "Export"       , "10%" );
-			$SKIN->td_header[] = array( "Edit"         , "10%" );
-			$SKIN->td_header[] = array( "Remove"       , "10%" );
-		
-			$ADMIN->html .= $SKIN->start_table( "Current Language Packs In Use" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				if ($INFO['default_language'] == $r['ldir'])
-				{
-					$root = "<span style='color:red;font-weight:bold'> (Default Language)</span>";
-				}
-				else
-				{
-					$root = " ( <a href='{$SKIN->base_url}&act=lang&code=makedefault&id=".urlencode($r['ldir'])."'>Make Default Language</a> )";
-				}
-			
-				$show_array[ $r['lid'] ] .= stripslashes($r['lname'])."<br>";
-			
-				if ( in_array( $r['lid'], $used_ids ) )
-				{
-					continue;
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['lname'])."</b> $root",
-														  "<center>{$r['mcount']}</center>",
-														  "<center><a href='".$SKIN->base_url."&act=lang&code=export&id={$r['lid']}'>Export</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=lang&code=edit&id={$r['lid']}'>Edit</a></center>",
-														  "<center><a href='javascript:checkdelete(\"act=lang&code=remove&id={$r['lid']}\")'>Remove</a></center>",
-												 )      );
-												   
-				$used_ids[] = $r['lid'];
-				
-				$form_array[] = array( $r['lid'], $r['lname'] );
-				
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		if ( count($used_ids) < 1 )
-		{
-			$used_ids[] = '0';
-		}
-			$DB->query("SELECT lid, ldir, lname FROM ibf_languages WHERE lid NOT IN(".implode(",",$used_ids).")");
-		
-			if ( $DB->get_num_rows() )
-			{
-			
-				$SKIN->td_header[] = array( "Title"  , "40%" );
-				$SKIN->td_header[] = array( "Export" , "10%" );
-				$SKIN->td_header[] = array( "Edit"   , "30%" );
-				$SKIN->td_header[] = array( "Remove" , "20%" );
-			
-				$ADMIN->html .= $SKIN->start_table( "Current Unallocated Language Packs" );
-				
-				
-				
-				while ( $r = $DB->fetch_row() )
-				{
-					
-					if ($INFO['default_language'] == $r['ldir'])
-					{
-						$root = "<span style='color:red;font-weight:bold'> (Default Language)</span>";
-					}
-					else
-					{
-						$root = " ( <a href='{$SKIN->base_url}&act=lang&code=makedefault&id=".urlencode($r['ldir'])."'>Make Default Language</a> )";
-					}
-				
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['lname'])."</b> $root",
-					 										  "<center><a href='".$SKIN->base_url."&act=lang&code=export&id={$r['lid']}'>Export</a></center>",
-															  "<center><a href='".$SKIN->base_url."&act=lang&code=edit&id={$r['lid']}'>Edit</a></center>",
-															  "<center><a href='javascript:checkdelete(\"act=lang&code=remove&id={$r['lid']}\")'>Remove</a></center>",
-													 )      );
-													 
-					$form_array[] = array( $r['lid'], $r['lname'] );
-													   
-				}
-				
-				$ADMIN->html .= $SKIN->end_table();
-			}
-		//}
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add'     ),
-												  2 => array( 'act'   , 'lang'    ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Create Language Set" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base new language set on...</b>" ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Create new Language set");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_member.php b/upload/sources/Admin/ad_member.php
deleted file mode 100644
index 1245466b..00000000
--- a/upload/sources/Admin/ad_member.php
+++ /dev/null
@@ -1,3182 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Forum functions
-|   > Module written by Matt Mecham
-|   > Date started: 1st march 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_forums();
-
-$root_path = "";
-
-class ad_forums {
-
-	var $base_url;
-	var $modules = "";
-
-	function ad_forums()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums;
-		
-		//--------------------------------------------
-    	// Get the sync module
-		//--------------------------------------------
-		
-		if ( USE_MODULES == 1 )
-		{
-			require ROOT_PATH."modules/ipb_member_sync.php";
-			
-			$this->modules = new ipb_member_sync();
-		}
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		$ADMIN->nav[] = array( 'act=mem&code=edit', 'Edit Member Search Form' );
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'stepone':
-				$this->do_advanced_search(1);
-				break;
-			case 'doform':
-				$this->do_edit_form();
-				break;
-			case 'doedit':
-				$this->do_edit();
-				break;
-			case 'advancedsearch':
-				$this->do_advanced_search();
-				break;
-			//---------------------
-			case 'unsuspend':
-				$this->unsuspend();
-				break;
-			//---------------------
-			case 'add':
-				$this->add_form();
-				break;
-			case 'doadd':
-				$this->do_add();
-				break;
-			//---------------------
-			case 'del':
-				$this->delete_form();
-				break;
-			case 'delete2':
-				$this->delete_lookup_form();
-				break;
-			case 'dodelete':
-				$this->dodelete();
-				break;
-			case 'prune':
-				$this->prune_confirm();
-				break;
-			case 'doprune':
-				$this->doprune();
-				break;
-			//---------------------
-			case 'title':
-				$this->titles();
-				break;
-			case 'rank_edit':
-				$this->rank_setup('edit');
-				break;
-			case 'rank_add':
-				$this->rank_setup('add');
-				break;
-			case 'do_add_rank':
-				$this->add_rank();
-				break;
-			case 'do_rank_edit':
-				$this->edit_rank();
-				break;
-			case 'rank_delete':
-				$this->delete_rank();
-				break;
-			//---------------------
-			case 'ban':
-				$this->ban_control();
-				break;
-			case 'doban':
-				$this->update_ban();
-				break;
-			//---------------------
-			case 'mod':
-				$this->view_mod();
-				break;
-			case 'domod':
-				$this->domod();
-				break;
-			//---------------------
-			case 'changename':
-				$this->change_name_start();
-				break;
-			case 'dochangename':
-				$this->change_name_complete();
-				break;
-			//---------------------	
-			case 'mail':
-				$this->bulk_mail_form();
-				break;
-			case 'domail':
-				$this->do_bulk_mail();
-				break;
-				
-			case 'banmember':
-				$this->temp_ban_start();
-				break;
-				
-			case 'dobanmember':
-				$this->temp_ban_complete();
-				break;
-			//---------------------
-			default:
-				$this->search_form();
-				break;
-		}
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// MASS EMAIL PEOPLE!
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function do_bulk_mail() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		// Get the ID's of the groups we're emailing.
-		
-		$ids = array();
- 		
- 		foreach ($IN as $key => $value)
- 		{
- 			if ( preg_match( "/^sg_(\d+)$/", $key, $match ) )
- 			{
- 				if ($IN[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		if ( count($ids) < 1 )
- 		{
- 			$this->bulk_mail_form(1, 'Errors', 'You must choose at least one group to send the email to');
- 			exit();
- 		}
- 		
- 		if ($IN['title'] == "")
- 		{
- 			$this->bulk_mail_form(1, 'Errors', 'You must set a subject for this email');
- 			exit();
- 		}
- 		
- 		if ($IN['email_contents'] == "")
- 		{
- 			$this->bulk_mail_form(1, 'Errors', 'You must include some text for the email body');
- 			exit();
- 		}
- 		
- 		$group_str = implode( ",", $ids);
- 		
- 		// Sort out the rest of the DB stuff
- 		
- 		$where = ""; // Where? who knows? who cares?
- 		
- 		if ($IN['posts'] > 0)
- 		{
- 			$where .= " AND posts < ".$IN['posts'];
- 		}
- 		
- 		if ($IN['days'] > 0)
- 		{
- 			$time = time() - ($IN['days']*60*60*24);
- 			$where .= " AND last_activity < '$time'";
- 		}
- 		
- 		if ($IN["honour_user_setting"] == 1)
- 		{
- 			$where .= "AND allow_admin_mails=1";
- 		}
- 		
- 		//+---------------------------------------
- 		// Get a grip, er count
- 		//+---------------------------------------
- 		
- 		$DB->query("SELECT COUNT(id) as total FROM ibf_members WHERE mgroup IN($group_str)".$where);
- 		
- 		$rows = $DB->fetch_row();
- 		
- 		if ($rows['total'] < 1)
- 		{
- 			$this->bulk_mail_form(1, 'Errors', 'Please expand your criteria as no members could be found to email using the supplied information');
- 			exit();
- 		}
- 		
- 		//+---------------------------------------
- 		// Regex up stuff
-		//+---------------------------------------
-		
-		$DB->query("SELECT * FROM ibf_stats");
-		$stats = $DB->fetch_row();
-		
-		$contents = $std->txt_stripslashes($HTTP_POST_VARS['email_contents']);
-		
-		$contents = str_replace( "{board_name}" , str_replace( "&#39;", "'", $INFO['board_name'] ) , $contents );
-		$contents = str_replace( "{board_url}"  , $INFO['board_url']."/index.".$INFO['php_ext'] , $contents );
-		$contents = str_replace( "{reg_total}"  , $stats['MEM_COUNT'] , $contents );
-		$contents = str_replace( "{total_posts}", $stats['TOTAL_TOPICS'] + $stats['TOTAL_REPLIES'] , $contents );
-		$contents = str_replace( "{busy_count}" , $stats['MOST_COUNT'] , $contents );
-		$contents = str_replace( "{busy_time}"  , $std->get_date( $stats['MOST_DATE'], 'SHORT' ), $contents );
-
- 		
- 		//+---------------------------------------
- 		// Are we previewing? Why am I asking you?
-		//+---------------------------------------
-		
-		if ($IN['preview'] != "")
-		{
-			$this->bulk_mail_form(1, 'Preview',
-									 "<b>".$std->txt_stripslashes($IN['title'])."</b><br><br>"
-									 .$contents."<br><br><b>Members to mail:</b> ".$rows['total']
-								 );
- 			exit();
- 		}
- 		
- 		//+---------------------------------------
- 		// We're still here? GROOVY, send da mail
-		//+---------------------------------------
-		
-		@set_time_limit(1200);
-		
-		require "./sources/lib/emailer.php";
-		
-		$this->email = new emailer();
-		
-		$this->email->bcc = array();
-		
-		$DB->query("SELECT email FROM ibf_members WHERE mgroup IN($group_str)".$where);
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($r['email'] != "")
-			{
-				$this->email->bcc[] = $r['email'];
-			}
-		}
-		
-		$this->email->from    = $INFO['email_in'];
-		$this->email->message = str_replace( "\r\n", "\n", $contents);
-		$this->email->subject = $std->txt_stripslashes($IN['title']);
-		
-		if ($IN['email_admin'] == 1)
-		{
-			$this->email->to = $INFO['email_in'];
-		}
-		else
-		{
-			$this->email->to = "";
-		}
-		
-		$this->email->send_mail();
-		
-		$ADMIN->save_log("Mass emailed members ($where)");
-		
-		$ADMIN->done_screen("Bulk Email sent", "Member Control", "act=mem" );
-		
-	}
-	
-	
-	
-	
-	function bulk_mail_form($preview=0, $title='Preview', $content="") {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		
-		$ADMIN->page_title = "Bulk Email Members";
-		
-		$ADMIN->page_detail = "You may bulk email your members by configuring the form below. Click the 'Quick Help' link for more information";
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'domail'  ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-									     
-		if ($HTTP_POST_VARS['email_contents'] == "")
-		{
-			$HTTP_POST_VARS['email_contents'] = "\n\n\n-------------------------------------\n{board_name} Statistics:\n"
-								   ."-------------------------------------\nRegistered Users: {reg_total}\nTotal Posts: {total_posts}\n"
-								   ."Busiest Time: {busy_count} users were online on {busy_time}\n\n"
-								   ."-------------------------------------\nHandy Links\n"
-								   ."-------------------------------------\nBoard Address: {board_url}\nLog In: {board_url}?act=Login&CODE=00\n"
-								   ."Lost Password Recovery: {board_url}?act=Reg&CODE=10\n\n"
-								   ."-------------------------------------\nHow to unsubscribe\n"
-								   ."-------------------------------------\nVisit your email preferences ({board_url}?act=UserCP&CODE=02) and ensure "
-								   ."that the box for 'Send me any updates sent by the board administrator' is unchecked and submit the form";
-		}
-		
-		if ($preview == 1)
-		{
-			$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
-			
-			$ADMIN->html .= $SKIN->start_table( $title );
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( nl2br($content) ) );
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Bulk Email Members: Content" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Honour 'Allow Admin Emails' user setting?</b><br>It is strongly recommended that you do!" ,
-												  $SKIN->form_yes_no( "honour_user_setting", isset($IN["honour_user_setting"]) ? $IN["honour_user_setting"] : 1 )
-									     	)      );
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email Subject</b>" ,
-												  $SKIN->form_input( "title", $std->txt_stripslashes($IN['title']) )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email contents</b><br>".$SKIN->js_help_link('m_bulkemail') ,
-												  $SKIN->form_textarea( "email_contents", $std->txt_stripslashes($HTTP_POST_VARS['email_contents']), 60, 15 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Send this email to the admin incoming address?</b><br>Enable this if you get a mail error upon submit - required when using SMTP." ,
-												  $SKIN->form_yes_no( "email_admin", isset($IN['email_admin']) ? $IN['email_admin'] : 1 )
-									     )      );
-									     							     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Bulk Email Members: Settings" );
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups WHERE g_id <> ".$INFO['guest_group']." ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Send to group <span style='color:red'>{$r['g_title']}</span>?</b>" ,
-												  $SKIN->form_yes_no( "sg_{$r['g_id']}", isset($IN['sg_'.$r['g_id']]) ? $IN['sg_'.$r['g_id']] : 1 )
-									     	)      );
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Where user has less than [x] posts</b><br>Leave blank to email regardless of post count" ,
-												  $SKIN->form_input( "post", $IN['post'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Where user has NOT been online for more than [x] days</b><br>Leave blank to email regardless of last visit" ,
-												  $SKIN->form_input( "days", $IN['days'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_basic( '<input type="submit" name="preview" id="button" value="Preview">', 'center' );
-		
-		$ADMIN->html .= $SKIN->end_form("Proceed");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// TEMP BANNING
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function temp_ban_start()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Account Suspension";
-		
-		$ADMIN->page_detail = "Automated temporary member suspension. Simply choose the duration of the suspension and submit the form below";
-		
-		$contents = "{membername},\nYour member account at {$INFO['board_name']} has been temporarily suspended.\n\nYour account will not be functional until {date_end} (depending on your timezone). This is an automated process and you do not need to do anything to expediate the unsuspension process.\n\nBoard Address: {$INFO['board_url']}/index.php";
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify a valid member id, please go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_members WHERE id='".$IN['mid']."'");
-		
-		if ( ! $member = $DB->fetch_row() )
-		{
-			$ADMIN->error("We could not match that ID in the members database");
-		}
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dobanmember'  ),
-												  2 => array( 'act'   , 'mem'       ),
-												  3 => array( 'mid'   , $IN['mid']  ),
-									     )      );
-									     		
-		$ban = $std->hdl_ban_line( $member['temp_ban'] );
-		
-		$units = array( 0 => array( 'h', 'Hours' ), 1 => array( 'd', 'Days' ) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Account Suspension", "Note: If this member is already suspended, any new setting will restart the ban" );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<strong>Suspend {$member['name']} for...</strong>" ,
-												  $SKIN->form_input('timespan', $ban['timespan'], "text", "", '5' ) . '&nbsp;' . $SKIN->form_dropdown('units', $units, $ban['units'] ),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email notification to this member?</b><br>(If so, you may edit the email below)" ,
-												  $SKIN->form_yes_no( "send_email", 0 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email contents</b><br>(Tags: {membername} = member's name, {date_end} = ban end)" ,
-												  $SKIN->form_textarea( "email_contents", $contents )
-									     ), "", 'top'       );
-									     									     
-		$ADMIN->html .= $SKIN->end_form("Suspend This Account");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	//---------------------------------------------------------------
-	
-	function unsuspend()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify a valid member id, please go back and try again");
-		}
-		
-		if ($IN['mid'] == 'all')
-		{
-			$DB->query("UPDATE ibf_members SET temp_ban=''");
-			
-			$ADMIN->save_log("Unsuspended all member accounts");
-		
-			$ADMIN->done_screen("All Accounts Unsuspended", "Member Control", "act=mem" );
-		}
-		else
-		{
-			$mid = intval($IN['mid']);
-			
-			$DB->query("UPDATE ibf_members SET temp_ban='' WHERE id=$mid");
-			
-			$DB->query("SELECT name FROM ibf_members WHERE id=$mid");
-			
-			$member = $DB->fetch_row();
-			
-			$ADMIN->save_log("Unsuspended {$member['name']}");
-		
-			$ADMIN->done_screen("{$member['name']} Unsuspended", "Member Control", "act=mem" );
-		}	
-			
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function temp_ban_complete()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$ADMIN->page_title = "Account Suspension";
-		
-		$ADMIN->page_detail = "Automated temporary member suspension. Confirmation and information";
-		
-		$IN['mid'] = intval($IN['mid']);
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify a valid member id, please go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_members WHERE id='".$IN['mid']."'");
-		
-		if ( ! $member = $DB->fetch_row() )
-		{
-			$ADMIN->error("We could not match that ID in the members database");
-		}
-		
-		//+-------------------------------
-		// Work out end date
-		//+-------------------------------
-		
-		$IN['timespan'] = intval($IN['timespan']);
-		
-		if ( $IN['timespan'] == "" )
-		{
-			$new_ban = "";
-		}
-		else
-		{
-			$new_ban = $std->hdl_ban_line( array( 'timespan' => intval($IN['timespan']), 'unit' => $IN['units']  ) );
-		}
-		
-		$show_ban = $std->hdl_ban_line( $new_ban );
-			
-		//+-------------------------------
-		// Update and show confirmation
-		//+-------------------------------
-									     
-		$DB->query("UPDATE ibf_members SET temp_ban='$new_ban' WHERE id={$IN['mid']}");
-		
-		// I say, did we choose to email 'dis member?
-		
-		if ($IN['send_email'] == 1)
-		{
-			// By golly, we did!
-			
-			require "./sources/lib/emailer.php";
-		
-			$this->email = new emailer();
-			
-			$msg = trim($std->txt_stripslashes($HTTP_POST_VARS['email_contents']));
-			
-			$msg = str_replace( "{membername}", $member['name']       , $msg );
-			$msg = str_replace( "{date_end}"  , $ADMIN->get_date( $show_ban['date_end'], 'LONG') , $msg );
-			
-			$this->email->message = $this->email->clean_message($msg);
-			$this->email->subject = "Account Suspension Notification";
-			$this->email->to      = $member['email'];
-			$this->email->send_mail();
-			
-			$skin_extra = $SKIN->add_td_row( array( "<strong>Email Sent</strong>",
-												    "<strong>Account Suspension Notification</strong><br /><br />".str_replace( "\n", "<br />", $msg)
-									    ), "", 'top'      );
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Suspension: Result"  );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<strong>{$member['name']} is suspended until...</strong>",
-												  $ADMIN->get_date( $show_ban['date_end'], 'LONG'),
-									    )      );
-									    
-		$ADMIN->html .= $skin_extra;
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->nav[] = array( "act=mem&code=stepone&USER_NAME={$member['name']}", "Admin Options for {$member['name']}" );
-		
-		$ADMIN->save_log("Suspended {$member['name']} until ".$ADMIN->get_date( $show_ban['date_end'], 'SHORT'));
-		
-		$ADMIN->output();
-	}
-	
-		
-	//+---------------------------------------------------------------------------------
-	//
-	// CHANGE MEMBER NAME
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function change_name_complete()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$IN['new_name'] = str_replace( '|', '&#124;', $IN['new_name'] );
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify a valid member id, please go back and try again");
-		}
-		
-		if ($IN['new_name'] == "")
-		{
-			$this->change_name_start("You must enter a new name for this member");
-			exit();
-		}
-		
-		$DB->query("SELECT name, email FROM ibf_members WHERE id='".$IN['mid']."'");
-		
-		if ( ! $member = $DB->fetch_row() )
-		{
-			$ADMIN->error("We could not match that ID in the members database");
-		}
-		
-		$mid = $IN['mid']; // Save me poor ol' carpels
-		
-		if ($IN['new_name'] == $member['name'])
-		{
-			$this->change_name_start("The new name is the same as the old name, that is illogical captain");
-			exit();
-		}
-		
-		// Check to ensure that his member name hasn't already been taken.
-		
-		$new_name = trim($IN['new_name']);
-		
-		$DB->query("SELECT id FROM ibf_members WHERE LOWER(name)='".strtolower($new_name)."'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$this->change_name_start("The name '$new_name' already exists, please choose another");
-			exit();
-		}
-		
-		// If one gets here, one can assume that the new name is correct for one, er...one.
-		// So, lets do the converteroo
-		
-		$DB->query("UPDATE ibf_members SET name='$new_name' WHERE id='$mid'");
-		$DB->query("UPDATE ibf_contacts SET contact_name='$new_name' WHERE contact_id='$mid'");
-		$DB->query("UPDATE ibf_forums SET last_poster_name='$new_name' WHERE last_poster_id='$mid'");
-		$DB->query("UPDATE ibf_moderator_logs SET member_name='$new_name' WHERE member_id='$mid'");
-		$DB->query("UPDATE ibf_moderators SET member_name='$new_name' WHERE member_id='$mid'");
-		$DB->query("UPDATE ibf_posts SET author_name='$new_name' WHERE author_id='$mid'");
-		$DB->query("UPDATE ibf_sessions SET member_name='$new_name' WHERE member_id='$mid'");
-		$DB->query("UPDATE ibf_topics SET starter_name='$new_name' WHERE starter_id='$mid'");
-		$DB->query("UPDATE ibf_topics SET last_poster_name='$new_name' WHERE last_poster_id='$mid'");
-		
-		// I say, did we choose to email 'dis member?
-		
-		if ($IN['send_email'] == 1)
-		{
-			// By golly, we did!
-			
-			require "./sources/lib/emailer.php";
-		
-			$this->email = new emailer();
-			
-			$msg = trim($HTTP_POST_VARS['email_contents']);
-			
-			$msg = str_replace( "{old_name}", $member['name'], $msg );
-			$msg = str_replace( "{new_name}", $new_name      , $msg );
-			
-			$this->email->message = $this->email->clean_message($msg);
-			$this->email->subject = "Member Name Change Notification";
-			$this->email->to      = $member['email'];
-			$this->email->send_mail();
-		}
-		
-		$DB->query("SELECT id, name FROM ibf_members WHERE mgroup <> '".$INFO['auth_group']."' ORDER BY id DESC LIMIT 0,1");
-		$r = $DB->fetch_row();
-		$stats['LAST_MEM_NAME'] = $r['name'];
-		$stats['LAST_MEM_ID']   = $r['id'];
-		
-		$db_string = $DB->compile_db_update_string( $stats );
-		$DB->query("UPDATE ibf_stats SET $db_string");
-		
-		$ADMIN->save_log("Changed Member Name '{$member['name']}' to '$new_name'");
-		
-		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-			$this->modules->on_name_change($mid, $new_name );
-		}
-		
-		$ADMIN->done_screen("Member Name Changed", "Member Control", "act=mem" );
-	}
-	
-	
-	
-	//===========================================================================
-	
-	function change_name_start($message="") {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Change Member Name";
-		
-		$ADMIN->page_detail = "You may enter a new name for this member.";
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You must specify a valid member id, please go back and try again");
-		}
-		
-		$DB->query("SELECT name FROM ibf_members WHERE id='".$IN['mid']."'");
-		
-		if ( ! $member = $DB->fetch_row() )
-		{
-			$ADMIN->error("We could not match that ID in the members database");
-		}
-		
-		$contents = "{old_name},\nAn administrator has changed your member name on {$INFO['board_name']}.\n\nYour new name is: {new_name}\n\nPlease remember this as you will need to use this new name when you log in next time.\nBoard Address: {$INFO['board_url']}/index.php";
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dochangename'  ),
-												  2 => array( 'act'   , 'mem'       ),
-												  3 => array( 'mid'   , $IN['mid']  ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Change Member Name" );
-		
-		if ($message != "")
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Error Message:</b>" ,
-												  	  "<b><span style='color:red'>$message</span></b>",
-									     	 )      );
-		}
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Current Member's Name</b>" ,
-												  $member['name'],
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>New Members Name</b>" ,
-												  $SKIN->form_input( "new_name", $IN['new_name'] )
-									     )      );
-
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email notification to this member?</b><br>(If so, you may edit the email below)" ,
-												  $SKIN->form_yes_no( "send_email", 1 )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email contents</b><br>(Tags: {old_name} = current name, {new_name} = new name)" ,
-												  $SKIN->form_textarea( "email_contents", $contents )
-									     )      );
-									     									     
-		$ADMIN->html .= $SKIN->end_form("Change this members name");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Moderation control...
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function domod() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ids = array();
-		
-		foreach ($IN as $k => $v)
-		{
-			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
-			{
-				if ($IN[ $match[0] ])
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
-		
-		//-------------------
-		
-		if ( count($ids) < 1 )
-		{	
-			$ADMIN->error("You did not select any members to approve or delete");
-		}
-		
-		//-------------------
-		
-		if ($IN['type'] == 'approve')
-		{
-		
-			//-------------------------------------------
-			
-			require ROOT_PATH."sources/lib/emailer.php";
-			
-			$email = new emailer();
-			
-			$email->get_template("complete_reg");
-			
-			$email->build_message( "" );
-			
-			$email->subject = "Account validated at ".$INFO['board_name'];
-			
-			//-------------------------------------------
-			
-			$main = $DB->query("SELECT m.id, m.email, m.mgroup, v.* FROM ibf_validating v
-								 LEFT JOIN ibf_members m ON (v.member_id=m.id)
-							    WHERE m.id IN(".implode( ",",$ids ).")");
-			
-			while( $row = $DB->fetch_row( $main ) )
-			{
-				if ($row['mgroup'] != $INFO['auth_group'])
-				{
-					continue;
-				}
-				
-				if ($row['real_group'] == "")
-				{
-					$row['real_group'] = $INFO['member_group'];
-				}
-				
-				$update = $DB->query("UPDATE ibf_members SET mgroup=".$row['real_group']." WHERE id=".$row['id']);
-				
-				$email->to = $row['email'];
-				
-				$email->send_mail();
-			}
-			
-			$DB->query("DELETE FROM ibf_validating WHERE member_id IN(".implode( ",",$ids ).")");
-			
-			$DB->query("SELECT id, name FROM ibf_members WHERE mgroup <> ".$INFO['auth_group']." ORDER BY id DESC LIMIT 0,1");
-			$r = $DB->fetch_row();
-
-			$DB->query("UPDATE ibf_stats SET MEM_COUNT=MEM_COUNT+".count($ids).", LAST_MEM_NAME='{$r['name']}', LAST_MEM_ID='{$r['id']}'");
-			
-			$ADMIN->save_log("Approved Queued Registrations");
-			
-			$ADMIN->done_screen( count($ids)." Members Approved", "Manage Registrations", "act=mem&code=mod" );	
-			
-		}
-		else
-		{
-			$DB->query("DELETE FROM ibf_members WHERE id IN(".implode( ",",$ids ).")");
-			
-			$DB->query("DELETE FROM ibf_member_extra WHERE id IN(".implode( ",",$ids ).")");
-			
-			// Delete member messages...
-		
-			$DB->query("DELETE from ibf_messages WHERE member_id IN(".implode( ",",$ids ).")");
-			$DB->query("DELETE from ibf_contacts WHERE member_id IN(".implode( ",",$ids ).") or contact_id IN(".implode( ",",$ids ).")");
-			
-			$DB->query("DELETE FROM ibf_validating WHERE member_id IN(".implode( ",",$ids ).")");
-			
-			$DB->query("DELETE from ibf_pfields_content WHERE member_id IN(".implode( ",",$ids ).")");
-			
-			$DB->query("DELETE from ibf_warn_logs WHERE wlog_mid IN(".implode( ",",$ids ).")");
-			
-			// Convert their posts and topics into guest postings..
-		
-			$DB->query("UPDATE ibf_posts SET author_id='0' WHERE author_id IN(".implode( ",",$ids ).")");
-		
-			$DB->query("UPDATE ibf_topics SET starter_id='0' WHERE starter_id IN(".implode( ",",$ids ).")");
-			
-			if ( USE_MODULES == 1 )
-			{
-				$this->modules->register_class(&$this);
-				$this->modules->on_delete($ids);
-			}
-			
-			$ADMIN->save_log("Denied Queued Registrations");
-			
-			$ADMIN->done_screen( count($ids)." Members Removed", "Manage Registrations", "act=mem&code=mod" );
-		}
-		
-	}
-	
-	
-	//---------------------------------------------
-	
-	function view_mod() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title  = "Manage User Registration/Email Change Queues";
-		
-		$ADMIN->page_detail = "This section allows you to allow or deny registrations where you have requested that an administrator previews new accounts before allowing full membership. It will also allow you to complete or deny new email address changes.<br><br>This form will also allow you to complete the registrations for those who did not receive an email.";
-		
-		$DB->query("SELECT COUNT(vid) as mcount FROM ibf_validating WHERE lost_pass <> 1");
-		
-		$row = $DB->fetch_row();
-		
-		$cnt = $row['mcount'] < 1 ? 0 : $row['mcount'];
-		
-		$st = intval($IN['st']);
-		
-		$ord = $IN['ord'] == 'asc' ? 'asc' : 'desc';
-		
-		$new_ord  = $ord  == 'asc' ? 'desc' : 'asc';
-		
-		switch ($IN['sort'])
-		{
-			case 'mem':
-				$col = 'm.name';
-				break;
-			case 'email':
-				$col = 'm.email';
-				break;
-			case 'sent':
-				$col = 'v.entry_date';
-				break;
-			case 'posts':
-				$col = 'm.posts';
-				break;
-			case 'reg':
-				$col = 'm.joined';
-				break;
-			default:
-				$col = 'v.entry_date';
-				break;
-		}
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'domod'  ),
-												  2 => array( 'act'   , 'mem'    ),
-									     )      );
-									     
-		$SKIN->td_header[] = array( "<a href='{$SKIN->base_url}&act=mem&code=mod&st=$st&sort=mem&ord=$new_ord'>Member Name</a>"       , "20%" );
-		$SKIN->td_header[] = array( "Where?"            , "20%" );
-		$SKIN->td_header[] = array( "<a href='{$SKIN->base_url}&act=mem&code=mod&st=$st&sort=email&ord=$new_ord'>Email Address</a>"     , "15%" );
-		$SKIN->td_header[] = array( "<a href='{$SKIN->base_url}&act=mem&code=mod&st=$st&sort=sent&ord=$new_ord'>Email Sent</a>"        , "10%" );
-		$SKIN->td_header[] = array( "<a href='{$SKIN->base_url}&act=mem&code=mod&st=$st&sort=posts&ord=$new_ord'>Posts</a>"             , "10%" );
-		$SKIN->td_header[] = array( "<a href='{$SKIN->base_url}&act=mem&code=mod&st=$st&sort=reg&ord=$new_ord'>Reg. On</a>"           , "10%" );
-		$SKIN->td_header[] = array( "Age" , "10%" );
-		$SKIN->td_header[] = array( "&nbsp;"            , "5%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Users awaiting authorisation" );
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $cnt,
-											   'PER_PAGE'    => 75,
-											   'CUR_ST_VAL'  => $st,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Multiple Pages",
-											   'BASE_URL'    => $SKIN->base_url."&act=mem&code=mod",
-									  )      );
-		
-		$ADMIN->html .= $SKIN->add_td_basic( "<b>$cnt users require registration or email change validation</b>", "center", "catrow2");
-		
-		if ($cnt > 0)
-		{
-			$DB->query("SELECT m.name, m.id, m.email, m.posts, m.joined, v.*
-					      FROM ibf_validating v
-					    LEFT JOIN ibf_members m ON (v.member_id=m.id)
-					    WHERE v.lost_pass <> 1
-					    ORDER BY $col $ord LIMIT $st,75");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				if ($r['coppa_user'] == 1)
-				{
-					$coppa = ' ( COPPA Request )';
-				}
-				else
-				{
-					$coppa = "";
-				}
-				
-				$where = ( $r['lost_pass'] ? 'Lost Password' : ( $r['new_reg'] ? "Registering" : ( $r['email_chg'] ? "Email Change" : 'N/A' ) ) );
-				
-				//$age = floor( ( time() - $r['entry_date'] ) / 86400 );
-				
-				$hours  = floor( ( time() - $r['entry_date'] ) / 3600 );
-				
-				$days   = intval( $hours / 24 );
-				
-				$rhours = intval( $hours - ($days * 24) );
-				
-				if ( $r['name'] == "" )
-				{
-					$r['name'] = "<em>Deleted Member</em>";
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$r['name']."</b>$coppa" ,
-				 										  "<center>$where</center>",
-												  		  $r['email'],
-												  		  "<center>".$std->get_date( $r['entry_date'], 'JOINED' )."</center>",
-												  		  "<center>{$r['posts']}</center>",
-												  		  "<center>".$std->get_date( $r['joined'], 'JOINED' )."</center>",
-												  		  "<center><strong><span style='color:red'>$days d</span>, $rhours h</center>",
-												  		  "<center><input type='checkbox' name='mid_{$r['member_id']}' value='1'></center>"
-											 )      );
-			}
-			$ADMIN->html .= $SKIN->add_td_basic( "$links", "left", "catrow2");
-	
-			$ADMIN->html .= $SKIN->add_td_basic("<select name='type' id='dropdown'><option value='approve'>Approve these Accounts</option><option value='delete'>DELETE these accounts</option></select>", "center", "catrow2" );
-			
-		}
-		
-		$ADMIN->html .= $SKIN->end_form("Go!");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Ban control...
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function ban_control() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Ban Control";
-		
-		$ADMIN->page_detail = "This section allows you to modify, delete or add IP addresses, email addresses and reserved names to the ban filters.";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doban'  ),
-												  2 => array( 'act'   , 'mem'       ),
-									     )      );
-									     
-		$ip_list    = "";
-		$name_list  = "";
-		$email_list = "";
-		
-		if ($INFO['ban_ip'] != "")
-		{
-			$ip_list = preg_replace( "/\|/", "\n", $INFO['ban_ip'] );
-		}
-		
-		//+-------------------------------
-		
-		if ($INFO['ban_email'] != "")
-		{
-			$email_list = preg_replace( "/\|/", "\n", $INFO['ban_email'] );
-		}
-		
-		//+-------------------------------
-		
-		if ($INFO['ban_names'] != "")
-		{
-			$name_list = preg_replace( "/\|/", "\n", $INFO['ban_names'] );
-		}
-
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"     , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"     , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Ban Control" );
-		
-		$ADMIN->html .= $SKIN->add_td_basic("Banned IP Addresses (one per line - use * as a wildcard)", "center", "pformstrip");
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Banned IP Address</b><br>(Example: 212.45.45.23)<br>(Example: 212.45.45.*)" ,
-												  $SKIN->form_textarea( 'ban_ip', $ip_list )
-											 )      );
-											 
-		$ADMIN->html .= $SKIN->add_td_basic("Banned Email Addresses (one per line - use * as a wildcard)", "center", "pformstrip");
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Banned Email Address</b><br>(Example: name@domain.com)<br>(Example: *@domain.com)" ,
-												  $SKIN->form_textarea( 'ban_email', $email_list )
-											 )      );
-											 
-		$ADMIN->html .= $SKIN->add_td_basic("Banned / Reserved Names (one per line)", "center", "pformstrip");
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Banned Names</b>" ,
-												  $SKIN->form_textarea( 'ban_names', $name_list )
-											 )      );
-											 
-		$ADMIN->html .= $SKIN->end_form("Update the ban filters");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-
-	}
-	
-	function update_ban()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		// Get the incoming..
-		
-		$new = array();
-		
-		$new['ban_ip']    = $this->_do_banline($HTTP_POST_VARS['ban_ip']);
-		$new['ban_email'] = $this->_do_banline($HTTP_POST_VARS['ban_email']);
-		$new['ban_names'] = $this->_do_banline($HTTP_POST_VARS['ban_names']);
-		
-		$ADMIN->rebuild_config( $new );
-		
-		$ADMIN->save_log("Updated Ban Filters");
-		
-		$ADMIN->done_screen("Ban Filters Updated", "Ban Control", "act=mem&code=ban" );		
-		
-	}
-	
-	function _do_banline($raw)
-	{
-		global $std;
-		
-		$ban = trim($std->txt_stripslashes($raw));
-		
-		$ban = str_replace('|', "&#124;", $ban);
-		
-		$ban = preg_replace( "/\n/", '|', str_replace( "\n\n", "\n", str_replace( "\r", "\n", $ban ) ) );
-		
-		$ban = preg_replace( "/\|{1,}\s{1,}?/s", "|", $ban );
-		
-		$ban = preg_replace( "/^\|/", "", $ban );
-		
-		$ban = preg_replace( "/\|$/", "", $ban );
-		
-		$ban = str_replace( "'", '&#39;', $ban );
-		
-		return $ban;
-	}
-		
-		
-	//+---------------------------------------------------------------------------------
-	//
-	// MEMBER RANKS...
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function titles() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Member Ranking Set Up";
-		
-		$ADMIN->page_detail = "This section allows you to modify, delete or add extra ranks.<br>If you wish to display pips below the members name, enter the number of pips. If you wish to use a custom image, simply enter the image name in the pips box. Note, these custom images must reside in the 'html/team_icons' directory of your installation";
-		
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Title"      , "30%" );
-		$SKIN->td_header[] = array( "Min Posts"  , "10%" );
-		$SKIN->td_header[] = array( "Pips"       , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"     , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"     , "20%" );
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT macro_id, img_dir FROM ibf_skins WHERE default_set=1");
-		
-		$mid = $DB->fetch_row();
-		
-		$DB->query("SELECT macro_replace AS A_STAR FROM ibf_macro WHERE macro_set={$mid['macro_id']} AND macro_value='A_STAR'");
-    	           
-    	$row = $DB->fetch_row();
-    	
-    	$row['A_STAR'] = str_replace( "<#IMG_DIR#>", $mid['img_dir'], $row['A_STAR'] );
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Titles/Ranks" );
-		
-		$DB->query("SELECT * FROM ibf_titles ORDER BY posts");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$img = "";
-			
-			if ( preg_match( "/^\d+$/", $r['pips'] ) )
-			{
-				for ($i = 1; $i <= $r['pips']; $i++)
-				{
-					$img .= $row['A_STAR'];
-					
-				}
-			}
-			else
-			{
-				$img = "<img src='html/team_icons/{$r['pips']}' border='0'>";
-			}
-				
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$r['title']."</b>" ,
-													  $r['posts'],
-													  $img,
-													  "<a href='{$SKIN->base_url}&act=mem&code=rank_edit&id={$r['id']}'>Edit</a>",
-													  "<a href='{$SKIN->base_url}&act=mem&code=rank_delete&id={$r['id']}'>Delete</a>",
-											 )      );
-			
-		}
-									     
-		
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'do_add_rank'  ),
-												  2 => array( 'act'   , 'mem'       ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Add a Member Rank" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Rank Title</b>" ,
-												  $SKIN->form_input( "title" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Minimum number of posts needed</b>" ,
-												  $SKIN->form_input( "posts" )
-									     )      );
-
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of pips</b><br>(Or pip image)" ,
-												  $SKIN->form_input( "pips" )
-									     )      );
-									     									     
-		$ADMIN->html .= $SKIN->end_form("Add this rank");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function add_rank() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		// check for input
-		//+-------------------------------
-		
-		foreach( array( 'posts', 'title', 'pips' ) as $field )
-		{
-			if ($IN[ $field ] == "")
-			{
-				$ADMIN->error("You must complete the form fully");
-			}
-		}
-		
-		//+-------------------------------
-		// Add it to the DB
-		//+-------------------------------
-		
-		$db_string = $DB->compile_db_insert_string( array (
-															 'posts'  => trim($IN['posts']),
-															 'title'  => trim($IN['title']),
-															 'pips'   => trim($IN['pips']),
-												  )       );
-												  
-		$DB->query("INSERT INTO ibf_titles (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-		$ADMIN->done_screen("Rank Added", "Member Ranking Control", "act=mem&code=title" );					
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function delete_rank() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		// check for input
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("We could not match that ID");
-		}
-		
-		$DB->query("DELETE FROM ibf_titles WHERE id='".$IN['id']."'");
-		
-		$ADMIN->save_log("Removed Rank Setting");
-		
-		$ADMIN->done_screen("Rank Removed", "Member Ranking Control", "act=mem&code=title" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function edit_rank() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		// check for input
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("We could not match that ID");
-		}
-		
-		//+-------------------------------
-		
-		foreach( array( 'posts', 'title', 'pips' ) as $field )
-		{
-			if ($IN[ $field ] == "")
-			{
-				$ADMIN->error("You must complete the form fully");
-			}
-		}
-		
-		//+-------------------------------
-		// Add it to the DB
-		//+-------------------------------
-		
-		$db_string = $DB->compile_db_update_string( array (
-															 'posts'  => trim($IN['posts']),
-															 'title'  => trim($IN['title']),
-															 'pips'   => trim($IN['pips']),
-												  )       );
-												  
-		$DB->query("UPDATE ibf_titles SET $db_string WHERE id='".$IN['id']."'");
-		
-		$ADMIN->save_log("Edited Rank Setting");
-		
-		$ADMIN->done_screen("Rank Edited", "Member Ranking Control", "act=mem&code=title" );					
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function rank_setup($mode='edit') {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Member Rank Set Up";
-		
-		$ADMIN->page_detail = "If you wish to display pips below the members name, enter the number of pips. If you wish to use a custom image, simply enter the image name in the pips box. Note, these custom images must reside in the 'html/team_icons' directory of your installation";
-		
-		if ($mode == 'edit')
-		{
-			$form_code = 'do_rank_edit';
-			
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("No rank ID was set, please try again");
-			}
-			
-			$DB->query("SELECT * from ibf_titles WHERE id='".$IN['id']."'");
-			$rank = $DB->fetch_row();
-			
-			$button = "Complete Edit";
-		}
-		else
-		{
-			$form_code = 'do_add_rank';
-			$rank = array( 'posts' => "", 'title' => "", 'pips' => "");
-			$button = "Add this rank";
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $form_code  ),
-												  2 => array( 'act'   , 'mem'       ),
-												  3 => array( 'id'    , $rank['id'] ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Ranks" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Rank Title</b>" ,
-												  $SKIN->form_input( "title", $rank['title'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Minimum number of posts needed</b>" ,
-												  $SKIN->form_input( "posts", $rank['posts'] )
-									     )      );
-
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of pips</b><br>(Or pip image)" ,
-												  $SKIN->form_input( "pips", $rank['pips'] )
-									     )      );
-									     									     
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// DELETE MEMBER SET UP
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function delete_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Member Account Deletion";
-		
-		$ADMIN->page_detail = "Search for a member to delete by enter part or all of the username, or configure the prune form.";
-		
-		
-		$mem_group[0] = array( '0', 'Any member group' );
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'delete2' ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Lookup" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enter part or all of the usersname</b>" ,
-												  $SKIN->form_input( "USER_NAME" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Find Member Account");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'prune' ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "<u>or</u> remove members where..." );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>The members last post was over [x] days ago.</b><br>([x] = number entered)<br>(Leave blank to omit from query)" ,
-												  $SKIN->form_input( "last_post", '60')
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><u>and</u> where the member has less than [x] posts</b><br>([x] = number entered)<br>(Leave blank to omit from query)" ,
-												  $SKIN->form_input( "posts", '100')
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><u>and</u> where the member joined [x] days ago</b><br>([x] = number entered)<br>(Leave blank to omit from query)" ,
-												  $SKIN->form_input( "joined", '365')
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><u>and</u> the member group is...</b>" ,
-												  $SKIN->form_dropdown( "mgroup",
-																		$mem_group,
-												  						0
-												  					  )
-									     )      );
-									     							     
-		$ADMIN->html .= $SKIN->end_form("Prune members");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function prune_confirm() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//-----------------------------
-		// Make sure we have *something*
-		//------------------------------
-		
-		$blanks = 0;
-		
-		foreach( array( 'posts', 'last_post', 'joined' ) as $field )
-		{
-			if ($IN[ $field ] == "")
-			{
-				$blanks++;
-			}
-		}
-		
-		if ($blanks == 3)
-		{
-			$ADMIN->error("You must specify at least one field to use in the pruning query");
-		}
-		
-		$time_now = time();
-		
-		$query = "SELECT COUNT(id) as mcount FROM ibf_members WHERE";
-		
-		$add_query = array();
-		
-		if ($IN['joined'] > 0)
-		{
-			$j = $time_now - ($IN['joined'] *60*60*24);
-			$add_query[] = " joined > $j ";
-		}
-		
-		if ($IN['last_post'] > 0)
-		{
-			$l = $time_now - ($IN['last_post'] *60*60*24);
-			$add_query[] = " (last_post < $l or last_post is null)";
-		}
-		
-		if ($IN['posts'] > 0)
-		{
-			$add_query[] = " posts < ".$IN['posts']." ";
-		}
-		
-		if ($IN['mgroup'] > 0)
-		{
-			$add_query[] = " mgroup='".$IN['mgroup']."' ";
-		}
-		
-		$add_query[] = ' id > 0';
-		
-		$additional_query = implode( "AND", $add_query );
-		
-		$this_query = trim( $query.$additional_query );
-		
-		$pass_query = addslashes(urlencode($additional_query));
-		
-		//--------------------------------
-		// Run the query
-		//--------------------------------
-		
-		$DB->query($this_query);
-		
-		$count = $DB->fetch_row();
-		
-		if ($count['mcount'] < 1)
-		{
-			$ADMIN->error("We did not find any members matching the prune criteria. Please go back and try again");
-		}
-		
-		if ($count['mcount'] < 101)
-		{
-			$DB->query("SELECT id, name FROM ibf_members WHERE $additional_query");
-			
-			$member_arr = array();
-			
-			while ( $mem = $DB->fetch_row() )
-			{
-				$member_arr[] = $std->make_profile_link($mem['name'], $mem['id']);
-			}
-		}
-		
-		$ADMIN->page_title = "Member Pruning";
-		
-		$ADMIN->page_detail = "Please confirm your action.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doprune' ),
-												  2 => array( 'act'   , 'mem'     ),
-												  3 => array( 'query' , $pass_query ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Prune Confirmation" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of members to prune</b>" ,
-												  $count['mcount']
-									     )      );
-									     
-		if ( count($member_arr) > 0 )
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Members to prune</b>" ,
-													  implode( ', ', $member_arr )
-											 )      );
-		}
-									     
-		$ADMIN->html .= $SKIN->end_form("Complete Member Pruning");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	
-	
-	function doprune() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//-----------------------------
-		// Make sure we have *something*
-		//------------------------------
-		
-		$query = trim(urldecode($std->txt_stripslashes($IN['query'])));
-		
-		$query = str_replace( "&lt;", "<", $query );
-		$query = str_replace( "&gt;", ">", $query );
-		
-		if ($query == "")
-		{
-			$ADMIN->error("Prune query error, no query to use");
-		}
-		
-		//-----------------------------
-		// Get the member ids...
-		//------------------------------
-		
-		$ids = array();
-		
-		$DB->query("SELECT id FROM ibf_members WHERE ".$query);
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ($i = $DB->fetch_row())
-			{
-				$ids[] = $i['id'];
-			}
-		}
-		else
-		{
-			$ADMIN->error("Could not find any members that matched the prune criteria");
-		}
-		
-		$id_string = implode( "," , $ids );
-		
-		$id_count = count($ids);
-		
-		// Convert their posts and topics into guest postings..
-		
-		$DB->query("UPDATE ibf_posts SET author_id='0' WHERE author_id IN(".$id_string.")");
-		
-		$DB->query("UPDATE ibf_topics SET starter_id='0' WHERE starter_id IN(".$id_string.")");
-		
-		// Delete member...
-		
-		$DB->query("DELETE from ibf_members WHERE id IN(".$id_string.")");
-		
-		$DB->query("DELETE from ibf_pfields_content WHERE member_id IN(".$id_string.")");
-		
-		// Delete member messages...
-		
-		$DB->query("DELETE from ibf_messages WHERE member_id IN (".$id_string.")");
-		
-		// Delete member subscriptions.
-		
-		$DB->query("DELETE from ibf_tracker WHERE member_id IN (".$id_string.")");
-		
-		// Delete from validating..
-		
-		$DB->query("DELETE FROM ibf_validating WHERE member_id IN (".$id_string.")");
-		
-		// Set the stats DB straight.
-		
-		$DB->query("SELECT id, name FROM ibf_members WHERE mgroup <> '".$INFO['auth_group']."' ORDER BY joined DESC LIMIT 0,1");
-		
-		$memb = $DB->fetch_row();
-		
-		$DB->query("SELECT COUNT(id) as members from ibf_members WHERE mgroup <> '".$INFO['auth_group']."'");
-		$r = $DB->fetch_row();
-		// Remove "guest" account...
-		$r['members']--;
-		$r['members'] < 1 ? 0 : $r['members'];
-		
-		$DB->query("UPDATE ibf_stats SET ".
-			             "MEM_COUNT={$r['members']}, ".
-			             "LAST_MEM_NAME='" . $memb['name'] . "', ".
-			             "LAST_MEM_ID='"   . $memb['id']   . "'");
-			             
-		// Blow me melon farmer
-		
-		$ADMIN->save_log("Removed $id_count members via the prune form");
-		
-		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-			$this->modules->on_delete($ids);
-		}
-		
-		$ADMIN->done_screen("Member Account(s) Deleted", "Member Control", "act=mem&code=edit" );
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function delete_lookup_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['USER_NAME'] == "")
-		{
-			$ADMIN->error("You didn't choose a member name to look for!");
-		}
-		
-		$DB->query("SELECT id, name FROM ibf_members WHERE name LIKE '".$IN['USER_NAME']."%'");
-		
-		if (! $DB->get_num_rows() )
-		{
-			$ADMIN->error("Sorry, we could not find any members that matched the search string you entered");
-		}
-		
-		$form_array = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$form_array[] = array( $r['id'] , $r['name'] );
-		}
-		
-		
-		
-		$ADMIN->page_title = "Delete a member";
-		
-		$ADMIN->page_detail = "Please choose which member to delete.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dodelete' ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Lookup results" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose from the matches...</b>" ,
-												  $SKIN->form_dropdown( "MEMBER_ID", $form_array )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Delete Member");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// DO DELETE
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function dodelete() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['MEMBER_ID'] == "")
-		{
-			$ADMIN->error("Could not resolve member id");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_members WHERE id='".$IN['MEMBER_ID']."'");
-		$mem = $DB->fetch_row();
-		
-		//+-------------------------------
-		
-		if ($mem['id'] == "")
-		{
-			$ADMIN->error("Could not resolve member id");
-		}
-		
-		// Convert their posts and topics into guest postings..
-		
-		$DB->query("UPDATE ibf_posts SET author_id='0' WHERE author_id='".$IN['MEMBER_ID']."'");
-		
-		$DB->query("UPDATE ibf_topics SET starter_id='0' WHERE starter_id='".$IN['MEMBER_ID']."'");
-		
-		// Delete member...
-		
-		$DB->query("DELETE from ibf_members WHERE id='".$IN['MEMBER_ID']."'");
-		$DB->query("DELETE from ibf_pfields_content WHERE member_id='".$IN['MEMBER_ID']."'");
-		$DB->query("DELETE from ibf_member_extra WHERE id='".$IN['MEMBER_ID']."'");
-		
-		// Delete member messages...
-		
-		$DB->query("DELETE from ibf_messages WHERE member_id='".$IN['MEMBER_ID']."'");
-		$DB->query("DELETE from ibf_contacts WHERE member_id='".$IN['MEMBER_ID']."' or contact_id='".$IN['MEMBER_ID']."'");
-		
-		// Delete member subscriptions.
-		
-		$DB->query("DELETE from ibf_tracker WHERE member_id='".$IN['MEMBER_ID']."'");
-		$DB->query("DELETE from ibf_forum_tracker WHERE member_id='".$IN['MEMBER_ID']."'");
-		$DB->query("DELETE from ibf_warn_logs WHERE wlog_mid='".$IN['MEMBER_ID']."'");
-		
-		// Delete from validating..
-		
-		$DB->query("DELETE FROM ibf_validating WHERE member_id='".$IN['MEMBER_ID']."'");
-		
-		// Set the stats DB straight.
-		
-		$DB->query("SELECT id, name FROM ibf_members WHERE mgroup <> '".$INFO['auth_group']."' ORDER BY joined DESC LIMIT 0,1");
-		
-		$memb = $DB->fetch_row();
-		
-		$DB->query("SELECT COUNT(id) as members from ibf_members WHERE mgroup <> '".$INFO['auth_group']."'");
-		$r = $DB->fetch_row();
-		// Remove "guest" account...
-		$r['members']--;
-		$r['members'] < 1 ? 0 : $r['members'];
-		
-		$DB->query("UPDATE ibf_stats SET ".
-			             "MEM_COUNT={$r['members']}, ".
-			             "LAST_MEM_NAME='" . $memb['name'] . "', ".
-			             "LAST_MEM_ID='"   . $memb['id']   . "'");
-			             
-		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-			$this->modules->on_delete($IN['MEMBER_ID']);
-		}
-		
-		// Blow me melon farmer
-		
-		$ADMIN->save_log("Deleted Member '{$mem['name']}'");
-		
-		$ADMIN->done_screen("Member Account Deleted", "Member Control", "act=mem&code=edit" );
-		
-	}
-		
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// ADD MEMBER FORM
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function add_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Pre Register a member";
-		
-		$ADMIN->page_detail = "You may pre-register members using this form.";
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($INFO['admin_group'] == $r['g_id'])
-			{
-				if ($MEMBER['mgroup'] != $INFO['admin_group'])
-				{
-					continue;
-				}
-			}
-			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-		}
-		
-		//+-------------------------------
-		
-		$custom_output = "";
-		$field_data     = array();
-		
-		$DB->query("SELECT * from ibf_pfields_content WHERE member_id='".$IN['MEMBER_ID']."'");
-		
-		while ( $content = $DB->fetch_row() )
-		{
-			foreach($content as $k => $v)
-			{
-				if ( preg_match( "/^field_(\d+)$/", $k, $match) )
-				{
-					$field_data[ $match[1] ] = $v;
-				}
-			}
-		}
-		
-		$DB->query("SELECT * from ibf_pfields_data WHERE fshowreg=1 ORDER BY forder");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			$form_element = "";
-			
-			if ( $row['ftype'] == 'drop' )
-			{
-				$carray = explode( '|', trim($row['fcontent']) );
-				
-				$d_content = array();
-				
-				foreach( $carray as $entry )
-				{
-					$value = explode( '=', $entry );
-					
-					$ov = trim($value[0]);
-					$td = trim($value[1]);
-					
-					if ($ov and $td)
-					{
-						$d_content[] = array( $ov, $td );
-					}
-				}
-				
-				$form_element = $SKIN->form_dropdown( 'field_'.$row['fid'], $d_content, "" );
-				
-			}
-			else if ( $row['ftype'] == 'area' )
-			{
-				$form_element = $SKIN->form_textarea( 'field_'.$row['fid'], "" );
-			}
-			else
-			{
-				$form_element = $SKIN->form_input( 'field_'.$row['fid'], "" );
-			}
-			
-			$custom_out .= $SKIN->add_td_row( array( "<b>{$row['ftitle']}</b><br>{$row['desc']}" , $form_element ) );
-			
-		}
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doadd' ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Registration" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Member Name</b>" ,
-												  $SKIN->form_input( "name" )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Password</b>" ,
-												  $SKIN->form_input( "password", "", 'password' )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email Address</b>" ,
-												  $SKIN->form_input( "email" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Member Group</b>" ,
-												  $SKIN->form_dropdown( "mgroup",
-																		$mem_group,
-												  						$mem['mgroup']
-												  					  )
-									     )      );
-									     
-		if ($custom_out != "")
-		{
-			$ADMIN->html .= $custom_out;
-		}
-									     						     
-		$ADMIN->html .= $SKIN->end_form("Register Member");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	function do_add()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		foreach( array('name', 'password', 'email', 'mgroup') as $field )
-		{
-			if ($IN[ $field ] == "")
-			{
-				$ADMIN->error("You must complete the form fully!");
-			}
-		}
-		
-		//----------------------------------
-		// Do we already have such a member?
-		//----------------------------------
-		
-		$DB->query("SELECT id FROM ibf_members WHERE LOWER(name)='".$IN['name']."'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$ADMIN->error("We already have a member by that name, please select another");
-		}
-		
-		//----------------------------------
-		// Custom profile field stuff
-		//----------------------------------
-		
-		$custom_fields = array();
-		
-		$DB->query("SELECT * from ibf_pfields_data");
-		
-		$have_custom = $DB->get_num_rows();
-		
-		while ( $row = $DB->fetch_row() )
-		{
-			$custom_fields[ 'field_'.$row['fid'] ] = $IN[ 'field_'.$row['fid'] ];
-		}
-		
-		//+--------------------------------------------
-		//| Find the highest member id, and increment it
-		//| auto_increment not used for guest id 0 val.
-		//+--------------------------------------------
-		
-		$DB->query("SELECT MAX(id) as new_id FROM ibf_members");
-		$r = $DB->fetch_row();
-		
-		$member_id = $r['new_id'] + 1;
-		
-		$db_string = $DB->compile_db_insert_string( array (
-															 'id'          => $member_id,
-															 'name'        => trim($IN['name']),
-															 'password'    => md5(trim($IN['password'])),
-															 'email'       => trim(strtolower($IN['email'])),
-															 'mgroup'      => $IN['mgroup'],
-															 'joined'      => time(),
-															 'posts'       => 0,
-															 'ip_address'  => $IN['ip_address'],
-															 'time_offset' => 0,
-															 'view_sigs'   => 1,
-															 'view_avs'    => 1,
-															 'view_pop'    => 1,
-															 'view_img'    => 1,
-															 'vdirs'       => "in:Inbox|sent:Sent Items",
-												  )       );
-												  
-		$DB->query("INSERT INTO ibf_members (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-		//$member_id = $DB->get_insert_id();
-		
-		//+--------------------------------------------
-		//| Insert into the custom profile fields DB
-		//+--------------------------------------------
-		
-		if ( count($custom_fields) > 0 )
-		{
-		
-			$custom_fields['member_id'] = $member_id;
-				
-			$db_string = $DB->compile_db_insert_string($custom_fields);
-				
-			$DB->query("INSERT INTO ibf_pfields_content (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		}
-		
-		unset($db_string);
-		
-		//+--------------------------------------------
-		
-		$DB->query("UPDATE ibf_stats SET ".
-			             "MEM_COUNT=MEM_COUNT+1, ".
-			             "LAST_MEM_NAME='" . trim($IN['name']) . "', ".
-			             "LAST_MEM_ID='"   . $member_id   . "'");
-			             
-		$ADMIN->save_log("Created new member account for '{$IN['name']}'");
-		
-		$ADMIN->done_screen("Member Account Created", "Member Control", "act=mem&code=edit" );												 
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// SEARCH FORM, SEARCH FOR MEMBER
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function search_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Edit a member";
-		
-		$ADMIN->page_detail = "Search for a member.";
-		
-		$mem_group = array( 0 => array( 'all', 'Any Group') );
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'stepone' ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Quick Search" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enter part or all of the usersname</b>" ,
-												  $SKIN->form_input( "USER_NAME" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Find Member");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'advancedsearch' ),
-												  2 => array( 'act'   , 'mem'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Advanced Search", "Please complete at least one section, leave fields blank to omit from the query" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Member Name contains...</b>" ,
-												  $SKIN->form_input( "name" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email Address contains...</b>" ,
-												  $SKIN->form_input( "email" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IP Address contains...</b>" ,
-												  $SKIN->form_input( "ip_address" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>AIM name contains...</b>" ,
-												  $SKIN->form_input( "aim_name" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>ICQ Number contains...</b>" ,
-												  $SKIN->form_input( "icq_number" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Yahoo! Identity contains...</b>" ,
-												  $SKIN->form_input( "yahoo" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Signature contains...</b>" ,
-												  $SKIN->form_input( "signature" )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Last post from...</b>" ,
-												  $SKIN->form_simple_input( "last_post" ). '... days ago to now'
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Last active from...</b>" ,
-												  $SKIN->form_simple_input( "last_activity" ). '... days ago to now'
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Is in group...</b>" ,
-												  $SKIN->form_dropdown( "mgroup", $mem_group )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Query Member Database");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function do_advanced_search($basic=0) {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$page_query = "";
-		$un_all = "";
-		
-		if ( $IN['showsusp'] == 1 )
-		{
-			$rq  = "temp_ban <> '' and temp_ban is not null";
-			$un_all = "<a href='{$SKIN->base_url}&act=mem&code=unsuspend&mid=all'>Unsuspend All Accounts</a>&nbsp;&middot&nbsp;";
-		}
-		else
-		{
-			if ($basic == 0)
-			{
-				$query = array();
-				
-				foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','last_post','last_activity','mgroup') as $bit )
-				{
-					$IN[ $bit ] = urldecode(trim($IN[ $bit ]));
-					
-					$page_query .= '&'.$bit.'='.urlencode($IN[ $bit ]);
-					
-					if ($IN[ $bit ] != "")
-					{
-						if ($bit == 'last_post' or $bit == 'last_activity')
-						{
-							$dateline = time() - ($IN[ $bit ]*60*60*24);
-							$query[] = 'm.'.$bit.' > '."'$dateline'";
-						}
-						else if ($bit == 'mgroup')
-						{
-							if ($IN['mgroup'] != 'all')
-							{
-								$query[] = "m.mgroup=".$IN['mgroup'];
-							}
-						}
-						else
-						{
-							$query[] = 'm.'.$bit." LIKE '%".$IN[$bit]."%'";
-						}
-					}
-				}
-				
-				if (count($query) < 1)
-				{
-					$ADMIN->error("Please complete at least one field before submitting the search form");
-				}
-				
-				$rq = implode( " AND ", $query );
-			}
-			else
-			{
-				// Basic username search
-				
-				if ( $IN['decode'] )
-				{
-					$IN['USER_NAME'] = trim(urldecode($IN['USER_NAME']));
-				}
-				else
-				{
-					$IN['USER_NAME'] = trim($IN['USER_NAME']);
-				}
-				
-				if ($IN['USER_NAME'] == "")
-				{
-					$ADMIN->error("You didn't choose a member name to look for!");
-				}
-				
-				$page_query = "&decode=1&USER_NAME=".urlencode($IN['USER_NAME']);
-			
-				$rq = "name LIKE '".$IN['USER_NAME']."%'";
-			}
-		}
-		
-		$st = intval($IN['st']);
-		
-		if ($st < 1)
-		{
-			$st = 0;
-		}
-		
-		$query = "SELECT m.id, m.email, m.name, m.mgroup, m.ip_address, m.posts, m.temp_ban, g.g_title
-		          FROM ibf_members m
-		           LEFT JOIN ibf_groups g ON (g.g_id=m.mgroup)
-		          WHERE $rq ORDER BY m.name LIMIT $st,50";
-		
-		//+-------------------------------
-		// Get the number of results
-		//+-------------------------------
-		
-		$DB->query("SELECT COUNT(m.id) as count FROM ibf_members m WHERE $rq");
-		
-		$count = $DB->fetch_row();
-		
-		if ($count['count'] < 1)
-		{
-			if ($IN['showsusp'])
-			{
-				$ADMIN->error("There are currently no suspended member accounts");
-			}
-			else
-			{
-				$ADMIN->error("Your search query did not return any matches from the member database. Please go back and try again");
-			}
-		}
-		
-		$ADMIN->page_title = "Your Member Search Results";
-		
-		$ADMIN->page_detail = "Your search results.";
-		
-		//+-------------------------------
-		
-		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['count'],
-											   'PER_PAGE'    => 50,
-											   'CUR_ST_VAL'  => $IN['st'],
-											   'L_SINGLE'    => $un_all."Single Page",
-											   'L_MULTI'     => $un_all."Multi Page",
-											   'BASE_URL'    => $SKIN->base_url."&act=mem&showsusp={$IN['showsusp']}&code={$IN['code']}".$page_query,
-											 )
-									  );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "IP Address "  , "15%" );
-		$SKIN->td_header[] = array( "Group"        , "10%" );
-		$SKIN->td_header[] = array( "Posts"        , "10%" );
-		$SKIN->td_header[] = array( "Email"        , "15%" );
-		$SKIN->td_header[] = array( "Edit"         , "16%" );
-		$SKIN->td_header[] = array( "Change"       , "16%" );
-		$SKIN->td_header[] = array( "Ban"          , "17%" );
-		
-		//+-------------------------------
-		
-		$title = $IN['showsusp'] == 1 ? 'Suspended Accounts' : 'Search Results';
-		
-		$ADMIN->html .= $SKIN->start_table( "{$count['count']} ".$title );
-		
-		//+-------------------------------
-		// Run the query
-		//+-------------------------------
-		
-		$DB->query($query);
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$tban = "";
-			$sus_link = "";
-			
-			if ( $r['temp_ban'] != "" )
-			{
-				$s_ban = $std->hdl_ban_line( $r['temp_ban'] );
-				
-				$sus_link = " - <a href='{$SKIN->base_url}&act=mem&code=unsuspend&mid={$r['id']}'>Unsuspend</a>";
-				
-				$tban = '&nbsp;&nbsp;<span style="font-size:10px">(Suspended until '.$ADMIN->get_date( $s_ban['date_end'], 'LONG') .$sus_link.')</span>';
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_basic( "<img src='html/sys-img/item.gif' border='0' alt='-'>&nbsp;<a style='font-size:12px' title='View this members profile' href='{$INFO['board_url']}/index.{$INFO['php_ext']}?act=Profile&MID={$r['id']}' target='blank'>{$r['name']}</a> $tban", "left", "pformstrip" );
-			$ADMIN->html .= $SKIN->add_td_row( array( "{$r['ip_address']}",
-													  $r['g_title'],
-													  "<center>".$r['posts']."</center>",
-													  "<center>".$r['email']."</center>",
-													  "<center><strong><a href='{$SKIN->base_url}&act=mem&code=doform&MEMBER_ID={$r['id']}' title='Edit this members account'>Edit Details</a></strong></center>",
-													  "<center><a href='{$SKIN->base_url}&act=mem&code=changename&mid={$r['id']}' title='Change this members name'>Change Name</a></center>",
-													  "<center><a href='{$SKIN->base_url}&act=mem&code=banmember&mid={$r['id']}' title='Suspend Member'>Suspend Account</a></span></center>"
-									     	 )      );
-			
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic($pages, 'right', 'pformstrip');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// DO EDIT FORM
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function do_edit_form() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums;
-		
-		require ROOT_PATH."sources/lib/post_parser.php";
-		
-		$parser = new post_parser();
-		
-		if ($IN['MEMBER_ID'] == "")
-		{
-			$ADMIN->error("Could not resolve member id");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_members WHERE id='".$IN['MEMBER_ID']."'");
-		$mem = $DB->fetch_row();
-		
-		//+-------------------------------
-		
-		if ($mem['id'] == "")
-		{
-			$ADMIN->error("Could not resolve member id");
-		}
-		
-		//+-------------------------------
-		
-		$mem_group = array();
-		$show_fixed = FALSE;
-		
-		$units = array( 0 => array( 'h', 'Hours' ), 1 => array( 'd', 'Days' ) );
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			// Ensure only root admins can promote to root admin grou...
-			// oh screw it, I can't be bothered explaining stuff tonight
-			
-			if ($INFO['admin_group'] == $r['g_id'])
-			{
-				if ($MEMBER['mgroup'] != $INFO['admin_group'])
-				{
-					continue;
-				}
-			}
-			
-			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-		}
-		
-		// is this a non root editing a root?
-		
-		if ($MEMBER['mgroup'] != $INFO['admin_group'])
-		{
-			if ($mem['mgroup'] == $INFO['admin_group'])
-			{
-				$show_fixed = TRUE;
-			}
-		}
-		
-		//+-------------------------------
-		
-		$lang_array = array();
-		
-		$DB->query("SELECT ldir, lname FROM ibf_languages");
-		
-		while ( $l = $DB->fetch_row() )
-		{
-			$lang_array[] = array( $l['ldir'], $l['lname'] );
-		}
- 		
- 		//+-------------------------------
- 		
- 		$DB->query("SELECT uid, sid, sname, default_set, hidden FROM ibf_skins");
- 		
- 		$skin_array = array();
- 		
- 		$def_skin = "";
- 			
-		if ( $DB->get_num_rows() )
-		{
-			while ( $s = $DB->fetch_row() )
-			{
-				if ($s['default_set'] == 1)
-				{
-					$def_skin = $s['sid'];
-				}
-				
-				if ($s['hidden'] == 1)
-				{
-					$hidden = " *(Hidden)";
-				}
-				else
-				{
-					$hidden = "";
-				}
-				
-				$skin_array[] = array( $s['sid'], $s['sname'].$hidden );
-			   
-			}
-		}
-			
-		//+-------------------------------
-		
-		if ($INFO['default_language'] == "")
-		{
-			$INFO['default_language'] = 'en';
-		}
-		
-		//-----------------------------------------------
-		// Custom profile fields stuff
-		//-----------------------------------------------
-		
-		$custom_output = "";
-		$field_data     = array();
-		
-		$DB->query("SELECT * from ibf_pfields_content WHERE member_id='".$IN['MEMBER_ID']."'");
-		
-		while ( $content = $DB->fetch_row() )
-		{
-			foreach($content as $k => $v)
-			{
-				if ( preg_match( "/^field_(\d+)$/", $k, $match) )
-				{
-					$field_data[ $match[1] ] = $v;
-				}
-			}
-		}
-		
-		$DB->query("SELECT * from ibf_pfields_data ORDER BY forder");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			$form_element = "";
-			
-			if ( $row['ftype'] == 'drop' )
-			{
-				$carray = explode( '|', trim($row['fcontent']) );
-				
-				$d_content = array();
-				
-				foreach( $carray as $entry )
-				{
-					$value = explode( '=', $entry );
-					
-					$ov = trim($value[0]);
-					$td = trim($value[1]);
-					
-					if ($ov != "" and $td !="")
-					{
-						$d_content[] = array( $ov, $td );
-					}
-				}
-				
-				$form_element = $SKIN->form_dropdown( 'field_'.$row['fid'], $d_content, $field_data[$row['fid']] );
-				
-			}
-			else if ( $row['ftype'] == 'area' )
-			{
-				$form_element = $SKIN->form_textarea( 'field_'.$row['fid'], $field_data[$row['fid']] );
-			}
-			else
-			{
-				$form_element = $SKIN->form_input( 'field_'.$row['fid'], $field_data[$row['fid']] );
-			}
-			
-			$custom_out .= $SKIN->add_td_row( array( "<b>{$row['ftitle']}</b><br>{$row['desc']}" , $form_element ) );
-			
-		}
-		
-		//+-------------------------------
-		//| Perms masks section
-		//+-------------------------------
-		
-		$perm_masks = array();
-		
-		
-		$DB->query("SELECT * FROM ibf_forum_perms");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$perm_masks[] = array( $r['perm_id'], $r['perm_name'] );
-		}
-		
-		//+-------------------------------
-		
-		
-		$ADMIN->page_title = "Edit member: ".$mem['name']." (ID: ".$mem['id'].")";
-		
-		$ADMIN->page_detail = "You may alter the members settings from here.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doedit'  ),
-												  2 => array( 'act'   , 'mem'     ),
-												  3 => array( 'mid'   , $mem['id'] ),
-												  4 => array( 'curpass', $mem['password'] ),
-											) );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Member Security Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IP address when registered</b>" ,$mem['ip_address'] )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Remove member's photo</b>" ,
-												  $SKIN->form_checkbox("remove_photo", 0)
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Warn Level</b>" ,
-												  $SKIN->form_input("warn_level", $mem['warn_level'])
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Member Title</b>" ,
-												  $SKIN->form_input("title", $mem['title'])
-									     )      );
-									     
-		if ($show_fixed != TRUE)
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Member Group</b>" ,
-													  $SKIN->form_dropdown( "mgroup",
-																			$mem_group,
-																			$mem['mgroup']
-																		  )
-											 )      );
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Member Group</b>" ,
-													  $SKIN->form_hidden( array( 1 => array( 'mgroup' , $mem['mgroup'] ) ) )."<b>Root Admin</b> (Can't Change)",
-											 )      );
-		}
-		
-		//+-------------------------------
-		// Sort out perm id stuff
-		//+-------------------------------
-		
-		$ADMIN->html .=
-		"<script type='text/javascript'>
-			
-			var show   = '';
-		";
-		
-		foreach ($perm_masks as $id => $d)
-		{
-			$ADMIN->html .= " 		perms_$d[0] = '$d[1]';\n";
-		}
-		
-		$ADMIN->html .=
-		"
-			
-		 	function saveit(f)
-		 	{
-		 		show = '';
-		 		for (var i = 0 ; i < f.options.length; i++)
-				{
-					if (f.options[i].selected)
-					{
-						tid  = f.options[i].value;
-						show += '\\n' + eval('perms_'+tid);
-					}
-				}
-				
-				if ( show != '' )
-				{
-					document.forms[0].override.checked = true;
-				}
-				else
-				{
-					document.forms[0].override.checked = false;
-				}
-			}
-			
-			function show_me()
-			{
-				if (show == '')
-				{
-					show = 'No change detected\\nClick on the multi-select box to activate';
-				}
-				
-				alert('Selected Permission Masks\\n---------------------------------\\n' + show);
-			}
-			
-		</script>";
-		
-		$arr = explode( ",",$mem['org_perm_id'] );
-		
-		$ch_ch = ( $mem['org_perm_id'] ) ? 'checked' : '';
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Override group forum permission mask with...</b><br>You may choose more than one" ,
-												  "<input type='checkbox' name='override' value='1' $ch_ch> <b>Override Group Permission Mask with...</b><br>".
-												  $SKIN->form_multiselect( "permid[]",
-																		$perm_masks,
-																		$arr, 5, 'onfocus="saveit(this)" onchange="saveit(this)"'
-																	  )."<br><input style='margin-top:5px' id='editbutton' type='button' onclick='show_me();' value='Show me selected masks'>"
-										 ) , "subforum"   );
-	
-		//-----------------------------------------------------------------------------------------------
-		// Mod posts bit
-		//-----------------------------------------------------------------------------------------------
-		
-		$mod_tick = 0;
-		$mod_arr  = array();
-		
-		if ( $mem['mod_posts'] == 1 )
-		{
-			$mod_tick = 'checked';
-		}
-		elseif ($mem['mod_posts'] > 0)
-		{
-			$mod_arr = $std->hdl_ban_line( $mem['mod_posts'] );
-			
-			$hours  = ceil( ( $mod_arr['date_end'] - time() ) / 3600 );
-				
-			if ( $hours > 24 and ( ($hours / 24) == ceil($hours / 24) ) )
-			{
-				$mod_arr['units']    = 'd';
-				$mod_arr['timespan'] = $hours / 24;
-			}
-			else
-			{
-				$mod_arr['units']    = 'h';
-				$mod_arr['timespan'] = $hours;
-			}
-			
-			$mod_extra = "<br /><span style='color:red'>Restriction in progress - remaining time has been recalculated</span>";
-		}
-						     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Require moderator preview of all posts by this member?</b><br>If yes, all posts by this member will be put into the moderation queue. Untick box and clear number box to remove." ,
-												  "<input type='checkbox' name='mod_indef' value='1' $mod_tick> Moderator Preview indefinitely
-												  <br /><b>or for</b> ".$SKIN->form_input('mod_timespan', $mod_arr['timespan'], "text", "", '5' ) . '&nbsp;' . $SKIN->form_dropdown('mod_units', $units, $mod_arr['units'] ).$mod_extra
-									     )      );
-									     
-		
-		$post_tick = 0;
-		$post_arr  = array();
-		
-		if ( $mem['restrict_post'] == 1 )
-		{
-			$post_tick = 'checked';
-		}
-		else if( $mem['restrict_post'] > 0 )
-		{
-			$post_arr = $std->hdl_ban_line( $mem['restrict_post'] );
-			
-			$hours  = ceil( ( $post_arr['date_end'] - time() ) / 3600 );
-				
-			if ( $hours > 24 and ( ($hours / 24) == ceil($hours / 24) ) )
-			{
-				$post_arr['units']    = 'd';
-				$post_arr['timespan'] = $hours / 24;
-			}
-			else
-			{
-				$post_arr['units']    = 'h';
-				$post_arr['timespan'] = $hours;
-			}
-			
-			$post_extra = "<br /><span style='color:red'>Restriction in progress - remaining time has been recalculated</span>";
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Restrict {$mem['name']} from posting?</b><br>Untick box and clear number box to remove restriction." ,
-												  "<input type='checkbox' name='post_indef' value='1' $post_tick> Restrict posting indefinitely
-												  <br /><b>or for</b> ".$SKIN->form_input('post_timespan', $post_arr['timespan'], "text", "", '5' ) . '&nbsp;' . $SKIN->form_dropdown('post_units', $units, $post_arr['units'] ).$post_extra
-									     ) , "subforum"     );
-									     
-									     
-		//-----------------------------------------------------------------------------------------------
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Password Control" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>New Password</b><br>(Leave this blank if you do not wish to reset password!)" ,
-												  $SKIN->form_input("password")
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------+
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------+
-		
-		$ADMIN->html .= $SKIN->start_table( "Board Settings" );							     
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Language Choice</b>" ,
-												  $SKIN->form_dropdown( "language",
-																		$lang_array,
-												  						$mem['language'] != "" ? $mem['language'] : $INFO['default_language']
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Skin Choice</b>" ,
-												  $SKIN->form_dropdown( "skin",
-																		$skin_array,
-												  						$mem['skin'] != "" ? $mem['skin'] : $def_skin
-												  					  )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Hide this members email address?</b>" ,
-												  $SKIN->form_yes_no("hide_email", $mem['hide_email'] )
-									     )      );
-									     						     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email a PM reminder?</b>" ,
-												  $SKIN->form_yes_no("email_pm", $mem['email_pm'] )
-									     )      );		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------+
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------+
-		
-		$ADMIN->html .= $SKIN->start_table( "Contact Information" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Email Address</b>" ,
-												  $SKIN->form_input("email", $mem['email'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>AIM Identity</b>" ,
-												  $SKIN->form_input("aim_name", $mem['aim_name'])
-									     )      );							     						     
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>ICQ Number</b>" ,
-												  $SKIN->form_input("icq_number", $mem['icq_number'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Yahoo Identity</b>" ,
-												  $SKIN->form_input("yahoo", $mem['yahoo'])
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>MSN Identity</b>" ,
-												  $SKIN->form_input("msnname", $mem['msnname'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Integrity Messenger Name</b>" ,
-												  $SKIN->form_input("integ_msg", $mem['integ_msg'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Website Address</b>" ,
-												  $SKIN->form_input("website", $mem['website'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------+
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------+
-		
-		$ADMIN->html .= $SKIN->start_table( "Other Information" );
-									     							     							     
-		//+-------------------------------
-		
-		$mem['signature'] = $parser->unconvert( $mem['signature'] );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Avatar</b>" ,
-												  $SKIN->form_input("avatar", $mem['avatar'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Avatar Size</b>" ,
-												  $SKIN->form_input("avatar_size", $mem['avatar_size'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Post Count</b>" ,
-												  $SKIN->form_input("posts", $mem['posts'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Location</b>" ,
-												  $SKIN->form_input("location", $mem['location'])
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Interests</b>" ,
-												  $SKIN->form_textarea("interests", str_replace( '<br>', "\n",$mem['interests']))
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Signature</b>" ,
-												  $SKIN->form_textarea("signature", $mem['signature'])
-									     )      );
-		
-		
-									     							     							     							     
-		//+-------------------------------
-		
-		if ($custom_out != "")
-		{
-		
-			$ADMIN->html .= $SKIN->end_table();
-			
-			
-			$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-			$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-			
-			//+-------------------------------+
-			
-			$ADMIN->html .= $SKIN->start_table( "Custom Profile Fields" );
-			
-			
-			$ADMIN->html .= $custom_out;
-											 
-		}
-								     							     							     
-		//+-------------------------------
-									     							     							     							     
-		$ADMIN->html .= $SKIN->end_form("Edit this member");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-
-	//+---------------------------------------------------------------------------------
-	
-	function do_edit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums, $HTTP_POST_VARS;
-		
-		$DB->query("SELECT * FROM ibf_members WHERE id='".$IN['mid']."'");
-		
-		$memb = $DB->fetch_row();
-		
-		$password = "";
-		
-		if ($IN['password'] != "")
-		{
-			$password = ", password='".md5($IN['password'])."'";
-		}
-		
-		require ROOT_PATH."sources/lib/post_parser.php";
-		
-		$parser = new post_parser();
-		
-		$IN['signature'] = $parser->convert( array ('TEXT'      => $IN['signature'],
-													'SMILIES'   => 0,
-													'CODE'      => $INFO['sig_allow_ibc'],
-													'HTML'      => $INFO['sig_allow_html'],
-													'SIGNATURE' => 1
-										   )       );
-										   
-		if ( $IN['override'] == 1 )
-		{
-			$permid = implode( ",", $HTTP_POST_VARS['permid'] );
-		}
-		else
-		{
-			$permid = "";
-		}
-		
-		$restrict_post = 0;
-		$mod_queue     = 0;
-		
-		if ( $IN['mod_indef'] == 1 )
-		{
-			$mod_queue = 1;
-		}
-		elseif ( $IN['mod_timespan'] > 0 )
-		{
-			$mod_queue = $std->hdl_ban_line( array( 'timespan' => intval($IN['mod_timespan']), 'unit' => $IN['mod_units']  ) );
-		}
-		
-		
-		if ( $IN['post_indef'] == 1 )
-		{
-			$restrict_post = 1;
-		}
-		elseif ( $IN['post_timespan'] > 0 )
-		{
-			$restrict_post = $std->hdl_ban_line( array( 'timespan' => intval($IN['post_timespan']), 'unit' => $IN['post_units']  ) );
-		}
-		
-		$db_string = $DB->compile_db_update_string( array (
-															'restrict_post'   => $restrict_post,
-															'mgroup'       => $IN['mgroup'],
-															'title'        => $IN['title'],
-															'language'     => $IN['language'],
-															'skin'         => $IN['skin'],
-															'hide_email'   => $IN['hide_email'],
-															'email_pm'     => $IN['email_pm'],
-															'email'        => $IN['email'],
-															'aim_name'     => $IN['aim_name'],
-															'icq_number'   => $IN['icq_number'],
-															'yahoo'        => $IN['yahoo'],
-															'msnname'      => $IN['msnname'],
-															'website'      => $IN['website'],
-															'avatar'       => $IN['avatar'],
-															'avatar_size'  => $IN['avatar_size'],
-															'posts'        => $IN['posts'],
-															'location'     => $IN['location'],
-															'interests'    => $IN['interests'],
-															'signature'    => $IN['signature'],
-															'mod_posts'    => $mod_queue,
-															'org_perm_id'  => $permid,
-															'warn_level'   => $IN['warn_level'],
-															'integ_msg'    => $IN['integ_msg'],
-												  )       );
-												  
-		$DB->query("UPDATE ibf_members SET $db_string".$password." WHERE id='".$IN['mid']."'");
-		
-		//----------------------------------
-		// Remove photo?
-		//----------------------------------
-		
-		if ( $IN['remove_photo'] )
-		{
-			$DB->query("SELECT id FROM ibf_member_extra WHERE id={$IN['mid']}");
-		
-			if ( $DB->get_num_rows() )
-			{
-				$DB->query("UPDATE ibf_member_extra SET photo_location='', photo_type='', photo_dimensions='' WHERE id={$IN['mid']}");
-			}
-			else
-			{
-				$DB->query("INSERT INTO ibf_member_extra SET photo_location='', photo_type='', photo_dimensions='', id={$IN['mid']}");
-			}
-			
-			foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
-			{
-				if ( @file_exists( $INFO['upload_dir']."/photo-".$IN['mid'].".".$ext ) )
-				{
-					@unlink( $INFO['upload_dir']."/photo-".$IN['mid'].".".$ext );
-				}
-			}
-		}
-		
-		//----------------------------------
-		// Custom profile field stuff
-		//----------------------------------
-		
-		$custom_fields = array();
-		
-		$DB->query("SELECT * from ibf_pfields_data");
-		
-		while ( $row = $DB->fetch_row() )
-		{
-			$custom_fields[ 'field_'.$row['fid'] ] = str_replace( '<br>', "\n", $IN[ 'field_'.$row['fid'] ] );
-		}
-		
-		if ( count($custom_fields) > 0 )
-		{
-			// Do we already have an entry in the content table?
-			
-			$DB->query("SELECT member_id FROM ibf_pfields_content WHERE member_id='".$IN['mid']."'");
-			$test = $DB->fetch_row();
-			
-			if ( $test['member_id'] )
-			{
-				// We have it, so simply update
-				
-				$db_string = $DB->compile_db_update_string($custom_fields);
-				
-				$DB->query("UPDATE ibf_pfields_content SET $db_string WHERE member_id='".$IN['mid']."'");
-			}
-			else
-			{
-				$custom_fields['member_id'] = $IN['mid'];
-				
-				$db_string = $DB->compile_db_insert_string($custom_fields);
-				
-				$DB->query("INSERT INTO ibf_pfields_content (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-			}
-		}
-		
-		
-		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-			
-			if ( $IN['password'] )
-			{
-				if ( md5($IN['password']) != $memb['password'] )
-				{
-					$this->modules->on_pass_change($IN['mid'], $IN['password']);
-				}
-			}
-			
-			if ( $memb['mgroup'] != $IN['mgroup'] )
-			{
-				$this->modules->on_group_change($IN['mid'], $IN['mgroup']);
-			}
-			
-			if ( $memb['email'] != $IN['email'] )
-			{
-				$this->modules->on_email_change($IN['mid'], $IN['email']);
-			}
-			
-			if ( $memb['signature'] != $IN['signature'] )
-			{
-				$this->modules->on_signature_update($memb, $IN['signature']);
-			}
-			
-			$mem_array = array(
-							    'title'        => $IN['title'],
-								'aim_name'     => $IN['aim_name'],
-								'icq_number'   => $IN['icq_number'],
-								'yahoo'        => $IN['yahoo'],
-								'msnname'      => $IN['msnname'],
-								'website'      => $IN['website'],
-								'location'     => $IN['location'],
-								'interests'    => $IN['interests'],
-								'id'		   => $IN['mid']
-							  );
-			
-			$this->modules->on_profile_update($mem_array, $custom_fields);
-		}
-		
-		$ADMIN->save_log("Edited Member '{$memb['name']}' account");
-		
-		$ADMIN->done_screen("Member Edited", "Member Control", "act=mem&code=edit" );
-		
-	}
-
-
-	
-	
-		
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_member_tools.php b/upload/sources/Admin/ad_member_tools.php
deleted file mode 100644
index 83b74367..00000000
--- a/upload/sources/Admin/ad_member_tools.php
+++ /dev/null
@@ -1,524 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Member Tool functions
-|   > Module written by Matt Mecham
-|   > Date started: 17th September 2003
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_member_tools();
-
-$root_path = "";
-
-class ad_member_tools {
-
-	var $base_url;
-	var $modules = "";
-
-	function ad_member_tools()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		$ADMIN->nav[] = array( 'act=mtools', 'Member Tools Home' );
-		
-		//---------------------------------------
-		
-		$ADMIN->page_title  = "Member Tool Box";
-		$ADMIN->page_detail = 'You can use the tools below to search for IP address.';
-
-		switch($IN['code'])
-		{
-			
-			case 'showallips':
-				$this->show_ips();
-				break;
-				
-			case 'learnip':
-				$this->learn_ip();
-				break;
-			
-			//---------------------
-			default:
-				$this->show_index();
-				break;
-		}
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// LEARN ABOUT THE IP. It's very good.
-	//
-	//+---------------------------------------------------------------------------------
-	
-	
-	function learn_ip()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ( $IN['ip'] == "" )
-		{
-			$this->show_index("You did not enter an IP address to search by");
-		}
-		
-		$ip = $IN['ip'];
-		
-		$resolved = 'N/A - Partial IP Address';
-		$exact    = 0;
-		
-		if ( substr_count( $ip, '.' ) == 3 )
-		{
-			$exact = 1;
-		}
-		
-		if ( strstr( $ip, '*' ) )
-		{
-			$exact = 0;
-			$ip    = str_replace( "*", "", $ip );
-		}
-			
-		if ( $exact != 0 )
-		{
-			$resolved = gethostbyaddr($ip);
-			$query    = "='".$ip."'";
-		}
-		else
-		{
-			$query    = " LIKE '".$ip."%'";
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Host Address for {$IN['ip']}" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IP address resolves to</b>" ,
-												  $resolved
-										  )      );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+--------------------------------------------------
-		// Find registered members
-		//+--------------------------------------------------
-		
-		$SKIN->td_header[] = array( "Name"       , "30%" );
-		$SKIN->td_header[] = array( "Email"      , "20%" );
-		$SKIN->td_header[] = array( "Posts"      , "10%" );
-		$SKIN->td_header[] = array( "IP"         , "20%" );
-		$SKIN->td_header[] = array( "Registered" , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Members using that IP when REGISTERING" );
-		
-		$DB->query("SELECT id, name, email, posts, ip_address, joined FROM ibf_members WHERE ip_address{$query} ORDER BY joined DESC LIMIT 250");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No Matches Found", "center");
-		}
-		else
-		{
-			while ( $m = $DB->fetch_row() )
-			{
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( $m['name'] ,
-														  $m['email'],
-														  $m['posts'],
-														  $m['ip_address'],
-														  $std->get_date( $m['joined'], 'SHORT' )
-												 )      );
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+--------------------------------------------------
-		// Find Names posted under
-		//+--------------------------------------------------
-		
-		$SKIN->td_header[] = array( "Name"       , "20%" );
-		$SKIN->td_header[] = array( "Email"      , "20%" );
-		$SKIN->td_header[] = array( "IP"         , "15%" );
-		$SKIN->td_header[] = array( "First Used"  , "20%" );
-		$SKIN->td_header[] = array( "View Post"  , "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Members using that IP when POSTING" );
-		
-		$DB->query("SELECT m.id, m.name, m.email, m.posts, m.joined, p.pid, p.author_id, p.post_date, p.ip_address, p.topic_id
-					FROM ibf_posts p
-					 LEFT JOIN ibf_members m ON ( p.author_id=m.id)
-					WHERE p.ip_address{$query} GROUP BY p.author_id ORDER BY p.post_date DESC LIMIT 250");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No Matches Found", "center");
-		}
-		else
-		{
-			while ( $m = $DB->fetch_row() )
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( $m['name'] ,
-														  $m['email'],
-														  $m['ip_address'],
-														  $std->get_date( $m['post_date'], 'SHORT' ),
-														  "<center><a href='index.php?showtopic={$m['topic_id']}&view=findpost&p={$m['pid']}' target='_blank'>View Post</a></center>",
-												 )      );
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+--------------------------------------------------
-		// Find Names VOTED under
-		//+--------------------------------------------------
-		
-		$SKIN->td_header[] = array( "Name"       , "20%" );
-		$SKIN->td_header[] = array( "Email"      , "20%" );
-		$SKIN->td_header[] = array( "IP"         , "15%" );
-		$SKIN->td_header[] = array( "First Used" , "20%" );
-		$SKIN->td_header[] = array( "View Poll" , "15%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Members using that IP when VOTING" );
-		
-		$DB->query("SELECT m.id, m.name, m.email, m.posts, m.joined, p.vote_date, p.ip_address, p.tid
-					FROM ibf_voters p
-					 LEFT JOIN ibf_members m ON ( p.member_id=m.id)
-					WHERE p.ip_address{$query} GROUP BY p.member_id ORDER BY p.vote_date DESC LIMIT 250");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No Matches Found", "center");
-		}
-		else
-		{
-			while ( $m = $DB->fetch_row() )
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( $m['name'] ,
-														  $m['email'],
-														  $m['ip_address'],
-														  $std->get_date( $m['vote_date'], 'SHORT' ),
-														  "<center><a href='index.php?showtopic={$m['tid']}' target='_blank'>View Poll</a></center>",
-												 )      );
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+--------------------------------------------------
-		// Find Names EMAILING under
-		//+--------------------------------------------------
-		
-		$SKIN->td_header[] = array( "Name"       , "20%" );
-		$SKIN->td_header[] = array( "Email"      , "20%" );
-		$SKIN->td_header[] = array( "IP"         , "15%" );
-		$SKIN->td_header[] = array( "First Used"    , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Members using that IP when EMAILING other members" );
-		
-		$DB->query("SELECT m.id, m.name, m.email, m.posts, m.joined, p.email_date, p.from_ip_address
-					FROM ibf_email_logs p
-					 LEFT JOIN ibf_members m ON ( p.from_member_id=m.id)
-					WHERE p.from_ip_address{$query} GROUP BY p.from_member_id ORDER BY p.email_date DESC LIMIT 250");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No Matches Found", "center");
-		}
-		else
-		{
-			while ( $m = $DB->fetch_row() )
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( $m['name'] ,
-														  $m['email'],
-														  $m['from_ip_address'],
-														  $std->get_date( $m['email_date'], 'SHORT' ),
-												 )      );
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+--------------------------------------------------
-		// Find Names VALIDATING under
-		//+--------------------------------------------------
-		
-		$SKIN->td_header[] = array( "Name"       , "20%" );
-		$SKIN->td_header[] = array( "Email"      , "20%" );
-		$SKIN->td_header[] = array( "IP"         , "15%" );
-		$SKIN->td_header[] = array( "First Used" , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Members using that IP while VALIDATING their accounts" );
-		
-		$DB->query("SELECT m.id, m.name, m.email, m.posts, m.joined, p.entry_date, p.ip_address
-					FROM ibf_validating p
-					 LEFT JOIN ibf_members m ON ( p.member_id=m.id)
-					WHERE p.ip_address{$query} GROUP BY p.member_id ORDER BY p.entry_date DESC LIMIT 250");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No Matches Found", "center");
-		}
-		else
-		{
-			while ( $m = $DB->fetch_row() )
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( $m['name'] ,
-														  $m['email'],
-														  $m['ip_address'],
-														  $std->get_date( $m['entry_date'], 'SHORT' ),
-												 )      );
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// SHOW ALL IPs
-	//
-	//+---------------------------------------------------------------------------------
-	
-	
-	function show_ips()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ( $IN['name'] == "" and $IN['member_id'] == "" )
-		{
-			$this->show_index("You did not enter a name to search by");
-		}
-		
-		if ( $IN['member_id'] )
-		{
-			$id = intval($IN['member_id']);
-			
-			$DB->query("SELECT id, name, email, ip_address FROM ibf_members WHERE id=$id");
-			
-			if ( ! $member = $DB->fetch_row() )
-			{
-				$this->show_index("Could not locate a member with the id of '$id'");
-			}
-		}
-		else
-		{
-			$name = addslashes($IN['name']);
-			
-			$DB->query("SELECT id, name, email, ip_address FROM ibf_members WHERE name='$name'");
-			
-			if ( ! $member = $DB->fetch_row() )
-			{
-				$this->show_index( "We could not find an exact match for that member name, some choices will be shown below", $name );
-			}
-		}
-		
-		$DB->query("SELECT count(distinct(ip_address)) as cnt FROM ibf_posts WHERE author_id={$member['id']}");
-		
-		$count = $DB->fetch_row();
-		
-		$st  = intval($IN['st']);
-		$end = 50;
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['cnt'],
-											   'PER_PAGE'    => $end,
-											   'CUR_ST_VAL'  => $st,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Multiple Pages",
-											   'BASE_URL'    => $SKIN->base_url."&act=mtools&code=showallips&member_id={$member['id']}",
-									  )      );
-		
-		$master = array();
-		$ips    = array();
-		
-		$DB->query("SELECT count(ip_address) as ip, ip_address, pid, topic_id, post_date FROM ibf_posts WHERE author_id={$member['id']} GROUP BY ip_address ORDER BY ip DESC LIMIT $st, $end");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$master[] = $r;
-			$ips[]    = '"'.$r['ip_address'].'"';
-		}
-		
-		$reg = array();
-		
-		if ( count($ips) > 0 )
-		{
-			$DB->query("SELECT id, name, ip_address FROM ibf_members WHERE ip_address IN (".implode(",",$ips).") AND id != {$member['id']}");
-			
-			while ( $i = $DB->fetch_row() )
-			{
-				$reg[ $i['ip_address'] ][] = $i;
-			}
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "IP Address"          , "20%" );
-		$SKIN->td_header[] = array( "Times Used"          , "10%" );
-		$SKIN->td_header[] = array( "Date Used"           , "25%" );
-		$SKIN->td_header[] = array( "Used for other Reg." , "20%" );
-		$SKIN->td_header[] = array( "IP Tool"             , "25%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "{$member['name']}'s IP addresses ({$count['cnt']}) matches" );
-		
-		foreach( $master as $idx => $r )
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( $r['ip_address'] ,
-													  $r['ip'] ,
-													  $std->get_date( $r['post_date'], 'SHORT' ),
-													  "<center>". intval( count($reg[ $r['ip_address'] ]) ). "</center>",
-													  "<center><a href='{$ADMIN->base_url}&act=mtools&code=learnip&ip={$r['ip_address']}'>Learn about this IP</a></center>"
-											 )      );
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic( "$links", "center", "catrow2");
-									     							     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Default Screen
-	//
-	//+---------------------------------------------------------------------------------
-	
-	
-	function show_index($msg="", $membername="")
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		
-		if ($msg != "")
-		{
-			$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
-			
-			$ADMIN->html .= $SKIN->start_table( "Message" );
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( $msg ) );
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'showallips'  ),
-												  2 => array( 'act'   , 'mtools'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Show all IP Addresses a member has posted with" );
-		
-		if ( $membername == "" )
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enter the member's name</b>" ,
-													  $SKIN->form_input( "name", $std->txt_stripslashes($HTTP_POST_VARS['name']) )
-											 )      );
-		}
-		else
-		{
-			$DB->query("SELECT id, name FROM ibf_members WHERE lower(name) LIKE '{$membername}%'");
-			
-			if ( ! $DB->get_num_rows() )
-			{
-				$this->show_index("There are no members with names that start with '$membername'");
-			}
-			
-			$mem_array = array();
-			
-			while ( $m = $DB->fetch_row() )
-			{
-				$mem_array[] = array( $m['id'], $m['name'] );
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose the member from the selection</b>" ,
-													  $SKIN->form_dropdown( "member_id", $mem_array )
-											 )      );
-		}
-		
-		$ADMIN->html .= $SKIN->end_form("Get IP Addresses");
-									     							     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'learnip'  ),
-												  2 => array( 'act'   , 'mtools'     ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "IP Multi-Tool" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show me everything you know about this IP...</b>" ,
-												   $SKIN->form_input( "ip", $std->txt_stripslashes($HTTP_POST_VARS['ip']) )
-										  )      );
-										  
-		$ADMIN->html .= $SKIN->end_form("Show me!");
-									     							     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	}
-	
-	
-	
-	
-	
-	
-	
-}
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_moderator.php b/upload/sources/Admin/ad_moderator.php
deleted file mode 100644
index 789cbdfb..00000000
--- a/upload/sources/Admin/ad_moderator.php
+++ /dev/null
@@ -1,958 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Category functions
-|   > Module written by Matt Mecham
-|   > Date started: 1st march 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_mod();
-
-
-class ad_mod {
-
-	var $base_url;
-
-	function ad_mod() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'add':
-				$this->add_one();
-				break;
-			case 'add_two':
-				$this->add_two();
-				break;
-			case 'add_final':
-				$this->mod_form('add');
-				break;
-			case 'doadd':
-				$this->add_mod();
-				break;
-				
-			case 'edit':
-				$this->mod_form('edit');
-				break;
-				
-			case 'doedit':
-				$this->do_edit();
-				break;
-				
-			case 'remove':
-				$this->do_delete();
-				break;
-				
-			default:
-				$this->show_list();
-				break;
-		}
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// DELETE MODERATOR
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function do_delete()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You did not choose a valid moderator ID");
-		}
-		
-		$DB->query("SELECT * FROM ibf_moderators WHERE mid='".$IN['mid']."'");
-		$mod = $DB->fetch_row();
-		
-		if ( $mod['is_group'] )
-		{
-			$name = 'Group: '.$mod['group_name'];
-		}
-		else
-		{
-			$name = $mod['member_name'];
-		}
-			
-		$DB->query("DELETE FROM ibf_moderators WHERE mid='".$IN['mid']."'");
-		
-		$ADMIN->save_log("Removed Moderator '{$name}'");
-		
-		$ADMIN->done_screen("Moderator Removed", "Moderator Control", "act=mod" );
-		
-	}	
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// EDIT MODERATOR
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function do_edit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You did not choose a valid moderator ID");
-		}
-		
-		$DB->query("SELECT member_name FROM ibf_moderators WHERE mid='".$IN['mid']."'");
-		$mod = $DB->fetch_row();
-		
-		//--------------------------------------
-		// Build Mr Hash
-		//--------------------------------------
-		
-		$mr_hash = array( 
-							'forum_id'     => $IN['forum_id'],
-							'edit_post'    => $IN['edit_post'],
-							'edit_topic'   => $IN['edit_topic'],
-							'delete_post'  => $IN['delete_post'],
-							'delete_topic' => $IN['delete_topic'],
-							'view_ip'      => $IN['view_ip'],
-							'open_topic'   => $IN['open_topic'],
-							'close_topic'  => $IN['close_topic'],
-							'mass_move'    => $IN['mass_move'],
-							'mass_prune'   => $IN['mass_prune'],
-							'move_topic'   => $IN['move_topic'],
-							'pin_topic'    => $IN['pin_topic'],
-							'unpin_topic'  => $IN['unpin_topic'],
-							'post_q'       => $IN['post_q'],
-							'topic_q'      => $IN['topic_q'],
-							'allow_warn'   => $IN['allow_warn'],
-							'split_merge'  => $IN['split_merge'],
-							'edit_user'    => $IN['edit_user'],
-							'can_mm'	   => $IN['can_mm'],
-						);
-						
-		
-			
-		$db_string = $DB->compile_db_update_string( $mr_hash );
-			
-		$DB->query("UPDATE ibf_moderators SET $db_string WHERE mid='".$IN['mid']."'");
-		
-		$ADMIN->save_log("Edited Moderator '{$mod['member_name']}'");
-		
-		$ADMIN->done_screen("Moderator Edited", "Moderator Control", "act=mod" );
-		
-	}	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// ADD MODERATOR
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function add_mod()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['fid'] == "")
-		{
-			$ADMIN->error("You did not choose any forums to add this member to");
-		}
-		
-		//--------------------------------------
-		// Build Mr Hash
-		//--------------------------------------
-		
-		$mr_hash = array( 
-							'edit_post'    => $IN['edit_post'],
-							'edit_topic'   => $IN['edit_topic'],
-							'delete_post'  => $IN['delete_post'],
-							'delete_topic' => $IN['delete_topic'],
-							'view_ip'      => $IN['view_ip'],
-							'open_topic'   => $IN['open_topic'],
-							'close_topic'  => $IN['close_topic'],
-							'mass_move'    => $IN['mass_move'],
-							'mass_prune'   => $IN['mass_prune'],
-							'move_topic'   => $IN['move_topic'],
-							'pin_topic'    => $IN['pin_topic'],
-							'unpin_topic'  => $IN['unpin_topic'],
-							'post_q'       => $IN['post_q'],
-							'topic_q'      => $IN['topic_q'],
-							'allow_warn'   => $IN['allow_warn'],
-							'split_merge'  => $IN['split_merge'],
-							'edit_user'    => $IN['edit_user'],
-							'can_mm'	   => $IN['can_mm'],
-						);
-						
-		$forum_ids = array();
-		
-		$DB->query("SELECT id FROM ibf_forums WHERE id IN(".$IN['fid'].")");
-		
-		while( $i = $DB->fetch_row() )
-		{
-			$forum_ids[ $i['id'] ] = $i['id'];
-		}
-		
-		//---------------------------------------
-						
-		if ($IN['mod_type'] == 'group')
-		{
-		
-			if ($IN['gid'] == "")
-			{
-				$ADMIN->error("We could not match that group ID");
-			}
-			
-			$DB->query("SELECT g_id, g_title FROM ibf_groups WHERE g_id='".$IN['gid']."'");
-			
-			if ( ! $group = $DB->fetch_row() )
-			{
-				$ADMIN->error("We could not match that group ID");
-			}
-			
-			//---------------------------------------
-			// Already using this group on this forum?
-			//---------------------------------------
-			
-			$DB->query("SELECT * FROM ibf_moderators WHERE forum_id IN(".$IN['fid'].") and group_id={$IN['gid']}");
-			
-			while( $f = $DB->fetch_row() )
-			{
-				unset($forum_ids[ $f['forum_id'] ]);
-			}
-			
-			$mr_hash['member_name'] = '-1';
-			$mr_hash['member_id']   = '-1';
-			$mr_hash['group_id']    = $group['g_id'];
-			$mr_hash['group_name']  = $group['g_title'];
-			$mr_hash['is_group']    = 1;
-			
-			$ad_log = "Added Group '{$group['g_title']}' as a moderator";
-			
-		}
-		else
-		{
-		
-			if ($IN['mem'] == "")
-			{
-				$ADMIN->error("You did not choose a member to add as a moderator");
-			}
-			
-			$DB->query("SELECT id, name from ibf_members WHERE id='".$IN['mem']."'");
-			
-			if ( ! $mem = $DB->fetch_row() )
-			{
-				$ADMIN->error("Could not match that member name so there.");
-			}
-			
-			//---------------------------------------
-			// Already using this member on this forum?
-			//---------------------------------------
-			
-			$DB->query("SELECT * FROM ibf_moderators WHERE forum_id IN(".$IN['fid'].") and member_id={$IN['mem']}");
-			
-			while( $f = $DB->fetch_row() )
-			{
-				unset($forum_ids[ $f['forum_id'] ]);
-			}
-			
-			$mr_hash['member_name'] = $mem['name'];
-			$mr_hash['member_id']   = $mem['id'];
-			$mr_hash['is_group']    = 0;
-			
-			$ad_log = "Added Member '{$mem['name']}' as a moderator";
-		
-		}
-		
-		//--------------------------------------
-		// Check for legal forums
-		//--------------------------------------
-		
-		if ( count($forum_ids) == 0)
-		{
-			$ADMIN->error("You did not select any forums that do not have this group or member already moderating.");
-		}
-		
-		//--------------------------------------
-		// Loopy loopy
-		//--------------------------------------
-		
-		foreach ($forum_ids as $cartman)
-		{
-			$mr_hash['forum_id'] = $cartman;
-			
-			$kenny = $DB->compile_db_insert_string( $mr_hash );
-			
-			$DB->query("INSERT INTO ibf_moderators (" .$kenny['FIELD_NAMES']. ") VALUES (". $kenny['FIELD_VALUES'] .")");
-		}
-		
-		$ADMIN->save_log($ad_log);
-		
-		$ADMIN->done_screen("Moderator Added", "Moderator Control", "act=mod" );
-		
-	}	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// ADD FINAL, display the add / edit form
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function mod_form( $type='add' ) {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$group = array();
-		
-		if ($type == 'add')
-		{
-			if ($IN['fid'] == "")
-			{
-				$ADMIN->error("You did not choose any forums to add this member to");
-			}	
-				
-			$mod   = array();
-			$names = array();
-			
-			//--------------------------------------
-			
-			$DB->query("SELECT name FROM ibf_forums WHERE id IN(".$IN['fid'].")");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$names[] = $r['name'];
-			}
-			
-			$thenames = implode( ", ", $names );
-			
-			//--------------------------------------
-			
-			$button = "Add this moderator";
-			
-			$form_code = 'doadd';
-			
-			if ($IN['mod_type'] == 'group')
-			{
-				$DB->query("SELECT g_id, g_title FROM ibf_groups WHERE g_id='".$IN['mod_group']."'");
-				
-				if (! $group = $DB->fetch_row() )
-				{
-					$ADMIN->error("Could not find that group to add as a moderator");
-				}
-				
-				$ADMIN->page_detail = "Adding <b>group: {$group['g_title']}</b> as a moderator to: $thenames";
-				$ADMIN->page_title = "Add a moderator group";
-			}
-			else
-			{
-			
-				if ($IN['MEMBER_ID'] == "")
-				{
-					$ADMIN->error("Could not resolve the member id bucko");
-				}
-				else
-				{
-					$DB->query("SELECT name, id FROM ibf_members WHERE id='".$IN['MEMBER_ID']."'");
-					
-					if ( ! $mem = $DB->fetch_row() )
-					{
-						$ADMIN->error("That member ID does not resolve");
-					}
-					
-					$member_id   = $mem['id'];
-					$member_name = $mem['name'];
-				}
-				
-				$ADMIN->page_detail = "Adding a $member_name as a moderator to: $thenames";
-				$ADMIN->page_title = "Add a moderator";
-			
-			}
-			
-		}
-		else
-		{
-			if ($IN['mid'] == "")
-			{
-				$ADMIN->error("You must choose a valid moderator to edit.");
-			}
-			
-			$button    = "Edit this moderator";
-			
-			$form_code = "doedit";
-			
-			$ADMIN->page_title  = "Editing a moderator";
-			$ADMIN->page_detail = "Please check the information carefully before submitting the form";
-			
-			$DB->query("SELECT * from ibf_moderators WHERE mid='".$IN['mid']."'");
-			
-			if ( ! $mod = $DB->fetch_row() )
-			{
-				$ADMIN->error("Could not retrieve that moderators record");
-			}
-			
-			$member_id   = $mod['member_id'];
-			$member_name = $mod['member_name'];
-		}
-		
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'     , $form_code ),
-												  2 => array( 'act'      , 'mod'      ),
-												  3 => array( 'mid'      , $mod['mid']),
-												  4 => array( 'fid'      , $IN['fid'] ),
-												  5 => array( 'mem'      , $member_id ),
-												  6 => array( 'mod_type' , $IN['mod_type'] ),
-												  7 => array( 'gid'      , $group['g_id'] ),
-												  8 => array( 'gname'    , $group['g_name'] ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "General Settings" );
-		
-		//+-------------------------------
-		
-		if ($type == 'edit')
-		{
-			$forums = array();
-			
-			$DB->query("SELECT id, name FROM ibf_forums ORDER BY position");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$forums[] = array( $r['id'], $r['name'] );
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderates forum...</b>" ,
-												  $SKIN->form_dropdown( "forum_id", $forums, $mod['forum_id'] )
-									     )      );
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can edit others posts/polls?</b>" ,
-												  $SKIN->form_yes_no("edit_post", $mod['edit_post'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can edit others topic titles?</b>" ,
-												  $SKIN->form_yes_no("edit_topic", $mod['edit_topic'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can delete others posts?</b>" ,
-												  $SKIN->form_yes_no("delete_post", $mod['delete_post'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can delete others topics/polls?</b>" ,
-												  $SKIN->form_yes_no("delete_topic", $mod['delete_topic'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can view posters IP addresses?</b>" ,
-												  $SKIN->form_yes_no("view_ip", $mod['view_ip'] )
-									     )      );		
-				
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can open locked topics?</b>" ,
-												  $SKIN->form_yes_no("open_topic", $mod['open_topic'] )
-									     )      );		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can close open topics?</b>" ,
-												  $SKIN->form_yes_no("close_topic", $mod['close_topic'] )
-									     )      );	
-									     	
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can move topics?</b>" ,
-												  $SKIN->form_yes_no("move_topic", $mod['move_topic'] )
-									     )      );							     
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can pin topics?</b>" ,
-												  $SKIN->form_yes_no("pin_topic", $mod['pin_topic'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can unpin topics?</b>" ,
-												  $SKIN->form_yes_no("unpin_topic", $mod['unpin_topic'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can split / merge topics?</b>" ,
-												  $SKIN->form_yes_no("split_merge", $mod['split_merge'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Moderator Control Panel Settings" );
-		
-		//+-------------------------------
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can mass move topics?</b>" ,
-												  $SKIN->form_yes_no("mass_move", $mod['mass_move'] )
-									     )      );	
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can mass prune topics?</b>" ,
-												  $SKIN->form_yes_no("mass_prune", $mod['mass_prune'] )
-									     )      );
-									     						     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can manage queued topics?</b>" ,
-												  $SKIN->form_yes_no("topic_q", $mod['topic_q'] )
-									     )      );							     
-									     	
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can manage queued posts?</b>" ,
-												  $SKIN->form_yes_no("post_q", $mod['post_q'] )
-									     )      );							     
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Advanced Settings" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can warn other users?</b>" ,
-												  $SKIN->form_yes_no("allow_warn", $mod['allow_warn'] )
-									     )      );							     
-									     	
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can edit user avatars and signatures?</b>" ,
-												  $SKIN->form_yes_no("edit_user", $mod['edit_user'] )
-									     )      );
-									   
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Can use topic multi-moderation?</b><br>".$SKIN->js_help_link('mod_mmod', 'Important Information' ) ,
-												  $SKIN->form_yes_no("can_mm", $mod['can_mm'] )
-									     )      );						     
-									     
-		//+-------------------------------
-									     
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();							     						     
-									     
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// ADD step one: Look up a member
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function add_one() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//-----------------------------
-		// Grab and serialize the input
-		//-----------------------------
-		
-		$fid      = "";
-		$fidarray = array();
-		
-		foreach ($IN as $k => $v)
-		{
-			if ( preg_match( "/^add_(\d+)$/", $k, $match ) )
-			{
-				if ($IN[ $match[0] ])
-				{
-					$fidarray[] = $match[1];
-				}
-			}
-		}
-		
-		if ( count($fidarray) < 1 )
-		{
-			$ADMIN->error("You must select a forum, or forums to add a moderator to. You can do this by checking the checkboxes to the left of the forum name");
-		}
-		
-		$fid = implode( "," ,$fidarray );
-		
-		$ADMIN->page_title = "Add a moderator";
-		
-		$ADMIN->page_detail = "Please find a member or group to moderate the forums you previously selected.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add_two' ),
-												  2 => array( 'act'   , 'mod'     ),
-												  3 => array( 'fid'   , $fid      ),
-												  4 => array( 'mod_type' , $IN['mod_type'] ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		if ($IN['mod_type'] == 'member')
-		{
-		
-			$ADMIN->html .= $SKIN->start_table( "Search for a member" );
-			
-											 
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enter part or all of the usersname</b>" ,
-													  $SKIN->form_input( "USER_NAME" )
-											 )      );
-											 
-			$ADMIN->html .= $SKIN->end_form("Find Member");
-											 
-			$ADMIN->html .= $SKIN->end_table();
-		
-		}
-		else
-		{
-			// Get the group ID's and names
-			
-			$mem_group = array();
-			
-			$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-			while ( $r = $DB->fetch_row() )
-			{
-				$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-			}
-			
-			$ADMIN->html .= $SKIN->start_table( "Choose a group as a moderator" );
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Select a group</b>" ,
-													  $SKIN->form_dropdown( "mod_group", $mem_group )
-											 )      );
-											 
-			$ADMIN->html .= $SKIN->end_form("Add this group");
-											 
-			$ADMIN->html .= $SKIN->end_table();
-			
-		}
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// REFINE MEMBER SEARCH
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function add_two() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		// Are we adding a group as a mod? If so, bounce straight to the mod perms form
-		
-		if ($IN['mod_type'] == 'group')
-		{
-			$this->mod_form();
-			exit();
-		}
-		
-		// Else continue as normal.
-		
-		if ($IN['USER_NAME'] == "")
-		{
-			$ADMIN->error("You didn't choose a member name to look for!");
-		}
-		
-		$DB->query("SELECT id, name FROM ibf_members WHERE name LIKE '".$IN['USER_NAME']."%'");
-		
-		if (! $DB->get_num_rows() )
-		{
-			$ADMIN->error("Sorry, we could not find any members that matched the search string you entered");
-		}
-		
-		$form_array = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$form_array[] = array( $r['id'] , $r['name'] );
-		}
-		
-		
-		
-		$ADMIN->page_title = "Add a moderator";
-		
-		$ADMIN->page_detail = "Please select the correct member name from the selection below to add as a moderator to the previously selected forums.";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add_final' ),
-												  2 => array( 'act'   , 'mod'    ),
-												  3 => array( 'fid'   , $IN['fid']),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Search for a member" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose from the matches...</b>" ,
-												  $SKIN->form_dropdown( "MEMBER_ID", $form_array )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Choose Member");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// SHOW LIST
-	// Renders a complete listing of all the forums and categories w/mods.
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function show_list() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Moderator Control Overview";
-		$ADMIN->page_detail  = "This section allows you to edit, remove and add new moderators to your forums";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add' ),
-												  2 => array( 'act'   , 'mod'   ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "Add"                , "5%" );
-		$SKIN->td_header[] = array( "Forum Name"         , "40%" );
-		$SKIN->td_header[] = array( "Current Moderators" , "55%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Your Categories and Forums" );
-		
-		//------------------------------------
-		
-		$cats   = array();
-		$forums = array();
-		$mods   = array();
-		$children = array();
-		
-		$DB->query("SELECT * from ibf_categories where id > 0 ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			$cats[$r['id']] = $r;
-		}
-		
-		$DB->query("SELECT * from ibf_forums ORDER BY position ASC");
-		while ($r = $DB->fetch_row())
-		{
-			
-			if ($r['parent_id'] > 0)
-			{
-				$children[ $r['parent_id'] ][] = $r;
-			}
-			else
-			{
-				$forums[] = $r;
-			}
-			
-		}
-		
-		$DB->query("SELECT * from ibf_moderators");
-		while ($r = $DB->fetch_row())
-		{
-			$mods[] = $r;
-		}
-		
-		//------------------------------------
-		
-		$last_cat_id = -1;
-		
-		foreach ($cats as $c)
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_row( array(
-													   '&nbsp;',
-													   "<a href='{$ADMIN->base_url}&act=cat&code=doeditform&c={$c['id']}'>".$c['name']."</a>",
-													   '&nbsp;',
-											 ), 'pformstrip'     );
-			$last_cat_id = $c['id'];
-			
-			
-			foreach($forums as $r)
-			{	
-			
-				if ($r['category'] == $last_cat_id)
-				{
-				
-					$mod_string = "";
-					
-					foreach( $mods as $phpid => $data )
-					{
-						if ($data['forum_id'] == $r['id'])
-						{
-							if ($data['is_group'] == 1)
-							{
-								$mod_string .= "<tr>
-											 <td width='60%'>Group: {$data['group_name']}</td>
-											 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=remove&mid={$data['mid']}'>Remove</a></td>
-											 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=edit&mid={$data['mid']}'>Edit</a></td>
-											</tr>";
-							}
-							else
-							{
-								$mod_string .= "<tr>
-												 <td width='60%'>{$data['member_name']}</td>
-												 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=remove&mid={$data['mid']}'>Remove</a></td>
-												 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=edit&mid={$data['mid']}'>Edit</a></td>
-												</tr>";
-							}
-						}
-					}
-					
-					if ($mod_string != "")
-					{
-						$these_mods = "<table cellpadding='3' cellspacing='0' width='100%' align='center'>".$mod_string."</table>";
-					}
-					else
-					{
-						$these_mods = "<center><i>Unmoderated</i></center>";
-					}
-				
-					if ($r['subwrap'] == 1 and $r['sub_can_post'] != 1)
-					{
-					
-						$ADMIN->html .= $SKIN->add_td_row( array(
-																   '&nbsp;',
-																    " - <b>".$r['name']."</b>",
-																   '&nbsp;',
-														 ), 'subforum'     );
-					}
-					else
-					{
-						$css = $r['subwrap'] == 1 ? 'subforum' : '';
-						
-						$ADMIN->html .= $SKIN->add_td_row( array(
-															   "<center><input type='checkbox' name='add_{$r['id']}' value='1'></center>",
-															   "<b>".$r['name']."</b>",
-															   $these_mods
-													 ) , $css     );
-					}
-													 
-					if ( ( isset($children[ $r['id'] ]) ) and ( count ($children[ $r['id'] ]) > 0 ) )
-					{
-						foreach($children[ $r['id'] ] as $idx => $rd)
-						{
-						
-							$mod_string = "";
-					
-							foreach( $mods as $phpid => $data )
-							{
-								if ($data['forum_id'] == $rd['id'])
-								{
-									if ($data['is_group'] == 1)
-									{
-										$mod_string .= "<tr>
-													 <td width='60%'>Group: {$data['group_name']}</td>
-													 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=remove&mid={$data['mid']}'>Remove</a></td>
-													 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=edit&mid={$data['mid']}'>Edit</a></td>
-													</tr>";
-									}
-									else
-									{
-										$mod_string .= "<tr>
-														 <td width='60%'>{$data['member_name']}</td>
-														 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=remove&mid={$data['mid']}'>Remove</a></td>
-														 <td width='20%'><a href='{$ADMIN->base_url}&act=mod&code=edit&mid={$data['mid']}'>Edit</a></td>
-														</tr>";
-									}
-								}
-							}
-							
-							if ($mod_string != "")
-							{
-								$these_mods = "<table cellpadding='3' cellspacing='0' width='100%' align='center'>".$mod_string."</table>";
-							}
-							else
-							{
-								$these_mods = "<center><i>Unmoderated</i></center>";
-							}
-					
-							$ADMIN->html .= $SKIN->add_td_row( array(
-															   "<center><input type='checkbox' name='add_{$rd['id']}' value='1'></center>",
-															   " +-- <b>".$rd['name']."</b>",
-															   $these_mods
-													 )  ,'subforum'    );
-						}
-					}					 
-				}
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic( "<b>Type of moderator to add:</b> &nbsp;" . $SKIN->form_dropdown( "mod_type",
-																				  array(
-																						 0 => array( 'member', 'Single Member' ),
-																						 1 => array( 'group', 'Member Group'   )
-																					   )
-																				  ) , "center" );
-		
-		$ADMIN->html .= $SKIN->end_form("Add a moderator to the selected forums");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	
-
-
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_modlogs.php b/upload/sources/Admin/ad_modlogs.php
deleted file mode 100644
index c2be1f78..00000000
--- a/upload/sources/Admin/ad_modlogs.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Import functions
-|   > Module written by Matt Mecham
-|   > Date started: 22nd April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_modlogs();
-
-
-class ad_modlogs {
-
-	var $base_url;
-
-	function ad_modlogs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-		
-			case 'view':
-				$this->view();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function view()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$start = $IN['st'] ? $IN['st'] : 0;
-		
-		$ADMIN->page_detail = "Viewing all actions by a moderator";
-		$ADMIN->page_title  = "Moderator Logs Manager";
-	
-		if ($IN['search_string'] == "")
-		{
-			$DB->query("SELECT COUNT(id) as count FROM ibf_moderator_logs WHERE member_id='".$IN['mid']."'");
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=modlog&mid={$IN['mid']}&code=view";
-			
-			$DB->query("SELECT m.*, f.id as forum_id, f.name FROM ibf_moderator_logs m
-					     LEFT JOIN ibf_forums f ON(f.id=m.forum_id)
-					    WHERE m.member_id='".$IN['mid']."' ORDER BY m.ctime DESC LIMIT $start, 20");
-			
-		}
-		else
-		{
-			$IN['search_string'] = urldecode($IN['search_string']);
-			
-			if ( ($IN['search_type'] == 'topic_id') or ($IN['search_type'] == 'forum_id') )
-			{
-				$dbq = "m.".$IN['search_type']."='".$IN['search_string']."'";
-			}
-			else
-			{
-				$dbq = "m.".$IN['search_type']." LIKE '%".$IN['search_string']."%'";
-			}
-		
-			$DB->query("SELECT COUNT(m.id) as count FROM ibf_moderator_logs m WHERE $dbq");
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=modlog&code=view&search_type={$IN['search_type']}&search_string=".urlencode($IN['search_string']);
-			
-			$DB->query("SELECT m.*, f.id as forum_id, f.name FROM ibf_moderator_logs m
-					    LEFT JOIN ibf_forums f ON(f.id=m.forum_id)
-					    WHERE $dbq ORDER BY m.ctime DESC LIMIT $start, 20");
-		
-		}
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
-											   'PER_PAGE'    => 20,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Pages: ",
-											   'BASE_URL'    => $ADMIN->base_url.$query,
-											 )
-									  );
-									  
-		$ADMIN->page_detail = "You may view and remove actions performed by your moderators";
-		$ADMIN->page_title  = "Moderator Logs Manager";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Member Name"            , "15%" );
-		$SKIN->td_header[] = array( "Action Perfomed"        , "15%" );
-		$SKIN->td_header[] = array( "Forum"                  , "15%" );
-		$SKIN->td_header[] = array( "Topic Title"            , "25%" );
-		$SKIN->td_header[] = array( "Time of action"         , "20%" );
-		$SKIN->td_header[] = array( "IP address"             , "10%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Moderator Logs" );
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'center', 'catrow');
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['ctime'] = $ADMIN->get_date( $row['ctime'], 'LONG' );
-				
-				if ( $row['topic_id'] )
-				{
-					$topicid = "<br />Topic ID: ".$row['topic_id'];
-				}
-				
-				$sess_id             = preg_replace( "/^.+?s=(\w{32}).+?$/" , "\\1", $row['http_referer'] );
-				$row['http_referer'] = preg_replace( "/s=(\w){32}/" , ""  , $row['http_referer'] );
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$row['member_name']}</b>",
-														  "<span style='font-weight:bold;color:red'>{$row['action']}</span>",
-														  "<b>{$row['name']}</b>",
-														  "{$row['topic_title']}".$topicid,
-														  "{$row['ctime']}",
-														  "{$row['ip_address']}",
-												 )      );
-			
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'center', 'tdtop');
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You did not select a member ID to remove by!");
-		}
-		
-		$DB->query("DELETE FROM ibf_moderator_logs WHERE member_id='".$IN['mid']."'");
-		
-		$ADMIN->save_log("Removed Moderator Logs");
-		
-		$std->boink_it($ADMIN->base_url."&act=modlog");
-		exit();
-	
-	
-	}
-	
-	
-
-	
-	
-	//-------------------------------------------------------------
-	// SHOW ALL LANGUAGE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You may view and remove actions performed by your moderators";
-		$ADMIN->page_title  = "Moderator Logs Manager";
-
-		
-		//+-------------------------------
-		// VIEW LAST 5
-		//+-------------------------------
-		
-		$DB->query("SELECT m.*, f.id as forum_id, f.name FROM ibf_moderator_logs m
-		            LEFT JOIN ibf_forums f ON (f.id=m.forum_id)
-		            ORDER BY m.ctime DESC LIMIT 0, 5");
-		
-		$SKIN->td_header[] = array( "Member Name"            , "15%" );
-		$SKIN->td_header[] = array( "Action Perfomed"        , "15%" );
-		$SKIN->td_header[] = array( "Forum"                  , "15%" );
-		$SKIN->td_header[] = array( "Topic Title"            , "25%" );
-		$SKIN->td_header[] = array( "Time of action"         , "20%" );
-		$SKIN->td_header[] = array( "IP address"             , "10%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Last 5 Moderation Actions" );
-
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['ctime'] = $ADMIN->get_date( $row['ctime'], 'LONG' );
-				
-				$topicid = "";
-				
-				if ( $row['topic_id'] )
-				{
-					$topicid = "<br />Topic ID: ".$row['topic_id'];
-				}
-				
-				$sess_id             = preg_replace( "/^.+?s=(\w{32}).+?$/" , "\\1", $row['http_referer'] );
-				$row['http_referer'] = preg_replace( "/s=(\w){32}/" , ""  , $row['http_referer'] );
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$row['member_name']}</b>",
-														  "<span style='font-weight:bold;color:red'>{$row['action']}</span>",
-														  "<b>{$row['name']}</b>",
-														  "{$row['topic_title']}".$topicid,
-														  "{$row['ctime']}",
-														  "{$row['ip_address']}",
-												 )      );
-			
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Member Name"            , "30%" );
-		$SKIN->td_header[] = array( "Actions Perfomed"       , "20%" );
-		$SKIN->td_header[] = array( "View all by member"     , "20%" );
-		$SKIN->td_header[] = array( "Remove all by member"   , "30%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Moderator Logs" );
-		
-		$DB->query("SELECT m.*, count(m.id) as act_count from ibf_moderator_logs m GROUP BY m.member_id ORDER BY act_count DESC");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$r['member_name']}</b>",
-													  "<center>{$r['act_count']}</center>",
-													  "<center><a href='".$SKIN->base_url."&act=modlog&code=view&mid={$r['member_id']}'>View</a></center>",
-													  "<center><a href='".$SKIN->base_url."&act=modlog&code=remove&mid={$r['member_id']}'>Remove</a></center>",
-											 )      );
-		}
-			
-		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'view'     ),
-												  2 => array( 'act'   , 'modlog'       ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Search Moderator Logs" );
-		
-		$form_array = array(
-							  0 => array( 'topic_title', 'Topic Title' ),
-							  1 => array( 'ip_address',  'IP Address'  ),
-							  2 => array( 'member_name', 'Member Name' ),
-							  3 => array( 'topic_id'   , 'Topic ID'    ),
-							  4 => array( 'forum_id'   , 'Forum ID'    )
-						   );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search for...</b>" ,
-										  		  $SKIN->form_input( "search_string")
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search in...</b>" ,
-										  		  $SKIN->form_dropdown( "search_type", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Search");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_multi_moderate.php b/upload/sources/Admin/ad_multi_moderate.php
deleted file mode 100644
index a1e6b811..00000000
--- a/upload/sources/Admin/ad_multi_moderate.php
+++ /dev/null
@@ -1,684 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Topic Multi-Moderation
-|   > Module written by Matt Mecham
-|   > Date started: 14th May 2003
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_multimod();
-
-
-class ad_multimod
-{
-
-	var $base_url;
-
-	function ad_multimod()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		$ADMIN->nav[] = array( 'act=multimod', 'Topic multi-moderation home' );
-		
-		switch($IN['code'])
-		{
-		
-			case 'list':
-				$this->list_current();
-				break;
-				
-			case 'new':
-				$this->do_form('new');
-				break;
-				
-			case 'edit':
-				$this->do_form('edit');
-				break;
-				
-			case 'donew':
-				$this->do_save('new');
-				break;
-				
-			case 'doedit':
-				$this->do_save('edit');
-				break;
-				
-			case 'delete':
-				$this->do_delete();
-				break;
-				
-			//-------------------------
-			
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//-------------------------------------------------------------
-	// DELETE!
-	//-------------------------------------------------------------
-	
-	function do_delete()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the MMOD ID, please try again");
-		}
-		
-		$DB->query("DELETE FROM ibf_topic_mmod WHERE mm_id='".$IN['id']."'");
-		
-		$mm_id = intval($IN['id']);
-		
-		//------------------------------------
-		// Remove the MMOD from relevant forums
-		//------------------------------------
-		
-		$final   = array();
-		
-		$DB->query("SELECT id,name,topic_mm_id FROM ibf_forums WHERE topic_mm_id LIKE '%,$mm_id,%'");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			$final[ $r['id'] ] = str_replace( ",$mm_id,", ",", $r['topic_mm_id'] );
-		}
-		
-		// now lets update the affected forum_id's.
-		
-		if ( count( $final ) > 0 )
-		{
-			foreach( $final as $fid => $raw_mm_id )
-			{
-				$new_mm_id = "," . $std->clean_perm_string($raw_mm_id) . ",";
-				
-				if ( $new_mm_id == ',,' )
-				{
-					$new_mm_id = '';
-				}
-				
-				$DB->query("UPDATE ibf_forums SET topic_mm_id='{$new_mm_id}' WHERE id=$fid");
-			}
-		}
-		
-		$ADMIN->save_log("Topic Multi-Mod removed");
-		
-		$std->boink_it($SKIN->base_url."&act=multimod");
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SAVE!
-	//-------------------------------------------------------------
-	
-	function do_save($type='new')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$forums = array();
-		
-		$IN['id'] = intval($IN['id']);
-		
-		if ( $type == 'edit' )
-		{
-			if ( $IN['id'] < 1 )
-			{
-				$ADMIN->error("You must use a valid id");
-			}
-		}
-		
-		if ( $IN['mm_title'] == "" )
-		{
-			$ADMIN->error("You must enter a valid title");
-		}
-		
-		//----------------------------------------
-		// Check for forums...
-		//----------------------------------------
-		
-		$forums = $this->get_activein_forums();
-		
-		if ( count($forums) < 1 )
-		{
-			$ADMIN->error("You must select some forums to activate with this multi-moderation suite");
-		}
-		
-		if ( $IN['topic_move'] == 'n' )
-		{
-			$ADMIN->error("Incorrect forum chosen in the 'move to' section of the topic multi-moderation. Please note that you cannot choose to move the topic to a category");
-		}
-			
-		$save = array(
-						'mm_title'              => $IN['mm_title'],
-						'mm_enabled'            => 1,
-						'topic_state'           => $IN['topic_state'],
-						'topic_pin'	            => $IN['topic_pin'],
-						'topic_move'            => $IN['topic_move'],
-						'topic_move_link'       => $IN['topic_move_link'],
-						'topic_title_st'        => $ADMIN->make_safe($HTTP_POST_VARS['topic_title_st']),
-						'topic_title_end'       => $ADMIN->make_safe($HTTP_POST_VARS['topic_title_end']),
-						'topic_reply'           => $IN['topic_reply'],
-						'topic_reply_content'   => $ADMIN->make_safe($HTTP_POST_VARS['topic_reply_content']),
-						'topic_reply_postcount' => $IN['topic_reply_postcount'],
-					 );
-					 
-		if ( $type == 'edit' )
-		{
-			$str = $DB->compile_db_update_string( $save );
-			
-			$mm_id = $IN['id'];
-			
-			$DB->query("UPDATE ibf_topic_mmod SET $str WHERE mm_id=$mm_id");
-			
-		}
-		else
-		{
-			$str = $DB->compile_db_insert_string( $save );
-			
-			$DB->query("INSERT INTO ibf_topic_mmod ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-			
-			$mm_id = $DB->get_insert_id();
-		}
-		
-		//------------------------------------
-		// Sort out the forum id things
-		//------------------------------------
-		
-		$final   = array();
-		$fstring = ','.implode( ",", $forums ).',';
-		
-		$DB->query("SELECT id,name,topic_mm_id FROM ibf_forums");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			if ( $r['topic_mm_id'] == "" )
-			{
-				// Is this forum_id one of the forums to activate?
-				
-				if ( stristr( $fstring, ','.$r['id'].',' ) )
-				{
-					$final[ $r['id'] ] = $mm_id;
-				}
-				else
-				{
-					continue;
-				}
-			}
-			
-			// Is this mm_id already active?
-			
-			else if ( stristr( $r['topic_mm_id'], ','.$mm_id.',' ) )
-			{
-				// Should it still be?
-				
-				if ( ! stristr( $fstring, ','.$r['id'].',' ) )
-				{
-					// No? Remove it at once!
-					
-					$final[ $r['id'] ] = str_replace( ",$mm_id,", ",", $r['topic_mm_id'] );
-				}
-					// No else, there's no need to update this forum_id's mm_id's
-			}
-			else if ( stristr( $fstring, ','.$r['id'].',' ) )
-			{
-				// forums' topic_mm_id is not blank and mm_id is not in that topic_mm_id, so...
-				
-				$final[ $r['id'] ] = $r['topic_mm_id'] . ','.$mm_id.',';
-			}
-		}
-		
-		// Phew - ok, now lets update the affected forum_id's.
-		
-		if ( count( $final ) > 0 )
-		{
-			foreach( $final as $fid => $raw_mm_id )
-			{
-				$new_mm_id = "," . $std->clean_perm_string($raw_mm_id) . ",";
-				
-				$DB->query("UPDATE ibf_forums SET topic_mm_id='{$new_mm_id}' WHERE id=$fid");
-			}
-		}
-		
-		$ADMIN->save_log("Update topic multi-moderation entries ($type)");
-		
-		$std->boink_it($ADMIN->base_url."&act=multimod");
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW MM FORM
-	//-------------------------------------------------------------
-	
-	function do_form($type='new')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "Multi moderation allows you to combine moderation actions to create easy to use shortcuts to several moderation options.";
-		$ADMIN->page_title  = "Topic Multi-Moderation";
-		
-		$form_code   = 'donew';
-		$description = 'Add a new topic multi-moderation';
-		$button      = "Add New Multi-Moderation";
-		if ( $type == 'edit' )
-		{
-			$id = intval($IN['id']);
-			
-			$DB->query("SELECT * FROM ibf_topic_mmod WHERE mm_id=$id");
-			
-			if ( ! $topic_mm = $DB->fetch_row() )
-			{
-				$ADMIN->error("Could not retrieve the information ($id)");
-			}
-			
-			$form_code   = 'doedit';
-			$description = 'Edit the topic multi-moderation';
-			$button      = "Edit Multi-Moderation";
-		}
-		
-		//---------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $form_code ),
-												  2 => array( 'act'   , 'multimod' ),
-												  3 => array( 'id'    , $id        ),
-									     )      );
-		
-		//---------------------------------------------------------
-		
-		$state_dd = array(
-						  0 => array( 'leave', 'Leave' ),
-						  1 => array( 'close', 'Close' ),
-						  2 => array( 'open' , 'Open'  ),
-					   );
-					  
-		$pin_dd   = array(
-						  0 => array( 'leave', 'Leave' ),
-						  1 => array( 'pin'  , 'Pin'   ),
-						  2 => array( 'unpin', 'Unpin' ),
-					    );
-					  
-		//---------------------------------------------------------
-		
-		$db_cats     = array();
-		$db_children = array();
-		$db_forums   = array();
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT f.id as forum_id, f.name as forum_name, f.position, f.read_perms, f.parent_id, f.subwrap, f.sub_can_post, f.redirect_on, f.topic_mm_id, c.id as cat_id, c.name as cat_name from ibf_forums f, ibf_categories c where c.id=f.category ORDER BY c.position, f.position");
-		
-		$forums     = "<select name='forums[]' class='textinput' size='15' multiple='multiple'>\n";
-		
-		$forum_jump = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($last_cat_id != $r['cat_id'])
-        	{
-        		$db_cats[ $r['cat_id'] ] = array( 'id'   => $r['cat_id'],
-        										  'name' => $r['cat_name'],
-        										);
-        										   
-        		$last_cat_id = $r['cat_id'];
-        	}
-        	
-        	if ($r['parent_id'] > 0)
-			{
-				$db_children[ $r['parent_id'] ][$r['forum_id']] = $r;
-			}
-			else
-			{
-				$db_forums[ $r['forum_id'] ] = $r;
-			}
-			
-		}
-				
-		
-		$last_cat_id = -1;
-			
-		foreach ( $db_forums as $an_eye_for_an => $i )
-		{
-			
-			if ( stristr( $i['topic_mm_id'], ",".$id."," ) )
-			{
-				$selected = ' selected="selected"';
-			}
-			else
-			{
-				$selected = "";
-			}
-			
-			if ( $i['redirect_on'] == 1 )
-			{
-				continue;
-			}
-			
-			if ($last_cat_id != $i['cat_id'])
-        	{
-        		$forums     .= "<option value=\"c_{$i['cat_id']}\" style='font-weight:bold'>{$db_cats[ $i['cat_id'] ]['name']}</option>\n";
-        		$forum_jump[] = array( 'n', $db_cats[ $i['cat_id'] ]['name'] );
-        		$last_cat_id = $i['cat_id'];
-        	}
-			
-			$forums      .= "<option value=\"{$i['forum_id']}\" $selected>&middot;&middot;&nbsp;{$i['forum_name']}</option>\n";
-			$forum_jump[] = array( $i['forum_id'], "&middot;&middot;&nbsp;{$i['forum_name']}" );
-			
-			// Add in sub cat children
-			
-			if ( ($i['subwrap'] == 1) and (count($db_children[ $i['forum_id'] ]) > 0) )
-			{
-				
-				foreach( $db_children[ $i['forum_id'] ] as $idx => $cdata )
-				{
-					if ( $cdata['redirect_on'] == 1 OR ( $cdata['subwrap'] and ( ! $cdata['sub_can_post'] ) ) )
-					{
-						continue;
-					}
-					
-					if ( stristr( $cdata['topic_mm_id'], ",".$id."," ) )
-					{
-						$selected = ' selected="selected"';
-					}
-					else
-					{
-						$selected = "";
-					}
-					
-					$forums      .= "<option value=\"{$cdata['forum_id']}\" $selected>&middot;&middot;&middot;&middot;&nbsp;{$cdata['forum_name']}</option>\n";
-					
-					$forum_jump[] = array( $cdata['forum_id'], "&middot;&middot;&middot;&middot;&nbsp;{$cdata['forum_name']}" );
-				}
-			}
-		}
-		
-		$forums .= "</select>";
-		
-		//---------------------------------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-
-		$ADMIN->html .= $SKIN->start_table( "Topic Multi-Moderation", $description );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Title for this Multi-Moderation Suite?</b>" ,
-												  $SKIN->form_input("mm_title", $topic_mm['mm_title'] )
-									     )      );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Active in Forums...</b><br>You may choose more than one" ,
-												  $forums
-									     )      );							     
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Moderation Options', 'left', 'pformstrip' );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Add to <i>START</i> of topic title?</b>" ,
-												  $SKIN->form_input("topic_title_st", $topic_mm['topic_title_st'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Add to <i>END</i> of topic title?</b>" ,
-												  $SKIN->form_input("topic_title_end", $topic_mm['topic_title_end'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Alter topic state?</b>" ,
-												  $SKIN->form_dropdown("topic_state", $state_dd, $topic_mm['topic_state'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Alter pinned state?</b>" ,
-												  $SKIN->form_dropdown("topic_pin", $pin_dd, $topic_mm['topic_pin'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Move topic?</b>" ,
-					    						  $SKIN->form_dropdown("topic_move", array_merge( array( 0 => array('-1', 'Don\'t Move' ) ), $forum_jump ), $topic_mm['topic_move'] )
-					    						  ."<br />".$SKIN->form_checkbox('topic_move_link', $topic_mm['topic_move_link'] )."<strong>Leave a link to the source topic?</strong>"
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Post Options', 'left', 'pformstrip' );
-	
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Add a reply to the topic?</b><br>HTML enabled" ,
-												  "Enable this reply? &nbsp;".$SKIN->form_yes_no('topic_reply', $topic_mm['topic_reply'] )
-												  ."<br />"
-												  . $SKIN->form_textarea("topic_reply_content", $topic_mm['topic_reply_content'] )
-												  ."<br />".$SKIN->form_checkbox('topic_reply_postcount', $topic_mm['topic_reply_postcount'] )."<strong>Increment poster's post count?</strong>"
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form($button);
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	//-------------------------------------------------------------
-	// SHOW ALL AVAILABLE MM's
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "Multi moderation allows you to combine moderation actions to create easy to use shortcuts to several moderation options.";
-		$ADMIN->page_title  = "Topic Multi-Moderation";
-		
-		
-		$SKIN->td_header[] = array( "Title"  , "50%" );
-		$SKIN->td_header[] = array( "Edit"   , "25%" );
-		$SKIN->td_header[] = array( "Remove" , "25%" );
-
-		$ADMIN->html .= $SKIN->start_table( "Current Topic Multi-Moderation" );
-		
-		$DB->query("SELECT * FROM ibf_topic_mmod ORDER BY mm_title");
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$ADMIN->html .= $SKIN->add_td_row( array( 
-														  "<strong>{$row['mm_title']}</strong>",
-														  "<center><a href='{$ADMIN->base_url}&amp;act=multimod&amp;code=edit&amp;id={$row['mm_id']}'>Edit</a></center>",
-														  "<center><a href='{$ADMIN->base_url}&amp;act=multimod&amp;code=delete&amp;id={$row['mm_id']}'>Remove</a></center>",
-												 )      );
-			
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>None set up</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic("<a href='{$ADMIN->base_url}&amp;act=multimod&amp;code=new' class='fauxbutton'>Add New</a>", 'center', 'pformstrip');
-		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	//------------------------------------------------------
-    // Get the active in forums
-    //------------------------------------------------------    
-        
-    function get_activein_forums()
-    {
-    	global $IN, $INFO, $DB, $std, $HTTP_POST_VARS;
-    	
-    	$forum_array  = array();
-    	$forum_string = "";
-    	$sql_query    = "";
-    	$check_sub    = 0;
-    	
-    	$cats         = array();
-    	$forums       = array();
-    	
-    	// If we have an array of "forums", loop
-    	// through and build our *SQL IN( ) statement.
-    	
-    	//------------------------------------------------
-    	// Check for an array
-    	//------------------------------------------------
-    	
-    	if ( is_array( $HTTP_POST_VARS['forums'] )  )
-    	{
-    	
-			 //--------------------------------------------
-			 // Go loopy loo
-			 //--------------------------------------------
-			 
-			 foreach( $HTTP_POST_VARS['forums'] as $l )
-			 {
-				 if ( preg_match( "/^c_/", $l ) )
-				 {
-					 $cats[] = intval( str_replace( "c_", "", $l ) );
-				 }
-				 else
-				 {
-					 $forums[] = intval($l);
-				 }
-			 }
-			 
-			 //--------------------------------------------
-			 // Do we have cats? Give 'em to Charles!
-			 //--------------------------------------------
-			 
-			 if ( count( $cats ) )
-			 {
-				 $sql_query = "SELECT id, read_perms, password, subwrap from ibf_forums WHERE category IN(".implode(",",$cats).")";
-				 $boolean   = "OR";
-			 }
-			 else
-			 {
-				 $sql_query = "SELECT id, read_perms, password, subwrap from ibf_forums";
-				 $boolean   = "WHERE";
-			 }
-			 
-			 if ( count( $forums ) )
-			 {
-				  $sql_query .= " $boolean (id IN(".implode(",",$forums).") or parent_id IN(".implode(",",$forums).") )";
-			 }
-			 
-			 if ( $sql_query == "" )
-			 {
-				 // Return empty..
-				 
-				 return;
-			 }
-  
-    		
-    		//--------------------------------------------
-    		// Run query and finish up..
-    		//--------------------------------------------
-			
-			$DB->query( $sql_query );
-				
-			while ($i = $DB->fetch_row())
-			{
-				$forum_array[] = $i['id'];
-			}
-		}
-		else
-		{
-			//--------------------------------------------
-			// Not an array...
-			//--------------------------------------------
-			
-			if ( $IN['forums'] != "" )
-			{
-				$l = $IN['forums'];
-				
-				//--------------------------------------------
-				// Single  Cat
-				//--------------------------------------------
-				
-				if ( preg_match( "/^c_/", $l ) )
-				{
-					$c = intval( str_replace( "c_", "", $l ) );
-					
-					if ($c)
-					{
-						$DB->query("SELECT id, read_perms, password FROM ibf_forums WHERE category=$c");
-						
-						while ($i = $DB->fetch_row())
-						{
-							$forum_array[] = $i['id'];
-						}
-					}
-				}
-				else
-				{
-					//--------------------------------------------
-					// Single forum
-					//--------------------------------------------
-				
-					$f = intval($l);
-					
-					if ($f)
-					{
-						$qe = " OR parent_id=$f ";
-						
-						$DB->query("SELECT id, read_perms, password FROM ibf_forums WHERE id=$f".$qe);
-						
-						while ($i = $DB->fetch_row())
-						{
-							$forum_array[] = $i['id'];
-						}
-					}
-				}
-			}
-		}
-    					
-    	return $forum_array;
-    	
-    }
-	
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_plugins.php b/upload/sources/Admin/ad_plugins.php
deleted file mode 100644
index 36c62321..00000000
--- a/upload/sources/Admin/ad_plugins.php
+++ /dev/null
@@ -1,1064 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Framework for IPS Services
-|   > Module written by Matt Mecham
-|   > Date started: 17 February 2003
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_plugins();
-
-
-class ad_plugins {
-
-	var $base_url;
-
-	function ad_plugins() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-		
-		// Make sure we're a root admin, or else!
-		
-		if ($MEMBER['mgroup'] != $INFO['admin_group'])
-		{
-			$ADMIN->error("Sorry, these functions are for the root admin group only");
-		}
-
-		switch($IN['code'])
-		{
-			
-			case 'ipchat':
-				$this->chat_splash();
-				break;
-			case 'chatframe':
-				$this->chat_frame();
-				break;
-			case 'chatsave':
-				$this->chat_save();
-				break;
-			case 'dochat':
-				$this->chat_config_save();
-				break;
-			case 'dorefreshchat':
-				$this->chat_refresh_online();
-				break;
-				
-			//----------------------------
-			
-			case 'reg':
-				$this->reg_splash();
-				break;	
-			case 'regframe':
-				$this->reg_frame();
-				break;
-			case 'regsave':
-				$this->reg_save();
-				break;
-			case 'doreg':
-				$this->reg_config_save();
-				break;
-			
-			//----------------------------
-			
-			case 'copy':
-				$this->copy_splash();
-				break;	
-			case 'copyframe':
-				$this->copy_frame();
-				break;
-			case 'copysave':
-				$this->copy_save();
-				break;
-			case 'docopy':
-				$this->copy_config_save();
-				break;
-				
-			default:
-				exit();
-				break;
-		}
-		
-	}
-	
-	
-	//-------------------------------------------------------------
-	// Copyright removal Splash
-	//--------------------------------------------------------------
-	
-	function copy_splash()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Do we have an order number
-		//---------------------------------------
-		
-		if ( $INFO['ipb_copy_number'] )
-		{
-			$this->copy_config();
-		}
-		else
-		{
-			$frames = "<html>
-		   			 <head><title>Invision Power Board: Registration Set up</title></head>
-					   <frameset rows='*,50' frameborder='yes' border='1' framespacing='0'>
-					   	<frame name='chat_top'   scrolling='auto' src='http://customer.invisionpower.com/ipb/copy/redirect_acp.php'>
-					   	<frame name='chat_bottom'  scrolling='auto' src='{$SKIN->base_url}&act=pin&code=copyframe'>
-					   </frameset>
-				   </html>";
-				   
-			print $frames;
-			exit();
-		}
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function copy_frame()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$css  = $SKIN->get_css();
-		
-		$html = "<html>
-				  <head>
-				   <title>Invision Power Board Order Box</title>
-				   $css
-				  </head>
-				  <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#4C77B6'>
-				  <table cellpadding=4 cellspacing=0 border=0 align='center'>
-				  <form action='{$SKIN->base_url}&act=pin&code=copysave' method='POST' target='body'>
-				  <tr>
-				   <td valign='middle' align='left'><b style='color:white'>Already paid for copyright removal?</b></td>
-				   <td valign='middle' align='left'><input type='text' size=50 name='ipb_copy_number' value='enter your IPB copyright removal key here...' onClick=\"this.value='';\"></td>
-				   <td valign='middle' align='left'><input type='submit' value='Continue...'></td>
-				  </tr>
-				  </table>
-				  </form>
-				  </body>
-				 </html>";
-				 
-		echo $html;
-		
-		exit();
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function copy_save()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$acc_number = trim($IN['ipb_copy_number']);
-		
-		if ( stristr( $acc_number, ',pass=' ) )
-		{
-			list( $acc_number, $pass ) = explode( ',pass=', $acc_number );
-			
-			if ( md5(strtolower($pass)) == 'b1c4780a00e7d010b0eca0b695398c02' )
-			{
-				$ADMIN->rebuild_config( array(
-										   'ipb_copy_number' => $acc_number,
-										   'ips_cp_purchase' => 1,
-								      )      );
-								  
-				$this->copy_config('new');
-				
-				exit();
-			}
-			else
-			{
-				$ADMIN->error("The override password was incorrect. Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.");
-			}
-		}
-		
-		if ( $acc_number == "" )
-		{
-			$ADMIN->error("Sorry, that is not a valid IPB Copyright key, please hit 'back' in your browser and try again.");
-		}
-		
-		$response = trim( @implode ('', @file( "http://customer.invisionpower.com/ipb/copy/?k=".urlencode($acc_number) ) ) );
-		
-		if ( $response == "" )
-		{
-			$ADMIN->error("There was no response back from the Invision Power Services registration server, this might be because of the following:
-			               <ul>
-			               <li>Your PHP version does not allow remote connections</li>
-			               <li>The Invision Power Services registration server is offline</li>
-			               <li>You are running this IPB on a server without an internet connection</li>
-			               </ul>
-			               <br />
-			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
-			             ");
-		}
-		else if ( $response == '0' )
-		{
-			$ADMIN->error("The registration key you entered is not valid, this might be because of the following:
-			               <ul>
-			               <li>You incorrectly entered the registration key</li>
-			               <li>You mistakenly used your customer center password instead of the registration key</li>
-			               <li>Your registration licence is no longer valid</li>
-			               </ul>
-			               <br />
-			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
-			             ");
-		}
-		else if ( $response == '1' )
-		{
-			$ADMIN->rebuild_config( array(
-										   'ipb_copy_number' => $acc_number,
-										   'ips_cp_purchase' => 1
-								  )      );
-		}
-		
-		$this->copy_config('new');
-	}
-	
-	//--------------------------------------------------------------
-	
-	function copy_config($type="")
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "&nbsp;";
-		$ADMIN->page_title  = "IPB Copyright Confirmation";
-		
-		if ( $type == "new" )
-		{
-			$ADMIN->page_detail .= "<br /><br /><b style='color:red'>Thank you for registering your copyrigt removal!</b>";
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"    , "100%" );
-		
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Configuration" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "The copyright should now be removed from the bottom of the IPB pages.<br /><br />If this is not the case, please contact our after sales staff immediately."
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-
-	}
-	
-	//---------------------------------------------------------------
-	
-	function copy_config_save()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$new = array(  
-						'ipb_reg_show' => $IN['ipb_reg_show'],
-						'ipb_reg_name' => $IN['ipb_reg_name'],
-					);
-					
-		
-		$ADMIN->rebuild_config( $new );
-		
-		$ADMIN->done_screen("IPB Registration Configuration Updated", "IPB Registration Configuration Updated", "act=pin&code=reg" );
-	}
-	
-	
-	
-	
-	//-------------------------------------------------------------
-	// Registration Splash
-	//--------------------------------------------------------------
-	
-	function reg_splash()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Do we have an order number
-		//---------------------------------------
-		
-		if ( $INFO['ipb_reg_number'] )
-		{
-			$this->reg_config();
-		}
-		else
-		{
-			$frames = "<html>
-		   			 <head><title>Invision Power Board: Registration Set up</title></head>
-					   <frameset rows='*,50' frameborder='yes' border='1' framespacing='0'>
-					   	<frame name='chat_top'   scrolling='auto' src='http://www.invisionboard.com/?whyregister++acp'>
-					   	<frame name='chat_bottom'  scrolling='auto' src='{$SKIN->base_url}&act=pin&code=regframe'>
-					   </frameset>
-				   </html>";
-				   
-			print $frames;
-			exit();
-		}
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function reg_frame()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$css  = $SKIN->get_css();
-		
-		$html = "<html>
-				  <head>
-				   <title>Invision Power Board Order Box</title>
-				   $css
-				  </head>
-				  <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#4C77B6'>
-				  <table cellpadding=4 cellspacing=0 border=0 align='center'>
-				  <form action='{$SKIN->base_url}&act=pin&code=regsave' method='POST' target='body'>
-				  <tr>
-				   <td valign='middle' align='left'><b style='color:white'>Already Registered?</b></td>
-				   <td valign='middle' align='left'><input type='text' size=50 name='ipb_reg_number' value='enter your IPB registration key here...' onClick=\"this.value='';\"></td>
-				   <td valign='middle' align='left'><input type='submit' value='Continue...'></td>
-				  </tr>
-				  </table>
-				  </form>
-				  </body>
-				 </html>";
-				 
-		echo $html;
-		
-		exit();
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function reg_save()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$acc_number = trim($IN['ipb_reg_number']);
-		
-		if ( stristr( $acc_number, ',pass=' ) )
-		{
-			list( $acc_number, $pass ) = explode( ',pass=', $acc_number );
-			
-			if ( md5(strtolower($pass)) == 'b1c4780a00e7d010b0eca0b695398c02' )
-			{
-				$ADMIN->rebuild_config( array( 'ipb_reg_number' => $acc_number ) );
-				$this->reg_config('new');
-				
-				exit();
-			}
-			else
-			{
-				$ADMIN->error("The override password was incorrect. Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.");
-			}
-		}
-		
-		if ( $acc_number == "" )
-		{
-			$ADMIN->error("Sorry, that is not a valid IPB registration key, please hit 'back' in your browser and try again.");
-		}
-		
-		$response = trim( implode ('', file( "http://customer.invisionpower.com/ipb/reg/?k=".urlencode($acc_number) ) ) );
-		
-		if ( $response == "" )
-		{
-			$ADMIN->error("There was no response back from the Invision Power Services registration server, this might be because of the following:
-			               <ul>
-			               <li>Your PHP version does not allow remote connections</li>
-			               <li>The Invision Power Services registration server is offline</li>
-			               <li>You are running this IPB on a server without an internet connection</li>
-			               </ul>
-			               <br />
-			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
-			             ");
-		}
-		else if ( $response == '0' )
-		{
-			$ADMIN->error("The registration key you entered is not valid, this might be because of the following:
-			               <ul>
-			               <li>You incorrectly entered the registration key</li>
-			               <li>You mistakenly used your customer center password instead of the registration key</li>
-			               <li>Your registration licence is no longer valid</li>
-			               </ul>
-			               <br />
-			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
-			             ");
-		}
-		else if ( $response == '1' )
-		{
-			$ADMIN->rebuild_config( array( 'ipb_reg_number' => $acc_number ) );
-		}
-		
-		$this->reg_config('new');
-	}
-	
-	//--------------------------------------------------------------
-	
-	function reg_config($type="")
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may edit the configuration below to suit";
-		$ADMIN->page_title  = "IPB Registration Configuration";
-		
-		if ( $type == "new" )
-		{
-			$ADMIN->page_detail .= "<br /><br /><b style='color:red'>Thank you for registering!</b>";
-		}
-		
-		//+-------------------------------
-		// START THE FORM
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doreg' ),
-												  2 => array( 'act'   , 'pin'    ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"    , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"    , "40%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Configuration" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Display registered to line?</b>" ,
-										  $SKIN->form_yes_no( "ipb_reg_show", $INFO['ipb_reg_show']  )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show as registered to...</b><br>Examples: <em>Matthew Mecham</em>, <em>IPS, Inc.</em>" ,
-										  $SKIN->form_input( "ipb_reg_name", $INFO['ipb_reg_name'] )
-								 )      );
-										 									 
-		$ADMIN->html .= $SKIN->end_form('Save this configuration');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-
-	}
-	
-	//---------------------------------------------------------------
-	
-	function reg_config_save()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$new = array(  
-						'ipb_reg_show' => $IN['ipb_reg_show'],
-						'ipb_reg_name' => $IN['ipb_reg_name'],
-					);
-					
-		
-		$ADMIN->rebuild_config( $new );
-		
-		$ADMIN->done_screen("IPB Registration Configuration Updated", "IPB Registration Configuration Updated", "act=pin&code=reg" );
-	}
-	
-	//-------------------------------------------------------------
-	// FORCE REFRESH ONLINE LIST
-	//--------------------------------------------------------------
-	
-	function chat_refresh_online()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$time = time();
-		
-		$server_url = 'http://'.str_replace( 'http://', '', $INFO['chat_server_addr'] ).'/ipc_who.pl?id='.$INFO['chat_account_no'].'&pw='.$INFO['chat_pass_md5'];
-			
-		if ( $data = @file( $server_url ) )
-		{
-			if ( count($data) > 0 )
-			{
-				$hits_left = array_shift($data);
-			}
-			
-			$name_string = strtolower( implode( '","', str_replace( '"', '&quot;', str_replace( '_', ' ', $data ) ) ) );
-			
-			if ( count($data) > 0 )
-			{
-				$DB->query("SELECT m.id, m.name, g.g_id, g.prefix, g.suffix FROM ibf_members m
-							 LEFT JOIN ibf_groups g ON (m.mgroup=g.g_id)
-							WHERE lower(name) IN (\"".$name_string."\") ORDER BY m.name");
-				
-				while ( $m = $DB->fetch_row() )
-				{
-					$member_ids[] = "<a href=\"{$INFO['board_url']}/index.{$INFO['php_ext']}?showuser={$m['id']}\">{$m['prefix']}{$m['name']}{$m['suffix']}</a>";
-				}
-				
-				$final = implode( ",\n", $member_ids );
-				
-				$final = preg_replace( "/,\n?$/s", "", $final );
-				
-				$final .= '|&|'.count($member_ids);
-			}
-			
-			$DB->query("UPDATE ibf_cache_store SET cs_value='".addslashes($final)."', cs_extra='{$hits_left}&{$time}' WHERE cs_key='chatstat'");
-		}
-		
-		$this->chat_config();
-		
-	}
-	
-	//-------------------------------------------------------------
-	// CHAT SPLASH
-	//--------------------------------------------------------------
-	
-	function chat_splash()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Do we have an order number
-		//---------------------------------------
-		
-		if ( $INFO['chat_account_no'] )
-		{
-			$this->chat_config();
-		}
-		else
-		{
-			$frames = "<html>
-		   			 <head><title>Invision Power Board: Chat Set up</title></head>
-					   <frameset rows='*,50' frameborder='yes' border='1' framespacing='0'>
-					   	<frame name='chat_top'   scrolling='auto' src='http://www.invisionchat.com/?acp++acp'>
-					   	<frame name='chat_bottom'  scrolling='auto' src='{$SKIN->base_url}&act=pin&code=chatframe'>
-					   </frameset>
-				   </html>";
-				   
-			print $frames;
-			exit();
-		}
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function chat_frame()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$css  = $SKIN->get_css();
-		
-		$html = "<html>
-				  <head>
-				   <title>Invision Power Board Order Box</title>
-				   $css
-				  </head>
-				  <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#4C77B6'>
-				  <table cellpadding=4 cellspacing=0 border=0 align='center'>
-				  <form action='{$SKIN->base_url}&act=pin&code=chatsave' method='POST' target='body'>
-				  <tr>
-				   <td valign='middle' align='left'><b style='color:white'>Ordered IP Chat?</b></td>
-				   <td valign='middle' align='left'><input type='text' size=35 name='account_no' value='enter your account number here...' onClick=\"this.value='';\"></td>
-				   <td valign='middle' align='left'><input type='submit' value='Continue...'></td>
-				  </tr>
-				  </table>
-				  </form>
-				  </body>
-				 </html>";
-				 
-		echo $html;
-		
-		exit();
-		
-	}
-	
-	//---------------------------------------------------------------
-	
-	function chat_save()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$acc_number = intval($IN['account_no']);
-		
-		if ( $acc_number == "" )
-		{
-			$ADMIN->error("Sorry, that is not a valid IP Chat account number");
-		}
-		
-		$ADMIN->rebuild_config( array( 'chat_account_no' => $acc_number ) );
-		
-		$this->chat_config();
-	}
-	
-	
-	
-	
-	
-	
-	//---------------------------------------------------------------
-	
-	function chat_config_save()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$acc_number = intval($IN['chat_account_no']);
-		
-		//if ( $acc_number == "" )
-		//{
-		//	$ADMIN->error("Sorry, that is not a valid IP Chat account number");
-		//}
-		
-		$new = array(   'chat_account_no'  => $acc_number,
-						'chat_allow_guest' => $IN['chat_allow_guest'],
-						'chat_width'       => $IN['chat_width'],
-						'chat_height'      => $IN['chat_height'],
-						'chat_language'    => $IN['chat_language'],
-						'chat_display'     => $IN['chat_display'],
-						'chat_poppad'	   => $IN['chat_poppad'],
-						'chat_server_addr' => $IN['chat_server_addr'],
-						'chat_who_on'	   => $IN['chat_who_on'],
-						'chat_who_save'	   => $IN['chat_who_save'],
-						'chat_hide_whoschatting' => $IN['chat_hide_whoschatting'],
-					);
-		
-		//------------------------------------		
-		// Get the ID's of the groups we're
-		// allowing admin accsss chat_access_groups
-		//------------------------------------
-		
-		$ids = array();
- 		
- 		foreach ($IN as $key => $value)
- 		{
- 			if ( preg_match( "/^sg_(\d+)$/", $key, $match ) )
- 			{
- 				if ($IN[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		$new['chat_admin_groups'] = implode( ",", $ids );
- 		
- 		//------------------------------------		
-		// Get the ID's of the groups we're
-		// allowing chat accsss 
-		//------------------------------------
-		
-		$ids = array();
- 		
- 		foreach ($IN as $key => $value)
- 		{
- 			if ( preg_match( "/^sa_(\d+)$/", $key, $match ) )
- 			{
- 				if ($IN[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		$new['chat_access_groups'] = implode( ",", $ids );
- 		
- 		if ( $IN['chat_pass_md5'] != "" )
- 		{
- 			$new['chat_pass_md5'] = md5(trim($IN['chat_pass_md5']));
- 		}
-		
-		$ADMIN->rebuild_config( $new );
-		
-		$ADMIN->done_screen("IP Chat Configurations Updated", "IP Chat Configuration", "act=pin&code=ipchat" );
-	}
-	
-	
-	//--------------------------------------------------------------
-	
-	function chat_config()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may edit the configuration below to suit";
-		$ADMIN->page_title  = "IP Chat Configuration";
-		
-		//+-------------------------------
-		// SET UP SOME DEFAULTS
-		//+-------------------------------
-		
-		$language = $INFO['chat_language'] == "" ? 'en' : $INFO['chat_language'];
-		
-		$larray = array( 0 => array( 'en', 'English' ),
-						 1 => array( 'ar', 'Arabic'  ),
-						 2 => array( 'de', 'German'  ),
-						 3 => array( 'es', 'Spanish' ),
-						 4 => array( 'fr', 'French'  ),
-						 5 => array( 'hr', 'Croation'),
-						 6 => array( 'it', 'Italian' ),
-						 7 => array( 'iw', 'Hebrew'  ),
-						 8 => array( 'nl', 'Dutch'   ),
-						 9 => array( 'pl', 'Polish'  ),
-						 10=> array( 'pt', 'Portuguese' ),
-					   );
-					   
-		$display = array( 0 => array( 'self', 'Normal IPB Page' ),
-						  1 => array( 'new',  'New Pop Up Window' ),
-						);
-		
-		
-		//+-------------------------------
-		// START THE FORM
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dochat' ),
-												  2 => array( 'act'   , 'pin'    ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"    , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"    , "40%" );
-		
-		//+-------------------------------
-		// Check DB
-		//+-------------------------------
-		
-		$row = array( 'cs_extra' => '0&0' );
-		
-		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$DB->query("INSERT INTO ibf_cache_store VALUES('chatstat', '', '0&0')");
-		}
-		
-		list( $hits, $time ) = explode( '&', $row['cs_extra'] );
-		
-		if ( $time > 0 )
-		{
-			if ( $hits < 1 )
-			{
-				$hits = 0;
-			}
-		}
-		
-		$expire = "";
-		
-		//+-------------------------------
-		// Hits will expire...
-		//+-------------------------------
-		
-		if ( $INFO['chat_who_save'] > 0 )
-		{
-			$expire = ($hits * $INFO['chat_who_save']) * 60;
-			
-			$expire = $ADMIN->get_date( time() + $expire, 'SHORT' );
-		}
-		
-		//+-------------------------------
-		// Check server...
-		//+-------------------------------
-		
-		if ( $INFO['chat_account_no'] )
-		{
-			$lookup = "http://client.invisionchat.com/ipc_srv_lookup.pl?id=".$INFO['chat_account_no'];
-			
-			if ( ! $data = trim( implode( '', @file( $lookup ) ) ) )
-			{
-				$server_name = "Auto-lookup failed. <a href='http://www.invisionboard.com/acp/chatcheck.php?id={$INFO['chat_account_no']}'>Click here to manually check</a>";
-			}
-			
-			if ( ! strstr( $data, "invisionchat.com" ) )
-			{
-				$server_name = "Auto-lookup failed. <a href='http://www.invisionboard.com/acp/chatcheck.php?id={$INFO['chat_account_no']}'>Click here to manually check</a>";
-			}
-			
-			$INFO['chat_server_addr'] = $data;
-			
-			$server_name = "Updated: ". $ADMIN->get_date( time(), 'SHORT' );
-		}
-		
-		//+-------------------------------
-		// Check for passy
-		//+-------------------------------
-		
-		
-		$ADMIN->html .= $SKIN->start_table( "Basic Configuration" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Chat Room Account Number?</b><br>Removing this number will remove all links / chat functionality within IPB." ,
-										  $SKIN->form_input( "chat_account_no", $INFO['chat_account_no'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Chat Room Server?</b><br>$server_name" ,
-										  $SKIN->form_input( "chat_server_addr", $INFO['chat_server_addr'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable 'Who's Chatting?'</b><br />".$SKIN->form_checkbox( 'chat_hide_whoschatting', $INFO['chat_hide_whoschatting'] ). " Hide Who's Chatting when no members are logged into chat?" ,
-										  $SKIN->form_yes_no( "chat_who_on", $INFO['chat_who_on']  ) . '<br />'
-										  . 'Update local list no less than every '
-										  . $SKIN->form_dropdown( 'chat_who_save', array( 
-										  												 0 => array( 5 ,  5 ),
-										  												 1 => array( 10, 10 ),
-										  												 2 => array( 15, 15 ),
-										  												 3 => array( 30, 30 )
-										  												), $INFO['chat_who_save']
-										  						) . ' minutes<br />Update Hits left: '.$hits.'<br />Est. hits expiry date: '.$expire
-										  	
-										  )      );
-										  
-		if ( $INFO['chat_pass_md5'] )
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Changed your IPChat control panel password?</b><br>If you have changed your IPChat control panel password, please add the new password here. Leave blank if it's not changed." ,
-													  $SKIN->form_input( "chat_pass_md5" )
-											 )      );
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b style='color:red'>ENTER YOUR IPCHAT CONTROL PANEL PASSWORD</b><br>You must enter your IPChat control panel password to allow retrieval of the Who's Chatting list." ,
-													  $SKIN->form_input( "chat_pass_md5" )
-											 )      );
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow guests access to the chat room?</b><br>Choosing 'no' will require all chat users to log into chat." ,
-										  $SKIN->form_yes_no( "chat_allow_guest", $INFO['chat_allow_guest']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Chat Room Dimensions (WIDTH)?</b>" ,
-										  $SKIN->form_input( "chat_width", $INFO['chat_width'] ? $INFO['chat_width'] : 600 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Chat Room Dimensions (HEIGHT)?</b>" ,
-										  $SKIN->form_input( "chat_height", $INFO['chat_height'] ? $INFO['chat_height'] : 350 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Chat Room Pop-up Window Padding? (in px)</b><br />Allows window to open without scrollbars" ,
-										  $SKIN->form_input( "chat_poppad", $INFO['chat_poppad'] ? $INFO['chat_poppad'] : 50 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default Chat Room Interface Language?</b>" ,
-										  $SKIN->form_dropdown( "chat_language", $larray, $language  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Load the chat room in...?</b>" ,
-										  $SKIN->form_dropdown( "chat_display", $display, $INFO['chat_display']  )
-								 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		// Whos Chatting
-		//+-------------------------------
-		
-		if ( $INFO['chat_who_on'] and $INFO["chat_pass_md5"] )
-		{
-			$SKIN->td_header[] = array( "{none}" , "100%" );
-			
-			$ADMIN->html .= $SKIN->start_table( "Who's Chatting?" );
-			
-			$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
-		
-			$chat_row = $DB->fetch_row();
-			
-			if ( strstr( $chat_row['cs_value'], $INFO['board_url'] ) )
-			{
-				list ($names, $count) = explode( '|&|', $chat_row['cs_value'] );
-		
-				$ADMIN->html .= $SKIN->add_td_row( array( stripslashes($names) ) );
-			}
-			else
-			{
-				$ADMIN->html .= $SKIN->add_td_row( array( "No users currently chatting" ) );
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_basic( "<a href='{$ADMIN->base_url}&act=pin&code=dorefreshchat'>Force Refresh Now</a>", 'right', 'catrow2' );
-		
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		//+-------------------------------
-		// Permission panel
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"    , "50%" );
-		$SKIN->td_header[] = array( "Access"    , "25%" );
-		$SKIN->td_header[] = array( "Admin"     , "25%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Admin Access Permission" );
-		
-		//-------------------------------
-		// Break up our line of admins
-		//-------------------------------
-		
-		$allowed = array();
-		
-		foreach( explode( ",", $INFO['chat_admin_groups'] ) as $i )
-		{
-			$allowed[ $i ] = 1;
-		}
-		
-		//-------------------------------
-		// Break up our allowed access
-		//-------------------------------
-		
-		$access = array();
-		
-		foreach( explode( ",", $INFO['chat_access_groups'] ) as $i )
-		{
-			$access[ $i ] = 1;
-		}
-		
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups WHERE g_id <> ".$INFO['guest_group']." ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			
-			$mode = $r['g_id'] == $INFO['admin_group'] ? 'green' : 'red';
-		
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Group '<span style='color:$mode'>{$r['g_title']}</span>' permissions...</b>" ,
-												  "<strong>Can use chat</strong>&nbsp;".$SKIN->form_checkbox( "sa_{$r['g_id']}", $access[ $r['g_id'] ]  ? 1 : 0 ),
-												  "<strong>Is Chat Admin</strong>&nbsp;".$SKIN->form_checkbox( "sg_{$r['g_id']}", $allowed[ $r['g_id'] ] ? 1 : 0 ),
-									     	)      );
-		}
-		
-									 
-		$ADMIN->html .= $SKIN->end_form('Save this configuration');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	//
-	// Save config. Does the hard work, so you don't have to.
-	//
-	//--------------------------------------------------------------
-	
-	function save_config( $new )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$master = array();
-		
-		if ( is_array($new) )
-		{
-			if ( count($new) > 0 )
-			{
-				foreach( $new as $field )
-				{
-				
-					// Handle special..
-					
-					if ($field == 'img_ext' or $field == 'avatar_ext')
-					{
-						$HTTP_POST_VARS[ $field ] = preg_replace( "/[\.\s]/", "" , $HTTP_POST_VARS[ $field ] );
-						$HTTP_POST_VARS[ $field ] = preg_replace( "/,/"     , '|', $HTTP_POST_VARS[ $field ] );
-					}
-					else if ($field == 'coppa_address')
-					{
-						$HTTP_POST_VARS[ $field ] = nl2br( $HTTP_POST_VARS[ $field ] );
-					}
-					
-					$HTTP_POST_VARS[ $field ] = preg_replace( "/'/", "&#39;", stripslashes($HTTP_POST_VARS[ $field ]) );
-				
-					$master[ $field ] = stripslashes($HTTP_POST_VARS[ $field ]);
-				}
-				
-				$ADMIN->rebuild_config($master);
-			}
-		}
-	}
-	//-------------------------------------------------------------
-	//
-	// Common header: Saves writing the same stuff out over and over
-	//
-	//--------------------------------------------------------------
-	
-	function common_header( $formcode = "", $section = "", $extra = "" )
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$extra = $extra ? $extra."<br>" : $extra;
-		
-		$ADMIN->page_detail = $extra . "Please check the data you are entering before submitting the changes";
-		$ADMIN->page_title  = "Plug In Configuration [ $section ]";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $formcode ),
-												  2 => array( 'act'   , 'pin'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Settings" );
-		
-	}
-
-	//-------------------------------------------------------------
-	//
-	// Common footer: Saves writing the same stuff out over and over
-	//
-	//--------------------------------------------------------------
-	
-	function common_footer( $button="Submit Changes" )
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}				
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_profilefields.php b/upload/sources/Admin/ad_profilefields.php
deleted file mode 100644
index fb6c644c..00000000
--- a/upload/sources/Admin/ad_profilefields.php
+++ /dev/null
@@ -1,468 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Custom profile field functions
-|   > Module written by Matt Mecham
-|   > Date started: 24th June 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_fields();
-
-
-class ad_fields {
-
-	var $base_url;
-
-	function ad_fields() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'add':
-				$this->main_form('add');
-				break;
-				
-			case 'doadd':
-				$this->main_save('add');
-				break;
-				
-			case 'edit':
-				$this->main_form('edit');
-				break;
-				
-			case 'doedit':
-				$this->main_save('edit');
-				break;
-				
-			case 'delete':
-				$this->delete_form();
-				break;
-				
-			case 'dodelete':
-				$this->do_delete();
-				break;
-						
-			default:
-				$this->main_screen();
-				break;
-		}
-		
-	}
-	
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Delete a group
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function delete_form()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the group ID, please try again");
-		}
-		
-		$ADMIN->page_title = "Deleting a Custom Profile Field";
-		
-		$ADMIN->page_detail = "Please check to ensure that you are attempting to remove the correct custom profile field as <b>all data will be lost!</b>.";
-		
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT ftitle, fid FROM ibf_pfields_data WHERE fid='".$IN['id']."'");
-		
-		if ( ! $field = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not fetch the row from the database");
-		}
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'dodelete'  ),
-												  2 => array( 'act'   , 'field'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     )      );
-									     
-		
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Removal Confirmation" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Custom Profile field to remove</b>" ,
-												  "<b>".$field['ftitle']."</b>",
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form("Delete this custom field");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-	
-	function do_delete()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the field ID, please try again");
-		}
-		
-		
-		// Check to make sure that the relevant groups exist.
-		
-		$DB->query("SELECT ftitle, fid FROM ibf_pfields_data WHERE fid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the ID's passed to deletion");
-		}
-		
-		$DB->query("ALTER TABLE ibf_pfields_content DROP field_{$row['fid']}");
-		
-		$DB->query("DELETE FROM ibf_pfields_data WHERE fid='".$IN['id']."'");
-		
-		$ADMIN->done_screen("Profile Field Removed", "Custom Profile Field Control", "act=field" );
-		
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Save changes to DB
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function main_save($type='edit')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['ftitle'] == "")
-		{
-			$ADMIN->error("You must enter a field title.");
-		}
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("Could not resolve the field id");
-			}
-			
-		}
-		
-		$content = "";
-		
-		if ($HTTP_POST_VARS['fcontent'] != "")
-		{
-			$content = str_replace( "\n", '|', str_replace( "\n\n", "\n", trim($HTTP_POST_VARS['fcontent']) ) );
-		}
-		
-		$db_string = array( 'ftitle'    => $IN['ftitle'],
-						    'fdesc'     => $IN['fdesc'],
-						    'fcontent'  => stripslashes($content),
-						    'ftype'     => $IN['ftype'],
-						    'freq'      => $IN['freq'],
-						    'fhide'     => $IN['fhide'],
-						    'fmaxinput' => $IN['fmaxinput'],
-						    'fedit'     => $IN['fedit'],
-						    'forder'    => $IN['forder'],
-						    'fshowreg'  => $IN['fshowreg'],
-						  );
-		
-						  
-		if ($type == 'edit')
-		{
-			$rstring = $DB->compile_db_update_string( $db_string );
-			
-			$DB->query("UPDATE ibf_pfields_data SET $rstring WHERE fid='".$IN['id']."'");
-			
-			$ADMIN->done_screen("Profile Field Edited", "Custom Profile Field Control", "act=field" );
-			
-		}
-		else
-		{
-			$rstring = $DB->compile_db_insert_string( $db_string );
-			
-			$DB->query("INSERT INTO ibf_pfields_data (" .$rstring['FIELD_NAMES']. ") VALUES (". $rstring['FIELD_VALUES'] .")");
-			
-			$new_id = $DB->get_insert_id();
-			
-			$DB->query("ALTER TABLE ibf_pfields_content ADD field_$new_id text default ''");
-			
-			$DB->query("OPTIMIZE TABLE ibf_pfields_content");
-			
-			$ADMIN->done_screen("Profile Field Added", "Custom Profile Field Control", "act=field" );
-		}
-	}
-	
-	
-	//+---------------------------------------------------------------------------------
-	//
-	// Add / edit group
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function main_form($type='edit')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("No group id to select from the database, please try again.");
-			}
-			
-			$form_code = 'doedit';
-			$button    = 'Complete Edit';
-				
-		}
-		else
-		{
-			$form_code = 'doadd';
-			$button    = 'Add Field';
-		}
-		
-		if ($IN['id'] != "")
-		{
-			$DB->query("SELECT * FROM ibf_pfields_data WHERE fid='".$IN['id']."'");
-			$fields = $DB->fetch_row();
-		}
-		else
-		{
-			$fields = array();
-		}
-		
-		if ($type == 'edit')
-		{
-			$ADMIN->page_title = "Editing Profile Field ".$fields['ftitle'];
-		}
-		else
-		{
-			$ADMIN->page_title = 'Adding a new profile field';
-			$fields['ftitle'] = '';
-		}
-		
-		$ADMIN->page_detail = "Please double check the information before submitting the form.";
-		
-		
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $form_code  ),
-												  2 => array( 'act'   , 'field'     ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     )  );
-									     
-		$fields['fcontent'] = str_replace( '|', "\n", $fields['fcontent'] );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Field Settings" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Field Title</b><br>Max characters: 200" ,
-												  $SKIN->form_input("ftitle", $fields['ftitle'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Description</b><br>Max Characters: 250<br>Can be used to note hidden/required status" ,
-												  $SKIN->form_input("fdesc", $fields['fdesc'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Field Type</b>" ,
-												  $SKIN->form_dropdown("ftype",
-												  					   array(
-												  					   			0 => array( 'text' , 'Text Input' ),
-												  					   			1 => array( 'drop' , 'Drop Down Box' ),
-												  					   			2 => array( 'area' , 'Text Area' ),
-												  					   		),
-												  					   $fields['ftype'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max Input (for text input and text areas) in characters</b>" ,
-												  $SKIN->form_input("fmaxinput", $fields['fmaxinput'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Display order (when editing and displaying) numeric 1 lowest." ,
-												  $SKIN->form_input("forder", $fields['forder'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Option Content (for drop downs)</b><br>In sets, one set per line<br>Example for 'Gender' field:<br>m=Male<br>f=Female<br>u=Not Telling<br>Will produce:<br><select name='pants'><option value='m'>Male</option><option value='f'>Female</option><option value='u'>Not Telling</option></select><br>m,f or u stored in database. When showing field in profile, will use value from pair (f=Female, shows 'Female')" ,
-												  $SKIN->form_textarea("fcontent", $fields['fcontent'] )
-									     )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Include on registration page?</b>" ,
-												  $SKIN->form_yes_no("fshowreg", $fields["fshowreg"] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Field MUST be completed and not left empty?</b><br>(Will not apply if you choose to hide below)" ,
-												  $SKIN->form_yes_no("freq", $fields['freq'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Hide from the member's profile?</b><br>If yes, only admins and super mods can see it, user can still edit." ,
-												  $SKIN->form_yes_no("fhide", $fields['fhide'] )
-									     )      );						     							     
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Field can be edited by the member?</b><br>If no, user cannot edit information, field can only be seen by admins and super mods. Admins can edit information via ACP" ,
-												  $SKIN->form_yes_no("fedit", $fields['fedit'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-			
-			
-	}
-
-	//+---------------------------------------------------------------------------------
-	//
-	// Show "Management Screen
-	//
-	//+---------------------------------------------------------------------------------
-	
-	function main_screen()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Custom Profile Fields";
-		
-		$ADMIN->page_detail = "Custom Profile fields can be used to add optional or required fields to be completed when registering or editing a profile. This is useful if you wish to record data from your members that is not already present in the base board.";
-		
-		$ADMIN->page_detail .= "<br /><br /><strong>Using Custom Profile Fields in Topic View</strong><br /><br />
-								When you have enabled this feature (via System Settings -> CPU Saving) you can use the custom fields
-								in your Topic View skin.<br />Simply add <strong>\$author[field_1]</strong> (or whatever the corresponding 'Topicview var.' is) in 'Post Entry'
-								where you would like it to be shown";
-		
-		$SKIN->td_header[] = array( "Field Title"    , "20%" );
-		$SKIN->td_header[] = array( "Type"           , "10%" );
-		$SKIN->td_header[] = array( "TopicView var." , "20%" );
-		$SKIN->td_header[] = array( "REQUIRED"       , "10%" );
-		$SKIN->td_header[] = array( "HIDDEN"         , "10%" );
-		$SKIN->td_header[] = array( "SHOW REG"       , "10%" );
-		$SKIN->td_header[] = array( "Edit"           , "10%" );
-		$SKIN->td_header[] = array( "Delete"         , "10%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Custom Profile Field Management" );
-		
-		$real_types = array( 'drop' => 'Drop Down Box',
-							 'area' => 'Text Area',
-							 'text' => 'Text Input',
-						   );
-		
-		$DB->query("SELECT * FROM ibf_pfields_data");
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$hide   = '&nbsp;';
-				$req    = '&nbsp;';
-				$regi   = '&nbsp;';
-				
-				"<center><a href='{$ADMIN->base_url}&act=group&code=delete&id=".$r['g_id']."'>Delete</a></center>";
-				
-				//-----------------------------------
-				if ($r['fhide'] == 1)
-				{
-					$hide = '<center><span style="color:red">Y</span></center>';
-				}
-				//-----------------------------------
-				if ($r['freq'] == 1)
-				{
-					$req = '<center><span style="color:red">Y</span></center>';
-				}
-				
-				if ($r['fshowreg'] == 1)
-				{
-					$regi = '<center><span style="color:red">Y</span></center>';
-				}
-				
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$r['ftitle']}</b>" ,
-														  "<center>{$real_types[$r['ftype']]}</center>",
-														  "<center>field_".$r['fid']."</center>",
-														  $req,
-														  $hide,
-														  $regi,
-														  "<center><a href='{$ADMIN->base_url}&act=field&code=edit&id=".$r['fid']."'>Edit</a></center>",
-														  "<center><a href='{$ADMIN->base_url}&act=field&code=delete&id=".$r['fid']."'>Delete</a></center>",
-											 )      );
-											 
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("None found", "center", "pformstrip");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic("<a href='{$ADMIN->base_url}&act=field&code=add' class='fauxbutton'>ADD NEW FIELD</a></center>", "center", "pformstrip");
-
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-		
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_settings.php b/upload/sources/Admin/ad_settings.php
deleted file mode 100644
index 42cfaf54..00000000
--- a/upload/sources/Admin/ad_settings.php
+++ /dev/null
@@ -1,2548 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Setting functions
-|   > Module written by Matt Mecham
-|   > Date started: 20th March 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() 
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-		
-		$DB->query("SELECT VERSION() AS version");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$DB->query("SHOW VARIABLES LIKE 'version'");
-			$row = $DB->fetch_row();
-		}
-		
-		$this->true_version = $row['version'];
-		
-		$no_array = explode( '.', preg_replace( "/^(.+?)[-_]?/", "\\1", $row['version']) );
-		
-		$one   = (!isset($no_array) || !isset($no_array[0])) ? 3  : $no_array[0];
-		$two   = (!isset($no_array[1]))                      ? 21 : $no_array[1];
-		$three = (!isset($no_array[2]))                      ? 0  : $no_array[2];
-		
-   		$this->mysql_version = (int)sprintf('%d%02d%02d', $one, $two, intval($three));
-
-		switch($IN['code'])
-		{
-			case 'fulltext':
-				$this->fulltext();
-				break;
-				
-			case 'dofulltext':
-				$this->do_fulltext();
-				break;
-				
-			case 'phpinfo':
-				phpinfo();
-				exit;
-				
-			case 'glines':
-				$this->guidelines();
-				break;
-			case 'doglines':
-				$this->do_guidelines();
-				break;
-				
-			case 'cookie':
-				$this->cookie();
-				break;
-			case 'docookie':
-				$this->save_config( array( 'cookie_domain', 'cookie_id', 'cookie_path' ) );
-				break;
-				
-			case 'warn':
-				$this->warn();
-				break;
-			case 'dowarn':
-				$HTTP_POST_VARS['warn_protected'] = ','. @implode( ",", $HTTP_POST_VARS['groups'] ) . ',';
-				$this->save_config( array( 	'warn_show_rating', "warn_past_max", 'warn_show_own', 'warn_min', 'warn_protected', 'warn_mod_day', 'warn_gmod_day', "warn_gmod_ban","warn_gmod_modq","warn_gmod_post","warn_mod_post","warn_mod_modq","warn_mod_ban",'warn_max',"warn_on" ) );
-				break;
-
-			case 'secure':
-				$this->secure();
-				break;
-			case 'dosecure':
-				$this->save_config( array ( 'strip_space_chr', 'validate_day_prune', 'bot_antispam', 'use_ttf', 'gd_width', 'gd_height',"gd_font",  'disable_admin_anon', 'disable_online_ip', 'disable_reportpost', 'allow_dynamic_img','session_expiration','match_browser','allow_dup_email','allow_images', 'force_login', 'no_reg',
-											'allow_flash','new_reg_notify','use_mail_form','flood_control', 'allow_online_list', 'reg_auth_type' ) );
-				break;
-			//-------------------------
-			case 'post':
-				$this->post();
-				break;
-			case 'dopost':
-				$this->save_config( array ( 'post_order_column', 'post_order_sort','poll_disable_noreply', 'siu_thumb', 'siu_width', 'siu_height', 'startpoll_cutoff', 'post_wordwrap', 'allow_result_view', 'max_poll_choices', 'poll_tags', 'guest_name_pre', 'guest_name_suf', 'max_w_flash', 'max_h_flash', 'hot_topic', 'display_max_topics','display_max_posts','max_emos','max_images','emo_per_row', 'etfilter_punct', 'etfilter_shout',
-											'strip_quotes', 'max_post_length','show_img_upload','pre_polls','pre_moved','pre_pinned','img_ext' ) );
-				break;
-			//-------------------------
-			case 'avatars':
-				$this->avatars();
-				break;
-			case 'doavatars':
-				$this->save_config( array ( 'av_gal_cols' , "disable_ipbsize", "photo_ext", 'subs_autoprune', 'topicpage_contents', 'postpage_contents', 'allow_skins', 'max_sig_length', 'sig_allow_ibc', 'sig_allow_html','avatar_ext','avatar_url','avup_size_max','avatars_on','avatar_dims','avatar_def', 'max_location_length', 'max_interest_length', 'post_titlechange', 'guests_ava', 'guests_img', 'guests_sig' ) );
-				break;
-			//-------------------------
-			case 'dates':
-				$this->dates();
-				break;
-			case 'dodates':
-				$this->save_config( array ( 'time_offset','clock_short','clock_joined','clock_long', 'time_adjust' ) );
-				break;
-			//-------------------------
-			
-			case 'calendar':
-				$this->calendar();
-				break;
-			case 'docalendar':
-				$this->save_config( array ( 'autohide_bday', 'autohide_calendar', 'show_birthdays', 'show_bday_calendar', 'show_calendar','calendar_limit', 'year_limit', 'start_year' ) );
-				break;
-			//-------------------------
-			
-			case 'cpu':
-				$this->cpu();
-				break;
-			case 'docpu':
-				$this->save_config( array ( 'custom_profile_topic', 'min_search_word', 'short_forum_jump', 'no_au_forum', 'no_au_topic', 'au_cutoff', 'load_limit','show_active','show_birthdays','show_totals','allow_search', 'search_post_cut', 'show_user_posted', 'nocache' ) );
-				break;
-			//-------------------------
-			case 'email':
-				$this->email();
-				break;
-			case 'doemail':
-				$this->save_config( array ( 'email_in', 'email_out', 'mail_method', 'smtp_host', 'smtp_port', 'smtp_user', 'smtp_pass' ) );
-				break;
-			//-------------------------
-			case 'url':
-				$this->url();
-				break;
-			case 'dourl':
-				$this->save_config( array ( 'number_format', 'html_dir','safe_mode_skins', 'board_name','board_url','home_name','home_url', 'disable_gzip',
-										    'html_url','upload_url', 'upload_dir', 'print_headers', 'header_redirect', 'debug_level', 'sql_debug' ) );
-				break;
-			//-------------------------
-			case 'pm':
-				$this->pm();
-				break;
-			case 'dopm':
-				$this->save_config( array ( 'show_max_msg_list', 'msg_allow_code', 'msg_allow_html' ) );
-				break;
-			//-------------------------
-			case 'news':
-				$this->news();
-				break;
-			case 'donews':
-				$this->save_config( array ( 'news_forum_id', 'index_news_link' ) );
-				break;
-			//-------------------------
-			case 'coppa':
-				$this->coppa();
-				break;
-			case 'docoppa':
-				$this->save_config( array ( 'use_coppa', 'coppa_fax', 'coppa_address' ) );
-				break;
-			//-------------------------
-			case 'board':
-				$this->board();
-				break;
-			case 'doboard':
-				$this->save_config( array ( 'board_offline', 'offline_msg' ) );
-				break;
-			//-------------------------
-			case 'spider':
-				$this->spider();
-				break;
-			case 'dospider':
-				$this->save_config( array (  'spider_suit', "spider_sense","spider_visit","spider_group","spider_active",'sp_google' ,'sp_inktomi','sp_lycos'  ,'sp_jeeves','sp_wuseek', 'sp_Archive_org', 'spider_anon' ) );
-				break;
-			//-------------------------
-			case 'bw':
-				$this->badword();
-				break;
-			case 'bw_add':
-				$this->add_badword();
-				break;
-			case 'bw_remove':
-				$this->remove_badword();
-				break;
-			case 'bw_edit':
-				$this->edit_badword();
-				break;
-			case 'bw_doedit':
-				$this->doedit_badword();
-				break;
-			//-------------------------
-			case 'emo':
-				$this->emoticons();
-				break;
-			case 'emo_add':
-				$this->add_emoticons();
-				break;
-			case 'emo_remove':
-				$this->remove_emoticons();
-				break;
-			case 'emo_edit':
-				$this->edit_emoticons();
-				break;
-			case 'emo_doedit':
-				$this->doedit_emoticons();
-				break;
-			case 'emo_upload':
-				$this->upload_emoticon();			
-			//-------------------------
-			case 'count':
-				$this->countstats();
-				break;
-			case 'docount':
-				$this->docount();
-				break;
-			default:
-				$this->cookie();
-				break;
-		}
-		
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	// Full Text options page
-	//--------------------------------------------------------------
-	
-	function fulltext()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-	
-		//---------------------------------------
-		// Get the mySQL version.
-		// Adapted from phpMyAdmin
-		//---------------------------------------
-		
-		$DB->query("SELECT VERSION() AS version");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$DB->query("SHOW VARIABLES LIKE 'version'");
-			$row = $DB->fetch_row();
-		}
-		
-		$this->true_version = $row['version'];
-		
-		$no_array = explode( '.', preg_replace( "/^(.+?)[-_]?/", "\\1", $row['version']) );
-		
-		$one   = (!isset($no_array) || !isset($no_array[0])) ? 3  : $no_array[0];
-		$two   = (!isset($no_array[1]))                      ? 21 : $no_array[1];
-		$three = (!isset($no_array[2]))                      ? 0  : $no_array[2];
-		
-   		$this->mysql_version = (int)sprintf('%d%02d%02d', $one, $two, intval($three));
-   		
-   		$this->common_header('dofulltext', 'Full Text Searching Set Up', 'You may change the configuration below');
-   		
-   		if ( $this->mysql_version < 32323 )
-   		{
-   			$ADMIN->html .= $SKIN->add_td_basic("<strong>Sorry, your MySQL installation is not capable of utilizing full text searching</strong><br />Contact your webhost to see about a MySQL upgrade.");
-											
-   			$ADMIN->html .= $SKIN->end_form($button);
-										 
-			$ADMIN->html .= $SKIN->end_table();
-		
-			$ADMIN->output();
-			
-			exit();
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<strong>What is full text searching?</strong><br />Full text searching is a very fast and very
-												efficient way of searching large amounts of posts without maintaining a manual index.");
-												
-			//-------------------------------------------
-			// Do we already have full text enabled?
-			//-------------------------------------------
-			
-			$DB->query("SHOW CREATE TABLE ibf_posts");
-			
-			$tbl_info = $DB->fetch_row();
-			
-			if ( preg_match( "/FULLTEXT KEY/i", $tbl_info['Create Table'] ) )
-			{
-				$ADMIN->html .= $SKIN->add_td_basic("<b>The Full text indexes already exist</b><input type='hidden' name='ftexist' value='1' />");
-									 			 
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>Type of search to use?</b>" ,
-												  $SKIN->form_dropdown( "search_sql_method", array( 0 => array( 'ftext', 'Full Text' ), 1 => array( 'man', 'Manual' ) ), $INFO['search_sql_method'] )
-										 )      );
-	
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default Search Mode?</b><br>Will only take effect if using full text searching" ,
-												  $SKIN->form_dropdown( "search_default_method", array( 0 => array( 'simple', 'Simple Search' ), 1 => array( 'adv', 'Advanced' ) ), $INFO['search_default_method']  )
-										 )      );
-			}
-			else
-			{
-				$ADMIN->html .= $SKIN->add_td_basic( "<b>You must create the full text indexes before you can set this section up. Simply submit this form to start setting up the indexes</b>" .
-											       "<input type='hidden' name='setup' value='1'>");
-			}
-			
-			$this->common_footer();
-		}						 
-	}
-	
-	//-------------------------------------------------------------
-	// Save full text options
-	//--------------------------------------------------------------
-	
-	function do_fulltext()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ( $IN['ftexist'] == 1)
-		{
-			$master = array();
-			$master['search_sql_method']      = $IN['search_sql_method'];
-			$master['search_default_method']  = $IN['search_default_method'];
-			
-			$ADMIN->rebuild_config($master);
-		}
-		else
-		{
-			// They don't.
-			// Check for correct version and if need be, attempt to create the indexes...
-			
-			if ( $this->mysql_version >= 32323 )
-			{
-				// How many posts do we have?
-				
-				$DB->query("SELECT COUNT(*) as cnt from ibf_posts");
-				
-				$result = $DB->fetch_row();
-				
-				// If over 15,000 posts...
-				
-				if ( $result['cnt'] > 15000 )
-				{
-					// Explain how, why and what to do..
-					
-					$ADMIN->page_detail = "";
-					$ADMIN->page_title  = "Unable to continue";
-		
-					$ADMIN->html .= $SKIN->add_td_basic( $this->return_sql_no_no_cant_do_it_sorry_text(), 'left', 'faker' );
-					
-					$ADMIN->output();
-				}
-				else
-				{
-					// Index away!
-					
-					$DB->query("alter table ibf_topics add fulltext(title)");
-					
-					$DB->query("alter table ibf_posts add fulltext(post)");
-					
-				}
-			}
-			else
-			{
-				$ADMIN->error("Sorry, the version of MySQL that you are using is unable to use FULLTEXT searches");
-			}
-		}
-		
-		$ADMIN->save_log("Full Text Options Updated");
-		
-		$ADMIN->done_screen("Full Text Settings updated", "Full Text Set Up", "act=op&code=fulltext" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// WARNY PORNY!
-	//--------------------------------------------------------------
-	
-	function warn()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('dowarn', 'Member Warning Set-Up', 'You may change the configuration below.' );
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-		}
-		
-		$protected = explode(',', trim($INFO['warn_protected']) );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable the warning system?</b>" ,
-										  $SKIN->form_yes_no( "warn_on", $INFO['warn_on']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Warning level...</b><br />This is related to the visual indicator in the member's profile." ,
-										 'Minimum '.$SKIN->form_simple_input( 'warn_min' , $INFO['warn_min']  == "" ? 0 : $INFO['warn_min'] ) .' to '.
-										 'Maximum '.$SKIN->form_simple_input( 'warn_max' , $INFO['warn_max']  == "" ? 10 : $INFO['warn_max'] ) .
-										 "<br>Minus numbers allowed. If using minus numbers, we recommend that you do not use the graphical blocks and percentage but use the 'rating' mode as 'warn mode' will not take into account a minus start number.<br>Members always start with a zero warn level when registered."
-								 )      );	
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Protected Groups...</b><br>Groups that cannot be warned<br />You may choose more than one" ,
-												  $SKIN->form_multiselect( "groups[]", $mem_group, $protected )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow all other non-protected groups to see <em>their own</em> warn level and reasons?</b>" ,
-										  $SKIN->form_yes_no( "warn_show_own", $INFO['warn_show_own']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow warnings to continue once the minimum or maximum has been reached?</b>" ,
-										  $SKIN->form_yes_no( "warn_past_max", $INFO['warn_past_max']  )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Type of visual indicator?</b>" ,
-										  $SKIN->form_dropdown( 'warn_show_rating', array( 0 => array( 0, 'Warn mode: Show graphical blocks & percentage' ), 1 => array( 1, 'Rating mode: Show < min | current | max > level' ) ), $INFO['warn_show_rating']  )
-								 )      );				 
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Forum Moderator Permissions', 'left', 'catrow2' );
-		
-		//----------------------------------------------------------------------------------------------------------- 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderators can ban via warn panel?</b><br />Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel" ,
-										  $SKIN->form_yes_no( "warn_mod_ban", $INFO['warn_mod_ban']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderators can mod queue members via warn panel?</b><br />Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel" ,
-										  $SKIN->form_yes_no( "warn_mod_modq", $INFO['warn_mod_modq']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderators can remove post rights via warn panel?</b><br />Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel" ,
-										  $SKIN->form_yes_no( "warn_mod_post", $INFO['warn_mod_post']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Moderators can warn a member...</b>" ,
-										 $SKIN->form_input( 'warn_mod_day' , $INFO['warn_mod_day']  == "" ? 1 : $INFO['warn_mod_day'] ).'... times a day'
-								 )      );		
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Global Moderator Permissions', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Global Moderators can ban via warn panel?</b><br />Admins can automatically do this via the warn panel" ,
-										  $SKIN->form_yes_no( "warn_gmod_ban", $INFO['warn_gmod_ban']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Global Moderators can mod queue members via warn panel?</b><br />Admins can automatically do this via the warn panel" ,
-										  $SKIN->form_yes_no( "warn_gmod_modq", $INFO['warn_gmod_modq']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Global Moderators can remove post rights via warn panel?</b><br />Admins can automatically do this via the warn panel" ,
-										  $SKIN->form_yes_no( "warn_gmod_post", $INFO['warn_gmod_post']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Global Moderators can warn a member...</b>" ,
-										 $SKIN->form_input( 'warn_gmod_day' , $INFO['warn_gmod_day']  == "" ? 1 : $INFO['warn_gmod_day'] ).'... times a day'
-								 )      );
-								 
-		$this->common_footer();
-	
-	}
-	
-	//-------------------------------------------------------------
-	// SPIDER MAN! CHECK OUT THOSE CRAZY PANTS!
-	//--------------------------------------------------------------
-	
-	function spider()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('dospider', 'Search Engine Spider/Crawler Set-Up', 'You may change the configuration below.<br />'.$SKIN->js_help_link('set_spider') );
-		
-		$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-		
-		$mem_group = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($INFO['admin_group'] == $r['g_id'])
-			{
-				if ($MEMBER['mgroup'] != $INFO['admin_group'])
-				{
-					continue;
-				}
-			}
-			
-			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
-		}
-		
-		$DB->query("SELECT sname, sid FROM ibf_skins ORDER BY sname");
-		
-		$skin_sets = array( 0 => array('', "Use default skin" ) );
-		
-		while ( $s = $DB->fetch_row() )
-		{
-			$skin_sets[] = array( $s['sid'], $s['sname'] );
-		}
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable the search engine spider recognition?</b>" ,
-										  $SKIN->form_yes_no( "spider_sense", $INFO['spider_sense']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Log all spider visits?</b><br />If you're under heavy attack, switch this off!" ,
-										  $SKIN->form_yes_no( "spider_visit", $INFO['spider_visit']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Treat spider/bot as part of which group?</b>" ,
-										  $SKIN->form_dropdown( "spider_group", $mem_group, $INFO['spider_group'] == "" ? $INFO['guest_group'] : $INFO['spider_group']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Force spider/bot to use skin:</b>" ,
-										  $SKIN->form_dropdown( "spider_suit", $skin_sets, $INFO['spider_suit']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show spider/bot in the active users list?</b>" ,
-										  $SKIN->form_yes_no( "spider_active", $INFO['spider_active']  )
-										  ."<br />".$SKIN->form_checkbox( 'spider_anon', $INFO['spider_anon'] )." Show as anonymous ( only root admins can see)"
-								 )      );
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'In the active users list...', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Call Googlebot...</b>" ,
-										 $SKIN->form_input( 'sp_google' , $INFO['sp_google']  == "" ? 'GoogleBot'   : $INFO['sp_google'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Call Microsoft / Hotbot...</b>" ,
-										 $SKIN->form_input( 'sp_inktomi', $INFO['sp_inktomi'] == "" ? 'Hot Bot'     : $INFO['sp_inktomi'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Call Lycos...</b>" ,
-										 $SKIN->form_input( 'sp_lycos'  , $INFO['sp_lycos']   == "" ? 'Lycos'       : $INFO['sp_lycos'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Call Ask Jeeves...</b>" ,
-										 $SKIN->form_input( 'sp_jeeves' , $INFO['sp_jeeves']  == "" ? 'Ask Jeeves'  : $INFO['sp_jeeves'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Call What U Seek...</b>" ,
-										 $SKIN->form_input( 'sp_wuseek' , $INFO['sp_wuseek']  == "" ? 'What U Seek' : $INFO['sp_wuseek'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Call Archive.org...</b>" ,
-										 $SKIN->form_input( 'sp_Archive_org' , $INFO['sp_Archive_org']  == "" ? 'Archive.org' : $INFO['sp_Archive_org'] )
-								 )      );
-		
-		$this->common_footer();
-	
-	
-	}
-	
-	
-	//-------------------------------------------------------------
-	// Board Guidelines
-	//--------------------------------------------------------------
-	
-	function do_guidelines()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$master = array();
-		$master['gl_show']  = $IN['gl_show'];
-		$master['gl_link']  = $IN['gl_link'];
-		$master['gl_title'] = $IN['gl_title'];
-		
-		$ADMIN->rebuild_config($master);
-		
-		$glines = stripslashes($HTTP_POST_VARS['gl_guidelines']);
-		$glines = str_replace( "<br>", "<br />", $glines);
-		
-		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='boardrules'");
-
-		if ( $row = $DB->fetch_row() )
-		{
-			$DB->query("UPDATE ibf_cache_store SET cs_value='".addslashes($glines)."' WHERE cs_key='boardrules'");
-		}
-		else
-		{
-			$db_string = $DB->compile_db_insert_string( array(
-															   'cs_key' => 'boardrules',
-															   'cs_value' => $glines,
-										  ) );
-
-			$DB->query("INSERT INTO ibf_cache_store (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		}
-
-		$ADMIN->save_log("Board Guidelines Updated");
-		
-		$ADMIN->done_screen("Forum Configurations updated", "Administration CP Home", "act=index" );
-		
-	}
-	
-	//---------------------------------------------
-	
-	function guidelines()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('doglines', 'Board Guidelines/Rules', 'You may change the configuration below');
-		
-		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='boardrules'");
-		
-		$row = $DB->fetch_row();
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show link in header to guidelines?</b>" ,
-										  $SKIN->form_yes_no( "gl_show", $INFO['gl_show'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>External http:// link to guidlines page?</b><br>Leave blank to use internal page" ,
-										  $SKIN->form_input( "gl_link", $INFO['gl_link'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Title to use in header?</b>" ,
-										  $SKIN->form_input( "gl_title", $INFO['gl_title'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>If not using external link; guidelines/rules text</b><br>HTML Enabled" ,
-										  $SKIN->form_textarea( "gl_guidelines", $std->my_br2nl($row['cs_value']), 65, 20  )
-								 )      );
-								 
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// COPPA
-	//--------------------------------------------------------------
-	
-	function coppa()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('docoppa', 'COPPA Set-Up', 'You may change the configuration below. Note, enabling <a href="http://www.ftc.gov/ogc/coppa1.htm" target="_blank">COPPA</a> on your board will require children under the age of 13 to get parental consent via a faxed or mailed form.');
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Use COPPA registration system?</b>" ,
-										  $SKIN->form_yes_no( "use_coppa", $INFO['use_coppa']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Fax number to receive COPPA forms</b>" ,
-										  $SKIN->form_input( "coppa_fax", $INFO['coppa_fax']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Mail address to receive COPPA forms</b>" ,
-										  $SKIN->form_textarea( "coppa_address", str_replace( "\n\n", "\n", $std->my_br2nl(str_replace( "\r\n", "\n", $INFO['coppa_address']) ) )  )
-								 )      );
-		
-		
-		$this->common_footer();
-	
-	
-	}
-	
-	//=====================================================
-	
-	function docount()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ( (! $IN['posts']) and (! $IN['members'] ) and (! $IN['lastreg'] ) )
-		{
-			$ADMIN->error("Nothing to recount!");
-		}
-		
-		$stats = array();
-		
-		if ($IN['posts'])
-		{
-			$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE queued <> 1");
-			$r = $DB->fetch_row();
-			$stats['TOTAL_REPLIES'] = $r['posts'];
-			$stats['TOTAL_REPLIES'] < 1 ? 0 : $stats['TOTAL_REPLIES'];
-			
-			$DB->query("SELECT COUNT(tid) as topics FROM ibf_topics WHERE approved = 1");
-			$r = $DB->fetch_row();
-			$stats['TOTAL_TOPICS'] = $r['topics'];
-			$stats['TOTAL_TOPICS'] < 1 ? 0 : $stats['TOTAL_TOPICS'];
-			
-			$stats['TOTAL_REPLIES'] -= $stats['TOTAL_TOPICS'];
-		}
-		
-		if ($IN['members'])
-		{
-			$DB->query("SELECT COUNT(id) as members from ibf_members WHERE mgroup <> '".$INFO['auth_group']."'");
-			$r = $DB->fetch_row();
-			$stats['MEM_COUNT'] = $r['members'];
-			// Remove "guest" account...
-			$stats['MEM_COUNT']--;
-			$stats['MEM_COUNT'] < 1 ? 0 : $stats['MEM_COUNT'];
-		}
-		
-		if ($IN['lastreg'])
-		{
-			$DB->query("SELECT id, name FROM ibf_members WHERE mgroup <> '".$INFO['auth_group']."' ORDER BY id DESC LIMIT 0,1");
-			$r = $DB->fetch_row();
-			$stats['LAST_MEM_NAME'] = $r['name'];
-			$stats['LAST_MEM_ID']   = $r['id'];
-		}
-		
-		if ($IN['online'])
-		{
-			$stats['MOST_DATE'] = time();
-			$stats['MOST_COUNT'] = 1;
-		}
-		
-		if ( count($stats) > 0 )
-		{
-			$db_string = $DB->compile_db_update_string( $stats );
-			$DB->query("UPDATE ibf_stats SET $db_string");
-		}
-		else
-		{
-			$ADMIN->error("Nothing to recount!");
-		}
-		
-		$ADMIN->done_screen("Statistics Recounted", "Administration CP Home", "act=index" );
-		
-	}
-	
-	
-	
-	function countstats()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "Please choose which statistics to recount.";
-		$ADMIN->page_title  = "Recount Statistics Control";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'docount' ),
-												  2 => array( 'act'   , 'op'     ),
-									     )      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Statistic"    , "70%" );
-		$SKIN->td_header[] = array( "Option"       , "30%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Recount Statistics" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "Recount total topics and posts",
-												  $SKIN->form_dropdown( 'posts', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Recount Members",
-												  $SKIN->form_dropdown( 'members', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Reset last registered member",
-												  $SKIN->form_dropdown( 'lastreg', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "Reset 'Most online' statistic?",
-												  $SKIN->form_dropdown( 'online', array( 0 => array( 0, 'No'  ), 1 => array( 1, 'Yes' ) ) )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form('Reset these statistics');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	//-------------------------------------------------------------
-	// CALENDAR
-	//--------------------------------------------------------------
-	
-	function calendar()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('docalendar', 'Calendar Set Up', 'You may change the configuration below');
-		
-		$INFO['start_year'] = (isset($INFO['start_year'])) ? $INFO['start_year'] : 2001;
-		$INFO['year_limit'] = (isset($INFO['year_limit'])) ? $INFO['year_limit'] : 5;
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show birthdays on the main calendar view?</b>" ,
-										  $SKIN->form_yes_no( "show_bday_calendar", $INFO['show_bday_calendar'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Today's birthdays on the board view?</b>" ,
-										  $SKIN->form_yes_no( "show_birthdays", $INFO['show_birthdays'] )
-										  ."<br />".$SKIN->form_checkbox( "autohide_bday", $INFO["autohide_bday"] )." Auto hide when none to show?"
-								 )      );
-								 						 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show forthcoming events?</b><br>This will show calendar events on the board index page in the stats section." ,
-										  $SKIN->form_yes_no( "show_calendar", $INFO['show_calendar'] )
-										  ."<br />".$SKIN->form_checkbox( "autohide_calendar", $INFO["autohide_calendar"] )." Auto hide when none to show?"
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show forthcoming events from today to [x] days ahead</b><br>This applies to the above option." ,
-										  $SKIN->form_input( "calendar_limit", $INFO['calendar_limit']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Starting year for calendar 'Year' drop down box</b><br>This applies to view calendar / post event." ,
-										  $SKIN->form_input( "start_year", $INFO['start_year']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Year end limit for 'Year' drop down box</b><br>This applies to view calendar / post event.<br>Example: current year is 2002, you enter 5 - last choosable year = 2007" ,
-										  $SKIN->form_input( "year_limit", $INFO['year_limit']  )
-								 )      );
-								 
- 		
-								 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// URLs and ADDRESSES
-	//--------------------------------------------------------------
-	
-	function board()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('doboard', 'Board offline/online', 'You may change the configuration below');
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Turn the board offline?</b><br>The board will still be accessable by those who have permission" ,
-										  $SKIN->form_yes_no( "board_offline", $INFO['board_offline'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>The offline message to display</b>" ,
-										  $SKIN->form_textarea( "offline_msg", $INFO['offline_msg']  )
-								 )      );
-								 
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// EMOTICON FUNCTIONS
-	//-------------------------------------------------------------
-	
-	function doedit_emoticons()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['before'] == "")
-		{
-			$ADMIN->error("You must enter text to replace, silly!");
-		}
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid emoticon id, silly!");
-		}
-		
-		if ( strstr( $IN['before'], '&#092;' ) )
-		{
-			$ADMIN->error("You cannot use the backslash character in \"{$IN['before']}\". Please use another character");
-		}
-		
-		$IN['clickable'] = $IN['clickable'] ? 1 : 0;
-		
-		$db_string = $DB->compile_db_update_string( array( 'typed'     => $IN['before'],
-														   'image'     => $IN['after'],
-														   'clickable' => $IN['click'],
-												  )      );
-												  
-		$DB->query("UPDATE ibf_emoticons SET $db_string WHERE id='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=emo");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	
-	function edit_emoticons()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may edit the emoticon filter below";
-		$ADMIN->page_title  = "Edit Emoticon";
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid filter id, silly!");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_emoticons WHERE id='".$IN['id']."'");
-		
-		if ( ! $r = $DB->fetch_row() )
-		{
-			$ADMIN->error("We could not find that emoticon in the database");
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'emo_doedit' ),
-												  2 => array( 'act'   , 'op'     ),
-												  3 => array( 'id'    , $IN['id'] ),
-									     )      );
-		
-		
-		
-		$SKIN->td_header[] = array( "Before"  , "40%" );
-		$SKIN->td_header[] = array( "After"   , "40%" );
-		$SKIN->td_header[] = array( "+ Clickable"  , "20%" );
-		
-		//+-------------------------------
-		
-		$emos = array();
-		
-		if (! is_dir($INFO['html_dir'].'emoticons') )
-		{
-			$ADMIN->error("Could not locate the emoticons directory - make sure the 'html_dir' path is set correctly");
-		}
-		
-		//+-------------------------------
-		
-		
-		$dh = opendir( $INFO['html_dir'].'emoticons' ) or die("Could not open the emoticons directory for reading, check paths and permissions");
- 		while ( $file = readdir( $dh ) )
- 		{
- 			if ( !preg_match( "/^..?$|^index|htm$|html$|^\./i", $file ) )
- 			{
- 				$emos[] = array( $file, $file );
- 			}
- 		}
- 		closedir( $dh );
- 		
- 		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Edit an Emoticon" );
-		
-		$ADMIN->html .= "<script language='javascript'>
-						 <!--
-						 	function show_emo() {
-						 	
-						 		var emo_url = '{$INFO['html_url']}/emoticons/' + document.theAdminForm.after.options[document.theAdminForm.after.selectedIndex].value;
-						 		
-						 		document.images.emopreview.src = emo_url;
-							}
-						//-->
-						</script>
-						";
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( $SKIN->form_input('before', stripslashes($r['typed']) ),
-												  $SKIN->form_dropdown('after', $emos, $r['image'], "onChange='show_emo()'") . "&nbsp;&nbsp;<img src='html/emoticons/{$r['image']}' name='emopreview' border='0'>",
-												  $SKIN->form_dropdown( 'click', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ), $r['clickable'] )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form('Edit Emoticon');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	//=====================================================
-	
-	function remove_emoticons()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid emoticon id, silly!");
-		}
-		
-		$DB->query("DELETE FROM ibf_emoticons WHERE id='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=emo");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	function add_emoticons()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['before'] == "")
-		{
-			$ADMIN->error("You must enter an emoticon text to replace, silly!");
-		}
-		
-		if ( strstr( $IN['before'], '&#092;' ) )
-		{
-			$ADMIN->error("You cannot use the backslash character in \"{$IN['before']}\". Please use another character");
-		}
-		
-		$IN['click'] = $IN['click'] ? 1 : 0;
-		
-		$db_string = $DB->compile_db_insert_string( array( 'typed'      => $IN['before'],
-														   'image'      => $IN['after'],
-														   'clickable'  => $IN['click'],
-												  )      );
-												  
-		$DB->query("INSERT INTO ibf_emoticons (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=emo");
-		exit();
-			
-		
-	}
-	
-	
-	function perly_length_sort($a, $b)
-	{
-		if ( strlen($a['typed']) == strlen($b['typed']) )
-		{
-			return 0;
-		}
-		return ( strlen($a['typed']) > strlen($b['typed']) ) ? -1 : 1;
-	}
-	
-	function perly_word_sort($a, $b)
-	{
-		if ( strlen($a['type']) == strlen($b['type']) )
-		{
-			return 0;
-		}
-		return ( strlen($a['type']) > strlen($b['type']) ) ? -1 : 1;
-	}
-	
-	//=====================================================
-	
-	function upload_emoticon()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_FILES;
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		if (! is_dir($INFO['html_dir'].'emoticons') )
-		{
-			$ADMIN->error("Could not locate the emoticons directory - make sure the 'html_dir' path is set correctly");
-		}
-							
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") )
-		{
-			$ADMIN->error("No file was chosen to upload!");
-		}
-		
-		//-------------------------------------------------
-		// Copy the upload to the uploads directory
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $INFO['html_dir'].'emoticons'."/".$FILE_NAME) )
-		{
-			$ADMIN->error("The upload failed");
-		}
-		else
-		{
-			@chmod( $INFO['html_dir'].'emoticons'."/".$FILE_NAME, 0777 );
-		}
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=emo");
-		exit();
-		
-		
-	}
-	
-	function emoticons()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may add/edit or remove emoticons in this section.<br>You can only choose emoticons that have been uploaded into the 'html/emoticons' directory.<br><br>Clickable refers to emoticons that are in the posting screens 'Clickable Emoticons' table.";
-		$ADMIN->page_title  = "Emoticon Control";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Before"      , "30%" );
-		$SKIN->td_header[] = array( "After"       , "30%" );
-		$SKIN->td_header[] = array( "+ Clickable" , "20%" );
-		$SKIN->td_header[] = array( "Edit"        , "10%" );
-		$SKIN->td_header[] = array( "Remove"      , "10%" );
-		
-		//+-------------------------------
-		
-		
-		
-		$ADMIN->html .= $SKIN->start_table( "Current Emoticons" );
-		
-		$DB->query("SELECT * from ibf_emoticons");
-		
-		$emo_url = $INFO['html_url'] . '/emoticons';
-		
-		$smilies = array();
-			
-		if ( $DB->get_num_rows() )
-		{
-			while ( $r = $DB->fetch_row() )
-			{
-				$smilies[] = $r;
-			}
-			
-			usort($smilies, array( 'ad_settings', 'perly_length_sort' ) );
-			
-			foreach( $smilies as $array_idx => $r )
-			{
-			
-				$click = $r['clickable'] ? 'Yes' : 'No';
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( stripslashes($r['typed']),
-														  "<center><img src='$emo_url/{$r['image']}'></center>",
-														  "<center>$click</center>",
-														  "<center><a href='".$SKIN->base_url."&act=op&code=emo_edit&id={$r['id']}'>Edit</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=op&code=emo_remove&id={$r['id']}'>Remove</a></center>",
-												 )      );
-												   
-			
-				
-			}
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$emos = array();
-		
-		if (! is_dir($INFO['html_dir'].'emoticons') )
-		{
-			$ADMIN->error("Could not locate the emoticons directory - make sure the 'html_dir' path is set correctly");
-		}
-		
-		//+-------------------------------
-		
-		$cnt   = 0;
-		$start = "";
-		
-		$dh = opendir( $INFO['html_dir'].'emoticons' ) or die("Could not open the emoticons directory for reading, check paths and permissions");
- 		while ( $file = readdir( $dh ) )
- 		{
- 			if ( !preg_match( "/^..?$|^index|htm$|html$|^\./i", $file ) )
- 			{
- 				$emos[] = array( $file, $file );
- 				
- 				if ($cnt == 0)
- 				{
- 					$cnt = 1;
- 					$start = $file;
- 				}
- 			}
- 		}
- 		closedir( $dh );
- 		
- 		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'emo_add' ),
-												  2 => array( 'act'   , 'op'     ),
-									     )      );
-		
-		
-		$SKIN->td_header[] = array( "Before"       , "40%" );
-		$SKIN->td_header[] = array( "After"        , "40%" );
-		$SKIN->td_header[] = array( "+ Clickable"  , "20%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= "<script language='javascript'>
-						 <!--
-						 	function show_emo() {
-						 	
-						 		var emo_url = '{$INFO['html_url']}/emoticons/' + document.theAdminForm.after.options[document.theAdminForm.after.selectedIndex].value;
-						 		
-						 		document.images.emopreview.src = emo_url;
-							}
-						//-->
-						</script>
-						";
-		
-		$ADMIN->html .= $SKIN->start_table( "Add a new Emoticon" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( $SKIN->form_input('before'),
-												  $SKIN->form_dropdown('after', $emos, "", "onChange='show_emo()'") . "&nbsp;&nbsp;<img src='html/emoticons/$start' name='emopreview' border='0'>",
-												  $SKIN->form_dropdown( 'click', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form('Add Emoticon');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'emo_upload' ),
-												  2 => array( 'act'   , 'op'     ),
-												  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
-									     ) , "uploadform", " enctype='multipart/form-data'"     );
-		
-		
-		$SKIN->td_header[] = array( "&nbsp;"       , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"       , "60%" );
-		
-		
-		$ADMIN->html .= $SKIN->start_table( "Upload an Emoticon to the emoticons directory" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose a file from your computer to upload</b><br>After uploading, the emoticon will be selectable from the form above.",
-												  $SKIN->form_upload(),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form('Upload Emoticon');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	//-------------------------------------------------------------
-	// BADWORD FUNCTIONS
-	//--------------------------------------------------------------
-	
-	
-	function doedit_badword()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['before'] == "")
-		{
-			$ADMIN->error("You must enter a word to replace, silly!");
-		}
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid filter id, silly!");
-		}
-		
-		$IN['match'] = $IN['match'] ? 1 : 0;
-		
-		strlen($IN['swop']) > 1 ?  $IN['swop'] : "";
-		
-		$db_string = $DB->compile_db_update_string( array( 'type'    => $IN['before'],
-														   'swop'    => $IN['after'],
-														   'm_exact' => $IN['match'],
-												  )      );
-												  
-		$DB->query("UPDATE ibf_badwords SET $db_string WHERE wid='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=bw");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	function edit_badword()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You may edit the chosen filter below";
-		$ADMIN->page_title  = "Bad Word Filter";
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid filter id, silly!");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_badwords WHERE wid='".$IN['id']."'");
-		
-		if ( ! $r = $DB->fetch_row() )
-		{
-			$ADMIN->error("We could not find that filter in the database");
-		}
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'bw_doedit' ),
-												  2 => array( 'act'   , 'op'     ),
-												  3 => array( 'id'    , $IN['id'] ),
-									     )      );
-		
-		
-		
-		$SKIN->td_header[] = array( "Before"  , "40%" );
-		$SKIN->td_header[] = array( "After"   , "40%" );
-		$SKIN->td_header[] = array( "Method"  , "20%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Edit a filter" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( $SKIN->form_input('before', stripslashes($r['type']) ),
-												  $SKIN->form_input('after' , stripslashes($r['swop']) ),
-												  $SKIN->form_dropdown( 'match', array( 0 => array( 1, 'Exact'  ), 1 => array( 0, 'Loose' ) ), $r['m_exact'] )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form('Edit Filter');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	//=====================================================
-	
-	function remove_badword()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must pass a valid filter id, silly!");
-		}
-		
-		$DB->query("DELETE FROM ibf_badwords WHERE wid='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=bw");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	function add_badword()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['before'] == "")
-		{
-			$ADMIN->error("You must enter a word to replace, silly!");
-		}
-		
-		$IN['match'] = $IN['match'] ? 1 : 0;
-		
-		strlen($IN['swop']) > 1 ?  $IN['swop'] : "";
-		
-		$db_string = $DB->compile_db_insert_string( array( 'type'    => $IN['before'],
-														   'swop'    => $IN['after'],
-														   'm_exact' => $IN['match'],
-												  )      );
-												  
-		$DB->query("INSERT INTO ibf_badwords (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		$std->boink_it($SKIN->base_url."&act=op&code=bw");
-		exit();
-			
-		
-	}
-	
-	//=====================================================
-	
-	function badword()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$ADMIN->page_detail = "You can add/edit and remove bad word filters in this section.<br>The badword filter allows you to globally replace words from a members post, signature and topic title.<br><br><b>Loose matching</b>: If you entered 'hell' as a bad word, it will replace 'hell' and 'hello' with either your replacement if entered or 6 hashes (case insensitive)<br><br><b>Exact matching</b>: If you entered 'hell' as a bad word, it will replace 'hell' only with either your replacement if entered or 6 hashes (case insensitive)";
-		$ADMIN->page_title  = "Bad Word Filter";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'bw_add' ),
-												  2 => array( 'act'   , 'op'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Before"  , "30%" );
-		$SKIN->td_header[] = array( "After"   , "30%" );
-		$SKIN->td_header[] = array( "Method"  , "20%" );
-		$SKIN->td_header[] = array( "Edit"    , "10%" );
-		$SKIN->td_header[] = array( "Remove"  , "10%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Current Filters" );
-		
-		$DB->query("SELECT * from ibf_badwords");
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $r = $DB->fetch_row() )
-			{
-				$words[] = $r;
-			}
-			
-			usort($words, array( 'ad_settings', 'perly_word_sort' ) );
-			
-			foreach($words as $idx => $r)
-			{
-			
-				$replace = $r['swop']    ? stripslashes($r['swop']) : '######';
-				
-				$method  = $r['m_exact'] ? 'Exact' : 'Loose';
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( stripslashes($r['type']),
-														  $replace,
-														  $method,
-														  "<center><a href='".$SKIN->base_url."&act=op&code=bw_edit&id={$r['wid']}'>Edit</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=op&code=bw_remove&id={$r['wid']}'>Remove</a></center>",
-												 )      );
-			}
-			
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		$SKIN->td_header[] = array( "Before"  , "40%" );
-		$SKIN->td_header[] = array( "After"   , "40%" );
-		$SKIN->td_header[] = array( "Method"  , "20%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Add a new filter" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( $SKIN->form_input('before'),
-												  $SKIN->form_input('after'),
-												  $SKIN->form_dropdown( 'match', array( 0 => array( 1, 'Exact'  ), 1 => array( 0, 'Loose' ) ) )
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_form('Add Filter');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	//-------------------------------------------------------------
-	// NEWS
-	//--------------------------------------------------------------
-	
-	function news()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('donews', 'News Export Set-Up', 'You may change the configuration below');
-		
-		$DB->query("SELECT id, name FROM ibf_forums ORDER BY name");
-		
-		$form_array = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$form_array[] = array( $r['id'], $r['name'] );
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Export news topics from which forum?</b>" ,
-										  $SKIN->form_dropdown( "news_forum_id", $form_array, $INFO['news_forum_id']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show a 'Latest News' link on the board index?</b>" ,
-										  $SKIN->form_yes_no( "index_news_link", $INFO['index_news_link']  )
-								 )      );
-		
-		
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// PM
-	//--------------------------------------------------------------
-	
-	function pm()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('dopm', 'Messenger Set up', 'You may change the configuration below');
-		
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow IBF Code in messages?</b>" ,
-										  $SKIN->form_yes_no( "msg_allow_code", $INFO['msg_allow_code']  )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow HTML in messages?</b>" ,
-										  $SKIN->form_yes_no( "msg_allow_html", $INFO['msg_allow_html']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. number of messages to show per page when viewing message list</b><br>Default is 50" ,
-										  $SKIN->form_input( "show_max_msg_list", $INFO['show_max_msg_list']  )
-								 )      );
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// EMAIL functions
-	//--------------------------------------------------------------
-	
-	function email()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('doemail', 'Email Set Up', 'You may change the configuration below');
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Email Addresses', 'left', 'catrow2' );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Board incoming email address</b>" ,
-										  $SKIN->form_input( "email_in", $INFO['email_in']  )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Board outgoing email address</b>" ,
-										  $SKIN->form_input( "email_out", $INFO['email_out']  )
-								 )      );
-								 
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_basic( 'Mail Method', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Mail Method</b><br>If PHP's mail() isn't available, choose SMTP" ,
-										  $SKIN->form_dropdown( "mail_method", 
-										  						 array(
-										  						 		0 => array( 'mail', 'PHP mail()' ),
-										  						 		1 => array( 'smtp', 'SMTP'  ),
-										  						 	  ),
-										  						 $INFO['mail_method']  )
-								 )      );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_basic( 'SMTP Options', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Over-ride SMTP Host?</b><br>Default is 'localhost'" ,
-										  $SKIN->form_input( "smtp_host", $INFO['smtp_host']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Over-ride SMTP Port?</b><br>Default is 25" ,
-										  $SKIN->form_input( "smtp_port", $INFO['smtp_port']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>SMTP UserName</b><br>Not required in most cases when using 'localhost'" ,
-										  $SKIN->form_input( "smtp_user", $INFO['smtp_user']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>SMTP Password</b><br>Not required in most cases when using 'localhost'" ,
-										  $SKIN->form_input( "smtp_pass", $INFO['smtp_pass'], 'password'  )
-								 )      );
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// URLs and ADDRESSES
-	//--------------------------------------------------------------
-	
-	function url()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('dourl', 'Global Set Up', 'You may change the configuration below');
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_basic( 'Board Name and HTTP addresses', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Board Name</b>" ,
-										  $SKIN->form_input( "board_name", $INFO['board_name']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Board Address</b>" ,
-										  $SKIN->form_input( "board_url", $INFO['board_url']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Website Name</b>" ,
-										  $SKIN->form_input( "home_name", $INFO['home_name']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Website Address</b>" ,
-										  $SKIN->form_input( "home_url", $INFO['home_url']  )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>HTML URL</b><br>For images, etc" ,
-										  $SKIN->form_input( "html_url", $INFO['html_url']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Upload URL</b>" ,
-										  $SKIN->form_input( "upload_url", $INFO['upload_url']  )
-								 )      );
-								 					 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Board Server Paths', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Path to 'html' directory</b><br>Note: this is a path, not a URL" ,
-										  $SKIN->form_input( "html_dir", $INFO['html_dir']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Upload Directory</b>" ,
-										  $SKIN->form_input( "upload_dir", $INFO['upload_dir']  )
-								 )      );
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'HTTP Environment', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Print HTTP headers?</b><br>(Some NT installs require this off)" ,
-										  $SKIN->form_yes_no( "print_headers", $INFO['print_headers'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><i>DISABLE</I> GZIP encoding?</b><br>(GZIP enables faster page transfer and lower bandwidth use)" ,
-										  $SKIN->form_yes_no( "disable_gzip", $INFO['disable_gzip'] )
-								 )      );
-								 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Type of auto-redirect?</b><br>(This is for quick no page redirects)" ,
-										  $SKIN->form_dropdown( 'header_redirect', 
-										  						 array(
-										  						 		0 => array( 'location', 'Location type (*nix savvy)' ),
-										  						 		1 => array( 'refresh' , 'Refresh (Windows savvy)' ),
-										  						 		2 => array( 'html'    , 'HTML META redirect (If all else fails...)' ),
-										  						 	  ),
-										  						 $INFO['header_redirect']  )
-								 )      );
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Debugging', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Debug level</b>" ,
-										  $SKIN->form_dropdown( "debug_level", 
-										  						 array(
-										  						 		0 => array( 0, '0: None - Don\'t show any debug information' ),
-										  						 		1 => array( 1, '1: Show server load, page generation times and query count' ),
-										  						 		2 => array( 2, '2: Show level 1 (above) and GET and POST information'),
-										  						 		3 => array( 3, '3: Show level 1 + 2 and database queries'),
-										  						 	  ),
-										  						 $INFO['debug_level']  )
-								 )      );
-								 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><i>ENABLE</I> SQL Debug Mode?</b><br>(If yes, add '&debug=1' to any page to view mySQL debug info)" ,
-										  $SKIN->form_yes_no( "sql_debug", $INFO['sql_debug'] )
-								 )      );
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Global Skin Settings', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Use safe mode skins?</b><br>(Note: You may need to resynchronise your template sets after changing this if you have custom/edited skins)" ,
-										  $SKIN->form_dropdown( 'safe_mode_skins', 
-										  						 array(
-										  						 		0 => array( '0', 'No' ),
-										  						 		1 => array( '1' , 'Yes' ),
-										  						 	  ),
-										  						 $INFO['safe_mode_skins']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number Formatting</b><br>You may choose which character to separate thousands from hundreds<br>(EG: USA & UK use a comma)" ,
-										  $SKIN->form_dropdown( 'number_format', 
-										  						 array(
-										  						 		0 => array( 'none', 'Don\'t format' ),
-										  						 		1 => array( 'space' , 'Space' ),
-										  						 		2 => array( ',' , ',' ),
-										  						 		3 => array( '.' , '.' ),
-										  						 	  ),
-										  						 $INFO['number_format']  )
-								 )      );
-								 
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	// CPU SAVING
-	//--------------------------------------------------------------
-	
-	function cpu()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('docpu', 'CPU Saving', 'You can opt to turn some features off to minimize the resource footprint');
-		
-		
-		if ($INFO['au_cutoff'] == "")
-		{
-			$INFO['au_cutoff'] = 15;
-		}
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'SQL Savings', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Active Users?</b>" ,
-										  $SKIN->form_yes_no( "show_active", $INFO['show_active'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Cut off for active user display in minutes</b>" ,
-										  $SKIN->form_input( "au_cutoff", $INFO['au_cutoff'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Birthdays?</b>" ,
-										  $SKIN->form_yes_no( "show_birthdays", $INFO['show_birthdays'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Board Totals?</b>" ,
-										  $SKIN->form_yes_no( "show_totals", $INFO['show_totals'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow custom profile field info be used in TopicView?</b>" ,
-										  $SKIN->form_yes_no( "custom_profile_topic", $INFO['custom_profile_topic'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Mark topics a user has posted when displaying a forum?</b>" ,
-										  $SKIN->form_yes_no( "show_user_posted", $INFO['show_user_posted'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Remove 'Users Browsing this <u>forum</u>' feature?</b><br>(This save 1 query per forum view)" ,
-										  $SKIN->form_yes_no( "no_au_forum", $INFO['no_au_forum'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Remove 'Users Browsing this <u>topic</u>' feature?</b><br>(This save 1 query per topic view)" ,
-										  $SKIN->form_yes_no( "no_au_topic", $INFO['no_au_topic'] )
-								 )      );
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'CPU Savings', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Server Load Limit</b><br>Will display 'busy' message when limit hit<br>Can be left blank for no limit" ,
-										  $SKIN->form_input( "load_limit", $INFO['load_limit']  )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow users (where allowed) to use search?</b>" ,
-										  $SKIN->form_yes_no( "allow_search", $INFO['allow_search'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Cut search post to [x] characters</b><br>Refers to when returning search results as posts<br>Leave blank to return full post with proper formatting" ,
-										  $SKIN->form_input( "search_post_cut", $INFO['search_post_cut'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Minimum search word length</b><br>Allowing shorter search words can return more results, such as 'if', 'at', etc" ,
-										  $SKIN->form_input( "min_search_word", $INFO['min_search_word'] )."<br>Note, if you have enabled full text searching, the minimum is 4 characters and cannot be changed via IPB"
-								 )      );
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Bandwidth Savings', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Print HTTP no-cache headers?</b><br>(This will stop browsers caching pages)" ,
-										  $SKIN->form_yes_no( "nocache", $INFO['nocache'] )
-								 )      );
-								 
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show short forum jump list?</b><br>This will remove sub-forums from the drop down list - useful if you have many" ,
-										  $SKIN->form_yes_no( "short_forum_jump", $INFO['short_forum_jump'] )
-								 )      );
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// DATES
-	//--------------------------------------------------------------
-	
-	function dates()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('dodates', 'Dates', 'Define date formats');
-		
-		$time_array = array();
-		
-		require ROOT_PATH."lang/en/lang_ucp.php";
-		
-		foreach( $lang as $off => $words )
- 		{
- 			if (preg_match("/^time_(\S+)$/", $off, $match))
- 			{
- 				$time_select[] = array( $match[1], $words );
- 			}
- 		}
- 		
- 		$d_date = $std->get_date(time(), 'LONG');
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Native Server Time Zone</b><br><span style='color:red'>If you have chosen the correct timezone and the clock is an hour out, this is because of daylight savings time and your members can correct this by editing their 'Board settings' via their User Control Panel.</span>" ,
-										  $SKIN->form_dropdown( "time_offset", $time_select, $INFO['time_offset']  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Server Time Adjustment (in minutes)</b><br>You fine tune the server time. If you need to subtract minutes from the server time, start the number with a '-' (no quotes)." ,
-										  $SKIN->form_input( "time_adjust", $INFO['time_adjust'] ) . "<br>Board time (inc. above time zone and current adj.) is now: $d_date"
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Short time format</b><br>Same configuration as <a href='http://www.php.net/date' target='_blank'>PHP Date</a>" ,
-										  $SKIN->form_input( "clock_short", $INFO['clock_short'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Join date time format</b><br>Same configuration as <a href='http://www.php.net/date' target='_blank'>PHP Date</a>" ,
-										  $SKIN->form_input( "clock_joined", $INFO['clock_joined'] )
-								 )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Long time format</b><br>Same configuration as <a href='http://www.php.net/date' target='_blank'>PHP Date</a>" ,
-										  $SKIN->form_input( "clock_long", $INFO['clock_long'] )
-								 )      );
- 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// AVATARS
-	//--------------------------------------------------------------
-	
-	function avatars()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('doavatars', 'User Profiles', 'Define user profile permissions');
-		
-		$INFO['avatar_ext'] = preg_replace( "/\|/", ",", $INFO['avatar_ext'] );
-		$INFO['photo_ext']  = preg_replace( "/\|/", ",", $INFO['photo_ext'] );
-		
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'User Profiles & Options', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow members to choose skins?</b>" ,
-										  $SKIN->form_yes_no( "allow_skins", $INFO['allow_skins'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of posts a member must have over before allowing them to change their member title?</b><br>Leave blank to disable completely" ,
-										  $SKIN->form_input( "post_titlechange", $INFO['post_titlechange'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Maximum length (in bytes) for the location field entry</b>" ,
-										  $SKIN->form_input( "max_location_length", $INFO['max_location_length'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Maximum length (in bytes) for the interests field entry</b>" ,
-										  $SKIN->form_input( "max_interest_length", $INFO['max_interest_length'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Maximum length (in bytes) for user signatures</b>" ,
-										  $SKIN->form_input( "max_sig_length", $INFO['max_sig_length'] )
-								 )      );						 
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow HTML in signatures?</b>" ,
-										  $SKIN->form_yes_no( "sig_allow_html", $INFO['sig_allow_html'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow IBF Code in signatures?</b>" ,
-										  $SKIN->form_yes_no( "sig_allow_ibc", $INFO['sig_allow_ibc'] )
-								 )      );
-								 
-		if ($INFO['postpage_contents'] == "")
-		{
-			$INFO['postpage_contents'] = '5,10,15,20,25,30,35,40';
-		}
-		
-		if ($INFO['topicpage_contents'] == "")
-		{
-			$INFO['topicpage_contents'] = '5,10,15,20,25,30,35,40';
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>User selectable posts per page dropdown contents</b><br>Separate with a comma, 'Use forum default' added automatically<br>Example: 5,15,20,25,30" ,
-										  $SKIN->form_input( "postpage_contents", $INFO['postpage_contents'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>User selectable topics per forum page dropdown contents</b><br>Separate with a comma, 'Use forum default' added automatically<br>Example: 5,15,20,25,30" ,
-										  $SKIN->form_input( "topicpage_contents", $INFO['topicpage_contents'] )
-								 )      );
-								 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Auto prune all topic subscriptions if the topic has no replies over [x] days</b><br>Leave blank for no auto prune limit" ,
-										  $SKIN->form_input( "subs_autoprune", $INFO['subs_autoprune'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allowed photo URL extensions</b><br>Seperate with comma (gif,png,jpeg) etc" ,
-										  $SKIN->form_input( "photo_ext", strlen($INFO['photo_ext']) > 1 ? $INFO['photo_ext'] : "gif,jpg,jpeg,png" )
-								 )      );
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Avatars', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Disable IPB auto sizing large photos/avatars?</b><br/ >This will ask the member to input their dimensions" ,
-										  $SKIN->form_yes_no( "disable_ipbsize", $INFO['disable_ipbsize'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow the use of avatars?</b>" ,
-										  $SKIN->form_yes_no( "avatars_on", $INFO['avatars_on'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allowed image extensions</b><br>Seperate with comma (gif,png,jpeg) etc" ,
-										  $SKIN->form_input( "avatar_ext", $INFO['avatar_ext'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow users to use remote URL avatars?</b>" ,
-										  $SKIN->form_yes_no( "avatar_url", $INFO['avatar_url'] )
-								 )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. file size for avatar uploads? (K)</b>" ,
-										  $SKIN->form_input( "avup_size_max", $INFO['avup_size_max'] )
-								 )      );
- 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Maximum avatar dimensions</b><br>(WIDTH<b>x</b>HEIGHT)" ,
-										  $SKIN->form_input( "avatar_dims", $INFO['avatar_dims'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Default sizes for gallery avatars</b><br>(WIDTH<b>x</b>HEIGHT)" ,
-										  $SKIN->form_input( "avatar_def", $INFO['avatar_def'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of columns for the avatar gallery?</b>" ,
-										  $SKIN->form_input( 'av_gal_cols' 	, $INFO['av_gal_cols'] = $INFO['av_gal_cols'] ? $INFO['av_gal_cols'] : 5 )
-								 )      );						 
-								 
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Guest Permissions', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow GUESTS to view signatures?</b>" ,
-										  $SKIN->form_yes_no( "guests_sig", $INFO['guests_sig'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow GUESTS to view posted images?</b>" ,
-										  $SKIN->form_yes_no( "guests_img", $INFO['guests_img'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow GUESTS to view user avatars?</b>" ,
-										  $SKIN->form_yes_no( "guests_ava", $INFO['guests_ava'] )
-								 )      );
-								 
-			     
-								 					 
-		$this->common_footer();
-	
-	
-	}
-	
-	
-	//-------------------------------------------------------------
-	// TOPICS and POSTS
-	//--------------------------------------------------------------
-	
-	function post()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$INFO['img_ext'] = preg_replace( "/\|/", ",", $INFO['img_ext'] );
-	
-		$this->common_header('dopost', 'Topics, Posts and Posting', 'Configure the viewable post elements and limits.');
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Topics', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------	
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of topics per forum page</b>" ,
-										  $SKIN->form_input( "display_max_topics", $INFO['display_max_topics'] )
-								 )      );
-									     
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of posts needed to make a 'hot topic'?</b>" ,
-										  $SKIN->form_input( "hot_topic", $INFO['hot_topic'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Topic prefix for PINNED topics</b>" ,
-										  $SKIN->form_input( "pre_pinned", $INFO['pre_pinned'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Topic prefix for MOVED topics</b>" ,
-										  $SKIN->form_input( "pre_moved", $INFO['pre_moved'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Topic prefix for POLLS</b>" ,
-										  $SKIN->form_input( "pre_polls", $INFO['pre_polls'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Stop shouting in topic titles?</b><br>(Will turn: CLICK HERE into Click Here)" ,
-										  $SKIN->form_yes_no( "etfilter_shout", $INFO['etfilter_shout'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Remove excess exclamation/question marks in topic titles?</b><br>(Will turn: This!!!!! into This!)" ,
-										  $SKIN->form_yes_no( "etfilter_punct", $INFO['etfilter_punct'] )
-								 )      );						 
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Posts & Posting', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------	
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of posts per topic page</b>" ,
-										  $SKIN->form_input( "display_max_posts", $INFO['display_max_posts'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Order posts within a topic by</b>" ,
-										  $SKIN->form_dropdown( "post_order_column",
-										  				        array(
-										  				        		0 => array( 'pid'       , 'Post ID'   ),
-										  				        		1 => array( 'post_date' , 'Post Date' )
-										  				        	 ),
-																$INFO['post_order_column'] ? $INFO['post_order_column'] : 'pid'
-															  )
-															  . ' '.
-										  $SKIN->form_dropdown( "post_order_sort",
-										  				        array(
-										  				        		0 => array( 'asc'       , 'Ascending (0-9)'  ),
-										  				        		1 => array( 'desc'      , 'Descending (9-0)' )
-										  				        	 ),
-																$INFO['post_order_sort'] ? $INFO['post_order_sort'] : 'asc'
-															  )
-								 )      );					 
-								 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>No. emoticons per clickable table row</b>" ,
-										  $SKIN->form_input( "emo_per_row", $INFO['emo_per_row'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. no. emoticons per post</b>" ,
-										  $SKIN->form_input( "max_emos", $INFO['max_emos'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. no. images per post</b>" ,
-										  $SKIN->form_input( "max_images", $INFO['max_images'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. size of post (in kilobytes [kb])</b>" ,
-										  $SKIN->form_input( "max_post_length", $INFO['max_post_length'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. width of posted Flash movies (in pixels)</b>" ,
-										  $SKIN->form_input( "max_w_flash", $INFO['max_w_flash'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. height of posted Flash movies (in pixels)</b>" ,
-										  $SKIN->form_input( "max_h_flash", $INFO['max_h_flash'] )
-								 )      );
-								 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Valid postable image extensions</b><br>(Seperate with comma (gif,jpeg,jpg) etc" ,
-										  $SKIN->form_input( "img_ext", $INFO['img_ext'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show uploaded images in post?</b>" ,
-										  $SKIN->form_yes_no( "show_img_upload", $INFO['show_img_upload'] )
-										 ."<br />".$SKIN->form_checkbox( 'siu_thumb', $INFO['siu_thumb'] )."Show Thumb? Size ".$SKIN->form_simple_input( 'siu_width', $INFO['siu_width'] )." x ".$SKIN->form_simple_input( 'siu_height', $INFO['siu_height'] )
-								 )      );					 
-		
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Stop Quote Embedding?</b><br>This will remove any quoted text when quoting a post that contains quotes<br><a href='#' title='and if that made any sense, then you have a larger IQ than me.'>..</a>" ,
-										  $SKIN->form_yes_no( "strip_quotes", $INFO['strip_quotes'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Guest names <i>prefix</i></b><br>(This is for when a guest posts with a members name, it allows for a visual difference to prevent confusion)" ,
-										  $SKIN->form_input( "guest_name_pre", $INFO['guest_name_pre'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Guest names <i>suffix</i></b><br>(This is for when a guest posts with a members name, it allows for a visual difference to prevent confusion)" ,
-										  $SKIN->form_input( "guest_name_suf", $INFO['guest_name_suf'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>No. characters to word wrap on?</b><br>Prevents long unbroken words which distort tables. 80 - 100 is recommended" ,
-										  $SKIN->form_input( "post_wordwrap", $INFO['post_wordwrap'] )
-								 )      );
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Polls', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow [IMG] and [URL] tags in polls?</b>" ,
-										  $SKIN->form_yes_no( "poll_tags", $INFO['poll_tags'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Maximum number of poll choices allowed?</b><br>" ,
-										  $SKIN->form_input( "max_poll_choices", $INFO['max_poll_choices'] ? $INFO['max_poll_choices'] : 10)
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow members to view the results of a poll without losing their vote?</b>" ,
-										  $SKIN->form_yes_no( 'allow_result_view', $INFO['allow_result_view'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>DISABLE the ability for members to post a 'no-reply' poll?</b>" ,
-										  $SKIN->form_yes_no( 'poll_disable_noreply', $INFO['poll_disable_noreply'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of hours to keep open the ability for topic starters to attach a poll to their topic</b><br>Does not affect admins or super moderators" ,
-										  $SKIN->form_input( 'startpoll_cutoff', $INFO['startpoll_cutoff'] ? $INFO['startpoll_cutoff'] : 24)
-								 )      );
-								 					 						 						 						 					 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// SECURITY
-	//--------------------------------------------------------------
-	
-	function secure()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$this->common_header('dosecure', 'Security', 'Define the level of security your board possess by using the configurations below');
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Security (Script/Bot Flood Control)', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable Script/Bot Flood Control?</b><br>Forces users to input a random code when registering and changing email address, etc to prevent bot's from spamming the forms.".$SKIN->js_help_link('s_reg_antispam') ,
-										  $SKIN->form_dropdown( "bot_antispam", 
-										  						array(
-										  								0 => array( '0'    , 'None'                  ),
-										  								1 => array( 'gd'   , 'Advanced (Requires GD Library)'    ),
-										  								2 => array( 'gif'  , 'Normal (No special requirements)'  ),
-										  								
-										  							 ),
-										  					    $INFO['bot_antispam']
-										  					  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IF using GD; Use [YES] TTF method, or [NO] basic method?</b><br />TTF is best if available" ,
-										  $SKIN->form_yes_no( "use_ttf", isset($INFO['use_ttf']) ? $INFO['use_ttf'] : 1 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IF using GD & TTF; Image WIDTH</b>" ,
-										  $SKIN->form_input( "gd_width", isset($INFO['gd_width']) ? $INFO['gd_width'] : 250 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IF using GD & TTF; Image HEIGHT</b>" ,
-										  $SKIN->form_input( "gd_height", isset($INFO['gd_height']) ? $INFO['gd_height'] : 70 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>IF using GD & TTF; Path to used .ttf</b>" ,
-										  $SKIN->form_input( "gd_font", isset($INFO['gd_font']) ? $INFO['gd_font'] : getcwd().'/fonts/progbot.ttf' )
-								 )      );
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Security (High)', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow dynamic images?</b><br>If 'yes' users can post scripted image generators" ,
-										  $SKIN->form_yes_no( "allow_dynamic_img", $INFO['allow_dynamic_img'] )
-								 )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Session Expiration (in seconds)</b><br>Removes inactive sessions over the limit you specify" ,
-										  $SKIN->form_input( "session_expiration", $INFO['session_expiration'] )
-								 )      );
- 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Match users browsers while validating?</b>" ,
-										  $SKIN->form_yes_no( "match_browser", $INFO['match_browser'] )
-								 )      );
-								 
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Security (Medium)', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------
-		
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Use secure mail form for member to member mails?</b><br>Hides users email addresses" ,
-										  $SKIN->form_yes_no( "use_mail_form", $INFO['use_mail_form'] )
-								 )      );
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Security (Low)', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-								 					 
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow images to be posted?</b><br>Advanced programmers can force images to run as scripts. IBF limits damage by this method however." ,
-										  $SKIN->form_yes_no( "allow_images", $INFO['allow_images'] )
-								 )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow flash movies in posts and avatars?</b><br>Flash has a built in scripting language which may or may not compromise security" ,
-										  $SKIN->form_yes_no( "allow_flash", $INFO['allow_flash'] )
-								 )      );	
-								 
-								 
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Security (Troublesome Users)', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------						 					 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow duplicate emails when user registers?</b><br>Will not check for existing email address" ,
-										  $SKIN->form_yes_no( "allow_dup_email", $INFO['allow_dup_email'] )
-								 )      );
-		
-						 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>New registration email validation?</b><br>Make admin manually preview all new accounts or make new users validate their email address" ,
-										  $SKIN->form_dropdown( "reg_auth_type", 
-										  						array(
-										  								0 => array( 'user' , 'User Email Validation' ),
-										  								1 => array( 'admin', 'Admin Validation'      ),
-										  								2 => array( '0'    , 'None'                  )
-										  							 ),
-										  					    $INFO['reg_auth_type']
-										  					  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Remove incomplete registration validations after...</b>" ,
-										  $SKIN->form_simple_input( 'validate_day_prune', $INFO['validate_day_prune'], 3 ). "... days"
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Get notified when a new user registers via email?</b>" ,
-										  $SKIN->form_dropdown( "new_reg_notify", 
-										  						array(
-										  								0 => array( '1' , 'Yes' ),
-										  								1 => array( '0' , 'No'  )
-										  							 ),
-										  					    $INFO['new_reg_notify']
-										  					  )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Force guests to log in before allowing access to the board?</b>" ,
-										  $SKIN->form_yes_no( "force_login", $INFO['force_login'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Disable new registrations?</b>" ,
-										  $SKIN->form_yes_no( "no_reg", $INFO['no_reg'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Remove chr(0xCA) from input?</b><br />Can be used as a 'hidden' space to emulate registered names - but can cause problems in non Western character sets." ,
-										  $SKIN->form_yes_no( 'strip_space_chr', $INFO['strip_space_chr'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Disable 'Report this post to a moderator' link?</b>" ,
-										  $SKIN->form_yes_no( "disable_reportpost", $INFO['disable_reportpost'] )
-								 )      ); // 
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Flood control delay (in seconds)</b><br>Make users wait before posting again<br>Can be left blank for no flood control" ,
-										  $SKIN->form_input( "flood_control", $INFO['flood_control'] )
-								 )      );
-		
-		//-----------------------------------------------------------------------------------------------------------						 
-		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Privacy', 'left', 'catrow2' );
-		
-		//-----------------------------------------------------------------------------------------------------------	
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Allow users to browse the Active Users list?</b>" ,
-										  $SKIN->form_yes_no( "allow_online_list", $INFO['allow_online_list'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Disable root admin group viewing anonymous online users?</b><br>Anonymous users have an asterisk after their name" ,
-										  $SKIN->form_yes_no( "disable_admin_anon", $INFO['disable_admin_anon'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Disable root admin group viewing online users IP address in online user list?</b>" ,
-										  $SKIN->form_yes_no( "disable_online_ip", $INFO['disable_online_ip'] )
-								 )      );
-								 
-		
-								 					 
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	// COOKIES: Yum Yum!
-	//--------------------------------------------------------------
-	
-	function cookie()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('docookie', 'Cookies', 'All of these fields can be left blank. Experiment to find the correct settings for your host');
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Cookie Domain</b><br>Hint: use <b>.your-domain.com</b> for global cookies" ,
-										  $SKIN->form_input( "cookie_domain", $INFO['cookie_domain'] )
-								 )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Cookie Name Prefix</b><br>Allows multiple boards on one host." ,
-										  $SKIN->form_input( "cookie_id", $INFO['cookie_id'] )
-								 )      );
- 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Cookie Path</b><br>Relative path from domain to root IBF dir" ,
-										  $SKIN->form_input( "cookie_path", $INFO['cookie_path'] )
-								 )      );
-		
-		$this->common_footer();
-	
-	
-	}
-	
-	//-------------------------------------------------------------
-	//
-	// Save config. Does the hard work, so you don't have to.
-	//
-	//--------------------------------------------------------------
-	
-	function save_config( $new )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$master = array();
-		
-		if ( is_array($new) )
-		{
-			if ( count($new) > 0 )
-			{
-				foreach( $new as $field )
-				{
-				
-					// Handle special..
-					
-					if ($field == 'img_ext' or $field == 'avatar_ext' or $field == 'photo_ext')
-					{
-						$HTTP_POST_VARS[ $field ] = preg_replace( "/[\.\s]/", "" , $HTTP_POST_VARS[ $field ] );
-						$HTTP_POST_VARS[ $field ] = str_replace('|', "&#124;", $HTTP_POST_VARS[ $field ]);
-						$HTTP_POST_VARS[ $field ] = preg_replace( "/,/"     , '|', $HTTP_POST_VARS[ $field ] );
-					}
-					else if ($field == 'coppa_address')
-					{
-						$HTTP_POST_VARS[ $field ] = nl2br( $HTTP_POST_VARS[ $field ] );
-					}
-					
-					if ( $field == 'gd_font' OR $field == 'html_dir' OR $field == 'upload_dir')
-					{
-						$HTTP_POST_VARS[ $field ] = preg_replace( "/'/", "&#39;", $HTTP_POST_VARS[ $field ] );
-					}
-					else
-					{
-						$HTTP_POST_VARS[ $field ] = preg_replace( "/'/", "&#39;", stripslashes($HTTP_POST_VARS[ $field ]) );
-					}
-					
-					$master[ $field ] = stripslashes($HTTP_POST_VARS[ $field ]);
-				}
-				
-				$ADMIN->rebuild_config($master);
-			}
-		}
-		
-		$ADMIN->save_log("Board Settings Updated, Back Up Written");
-		
-		$ADMIN->done_screen("Forum Configurations updated", "Administration CP Home", "act=index" );
-		
-		
-		
-	}
-	//-------------------------------------------------------------
-	//
-	// Common header: Saves writing the same stuff out over and over
-	//
-	//--------------------------------------------------------------
-	
-	function common_header( $formcode = "", $section = "", $extra = "" )
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$extra = $extra ? $extra."<br>" : $extra;
-		
-		$ADMIN->page_detail = $extra . "Please check the data you are entering before submitting the changes";
-		$ADMIN->page_title  = "Board Settings ($section)";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $formcode ),
-												  2 => array( 'act'   , 'op'      ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Settings" );
-		
-	}
-
-	//-------------------------------------------------------------
-	//
-	// Common footer: Saves writing the same stuff out over and over
-	//
-	//--------------------------------------------------------------
-	
-	function common_footer( $button="Submit Changes" )
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	function return_sql_no_no_cant_do_it_sorry_text()
-	{
-return "
-<div style='line-height:150%'>
-<span id='large'>Unable to automatically create the FULLTEXT indexes</span>
-<br /><br />
-You have too many posts for an automatic FULLTEXT index creation. It is more than likely that PHP will
-time out before the indexes are complete which could cause some index corruption.
-<br />
-Creating FULLTEXT indexes is a relatively slow process but it's one that's worth doing as it will save you
-a lot of time and CPU power when your members search.
-<br />
-On average, a normal webserver is capable of indexing about 80,000 posts an hour but it is a relatively intense process. If you
-are using MySQL 4.0.12+ then this time is reduced substaintially.
-<br />
-<br />
-<strong style='color:red;font-size:14px'>How to manually create the indexes</strong>
-<br />
-If you have shell (SSH / Telnet) access to mysql, the process is very straightforward. If you do not have access to shell, then you will
-have to contact your webhost and ask them to do this for you.
-<br /><br />
-<strong>Step 1: Initiate mysql</strong>
-<br />
-In shell type:
-<br />
-<pre>mysql -u{your_sql_user_name} -p{your_sql_password}</pre>
-<br />
-Your MySQL username and password can be found in your conf_global.php file
-<br />
-<br />
-<strong>Step 2: Select your database</strong>
-<br />
-In mysql type:
-<br />
-<pre>use {your_database_name_here};</pre>
-<br />
-Make sure you use a trailing semi-colon. Your MySQL database name can be found in conf_global.php
-<br /><br />
-<strong>Step 3: Indexing the topics table</strong>
-<br />
-In mysql type:
-<br />
-<pre>\g alter table ibf_topics add fulltext(title);</pre>
-<br />
-If you are not using 'ibf_' as your table extension, adjust that query to suit. This query can take a while
-depending on the number of topics you have.
-<br />
-<br />
-<strong>Step 4: Indexing the posts table</strong>
-<br />
-In mysql type:
-<br />
-<pre>\g alter table ibf_posts add fulltext(post);</pre>
-<br />
-If you are not using 'ibf_' as your table extension, adjust that query to suit. This query can take a while
-depending on the number of posts you have. On average MySQL can index 80,000 posts an hour. If you are using MySQL 4, the time is greatly reduced.
-</div>
-";
-	}
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_skin_import.php b/upload/sources/Admin/ad_skin_import.php
deleted file mode 100644
index 28042ce9..00000000
--- a/upload/sources/Admin/ad_skin_import.php
+++ /dev/null
@@ -1,1067 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Import functions
-|   > Module written by Matt Mecham
-|   > Date started: 22nd April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_langs();
-
-
-class ad_langs {
-
-	var $base_url;
-
-	function ad_langs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-		
-			case 'doimport':
-				$this->doimport();
-				break;
-				
-			case 'import':
-				$this->import();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You did not select a tar-chive to import!");
-		}
-		
-		$this->tar_with_path = $INFO['base_dir']."archive_in/".$IN['id'];
-		
-		if ( ! unlink($this->tar_with_path) )
-		{
-			$ADMIN->error("Could not remove that file, please check the CHMOD permissions");
-		}
-		
-		$std->boink_it($ADMIN->base_url."&act=import");
-		exit();
-	
-	
-	}
-	
-	
-	//---------------------------------------------
-	// Import switcheroo
-	//---------------------------------------------
-	
-	function import()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You did not select a tar-chive to import!");
-		}
-		
-		$this->tar_with_path = $INFO['base_dir']."archive_in/".$IN['id'];
-		
-		$this->work_path     = $INFO['base_dir']."archive_in";
-		
-		if (! file_exists($this->tar_with_path) )
-		{
-			$ADMIN->error( "That archive is not found on the server, it may have been deleted by another admin");
-		}
-		
-		$this->tar_file = $IN['id'];
-		
-		$this->name_translated = preg_replace( "/^(css|image|set|wrap|tmpl)-(.+?)\.(\S+)$/", "\\2", $this->tar_file );
-		$this->name_translated = preg_replace( "/_/", " ", $this->name_translated );
-		
-		require ROOT_PATH."sources/lib/tar.php";
-		
-		$this->tar = new tar();
-		
-		switch($IN['type'])
-		{
-			case 'css':
-				$this->css_import();
-				break;
-				
-			case 'wrap':
-				$this->wrap_import();
-				break;
-				
-			case 'image':
-				$this->image_import();
-				break;
-				
-			case 'tmpl':
-				$this->template_import();
-				break;
-			case 'set':
-				$this->set_import();
-				break;
-				
-			//---------
-			default:
-				$ADMIN->error("Unrecognised archive type");
-				break;
-		}
-	
-	
-	}
-	
-	function set_import()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$images_dir    = $INFO['base_dir']."style_images";
-		$skins_dir     = $INFO['base_dir']."Skin";
-		
-		if (! is_writeable($images_dir) )
-		{
-			$ADMIN->error("Cannot write to the $images_dir directory, please set sufficient CHMOD permissions to allow this. IBF cannot do this for you.");
-		}
-		
-		if (! is_dir($skins_dir) )
-		{
-			$ADMIN->error("Cannot write to the $skins_dir directory, It is not there.");
-		}
-		
-		if (! is_writeable($skins_dir) )
-		{
-			$ADMIN->error("Cannot write to the $skins_dir directory, please set sufficient CHMOD permissions to allow this. IBF cannot do this for you.");
-		}
-		
-		//------------------------------------------------------
-		
-		$this->tar->new_tar( $this->work_path, $this->tar_file );
-		
-		$files = $this->tar->list_files();
-		
-		if (! $this->check_archive($files) )
-		{
-			$ADMIN->error("That is not a valid tar-achive, please re-upload in binary and try again");
-		}
-		
-		//------------------------------------------------------
-		
-		$DB->query("SELECT COUNT(*) as count FROM ibf_tmpl_names");
-		
-		$tmpl_count = $DB->fetch_row();
-		
-		//------------------------------------------------------
-		// Attempt to create a new work directory
-		//------------------------------------------------------
-		
-		$new_dir = preg_replace( "/^(.+?)\.tar$/", "\\1", $this->tar_file );
-		
-		$this->new_dir = $new_dir;
-		
-		if ( ! mkdir($this->work_path."/".$new_dir, 0777) )
-		{
-			$ADMIN->error("Directory creation failed, cannot import skin set. Please check the permission in 'archive_in'");
-		}
-		
-		@chmod($this->work_path."/".$new_dir, 0777);
-		
-		$next_id = array( 'css' => 0, 'wrap' => 0, 'templates' => 0, 'macro' => 0 );
-		
-		//------------------------------------------------------
-		// Add a dummy entries into the DB to get the next insert ID
-		//------------------------------------------------------
-		
-		$DB->query("INSERT INTO ibf_tmpl_names SET skname=\"".$this->name_translated." (Set Import).{$tmpl_count['count']}\"");
-		
-		$next_id['templates'] = $DB->get_insert_id();
-		
-		//------------------------------------------------------
-		
-		$DB->query("INSERT INTO ibf_css SET css_name=\"".$this->name_translated." (Set Import)\"");
-		
-		$next_id['css'] = $DB->get_insert_id();
-		
-		//------------------------------------------------------
-		
-		$DB->query("INSERT INTO ibf_templates SET name=\"".$this->name_translated." (Set Import)\"");
-		
-		$next_id['wrap'] = $DB->get_insert_id();
-		
-		//------------------------------------------------------
-		// Get the new macro set_id
-		//------------------------------------------------------
-		
-		$DB->query("SELECT MAX(set_id) as max FROM ibf_macro_name");
-		
-		$max = $DB->fetch_row();
-		
-		$next_id['macro'] = $max['max'] + 1;
-		
-		//------------------------------------------------------
-		// Attempt to create the new directories
-		//------------------------------------------------------
-		
-		$next_id['images'] = str_replace( " ", "_", substr($this->name_translated,0,8) ) . '-'. substr( time(), 7,10);
-		
-		if (! mkdir($images_dir."/".$next_id['images'], 0777) )
-		{
-			$this->import_error("Could not create a new directory in style_images", $next_id);
-		}
-		
-		@chmod($images_dir."/".$next_id['images'], 0777);
-		
-		//-----------------------------------------------------
-		
-		if (! mkdir($skins_dir."/s".$next_id['templates'], 0777) )
-		{
-			$this->import_error("Could not create a new directory in Skin", $next_id);
-		}
-		
-		@chmod($skins_dir."/s".$next_id['templates'], 0777);
-		
-		//------------------------------------------------------
-		
-		$this->tar->extract_files($this->work_path."/".$new_dir);
-		
-		if ($this->tar->error != "")
-		{
-			$this->import_error($this->tar->error, $next_id);
-		}
-		
-		//------------------------------------------------------
-		
-		if ( file_exists($this->work_path."/".$new_dir."/templates_conf.inc") )
-		{
-			require $this->work_path."/".$new_dir."/templates_conf.inc";
-			
-			$template_config = array( 'author'     => stripslashes($config['author']),
-									  'email'      => stripslashes($config['email']),
-									  'url'        => stripslashes($config['url']),
-									);
-									
-			$db_string = $DB->compile_db_update_string( $template_config );
-						   
-			$DB->query("UPDATE ibf_tmpl_names SET $db_string WHERE skid='{$next_id['templates']}'");
-		}
-		
-		//------------------------------------------------------
-		// Import the CSS
-		//------------------------------------------------------
-		
-		if ($FH = fopen( $this->work_path."/".$new_dir."/stylesheet.css", 'r' ) )
-		{
-			$css = fread($FH, filesize($this->work_path."/".$new_dir."/stylesheet.css") );
-			fclose($FH);
-			
-			//-------------------------
-			// Swop Binary to Ascii
-		    //-------------------------
-			
-			$css = preg_replace( "/\r/", "\n", stripslashes($css) );
-			
-			$css_string = $DB->compile_db_update_string( array(
-																 'css_name' => stripslashes( $this->name_translated )." (Import)",
-																 'css_text' => $css,
-													   )      );
-												   
-			$DB->query("UPDATE ibf_css SET $css_string WHERE cssid='{$next_id['css']}'");
-			
-		}
-		else
-		{
-			$this->import_error("Could not read the uploaded CSS archive file, please check the permissions on that file and try again", $next_id);
-		}
-		
-		//------------------------------------------------------
-		// Import the board wrapper
-		//------------------------------------------------------
-		
-		if ($FH = fopen( $this->work_path."/".$new_dir."/wrapper.html", 'r' ) )
-		{
-			$text = fread($FH, filesize($this->work_path."/".$new_dir."/wrapper.html") );
-			fclose($FH);
-			
-			//-------------------------
-			// Swop Binary to Ascii
-		    //-------------------------
-			
-			$text = preg_replace( "/\r/", "\n", stripslashes($text) );
-			
-			$wrap_string = $DB->compile_db_update_string( array(
-																  'name'     => stripslashes( $this->name_translated )." (Import)",
-																  'template' => $text,
-														)      );
-												   
-			$DB->query("UPDATE ibf_templates SET $wrap_string WHERE tmid='{$next_id['wrap']}'");
-			
-		}
-		else
-		{
-			$this->import_error("Could not read the uploaded board wrapper archive file, please check the permissions on that file and try again", $next_id);
-		}
-		
-		//------------------------------------------------------
-		// Attempt to copy over the image files
-		//------------------------------------------------------
-		
-		if (! $ADMIN->copy_dir($this->work_path."/".$new_dir."/images", $images_dir."/".$next_id['images']) )
-		{
-			$this->import_error("Could not import images, terminating the import", $next_id);
-		}
-		
-		//------------------------------------------------------
-		// Import the Macro's
-		//------------------------------------------------------
-		
-		if ($FH = fopen( $this->work_path."/".$new_dir."/macro.txt", 'r' ) )
-		{
-			$data = fread($FH, filesize($this->work_path."/".$new_dir."/macro.txt") );
-			fclose($FH);
-		
-			$init_array = array();
-			$final_keys = array();
-			
-			$init_array = explode("\n", $data);
-			
-			foreach( $init_array as $l )
-			{
-				if (preg_match( "~=~", $l ) )
-				{
-					// is valid line
-					
-					list($k, $v) = explode( "~=~", $l );
-					
-					$k = trim($k);
-					$v = trim($v);
-					
-					$final_keys[$k] = $v;
-				}
-			}
-	
-			foreach( $final_keys as $k => $v)
-			{
-				if ($v == '*UNASSIGNED*')
-				{
-					$v = "";
-				}
-				
-				$str = $DB->compile_db_insert_string( array (
-															'macro_value'   => stripslashes($k),
-															'macro_replace' => stripslashes($v),
-															'macro_set'     => $next_id['macro'],
-															'can_remove'    => 1,
-												)       );
-			
-				$DB->query("INSERT INTO ibf_macro ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-			}
-			
-			// Add the macro name
-			
-			$DB->query("INSERT INTO ibf_macro_name SET set_id='".$next_id['macro']."', set_name='".$this->name_translated."'");
-			
-		}
-		else
-		{
-			$this->import_error("Could not read the macro.txt file contained in the skin you're importing.", $next_id);
-		}
-		
-		$tmpl_string = $DB->compile_db_update_string( $template_config );
-						   
-		$DB->query("UPDATE ibf_tmpl_names SET $tmpl_string WHERE skid='{$next_id['templates']}'");
-		
-		//------------------------------------------------------
-		// Import the TEMPLATES - wohoo, this'll make the server burn
-		//------------------------------------------------------
-		
-		if ($FH = fopen( $this->work_path."/".$new_dir."/templates.html", 'r' ) )
-		{
-			$data = fread($FH, filesize($this->work_path."/".$new_dir."/templates.html") );
-			fclose($FH);
-			
-			//-------------------------------------------------
-			// Divide the file up into different sections
-			//-------------------------------------------------
-			
-			preg_match_all( "/<!--IBF_GROUP_START:(\S+?)-->(.+?)<!--IBF_GROUP_END:\S+?-->/s", $data, $match );
-			
-			for ($i=0; $i < count($match[0]); $i++)
-			{
-				$match[1][$i] = trim($match[1][$i]);
-				
-				$match[2][$i] = trim($match[2][$i]);
-				
-				// Pass it on to our handler..
-			
-				$this->process_template_group($match[2][$i], $next_id['templates'], $match[1][$i], 1 );
-			}
-		}
-		else
-		{
-			$this->import_error("Could not read the templates.html file contained in the skin you're importing.", $next_id);
-		}
-		
-		//------------------------------------------------------
-		// Add a new row to the skins table.
-		//------------------------------------------------------
-		
-		$DB->query("SELECT MAX(sid) as new_id FROM ibf_skins");
-			
-		$set = $DB->fetch_row();
-		
-		$set['new_id']++;
-		
-		$new_name = stripslashes( $this->name_translated )." (Import)".$set['new_id'];
-		
-		$skin_string = $DB->compile_db_insert_string( array( 'sname'       => $new_name,
-															 'sid'         => $set['new_id'],
-															 'set_id'      => $next_id['templates'],
-															 'tmpl_id'     => $next_id['wrap'],
-															 'img_dir'     => $next_id['images'],
-															 'css_id'      => $next_id['css'],
-															 'macro_id'    => $next_id['macro'],
-															 'hidden'      => 0,
-															 'default_set' => 0
-												    )      );
-							
-		$DB->query("INSERT INTO ibf_skins (".$skin_string['FIELD_NAMES'].") VALUES(".$skin_string['FIELD_VALUES'].")");
-		
-		$ADMIN->rm_dir($this->work_path."/".$new_dir);
-		
-		$ADMIN->done_screen("Skin set Imported", "Manage Skin sets", "act=sets" );
-		
-	}
-	
-	
-	//------------------------------------------------------
-	//process the template group
-	//------------------------------------------------------
-	
-	
-	function process_template_group($raw, $setid, $group, $isnew=0)
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$root_path = $INFO['base_dir'];
-		
-		$skin_dir  = $root_path."Skin/s".$setid;
-		
-		//-------------------------------------------
-		// If we are not using safe mode skins, lets
-		// test to make sure we can write to that dir
-		//-------------------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				if ($isnew == 1)
-				{
-					$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-				}
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-			
-			// Are we creating a new template set? 
-			// if so, lets create the directory
-			
-			if ($isnew == 1)
-			{
-				if ( ! is_writeable($root_path.'Skin') )
-				{	
-					$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-					$ADMIN->error("The directory 'Skin' is not writeable by this script. Please check the permissions on that directory. CHMOD to 0777 if in doubt and try again");
-				}
-				
-				/*if ( ! file_exists($skin_dir) )
-				{
-					// Directory does not exist, lets create it
-					
-					if ( ! @mkdir($skin_dir, 0777) )
-					{
-						$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-						$ADMIN->error("Could not create directory '$skin_dir' please check the CHMOD permissions and re-try");
-					}
-					else
-					{
-						@chmod($skin_dir, 0777);
-					}
-				}*/
-			}
-			else
-			{
-				if ( ! is_writeable($skin_dir) )
-				{
-					$ADMIN->error("Cannot write into '$skin_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-				}
-			}
-		
-		}
-		
-		//--------------------------------
-		// Remove everything up until the
-		// first <!--START tag...
-		//--------------------------------
-		
-		$raw = preg_replace( "/^.*?(<!--IBF_START_FUNC)/s", "\\1", trim($raw));
-		
-		$raw = str_replace( "\r\n", "\n", $raw);
-		
-		//+-------------------------------
-		// Convert the tags back to php native
-		//+-------------------------------
-		
-		$raw = $this->unconvert_tags($raw);
-		
-		//+-------------------------------
-		// Grab our vars and stuff
-		//+-------------------------------
-		
-		$master = array();
-		$flag   = 0;
-		
-		$eachline = explode( "\n", $raw );
-		
-		foreach ($eachline as $line)
-		{
-			if ($flag == 0)
-			{
-				// We're not gathering HTML, lets see if we have a new
-				// function start..
-				
-				if ( preg_match( "/\s*<!--IBF_START_FUNC\|(\S+?)\|(.*?)-->\s*/", $line, $matches) )
-				{
-					$func = trim($matches[1]);
-					$data = trim($matches[2]);
-					
-					if ($func != "")
-					{
-					
-						$flag = $func;
-						
-						$master[$func] = array( 'func_name'  => $func,
-												'func_data'  => $data,
-												'content'    => ""
-											  );
-					}
-					continue;
-					
-				}
-				
-			}
-			
-			if ( preg_match("/\s*?<!--IBF_END_FUNC\|$flag-->\s*?/", $line) )
-			{
-				 // We have found the end of the subbie..
-				 // Reset the flag and feed the next line.
-				 
-				 $flag = 0;
-				 continue;
-			}
-			else
-			{
-				// Carry on feeding the HTML...
-				
-				if ( isset($master[$flag]['content']) )
-				{
-					$master[$flag]['content'] .= $line."\n";
-					continue;
-				}
-			}
-			
-		}
-		
-		//+-------------------------------
-		// Start parsing the php skin file
-		//+-------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-		
-			$final = "<"."?php\n\n".
-					 "class $group {\n\n";
-			
-			foreach( $master as $func_name => $data )
-			{
-			
-				$final .= "\n\nfunction ".trim($data['func_name'])."(".trim($data['func_data']).") {\n".
-					   	  "global \$ibforums;\n".
-					   	  "return <<<EOF\n";
-					   	  
-			    $final .= trim($data['content']);
-					   
-				$final .= "\nEOF;\n}\n";
-				
-			}
-			
-			$final .= "\n\n}\n?".">";
-			
-			if ($fh = fopen( $skin_dir."/".$group.".php", 'w' ) )
-			{
-				fwrite($fh, $final, strlen($final) );
-				fclose($fh);
-				
-				@chmod( $skin_dir."/".$group.".php", 0777 );
-			}
-			else
-			{
-				if ($isnew == 1)
-				{
-					$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-				}
-				$errors[] = "Could not save information to $phpskin, please ensure that the CHMOD permissions are correct.";
-			}
-		
-		}
-		
-		//+-------------------------------
-		// Update the DB
-		//+-------------------------------
-		
-		
-		foreach( $master as $func_name => $data )
-		{
-		
-			if ($isnew == 0)
-			{
-				$str = $DB->compile_db_update_string( array(
-															  'section_content' => stripslashes(trim($data['content'])),
-															  'func_data'       => stripslashes(trim($data['func_data']))
-													)      );
-													
-				$DB->query("UPDATE ibf_skin_templates SET $str WHERE set_id='$setid' AND group_name='$group' AND func_name='".trim($data['func_name'])."'");
-			}
-			else
-			{
-				$str = $DB->compile_db_insert_string( array(
-															  'section_content' => stripslashes(trim($data['content'])),
-															  'func_data'       => stripslashes(trim($data['func_data'])),
-															  'set_id'          => $setid,
-															  'group_name'      => $group,
-															  'func_name'       => trim($data['func_name']),
-															  'can_remove'      => 0,
-													)      );
-													
-				$DB->query("INSERT INTO ibf_skin_templates ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-			}
-		}
-		
-		
-		return TRUE;
-		
-		
-	}
-	
-	
-	
-	//-------------------------------------------------------------------
-	
-	//-------------------------------------------------------------------
-	
-	function template_import()
-	{
-		// Depreciated
-		
-	}
-	
-	
-	//-------------------------------------------------------------------
-	
-	function image_import()
-	{
-		// Depreciated
-		
-	}
-	
-	//-------------------------------------------------------------------
-	
-	//-------------------------------------------------------------------
-	
-	function wrap_import()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		// Depreciated
-		
-	}
-	
-	//-------------------------------------------------------------------
-	
-	
-	function css_import()
-	{
-		// Depreciated
-		
-	}
-	
-	
-	
-	
-	//----------------------------------------------------
-	
-	function check_archive($files)
-	{
-		if (count($files) > 0)
-		{
-			foreach($files as $giles)
-			{
-				if ( ! preg_match( "/^(?:[\(\)\:\;\~\.\w\d\+\-\_\/]+)$/", $giles) )
-				{
-					return FALSE;
-				}
-			}
-		}
-		else
-		{
-			return FALSE;
-		}
-		
-		return TRUE;
-	}
-	
-	
-	//-------------------------------------------------------------
-	// SHOW ALL LANGUAGE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You can select which archives to import onto your board in this section. All archives must be uploaded into the 'archive_in' directory";
-		$ADMIN->page_title  = "Import Skin Archive Manager";
-		
-		
-		
-		//+-------------------------------
-		
-		$files = array();
-		
-		$dir = $INFO['base_dir']."/archive_in";
-			
-		if ( is_dir($dir) )
-		{
-			$handle = opendir($dir);
-			
-			while (($filename = readdir($handle)) !== false)
-			{
-				if (($filename != ".") && ($filename != ".."))
-				{
-					if (preg_match("/^(css|image|set|wrap|tmpl).+?\.(tar|html|css)$/", $filename))
-					{
-						$files[] = $filename;
-					}
-				}
-			}
-			
-			closedir($handle);
-			
-		}
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Name"         , "30%" );
-		$SKIN->td_header[] = array( "Type"         , "20%" );
-		$SKIN->td_header[] = array( "File Name"     , "30%" );
-		$SKIN->td_header[] = array( "Import"       , "10%" );
-		$SKIN->td_header[] = array( "Remove"       , "10%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Current Archives Uploaded" );
-		
-		if ( count($files) > 0 )
-		{
-			foreach($files as $file)
-			{
-			
-				$type = array( 'css'   => 'Style Sheet',
-							   'image' => 'Image & Macro set',
-							   'set'   => 'Skin Set Collection',
-							   'wrap'  => 'Board Wrapper',
-							   'tmpl'  => 'Template set'
-							 );
-							 
-				$rtype = preg_replace( "/^(css|image|set|wrap|tmpl).+?\.(\S+)$/"  , "\\1", $file );
-				
-				$rname = preg_replace( "/^(css|image|set|wrap|tmpl)-(.+?)\.(\S+)$/", "\\2", $file );
-				
-				$rname = preg_replace( "/_/", " ", $rname );
-				
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>$rname</b>",
-														  "<center>{$type[$rtype]}</center>",
-														  "<center>$file</center>",
-														  "<center><a href='".$SKIN->base_url."&act=import&code=import&type=$rtype&id=$file'>Import</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=import&code=remove&id=$file'>Remove</a></center>",
-												 )      );
-			}
-			
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	function unconvert_tags($t="")
-	{
-		if ($t == "")
-		{
-			return "";
-		}
-		
-		// Make some tags safe..
-		
-		$t = preg_replace( "/\{ibf\.vars\.(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)\}/", "" , $t );
-		
-		
-		$t = preg_replace( "/{ibf\.script_url}/i"   , '{$ibforums->base_url}'         , $t);
-		$t = preg_replace( "/{ibf\.session_id}/i"   , '{$ibforums->session_id}'       , $t);
-		$t = preg_replace( "/{ibf\.skin\.(\w+)}/"   , '{$ibforums->skin[\''."\\1".'\']}'   , $t);
-		$t = preg_replace( "/{ibf\.lang\.(\w+)}/"   , '{$ibforums->lang[\''."\\1".'\']}'   , $t);
-		$t = preg_replace( "/{ibf\.vars\.(\w+)}/"   , '{$ibforums->vars[\''."\\1".'\']}'   , $t);
-		$t = preg_replace( "/{ibf\.member\.(\w+)}/" , '{$ibforums->member[\''."\\1".'\']}' , $t);
-		
-		return $t;
-		
-	}
-	
-	function rebuild_phpskin($templates_dir, $skins_dir)
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$errors = array();
-		
-		require $templates_dir."/config.php";
-		
-		if ( $handle = opendir($templates_dir) )
-		{
-		
-			while (($filename = readdir($handle)) !== false)
-			{
-				if (($filename != ".") && ($filename != ".."))
-				{
-					if ( preg_match( "/^index\./", $filename ) )
-					{
-						continue;
-					}
-					
-					//-------------------------------------------
-				
-					if ( preg_match( "/\.html$/", $filename ) )
-					{
-						
-						$name = preg_replace( "/\.html$/", "", $filename );
-						
-						
-						if ($FHD = fopen($templates_dir."/".$filename, 'r') )
-						{
-							$text = fread($FHD, filesize($templates_dir."/".$filename) );
-							fclose($FHD);
-						}
-						else
-						{
-							$errors[] = "Could not open $filename, skipping file...";
-							continue;
-						}
-						
-						//----------------------------------------------------
-						
-						$need = count($skin[$name]);
-						$start = 0;
-						$end   = 0;
-						
-						if ($need < 1)
-						{
-							$errors[] = "Error recalling function data for $filename, skipping...";
-							continue;
-						}
-	
-						// check to make sure the splitter tags are intact
-						
-						foreach($skin[$name] as $func_name => $data)
-						{
-							if ( preg_match("/<!--\|IBF\|$func_name\|START\|-->/", $text) )
-							{
-								$start++;
-							}
-							
-							//+-------------------------------
-							
-							if ( preg_match("/<!--\|IBF\|$func_name\|END\|-->/", $text) )
-							{
-								$end++;
-							}
-						}
-						
-						if ($start != $end)
-						{
-							$errors[] = "Some start or end template splitter comments are missing in $filename, skipping file....";
-							continue;
-						}
-						
-						if ($start != $need)
-						{
-							$errors[] = "Some template splitter comments are missing in $filename, skipping file...";
-							continue;
-						}
-						
-						//+-------------------------------
-						// Convert the tags back to php native
-						//+-------------------------------
-						
-						$text = $this->unconvert_tags($text);
-						
-						//+-------------------------------
-						// Start parsing the php skin file
-						//+-------------------------------
-						
-						$final = "<"."?php\n\n".
-								 "class $name {\n\n";
-						
-						foreach($skin[$name] as $func_name => $data)
-						{
-						
-							$top = "\n\nfunction $func_name($data) {\n".
-								   "global \$ibforums;\n".
-								   "return <<<EOF\n";
-								   
-							$bum = "\nEOF;\n}\n";
-						
-							$text = preg_replace("/\s*<!--\|IBF\|$func_name\|START\|-->\s*\n/", "$top", $text);
-							
-							
-							//+-------------------------------
-							
-							$text = preg_replace("/\s*<!--\|IBF\|$func_name\|END\|-->\s*\n/", "$bum", $text);
-						}
-						
-						$end = "\n\n}\n?".">";
-						
-						$final .= $text.$end;
-						
-						if ($fh = fopen( $skins_dir."/".$name.".php", 'w' ) )
-						{
-							fwrite($fh, $final, strlen($final) );
-							fclose($fh);
-							@chmod( $skins_dir."/".$name.".php", 0777 );
-						}
-						else
-						{
-							$errors[] = "Could not save information to $phpskin, please ensure that the CHMOD permissions are correct.";
-						}
-						
-						$end   = "";
-						$final = "";
-						$top   = "";
-						
-					} // if *.php
-					
-				} // if not dir
-				
-			} // while loop
-			
-			closedir($handle);
-			
-		}
-		else
-		{
-			$errors[] = "Could not open the templates directory!";
-		}
-		
-		return $errors;
-	
-	}
-	
-	
-	function import_error( $error, $next_id)
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$DB->query("DELETE FROM ibf_macro_name WHERE set_id='{$next_id['macro']}'");
-		$DB->query("DELETE FROM ibf_macro WHERE macro_id='{$next_id['macro']}'");
-		$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='{$next_id['templates']}'");
-		$DB->query("DELETE FROM ibf_css WHERE cssid='{$next_id['css']}'");
-		$DB->query("DELETE FROM ibf_templates WHERE tmid='{$next_id['wrap']}'");
-		$DB->query("DELETE FROM ibf_skin_templates WHERE set_id='{$next_id['templates']}'");
-		
-		@rmdir($INFO['base_dir']."/style_images/".$next_id['images']);
-		@rmdir($INFO['base_dir']."/Skin/s".$next_id['templates']);
-		
-		$ADMIN->rm_dir($this->work_path."/".$this->new_dir);
-		
-		$ADMIN->error( $error );
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_spiderlogs.php b/upload/sources/Admin/ad_spiderlogs.php
deleted file mode 100644
index 5c6e08eb..00000000
--- a/upload/sources/Admin/ad_spiderlogs.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Spider (MAN) Logs
-|   > Module written by Matt Mecham
-|   > Date started: 28th May 2003
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_spiderlogs();
-
-
-class ad_spiderlogs {
-
-	var $base_url;
-
-	function ad_spiderlogs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		$ADMIN->nav[] = array( 'act=spiderlog', 'Search Engine Spider Logs' );
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-		
-			case 'view':
-				$this->view();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function view()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$start = $IN['st'] ? $IN['st'] : 0;
-		
-		$ADMIN->page_detail = "Viewing all actions by a search engine spider";
-		$ADMIN->page_title  = "Search Engine Logs Manager";
-		
-		$botty = urldecode($IN['bid']);
-	
-		if ($IN['search_string'] == "")
-		{
-			$DB->query("SELECT COUNT(sid) as count FROM ibf_spider_logs WHERE bot='$botty'");
-			
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=spiderlog&bid={$IN['bid']}&code=view";
-			
-			$DB->query("SELECT * FROM ibf_spider_logs WHERE bot='$botty' ORDER BY entry_date DESC LIMIT $start, 20");
-			
-		}
-		else
-		{
-			$IN['search_string'] = urldecode($IN['search_string']);
-		
-			$DB->query("SELECT COUNT(sid) as count FROM ibf_spider_logs WHERE query_string LIKE '%{$IN['search_string']}%'");
-			
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=spiderlog&code=view&search_string=".urlencode($IN['search_string']);
-			
-			$DB->query("SELECT * FROM ibf_spider_logs WHERE query_string LIKE '%{$IN['search_string']}%' ORDER BY entry_date DESC LIMIT $start, 20");
-			
-		
-		
-		}
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
-											   'PER_PAGE'    => 20,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Pages: ",
-											   'BASE_URL'    => $ADMIN->base_url.$query,
-											 )
-									  );
-									  
-		$ADMIN->page_detail = "You may view and remove actions performed by a search engine bot";
-		$ADMIN->page_title  = "Search Engine Logs Manager";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Bot Name"            , "15%" );
-		$SKIN->td_header[] = array( "Query String"        , "15%" );
-		$SKIN->td_header[] = array( "Time of action"      , "20%" );
-		$SKIN->td_header[] = array( "IP address"          , "10%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Search Engine Logs" );
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'right', 'pformstrip');
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$INFO[ 'sp_'.$row['bot'] ]."</b>",
-														  "<a href='{$INFO['board_url']}/index.{$INFO['php_ext']}?{$row['query_string']}' target='_blank'>{$row['query_string']}</a>",
-														  $ADMIN->get_date( $row['entry_date'], 'LONG' ),
-														  "{$row['ip_address']}",
-												 )      );
-			
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'right', 'pformstrip');
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		if ($IN['bid'] == "")
-		{
-			$ADMIN->error("You did not select a bot to remove by!");
-		}
-		
-		$botty = urldecode($IN['bid']);
-		
-		$DB->query("DELETE FROM ibf_spider_logs WHERE bot='$botty'");
-		
-		$ADMIN->save_log("Removed Search Engine Logs");
-		
-		$std->boink_it($ADMIN->base_url."&act=spiderlog");
-		exit();
-	
-	
-	}
-	
-	
-
-	
-	
-	//-------------------------------------------------------------
-	// SHOW ALL LANGUAGE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You may view and remove entries in your spider engine logs";
-		$ADMIN->page_title  = "Search Engine Logs Manager";
-
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Bot Name"            , "20%" );
-		$SKIN->td_header[] = array( "Hits"                , "20%" );
-		$SKIN->td_header[] = array( "Started"             , "20%" );
-		$SKIN->td_header[] = array( "View all by bot"     , "20%" );
-		$SKIN->td_header[] = array( "Remove all by bot"   , "20%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Search Engine Spider Logs" );
-		
-		$DB->query("SELECT count(*) as cnt, bot, entry_date, query_string FROM `ibf_spider_logs` group by bot order by entry_date DESC");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-		
-			$url_butt = urlencode($r['bot']);
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( $INFO[ 'sp_'.$r['bot'] ],
-													  "<center>{$r['cnt']}</center>",
-													   $ADMIN->get_date( $r['entry_date'], 'SHORT' ),
-													  "<center><a href='".$SKIN->base_url."&act=spiderlog&code=view&bid={$url_butt}'>View</a></center>",
-													  "<center><a href='".$SKIN->base_url."&act=spiderlog&code=remove&bid={$url_butt}'>Remove</a></center>",
-											 )      );
-		}
-			
-		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'view'     ),
-												  2 => array( 'act'   , 'spiderlog'       ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Search Search Engine Logs" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search for...</b>" ,
-										  		  $SKIN->form_input( "search_string").'... in the query string'
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Search");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_statistics.php b/upload/sources/Admin/ad_statistics.php
deleted file mode 100644
index c5d21b3c..00000000
--- a/upload/sources/Admin/ad_statistics.php
+++ /dev/null
@@ -1,566 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Statistical functions
-|   > Module written by Matt Mecham
-|   > Date started: 4th July 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_stats();
-
-
-class ad_stats {
-
-	var $base_url;
-	var $month_names = array();
-
-	function ad_stats()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-		
-		$this->month_names = array( 1 => 'January', 'February', 'March'     , 'April'  , 'May'     , 'June',
-										 'July'   , 'August'  , 'September' , 'October', 'November', 'December'
-								  );
-
-		switch($IN['code'])
-		{
-			case 'show_reg':
-				$this->result_screen('reg');
-				break;
-				
-			case 'show_topic':
-				$this->result_screen('topic');
-				break;
-					
-			case 'topic':
-				$this->main_screen('topic');
-				break;
-			
-			//-----------------------
-			
-			case 'show_post':
-				$this->result_screen('post');
-				break;
-					
-			case 'post':
-				$this->main_screen('post');
-				break;
-			
-			//-----------------------
-			
-			case 'show_msg':
-				$this->result_screen('msg');
-				break;
-					
-			case 'msg':
-				$this->main_screen('msg');
-				break;
-				
-				//-----------------------
-			
-			case 'show_views':
-				$this->show_views();
-				break;
-					
-			case 'views':
-				$this->main_screen('views');
-				break;
-			
-			//-----------------------
-			
-			default:
-				$this->main_screen('reg');
-				break;
-		}
-		
-	}
-	
-	//select forum_id, SUM(views)from ibf_topics group by forum_id order by forum_id
-	
-	//+---------------------------------------------------------------------------------
-	//| Results screen
-	//+---------------------------------------------------------------------------------
-	
-	function show_views()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Statistic Center Results";
-		
-		$ADMIN->page_detail = "Showing topic view statistics";
-		
-		//+---------------------
-		
-		if ( ! checkdate($IN['to_month']   ,$IN['to_day']   ,$IN['to_year']) )
-		{
-			$ADMIN->error("The 'Date To:' time is incorrect, please check the input and try again");
-		}
-		
-		if ( ! checkdate($IN['from_month'] ,$IN['from_day'] ,$IN['from_year']) )
-		{
-			$ADMIN->error("The 'Date From:' time is incorrect, please check the input and try again");
-		}
-		
-		//+---------------------
-		
-		$to_time   = mktime(12 ,0 ,0 ,$IN['to_month']   ,$IN['to_day']   ,$IN['to_year']  );
-		$from_time = mktime(12 ,0 ,0 ,$IN['from_month'] ,$IN['from_day'] ,$IN['from_year']);
-		
-		
-		$human_to_date   = getdate($to_time);
-		$human_from_date = getdate($from_time);
-		
-		$DB->query("SELECT SUM(t.views) as result_count, t.forum_id, f.name as result_name
-				           FROM ibf_topics t, ibf_forums f
-				           WHERE t.start_date > '$from_time'
-				           AND t.start_date < '$to_time'
-				           AND t.forum_id=f.id
-				           GROUP BY t.forum_id
-				           ORDER BY result_count {$IN['sortby']}");
-				           
-		$running_total = 0;
-		$max_result    = 0;
-		
-		$results       = array();
-		
-		$SKIN->td_header[] = array( "Forum"   , "40%" );
-		$SKIN->td_header[] = array( "Result"  , "50%" );
-		$SKIN->td_header[] = array( "Views"   , "10%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Topic Views"
-										    ." ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} to"
-										    ." {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})"
-										  );
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			while ($row = $DB->fetch_row() )
-			{
-			
-				if ( $row['result_count'] >  $max_result )
-				{
-					$max_result = $row['result_count'];
-				}
-				
-				$running_total += $row['result_count'];
-			
-				$results[] = array(
-									 'result_name'     => $row['result_name'],
-									 'result_count'    => $row['result_count'],
-								  );
-								  
-			}
-			
-			foreach( $results as $pOOp => $data )
-			{
-			
-    			$img_width = intval( ($data['result_count'] / $max_result) * 100 - 8);
-    			
-    			if ($img_width < 1)
-    			{
-    				$img_width = 1;
-    			}
-    			
-    			$img_width .= '%';
-    			
-    			$ADMIN->html .= $SKIN->add_td_row( array( $data['result_name'],
-    													  "<img src='{$SKIN->img_url}/bar_left.gif' border='0' width='4' height='11' align='middle' alt=''><img src='{$SKIN->img_url}/bar.gif' border='0' width='$img_width' height='11' align='middle' alt=''><img src='{$SKIN->img_url}/bar_right.gif' border='0' width='4' height='11' align='middle' alt=''>",
-												  		  "<center>".$data['result_count']."</center>",
-									             )      );
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( '&nbsp;',
-													 "<div align='right'><b>Total</b></div>",
-													 "<center><b>".$running_total."</b></center>",
-											)      );
-		
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No results found", "center" );
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//| Results screen
-	//+---------------------------------------------------------------------------------
-	
-	function result_screen($mode='reg')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Statistic Center Results";
-		
-		$ADMIN->page_detail = "&nbsp;";
-		
-		//+---------------------
-		
-		if ( ! checkdate($IN['to_month']   ,$IN['to_day']   ,$IN['to_year']) )
-		{
-			$ADMIN->error("The 'Date To:' time is incorrect, please check the input and try again");
-		}
-		
-		if ( ! checkdate($IN['from_month'] ,$IN['from_day'] ,$IN['from_year']) )
-		{
-			$ADMIN->error("The 'Date From:' time is incorrect, please check the input and try again");
-		}
-		
-		//+---------------------
-		
-		$to_time   = mktime(12 ,0 ,0 ,$IN['to_month']   ,$IN['to_day']   ,$IN['to_year']  );
-		$from_time = mktime(12 ,0 ,0 ,$IN['from_month'] ,$IN['from_day'] ,$IN['from_year']);
-		
-		
-		$human_to_date   = getdate($to_time);
-		$human_from_date = getdate($from_time);
-		
-		//+---------------------
-		
-		if ($mode == 'reg')
-		{
-			$table     = 'Registration Statistics';
-			
-			$sql_table = 'ibf_members';
-			$sql_field = 'joined';
-			
-			$ADMIN->page_detail = "Showing the number of users registered. (Note: All times based on GMT)";
-		}
-		else if ($mode == 'topic')
-		{
-			$table     = 'New Topic Statistics';
-			
-			$sql_table = 'ibf_topics';
-			$sql_field = 'start_date';
-			
-			$ADMIN->page_detail = "Showing the number of topics started. (Note: All times based on GMT)";
-		}
-		else if ($mode == 'post')
-		{
-			$table     = 'Post Statistics';
-			
-			$sql_table = 'ibf_posts';
-			$sql_field = 'post_date';
-			
-			$ADMIN->page_detail = "Showing the number of posts. (Note: All times based on GMT)";
-		}
-		else if ($mode == 'msg')
-		{
-			$table     = 'PM Sent Statistics';
-			
-			$sql_table = 'ibf_messages';
-			$sql_field = 'msg_date';
-			
-			$ADMIN->page_detail = "Showing the number of sent messages. (Note: All times based on GMT)";
-		}
-		
-	  
-	  	switch ($IN['timescale'])
-	  	{
-	  		case 'daily':
-	  			$sql_date = "%w %U %m %Y";
-		  		$php_date = "F jS - Y";
-		  		break;
-		  		
-		  	case 'monthly':
-		  		$sql_date = "%m %Y";
-		  	    $php_date = "F Y";
-		  	    break;
-		  	    
-		  	default:
-		  		// weekly
-		  		$sql_date = "%U %Y";
-		  		$php_date = " [F Y]";
-		  		break;
-		}		
-	  
-		$DB->query("SELECT MAX($sql_field) as result_maxdate,
-				           COUNT(*) as result_count,
-				           DATE_FORMAT(from_unixtime($sql_field),'$sql_date') AS result_time
-				           FROM $sql_table
-				           WHERE $sql_field > '$from_time'
-				           AND $sql_field < '$to_time'
-				           GROUP BY result_time
-				           ORDER BY $sql_field {$IN['sortby']}");
-				           
-		$running_total = 0;
-		$max_result    = 0;
-		
-		$results       = array();
-		
-		$SKIN->td_header[] = array( "Date"    , "20%" );
-		$SKIN->td_header[] = array( "Result"  , "70%" );
-		$SKIN->td_header[] = array( "Count"   , "10%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( ucfirst($IN['timescale'])
-										    ." ".$table
-										    ." ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} to"
-										    ." {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})"
-										  );
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			while ($row = $DB->fetch_row() )
-			{
-			
-				if ( $row['result_count'] >  $max_result )
-				{
-					$max_result = $row['result_count'];
-				}
-				
-				$running_total += $row['result_count'];
-			
-				$results[] = array(
-									 'result_maxdate'  => $row['result_maxdate'],
-									 'result_count'    => $row['result_count'],
-									 'result_time'     => $row['result_time'],
-								  );
-								  
-			}
-			
-			foreach( $results as $pOOp => $data )
-			{
-			
-    			$img_width = intval( ($data['result_count'] / $max_result) * 100 - 8);
-    			
-    			if ($img_width < 1)
-    			{
-    				$img_width = 1;
-    			}
-    			
-    			$img_width .= '%';
-    			
-    			if ($IN['timescale'] == 'weekly')
-    			{
-    				$date = "Week #".strftime("%W", $data['result_maxdate']) . date( $php_date, $data['result_maxdate'] );
-    			}
-    			else
-    			{
-    				$date = date( $php_date, $data['result_maxdate'] );
-    			}
-    			
-    			$ADMIN->html .= $SKIN->add_td_row( array( $date,
-    													  "<img src='{$SKIN->img_url}/bar_left.gif' border='0' width='4' height='11' align='middle' alt=''><img src='{$SKIN->img_url}/bar.gif' border='0' width='$img_width' height='11' align='middle' alt=''><img src='{$SKIN->img_url}/bar_right.gif' border='0' width='4' height='11' align='middle' alt=''>",
-												  		  "<center>".$data['result_count']."</center>",
-									             )      );
-			}
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( '&nbsp;',
-													 "<div align='right'><b>Total</b></div>",
-													 "<center><b>".$running_total."</b></center>",
-											)      );
-		
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No results found", "center" );
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	//| Date selection screen
-	//+---------------------------------------------------------------------------------
-	
-	function main_screen($mode='reg')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$ADMIN->page_title = "Statistic Center";
-		
-		$ADMIN->page_detail = "Please define the date ranges and other options below.<br>Note: The statistics generated are based on the information currently held in the database, they do not take into account pruned forums or delete posts, etc.";
-		
-		if ($mode == 'reg')
-		{
-			$form_code = 'show_reg';
-			
-			$table     = 'Registration Statistics';
-		}
-		else if ($mode == 'topic')
-		{
-			$form_code = 'show_topic';
-			
-			$table     = 'New Topic Statistics';
-		}
-		else if ($mode == 'post')
-		{
-			$form_code = 'show_post';
-			
-			$table     = 'Post Statistics';
-		}
-		else if ($mode == 'msg')
-		{
-			$form_code = 'show_msg';
-			
-			$table     = 'PM Statistics';
-		}
-		else if ($mode == 'views')
-		{
-			$form_code = 'show_views';
-			
-			$table     = 'Topic View Statistics';
-		}
-		
-		
-		$old_date = getdate(time() - (3600 * 24 * 90));
-		$new_date = getdate(time() + (3600 * 24));
-		
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $form_code  ),
-												  2 => array( 'act'   , 'stats'     ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( $table );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Date From</b>" ,
-												  $SKIN->form_dropdown( "from_month" , $this->make_month(), $old_date['mon']  ).'&nbsp;&nbsp;'.
-												  $SKIN->form_dropdown( "from_day"   , $this->make_day()  , $old_date['mday'] ).'&nbsp;&nbsp;'.
-												  $SKIN->form_dropdown( "from_year"  , $this->make_year() , $old_date['year'] )
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Date To</b>" ,
-												  $SKIN->form_dropdown( "to_month" , $this->make_month(), $new_date['mon']  ).'&nbsp;&nbsp;'.
-												  $SKIN->form_dropdown( "to_day"   , $this->make_day()  , $new_date['mday'] ).'&nbsp;&nbsp;'.
-												  $SKIN->form_dropdown( "to_year"  , $this->make_year() , $new_date['year'] )
-									     )      );
-		
-		if ($mode != 'views')
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Time scale</b>" ,
-													  $SKIN->form_dropdown( "timescale" , array( 0 => array( 'daily', 'Daily'), 1 => array( 'weekly', 'Weekly' ), 2 => array( 'monthly', 'Monthly' ) ) )
-											 )      );
-		}
-						     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Result Sorting</b>" ,
-												  $SKIN->form_dropdown( "sortby" , array( 0 => array( 'asc', 'Ascending - Oldest dates first'), 1 => array( 'desc', 'Descending - Newest dates first' ) ), 'desc' )
-									     )      );
-									     									     
-		$ADMIN->html .= $SKIN->end_form("Show");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//+---------------------------------------------------------------------------------
-	
-	function make_year()
-	{
-		$time_now = getdate();
-		
-		$return = array();
-		
-		$start_year = 2002;
-		
-		$latest_year = intval($time_now['year']);
-		
-		if ($latest_year == $start_year)
-		{
-			$start_year -= 1;
-		}
-		
-		for ( $y = $start_year; $y <= $latest_year; $y++ )
-		{
-			$return[] = array( $y, $y);
-		}
-		
-		return $return;
-	}
-	
-	//+----------------------------------------
-	
-	function make_month()
-	{
-		$return = array();
-		
-		for ( $m = 1 ; $m <= 12; $m++ )
-		{
-			$return[] = array( $m, $this->month_names[$m] );
-		}
-		
-		return $return;
-	}
-	
-	//+----------------------------------------
-	
-	function make_day()
-	{
-		$return = array();
-		
-		for ( $d = 1 ; $d <= 31; $d++ )
-		{
-			$return[] = array( $d, $d );
-		}
-		
-		return $return;
-	}
-	
-	
-		
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_stylesets.php b/upload/sources/Admin/ad_stylesets.php
deleted file mode 100644
index a9412eb7..00000000
--- a/upload/sources/Admin/ad_stylesets.php
+++ /dev/null
@@ -1,973 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Help Control functions
-|   > Module written by Matt Mecham
-|   > Date started: 2nd April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'wrapper':
-				$this->list_wrappers();
-				break;
-				
-			case 'add':
-				$this->do_form('add');
-				break;
-				
-			case 'edit':
-				$this->do_form('edit');
-				break;
-				
-			case 'doadd':
-				$this->save_skin('add');
-				break;
-				
-			case 'doedit':
-				$this->save_skin('edit');
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-			
-			//-------------------------
-			case 'memskins':
-				$this->mem_skins();
-				break;
-				
-			case 'export':
-				$this->export();
-				break;
-				
-			default:
-				$this->list_sets();
-				break;
-		}
-		
-	}
-	
-	//----------------------------------------------------
-	
-	function export()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing skin set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_skins WHERE uid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_macro_name WHERE set_id='".$row['macro_id']."'");
-		
-		if ( ! $macro_name = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_css WHERE cssid='".$row['css_id']."'");
-		
-		if ( ! $css = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_tmpl_names WHERE skid='".$row['set_id']."'");
-		
-		if ( ! $tmpl = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_templates WHERE tmid='".$row['tmpl_id']."'");
-		
-		if ( ! $wrap = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		
-		//+-------------------------------
-		
-		if ($INFO['base_dir'] == './')
-		{
-			$INFO['base_dir'] = str_replace( '\\', '/', getcwd() ) . '/';
-		}
-		
-		$archive_dir   = $INFO['base_dir']."archive_out";
-		$images_dir    = $INFO['base_dir']."style_images/".$row['img_dir'];
-		
-		require ROOT_PATH."sources/lib/tar.php";
-		
-		if (!is_dir($archive_dir))
-		{
-			$ADMIN->error("Could not locate $archive_dir, is the directory there?");
-		}
-		
-		if (!is_writeable($archive_dir))
-		{
-			$ADMIN->error("Cannot write in $archive_dir, CHMOD via FTP to 0755 or 0777 to enable this script to write into it. IBF cannot do this for you");
-		}
-		
-		if (!is_dir($images_dir))
-		{
-			$ADMIN->error("Could not locate $images_dir, is the directory there?");
-		}
-		
-		//+-------------------------------
-		// Set up the dir structure
-		//+-------------------------------
-		
-		$css_name  = "stylesheet.css";
-		$wrap_name = "wrapper.html";
-		$macro_name = "macro.txt";
-		$template_name = "templates.html";
-		
-		$img_dir   = 'images';
-		
-		$pack_name = preg_replace( "/\s{1,}/", "_", $row['sname'] );
-		
-		$new_dir = "set-".$pack_name;
-		
-		//+-------------------------------
-		
-		if ( ! mkdir($archive_dir."/".$new_dir, 0777) )
-		{
-			$ADMIN->error("Directory creation failed, cannot export skin set. Please check the permission in 'archive_out'");
-		}
-		
-		//+-------------------------------
-		
-		if ( ! mkdir($archive_dir."/".$new_dir."/".$img_dir, 0777) )
-		{
-			$ADMIN->error("Directory creation failed, cannot export skin set. Please check the permission in 'archive_out'");
-		}
-		
-		//+-------------------------------
-		// Make the wrapper file...
-		//+-------------------------------
-		
-		$wrap['template'] = preg_replace("/\r/", "\n", $wrap['template'] );
-		
-		$FH = fopen($archive_dir."/".$new_dir."/".$wrap_name, 'w');
-		fwrite($FH, $wrap['template'], strlen($wrap['template']));
-		fclose($FH);
-		
-		@chmod($archive_dir."/".$new_dir."/".$wrap_name, 0777);
-		
-		//+-------------------------------
-		// Make the css file...
-		//+-------------------------------
-		
-		$FH = fopen($archive_dir."/".$new_dir."/".$css_name, 'w');
-		fwrite($FH, $css['css_text'], strlen($css['css_text']));
-		fclose($FH);
-		
-		@chmod($archive_dir."/".$new_dir."/".$css_name, 0777);
-		
-		//+-------------------------------
-		// Copy over the images...
-		//+-------------------------------
-		
-		if ( ! $ADMIN->copy_dir($images_dir, $archive_dir."/".$new_dir."/".$img_dir) )
-		{
-			$ADMIN->error( $ADMIN->errors );
-		}
-		
-		//+-------------------------------
-		// Make the macro file...
-		//+-------------------------------
-		
-		$file_content = "";
-		
-		$DB->query("SELECT macro_replace, macro_value FROM ibf_macro WHERE macro_set='".$row['macro_id']."'");
-		
-		while( $mrow = $DB->fetch_row() )
-		{
-			if ($mrow['macro_replace'] == "")
-			{
-				$mrow['macro_replace'] = "*UNASSIGNED*";
-			}
-			
-			// Fix newlines..
-			
-			$mrow['macro_replace'] = str_replace( "\n", '\n', str_replace("\r", "\n", $mrow['macro_replace'] ) );
-			
-			$file_content .= $mrow['macro_value']."~=~".$mrow['macro_replace']."\n";
-		}
-		
-		$FH = fopen($archive_dir."/".$new_dir."/".$macro_name, 'w');
-		fwrite($FH, $file_content, strlen($file_content));
-		fclose($FH);
-		
-		@chmod($archive_dir."/".$new_dir."/".$macro_name, 0777);
-		
-		//+----------------------------------------------------------------------------
-		// Generate template HTML file
-		//+----------------------------------------------------------------------------
-		
-		$output = "";
-		
-		$groups = $DB->query("SELECT DISTINCT(group_name) FROM ibf_skin_templates WHERE set_id='".$row['set_id']."'");
-		
-		if ( ! $DB->get_num_rows($groups) )
-		{
-			$ADMIN->rm_dir($archive_dir);
-			$ADMIN->error("Export Failed at template set creation: Can't query the information from the database");
-		}
-		
-		$output .= "<!--TEMPLATE_SET|internal,internal,internal,internal-->\n\n";
-		
-		while ( $trow = $DB->fetch_row($groups) )
-		{
-		
-			$aq = $DB->query("SELECT * FROM ibf_skin_templates WHERE set_id='".$row['set_id']."' AND group_name='".$trow['group_name']."'");
-			
-			if ( ! $DB->get_num_rows($aq) )
-			{
-				$ADMIN->rm_dir($archive_dir);
-				$ADMIN->error("Can't query the information from the database");
-			}
-			
-			$output .= "<!-- PLEASE LEAVE ALL 'IBF' COMMENTS IN PLACE, DO NOT REMOVE THEM! -->\n<!--IBF_GROUP_START:{$trow['group_name']}-->\n\n";
-			
-			while ( $next_row = $DB->fetch_row($aq) )
-			{
-				$text = $this->convert_tags($next_row['section_content']);
-				$text = str_replace( "\r\n", "\n", $text);
-				$text = str_replace( "\n\n", "\n", $text);
-				
-				$output .= "<!--IBF_START_FUNC|{$next_row['func_name']}|{$next_row['func_data']}-->\n\n";
-				$output .= $text."\n";
-				$output .= "<!--IBF_END_FUNC|{$next_row['func_name']}-->\n\n";
-			}
-			
-			$output .= "\n<!--IBF_GROUP_END:{$trow['group_name']}-->\n";
-		
-		}
-		
-		$FH = fopen($archive_dir."/".$new_dir."/".$template_name, 'w');
-		fwrite($FH, $output, strlen($output));
-		fclose($FH);
-		
-		@chmod($archive_dir."/".$new_dir."/".$template_name, 0777);
-		
-		//+----------------------------------------------------------------------------
-		// Generate the config file..
-		//+----------------------------------------------------------------------------
-		
-		$file_content = "<?php\n\n".
-					    "\$config=array('author' => \"".addslashes($tmpl['author'])."\", ".
-					    "'email'=>\"".addslashes($tmpl['email'])."\", ".
-					    "'url'=>\"".addslashes($tmpl['url'])."\")\n\n?".">";
-		
-		$FH = fopen($archive_dir."/".$new_dir."/"."templates_conf.inc", 'w');
-		fwrite($FH, $file_content, strlen($file_content));
-		fclose($FH);
-		
-		@chmod($archive_dir."/".$new_dir."/"."templates_conf.inc", 0777);
-		
-		//+-------------------------------
-		// Add files and write tarball
-		//+-------------------------------
-		
-		$tar = new tar();
-		
-		$tar->new_tar( $archive_dir, $new_dir.".tar" );
-		$tar->add_directory( $archive_dir."/".$new_dir );
-		$tar->write_tar();
-		
-		// Check for errors.
-		
-		if ($tar->error != "")
-		{
-			$ADMIN->rm_dir($archive_dir);
-			$ADMIN->error($tar->error);
-		}
-		
-		// remove original unarchived directory
-		
-		$ADMIN->rm_dir($archive_dir."/".$new_dir);
-		
-		$ADMIN->done_screen("Skin Pack Export Created<br><br>You can download the tar-chive <a href='archive_out/{$new_dir}.tar' target='_blank'>here</a>", "Manage Skin Sets", "act=sets" );
-		
-		
-	}
-	
-	//----------------------------------------------
-	// I must get around to centralising this...
-	//----------------------------------------------
-	
-	function convert_tags($t="")
-	{
-		if ($t == "")
-		{
-			return "";
-		}
-		
-		$t = preg_replace( "/{?\\\$ibforums->base_url}?/"            , "{ibf.script_url}"   , $t );
-		$t = preg_replace( "/{?\\\$ibforums->session_id}?/"          , "{ibf.session_id}"   , $t );
-		$t = preg_replace( "/{?\\\$ibforums->skin\['?(\w+)'?\]}?/"   , "{ibf.skin.\\1}"      , $t );
-		$t = preg_replace( "/{?\\\$ibforums->lang\['?(\w+)'?\]}?/"   , "{ibf.lang.\\1}"      , $t );
-		$t = preg_replace( "/{?\\\$ibforums->vars\['?(\w+)'?\]}?/"   , "{ibf.vars.\\1}"      , $t );
-		$t = preg_replace( "/{?\\\$ibforums->member\['?(\w+)'?\]}?/" , "{ibf.member.\\1}"    , $t );
-		
-		return $t;
-		
-	}
-	
-	//----------------------------------------------
-	
-	function mem_skins()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$DB->query("SELECT sid FROM ibf_skins WHERE uid='".$IN['oid']."'");
-		$old = $DB->fetch_row();
-		
-		if ($IN['nid'] == 'n')
-		{
-			$DB->query("UPDATE ibf_members SET skin=NULL WHERE skin='".$old['sid']."'");
-		}
-		else
-		{
-			$DB->query("SELECT sid FROM ibf_skins WHERE uid='".$IN['nid']."'");
-			$new = $DB->fetch_row();
-			$DB->query("UPDATE ibf_members SET skin='".$new['sid']."' WHERE skin='".$old['sid']."'");
-		}
-		
-		$ADMIN->done_screen("Member Skin Choices Updated", "Manage Skin Sets", "act=sets" );
-		
-	}
-	
-	
-	//-------------------------------------------------------------
-	// REMOVE WRAPPERS
-	//-------------------------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing skin set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_skins WHERE uid='".$IN['id']."'");
-		
-		if (! $skin = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query that skin set information from the DB");
-		}
-		
-		//+-------------------------------
-		
-		if ($skin['default_set'] == 1)
-		{
-			$ADMIN->error("You can not remove this skin set as it is set as the default. Set another skin as default and try again");
-		}
-		
-		//+-------------------------------
-		
-		// Update the members skins..
-		
-		$DB->query("UPDATE ibf_members SET skin='' WHERE skin='".$skin['sid']."'");
-		
-		// Update the forums DB
-		
-		$DB->query("SELECT id FROM ibf_forums WHERE skin_id='".$skin['sid']."'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$arr = array();
-			
-			while ( $i = $DB->fetch_row() )
-			{
-				$arr['forum_skin_'.$i['id']] = '';
-			}
-		
-			$DB->query("UPDATE ibf_forums SET skin_id='' WHERE skin_id='".$skin['sid']."'");
-			
-			// Remove it from the config file..
-			
-			$ADMIN->rebuild_config($arr);
-			
-		}
-		
-		// Remove skin from the DB
-		
-		$DB->query("DELETE FROM ibf_skins WHERE uid='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=sets");
-			
-		exit();
-		
-		
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT SKIN SETS
-	//-------------------------------------------------------------
-	
-	function save_skin( $type='add' )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("You must specify an existing skin set ID, go back and try again");
-			}
-		}
-		
-		if ($IN['sname'] == "")
-		{
-			$ADMIN->error("You must specify a name for this skin pack ID");
-		}
-		
-		
-		$barney = array( 'sname'      => $std->txt_stripslashes($HTTP_POST_VARS['sname']),
-						 'set_id'     => $IN['template'],
-						 'tmpl_id'    => $IN['wrapper'],
-						 'img_dir'    => $IN['img_dir'],
-						 'css_id'     => $IN['css'],
-						 'css_method' => $IN['css_method'],
-						 'hidden'     => $IN['hidden'],
-						 'default_set'=> $IN['default_set'],
-						 'macro_id'   => $IN['macro_id'],
-					   );
-					   
-		if ($type == 'add')
-		{
-		
-			$DB->query("SELECT MAX(sid) as new_id FROM ibf_skins");
-			
-			$row = $DB->fetch_row();
-			
-			$barney['sid'] = $row['new_id'] + 1;
-		
-			$db_string = $DB->compile_db_insert_string( $barney );
-			
-			$DB->query("INSERT INTO ibf_skins (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-			
-			if ($IN['default_set'] == 1)
-			{
-				$DB->query("UPDATE ibf_skins SET default_set=0 WHERE sid <> '".$barney['sid']."'");
-			}
-			
-			$std->boink_it($SKIN->base_url."&act=sets");
-			
-			exit();
-			
-		}
-		else
-		{
-			$db_string = $DB->compile_db_update_string( $barney );
-			
-			$DB->query("UPDATE ibf_skins SET $db_string WHERE uid='".$IN['id']."'");
-			
-			if ($IN['default_set'] == 1)
-			{
-				$DB->query("UPDATE ibf_skins SET default_set=0 WHERE uid <> '".$IN['id']."'");
-			}
-			
-			$ADMIN->done_screen("Skin Set Updated", "Manage Skin Sets", "act=sets" );
-		}
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT SETS
-	//-------------------------------------------------------------
-	
-	function do_form( $type='add' )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		
-		$css       = array();
-		$wrappers  = array();
-		$templates = array();
-		$macros    = array();
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_skins WHERE uid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_macro_name");
-		
-		while( $img = $DB->fetch_row() )
-		{
-			$macros[] = array( $img['set_id'], $img['set_name'] );
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT cssid, css_name FROM ibf_css");
-		
-		while ( $c = $DB->fetch_row() )
-		{
-			$css[] = array( $c['cssid'], $c['css_name'] );
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT tmid, name FROM ibf_templates");
-		
-		while ( $t = $DB->fetch_row() )
-		{
-			$wrappers[] = array( $t['tmid'], $t['name'] );
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT skid, skname FROM ibf_tmpl_names");
-		
-		while ( $s = $DB->fetch_row() )
-		{
-			$templates[] = array( $s['skid'], $s['skname'] );
-		}
-		
-		
-		//+-------------------------------
-		
-		if ($type == 'add')
-		{
-			$code = 'doadd';
-			$button = 'Create Skin Set';
-			$row['sname'] = $row['sname'].".2";
-			$row['default_set'] = 0;
-		}
-		else
-		{
-			$code = 'doedit';
-			$button = 'Edit Skin Set';
-		}
-		
-		$dirs = array();
-		
-		$dh = opendir( './style_images' );
- 		while ( $file = readdir( $dh ) )
- 		{
- 			if (($file != ".") && ($file != ".."))
- 			{
-				if ( is_dir('./style_images/'.$file) )
-				{
-					$dirs[] = array( $file, $file );
-				}
- 			}
- 		}
- 		closedir( $dh );
- 		
- 		//+-------------------------------
- 		
- 		if ( file_exists( ROOT_PATH."cache" ) )
-		{
-			if ( is_writeable( ROOT_PATH."cache" ) )
-			{
-				$cssextra = $SKIN->form_dropdown('css_method', array( 0 => array( 'inline', 'Inline'), 1 => array( 'external', 'External' ) ), $row['css_method']);
-			}
-		}
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "You may mix n' match which skin resources you wish to apply to this skin set.";
-		$ADMIN->page_title  = "Manage Skin Sets";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $code      ),
-												  2 => array( 'act'   , 'sets'      ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     ), "theAdminForm", "onSubmit=\"return no_specialchars('sets')\""    );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( $button );
-		
-		$ADMIN->html .= $SKIN->js_no_specialchars();
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Skin Set Title</b>",
-													$SKIN->form_input('sname', $row['sname']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Use Templates:</b>",
-													$SKIN->form_dropdown('template', $templates, $row['set_id']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Use Macro Set:</b>",
-													$SKIN->form_dropdown('macro_id', $macros, $row['macro_id']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Use Image Directory:</b>",
-													$SKIN->form_dropdown('img_dir', $dirs, $row['img_dir']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Use Stylesheet:</b>",
-													$SKIN->form_dropdown('css', $css, $row['css_id']).'&nbsp;'.$cssextra,
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Use Wrapper:</b>",
-													$SKIN->form_dropdown('wrapper', $wrappers, $row['tmpl_id']),
-									     )      );
-									     
-
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Hide from Members?</b><br>Useful if you want to make a forum only skin",
-													$SKIN->form_yes_no('hidden', $row['hidden']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Set as default skin set?</b><br>Used for unallocated forum and member skins",
-													$SKIN->form_yes_no('default_set', $row['default_set']),
-									     )      );
-												 
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW WRAPPERS
-	//-------------------------------------------------------------
-	
-	function list_sets()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-		
-		$forums      = array();
-		$forum_skins = array();
-	
-		$ADMIN->page_detail = "You may add/edit and remove skin sets.<br><br>Skin sets are groups of style resources. You can mix n' match board wrappers, image and macro sets, stylesheets and skin templates. If you wish to edit any of the resources, please choose the resource you wish to manage from the menu bar on the left.";
-		$ADMIN->page_title  = "Manage Skin Sets";
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT id, name FROM ibf_forums");
-		
-		while ( $f = $DB->fetch_row() )
-		{
-			$forums[ $f['id'] ] = $f['name'];
-			
-			if ($INFO['forum_skin_'.$f['id']] != "")
-			{
-				$forum_skins[ $INFO['forum_skin_'.$f['id']] ][] = $f['name'];
-			}
-		}
-		
-		
-		$DB->query("select ibf_skins.*, count(ibf_members.id) as mcount from ibf_skins left join ibf_members on(ibf_members.skin=ibf_skins.sid) where (ibf_members.skin is not null or ibf_skins.default_set = 1) group by ibf_skins.sid order by ibf_skins.sname");
-		
-		$used_ids = array();
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			$SKIN->td_header[] = array( "Title"       , "40%" );
-			$SKIN->td_header[] = array( "No. Members" , "20%" );
-			$SKIN->td_header[] = array( "Export"      , "10%" );
-			$SKIN->td_header[] = array( "Edit"        , "10%" );
-			$SKIN->td_header[] = array( "Remove"      , "10%" );
-			$SKIN->td_header[] = array( "Hidden"      , "5%" );
-			$SKIN->td_header[] = array( "Default"     , "5%" );
-			
-			//+-------------------------------
-		
-			$ADMIN->html .= $SKIN->start_table( "Current Skins Used by Members" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$extra = "";
-				
-				if ( is_array($forum_skins[ $r['sid'] ]) )
-				{
-					if ( count($forum_skins[ $r['sid'] ]) > 0 )
-					{
-						$extra = "<br>(Used in forums: ".implode( ",", $forum_skins[ $r['sid'] ] )." )";
-					}
-				}
-				
-				$default = '&nbsp;';
-				$hidden  = '&nbsp;';
-				
-				if ($r['hidden'] == 1)
-				{
-					$hidden = "<span style='color:red;font-weight:bold'>X</span>";
-				}
-				
-				if ($r['default_set'] == 1)
-				{
-					$default = "<span style='color:red;font-weight:bold'>X</span>";
-				}
-				
-				$editlist = "<br /><b>Edit:</b> <a href='{$SKIN->base_url}&act=wrap&code=edit&id={$r['tmpl_id']}'>Wrapper</a>
-							&middot; <a href='{$SKIN->base_url}&act=templ&code=edit&id={$r['set_id']}'>HTML</a>
-							&middot; <a href='{$SKIN->base_url}&act=style&code=edit&id={$r['css_id']}'>CSS</a>
-							&middot; <a href='{$SKIN->base_url}&act=style&code=colouredit&id={$r['css_id']}'>Colours</a>
-							&middot; <a href='{$SKIN->base_url}&act=image&code=edit&id={$r['macro_id']}'>Macros</a>";
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$std->txt_stripslashes($r['sname'])."</b>$extra".$editlist,
-														  "<center>".$r['mcount']."</center>",
-														  "<center><a href='".$SKIN->base_url."&act=sets&code=export&id={$r['uid']}'>Export</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=sets&code=edit&id={$r['uid']}'>Edit</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=sets&code=remove&id={$r['uid']}'>Remove</a></center>",
-														  "<center>$hidden</center>",
-														  "<center>$default</center>",
-												 )      );
-												   
-				$used_ids[] = $r['uid'];
-				
-				$form_array[] = array( $r['uid'], $r['sname'] );
-				
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		if ( count($used_ids) < 1 )
-		{
-			$DB->query("SELECT * FROM ibf_skins");
-			
-			$left_one = $DB->get_num_rows();
-		}
-		else if ( count($used_ids) > 0 )
-		{
-			$DB->query("SELECT * FROM ibf_skins WHERE uid NOT IN(".implode(",",$used_ids).")");
-			
-			$left_two = $DB->get_num_rows();
-		}
-		
-		if ( $left_one > 0 or $left_two > 0 )
-		{
-			$SKIN->td_header[] = array( "Title"  , "60%" );
-			$SKIN->td_header[] = array( "Export" , "10%" );
-			$SKIN->td_header[] = array( "Edit"   , "10%" );
-			$SKIN->td_header[] = array( "Remove" , "10%" );
-			$SKIN->td_header[] = array( "Hidden" , "5%" );
-			$SKIN->td_header[] = array( "Default", "5%" );
-		
-			$ADMIN->html .= $SKIN->start_table( "Skin Sets not used by Members" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				
-				$extra = "";
-			
-				if ( is_array($forum_skins[ $r['sid'] ]) )
-				{
-					if ( count($forum_skins[ $r['sid'] ]) > 0 )
-					{
-						$extra = "<br>(Used in forums: ".implode( ",", $forum_skins[ $r['sid'] ] )." )";
-					}
-				}
-				
-				$default = '&nbsp;';
-				$hidden  = '&nbsp;';
-				
-				if ($r['hidden'] == 1)
-				{
-					$hidden = "<span style='color:red;font-weight:bold'>X</span>";
-				}
-				
-				if ($r['default_set'] == 1)
-				{
-					$default = "<span style='color:red;font-weight:bold'>X</span>";
-				}
-				
-				$editlist = "<br /><b>Edit:</b> <a href='{$SKIN->base_url}&act=wrap&code=edit&id={$r['tmpl_id']}'>Wrapper</a>
-							&middot; <a href='{$SKIN->base_url}&act=templ&code=edit&id={$r['set_id']}'>HTML</a>
-							&middot; <a href='{$SKIN->base_url}&act=style&code=edit&id={$r['css_id']}'>CSS</a>
-							&middot; <a href='{$SKIN->base_url}&act=style&code=colouredit&id={$r['css_id']}'>Colours</a>
-							&middot; <a href='{$SKIN->base_url}&act=image&code=edit&id={$r['macro_id']}'>Macros</a>";
-				
-				$ADMIN->html .= $SKIN->js_checkdelete();
-				
-			
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".$std->txt_stripslashes($r['sname'])."</b>$extra".$editlist,
-														  "<center><a href='".$SKIN->base_url."&act=sets&code=export&id={$r['uid']}'>Export</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=sets&code=edit&id={$r['uid']}'>Edit</a></center>",
-														  "<center><a href='javascript:checkdelete(\"act=sets&code=remove&id={$r['uid']}\")'>Remove</a></center>",
-														  "<center>$hidden</center>",
-														  "<center>$default</center>",
-												 )      );
-												 
-				$form_array[] = array( $r['uid'], $r['sname'] );
-												   
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add'     ),
-												  2 => array( 'act'   , 'sets'    ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Create New Skin Set" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base new skin set on...</b>" ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Create new Skin Set");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'memskins'     ),
-												  2 => array( 'act'   , 'sets'         ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Swop members skin choice" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Where members use skin...</b>",
-										  		  $SKIN->form_dropdown( "oid", $form_array)
-								 )      );
-								 
-		$form_array[] = array( 'n', 'None (Will use whatever is set as default)' );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>update to use skin...</b>",
-										  		  $SKIN->form_dropdown( "nid", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Update members skin choice");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_stylesheets.php b/upload/sources/Admin/ad_stylesheets.php
deleted file mode 100644
index cf8942aa..00000000
--- a/upload/sources/Admin/ad_stylesheets.php
+++ /dev/null
@@ -1,1349 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > CSS management functions
-|   > Module written by Matt Mecham
-|   > Date started: 4th April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'wrapper':
-				$this->list_sheets();
-				break;
-				
-			case 'add':
-				$this->do_form('add');
-				break;
-				
-			case 'edit2':
-				$this->do_form('edit');
-				break;
-				
-			case 'edit':
-				//$this->edit_splash();
-				$this->do_form('edit');
-				break;
-				//break;
-				
-			case 'doadd':
-				$this->save_wrapper('add');
-				break;
-				
-			case 'doedit':
-				$this->save_wrapper('edit');
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-			case 'export':
-				$this->export();
-				break;
-				
-			case 'optimize':
-				$this->optimize();
-				break;
-				
-			case 'css_upload':
-				$this->css_upload('new');
-				break;
-				
-			case 'easyedit':
-				$this->easy_edit();
-				break;
-				
-			case 'doresync':
-				$this->do_resynch();
-				break;
-			
-			case 'colouredit':
-				$this->colouredit();
-				break;
-				
-			case 'docolour':
-				$this->do_colouredit();
-				break;
-			
-			//-------------------------
-			default:
-				$this->list_sheets();
-				break;
-		}
-		
-	}
-	
-	//+-------------------------------
-	
-	function do_resynch()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT cssid, css_text, css_name, css_comments FROM ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $cssinfo = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the CSS details from the database");
-		}
-		
-		if ( $IN['favour'] == 'cache' )
-		{
-			$cache_file = ROOT_PATH."cache/css_".$IN['id'].".css";
-			
-			if ( file_exists( $cache_file ) )
-			{
-				$FH = fopen( $cache_file, 'r' );
-				$cache_data = fread( $FH, filesize($cache_file) );
-				fclose($FH);
-			}
-			else
-			{
-				$ADMIN->error("Could not locate cached CSS file @ $cache_file");
-			}
-			
-			$dbr = $DB->compile_db_update_string( array( 'css_text' => $cache_data ) );
-			
-			$DB->query("UPDATE ibf_css SET $dbr WHERE cssid='".$IN['id']."'");
-		}
-		else
-		{
-			$cache_file = ROOT_PATH."cache/css_".$IN['id'].".css";
-			
-			$FH = fopen( $cache_file, 'w' );
-			fputs( $FH, $cssinfo['css_text'], strlen($cssinfo['css_text']) );
-			fclose($FH);
-		}
-		
-		if ( $IN['return'] != 'colouredit' )
-		{
-			$this->do_form('edit');
-		}
-		else
-		{
-			$this->colouredit();
-		}
-	}
-	
-	
-	
-	//+-------------------------------
-	
-	function resync_splash($db_length, $cache_length, $cache_mtime, $db_mtime, $id, $return="")
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "A mismatch has been found between the cached style sheet and the style sheet stored in the database";
-		$ADMIN->page_title  = "Resynchronise Style Sheet";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "50%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "50%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doresync'  ),
-												  2 => array( 'act'   , 'style'     ),
-												  3 => array( 'id'    , $id         ),
-												  4 => array( 'return', $return     ),
-									     )    );
-									     
-		$favour = 'db';
-		
-		$ADMIN->html .= $SKIN->start_table( "Resynch CSS before editing..." );
-		
-		if ( intval($cache_mtime) > intval($db_mtime) )
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<b>CSS in database last updated:</b> ".$ADMIN->get_date($db_mtime, 'LONG'),
-														"<b>CSS in database, # characters:</b> $db_length",
-											 )      );
-											 
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<span style='color:red'><b>CSS in CACHE last updated:</b> ".$ADMIN->get_date($cache_mtime, 'LONG')."</span>",
-														"<span style='color:red'><b>CSS in CACHE, # characters:</b> $cache_length</span>",
-											 )      );
-			$favour = 'cache';
-											 
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<span style='color:red'><b>CSS in database last updated:</b> ".$ADMIN->get_date($db_mtime, 'LONG')."</span>",
-														"<span style='color:red'><b>CSS in database, # characters:</b> $db_length</span>",
-											 )      );
-											 
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<b>CSS in CACHE last updated:</b> ".$ADMIN->get_date($cache_mtime, 'LONG'),
-														"<b>CSS in CACHE, # characters:</b> $cache_length",
-											 )      );
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<b>Resynchronise using....</b>",
-														$SKIN->form_dropdown( 'favour', array(
-																							    0 => array( 'cache', 'Overwrite database version with cached version'),
-																							    1 => array( 'db'   , 'Update cached version from the database' ),
-																							 ), $favour ),
-											 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Resynchronise");
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-	}
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT WRAPPERS
-	//-------------------------------------------------------------
-	
-	
-	
-	
-	function css_upload($type='new')
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_FILES;
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		if (! is_dir($INFO['upload_dir']) )
-		{
-			$ADMIN->error("Could not locate the uploads directory - make sure the 'uploads' path is set correctly");
-		}
-							
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") )
-		{
-			$ADMIN->error("No file was chosen to upload!");
-		}
-		
-		//-------------------------------------------------
-		// Move the uploaded file to somewhere we can
-		// manipulate it in safe mode
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $INFO['upload_dir']."/".$FILE_NAME) )
-		{
-			$ADMIN->error("The upload failed");
-		}
-		
-		// Open the file and copy to the DB
-		
-		$real_name = str_replace( "_", " ", preg_replace( "/^(.*),\d+\.css$/", "\\1", $FILE_NAME ) );
-		$real_name .= ' [UPLOAD]';
-		
-		if ( $FH = @fopen( $INFO['upload_dir']."/".$FILE_NAME, "r" ) )
-		{
-			$data = @fread( $FH, @filesize($INFO['upload_dir']."/".$FILE_NAME) );
-			@fclose($FH);
-			@unlink($INFO['upload_dir']."/".$FILE_NAME);
-		}
-		else
-		{
-			@unlink($INFO['upload_dir']."/".$FILE_NAME);
-			$ADMIN->error("Could not open the uploaded file for reading, aborting process");
-		}
-		
-		list($css, $comments) = explode( "<|COMMENTS|>", $data );
-		
-		$css      = trim($css);
-		$comments = trim($css);
-		
-		if ($type == 'new')
-		{
-			$dbs = $DB->compile_db_insert_string( array (
-														  'css_name'     => $real_name,
-														  'css_text'     => $css,
-														  'css_comments' => $comments,
-														  'updated'      => time(),
-												)       );
-											
-												
-			$DB->query("INSERT INTO ibf_css (".$dbs['FIELD_NAMES'].") VALUES(".$dbs['FIELD_VALUES'].")");
-			
-			$new_id = $DB->get_insert_id();
-			
-			if ( file_exists( ROOT_PATH."cache" ) )
-			{
-				if ( is_writeable( ROOT_PATH."cache" ) )
-				{
-					$FH = fopen( ROOT_PATH."cache/css_".$new_id.".css", 'w' );
-					fputs( $FH, $css, strlen($css) );
-					fclose($FH);
-				}
-			}
-			
-			$ADMIN->done_screen("Stylesheet uploaded", "Manage Style Sheets", "act=style" );
-		}
-		
-		
-	}
-	
-	
-	//----------------------------------------------------
-	
-	function optimize()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing CSS ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$orig_size = strlen($row['css_text']);
-		
-		$orig_text = str_replace( "\r\n", "\n", $row['css_text']);
-		$orig_text = str_replace( "\r"  , "\n", $orig_text);
-		$orig_text = str_replace( "\n\n", "\n", $orig_text);
-		
-		$parsed = array();
-		
-		// Remove comments
-		
-		$orig_text = preg_replace( "#/\*(.+?)\*/#s", "", $orig_text );
-		
-		// Grab all the definitions
-		
-		preg_match_all( "/(.+?)\{(.+?)\}/s", $orig_text, $match, PREG_PATTERN_ORDER );
-		
-		for ( $i = 0 ; $i < count($match[0]); $i++ )
-		{
-			$match[1][$i] = trim($match[1][$i]);
-			$parsed[ $match[1][$i] ] = trim($match[2][$i]);
-		}
-		
-		//------------------
-		
-		if ( count($parsed) < 1)
-		{
-			$ADMIN->error("The stylesheet is in a format that Invision Power Board cannot understand, no optimization done.");
-		}
-		
-		// Clean them up
-		
-		$final = "";
-		
-		foreach( $parsed as $name => $p )
-		{
-			// Ignore comments
-			
-			if ( preg_match( "#^//#", $name) )
-			{
-				continue;
-			}
-			
-			// Split up the components
-			
-			$parts = explode( ";", $p);
-			$defs  = array();
-			
-			foreach( $parts as $part )
-			{
-				if ($part != "")
-				{
-					list($definition, $data) = explode( ":", $part );
-					$defs[]   = trim($definition).": ".trim($data);
-				}
-			}
-			
-			$final .= $name . " { ".implode("; ", $defs). " }\n";
-		}
-		
-		$final_size = strlen($final);
-		
-		if ($final_size < 1000)
-		{
-			$ADMIN->error("The stylesheet is in a format that Invision Power Board cannot understand, no optimization done.");
-		}
-		
-		// Update the DB
-		
-		$dbs = $DB->compile_db_update_string( array( 'css_text' => $final ) );
-		
-		$DB->query("UPDATE ibf_css SET $dbs WHERE cssid='".$IN['id']."'");
-		
-		$saved    = $orig_size - $final_size;
-		$pc_saved = 0;
-		
-		if ($saved > 0)
-		{
-			$pc_saved = sprintf( "%.2f", ($saved / $orig_size) * 100);
-		}
-		
-		$ADMIN->done_screen("Stylesheet updated: Characters Saved: $saved ($pc_saved %)", "Manage Style Sheets", "act=style" );
-				    
-		
-		
-	}
-	
-	
-	//----------------------------------------------------
-	
-	function export()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing CSS ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$name = str_replace( " ", "_", $row['css_name'] );
-		
-		@header("Content-type: unknown/unknown");
-		@header("Content-Disposition: attachment; filename=$name,{$row['cssid']}.css");
-		
-		print $row['css_text'];
-		
-		exit();
-		
-	}
-	
-	
-	//-------------------------------------------------------------
-	// REMOVE WRAPPERS
-	//-------------------------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing stylesheet ID, go back and try again");
-		}
-		
-		$DB->query("DELETE FROM ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( file_exists( ROOT_PATH."cache/css_".$IN['id'].".css" ) )
-		{
-			@unlink( ROOT_PATH."cache/css_".$IN['id'].".css" );
-		}
-		
-		$std->boink_it($SKIN->base_url."&act=style");
-			
-		exit();
-		
-		
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT WRAPPERS
-	//-------------------------------------------------------------
-	
-	function save_wrapper( $type='add' )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("You must specify an existing CSS ID, go back and try again");
-			}
-			
-		}
-		
-		if ($IN['name'] == "")
-		{
-			$ADMIN->error("You must specify a name for this stylesheet");
-		}
-		
-		if ($IN['css'] == "")
-		{
-			$ADMIN->error("You can't have an empty stylesheet, can you?");
-		}
-		
-		$css = stripslashes($HTTP_POST_VARS['css']);
-		
-		$barney = array( 'css_name'     => stripslashes($HTTP_POST_VARS['name']),
-						 'css_text'     => $css,
-						 'updated'      => time(),
-					   );
-					   
-		if ($type == 'add')
-		{
-			$db_string = $DB->compile_db_insert_string( $barney );
-			
-			$DB->query("INSERT INTO ibf_css (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-			
-			$new_id = $DB->get_insert_id();
-			
-			//--------------------------------------------
-			// Update cache?
-			//--------------------------------------------
-			
-			if ( file_exists( ROOT_PATH."cache" ) )
-			{
-				if ( is_writeable( ROOT_PATH."cache" ) )
-				{
-					$FH = fopen( ROOT_PATH."cache/css_".$new_id.".css", 'w' );
-					fputs( $FH, $css, strlen($css) );
-					fclose($FH);
-				}
-			}
-			
-			
-			$std->boink_it($SKIN->base_url."&act=style");
-			
-			exit();
-			
-		}
-		else
-		{
-			$db_string = $DB->compile_db_update_string( $barney );
-			
-			$DB->query("UPDATE ibf_css SET $db_string WHERE cssid='".$IN['id']."'");
-			
-			//--------------------------------------------
-			// Update cache?
-			//--------------------------------------------
-			
-			$extra = "<b>Cache file updated</b>";
-			
-			if ( file_exists( ROOT_PATH."cache" ) )
-			{
-				if ( is_writeable( ROOT_PATH."cache" ) )
-				{
-					if ( $FH = @fopen( ROOT_PATH."cache/css_".$IN['id'].".css", 'w' ) )
-					{
-						@fputs( $FH, $css, strlen($css) );
-						@fclose($FH);
-					}
-					else
-					{
-						$extra = "<b>Cache file not updated. Check CHMOD permissions on ./cache and ./cache/css_".$IN['id'].".css</b>";
-					}
-				}
-				else
-				{
-					$extra = "<b>Cache file not updated. Check CHMOD permissions on ./cache and ./cache/css_".$IN['id'].".css</b>";
-				}
-			}
-			else
-			{
-				$extra = "<b>Cache file not updated. Cache folder not present</b>";
-			}
-			
-			$ADMIN->nav[] = array( 'act=style' ,'Style Sheet Control Home' );
-			$ADMIN->nav[] = array( "act=style&code=edit2&id={$IN['id']}" ,"Edit Sheet Again" );
-			
-			$ADMIN->done_screen("Stylesheet updated : $extra", "Manage Style Sheets", "act=style" );
-			
-			
-		}
-		
-		
-	}
-	
-	
-	function do_form( $type='add' )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT cssid, css_text, css_name, updated FROM ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $cssinfo = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the CSS details from the database");
-		}
-		
-		//+-------------------------------
-		
-		$css = $cssinfo['css_text'];
-		
-		if ($type == 'add')
-		{
-			$code = 'doadd';
-			$button = 'Create StyleSheet';
-			$cssinfo['css_name'] = $cssinfo['css_name'].".2";
-		}
-		else
-		{
-			$code = 'doedit';
-			$button = 'Edit Stylesheet';
-			
-			//+-------------------------------
-			// DB same as cache version?
-			//+-------------------------------
-			
-			$cache_file = ROOT_PATH."cache/css_".$IN['id'].".css";
-			
-			if ( file_exists( $cache_file ) )
-			{
-				$FH = fopen( $cache_file, 'r' );
-				$cache_data = fread( $FH, filesize($cache_file) );
-				fclose($FH);
-			
-				$db_length    = strlen( trim($css) );
-				$cache_length = strlen(trim($cache_data));
-				
-				if ($db_length != $cache_length)
-				{
-					// We've got ourselves a mismatch!
-					// Get mtime of cache file
-					
-					$stat = stat( $cache_file );
-					
-					$cache_mtime = $stat[9];
-					$db_mtime    = $cssinfo['updated'];
-					
-					$this->resync_splash($db_length, $cache_length, $cache_mtime, $db_mtime, $IN['id']);
-					
-				}
-			}
-		}
-		
-		//+-------------------------------
-		// COLURS!ooO!
-		//+-------------------------------
-		
-		//.class { definitions }
-		//#id { definitions }
-		
-		$css_elements = array();
-		
-		preg_match_all( "/(\.|\#)(\S+?)\s{0,}\{.+?\}/s", $css, $match );
-		
-		for ($i=0; $i < count($match[0]); $i++)
-		{
-			$type = trim($match[1][$i]);
-			
-			$name = trim($match[2][$i]);
-			
-			if ($type == '.')
-			{
-				$css_elements[] = array( 'class|'.$name, $type.$name );
-			}
-			else
-			{
-				$css_elements[] = array( 'id|'.$name, $type.$name );
-			}
-		}
-			
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "You may use CSS fully when adding or editing stylesheets.";
-		$ADMIN->page_title  = "Manage Style Sheets";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= "<script language='javascript'>
-		                 <!--
-		                 function cssSearch(theID)
-		                 {
-		                 	cssChosen = document.cssForm.csschoice.options[document.cssForm.csschoice.selectedIndex].value;
-		                 	
-		                 	window.open('{$SKIN->base_url}&act=rtempl&code=css_search&id='+theID+'&element='+cssChosen,'CSSSEARCH','width=400,height=500,resizable=yes,scrollbars=yes');
-		                 }
-		                 
-		                 function cssPreview(theID)
-		                 {
-		                 	cssChosen = document.cssForm.csschoice.options[document.cssForm.csschoice.selectedIndex].value;
-		                 	
-		                 	window.open('{$SKIN->base_url}&act=rtempl&code=css_preview&id='+theID+'&element='+cssChosen,'CSSSEARCH','width=400,height=500,resizable=yes,scrollbars=yes');
-		                 }
-		                 
-		                 //-->
-		                 </script>";
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'css_search' ),
-												  2 => array( 'act'   , 'style'      ),
-												  3 => array( 'id'    , $IN['id']    ),
-									     ), "cssForm"      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "80%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Find CSS Usage" );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Show me where...",
-													$SKIN->form_dropdown('csschoice', $css_elements).' ... is used within the templates &nbsp;'
-												   .'<input type="button" value="Go!" onClick="cssSearch(\''.$IN['id'].'\');" id="editbutton">'
-												   .'&nbsp;<input type="button" value="Preview CSS Style" onClick="cssPreview(\''.$IN['id'].'\');" id="editbutton">'
-									     )      );
-									     
-		
-												 
-		$ADMIN->html .= $SKIN->end_form();
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->js_no_specialchars();
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $code      ),
-												  2 => array( 'act'   , 'style'      ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     ), "theAdminForm", "onSubmit=\"return no_specialchars('csssheet')\""      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "80%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( $button );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Stylesheet Title",
-													$SKIN->form_input('name', $cssinfo['css_name']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$SKIN->td_header[] = array( "{none}"  , "100%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Contents" );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<center>".$SKIN->form_textarea('css', $css, $INFO['tx'], $INFO['ty'])."<br /><a href='html/sys-img/css.html' target='_blank'>Launch Style Maker</a></center>",
-									     )      );
-												 
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// EDIT COLOURS START
-	//-------------------------------------------------------------
-	
-	function colouredit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT cssid, css_text, css_name, updated FROM ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $cssinfo = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the CSS details from the database");
-		}
-		
-		$css = $cssinfo['css_text'];
-		
-		//+-------------------------------
-		// DB same as cache version?
-		//+-------------------------------
-		
-		$cache_file = ROOT_PATH."cache/css_".$IN['id'].".css";
-		
-		if ( file_exists( $cache_file ) )
-		{
-			$FH = fopen( $cache_file, 'r' );
-			$cache_data = fread( $FH, filesize($cache_file) );
-			fclose($FH);
-		
-			$db_length    = strlen( $css );
-			$cache_length = strlen($cache_data);
-			
-			if ($db_length != $cache_length)
-			{
-				// We've got ourselves a mismatch!
-				// Get mtime of cache file
-				
-				$stat = stat( $cache_file );
-				
-				$cache_mtime = $stat[9];
-				$db_mtime    = $cssinfo['updated'];
-				
-				if ( $cache_mtime != $db_mtime and ( $db_length - $cache_length > 3 ))
-				{
-					$this->resync_splash($db_length, $cache_length, $cache_mtime, $db_mtime, $IN['id'], 'colouredit');
-				}
-			}
-		}
-		
-		
-		//+-------------------------------
-		// Start the CSS matcher thingy
-		//+-------------------------------
-		
-		//.class { definitions }
-		//#id { definitions }
-		
-		$colours = array();
-		
-		// Make http:// safe..
-		
-		//
-		
-		preg_match_all( "/([\:\.\#\w\s,]+)\{(.+?)\}/s", $css, $match );
-		
-		for ($i=0; $i < count($match[0]); $i++)
-		{
-			
-			$name    = trim($match[1][$i]);
-			$content = trim($match[2][$i]);
-			
-			$defs    = explode( ';', $content );
-			
-			if ( count( $defs ) > 0 )
-			{
-				foreach( $defs as $a )
-				{
-					$a = trim($a);
-					
-					if ( $a != "" )
-					{
-						list( $property, $value ) = explode( ":", $a, 2 );
-						
-						$property = trim($property);
-						$value    = trim($value);
-						
-						if ( $property and $value )
-						{
-							if ( $property == 'color' or $property == 'background-color' or $property == 'border' or $property == 'background-image' )
-							{
-								$colours[ $name ][$property] = $value;
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		if ( count($colours) < 1 )
-		{
-			$ADMIN->error("CSS all gone wonky! No colours to edit");
-		}
-		
-		//+-------------------------------
-		
-		// Get $skin_names stuff
-		
-		require './sources/Admin/skin_info.php';
-	
-		$ADMIN->page_detail = "You edit the existing colours below. <strong><a href='html/sys-img/colours.html' target='_blank'>Launch Colour Picker</a></center></strong>";
-		$ADMIN->page_title  = "Manage Style Sheets [ Colours ]";
-		
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'docolour'   ),
-												  2 => array( 'act'   , 'style'      ),
-												  3 => array( 'id'    , $IN['id']    ),
-									     )    );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Property"     , "25%" );
-		$SKIN->td_header[] = array( "&nbsp;"       , "75%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "CSS Colours" );
-		
-		foreach ( $colours as $prop => $val )
-		{
-		
-			$tbl_colour = "";
-			$tbl_bg     = "";
-			$tbl_html   = "";
-			
-			$desc = $css_names[ $prop ];
-			
-			if ( $desc == "" )
-			{
-				$desc = 'None available';
-			}
-			
-			$name = $prop;
-			
-			$md5 = md5($name);
-			
-			if ( strlen($name) > 30 )
-			{
-				$name = substr( $name, 0, 30 ) .'...';
-			}
-			
-			
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<strong>".$name."</strong><br />($desc)",
-														"<table width='100%' border='0' cellpadding='4' cellspacing='0'>
-														 <tr>
-														  <td width='20%'>Font Colour</td><td width='30%'>".
-														     $SKIN->form_simple_input('frm_'.$md5.'_color'           , $val['color'], "8")."&nbsp;&nbsp;<input type='text' size='6' style='border:1px solid black;background-color:{$val['color']}' readonly='readonly'>"
-														."</td>
-														  <td width='20%'>Background Colour</td><td width='30%'>".
-														     $SKIN->form_simple_input('frm_'.$md5.'_background-color', $val['background-color'], "8")."&nbsp;&nbsp;<input type='text' size='6' style='border:1px solid black;background-color:{$val['background-color']}' readonly='readonly'>"
-											 			."</td>
-											 			 </tr>
-											 			 <tr>
-											 			 <td>Border</td><td width='30%'>".
-											 			   $SKIN->form_simple_input('frm_'.$md5.'_border'          , $val['border'], "20")
-											 			."</td>
-											 			  <td>Background-image</td><td width='30%'>".
-											 			   $SKIN->form_simple_input('frm_'.$md5.'_background-image', $val['background-image'], "30")
-											 			."</td></tr></table>"
-											 )      );
-									     
-		}
-												 
-		$ADMIN->html .= $SKIN->end_form("Edit");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// EDIT COLOURS START
-	//-------------------------------------------------------------
-	
-	function do_colouredit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT cssid, css_text, css_name, updated FROM ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $cssinfo = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the CSS details from the database");
-		}
-		
-		$css = $cssinfo['css_text'];
-		
-		//+-------------------------------
-		// Start the CSS matcher thingy
-		//+-------------------------------
-		
-		$colours = array();
-		
-		preg_match_all( "/([\:\.\#\w\s,]+)\{(.+?)\}/s", $css, $match );
-		
-		for ($i=0; $i < count($match[0]); $i++)
-		{
-			
-			$name    = trim($match[1][$i]);
-			$content = trim($match[2][$i]);
-			
-			$md5     = md5($name);
-			
-			$defs    = explode( ';', $content );
-			
-			if ( count( $defs ) > 0 )
-			{
-				foreach( $defs as $a )
-				{
-					$a = trim($a);
-					
-					if ( $a != "" )
-					{
-						list( $property, $value ) = explode( ":", $a, 2 );
-						
-						$property = trim($property);
-						$value    = trim($value);
-						
-						if ( $property and $value )
-						{
-							if ( $property != 'color' and $property != 'background-color' and $property != 'border' and $property != 'background-image' )
-							{
-								$colours[ $name ][$property] = $value;
-							}
-						}
-					}
-				}
-			}
-			
-			foreach( array( 'color', 'background-color', 'border', 'background-image' ) as $prop )
-			{
-				if ( isset($HTTP_POST_VARS['frm_'.$md5.'_'.$prop]) )
-				{
-					$colours[ $name ][$prop] = stripslashes($HTTP_POST_VARS['frm_'.$md5.'_'.$prop]);
-				}
-			}
-		}
-		
-		if ( count($colours) < 1 )
-		{
-			$ADMIN->error("CSS all gone wonky! No colours to edit");
-		}
-		
-		//+-------------------------------
-		
-		unset($name);
-		unset($property);
-		
-		$final = "";
-		
-		foreach( $colours as $name => $property )
-		{
-			$final .= $name." { ";
-			
-			if ( is_array($property) and count($property) > 0 )
-			{
-				foreach( $property as $key => $value )
-				{
-					if ( $key AND $value )
-					{
-						$final .= $key.": ".$value.";";
-					}
-				}
-			}
-			
-			$final .= " }\n";
-		
-		}
-		
-		$barney = array( 
-						 'css_text'     => $final,
-						 'updated'      => time(),
-					   );
-					   
-		$db_string = $DB->compile_db_update_string( $barney );
-		
-		$DB->query("UPDATE ibf_css SET $db_string WHERE cssid='".$IN['id']."'");
-		
-		//--------------------------------------------
-		// Update cache?
-		//--------------------------------------------
-		
-		$extra = "<b>Cache file updated</b>";
-			
-			if ( file_exists( ROOT_PATH."cache" ) )
-			{
-				if ( is_writeable( ROOT_PATH."cache" ) )
-				{
-					if ( $FH = @fopen( ROOT_PATH."cache/css_".$IN['id'].".css", 'w' ) )
-					{
-						@fputs( $FH, $css, strlen($css) );
-						@fclose($FH);
-					}
-					else
-					{
-						$extra = "<b>Cache file not updated. Check CHMOD permissions on ./cache and ./cache/css_".$IN['id'].".css</b>";
-					}
-				}
-				else
-				{
-					$extra = "<b>Cache file not updated. Check CHMOD permissions on ./cache and ./cache/css_".$IN['id'].".css</b>";
-				}
-			}
-			else
-			{
-				$extra = "<b>Cache file not updated. Cache folder not present</b>";
-			}
-		
-		$ADMIN->nav[] = array( 'act=style' ,'Style Sheet Control Home' );
-		$ADMIN->nav[] = array( "act=style&code=edit2&id={$IN['id']}" ,"Edit Sheet Again (Advanced)" );
-		$ADMIN->nav[] = array( "act=style&code=colouredit&id={$IN['id']}" ,"Edit Colours Again?" );
-		
-		$ADMIN->done_screen("Stylesheet updated : $extra", "Manage Style Sheets", "act=style" );
-			
-		
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW STYLE SHEETS
-	//-------------------------------------------------------------
-	
-	function list_sheets()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-		$show_array = array();
-	
-		$ADMIN->page_detail = "You may add/edit and remove stylesheets.<br><br>Style Sheets are CSS files. This is where you can change the colours, fonts and font sizes throughout the board.";
-		$ADMIN->page_title  = "Manage Stylesheets";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Title"  , "40%" );
-		$SKIN->td_header[] = array( "Allocation"   , "20%" );
-		$SKIN->td_header[] = array( "Optimize" , "10%" );
-		$SKIN->td_header[] = array( "Download" , "10%" );
-		$SKIN->td_header[] = array( "Edit"   , "10%" );
-		$SKIN->td_header[] = array( "Remove" , "10%" );
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT DISTINCT(c.cssid), c.css_name, s.sname from ibf_css c, ibf_skins s WHERE s.css_id=c.cssid ORDER BY c.css_name ASC");
-		
-		$used_ids = array();
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			$ADMIN->html .= $SKIN->start_table( "Current Stylesheets In Use" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$show_array[ $r['cssid'] ] .= stripslashes($r['sname'])."<br>";
-			
-				if ( in_array( $r['cssid'], $used_ids ) )
-				{
-					continue;
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['css_name'])."</b>",
-														  "<#X-{$r['cssid']}#>",
-														  "<center><a href='".$SKIN->base_url."&act=style&code=optimize&id={$r['cssid']}'>Optimize</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=style&code=export&id={$r['cssid']}'>Download</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=style&code=edit&id={$r['cssid']}'>Edit</a></center>",
-														  "<i>Deallocate before removing</i>",
-												 )      );
-												   
-				$used_ids[] = $r['cssid'];
-				
-				$form_array[] = array( $r['cssid'], $r['css_name'] );
-				
-			}
-			
-			foreach( $show_array as $idx => $string )
-			{
-				$string = preg_replace( "/<br>$/", "", $string );
-				
-				$ADMIN->html = preg_replace( "/<#X-$idx#>/", "$string", $ADMIN->html );
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		if ( count($used_ids) > 0 )
-		{
-		
-			$DB->query("SELECT cssid, css_name FROM ibf_css WHERE cssid NOT IN(".implode(",",$used_ids).")");
-		
-			if ( $DB->get_num_rows() )
-			{
-			
-				$SKIN->td_header[] = array( "Title"  , "60%" );
-				$SKIN->td_header[] = array( "Optimize" , "10%" );
-				$SKIN->td_header[] = array( "Download" , "10%" );
-				$SKIN->td_header[] = array( "Edit"   , "10%" );
-				$SKIN->td_header[] = array( "Remove" , "10%" );
-			
-				$ADMIN->html .= $SKIN->start_table( "Current Unallocated Stylesheets" );
-				
-				$ADMIN->html .= $SKIN->js_checkdelete();
-				
-				
-				while ( $r = $DB->fetch_row() )
-				{
-					
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['css_name'])."</b>",
-					 										  "<center><a href='".$SKIN->base_url."&act=style&code=optimize&id={$r['cssid']}'>Optimize</a></center>",
-					 										  "<center><a href='".$SKIN->base_url."&act=style&code=export&id={$r['cssid']}'>Download</a></center>",
-															  "<center><a href='".$SKIN->base_url."&act=style&code=edit&id={$r['cssid']}'>Edit</a></center>",
-															  "<center><a href='javascript:checkdelete(\"act=style&code=remove&id={$r['cssid']}\")'>Remove</a></center>",
-													 )      );
-													 
-					$form_array[] = array( $r['cssid'], $r['css_name'] );
-													   
-				}
-				
-				$ADMIN->html .= $SKIN->end_table();
-			}
-		}
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add'      ),
-												  2 => array( 'act'   , 'style'    ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Create New Stylesheet (Copy)" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base new stylesheet on...</b>" ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Copy to new stylesheet");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'css_upload' ),
-												  2 => array( 'act'   , 'style'     ),
-												  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
-									     ) , "uploadform", " enctype='multipart/form-data'"     );
-									     
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Upload new stylesheet" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Browse your hard drive</b>" ,
-										  		  $SKIN->form_upload()
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Upload new stylesheet");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_templates.php b/upload/sources/Admin/ad_templates.php
deleted file mode 100644
index c711c865..00000000
--- a/upload/sources/Admin/ad_templates.php
+++ /dev/null
@@ -1,2198 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Skin -> Templates functions
-|   > Module written by Matt Mecham
-|   > Date started: 15th April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'add':
-				$this->add_splash();
-				break;
-				
-			case 'find_pop':
-				$this->find_popular();
-				break;
-				
-			case 'edit':
-				$this->show_cats();
-				break;
-				
-			case 'dedit':
-				$this->do_form();
-				break;
-				
-			case 'doedit':
-				$this->do_edit();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-			case 'tools':
-				$this->tools();
-				break;
-				
-			case 'editinfo':
-				$this->edit_info();
-				break;
-				
-			case 'export':
-				$this->export();
-				break;
-			
-			case 'edit_bit':
-				$this->edit_bit();
-				break;
-				
-			case 'download':
-				$this->download_group();
-				break;
-				
-			case 'upload':
-				$this->upload_form();
-				break;
-				
-			case 'do_upload':
-				$this->upload_single();
-				break;
-				
-			
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//------------------------------------------------------
-	
-	function add_splash()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_FILES;
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") )
-		{
-			// We're adding new templates based on another set
-			
-			$this->add_templates();
-			exit();
-		}
-		
-		if (! is_dir($INFO['upload_dir']) )
-		{
-			$ADMIN->error("Could not locate the uploads directory - make sure the 'uploads' path is set correctly");
-		}
-		
-		//-------------------------------------------------
-		// Copy the upload to the uploads directory
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $INFO['upload_dir']."/".$FILE_NAME) )
-		{
-			$ADMIN->error("The upload failed");
-		}
-		else
-		{
-			@chmod( $INFO['upload_dir']."/".$FILE_NAME, 0777 );
-		}
-		
-		//-------------------------------------------------
-		// Attempt to open the file..
-		//-------------------------------------------------
-		
-		$filename = $INFO['upload_dir']."/".$FILE_NAME;
-		
-		if ( $FH = @fopen( $filename, 'r' ) )
-		{
-			$data = @fread( $FH, filesize($filename) );
-			@fclose($FH);
-			
-			@unlink($filename);
-		}
-		else
-		{
-			$ADMIN->error("Could not open the uploaded file for reading!");
-		}
-		
-		//-------------------------------------------------
-		// If we're here, we'll assume that we've read the
-		// file and the contents are in $data
-		// So, lets make sure its the correct template file..
-		//-------------------------------------------------
-		
-		if ( ! preg_match( "/<!--TEMPLATE_SET\|(.+?)-->/", $data, $matches ) )
-		{
-			$ADMIN->error("This file does not appear to be a valid Invision Power Board Template Set file");
-		}
-		
-		list($pack_name,$author,$email,$url) = explode( ",", trim($matches[1]) );
-		
-		//-------------------------------------------------
-		// Find the new set ID by inserting the data for the
-		// template names, we can always remove it later if
-		// we get an error
-		//-------------------------------------------------
-		
-		$pack_name .= "(Upload ID: ".substr( time(), -6 ).")";
-		$pack_name = str_replace( "'", "", $pack_name );
-		$author    = str_replace( "'", "", $author );
-		$email     = str_replace( "'", "", $email );
-		$url       = str_replace( "'", "", $url );
-		
-		$DB->query("INSERT INTO ibf_tmpl_names (skname, author, email, url) VALUES('$pack_name', '$author', '$email', '$url')");
-		$setid = $DB->get_insert_id();
-		
-		//-------------------------------------------------
-		// Divide the file up into different sections
-		//-------------------------------------------------
-		
-		preg_match_all( "/<!--IBF_GROUP_START:(\S+?)-->(.+?)<!--IBF_GROUP_END:\S+?-->/s", $data, $match );
-		
-		for ($i=0; $i < count($match[0]); $i++)
-		{
-			$match[1][$i] = trim($match[1][$i]);
-			
-			$match[2][$i] = trim($match[2][$i]);
-			
-			// Pass it on to our handler..
-		
-			$this->process_upload($match[2][$i], $setid, $match[1][$i], 1 );
-			
-			
-		}
-		
-		// Insert this new data into the template names thingy
-	
-		$ADMIN->done_screen("Template set import complete", "Manage Template Sets", "act=templ" );
-		
-	}
-	
-	//------------------------------------------------------
-	
-	function upload_single()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_FILES;
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		if (! is_dir($INFO['upload_dir']) )
-		{
-			$ADMIN->error("Could not locate the uploads directory - make sure the 'uploads' path is set correctly");
-		}
-							
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") )
-		{
-			$ADMIN->error("No file was chosen to upload!");
-		}
-		
-		//-------------------------------------------------
-		// Copy the upload to the uploads directory
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $INFO['upload_dir']."/".$FILE_NAME) )
-		{
-			$ADMIN->error("The upload failed");
-		}
-		else
-		{
-			@chmod( $INFO['upload_dir']."/".$FILE_NAME, 0777 );
-		}
-		
-		//-------------------------------------------------
-		// Attempt to open the file..
-		//-------------------------------------------------
-		
-		$filename = $INFO['upload_dir']."/".$FILE_NAME;
-		
-		if ( $FH = @fopen( $filename, 'r' ) )
-		{
-			$data = @fread( $FH, filesize($filename) );
-			@fclose($FH);
-			
-			@unlink($filename);
-		}
-		else
-		{
-			$ADMIN->error("Could not open the uploaded file for reading!");
-		}
-		
-		//-------------------------------------------------
-		// If we're here, we'll assume that we've read the
-		// file and the contents are in $data
-		// So, lets make sure its the correct template file..
-		//-------------------------------------------------
-		
-		preg_match( "/<!--IBF_GROUP_START:(\S+?)-->/", $data, $matches );
-		
-		$found_group = trim($matches[1]);
-		
-		if ($found_group != $IN['group'])
-		{
-			$ADMIN->error("The uploaded file does not appear to be the correct type for this template group. Looking for template group '{$IN['group']}', found '$found_group'");
-		}
-		
-		//-------------------------------------------------
-		// If we're here, then lets proceed, first lets
-		// remove the END GROUP statement.
-		//-------------------------------------------------
-		
-		$data = preg_replace( "/<!--IBF_GROUP_END:\S+-->/", "", $data );
-		
-		// Pass it on to our handler..
-		
-		$this->process_upload($data, $IN['setid'], $IN['group'] );
-		
-		$ADMIN->done_screen("Template set update complete", "Manage Template Sets", "act=templ" );
-		
-	}
-	
-	//------------------------------------------------------
-	
-	function upload_form()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		require './sources/Admin/skin_info.php';
-		
-		if ($IN['setid'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		if ($IN['group'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		//-----------------------------------
-		// Get the info from the DB
-		//-----------------------------------
-		
-		$DB->query("SELECT * FROM ibf_skin_templates WHERE set_id='".$IN['setid']."' AND group_name='".$IN['group']."'");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$ADMIN->error("Can't query the information from the database");
-		}
-		
-		$DB->query("SELECT skname FROM ibf_tmpl_names WHERE skid='".$IN['setid']."'");
-		
-		$row = $DB->fetch_row();
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "Please check all the information carefully before continuing.";
-		$ADMIN->page_title  = "Upload a template file for template set: {$row['skname']}";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'do_upload' ),
-												  2 => array( 'act'   , 'templ'     ),
-												  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
-												  4 => array( 'setid' , $IN['setid']  ),
-												  5 => array( 'group' , $IN['group']  ),
-									     ) , "uploadform", " enctype='multipart/form-data'"     );
-									     
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-
-		$ADMIN->html .= $SKIN->start_table("Upload template file to replace: ".$skin_names[ $IN['group'] ][0]);
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Choose a file from your computer to upload</b><br>Note: Uploading this file will replace all data currently held, there is no undo!.",
-												  $SKIN->form_upload(),
-										 )      );
-									     
-		$ADMIN->html .= $SKIN->end_form('Upload File');
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->nav[] = array( 'act=templ' ,'Template Control Home' );
-		$ADMIN->nav[] = array( "act=templ&code=edit&id={$IN['setid']}" ,$row['skname'] );
-		
-		$ADMIN->output();						
-		
-	}
-	
-	//------------------------------------------------------
-	
-	function export()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		$DB->query("SELECT * FROM ibf_tmpl_names WHERE skid='".$IN['id']."'");
-			
-		if ( ! $set = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not find a template set with that ID in the database, please try again");
-		}
-			
-		//-----------------------------------
-		// Get the info from the DB
-		//-----------------------------------
-		
-		$groups = $DB->query("SELECT DISTINCT(group_name) FROM ibf_skin_templates WHERE set_id='".$IN['id']."'");
-		
-		if ( ! $DB->get_num_rows($groups) )
-		{
-			$ADMIN->error("Can't query the information from the database");
-		}
-		
-		// Loop and pass it to the download compiler
-		
-		$author = str_replace( ",", "-", $set['author'] );
-		$email  = str_replace( ",", "-", $set['email'] );
-		$url    = str_replace( ",", "-", $set['url'] );
-		$skname = str_replace( ",", "-", $set['skname'] );
-		
-		$output .= "<!--TEMPLATE_SET|$skname,$author,$email,$url-->\n\n";
-		
-		while ( $row = $DB->fetch_row($groups) )
-		{
-			$output .= $this->download_group(1, $IN['id'], $row['group_name'] );
-		}
-		
-		$name = str_replace( " ", "_", $set['skname'] );
-		
-		@header("Content-type: unknown/unknown");
-		@header("Content-Disposition: attachment; filename={$name}.SET.html");
-		
-		print $output;
-		
-		exit();
-		
-	}
-	
-	//------------------------------------------------------
-	
-	//------------------------------------------------------
-	
-	function download_group($return=0, $setid="", $group="")
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($setid != "")
-		{
-			$IN['setid'] = $setid;
-		}
-		
-		if ($group != "")
-		{
-			$IN['group'] = $group;
-		}
-		
-		if ($IN['setid'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		if ($IN['group'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		//-----------------------------------
-		// Get the info from the DB
-		//-----------------------------------
-		
-		$aq = $DB->query("SELECT * FROM ibf_skin_templates WHERE set_id='".$IN['setid']."' AND group_name='".$IN['group']."'");
-		
-		if ( ! $DB->get_num_rows($aq) )
-		{
-			$ADMIN->error("Can't query the information from the database");
-		}
-		
-		$output = "<!-- PLEASE LEAVE ALL 'IBF' COMMENTS IN PLACE, DO NOT REMOVE THEM! -->\n<!--IBF_GROUP_START:{$IN['group']}-->\n\n";
-		
-		while ( $row = $DB->fetch_row($aq) )
-		{
-			$text = $this->convert_tags($row['section_content']);
-			
-			$output .= "<!--IBF_START_FUNC|{$row['func_name']}|{$row['func_data']}-->\n\n";
-			$output .= $text."\n";
-			$output .= "<!--IBF_END_FUNC|{$row['func_name']}-->\n\n";
-		}
-		
-		$output .= "\n<!--IBF_GROUP_END:{$IN['group']}-->\n";
-		
-		if ($return == 0)
-		{
-			$DB->query("SELECT skname FROM ibf_tmpl_names WHERE skid='".$IN['setid']."'");
-			
-			$set = $DB->fetch_row();
-			
-			$name = str_replace( " ", "_", $set['skname'] );
-			
-			@header("Content-type: unknown/unknown");
-			@header("Content-Disposition: attachment; filename={$name}.{$IN['group']}.html");
-			
-			print $output;
-			
-			exit();
-		}
-		else
-		{
-			return $output;
-		}
-		
-	}
-	
-	//------------------------------------------------------
-	
-	function show_cats()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_tmpl_names WHERE skid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		// Get $skin_names stuff
-		
-		require './sources/Admin/skin_info.php';
-		
-		
-		if ($row['author'] and $row['email'])
-		{
-			$author = "<br><br>This template set <b>'{$row['skname']}'</b> was created by <a href='mailto:{$row['email']}' target='_blank'>{$row['author']}</a>";
-		}
-		else if ($row['author'])
-		{
-			$author = "<br><br>This template set <b>'{$row['skname']}'</b> was created by {$row['author']}";
-		}
-		
-		if ($row['url'])
-		{
-			$url = " (website: <a href='{$row['url']}' target='_blank'>{$row['url']}</a>)";
-		}
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "Please choose which section you wish to edit below.<br><br><b>Download</b> this HTML section This option allows you to download all of the HTML for this template section for offline editing.<br><b>Upload</b> HTML for this section This option allows you to upload a saved HTML file to replace this template section.$author $url";
-		$ADMIN->page_title  = "Edit Template sets";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->js_checkdelete();
-		
-		$all_cats = $DB->query("select group_name, set_id, suid, count(group_name) as number_secs, group_name FROM ibf_skin_templates WHERE set_id='".$IN['id']."' group by group_name");
-		
-		$SKIN->td_header[] = array( "Skin Category Title"   , "40%" );
-		$SKIN->td_header[] = array( "View Options"          , "20%" );
-		$SKIN->td_header[] = array( "Manage"                , "30%" );
-		$SKIN->td_header[] = array( "# Bits"                , "10%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= "<script language='javascript'>
-						 function pop_win(theUrl) {
-						 	
-						 	window.open('{$SKIN->base_url}&'+theUrl,'Preview','width=400,height=450,resizable=yes,scrollbars=yes');
-						 }
-						 </script>";
-						 
-		$qc = $SKIN->form_dropdown( 'entry', array(
-													0 => array( 'boardheader', 'Edit Board Header'             ),
-													1 => array( 'catforum'   , 'Edit Category & Forum Table'   ),
-													2 => array( 'topiclist'  , 'Edit Topic List Entry & Table' ),
-													3 => array( 'postlist'   , 'Edit Post View & Table'        ),
-								  )			     );
-												  
-						 
-		$quick_click = "<form action='{$SKIN->base_url}&act=templ&code=find_pop&id={$IN['id']}' method='post'>
-						<div align='right'>Quick&nbsp;Clicks&nbsp;&nbsp;{$qc}&nbsp;<input type='submit' value='Go' /></div></form>
-					   ";
-		
-		$ADMIN->html .= $SKIN->start_table("Template: ".$row['skname'], $quick_click);
-			
-		while ( $group = $DB->fetch_row($all_cats) )
-		{
-		
-			$name = "<b>".$group['group_name']."</b>";
-			$desc = "";
-			
-			$expand = 'Expand to Edit';
-			$eid    = $group['suid'];
-			$exp_content = "";
-			
-			// If available, change group name to easy name
-			
-			if ( isset($skin_names[ $group['group_name'] ]) )
-			{
-				$name = "<b>".$skin_names[ $group['group_name'] ][0]."</b>";
-				$desc = "<br><span id='description'>".$skin_names[ $group['group_name'] ][1]."</span>";
-			}
-			else
-			{
-				$name .= " (Non-Default Group)";
-				$desc = "<br>This group is not part of the standard Invision Power Board installation and no description is available";
-			}
-			
-			// Is this section expanded?
-			
-			if ($IN['expand'] == $group['suid'])
-			{
-				$expand = 'Collapse';
-				$eid    = '';
-				
-				$new_q = $DB->query("SELECT func_name, LENGTH(section_content) as sec_length, suid FROM ibf_skin_templates WHERE set_id='{$IN['id']}' AND group_name='{$group['group_name']}'");
-				
-				//----------------------------
-				
-				if ( $DB->get_num_rows($new_q) )
-				{
-					$exp_content .= $SKIN->add_td_basic( "<script type='text/javascript'>
-														  function checkall(cb) {
-															   var fmobj = document.mutliact;
-															   for (var i=0;i<fmobj.elements.length;i++) {
-																   var e = fmobj.elements[i];
-																   if ((e.name != 'allbox') && (e.type=='checkbox') && (!e.disabled)) {
-																	   e.checked = fmobj.allbox.checked;
-																   }
-															   }
-														   }
-														   function checkcheckall(cb) {	
-															   var fmobj = document.mutliact;
-															   var TotalBoxes = 0;
-															   var TotalOn = 0;
-															   for (var i=0;i<fmobj.elements.length;i++) {
-																   var e = fmobj.elements[i];
-																   if ((e.name != 'allbox') && (e.type=='checkbox')) {
-																	   TotalBoxes++;
-																	   if (e.checked) {
-																		   TotalOn++;
-																	   }
-																   }
-															   }
-															   if (TotalBoxes==TotalOn) {fmobj.allbox.checked=true;}
-															   else {fmobj.allbox.checked=false;}
-														   }
-														   </script>
-														  <a name='anc{$group['suid']}'>
-														  <form name='mutliact' action='{$SKIN->base_url}&act=templ&code=edit_bit&expand={$group['suid']}' method='post'>
-														  <table cellspacing='1' cellpadding='5' width='100%' align='center' bgcolor='#333333'>
-														  <tr>
-														   <td align='left' colspan='2' class='catrow2'><a style='font-weight:bold;font-size:12px;color:#000033' href='{$SKIN->base_url}&act=templ&code=edit&id={$IN['id']}&expand=' title='Collapse' alt='Collapse'>$name</a></td>
-														   <td colspan='3' bgcolor='#FFFFFF'>&nbsp;</td>
-														  <tr>
-														   <td width='5%' class='catrow2' align='center'><input type='checkbox' onclick='checkall()' name='allbox' value='1' /></td>
-														   <td width='25%' class='catrow2'>Edit all the sections below</td>
-														   <td width='20%' class='catrow2' align='center'># Characters</td>
-														   <td width='20%' class='catrow2' align='center'>Edit</td>
-														   <td width='30%' class='catrow2' align='center'>Preview Options</td>
-														  </tr>
-														  <!--CONTENT-->
-														  <tr>
-														   <td colspan='5'  class='catrow2' align='center'><input type='submit' value='Edit Selected' /></td>
-														  </tr>
-														  </table></form>", "left", "tdrow2" );
-				
-				
-					$temp = "";
-					$sec_arry = array();
-					
-					// Stuff array to sort on name
-					
-					while ( $i = $DB->fetch_row($new_q) )
-					{
-						$sec_arry[ $i['suid'] ] = $i;
-						$sec_arry[ $i['suid'] ]['easy_name'] = $i['func_name'];
-						
-						// If easy name is available, use it
-						
-						if ($bit_names[ $group['group_name'] ][ $i['func_name'] ] != "")
-						{
-							$sec_arry[ $i['suid'] ]['easy_name'] = $bit_names[ $group['group_name'] ][ $i['func_name'] ];
-						}
-						
-					}
-					
-					// Sort by easy_name
-					
-					usort($sec_arry, array( 'ad_settings', 'perly_word_sort' ) );
-					
-					// Loop and print
-					
-					foreach( $sec_arry as $id => $sec )
-					{
-						$sec['easy_name'] = preg_replace( "/^(\d+)\:\s+?/", "", $sec['easy_name'] );
-						
-						$temp .= "
-									<tr>
-									 <td width='5%'  class='tdrow1' align='center'><input type='checkbox' onclick='checkcheckall()' name='cb_{$sec['suid']}' value='1' /></td>
-									 <td width='40%' class='tdrow1'><b>{$sec['easy_name']}</b></td>
-									 <td width='10%' class='tdrow1' align='center'>{$sec['sec_length']}</td>
-									 <td width='10%' class='tdrow1' align='center'><a href='{$SKIN->base_url}&act=templ&code=edit_bit&suid={$sec['suid']}&expand={$group['suid']}&type=single'>Edit Single</a></td>
-									 <td width='40%' class='tdrow1' align='center' nowrap>(<a href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=html\")'>HTML</a> | <a href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=text\")'>Text</a> | <a href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=css\")'>With CSS</a>)</td>
-									</tr>
-								";
-					}
-				
-					
-					$exp_content = str_replace( "<!--CONTENT-->", $temp, $exp_content );
-					
-					$desc = "";
-				
-				}
-				
-				//----------------------------
-				
-			}
-			else
-			{
-			
-				$ADMIN->html .= $SKIN->add_td_row( array( 
-															"<span style='font-weight:bold;font-size:12px;color:#000033'><a href='{$SKIN->base_url}&act=templ&code=edit&id={$IN['id']}&expand=$eid&#anc$eid'>".$name."</a></span>".$desc,
-															"<center><a href='{$SKIN->base_url}&act=templ&code=edit&id={$IN['id']}&expand=$eid'>$expand</a></center>",
-															"<center><a href='{$SKIN->base_url}&act=templ&code=download&setid={$group['set_id']}&group={$group['group_name']}' title='Download a HTML file of this section for offline editing'>Download</a> | <a href='{$SKIN->base_url}&act=templ&code=upload&setid={$group['set_id']}&group={$group['group_name']}' title='Upload a saved HTML file to replace this section'>Upload</a></center>",
-															"<center>".$group['number_secs']."</center>",
-												 )      );
-			}
-											 
-			$ADMIN->html .= $exp_content;
-											 
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-									     
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->nav[] = array( 'act=templ' ,'Template Control Home' );
-		$ADMIN->nav[] = array( '' ,'Managing Template Set "'.$row['skname'].'"' );
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	// Sneaky sorting.
-	// We use the format "1: name". without this hack
-	// 1: name, 2: other name, 11: other name
-	// will sort as 1: name, 11: other name, 2: other name
-	// There is natsort and such in PHP, but it causes some
-	// problems on older PHP installs, this is hackish but works
-	// by simply adding '0' to a number less than 2 characters long.
-	// of course, this won't work with three numerics in the hundreds
-	// but we don't have to worry about more that 99 bits in a template
-	// at this stage.
-	
-	function perly_word_sort($a, $b)
-	{
-		$nat_a = intval( $a['easy_name'] );
-		$nat_b = intval( $b['easy_name'] );
-		
-		if (strlen($nat_a) < 2)
-		{
-			$nat_a = '0'.$nat_a;
-		}
-		if (strlen($nat_b) < 2)
-		{
-			$nat_b = '0'.$nat_b;
-		}
-		
-		return strcmp($nat_a, $nat_b);
-	}
-	
-	
-	//+--------------------------------------------------------------------------------
-	//+--------------------------------------------------------------------------------
-	
-	
-	function edit_info()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_tmpl_names WHERE skid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		$final['skname'] = stripslashes($HTTP_POST_VARS['skname']);
-		
-		if (isset($HTTP_POST_VARS['author']))
-		{
-			$final['author'] = str_replace( ",", "", stripslashes($HTTP_POST_VARS['author']) );
-			$final['email']  = str_replace( ",", "", stripslashes($HTTP_POST_VARS['email']) );
-			$final['url']    = str_replace( ",", "", stripslashes($HTTP_POST_VARS['url']) );
-		}
-		
-		$db_string = $DB->compile_db_update_string( $final );
-		
-		$DB->query("UPDATE ibf_tmpl_names SET $db_string WHERE skid='".$IN['id']."'");
-		
-		$ADMIN->done_screen("Template information updated", "Manage Template sets", "act=templ" );
-		
-	}
-	
-	
-	//------------------------------------------------------------------------------------
-	//------------------------------------------------------------------------------------
-	
-	function tools()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must choose a valid skin file to perform this operation on");
-		}
-		
-		if ($IN['tool'] == 'tmpl')
-		{
-			$this->tools_build_tmpl();
-		}
-		else
-		{
-			$this->tools_rebuildphp();
-		}
-		
-	}
-	
-	//------------------------------------------------------------------------------------
-	
-	function tools_build_tmpl()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$insert = 1;
-		
-		// Rebuilds the data editable files from the PHP source files
-		
-		$skin_dir     = ROOT_PATH."Skin/s".$IN['id'];
-		
-		/*$curr_groups = array();
-		
-		// Are we updating or inserting?
-		
-		$DB->query("SELECT group_name, func_name FROM ibf_skin_templates WHERE set_id='".$IN['id']."'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$insert = 0;
-		
-			while ( $gname = $DB->fetch_row() )
-			{
-				$curr_group[ $gname['group_name'] ][ $gname['func_name'] ] = 1;
-			}
-		}*/
-		
-		$errors = array();
-		
-		$flag = 0;
-		
-		//------------------------------------------------
-		// Is this a safe mode only skinny poos?
-		//------------------------------------------------
-		
-		if ( ! file_exists( $skin_dir ) )
-		{
-			$ADMIN->error("This template set is a safe mode only skin and no PHP skin files exist, there is no need to run this tool on this template set.");
-		}
-		
-		
-		if ( ! is_readable($skin_dir) )
-		{
-			$ADMIN->error("Cannot write into '$skin_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-		}
-		
-		if ( is_dir($skin_dir) )
-		{
-			if ( $handle = opendir($skin_dir) )
-			{
-			
-				while (($filename = readdir($handle)) !== false)
-				{
-					if (($filename != ".") && ($filename != ".."))
-					{
-					
-						if ( preg_match( "/\.php$/", $filename ) )
-						{
-							
-							$name = preg_replace( "/^(\S+)\.(\S+)$/", "\\1", $filename );
-							
-							if ($FH = fopen($skin_dir."/".$filename, 'r') )
-							{
-								$fdata = fread( $FH, filesize($skin_dir."/".$filename) );
-								fclose($FH);
-							}
-							else
-							{
-								$errors[] = "Could not open $filename for reading, skipping file...";
-								continue;
-							}
-							
-							$fdata = str_replace( "\r", "\n", $fdata );
-							$fdata = str_replace( "\n\n", "\n", $fdata );
-							
-							if ( ! preg_match( "/\n/", $fdata ) )
-							{
-								$errors[] = "Could not find any line endings in $filename, skipping file...";
-								continue;
-							}
-							
-							$farray = explode( "\n", $fdata );
-							
-							//----------------------------------------------------
-							
-							$functions = array();
-							
-							foreach($farray as $f)
-							{
-								
-								// Skip javascript functions...
-								
-								if ( preg_match( "/<script/i", $f ) )
-								{
-									$script_token = 1;
-								}
-								
-								if ( preg_match( "/<\/script>/i", $f ) )
-								{
-									$script_token = 0;
-								}
-								
-								//-------------------------------
-								
-								if ($script_token == 0)
-								{
-									if ( preg_match( "/^function\s*([\w\_]+)\s*\((.*)\)/i", $f, $matches ) )
-									{
-										$functions[$matches[1]] = '';
-										$config[$matches[1]]    = $matches[2];
-										$flag = $matches[1];
-										continue;
-									}
-								}
-									
-								if ($flag)
-								{
-									$functions[$flag] .= $f."\n";
-									continue;
-								}
-								 
-							}
-							
-							//----------------------------------------------------
-							// Remove current templates for this set...
-							//----------------------------------------------------
-							
-							$DB->query("DELETE FROM ibf_skin_templates WHERE set_id='".$IN['id']."' AND group_name='$name'");
-							
-							$final = "";
-							$flag  = 0;
-							
-							foreach($functions as $fname => $ftext)
-							{
-								preg_match( "/return <<<(EOF|HTML)(.+?)(EOF|HTML);/s", $ftext, $matches );
-								
-								$matches[2] = str_replace( '\\n' , '\\\\\\n', $matches[2] );
-								
-								
-								$db_update = $DB->compile_db_update_string( array (
-																				'set_id'          => $IN['id'],
-																				'group_name'      => $name,
-																				'section_content' => $matches[2],
-																				'func_name'       => $fname,
-																				'func_data'       => trim($config[$fname]),
-																				'updated'         => time(),
-																	  )       );
-																	  
-						
-								$DB->query("INSERT INTO ibf_skin_templates SET $db_update");
-							}
-							
-							$functions = array();
-							
-							//----------------------------------------------------
-							
-						} // if *.php
-						
-					} // if not dir
-					
-				} // while loop
-				
-				closedir($handle);
-				
-			}
-			else
-			{
-				$ADMIN->error("Could not open directory $skin_dir for reading!");
-			}
-		}
-		else
-		{
-			$ADMIN->error("$skin_dir is not a directory, please check the \$root_path variable in admin.php");
-		}
-		
-		$ADMIN->done_screen("Editable templates updated from source PHP skin files", "Manage Template sets", "act=templ" );
-		
-		if (count($errors > 0))
-		{
-			$this->html .= $SKIN->start_table("Errors and warnings");
-		
-			$this->html .= $SKIN->add_td_basic( implode("<br>", $errors) );
-											 
-			$this->html .= $SKIN->end_table();
-		}
-		
-		
-	}
-	
-	
-	//-------------------------------------------------------------
-	// Add templates
-	//-------------------------------------------------------------
-	
-	
-	function add_templates()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		//-------------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-		
-			if ( ! is_writeable(ROOT_PATH.'Skin') )
-			{
-				$ADMIN->error("The directory 'Skin' is not writeable by this script. Please check the permissions on that directory. CHMOD to 0777 if in doubt and try again");
-			}
-			
-			//-------------------------------------
-			
-			if ( ! is_dir(ROOT_PATH.'Skin/s'.$IN['id']) )
-			{
-				$ADMIN->error("Could not locate the original template set to copy, please check and try again");
-			}
-		
-		}
-		
-		//-------------------------------------
-		
-		$DB->query("SELECT * FROM ibf_tmpl_names WHERE skid='".$IN['id']."'");
-		
-		//-------------------------------------
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query that template set from the DB, so there");
-		}
-		
-		//-------------------------------------
-		
-		$row['skname'] = $row['skname'].".NEW";
-		
-		// Insert a new row into the DB...
-		
-		$final = array();
-		
-		foreach($row as $k => $v)
-		{
-			if ($k == 'skid')
-			{
-				continue;
-			}
-			else
-			{
-				$final[ $k ] = $v;
-			}
-		}
-		
-		$db_string = $DB->compile_db_insert_string( $final );
-		
-		$DB->query("INSERT INTO ibf_tmpl_names (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		$new_id = $DB->get_insert_id();
-		
-		//-------------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-		
-			//-------------------------------------
-			
-			if ( ! $ADMIN->copy_dir( $INFO['base_dir'].'Skin/s'.$IN['id'] , $INFO['base_dir'].'Skin/s'.$new_id ) )
-			{
-				$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$new_id'");
-				
-				$ADMIN->error( $ADMIN->errors );
-			}
-		
-		}
-		
-		// Copy over the templates stored inthe database...
-		
-		$get = $DB->query("SELECT * FROM ibf_skin_templates WHERE set_id='".$IN['id']."'");
-		
-		while( $r = $DB->fetch_row($get) )
-		{
-			$r['section_content'] = str_replace( '\\n' , '\\\\\\n', $r['section_content'] );
-			
-			$row = $DB->compile_db_insert_string( array (
-														'set_id'          =>  $new_id,
-														'group_name'      =>  $r['group_name'],
-														'section_content' =>  $r['section_content'],
-														'func_name'       =>  $r['func_name'],
-														'func_data'       =>  $r['func_data'],
-														'updated'         => time(),
-														'can_remove'      => $r['can_remove'],
-											 )       );
-											 
-			$put = $DB->query("INSERT INTO ibf_skin_templates ({$row['FIELD_NAMES']}) VALUES({$row['FIELD_VALUES']})");
-		}
-		
-		//-------------------------------------
-		// All done, yay!
-		//-------------------------------------
-		
-		$ADMIN->done_screen("New Template Set", "Manage Template sets", "act=templ" );
-	
-	}
-	
-	//-------------------------------------------------------------
-	// REMOVE WRAPPERS
-	//-------------------------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-			
-			if ( ! $ADMIN->rm_dir( $INFO['base_dir']."Skin/s".$IN['id'] ) )
-			{
-				$ADMIN->error("Could not remove the template files, please check the CHMOD permissions to ensure that this script has the correct permissions to allow this");
-			}
-			
-		}
-		
-		$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='".$IN['id']."'");
-		$DB->query("DELETE FROM ibf_skin_templates WHERE set_id='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=templ");
-		exit();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// Find popular bits :D
-	//-------------------------------------------------------------
-	
-	function find_popular()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_COOKIE_VARS;
-		
-		//-----------------------------------
-		// Check for valid input...
-		//-----------------------------------
-		
-		$id = intval($IN['id']);
-		
-		if ( $id < 1 )
-		{
-			$ADMIN->error("Baah! Something is whack, man");
-		}
-		
-		switch ( $IN['entry'] )
-		{
-			case 'boardheader':
-				$sql = 'group_name="skin_global" AND func_name IN ( "Member_bar", "Guest_bar", "Member_no_usepm_bar", "BoardHeader" )';
-				break;
-			case 'catforum':
-				$sql = 'group_name="skin_boards" AND func_name IN ( "CatHeader_Expanded", "PageTop",  "end_this_cat", "end_all_cats", "ForumRow" )';
-				break;
-			case 'topiclist':
-				$sql = 'group_name="skin_forum" AND func_name IN ( "PageTop", "TableEnd", "RenderRow", "render_pinned_start", "render_pinned_end", "render_pinned_row" )';
-				break;
-			default:
-				$sql = 'group_name="skin_topic" AND func_name IN ( "PageTop", "TableFooter", "RenderRow" )';
-				break;
-		}
-		
-		$DB->query("SELECT * FROM ibf_skin_templates WHERE $sql AND set_id=$id");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			$IN['cb_'.$r['suid']] = 1;
-		}
-		
-		$this->edit_bit();
-	}
-	
-	//-------------------------------------------------------------
-	// EDIT TEMPLATES, STEP TWO
-	//-------------------------------------------------------------
-	
-	function edit_bit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_COOKIE_VARS;
-		
-		//-----------------------------------
-		// Check for valid input...
-		//-----------------------------------
-		
-		// Get $skin_names stuff
-		
-		require './sources/Admin/skin_info.php';
-		
-		$ADMIN->page_detail = "You may edit the HTML of this template.";
-		$ADMIN->page_title  = "Template Editing";
-		
-		$ids = array();
-		
-		if ( $IN['type'] == 'single' )
-		{
-			if ($IN['suid'] == "")
-			{
-				$ADMIN->error("You must specify an existing template set ID, go back and try again");
-			}
-			$ids[] = $IN['suid'];
-		}
-		else
-		{
-			foreach ($IN as $key => $value)
-			{
-				if ( preg_match( "/^cb_(\d+)$/", $key, $match ) )
-				{
-					if ($IN[$match[0]])
-					{
-						$ids[] = $match[1];
-					}
-				}
-			}
- 		}
- 
- 		
- 		if ( count($ids) < 1 )
- 		{
- 			$ADMIN->error("No ids selected, please go back and select some before submitting the form");
- 		}
-		
-		
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->js_template_tools();
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'doedit'    ),
-												  2 => array( 'act'   , 'templ'     ),
-												  3 => array( 'suid'  , $IN['suid'] ),
-												  4 => array( 'type'  , $IN['type'] ),
-									     )  , "theform"    );
-									     
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_skin_templates WHERE suid IN (".implode(",",$ids).")");
-		
-		while ( $i = $DB->fetch_row() )
-		{
-			$sec_arry[ $i['suid'] ] = $i;
-			$sec_arry[ $i['suid'] ]['easy_name'] = $i['func_name'];
-			
-			// If easy name is available, use it
-			
-			if ($bit_names[ $i['group_name'] ][ $i['func_name'] ] != "")
-			{
-				$sec_arry[ $i['suid'] ]['easy_name'] = $bit_names[ $i['group_name'] ][ $i['func_name'] ];
-			}
-			
-		}
-		
-		// Sort by easy_name
-		
-		usort($sec_arry, array( 'ad_settings', 'perly_word_sort' ) );
-		
-		// Loop and print
-		
-		foreach( $sec_arry as $id => $template )
-		{
-			$template['easy_name'] = preg_replace( "/^(\d+)\:\s+?/", "", $template['easy_name'] );
-
-
-			//+-------------------------------
-			// Swop < and > into ascii entities
-			// to prevent textarea breaking html
-			//+-------------------------------
-			
-			$setid     = $template['set_id'];
-			$groupname = $template['group_name'];
-			
-			$templ = $this->convert_tags($template['section_content']);
-			
-			$templ = preg_replace("/&/", "&#38;", $templ );
-			$templ = preg_replace("/</", "&#60;", $templ );
-			$templ = preg_replace("/>/", "&#62;", $templ );
-			
-			//+-------------------------------
-			
-			$SKIN->td_header[] = array( "{none}"   , "100%" );
-			
-			$ADMIN->html .= $SKIN->start_table( "Template: ". $template['easy_name'] );
-			
-			$ADMIN->html .= $SKIN->add_td_basic( "<input type='button' value='Macro Look-up' id='editbutton' title='View a macro definition' onClick='pop_win(\"code=macro_one&suid={$template['suid']}\", \"MacroWindow\", 400, 200)'>".
-												 "&nbsp;<input type='button' value='Compare' id='editbutton' title='Compare the edited version to the original' onClick='pop_win(\"act=rtempl&code=compare&suid={$template['suid']}\", \"CompareWindow\", 500,400)'>".
-												 "&nbsp;<input type='button' value='Restore' id='editbutton' title='Restore the original, unedited template bit' onClick='restore(\"{$template['suid']}\",\"{$IN['expand']}\")'>".
-												 "&nbsp;<input type='button' value='View Original' id='editbutton' title='View the HTML for the unedited template bit' onClick='pop_win(\"act=rtempl&code=preview&suid={$template['suid']}&type=html\", \"OriginalPreview\", 400,400)'>".
-												 "&nbsp;<input type='button' value='Search' id='editbutton' title='Search the templates for a string' onClick='pop_win(\"act=rtempl&code=search&suid={$template['suid']}&type=html\", \"Search\", 500,400)'>".
-												 "&nbsp;<input type='button' value='Edit Box Size' id='editbutton' title='Change the size of the edit box below' onClick=\"pop_win('&act=prefs', 'prefs', '300', '100')\">",
-												 "center", "catrow");
-												 
-			$ADMIN->html .= $SKIN->add_td_basic( "<b>Show me the HTML code for:&nbsp;".
-												 "<select name='htmlcode' onChange=\"document.theform.res.value='&'+document.theform.htmlcode.options[document.theform.htmlcode.selectedIndex].value+';'\" id='multitext'><option value='copy'>&copy;</option>
-												 <option value='raquo'>&raquo;</option>
-												 <option value='laquo'>&laquo;</option>
-												 <option value='#149'>&#149;</option>
-												 <option value='reg'>&reg;</option>
-												 </select>&nbsp;&nbsp;<input type='text' name='res' size=20 id='multitext'>&nbsp;&nbsp;<input type='button' value='select' id='editbutton' onClick='document.theform.res.focus();document.theform.res.select();'>"
-				
-												, "center", "tdrow1");
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( 
-														"<center>".$SKIN->form_textarea("txt_{$template['suid']}", $templ, $INFO['tx'], $INFO['ty'], $wrap)."</center>",
-											 )      );
-									     
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		$ADMIN->html .= "<div class='tableborder'><div class='catrow2' align='center'><input type='submit' value='Update templates' /></div></div></form>";
-									     
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_tmpl_names WHERE skid='".$setid."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		$ADMIN->nav[] = array( 'act=templ' ,'Template Control Home' );
-		$ADMIN->nav[] = array( "act=templ&code=edit&id={$setid}" ,$row['skname'] );
-		$ADMIN->nav[] = array( "act=templ&code=edit&id={$setid}&expand={$IN['expand']}", $groupname );
-		//$ADMIN->nav[] = array( "", $template['func_name'] );
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// COMPLETE EDIT
-	//-------------------------------------------------------------
-	
-	function do_edit()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		// Check incoming
-		//+-------------------------------
-		
-		foreach ($IN as $key => $value)
-		{
-			if ( preg_match( "/^txt_(\d+)$/", $key, $match ) )
-			{
-				if ($IN[$match[0]])
-				{
-					$ids[] = $match[1];
-				}
-			}
-		}
- 		
- 		if ( count($ids) < 1 )
- 		{
- 			$ADMIN->error("No ids selected, please go back and select some before submitting the form");
- 		}
- 		
- 		//+-------------------------------
-		// Get the group name, etc
-		//+-------------------------------
-		
-		$DB->query("SELECT * FROM ibf_skin_templates WHERE suid IN(".implode( ",", $ids ).")");
-		
-		if ( ! $template = $DB->fetch_row() )
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		$real_name = $template['group_name'];
-		
-		//+-------------------------------
-		// Get the template set info
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_tmpl_names WHERE skid='".$template['set_id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		
-		$phpskin  = ROOT_PATH."Skin/s".$template['set_id']."/".$real_name.".php";
-		
-		//+-------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-		
-		   if ( ! is_writeable($phpskin) )
-		   {
-			   $ADMIN->error("Cannot write into '$phpskin', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-		   }
-		
-		}
-		
-		//+-------------------------------
-		// Process my bits :o
-		//+-------------------------------
-		
-		foreach( $ids as $id )
-		{
-		
-			$text = stripslashes($HTTP_POST_VARS['txt_'.$id]);
-		
-			//+-------------------------------
-			// Sw(o|a)p back < & >
-			//+-------------------------------
-			
-			$text = preg_replace("/&#60;/", "<", $text);
-			$text = preg_replace("/&#62;/", ">", $text);
-			$text = preg_replace("/&#38;/", "&", $text);
-			
-			$text = str_replace( '\\n' , '\\\\\\n', $text );
-			
-			//+-------------------------------
-			// Convert \r to nowt
-			//+-------------------------------
-			
-			$text = preg_replace("/\r/", "", $text);
-			
-			$text = $this->unconvert_tags($text);
-			
-			//+-------------------------------
-			// Update the DB
-			//+-------------------------------
-			
-			$string = $DB->compile_db_update_string( array (
-															 'section_content' => $text,
-															 'updated'         => time(),
-												   )       );
-			
-			$DB->query("UPDATE ibf_skin_templates SET $string WHERE suid=$id");
-		
-		}
-		
-		
-		//+-------------------------------
-		// Rebuild the PHP file
-		//+-------------------------------
-		
-		$final = "<"."?php\n\n".
-				 "class $real_name {\n\n";
-				 
-		//+------------------------------------------
-		// Get all the data from the DB that matches
-		// the group name (filename) and set_id
-		//+------------------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-		
-			$DB->query("SELECT * FROM ibf_skin_templates WHERE group_name='$real_name' AND set_id='{$template['set_id']}'"); 
-			
-			while ( $data = $DB->fetch_row() )
-			{
-			
-				$final .= "\n\nfunction {$data['func_name']}({$data['func_data']}) {\n".
-					      "global \$ibforums;\n".
-					      "return <<<EOF\n";
-					   
-				$final .= $data['section_content'];
-					   
-				$final .= "\nEOF;\n}\n";
-			
-			}
-			
-			$final .= "\n\n}\n?".">";
-			
-			if ($fh = fopen( "$phpskin", 'w' ) )
-			{
-				fwrite($fh, $final, strlen($final) );
-				fclose($fh);
-			}
-			else
-			{
-				$ADMIN->error("Could not save information to $phpskin, please ensure that the CHMOD permissions are correct.");
-			}
-		
-		}
-		
-		$ADMIN->done_screen("Template file(s) updated", "Manage Templates in template set: {$row['skname']}", "act=templ&code=edit&id={$template['set_id']}" );
-		
-	}
-	
-	//-------------------------------------------------------------
-	// EDIT TEMPLATES, STEP ONE
-	//-------------------------------------------------------------
-	
-	function do_form()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_tmpl_names WHERE skid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		
-		$form_array = array();
-	
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "Please choose which section you wish to edit below.";
-		$ADMIN->page_title  = "Edit Template Set Data";
-		
-		//+-------------------------------
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->js_no_specialchars();
-		
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'editinfo'    ),
-												  2 => array( 'act'   , 'templ'       ),
-												  3 => array( 'id'    , $IN['id']     ),
-									     ), "theAdminForm", "onSubmit=\"return no_specialchars('templates')\""      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Edit template information" );
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Template Set Name</b>",
-													$SKIN->form_input('skname', $row['skname']),
-									     )      );
-									     
-		
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Template set author name:</b>",
-													$SKIN->form_input('author', $row['author']),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Template set author email:</b>",
-													$SKIN->form_input('email', $row['email']),
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"<b>Template set author webpage:</b>",
-													$SKIN->form_input('url', $row['url']),
-										 )      );
-									     
-		
-									     
-		$ADMIN->html .= $SKIN->end_form("Edit template set details");
-									     
-		$ADMIN->html .= $SKIN->end_table();
-									     
-		
-		$ADMIN->nav[] = array( 'act=templ' ,'Template Control Home' );
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW CURRENT TEMPLATE PACKS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "The skin templates contain the all the HTML that is used by the board.
-							   <br>
-							   This section will allow you to create new template sets or edit HTML in your current template sets.";
-		$ADMIN->page_title  = "Manage Template Sets";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Title"        , "30%" );
-		$SKIN->td_header[] = array( "Allocation"   , "20%" );
-		$SKIN->td_header[] = array( "Edit&nbsp;Properties"    , "20%" );
-		$SKIN->td_header[] = array( "Manage HTML"  , "20%" );
-		$SKIN->td_header[] = array( "Remove"       , "10%" );
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT DISTINCT(s.set_id), s.sname, t.skid, t.skname from ibf_tmpl_names t, ibf_skins s WHERE s.set_id=t.skid ORDER BY t.skname ASC");
-		
-		$used_ids = array();
-		$show_array = array();
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			$ADMIN->html .= $SKIN->start_table( "Current Template sets In Use" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$show_array[ $r['skid'] ] .= stripslashes($r['sname'])."<br>";
-			
-				if ( in_array( $r['skid'], $used_ids ) )
-				{
-					continue;
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['skname'])."</b><br>[ <a href='{$SKIN->base_url}&act=templ&code=export&id={$r['skid']}' title='Download this complete template set'>Export</a> ]",
-														  "<#X-{$r['skid']}#>",
-														  //"<center><a href='".$SKIN->base_url."&act=templ&code=export&id={$r['skid']}'>Download</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=templ&code=dedit&id={$r['skid']}' title='Edit Template Set Name'>Edit Properties</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=templ&code=edit&id={$r['skid']}' title='Edit, upload and download'>Manage HTML</a></center>",
-														  "<i>Deallocate before removing</i>",
-												 )      );
-												   
-				$used_ids[] = $r['skid'];
-				
-				$form_array[] = array( $r['skid'], $r['skname'] );
-				
-			}
-			
-			foreach( $show_array as $idx => $string )
-			{
-				$string = preg_replace( "/<br>$/", "", $string );
-				
-				$ADMIN->html = preg_replace( "/<#X-$idx#>/", "$string", $ADMIN->html );
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		if ( count($used_ids) > 0 )
-		{
-		
-			$DB->query("SELECT skid, skname FROM ibf_tmpl_names WHERE skid NOT IN(".implode(",",$used_ids).")");
-		
-			if ( $DB->get_num_rows() )
-			{
-			
-				$SKIN->td_header[] = array( "Title"          , "50%" );
-				$SKIN->td_header[] = array( "Edit&nbsp;Properties"    , "20%" );
-				$SKIN->td_header[] = array( "Manage HTML"    , "20%" );
-				$SKIN->td_header[] = array( "Remove"         , "10%" );
-			
-				$ADMIN->html .= $SKIN->start_table( "Current Unallocated Template sets" );
-				
-				$ADMIN->html .= $SKIN->js_checkdelete();
-				
-				while ( $r = $DB->fetch_row() )
-				{
-					
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['skname'])."</b><br>[ <a href='{$SKIN->base_url}&act=templ&code=export&id={$r['skid']}' title='Download this complete template set'>Export</a> ]",
-															  //"<center><a href='".$SKIN->base_url."&act=templ&code=export&id={$r['skid']}'>Download</a></center>",
-															  "<center><a href='".$SKIN->base_url."&act=templ&code=dedit&id={$r['skid']}'>Edit Properties</a></center>",
-															  "<center><a href='".$SKIN->base_url."&act=templ&code=edit&id={$r['skid']}' title='Edit, upload and download'>Manage HTML</a></center>",
-															  "<center><a href='javascript:checkdelete(\"act=templ&code=remove&id={$r['skid']}\")'>Remove</a></center>",
-													 )      );
-													 
-					$form_array[] = array( $r['skid'], $r['skname'] );
-													   
-				}
-				
-				$ADMIN->html .= $SKIN->end_table();
-			}
-		}
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add'     ),
-												  2 => array( 'act'   , 'templ'    ),
-												  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
-									     ) , "uploadform", " enctype='multipart/form-data'"     );
-												  
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Create New Template Set" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base new Template set on...</b>" ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><u>OR</u> Choose a file from your computer to import</b><br>Note: This must be a template group set.",
-												  $SKIN->form_upload(),
-										 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Create new Template set");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'tools'     ),
-												  2 => array( 'act'   , 'templ'    ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "Tool"  , "50%" );
-		$SKIN->td_header[] = array( "run on template set"  , "50%" );
-		
-		$extra = "";
-		
-		if ( SAFE_MODE_ON == 1)
-		{
-			$extra = "<br><span id='detail'>WARNING: Safe mode restrictions detected, some of these tools will not work</span>";
-		}
-		
-		$ADMIN->html .= $SKIN->start_table( "Template Tools".$extra );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( $SKIN->form_dropdown( "tool",
-																		array(
-																				1 => array( 'tmpl', 'Resynchronise the database templates FROM the PHP skin files'   ),
-																			 )
-												                      ) ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Run Tool");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	function convert_tags($t="")
-	{
-		if ($t == "")
-		{
-			return "";
-		}
-		
-		$t = preg_replace( "/{?\\\$ibforums->base_url}?/"            , "{ibf.script_url}"   , $t );
-		$t = preg_replace( "/{?\\\$ibforums->session_id}?/"          , "{ibf.session_id}"   , $t );
-		$t = preg_replace( "/{?\\\$ibforums->skin\['?(\w+)'?\]}?/"   , "{ibf.skin.\\1}"      , $t );
-		$t = preg_replace( "/{?\\\$ibforums->lang\['?(\w+)'?\]}?/"   , "{ibf.lang.\\1}"      , $t );
-		$t = preg_replace( "/{?\\\$ibforums->vars\['?(\w+)'?\]}?/"   , "{ibf.vars.\\1}"      , $t );
-		$t = preg_replace( "/{?\\\$ibforums->member\['?(\w+)'?\]}?/" , "{ibf.member.\\1}"    , $t );
-		
-		// Make some tags safe..
-		
-		$t = preg_replace( "/\{ibf\.vars\.(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)\}/", "" , $t );
-				
-		return $t;
-		
-	}
-	
-	function unconvert_tags($t="")
-	{
-		if ($t == "")
-		{
-			return "";
-		}
-		
-		// Make some tags safe..
-		
-		$t = preg_replace( "/\{ibf\.vars\.(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)\}/", "" , $t );
-		
-		$t = preg_replace( "/{ibf\.script_url}/i"   , '{$ibforums->base_url}'         , $t);
-		$t = preg_replace( "/{ibf\.session_id}/i"   , '{$ibforums->session_id}'       , $t);
-		$t = preg_replace( "/{ibf\.skin\.(\w+)}/"   , '{$ibforums->skin[\''."\\1".'\']}'   , $t);
-		$t = preg_replace( "/{ibf\.lang\.(\w+)}/"   , '{$ibforums->lang[\''."\\1".'\']}'   , $t);
-		$t = preg_replace( "/{ibf\.vars\.(\w+)}/"   , '{$ibforums->vars[\''."\\1".'\']}'   , $t);
-		$t = preg_replace( "/{ibf\.member\.(\w+)}/" , '{$ibforums->member[\''."\\1".'\']}' , $t);
-		
-		return $t;
-		
-	}
-	
-	/*
-	<!--IBF_START_FUNC|calendar_events|$events = ""-->
-        <tr>
-           <td id='category' colspan='2'>{ibf.lang.calender_f_title}</td>
-    	</tr>
-    	<tr>
-          <td id='forum1' width='5%' valign='middle'>{ibf.skin.F_ACTIVE}</td>
-          <td id='forum2' width='95%'>$events</td>
-        </tr>
-    <!--IBF_END_FUNC|calendar_events-->
-*/
-	
-	
-	
-	function process_upload($raw, $setid, $group, $isnew=0)
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$skin_dir     = ROOT_PATH."Skin/s".$setid;
-		
-		//-------------------------------------------
-		// If we are not using safe mode skins, lets
-		// test to make sure we can write to that dir
-		//-------------------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				if ($isnew == 1)
-				{
-					$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-				}
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-			
-			// Are we creating a new template set? 
-			// if so, lets create the directory
-			
-			if ($isnew == 1)
-			{
-				if ( ! is_writeable(ROOT_PATH.'Skin') )
-				{	
-					$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-					$ADMIN->error("The directory 'Skin' is not writeable by this script. Please check the permissions on that directory. CHMOD to 0777 if in doubt and try again");
-				}
-				
-				if ( ! file_exists($skin_dir) )
-				{
-					// Directory does not exist, lets create it
-					
-					if ( ! @mkdir($skin_dir, 0777) )
-					{
-						$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-						$ADMIN->error("Could not create directory '$skin_dir' please check the CHMOD permissions and re-try");
-					}
-					else
-					{
-						@chmod($skin_dir, 0777);
-					}
-				}
-			}
-			else
-			{
-				if ( ! is_writeable($skin_dir) )
-				{
-					$ADMIN->error("Cannot write into '$skin_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
-				}
-			}
-		
-		}
-		
-		//--------------------------------
-		// Remove everything up until the
-		// first <!--START tag...
-		//--------------------------------
-		
-		$raw = preg_replace( "/^.*?(<!--IBF_START_FUNC)/s", "\\1", trim($raw));
-		
-		$raw = str_replace( "\r\n", "\n", $raw);
-		
-		//+-------------------------------
-		// Convert the tags back to php native
-		//+-------------------------------
-		
-		$raw = $this->unconvert_tags($raw);
-		
-		//+-------------------------------
-		// Grab our vars and stuff
-		//+-------------------------------
-		
-		$DB->query("SELECT func_name, group_name FROM ibf_skin_templates WHERE set_id='$setid'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $gname = $DB->fetch_row() )
-			{
-				$curr_group[ $gname['group_name'] ][ $gname['func_name'] ] = 1;
-			}
-		}
-		
-		$master = array();
-		$flag   = 0;
-		
-		$eachline = explode( "\n", $raw );
-		
-		foreach ($eachline as $line)
-		{
-			if ($flag == 0)
-			{
-				// We're not gathering HTML, lets see if we have a new
-				// function start..
-				
-				if ( preg_match( "/\s*<!--IBF_START_FUNC\|(\S+?)\|(.*?)-->\s*/", $line, $matches) )
-				{
-					$func = trim($matches[1]);
-					$data = trim($matches[2]);
-					
-					if ($func != "")
-					{
-					
-						$flag = $func;
-						
-						$master[$func] = array( 'func_name'  => $func,
-												'func_data'  => $data,
-												'content'    => ""
-											  );
-					}
-					continue;
-					
-				}
-				
-			}
-			
-			if ( preg_match("/\s*?<!--IBF_END_FUNC\|$flag-->\s*?/", $line) )
-			{
-				 // We have found the end of the subbie..
-				 // Reset the flag and feed the next line.
-				 
-				 $flag = 0;
-				 continue;
-			}
-			else
-			{
-				// Carry on feeding the HTML...
-				
-				if ( isset($master[$flag]['content']) )
-				{
-					$master[$flag]['content'] .= $line."\n";
-					continue;
-				}
-			}
-			
-		}
-		
-		//+-------------------------------
-		// Start parsing the php skin file
-		//+-------------------------------
-		
-		if ($INFO['safe_mode_skins'] != 1)
-		{
-		
-			if (SAFE_MODE_ON == 1)
-			{
-				$ADMIN->error("Safe mode detected, you will need to change the board configuration to switch 'Safe Mode Skins' on. To do this, click on the 'Board Settings' menu and choose 'Basic Config' when the sub menu appears.");
-			}
-		
-			$final = "<"."?php\n\n".
-					 "class $group {\n\n";
-			
-			foreach( $master as $func_name => $data )
-			{
-			
-				$final .= "\n\nfunction ".trim($data['func_name'])."(".trim($data['func_data']).") {\n".
-					   	  "global \$ibforums;\n".
-					   	  "return <<<EOF\n";
-					   	  
-			    $final .= trim($data['content']);
-					   
-				$final .= "\nEOF;\n}\n";
-				
-			}
-			
-			$final .= "\n\n}\n?".">";
-			
-			if ($fh = fopen( $skin_dir."/".$group.".php", 'w' ) )
-			{
-				fwrite($fh, $final, strlen($final) );
-				fclose($fh);
-			}
-			else
-			{
-				if ($isnew == 1)
-				{
-					$DB->query("DELETE FROM ibf_tmpl_names WHERE skid='$setid'");
-				}
-				$errors[] = "Could not save information to $phpskin, please ensure that the CHMOD permissions are correct.";
-			}
-		
-		}
-		
-		//+-------------------------------
-		// Update the DB
-		//+-------------------------------
-		
-		
-		foreach( $master as $func_name => $data )
-		{
-		
-			if ($isnew == 0)
-			{
-				if ($curr_group[$group][$func_name] != 1)
-				{
-					// Not a current group/ func..
-					
-					$isnew = 1;
-				}
-			}
-		
-			if ($isnew == 0)
-			{
-				$data['content'] = str_replace( '\\n' , '\\\\\\n', $data['content'] );
-				
-				$str = $DB->compile_db_update_string( array(
-															  'section_content' => trim($data['content']),
-															  'func_data'       => trim($data['func_data'])
-													)      );
-													
-				$DB->query("UPDATE ibf_skin_templates SET $str WHERE set_id='$setid' AND group_name='$group' AND func_name='".trim($data['func_name'])."'");
-			}
-			else
-			{
-				$data['content'] = str_replace( '\\n' , '\\\\\\n', $data['content'] );
-				
-				$str = $DB->compile_db_insert_string( array(
-															  'section_content' => trim($data['content']),
-															  'func_data'       => trim($data['func_data']),
-															  'set_id'          => $setid,
-															  'group_name'      => $group,
-															  'func_name'       => trim($data['func_name']),
-															  'can_remove'      => 0,
-													)      );
-													
-				$DB->query("INSERT INTO ibf_skin_templates ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-			}
-		}
-		
-		
-		return TRUE;
-		
-		
-	}
-	
-	/*foreach($functions as $fname => $ftext)
-	  {
-		  preg_match( "/return <<<(EOF|HTML)(.+?)(EOF|HTML);/s", $ftext, $matches );
-		  
-		  // Are we updating a current set, but have a new group to add?
-		  // Who knows, but it's bloody exciting
-		  
-		  if ($insert == 0)
-		  {
-			  if ($curr_group[$name][$fname] != 1)
-			  {
-				  // Not a current group..
-				  
-				  $insert = 1;
-			  }
-		  }
-		  
-		  // Swap fake newlines
-		  
-		  $matches[2] = str_replace( '\n', '\\\n', $matches[2] );
-		  
-		  // Swap real newlines
-		  //$matches[2] = str_replace( "\r", '\\r', $matches[2] );
-		  //$matches[2] = str_replace( "\n", '\\n', $matches[2] );
-		  
-		  if ($insert == 0)
-		  {
-		  
-			  $db_update = $DB->compile_db_update_string( array (
-															  'section_content' => str_replace( '\n', '\\\n', $matches[2] ),
-															  'func_data'       => trim($config[$fname]),
-															  'updated'         => time(),
-													)       );
-																						
-			  $DB->query("UPDATE ibf_skin_templates SET $db_update WHERE func_name='$fname' AND set_id='".$IN['id']."' AND group_name='$name'");
-		  }
-		  else
-		  {
-		  
-			  $db_update = $DB->compile_db_update_string( array (
-															  'set_id'          => $IN['id'],
-															  'group_name'      => $name,
-															  'section_content' => str_replace( '\n', '\\\n', $matches[2] ),
-															  'func_name'       => $fname,
-															  'func_data'       => trim($config[$fname]),
-															  'updated'         => time(),
-													)       );
-													
-			  //----------------------------------------------------
-			  // Remove current templates with this name
-			  //----------------------------------------------------
-	  
-			  //$DB->query("DELETE FROM ibf_skin_templates WHERE func_name='$fname' AND set_id='".$IN['id']."' AND group_name='$name'");
-	  
-			  $DB->query("INSERT INTO ibf_skin_templates SET $db_update");
-		  //}
-		  
-		  
-	  }*/
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_warnlogs.php b/upload/sources/Admin/ad_warnlogs.php
deleted file mode 100644
index 51be7695..00000000
--- a/upload/sources/Admin/ad_warnlogs.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Warn Log functions
-|   > Module written by Matt Mecham
-|   > Date started: 4th June 2003
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-
-$idx = new ad_warnlogs();
-
-
-class ad_warnlogs {
-
-	var $base_url;
-
-	function ad_warnlogs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-		
-			case 'view':
-				$this->view();
-				break;
-				
-			case 'viewcontact':
-				$this->view_contact();
-				break;
-				
-			case 'viewnote':
-				$this->view_note();
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-				
-			//-------------------------
-			default:
-				$this->list_current();
-				break;
-		}
-		
-	}
-	
-	//---------------------------------------------
-	// View NOTE in da pop up innit
-	//---------------------------------------------
-	
-	function view_note()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the email ID, please try again");
-		}
-		
-		require( ROOT_PATH.'sources/lib/post_parser.php');
-        
-        $this->parser  = new post_parser(1);
-		
-		$id = intval($IN['id']);
-		
-		$DB->query("SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
-						FROM ibf_warn_logs l
-						  LEFT JOIN ibf_members m ON (m.id=l.wlog_mid)
-						  LEFT JOIN ibf_members p ON (p.id=l.wlog_addedby)
-					    WHERE l.wlog_id=$id");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the email ID, please try again ($id)");
-		}
-		
-		$SKIN->td_header[] = array( "&nbsp;" , "100%" );
-		
-		$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_notes'], $cont );
-		
-		$ADMIN->html .= $SKIN->start_table( "Warn Notes" );
-	
-		$row['date']  = $ADMIN->get_date( $row['wlog_date'], 'LONG' );
-		
-		$text   = $this->parser->convert( array(
-													'TEXT'    => $cont[1],
-													'SMILIES' => 1,
-													'CODE'    => 1,
-													'HTML'    => 0
-										   )      );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array(
-													"<strong>From:</strong> {$row['p_name']}
-													<br /><strong>To:</strong> {$row['a_name']}
-													<br /><strong>Sent:</strong> {$row['date']}
-													<hr>
-													<br />$text
-												    "
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->print_popup();
-	
-	
-	}
-	
-	
-	//---------------------------------------------
-	// View contact in da pop up innit
-	//---------------------------------------------
-	
-	function view_contact()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("Could not resolve the email ID, please try again");
-		}
-		
-		$id = intval($IN['id']);
-		
-		$DB->query("SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
-						FROM ibf_warn_logs l
-						  LEFT JOIN ibf_members m ON (m.id=l.wlog_mid)
-						  LEFT JOIN ibf_members p ON (p.id=l.wlog_addedby)
-					    WHERE l.wlog_id=$id");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not resolve the email ID, please try again ($id)");
-		}
-		
-		$type = $row['wlog_contact'] == 'pm' ? "PM" : "EMAIL";
-		
-		$SKIN->td_header[] = array( "&nbsp;" , "100%" );
-		
-		$subject = preg_match( "#<subject>(.+?)</subject>#is", $row['wlog_contact_content'], $subj );
-		$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_contact_content'], $cont );
-		
-		$ADMIN->html .= $SKIN->start_table( $type.": ".$subj[1] );
-	
-		
-		
-		$row['date'] = $ADMIN->get_date( $row['wlog_date'], 'LONG' );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array(
-													"<strong>From:</strong> {$row['p_name']}
-													<br /><strong>To:</strong> {$row['a_name']}
-													<br /><strong>Sent:</strong> {$row['date']}
-													<br /><strong>Subject:</strong> $subj[1]
-													<hr>
-													<br />$cont[1]
-												    "
-										 )      );
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->print_popup();
-	
-	
-	}
-	
-	
-	
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function view()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$start = $IN['st'] ? $IN['st'] : 0;
-		
-		$ADMIN->html .= $SKIN->js_pop_win();
-		
-		$ADMIN->page_detail = "Viewing all warn entries on a member";
-		$ADMIN->page_title  = "Warn Logs Manager";
-	
-		if ($IN['search_string'] == "" and $IN['mid'])
-		{
-			$DB->query("SELECT COUNT(wlog_id) as count FROM ibf_warn_logs WHERE wlog_mid='".$IN['mid']."'");
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=warnlog&mid={$IN['mid']}&code=view";
-			
-			$DB->query("SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
-						FROM ibf_warn_logs l
-						  LEFT JOIN ibf_members m ON (m.id=l.wlog_mid)
-						  LEFT JOIN ibf_members p ON (p.id=l.wlog_addedby)
-					    WHERE l.wlog_mid={$IN['mid']}
-					    ORDER BY l.wlog_date DESC LIMIT $start,30");	
-		}
-		else
-		{
-			$IN['search_string'] = urldecode($IN['search_string']);
-			
-			if ( ($IN['search_type'] == 'notes') )
-			{
-				$dbq = "l.wlog_notes LIKE '%".$IN['search_string']."%'";
-			}
-			else
-			{
-				$dbq = "l.wlog_contact_content LIKE '%".$IN['search_string']."%'";
-			}
-		
-			$DB->query("SELECT COUNT(l.wlog_id) as count FROM ibf_warn_logs l WHERE $dbq");
-			$row = $DB->fetch_row();
-			
-			$row_count = $row['count'];
-			
-			$query = "&act=warnlog&code=view&search_type={$IN['search_type']}&search_string=".urlencode($IN['search_string']);
-			
-			$DB->query("SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
-						FROM ibf_warn_logs l
-						  LEFT JOIN ibf_members m ON (m.id=l.wlog_mid)
-						  LEFT JOIN ibf_members p ON (p.id=l.wlog_addedby)
-					    WHERE $dbq
-					    ORDER BY l.wlog_date DESC LIMIT $start,30");	
-		}
-		
-		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
-											   'PER_PAGE'    => 30,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "Single Page",
-											   'L_MULTI'     => "Pages: ",
-											   'BASE_URL'    => $ADMIN->base_url.$query,
-											 )
-									  );
-									  
-		$ADMIN->page_detail = "You may view warn entries added by your moderators";
-		$ADMIN->page_title  = "Warn Logs Manager";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Type"        , "5%" );
-		$SKIN->td_header[] = array( "Member Name" , "15%" );
-		$SKIN->td_header[] = array( "Contacted"   , "5%" );
-		$SKIN->td_header[] = array( "MOD Q"       , "10%" );
-		$SKIN->td_header[] = array( "SUSP"        , "10%" );
-		$SKIN->td_header[] = array( "NO POST"     , "10%" );
-		$SKIN->td_header[] = array( "Date"        , "15%" );
-		$SKIN->td_header[] = array( "Warned By"   , "15%" );
-		$SKIN->td_header[] = array( "View Note"   , "10%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Warn Logs" );
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'right', 'pformstrip');
-		
-		$days = array( 'd' => "Days", 'h' => "Hours" );
-		
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['wlog_date'] = $ADMIN->get_date( $row['wlog_date'], 'LONG' );
-				
-				$type = ( $row['wlog_type'] == 'pos' )      ? '<span style="color:green;font-weight:bold">-</span>' : '<span style="color:red;font-weight:bold">+</span>';
-				$cont = ( $row['wlog_contact'] !=  'none' ) ? "<center><a href='javascript:pop_win(\"&act=warnlog&code=viewcontact&id={$row['wlog_id']}\",400,400)'>View</a></center>" : '&nbsp;';
-				
-				$mod     = preg_match( "#<mod>(.+?)</mod>#is"        , $row['wlog_notes'], $mm );
-				$post    = preg_match( "#<post>(.+?)</post>#is"      , $row['wlog_notes'], $pm );
-				$susp    = preg_match( "#<susp>(.+?)</susp>#is"      , $row['wlog_notes'], $sm );
-				$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_notes'], $cm );
-				
-				$content = $cm[1];
-				
-				$mod  = trim($mm[1]);
-				$post = trim($pm[1]);
-				$susp = trim($sm[1]);
-				
-				list($v, $u, $i) = explode(',', $mod);
-				
-				if ( $i == 1 )
-				{
-					$mod = 'INDEF';
-				}
-				else if ( $v == "" )
-				{
-					$mod = 'None';
-				}
-				else
-				{
-					$mod = $v.' '.$days[$u];
-				}
-				
-				//----------
-				
-				list($v, $u, $i) = explode(',', $post);
-				
-				if ( $i == 1 )
-				{
-					$post = 'INDEF';
-				}
-				else if ( $v == "" )
-				{
-					$post = 'None';
-				}
-				else
-				{
-					$post = $v.' '.$days[$u];
-				}
-				
-				list($v, $u) = explode(',', $susp);
-				
-				if ( $v == "" )
-				{
-					$susp = 'None';
-				}
-				else
-				{
-					$susp = $v.' '.$days[$u];
-				}
-				
-				//----------
-		
-				$ADMIN->html .= $SKIN->add_td_row( array(
-														  "<center>$type</center>",
-														  "<b>{$row['a_name']}</b>",
-														  $cont,
-														  $mod,
-														  $susp,
-														  $post,
-														  "{$row['wlog_date']}",
-														  "<b>{$row['p_name']}</b>",
-														  "<center><a href='javascript:pop_win(\"&act=warnlog&code=viewnote&id={$row['wlog_id']}\",400,400)'>View</a></center>"
-												 )      );
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_basic($links, 'right', 'pformstrip');
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-	}
-	
-	//---------------------------------------------
-	// Remove archived files
-	//---------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		if ($IN['mid'] == "")
-		{
-			$ADMIN->error("You did not select a member ID to remove by!");
-		}
-		
-		$DB->query("DELETE FROM ibf_warn_logs WHERE wlog_mid={$IN['mid']}");
-		
-		$ADMIN->save_log("Removed Warn Logs");
-		
-		$std->boink_it($ADMIN->base_url."&act=warnlog");	
-	}
-	
-	
-
-	
-	
-	//-------------------------------------------------------------
-	// SHOW LOGS
-	//-------------------------------------------------------------
-	
-	function list_current()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You may view and remove warn actions performed by your staff.<br />Note: Removing the logs does not decrease the member's warn level";
-		$ADMIN->page_title  = "Warn Logs Manager";
-		
-		$ADMIN->html .= $SKIN->js_pop_win();
-		
-		//+-------------------------------
-		// VIEW LAST 5
-		//+-------------------------------
-		
-		$DB->query("SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
-				     FROM ibf_warn_logs l
-				     LEFT JOIN ibf_members m ON (m.id=l.wlog_mid)
-				     LEFT JOIN ibf_members p ON (p.id=l.wlog_addedby)
-				    ORDER BY l.wlog_date DESC LIMIT 0,10");
-		
-		$SKIN->td_header[] = array( "Type"            , "5%" );
-		$SKIN->td_header[] = array( "Warned Member"   , "25%" );
-		$SKIN->td_header[] = array( "Contacted?"      , "5%" );
-		$SKIN->td_header[] = array( "Date"            , "25%" );
-		$SKIN->td_header[] = array( "Warned By"       , "25%" );
-
-		$ADMIN->html .= $SKIN->start_table( "Last 10 Warn Entries" );
-
-		if ( $DB->get_num_rows() )
-		{
-			while ( $row = $DB->fetch_row() )
-			{
-			
-				$row['wlog_date'] = $ADMIN->get_date( $row['wlog_date'], 'LONG' );
-				
-				$type = ( $row['wlog_type'] == 'pos' ) ? '<span style="color:green;font-weight:bold">-</span>' : '<span style="color:red;font-weight:bold">+</span>';
-				$cont = ( $row['wlog_contact'] !=  'none' ) ? "<center><a title='Show message' href='javascript:pop_win(\"&act=warnlog&code=viewcontact&id={$row['wlog_id']}\",400,400)'><img src='{$SKIN->img_url}/acp_check.gif' border='0' alt='X'></a></center>" : '&nbsp;';
-				
-				$ADMIN->html .= $SKIN->add_td_row( array(
-														  "<center>$type</center>",
-														  "<b>{$row['a_name']}</b>",
-														  $cont,
-														  "{$row['wlog_date']}",
-														  "<b>{$row['p_name']}</b>",
-												 )      );
-			}
-		}
-		else
-		{
-			$ADMIN->html .= $SKIN->add_td_basic("<center>No results</center>");
-		}
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Member Name"            , "30%" );
-		$SKIN->td_header[] = array( "Times Warned"           , "20%" );
-		$SKIN->td_header[] = array( "View all by member"     , "20%" );
-		$SKIN->td_header[] = array( "Remove all by member"   , "30%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Saved Warn Logs" );
-		
-		$DB->query("SELECT l.*, m.name, count(l.wlog_mid) as act_count from ibf_warn_logs l, ibf_members m WHERE m.id=l.wlog_mid GROUP BY l.wlog_mid ORDER BY act_count DESC");
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$r['name']}</b>",
-													  "<center>{$r['act_count']}</center>",
-													  "<center><a href='".$SKIN->base_url."&act=warnlog&code=view&mid={$r['wlog_mid']}'>View</a></center>",
-													  "<center><a href='".$SKIN->base_url."&act=warnlog&code=remove&mid={$r['wlog_mid']}'>Remove</a></center>",
-											 )      );
-		}
-			
-		
-		
-		$ADMIN->html .= $SKIN->end_table();
-		
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'view'     ),
-												  2 => array( 'act'   , 'warnlog'       ),
-									     )      );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Search Warn Logs" );
-		
-		$form_array = array(
-							  0 => array( 'notes'  , 'Entry Notes' ),
-							  1 => array( 'contact', 'Email/PM Sent'  ),
-						   );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search for...</b>" ,
-										  		  $SKIN->form_input( "search_string")
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search in...</b>" ,
-										  		  $SKIN->form_dropdown( "search_type", $form_array)
-								 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Search");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_wrappers.php b/upload/sources/Admin/ad_wrappers.php
deleted file mode 100644
index 6623fbb0..00000000
--- a/upload/sources/Admin/ad_wrappers.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Help Control functions
-|   > Module written by Matt Mecham
-|   > Date started: 2nd April 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-if ( ! defined( 'IN_ACP' ) )
-{
-	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
-	exit();
-}
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-		
-		//---------------------------------------
-
-		switch($IN['code'])
-		{
-			case 'wrapper':
-				$this->list_wrappers();
-				break;
-				
-			case 'add':
-				$this->add_splash();
-				break;
-				
-			case 'edit':
-				$this->do_form('edit');
-				break;
-				
-			case 'doadd':
-				$this->save_wrapper('add');
-				break;
-				
-			case 'doedit':
-				$this->save_wrapper('edit');
-				break;
-				
-			case 'remove':
-				$this->remove();
-				break;
-				
-			case 'export':
-				$this->export();
-			
-			//-------------------------
-			default:
-				$this->list_wrappers();
-				break;
-		}
-		
-	}
-	
-	
-	//---------------------------------------------------------------------
-	
-	function add_splash()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_FILES;
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") )
-		{
-			// We're adding new templates based on another set
-			
-			$this->do_form('add');
-			exit();
-		}
-		
-		if (! is_dir($INFO['upload_dir']) )
-		{
-			$ADMIN->error("Could not locate the uploads directory - make sure the 'uploads' path is set correctly");
-		}
-		
-		//-------------------------------------------------
-		// Copy the upload to the uploads directory
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $INFO['upload_dir']."/".$FILE_NAME) )
-		{
-			$ADMIN->error("The upload failed");
-		}
-		else
-		{
-			@chmod( $INFO['upload_dir']."/".$FILE_NAME, 0777 );
-		}
-		
-		//-------------------------------------------------
-		// Attempt to open the file..
-		//-------------------------------------------------
-		
-		$filename = $INFO['upload_dir']."/".$FILE_NAME;
-		
-		if ( $FH = @fopen( $filename, 'r' ) )
-		{
-			$data = @fread( $FH, filesize($filename) );
-			@fclose($FH);
-			
-			@unlink($filename);
-		}
-		else
-		{
-			$ADMIN->error("Could not open the uploaded file for reading!");
-		}
-		
-		//-------------------------------------------------
-		// If we're here, we'll assume that we've read the
-		// file and the contents are in $data
-		// So, lets make sure its the correct template file..
-		//-------------------------------------------------
-		
-		if ( ! preg_match( "/<% COPYRIGHT %>/", $data ) )
-		{
-			$ADMIN->error("This file does not appear to be a valid Invision Power Board Wrapper file");
-		}
-		
-		//----------------------------------
-		// Insert wrapper into DB
-		//----------------------------------
-		
-		$wrap_name .= "New Wrapper (Upload ID: ".substr( time(), -6 ).")";
-		
-		$str = $DB->compile_db_insert_string( array ( 'name'     => $wrap_name,
-													  'template' => $data,
-											)       );
-											
-		$DB->query("INSERT INTO ibf_templates ({$str['FIELD_NAMES']}) VALUES({$str['FIELD_VALUES']})");
-		
-		$ADMIN->done_screen("Board Wrapper import complete", "Manage Board Wrappers", "act=wrap" );
-		
-	}
-	
-	//---------------------------------------------------------------------
-	
-	function export()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT * from ibf_templates WHERE tmid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		//+-------------------------------
-		// Pass file as an attachment, yeah!
-		//+-------------------------------
-		
-		$l_name = preg_replace( "/\s{1,}/", "_", $row['name'] );
-		
-		$file_name = "wrap-".substr($l_name, 0, 8).".html";
-		
-		$row['template'] = preg_replace("/\r\n/", "\n", $row['template'] );
-		
-		@header("Content-type: unknown/unknown");
-		@header("Content-Disposition: attachment; filename=$file_name");
-		
-		print $row['template']."\n";
-		
-		exit();
-		
-	}
-	
-	
-	//-------------------------------------------------------------
-	// REMOVE WRAPPERS
-	//-------------------------------------------------------------
-	
-	function remove()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		$DB->query("DELETE FROM ibf_templates WHERE tmid='".$IN['id']."'");
-		
-		$std->boink_it($SKIN->base_url."&act=wrap");
-			
-		exit();
-		
-		
-	}
-	
-	
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT WRAPPERS
-	//-------------------------------------------------------------
-	
-	function save_wrapper( $type='add' )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//+-------------------------------
-		
-		if ($type == 'edit')
-		{
-			if ($IN['id'] == "")
-			{
-				$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-			}
-		}
-		
-		if ($IN['name'] == "")
-		{
-			$ADMIN->error("You must specify a name for this wrapper");
-		}
-		
-		if ($IN['template'] == "")
-		{
-			$ADMIN->error("You can't have an empty template, can you?");
-		}
-		
-		$tmpl = preg_replace( "!&lt;/textarea>!", "/textarea>", stripslashes($HTTP_POST_VARS['template']) );
-		
-		$tmpl = str_replace( "&amp;amp;" , "&amp;"   , $tmpl );
-		$tmpl = str_replace( "&amp;nbsp;", "&nbsp;"  , $tmpl );
-		$tmpl = str_replace( "&amp;copy;", "&copy;"  , $tmpl );
-		$tmpl = preg_replace( "/\\\/"    , "&#092;"  , $tmpl );
-		$tmpl = preg_replace( "/&#092;/" , '\\\\\\\\'    , $tmpl ); // o_O
-		
-		
-		if ( ! preg_match( "/<% BOARD %>/", $tmpl ) )
-		{
-			$ADMIN->error("You cannot remove the &lt% BOARD %> tag silly!");
-		}
-		
-		if ( ! preg_match( "/<% COPYRIGHT %>/", $tmpl ) )
-		{
-			$ADMIN->error("You cannot remove the &lt% COPYRIGHT %> tag silly!");
-		}
-		
-		$barney = array( 'name'     => stripslashes($HTTP_POST_VARS['name']),
-						 'template' => $tmpl
-					   );
-					   
-		if ($type == 'add')
-		{
-			$db_string = $DB->compile_db_insert_string( $barney );
-			
-			$DB->query("INSERT INTO ibf_templates (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-			
-			$std->boink_it($SKIN->base_url."&act=wrap");
-			
-			exit();
-			
-		}
-		else
-		{
-			$db_string = $DB->compile_db_update_string( $barney );
-			
-			$DB->query("UPDATE ibf_templates SET $db_string WHERE tmid='".$IN['id']."'");
-			
-			$ADMIN->done_screen("Wrapper updated", "Manage Board Wrappers", "act=wrap" );
-		}
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// ADD / EDIT WRAPPERS
-	//-------------------------------------------------------------
-	
-	function do_form( $type='add' )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		//+-------------------------------
-		
-		if ($IN['id'] == "")
-		{
-			$ADMIN->error("You must specify an existing wrapper ID, go back and try again");
-		}
-		
-		$DB->query("SELECT * from ibf_templates WHERE tmid='".$IN['id']."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$ADMIN->error("Could not query the information from the database");
-		}
-		
-		if ($type == 'add')
-		{
-			$code = 'doadd';
-			$button = 'Create Wrapper';
-			$row['name'] = $row['name'].".2";
-		}
-		else
-		{
-			$code = 'doedit';
-			$button = 'Edit Wrapper';
-		}
-		
-		//+-------------------------------
-	
-		$ADMIN->page_detail = "You may use HTML fully when adding or editing wrappers.";
-		$ADMIN->page_title  = "Manage Board Wrappers";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->js_no_specialchars();
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $code      ),
-												  2 => array( 'act'   , 'wrap'      ),
-												  3 => array( 'id'    , $IN['id']   ),
-									     ), "theAdminForm", "onSubmit=\"return no_specialchars('wrapper')\""      );
-									     
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "20%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "80%" );
-
-		//+-------------------------------
-		
-		$row['template'] = preg_replace( "/\/textarea>/", "&lt;/textarea>", $row['template'] );  // Stop html killing the text area
-		
-		// Sort out amps and stuff
-		
-		$row['template'] = str_replace( "&amp;", "&amp;amp;", $row['template'] );
-		$row['template'] = str_replace( "&nbsp;", "&amp;nbsp;", $row['template'] );
-		$row['template'] = str_replace( "&copy;", "&amp;copy;", $row['template'] );
-		$row['template'] = preg_replace( "/\\\/" , "&#092;" , $row['template'] );
-		
-		$ADMIN->html .= $SKIN->start_table( $button );
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Wrapper Title",
-													$SKIN->form_input('name', $row['name']),
-									     )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
-													"Content",
-													$SKIN->form_textarea('template', $row['template'], $INFO['tx'], $INFO['ty']),
-									     )      );
-												 
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-		
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SHOW WRAPPERS
-	//-------------------------------------------------------------
-	
-	function list_wrappers()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$form_array = array();
-	
-		$ADMIN->page_detail = "You may add/edit and remove the board wrapper templates.<br><br>Board wrapper refers to the main board template which allows additional HTML to be added to the header and footer of the board";
-		$ADMIN->page_title  = "Manage Board Wrappers";
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "Title"        , "40%" );
-		$SKIN->td_header[] = array( "Allocation"   , "30%" );
-		$SKIN->td_header[] = array( "Export"       , "10%" );
-		$SKIN->td_header[] = array( "Edit"         , "10%" );
-		$SKIN->td_header[] = array( "Remove"       , "10%" );
-		
-		//+-------------------------------
-		
-		$DB->query("SELECT DISTINCT(w.tmid), w.name, s.sname from ibf_templates w, ibf_skins s WHERE s.tmpl_id=w.tmid ORDER BY w.name ASC");
-		
-		$used_ids = array();
-		$show_array = array();
-		
-		if ( $DB->get_num_rows() )
-		{
-		
-			$ADMIN->html .= $SKIN->start_table( "Current Wrappers In Use" );
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$show_array[ $r['tmid'] ] .= stripslashes($r['sname'])."<br>";
-			
-				if ( in_array( $r['tmid'], $used_ids ) )
-				{
-					continue;
-				}
-				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['name'])."</b>",
-														  "<#X-{$r['tmid']}#>",
-														  "<center><a href='".$SKIN->base_url."&act=wrap&code=export&id={$r['tmid']}'>Export</a></center>",
-														  "<center><a href='".$SKIN->base_url."&act=wrap&code=edit&id={$r['tmid']}'>Edit</a></center>",
-														  "<i>Deallocate before removing</i>",
-												 )      );
-												   
-				$used_ids[] = $r['tmid'];
-				
-				$form_array[] = array( $r['tmid'], $r['name'] );
-				
-			}
-			
-			foreach( $show_array as $idx => $string )
-			{
-				$string = preg_replace( "/<br>$/", "", $string );
-				
-				$ADMIN->html = preg_replace( "/<#X-$idx#>/", "$string", $ADMIN->html );
-			}
-			
-			$ADMIN->html .= $SKIN->end_table();
-		}
-		
-		if ( count($used_ids) > 0 )
-		{
-		
-			$DB->query("SELECT tmid, name FROM ibf_templates WHERE tmid NOT IN(".implode(",",$used_ids).")");
-		
-			if ( $DB->get_num_rows() )
-			{
-			
-				$SKIN->td_header[] = array( "Title"  , "70%" );
-				$SKIN->td_header[] = array( "Export" , "10%" );
-				$SKIN->td_header[] = array( "Edit"   , "10%" );
-				$SKIN->td_header[] = array( "Remove" , "10%" );
-			
-				$ADMIN->html .= $SKIN->start_table( "Current Unallocated Wrappers" );
-				
-				$ADMIN->html .= $SKIN->js_checkdelete();
-				
-				
-				while ( $r = $DB->fetch_row() )
-				{
-					
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>".stripslashes($r['name'])."</b>",
-															  "<center><a href='".$SKIN->base_url."&act=wrap&code=export&id={$r['tmid']}'>Export</a></center>",
-															  "<center><a href='".$SKIN->base_url."&act=wrap&code=edit&id={$r['tmid']}'>Edit</a></center>",
-															  "<center><a href='javascript:checkdelete(\"act=wrap&code=remove&id={$r['tmid']}\")'>Remove</a></center>",
-													 )      );
-													 
-					$form_array[] = array( $r['tmid'], $r['name'] );
-													   
-				}
-				
-				$ADMIN->html .= $SKIN->end_table();
-			}
-		}
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'add'     ),
-												  2 => array( 'act'   , 'wrap'    ),
-												  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
-									     ) , "uploadform", " enctype='multipart/form-data'"     );
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		
-		$ADMIN->html .= $SKIN->start_table( "Create New Wrapper" );
-			
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Base new wrapper on...</b>" ,
-										  		  $SKIN->form_dropdown( "id", $form_array)
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b><u>OR</u> Choose a wrapper file from your computer to import</b><br>Note: This must be in the correct format.",
-												  $SKIN->form_upload(),
-										 )      );
-		
-		$ADMIN->html .= $SKIN->end_form("Create new wrapper");
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		//+-------------------------------
-		//+-------------------------------
-		
-		$ADMIN->output();
-	
-	}
-	
-	
-}
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/admin_functions.php b/upload/sources/Admin/admin_functions.php
deleted file mode 100644
index 1ebcd310..00000000
--- a/upload/sources/Admin/admin_functions.php
+++ /dev/null
@@ -1,762 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin functions library
-|   > Script written by Matt Mecham
-|   > Date started: 1st march 2002
-|
-+--------------------------------------------------------------------------
-*/
-
-
-class admin_functions {
-
-	var $img_url;
-	var $page_title  = "Welcome to the Invision Power Board Administration CP";
-	var $page_detail = "You can set up and customize your board from within this control panel.<br><br>Clicking on one of the links in the left menu pane will show you the relevant options for that administration category. Each option will contain further information on configuration, etc.";
-	var $html;
-	var $errors = "";
-	var $nav    = array();
-	var $time_offset = 0;
-	var $jump_menu = "";
-	var $no_jump = 0;
-
-	function admin_functions() {
-		global $INFO, $IN;
-		
-		$this->img_url = $INFO['html_url'].'/sys-img';
-		$this->base_url = $INFO['board_url']."/admin.".$INFO['php_ext']."?adsess=".$IN['AD_SESS'];
-		
-	}
-	
-	//---------------------------
-	// Makes good raw form text
-	//----------------------------
-	
-	function make_safe($t)
-	{
-		$t = stripslashes($t);
-		
-		$t = preg_replace( "/\\\/", "&#092;", $t );
-		
-		return $t;
-	}
-	
-	//---------------------------
-	// Sets up time offset for ACP use
-	//----------------------------
-	
-	
-	function get_date($date="", $method="")
-	{
-		global $INFO, $IN, $MEMBER;
-		
-		$this->time_options = array( 'JOINED' => $INFO['clock_joined'],
-									 'SHORT'  => $INFO['clock_short'],
-									 'LONG'   => $INFO['clock_long']
-								   );
-								   
-		if (!$date)
-        {
-            return '--';
-        }
-        
-        if (empty($method))
-        {
-        	$method = 'LONG';
-        }
-        
-        $this->time_offset = (($MEMBER['time_offset'] != "") ? $MEMBER['time_offset'] : $INFO['time_offset']) * 3600;
-			
-		if ($INFO['time_adjust'] != "" and $INFO['time_adjust'] != 0)
-		{
-			$this->time_offset += ($INFO['time_adjust'] * 60);
-		}
-		
-		if ($MEMBER['dst_in_use'])
-		{
-			$this->time_offset += 3600;
-		}
-        
-        return gmdate($this->time_options[$method], ($date + $this->time_offset) );
-		
-		
-		
-	}
-	
-	//**********************************************/
-	// save_log
-	//
-	// Add an entry into the admin logs, yeah.
-	//**********************************************/
-	
-	function save_log($action="")
-	{
-		global $INFO, $DB, $IN, $MEMBER;
-		
-		$str = $DB->compile_db_insert_string( array(
-													  'act'        => $IN['act'],
-													  'code'       => $IN['code'],
-													  'member_id'  => $MEMBER['id'],
-													  'ctime'      => time(),
-													  'note'       => $action,
-													  'ip_address' => $IN['IP_ADDRESS'],
-											)       );
-											
-		$DB->query("INSERT INTO ibf_admin_logs ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		
-		return true;  // to anyone that cares..
-		
-	}
-	
-	
-	//**********************************************/
-	// get_tar_names
-	//
-	// Simply returns a list of tarballs that start
-	// with the given filename
-	//**********************************************/
-	
-	function get_tar_names($start='lang-')
-	{
-		global $INFO;
-		
-		// Remove trailing slashes..
-		
-		$files = array();
-		
-		$dir = $INFO['base_dir']."archive_in";
-			
-		if ( is_dir($dir) )
-		{
-			$handle = opendir($dir);
-			
-			while (($filename = readdir($handle)) !== false)
-			{
-				if (($filename != ".") && ($filename != ".."))
-				{
-					if (preg_match("/^$start.+?\.tar$/", $filename))
-					{
-						$files[] = $filename;
-					}
-				}
-			}
-			
-			closedir($handle);
-			
-		}
-		
-		return $files;
-			
-	}
-	
-	//**********************************************/
-	// copy_dir
-	//
-	// Copies to contents of a dir to a new dir, creating
-	// destination dir if needed.
-	//
-	//**********************************************/
-	
-	function copy_dir($from_path, $to_path, $mode = 0777)
-	{
-	
-		global $INFO;
-		
-		// Strip off trailing slashes...
-		
-		$from_path = preg_replace( "#/$#", "", $from_path);
-		$to_path   = preg_replace( "#/$#", "", $to_path);
-	
-		if ( ! is_dir($from_path) )
-		{
-			$this->errors = "Could not locate directory '$from_path'";
-			return FALSE;
-		}
-	
-		if ( ! is_dir($to_path) )
-		{
-			if ( ! @mkdir($to_path, $mode) )
-			{
-				$this->errors = "Could not create directory '$to_path' please check the CHMOD permissions and re-try";
-				return FALSE;
-			}
-			else
-			{
-				@chmod($to_path, $mode);
-			}
-		}
-		
-		$this_path = getcwd();
-		
-		if (is_dir($from_path))
-		{
-			chdir($from_path);
-			$handle=opendir('.');
-			while (($file = readdir($handle)) !== false)
-			{
-				if (($file != ".") && ($file != ".."))
-				{
-					if (is_dir($file))
-					{
-						
-						$this->copy_dir($from_path."/".$file, $to_path."/".$file);
-						
-						chdir($from_path);
-					}
-					
-					if ( is_file($file) )
-					{
-						copy($from_path."/".$file, $to_path."/".$file);
-						@chmod($to_path."/".$file, 0777);
-					} 
-				}
-			}
-			closedir($handle); 
-		}
-		
-		if ($this->errors == "")
-		{
-			return TRUE;
-		}
-	}
-	
-	//**********************************************/
-	// rm_dir
-	//
-	// Removes directories, if non empty, removes
-	// content and directories
-	// (Code based on annotations from the php.net
-	// manual by pal@degerstrom.com)
-	//**********************************************/
-	
-	function rm_dir($file)
-	{
-		global $INFO;
-		
-		$errors = 0;
-		
-		// Remove trailing slashes..
-		
-		$file = preg_replace( "#/$#", "", $file );
-		
-		if ( file_exists($file) )
-		{
-			// Attempt CHMOD
-			
-			@chmod($file, 0777);
-			
-			if ( is_dir($file) )
-			{
-				$handle = opendir($file);
-				
-				while (($filename = readdir($handle)) !== false)
-				{
-					if (($filename != ".") && ($filename != ".."))
-					{
-						$this->rm_dir($file."/".$filename);
-					}
-				}
-				
-				closedir($handle);
-				
-				if ( ! @rmdir($file) )
-				{
-					$errors++;
-				}
-			}
-			else
-			{
-				if ( ! @unlink($file) )
-				{
-					$errors++;
-				}
-			}
-		}
-		
-		if ($errors == 0)
-		{
-			return TRUE;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-	
-	//**********************************************/
-	// rebuild_config:
-	//
-	// Er, rebuilds the config file
-	//
-	//**********************************************/
-	
-	function rebuild_config( $new = "" )
-	{
-		global $IN, $std, $ADMIN, $root_path;
-		
-		//-----------------------------------------
-		// Check to make sure this is a valid array
-		//-----------------------------------------
-		
-		if (! is_array($new) )
-		{
-			$ADMIN->error("Error whilst attempting to rebuild the board config file, attempt aborted");
-		}
-		
-		//-----------------------------------------
-		// Do we have anything to save out?
-		//-----------------------------------------
-		
-		if ( count($new) < 1 )
-		{
-			return "";
-		}
-		
-		//-----------------------------------------
-		// Get an up to date copy of the config file
-		// (Imports $INFO)
-		//-----------------------------------------
-		
-		require ROOT_PATH.'conf_global.php';
-		
-		//-----------------------------------------
-		// Rebuild the $INFO hash
-		//-----------------------------------------
-		
-		foreach( $new as $k => $v )
-		{
-			// Update the old...
-			
-			$v = preg_replace( "/'/", "\\'" , $v );
-			$v = preg_replace( "/\r/", ""   , $v );
-			
-			$INFO[ $k ] = $v;
-		}	
-		
-		//-----------------------------------------
-		// Rename the old config file
-		//-----------------------------------------
-		
-		@rename( ROOT_PATH.'conf_global.php', ROOT_PATH.'conf_global-bak.php' );
-		@chmod( ROOT_PATH.'conf_global-bak.php', 0777);
-		
-		//-----------------------------------------
-		// Rebuild the old file
-		//-----------------------------------------
-		
-		ksort($INFO);
-		
-		$file_string = "<?php\n";
-		
-		foreach( $INFO as $k => $v )
-		{
-			if ($k == 'skin' or $k == 'languages')
-			{
-				// Protect serailized arrays..
-				$v = stripslashes($v);
-				$v = addslashes($v);
-			}
-			
-			$file_string .= '$INFO['."'".$k."'".']'."\t\t\t=\t'".$v."';\n";
-		}
-		
-		$file_string .= "\n".'?'.'>';   // Question mark + greater than together break syntax hi-lighting in BBEdit 6 :p
-		
-		if ( $fh = fopen( ROOT_PATH.'conf_global.php', 'w' ) )
-		{
-			fwrite($fh, $file_string, strlen($file_string) );
-			fclose($fh);
-		}
-		else
-		{
-			$ADMIN->error("Fatal Error: Could not open conf_global for writing - no changes applied. Try changing the CHMOD to 0777");
-		}
-		
-		// Pass back the new $INFO array to anyone who cares...
-		
-		return $INFO;
-		
-	}
-	
-	//**********************************************/
-	// compile_forum_perms:
-	//
-	// Returns the READ/REPLY/START DB strings
-	//
-	//**********************************************/
-	
-	
-	function compile_forum_perms() {
-		global $DB, $IN;
-		
-		$r_array = array( 'READ' => '', 'REPLY' => '', 'START' => '', 'UPLOAD' => '' );
-		
-		if ($IN['READ_ALL'] == 1)
-		{
-			$r_array['READ'] = '*';
-		}
-		
-		if ($IN['REPLY_ALL'] == 1)
-		{
-			$r_array['REPLY'] = '*';
-		}
-		
-		if ($IN['START_ALL'] == 1)
-		{
-			$r_array['START'] = '*';
-		}
-		
-		if ($IN['UPLOAD_ALL'] == 1)
-		{
-			$r_array['UPLOAD'] = '*';
-		}
-		
-		
-		$DB->query("SELECT perm_id, perm_name FROM ibf_forum_perms ORDER BY perm_id");
-			 
-		while ( $data = $DB->fetch_row() )
-		{
-			if ($r_array['READ'] != '*')
-			{
-				if ($IN[ 'READ_'.$data['perm_id'] ] == 1)
-				{
-					$r_array['READ'] .= $data['perm_id'].",";
-				}
-			}
-			//+----------------------------
-			if ($r_array['REPLY'] != '*')
-			{
-				if ($IN[ 'REPLY_'.$data['perm_id'] ] == 1)
-				{
-					$r_array['REPLY'] .= $data['perm_id'].",";
-				}
-			}
-			//+----------------------------
-			if ($r_array['START'] != '*')
-			{
-				if ($IN[ 'START_'.$data['perm_id'] ] == 1)
-				{
-					$r_array['START'] .= $data['perm_id'].",";
-				}
-			}
-			//+----------------------------
-			if ($r_array['UPLOAD'] != '*')
-			{
-				if ($IN[ 'UPLOAD_'.$data['perm_id'] ] == 1)
-				{
-					$r_array['UPLOAD'] .= $data['perm_id'].",";
-				}
-			}
-		}
-		
-		$r_array['START']   = preg_replace( "/,$/", "", $r_array['START']   );
-		$r_array['REPLY']   = preg_replace( "/,$/", "", $r_array['REPLY']   );
-		$r_array['READ']    = preg_replace( "/,$/", "", $r_array['READ']    );
-		$r_array['UPLOAD']  = preg_replace( "/,$/", "", $r_array['UPLOAD']  );
-		
-		return $r_array;
-		
-	}
-	
-	
-	//+------------------------------------------------
-	//+------------------------------------------------
-	// OUTPUT FUNCTIONS
-	//+------------------------------------------------
-	//+------------------------------------------------
-	
-	function print_popup() {
-		global $IN, $INFO, $DB, $std, $SKIN, $use_gzip;
-	
-		$html = "<html>
-		          <head><title>Remote</title>
-		          <meta HTTP-EQUIV=\"Pragma\"  CONTENT=\"no-cache\">
-				  <meta HTTP-EQUIV=\"Cache-Control\" CONTENT=\"no-cache\">
-				  <meta HTTP-EQUIV=\"Expires\" CONTENT=\"Mon, 06 May 1996 04:57:00 GMT\">";
-		
-		$html .= $SKIN->get_css();
-		
-		$html .= "</head>\n";
-		
-		$html .= "</head>
-				  <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>
-				  ";
-						 
-		$html .= $this->html;
-		
-		$html .= "</body></html>";
-		
-		print $html;
-		
-		exit();
-	}
-					   
-		
-	
-	
-	function output() {
-		global $IN, $INFO, $DB, $std, $SKIN, $use_gzip;
-	
-		$html  = $SKIN->print_top($this->page_title, $this->page_detail);
-		$html .= $this->html;
-		$html .= $SKIN->print_foot();
-		
-		$DB->close_db();
-		
-		$navigation = array( "<a href='{$this->base_url}&act=index' target='body'>ACP Home</a>" );
-		
-		if ( count($this->nav) > 0 )
-		{
-			foreach ( $this->nav as $idx => $links )
-			{
-				if ($links[0] != "")
-				{
-					$navigation[] = "<a href='{$this->base_url}&{$links[0]}' target='body'>{$links[1]}</a>";
-				}
-				else
-				{
-					$navigation[] = $links[1];
-				}
-			}
-		}
-		
-		if ( count($navigation) > 0 )
-		{
-			$html = str_replace( "<!--NAV-->", $SKIN->wrap_nav( implode( " -&gt; ", $navigation ) ), $html );
-		}
-		
-		if ( $this->no_jump != 1 )
-		{
-			$html = str_replace( "<!--JUMP-->", $this->build_jump_menu(), $html );
-		}
-		
-		if ($use_gzip == 1)
-		{
-        	$buffer = ob_get_contents();
-        	ob_end_clean();
-        	ob_start('ob_gzhandler');
-        	print $buffer;
-    	}
-    	
-    	//@header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-		//@header("Cache-Control: no-cache, must-revalidate");
-		//@header("Pragma: no-cache");
-				
-    	print $html;
-    	
-    	exit();
-	
-	}
-	
-	//**********************************************/
-	// Error:
-	//
-	// Displays an error
-	//
-	//**********************************************/
-	
-	function error($error="", $is_popup=0) {
-		global $IN, $INFO, $DB, $std, $SKIN, $HTTP_REFERER;
-		
-		$this->page_title  = "Admin CP Message";
-		$this->page_detail = "&nbsp;";
-		
-		$this->html .= "<div class='tableborder'>
-		                 <div class='maintitle'>Admin CP Message</div>
-		                 <div class='tdrow1' style='padding:8px'>
-						  <span style='font-size:12px'>$error</span>
-						 </div>
-						</div>";
-		
-		if ($is_popup == 0)
-		{
-			$this->output();
-		}
-		else
-		{
-			$this->print_popup();
-		}
-		
-	}
-	
-	//**********************************************/
-	// Done Screen:
-	//
-	// Displays the "done" screen. Really? Yes.
-	//
-	//**********************************************/
-	
-	function done_screen($title, $link_text="", $link_url="") {
-		global $IN, $INFO, $DB, $std, $SKIN;
-		
-		$this->page_title  = $title;
-		$this->page_detail = "The action was executed successfully";
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
-		
-		$this->html .= $SKIN->start_table("Result");
-		
-		$this->html .= $SKIN->add_td_basic( "<a href='{$this->base_url}&{$link_url}' target='body'>Go to: $link_text</a>", "center" );
-		
-		$this->html .= $SKIN->add_td_basic( "<a href='{$this->base_url}&act=index' target='body'>Go to: Administration Home</a>", "center" );
-										 
-		$this->html .= $SKIN->end_table();
-			
-		$this->output();
-	
-	}
-	
-	function info_screen($text="", $title='Safe Mode Restriction Warning') {
-		global $IN, $INFO, $DB, $std, $SKIN;
-		
-		$this->page_title  = $title;
-		$this->page_detail = "Please note the following:";
-		
-		$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
-		
-		$this->html .= $SKIN->start_table("Result");
-		
-		$this->html .= $SKIN->add_td_basic( $text );
-		
-		$this->html .= $SKIN->add_td_basic( "<a href='{$this->base_url}&act=index' target='body'>Go to: Administration Home</a>", "center" );
-										 
-		$this->html .= $SKIN->end_table();
-			
-		$this->output();
-	
-	}
-	
-	
-	//**********************************************/
-	// MENU:
-	//
-	// Build the collapsable menu trees
-	//
-	//**********************************************/
-	
-	function menu() {
-		global $IN, $std, $INFO, $PAGES, $CATS, $SKIN;
-		
-		$links = $this->build_tree();
-		
-		$html = $SKIN->menu_top() . $links . $SKIN->menu_foot();
-		
-		// Saving cookie?
-		
-		if ( $INFO['menu'] )
-		{
-			$std->my_setcookie( 'acpmenu', $IN['show'] );
-		}
-		
-		print $html;
-		exit();
-
-		
-	}
-	
-	//+------------------------------------------------
-	
-	function build_tree() {
-		global $IN, $std, $INFO, $PAGES, $CATS, $SKIN, $DESC;
-		
-		$html  = "";
-		$links = "";
-		
-		
-		foreach($CATS as $cid => $name)
-		{
-			
-			$ADMIN->jump_menu .= "<optgroup label='$name'>\n";
-			
-			if ( preg_match( "/(?:^|,)$cid(?:,|$)/", $IN['show'] ) )
-			{
-			
-				foreach($PAGES[ $cid ] as $pid => $pdata)
-				{
-					if ( $pdata[2] != "" )
-					{
-						if ( ! @is_dir( ROOT_PATH.$pdata[2] ) )
-				  		{
-					  		continue;
-					  	}
-					}
-					
-					$links .= $SKIN->menu_cat_link($pdata[1], $pdata[0], $pdata[3]);
-				}
-				  
-				$html .= $SKIN->menu_cat_expanded( $name, $links, $cid );
-				unset($links);
-			}
-			else
-			{
-				$html .= $SKIN->menu_cat_collapsed( $name, $cid, $DESC[ $cid ] );
-			}
-			
-			$ADMIN->jump_menu .= "</optgroup>\n";
-		}
-		
-		return $html;
-		
-	}
-	
-	//-------------------------------------------------------------
-	// BUILDS JUMP MENU, yay!
-	//-------------------------------------------------------------
-	
-	function build_jump_menu()
-	{
-		global $IN, $std, $PAGES, $CATS, $SKIN, $DESC;
-		
-		$html = "<script type='text/javascript'>
-				 function dojump()
-				 {
-				 	if ( document.jumpmenu.val.options[document.jumpmenu.val.selectedIndex].value != '' )
-				 	{
-				 		window.location.href = '{$this->base_url}' + '&' + document.jumpmenu.val.options[document.jumpmenu.val.selectedIndex].value;
-				 	}
-				 }
-				 </script>
-				 ";
-		
-		$html .= "<form name='jumpmenu'>\n<select class='jmenu' name='val'>";
-		
-		foreach($CATS as $cid => $name)
-		{
-			$html .= "<optgroup label='$name'>\n";
-			
-			foreach($PAGES[ $cid ] as $pid => $pdata)
-			{
-				$html .= "<option value='$pdata[1]'>$pdata[0]</option>\n";
-			}
-			
-			$html .= "</optgroup>\n";
-		}
-		
-		$html .= "</select>&nbsp;<input type='button' class='jmenubutton' value='Go!' onclick='dojump();' />\n</form>";
-		
-		return $html;
-		
-	}
-	
-}
-
-
-
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/admin_pages.php b/upload/sources/Admin/admin_pages.php
deleted file mode 100644
index bf220aa3..00000000
--- a/upload/sources/Admin/admin_pages.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-// Simple library that holds all the links for the admin cp
-
-// CAT_ID => array(  PAGE_ID  => (PAGE_NAME, URL ) )
-
-// $PAGES[ $cat_id ][$page_id][0] = Page name
-// $PAGES[ $cat_id ][$page_id][1] = Url
-
- 
-$PAGES = array(
-
-				/*0 => array (
-							 1 => array( 'IPS Latest News'         , 'act=ips&code=news'   ),
-							 2 => array( 'Check for updates'      , 'act=ips&code=updates'  ),
-							 3 => array( 'Documentation'     , 'act=ips&code=docs'    ),
-							 4 => array( 'Get Support'       , 'act=ips&code=support' ),
-							 5 => array( 'IPS Hosting'  , 'act=ips&code=host'   ),
-							 6 => array( 'Purchase Services'    , 'act=ips&code=purchase'     ),
-						   ),*/
-						   
-				1 => array (
-				
-							1 => array( 'IP Chat'              , 'act=pin&code=ipchat'  ),
-							2 => array( 'IPS Hosting'          , 'act=ips&code=host'    ),
-							3 => array( 'IPB Registration'     , 'act=pin&code=reg'     ),
-							4 => array( 'IPB Copyright Removal', 'act=pin&code=copy'    ),
-							5 => array( 'Subscription Manager'    , 'act=msubs' ),
-							6 => array( '&#0124;-- Logs'          , 'act=msubs&code=searchlog', 'modules/subsmanager' ),
-							7 => array( '&#0124;-- Currency Set-up' , 'act=msubs&code=currency', 'modules/subsmanager' ),
-							8 => array( '&#039;-- Transactions'   , 'act=msubs&code=dosearch', 'modules/subsmanager' ),
-							
-							
-						   ),
-
-				2 => array (
-							 1 => array( 'General Configuration', 'act=op&code=url'   ),
-							 2 => array( 'Security & Privacy'      , 'act=op&code=secure'  ),
-							 3 => array( 'Topics, Posts & Polls', 'act=op&code=post'    ),
-							 4 => array( 'User Profiles'       , 'act=op&code=avatars' ),
-							 5 => array( 'Date & Time Formats'  , 'act=op&code=dates'   ),
-							 6 => array( 'CPU Saving'    , 'act=op&code=cpu'     ),
-							 7 => array( 'Cookies'       , 'act=op&code=cookie'  ),
-							 8 => array( 'PM Set up'       , 'act=op&code=pm'    ),
-							 9 => array( 'Board on/off'    , 'act=op&code=board' ),
-							 10 =>array( 'News Set-up'    , 'act=op&code=news' ),
-							 11 =>array( 'Calendar/Birthday'    , 'act=op&code=calendar' ),
-							 12 =>array( 'COPPA Set-up'       , 'act=op&code=coppa' ),
-							 14 =>array( 'Email Set-up'       , 'act=op&code=email' ),
-							 15 =>array( 'Server Environment' , 'act=op&code=phpinfo' ),
-							 16 =>array( 'Board Guidelines'   , 'act=op&code=glines' ),
-							 17 =>array( 'Full Text Searching', 'act=op&code=fulltext'),
-							 18 =>array( 'Search Engine Spiders', 'act=op&code=spider' ),
-							 19 =>array( 'Warning Set-up'       , 'act=op&code=warn' ),
-							 20 =>array( 'IPDynamic Lite Set-up'    , 'act=csite',     'sources/dynamiclite' ),
-							 
-							 
-						   ),
-
-				3 => array (
-							 1 => array( 'New Category'        , 'act=cat&code=new'        ),
-							 2 => array( 'New Forum'           , 'act=forum&code=newsp'    ),
-							 3 => array( 'Manage Forums'       , 'act=cat&code=edit'       ),
-							 4 => array( 'Permission Masks'    , 'act=group&code=permsplash'),
-							 5 => array( 'Re-Order Categories' , 'act=cat&code=reorder'    ),
-							 6 => array( 'Re-Order Forums'     , 'act=forum&code=reorder'  ),
-							 7 => array( 'Moderators'          , 'act=mod'                 ),
-							 //8 => array( 'Topic Multi-Moderation', 'act=multimod'          ),
-						   ),
-						   
-				
-				4 => array (
-							 1 => array( 'Moderator\'s CP'       , 'act=modcp' ,   "" , 1     ),
-							 2 => array( 'Topic Multi-Moderation', 'act=multimod'          ),
-						   ),
-						   
-						   
-				5 => array (
-							1 => array ( 'Pre-Register'        , 'act=mem&code=add'  ),
-							2 => array ( 'Find/Edit/Suspend User'      , 'act=mem&code=edit' ),
-							3 => array ( 'Delete User(s)'      , 'act=mem&code=del'  ),
-							4 => array ( 'List Suspended Users', 'act=mem&code=advancedsearch&showsusp=1' ),
-							5 => array ( 'Ban Settings'        , 'act=mem&code=ban'  ),
-							6 => array ( 'User Title/Ranks'    , 'act=mem&code=title'),
-							7 => array ( 'Manage User Groups'  , 'act=group'         ),
-							8 => array ( 'Manage Validating', 'act=mem&code=mod'  ),
-							9 => array ( 'Custom Profile Fields', 'act=field'       ),
-							10 => array ( 'Bulk Email Members'   , 'act=mem&code=mail' ),
-							11 => array ( 'Member Tools'         , 'act=mtools'  ),
-							
-						   ),
-						   
-				6 => array (
-							1 => array( 'Manage Word Filters', 'act=op&code=bw'    ),
-							2 => array( 'Manage Emoticons', 'act=op&code=emo'   ),
-							3 => array( 'Manage Help Files', 'act=help'         ),
-							4 => array( 'Recount Statistics', 'act=op&code=count'    ),
-							
-						   ),
-						   
-				7 => array (
-							1 => array( '<b>Manage Skin Sets</b>' , 'act=sets'        ),
-							2 => array( '&#0124;-- Board Wrappers'   , 'act=wrap'        ),
-							3 => array( '&#0124;-- HTML Templates'   , 'act=templ'       ),
-							4 => array( '&#0124;-- Style Sheets'    , 'act=style'       ),
-							5 => array( '&#039;-- Macros'           , 'act=image'       ),
-							6 => array( 'Import Skin files'       , 'act=import'      ),
-							7 => array( 'Skin Version Control'    , 'act=skinfix'      ),
-							
-						   ),
-						   
-				8 => array (
-							1 => array( 'Manage Languages' , 'act=lang'             ),
-							2 => array( 'Import a Language', 'act=lang&code=import' ),
-						   ),
-						   
-				9 => array (
-							1 => array( 'Registration Stats' , 'act=stats&code=reg'   ),
-							2 => array( 'New Topic Stats'    , 'act=stats&code=topic' ),
-							3 => array( 'Post Stats'         , 'act=stats&code=post'  ),
-							4 => array( 'Personal Message'    , 'act=stats&code=msg'   ),
-							5 => array( 'Topic Views'        , 'act=stats&code=views' ),
-						   ),
-						   
-				10 => array (
-							1 => array( 'mySQL Toolbox'   , 'act=mysql'           ),
-							2 => array( 'mySQL Back Up'   , 'act=mysql&code=backup'    ),
-							3 => array( 'SQL Runtime Info', 'act=mysql&code=runtime'   ),
-							4 => array( 'SQL System Vars' , 'act=mysql&code=system'    ),
-							5 => array( 'SQL Processes'   , 'act=mysql&code=processes' ),
-						   ),
-				
-				11 => array(
-							1 => array( 'View Moderator Logs', 'act=modlog'    ),
-							2 => array( 'View Admin Logs'    , 'act=adminlog'  ),
-							3 => array( 'View Email Logs'    , 'act=emaillog'  ),
-							4 => array( 'View Bot Logs'      , 'act=spiderlog' ),
-							5 => array( 'View Warn Logs'     , 'act=warnlog'   ),
-						   ),
-			   );
-			   
-			   
-$CATS = array (   
-				  //0 => "IPS Services",
-				  1 => "IPB Enhancements",
-				  2 => "System Settings",
-			      3 => 'Forum Control',
-			      4 => 'Forum Moderation',
-				  5 => 'Users and Groups',
-				  6 => 'Administration',
-				  7 => 'Skins & Templates',
-				  8 => 'Languages',
-				  9 => 'Statistic Center',
-				  10 => 'SQL Management',
-				  11 => 'Board Logs',
-			  );
-			  
-$DESC = array (
-				 // 0 => "Get IPS latest news, documentation, request support, purchase extra services and more...",
-				  1 => "Set up and manage your IPB plug in services",
-				  2 => "Edit forum settings such as cookie paths, security features, posting abilities, etc",
-				  3 => "Create, edit, remove and re-order categories, forums and moderators",
-				  4 => "Access the moderators CP and manage topic multi-moderation",
-				  5 => "Edit, register, remove and ban members. Set up member titles and ranks. Manage User Groups and moderated registrations",
-				  6 => "Manage Help Files, Bad Word Filters and Emoticons",
-				  7 => "Manage templates, skins, colours and images.",
-				  8 => "Manage language sets",
-				  9 => "Get registration and posting statistics",
-				  10 => "Manage your SQL database; repair, optimize and export data",
-				  11 => "View admin, moderator and email logs (Root admin only)",
-			  );
-			  
-			  
-?>
\ No newline at end of file
diff --git a/upload/sources/Admin/skin_info.php b/upload/sources/Admin/skin_info.php
deleted file mode 100644
index 9768c28a..00000000
--- a/upload/sources/Admin/skin_info.php
+++ /dev/null
@@ -1,582 +0,0 @@
-<?php
-
-
-$css_names = array(
-
-'BODY' => "Web Page Body",
-'TABLE, TR, TD' => "Default table",
-'a:link, a:visited, a:active' => "Default link",
-'a:hover' => "Default link hover",
-'.googlebottom, .googlebottom a:link, .googlebottom a:visited, .googlebottom a:active' => "Simple Search Results: Dark",
-'.googlish, .googlish a:link, .googlish a:visited, .googlish a:active' => "Simple Search Results: Topic Link",
-'.googlesmall, .googlesmall a:link, .googlesmall a:active, .googlesmall a:visited' => "Simple Search Results: Small Text",
-'option.sub' => "Search Form: Select forums box: subcat colour",
-'.caldate' => "Calendar: Date",
-'#ucpmenu' => "User CP: Menu colour",
-'#ucpcontent' => "User CP: Content colour",
-'#logostrip'  => "Board Header: Logo Strip",
-'#submenu' => "Board Header: Icon Strip",
-'#submenu a:link, #submenu a:visited, #submenu a:active' => "Board Header: Icon Strip link colours",
-'#userlinks' => "Board Header: Member Bar",
-'.activeuserstrip' => 'Forums & Topics: Active users bar',
-'.pformstrip'      => 'Global: Sub heading',
-'.pformleft'       => 'Global: left side table cell',
-'.pformleftw'      => 'Global: left side table cell wide',
-'.pformright'      => 'Global: right side table cell',
-'.post1'           => 'Post View: Alt colour #1',
-'.post2'		   => 'Post View: Alt colour #2',
-'.postlinksbar'     => 'Post View: Track topic, etc links',
-'.row1'			  => 'Global: Alt row #1',
-'.row2'			  => 'Global: Alt row #2',
-'.row3'			  => 'Global: Alt row #3',
-'.row4'			  => 'Global: Alt row #4',
-'.darkrow1'		  => 'Global: Alt dark row #1',
-'.darkrow2'		  => 'Global: Alt dark row #2',
-'.darkrow3'		  => 'Global: Alt dark row #3',
-'.hlight'		  => 'Msgr: Inbox row selected',
-'.dlight'		  => 'Msgr: Inbox row not selected',
-'.titlemedium'	  => 'Global: Sub heading (minor)',
-'.titlemedium a:link, .titlemedium a:visited, .titlemedium a:active' =>'Global: Sub heading (minor) Links',
-'.maintitle'     => 'Global: Main table heading',
-'.maintitle a:link, .maintitle a:visited, .maintitle a:active' => 'Global: Main table heading Links',
-'.plainborder'   => 'Global: Table alt #1',
-'.tableborder'   => 'Global: Table cellspacing colour',
-'.tablefill'     => 'Global: Table alt #2',
-'.tablepad'		 => 'Global: Table alt #3',
-'.desc'			 => 'Forum View: Last post info',
-'.signature'	 => 'Post View: Signature',
-'.normalname'	 => 'Post View: Member name (reg)',
-'.unreg'		 => 'Post View: Unreg name',
-'.searchlite'    => 'Global: Search highlighting',
-'#QUOTE'         => 'Quote Box',
-'#CODE'		     => 'Code Box',
-
-);
-
-$skin_names = array(
-
-					 'skin_boards'  => array(
-					 						   'Board Index Sections',
-					 						   'Elements for the board index listing (shows you all the forums and is the first page you see when visiting the board) such as
-					 						   forum link HTML, active user overview HTML, board statistics overview HTML, today\'s birthdays overview HTML',
-					 						),
-					 						
-					 'skin_buddy'   => array(
-					 							'myAssistant Sections',
-					 							'Elements for the myAssistant feature, including links and search boxes',
-					 						),
-					 'skin_calendar'=> array(
-					 							'Calendar Sections',
-					 							'Elements for the calendar, including calendar view, view events',
-					 						),
-					 'skin_emails'  => array(
-					 							'Member Contact Sections',
-					 							'Elements from various contact methods, such as ICQ, AIM pager, email form and report post to moderator form',
-					 						),
-					 'skin_forum'   => array(
-					 							'Forum Index Sections',
-					 							'Elements for forum view (list all topics in forum). Includes forum log in window, forum rules',
-					 						),
-					 'skin_global'  => array(
-					 							'Global HTML elements',
-					 							'Various HTML elements such as board header, redirect page, error page',
-					 						),
-					 'skin_help'	=> array(	
-					 							'Help Sections',
-					 							'Elements for the help screen, including search boxes and view help files',
-					 						),
-					 'skin_legends' => array(
-					 							'Board Legends Sections',
-					 							'Elements for the "view all emoticons" windows, and the "Find User" sections',
-					 						),
-					 'skin_login'   => array(
-					 							'Log In Sections',
-					 							'Elements for the log in form',
-					 						),
-					 'skin_mlist'   => array(
-					 							'Member List Sections',
-					 							'Elements for the member list views',
-					 						),
-					 'skin_mod'		=> array(
-					 							'Moderator Function Sections',
-					 							'Elements for the moderator tools such as delete topic, edit topic and the moderator CP sections',
-					 						),
-					 'skin_msg'     => array(
-					 							'Messenger Sections',
-					 							'Elements for the messenger, such as view inbox, view message, archive messages, etc',
-					 						),
-					 'skin_online'  => array (
-					 							'Online List Sections',
-					 							'Elements for the "Show all online users" link',
-					 						),
-					 'skin_poll'    => array (
-					 							'View Poll Sections',
-					 							'Elements for the poll view, includes vote form and vote results',
-					 						),
-					 'skin_post'    => array(
-					 							'Post Screen Sections',
-					 							'Elements for the post screens such as new topic, reply to topic, quote post, edit post, some messenger new PM sections, some calender new event sections',
-					 						),
-					 'skin_printpage'=> array(
-					 							'Printable Topic Sections',
-					 							'Elements for displaying the "printable topic" page',
-					 						),
-					 'skin_profile'	=> array(
-					 							'Profile View Sections',
-					 							'Elements for viewing a members profile',
-					 						),
-					 'skin_register' => array(
-					 							'Register Sections',
-					 							'Elements for the register form, validate account form and COPPA forms',
-					 						),
-					 'skin_search'   => array(
-					 							'Search Sections',
-					 							'Elements for the search forum and the results view',
-					 						),
-					 'skin_stats'    => array(
-					 							'Statistics Section',
-					 							'Elements for various functions such as "View Moderating Team", "View todays top 10 posts", "View Active Topics"',
-					 						),
-					 'skin_topic'	 => array(
-					 							'Topic View Section',
-					 							'Elements for the topic view screen, such as post view, inline attachment view, etc.',
-					 						),
-					 
-					 'skin_modcp'	 => array(
-					 							'Mod CP Section',
-					 							'Elements for the moderators control panel sections.',
-					 						),
-					 						
-					 'skin_csite'	 => array(
-					 							'IP Dynamic Lite',
-					 							'Elements for IP Dynamic Lite.',
-					 						),
-					 						
-					 						
-					 'skin_ucp'      => array(
-					 							'User Control Panel Section',
-					 							'Elements for the user control panel, such as the menu (also used in Messenger Views), edit profile, edit signature, edit avatar, etc.',
-					 						)
-);
-
-
-$bit_names['skin_boards'] = array(
-
-
-'PageTop'            => '1: Board Index Page Top',
-'newslink'           => '2: Latest News Link',
-'CatHeader_Expanded' => '3: Start Category Table',
-'ForumRow'           => '4: +-- Board Index Forum Row',
-'forum_redirect_row'       => '5: +-- Board Index Redirect Forum Row',
-'subforum_img_with_link'   => '6: +-- ---- Mark forum as read (subforum) post marker',
-'forum_img_with_link'      => '7: +-- ---- Mark forum as read post marker',
-'forumrow_lastunread_link' => '8: +-- ---- Forum Row - Last unread link',
-'subheader'          => '9: +-- Sub Forum Row',
-'end_this_cat'       => '10: +-- End Category Row',
-'end_all_cats'       => '11: End Category Table',
-'BoardInformation'   => '12: Page Bottom Links - Moderating Team,etc',
-'quick_log_in'       => '13: Quick Log In Box',
-'stats_header'       => '14: Start Board Statistics Table',
-'ActiveUsers'        => '15: +-- Active Users Row',
-'active_list_sep'	 => '16: +-- Active list character seperator',
-'active_user_links'  => '17: +-- Active User Links',
-'bottom_links'		 => '18: +-- Page Bottom Links',
-'birthdays'          => '19: +-- Members Birthdays Row',
-'calendar_events'    => '20: +-- Forthcoming Calendar Events Row',
-'ShowStats'          => '21: +-- Board Stats: Posts, Topics, etc Row',
-'stats_footer'       => '22: End Board Statistics Table',
-);
-
-$bit_names['skin_buddy'] = array (
-'buddy_js'			 => '1: myAssistant Javascript source',
-'build_away_msg'	 => '2: New posts and topics info',
-'append_view'		 => '3: Javascript redirect link wrapper',
-'main'				 => '4: Main myAssistant HTML',
-'login'				 => '5: Not logged in HTML',
-'closelink'			 => '6: Close window links',
-);
-
-$bit_names['skin_calendar'] = array (
-'cal_main_content'     => '1: Main Month Display HTML',
-'cal_birthday_start'   => '2: +-- Start Birthday Entry',
-'cal_birthday_entry'   => '3: +-- Birthday Entry Link',
-'cal_birthday_end'	   => '4: End Birthday Entry',
-'cal_edit_button'	   => '5: Edit Entry Button',
-'cal_page_events_start'=> '6: Start Event Page',
-'cal_show_event'       => '7: +-- Show Event Page',
-'cal_events_end'	   => '8: End Day Events',
-'cal_date_cell_today'  => '9: Today\'s Calendar Cell',
-'cal_date_cell'		   => '10: Date Cell',
-'cal_blank_cell'	   => '11: Blank Cell',
-'cal_events_start'	   => '12: Cell Start Event Entry',
-'cal_events_wrap'      => '13: Event cell wrap',
-'cal_day_bit'		   => '14: Top Bar Weekday Name',
-'cal_new_row'		   => '15: Start New Calendar Row',
-);
-
-$bit_names['skin_emails'] = array(
-'pager_header'			=> '1: Pop-up Header',
-'yahoo_body'			=> '2: +-- Yahoo Body',
-'msn_body'				=> '3: +-- MSN Body',
-'aol_body'				=> '4: +-- AIM Body',
-'icq_body'				=> '5: +-- ICQ Body',
-'end_table'				=> '6: End Table',
-'report_form'			=> '7: Report this post form',
-'send_form'				=> '8: Send Email form',
-'show_address'			=> '9: Show email address',
-'forward_form'			=> '10: Forward Topic form',
-'forum_jump'			=> '11: Forum Jump',
-'sent_screen'			=> '12: Email sent screen'
-);
-$bit_names['skin_forum'] = array(
-'page_title'			=> '1: Page Title',
-'show_rules'			=> '2: Forum Rules Page',
-'show_rules_full'		=> '3: Show Forum Rules Full',
-'show_rules_link'		=> '4: Forum Rules Link',
-'PageTop'				=> '5: Forum Page Header',
-'render_pinned_start'	=> '6: +-- Important Topics Title Start',
-'render_pinned_row'		=> '7: +-- Pinned Topic Entry',
-'render_pinned_end'		=> '8: +-- Important Topics Title End',
-'RenderRow'				=> '9: +-- Normal Topic Entry',
-'forum_active_users'	=> '10: +-- Users Browsing Forum Box',
-'TableEnd'				=> '11: Forum Page End',
-'show_sub_link'			=> '12: Subscribe to Forum Link',
-'show_no_matches'		=> '13: No Topics to Display Message',
-'Forum_log_in'			=> '14: Forum Log In Page',
-'who_link'				=> '15: Who Posted? Link',
-);
-$bit_names['skin_global'] = array(
-'BoardHeader'				=> '1: Board Header (logo, links, etc)',
-'ibf_banner'				=> '2: +--IPS Hosting Banner (not activated)',
-'Member_bar'				=> '3: +--Member Bar WITH Messenger Links',
-'Member_no_usepm_bar'		=> '4: +--Member Bar NO Messenger Links',
-'Guest_bar'					=> '5: +--Guest Bar',
-'admin_link'				=> '6: +--Link to Admin CP',
-'mod_link'					=> '7: +--Link to Mod CP',
-'start_nav'					=> '8: +--Navigation Start',
-'end_nav'					=> '9: +--Navigation End',
-'Error'						=> '10: Error Page',
-'error_log_in'				=> '11: Error Page Log in Box',
-'board_offline'				=> '12: Offline Board Message',
-'PM_popup'					=> '13: New PM Pop up Javascript',
-'Redirect'					=> '14: Redirect Page',
-);
-$bit_names['skin_help'] = array (
-'start'		=> '1: Start Help Page',
-'display'   => '2: Show Help Page',
-'row'		=> '3: Show Help Topic Title',
-'no_results' => '4: No Help Search Results',
-'end'		 => '5: End Help Page',
-);
-$bit_names['skin_legends'] = array(
-'page_header'		=> '1: Page Header',
-'find_user_one'		=> '2: Find User Form',
-'find_user_error'	=> '3: Find User Error',
-'find_user_final'	=> '4: Find User Result',
-'emoticon_javascript' => '5: Emoticons Javascript',
-'emoticons_row'		  => '6: Emoticons Row',
-'page_footer'		  => '7: Page Footer'
-);
-$bit_names['skin_login'] = array(
-'ShowForm'		=> '1: Log In Form',
-'errors'		=> '2: Log In Errors Box',
-'ShowLogOutForm' => '3: Log Out Form (no longer used)'
-);
-$bit_names['skin_mlist'] = array(
-'start'			=> '1: Start Page',
-'Page_header'	=> '2: Page Header',
-'show_row'		=> '3: +-- Member List Row',
-'no_results'	=> '4: +-- No Results',
-'Page_end'		=> '5: Page Footer',
-'end'			=> '6: End Page',
-);
-$bit_names['skin_mod'] = array(
-'table_top'					=> "1: Start Table",
-'mod_exp'					=> "2: Action Explanation",
-'move_form'					=> "3: Move Topic Form",
-'merge_body'				=> "4: Merge Topics Form",
-'split_body'				=> "5: Split Topic Form",
-'split_row'					=> "6: +-- Split Topics Post Row",
-'split_end_form'			=> "7: Split Topic End Form",
-'poll_select_form'			=> "8: Edit Poll: Form",
-'poll_entry'				=> "9: Edit Poll: Poll Choice Row",
-'topictitle_fields'			=> "10: Edit Topic Title",
-'end_form'					=> "11: End Form",
-'delete_js'					=> "12: Delete Javascript",
-'topic_history'				=> "13: Topic History Table",
-'mod_log_start'				=> "14: Mod Logs: Start Entries",
-'mod_log_none'				=> "15: +-- Mod Logs: No Entries",
-'mod_log_row'				=> "16: +-- Mod Logs: Entry",
-'mod_log_end'				=> "17: Mod Logs: End Entries",
-'forum_jump'				=> "18: Forum Jump",
-);
-$bit_names['skin_modcp'] = array (
-'splash'					=> "0: Depreciated (Not Used)",
-'mod_cp_start'				=> "1: Mod CP Start",
-'modpost_topicentry'		=> "2: Mod Q: Topic Entry",
-'modtopics_end'				=> "3: Mod Q: Topics: End",
-'mod_topic_title'			=> "4: Mod Q: Topic Title",
-'mod_postentry'				=> "5: Mod Q: Post Entry",
-'mod_postentry_checkbox'	=> "6: Mod Q: Post Entry check box",
-'mod_topic_spacer'			=> "7: Mod Q: Topic Spacer",
-'modpost_topicstart'		=> "8: Mod Q: Post: Topic Start",
-'modtopicview_start'		=> "9: Mod Q: Topic: Start",
-'modtopics_start'			=> "10: Mod Q: Topics Overview Start",
-'modpost_topicend'			=> "11: Mod Q: Post :Topic End",
-'prune_confirm'				=> "12: Prune Posts: Confirm Box",
-'prune_splash'				=> "13: Prune Posts: Main Form",
-'ip_start_form'				=> "14: IP Search: Start Form",
-'ip_post_results'			=> "15: IP Post Entry",
-'ip_member_start'			=> "16: IP Member Start",
-'ip_member_row'				=> "17: IP Member Row",
-'ip_member_end'				=> "18: IP Member End",
-'find_user'					=> "19: Find User: I",
-'find_two'					=> "20: Find User: II",
-'edit_user_form'			=> "21: Edit User Form",
-'results'					=> "22: Result Screen",
-'mod_simple_page'			=> "23: Display Error/Result Box",
-'start_topics'				=> "24: Topic View: Start",
-'topic_row'					=> "25: Topic View: Entry",
-'show_no_topics'			=> "26: Topic View: None Found",
-'topics_end'				=> "27: Topic View: End",
-'cat_row'					=> "28: Category Row",
-'forum_page_start'			=> "29: Forum View Start",
-'forum_row'					=> "30: Forum View Entry",
-'forum_page_end'			=> "31: Forum View End",
-'move_checked_form_start'	=> "32: Move Form Start",
-'move_checked_form_entry'   => "33: Move Form Entry",
-'move_checked_form_end'		=> "34: Move Form End",
-'mod_exp'					=> "35: Action Explanation",
-'end_form'					=> "36: End Form",
-);
-
-$bit_names['skin_msg']		= array(
-'Address_header'			=> "1: Address Book: Header",
-'Address_table_header'		=> "2: +-- Address Book: Table Header",
-'address_add'				=> "3: +-- Address Book: Add Entry",
-'address_edit'				=> "4: +-- Address Book: Edit Entry",
-'render_address_row'		=> "5: +-- Address Book: Show Entry",
-'Address_none'				=> "6: +-- Address Book: No Entries",
-'end_address_table'			=> "7: Address Book: Footer",
-'archive_html_header'		=> "8: Archive PM: Header",
-'archive_form'				=> "9: +-- Archive PM: Form",
-'archive_complete'			=> "10: +-- Archive PM: Success Page",
-'archive_html_entry'		=> "11: +-- Archive PM: HTML Entry",
-'archive_html_footer'		=> "12: Archive PM: HTML Entry Footer",
-'unsent_table_header'		=> "13: Unsent PM: Table Header",
-'unsent_row'				=> "14: +-- Unsent PM: Entry",
-'unsent_end'				=> "15: Unsent PM: End",
-'trackUNread_table_header'  => "16: Track: Unread: Header",
-'trackUNread_row'			=> "17: +-- Track: Unread: Entry",
-'trackUNread_end'			=> "18: Track: Unread: End",
-'trackread_table_header'	=> "19: Track: Read: Header",
-'trackread_row'				=> "20: +-- Track: Read: Entry",
-'trackread_end'				=> "21: Track: Read: End",
-'inbox_table_header'		=> "22: Msg List: Inbox Header",
-'No_msg_inbox'				=> "23: +-- Msg List: No Entries",
-'inbox_row'					=> "24: +-- Msg List: PM Entry",
-'end_inbox'					=> "25: Msg List: End InBox",
-'prefs_header'				=> "26: Folders: Header",
-'prefs_row'					=> "27: +-- Folders: Entry",
-'prefs_add_dirs'			=> "28: +-- Folders: Add Folder Entry",
-'prefs_footer'				=> "29: Folders: Footer",
-'send_form_header'			=> "30: Send PM: Header",
-'Send_form'					=> "31: +-- Send PM: Main Form",
-'preview'					=> "32: +-- Send PM: Preview Message Box",
-'pm_errors'					=> "33: +-- Send PM: Error Box",
-'mass_pm_box'				=> "34: +-- Send PM: BCC Box",
-'send_form_footer'			=> "35: Send PM: Form Footer",
-'Render_msg'				=> "36: Show Received PM",
-'pm_popup'					=> "37: New Messages POP UP HTML",
-);
-$bit_names['skin_online'] = array(
-'end'						=> "0: Depreciated (Not Used)",
-'Page_header'				=> "1: Header",
-'show_row'					=> "2: Entry",
-'Page_end'					=> "3: Footer",
-);
-$bit_names['skin_poll'] = array(
-'ShowPoll_header'			=> "1: Show Poll: Header",
-'ShowPoll_Form_header'		=> "2: Show Poll: Form Header",
-'Render_row_results'		=> "3: Show Poll: Result Row",
-'Render_row_form'			=> "4: Show Poll: Choice Radio Button",
-'ShowPoll_footer'			=> "5: Show Poll: Footer",
-'delete_link'				=> "6: Delete Link",
-'edit_link'					=> "7: Edit Link",
-);
-$bit_names['skin_post'] = array(
-
-'calendar_start_edit_form'	=> "1: Calendar: Start Edit Form",
-'calendar_event_title'		=> "2: +-- Calendar: Event Title",
-'calendar_start_form'		=> "3: +-- Calendar: New Event Start Form",
-'calendar_delete_box'		=> "4: +-- Calendar: Delete Box",
-'calendar_choose_date'		=> "5: +-- Calendar: Choose Date",
-'calendar_admin_group_box'	=> "6: +-- Calendar: Admin Group Box",
-'calendar_event_type'		=> "7: +-- Calendar: Event Type",
-'calendar_end_form'			=> "8: Calendar: End Form",
-'TopicSummary_top'			=> "9: Post: Topic Summary Start",
-'TopicSummary_body'			=> "10: +-- Post: Topic Summary Body",
-'TopicSummary_bottom'		=> "11: Post: Topic Summary End",
-'table_structure'			=> "12: Post: Table Structure",
-'table_top'					=> "13: Post: Table Top",
-'preview'					=> "14: +-- Post: Preview Box",
-'errors'					=> "15: +-- Post: Errors Box",
-'nameField_unreg'			=> "16: +-- Post: Guest Name Fields",
-'nameField_reg'				=> "17: +-- Post: Registered Member Name Fields",
-'postbox_buttons'			=> "18: +-- Post: Code Buttons & Post Text area",
-'PostIcons'					=> "19: +-- Post: Post Icons Box",
-'topictitle_fields'			=> "20: +-- Post: Topic Title Fields",
-'Upload_field'				=> "21: +-- Post: Upload Field",
-'edit_upload_field'			=> "22: +-- Post: Edit Upload Field",
-'add_edit_box'				=> "23: +-- Post: Append Edited By.. checkbox",
-'mod_options'				=> "24: +-- Post: Mod Options Drop Down",
-'quote_box'					=> "25: +-- Post: Quote Text area",
-'smilie_table'				=> "26: +-- Post: Smilie Box",
-'EndForm'					=> "27: Post: End Form",
-'poll_box'					=> "28: Poll: Options Text area",
-'pm_postbox_buttons'		=> "29: PM: Code Buttons & msg Text area",
-);
-$bit_names['skin_printpage'] = array(
-'pp_header'					=> "1: Start Page",
-'pp_postentry'				=> "2: Post Entry",
-'pp_end'					=> "3: End Page",
-'choose_form'				=> "4: Client Choose Form",
-);
-$bit_names['skin_profile'] = array(
-'show_profile'				=> "1: Member Profile Page",
-'user_edit'					=> "2: User Edit Links",
-'custom_field'				=> "3: Custom Field",
-);
-$bit_names['skin_register'] = array(
-'show_authorise'			=> "1: Reg. Complete, Authorise Needed Msg",
-'show_preview'				=> "2: Reg. Complete, Admin Authorise Msg",
-'errors'					=> "3: Errors Box",
-'ShowForm'					=> "4: Main Registration Form",
-'reg_antispam'				=> "5: Reg Flood Bot Code Box",
-'optional_title'			=> "6: Custom Fields Start",
-'field_entry'				=> "7: Custom Fields Entry",
-'field_textarea'			=> "8: Custom Fields Textarea",
-'field_textinput'			=> "9: Custom Fields Input",
-'field_dropdown'			=> "10: Custom Fields Drop Down",
-'coppa_start'				=> "11: COPPA Start",
-'coppa_two'					=> "12: COPPA Middle",
-'coppa_form'				=> "13: COPPA Form",
-'lost_pass_form'			=> "14: Lost Password Form",
-'show_dumb_form'			=> "15: User Validate Account Form",
-);
-$bit_names['skin_search']  = array(
-'Form'						=> "1: Main Search Form",
-'RenderRow'					=> "2: Results: Topic Row",
-'RenderPostRow'				=> "3: Results: Post Row",
-'end'						=> "4: Results: End Page",
-'end_as_post'				=> "5: Results: End Post Page",
-'start'						=> "6: Results: Start Page",
-'start_as_post'				=> "7: Results: Post Start",
-'active_start'				=> "8: Active Topics Start",
-'active_none'				=> "9: Active Topics No Results",
-);
-$bit_names['skin_stats'] = array(
-'page_title'				=> "1: Page Title",
-'who_header'				=> "2: Who Posted? Header",
-'who_row'					=> "3: Who Posted? Entry",
-'who_name_link'				=> "4: Who Posted? Name Link",
-'who_end'					=> "5: Who Posted? End",
-'leader_row'				=> "6: Forum Leaders: Entry",
-'group_strip'				=> "7: Forum Leaders: Group Row",
-'close_strip'				=> "8: Forum Leaders: Group Close",
-'top_poster_header'			=> "9: Top Poster: Header",
-'top_poster_no_info'		=> "10: Top Poster: No Results",
-'top_poster_row'			=> "11: Top Poster: Entry",
-'top_poster_footer'			=> "12: Top Poster: Footer",
-);
-$bit_names['skin_topic'] = array(
-'PageTop'					=> "1: Header",
-'golastpost_link'			=> "2: Go to Last Post Link",
-'RenderRow'					=> "3: Post Entry",
-'Show_attachments_img'		=> "4: Attachments: Show Image",
-'Show_attachments'			=> "5: Attachments: Show Link Box",
-'report_link'				=> "6: Report This Post Link",
-'ip_show'					=> "7: IP Address Show/Link",
-'topic_active_users'		=> "8: Users Browsing This Topic Box",
-'email_options'				=> "9: Subscribe/Track Links",
-'Mod_Panel'					=> "10: Mod Options Drop Down",
-'mod_wrapper'				=> "11: Mod Options Entry",
-'TableFooter'				=> "12: Footer",
-);
-$bit_names['skin_ucp']		= array(
-'personal_splash_av'		=> "0: Depreciated (Not Used)",
-'personal_splash'			=> "0: Depreciated (Not Used)",
-'Menu_bar'					=> "1: Side Menu Links",
-'splash'					=> "2: UCP Home",
-'signature'					=> "3: Signature Edit / Preview",
-'pass_change'				=> "4: Password Change Section",
-'personal_panel'			=> "5: Profile Form: Main",
-'field_entry'				=> "6: Profile Form: Custom Profile Entry",
-'field_textarea'			=> "7: Profile Form: Custom Profile Textarea",
-'field_textinput'			=> "8: Profile Form: Custom Profile Text Input",
-'field_dropdown'			=> "9: Profile Form: Custom Profile DropDown",
-'required_title'			=> "10: Profile Form: Required Fields Title",
-'member_title'				=> "11: Profile Form: Member Title Field",
-'birthday'					=> "12: Profile Form: Birthday Fields",
-'email_change'				=> "13: Email Change Form",
-'personal_avatar'			=> "14: Avatar Options Main",
-'personal_avatar_URL'		=> "15: Avatar Options URL",
-'avatar_upload_field'		=> "16: Avatar Options Upload",
-'personal_avatar_end'		=> "17: Avatar Options End",
-'forum_subs_header'			=> "18: Forum Subscriptions: Header",
-'forum_subs_row'			=> "19: Forum Subscriptions: Entry",
-'forum_subs_none'			=> "20: Forum Subscriptions: No Entries",
-'forum_subs_end'			=> "21: Forum Subscriptions: End",
-'subs_header'				=> "22: Topic Subscriptions: Header",
-'subs_row'					=> "23: Topic Subscriptions: Entry",
-'subs_none'					=> "24: Topic Subscriptions: No Entries",
-'subs_forum_row'			=> "25: Topic Subscriptions: Forum Header",
-'subs_end'					=> "26: Topic Subscriptions: End",
-'skin_lang_header'			=> "27: Skins & Languages Header",
-'settings_skin'				=> "28: Skins & Languages Main",
-'skin_lang_end'				=> "29: Skins & Languages End",
-'settings_header'			=> "30: Board Settings Header",
-'settings_end'				=> "31: Board Settings End",
-'email'						=> "32: Email Options",
-'forum_jump'				=> "33: Forum Jump",
-'CP_end'					=> "34: End CP",
-);
-
-$bit_names['skin_csite'] = array(
-
-'csite_skeleton_template' => "1: MAIN TEMPLATE",
-'csite_css_external'      => "2: |-- Header; CSS External",
-'csite_css_inline'		  => "3: '-- Header; CSS Inline",
-
-'tmpl_welcomebox_member' => "4: Member's Welcome Box",
-'tmpl_welcomebox_guest'  => "5: Guest's Welcome Box",
-'tmpl_search'			 => "6: Search Box",
-'tmpl_sitenav'			 => "7: Site Nav. Box",
-
-'tmpl_onlineusers'		=> "8: Online Users Box",
-'tmpl_changeskin'		=> "9: Change Skin Box",
-'tmpl_affiliates'		=> "10: Affiliates / Recommended Sites Box",
-
-'tmpl_recentarticles'	=> "11: Recent Articles box",
-'tmpl_latestposts'      => "12: Latest Discussions box",
-
-'tmpl_poll_header'		=> "14: Poll; Poll Header",
-'tmpl_poll_choice_row'  => "15: |-- Poll; Choice entry & radiobutton",
-'tmpl_poll_result_row'  => "16: |-- Poll; Result row",
-'tmpl_poll_vote'        => "17: |-- Poll; Vote Button",
-'tmpl_poll_footer'      => "18: '-- Poll; Poll Footer",
-
-'tmpl_articles_row'     => "19: Articles; Article Entry",
-'tmpl_comment_link'     => "20: |-- Articles; Add Comment link",
-'tmpl_readmore_link'    => "21: '-- Articles; Read More link",
-
-'tmpl_debug'			=> "22: Debug Strip",
-'tmpl_topic_row'		=> "23: Topic format used for 'recent articles' and 'latest discussions'",
-'tmpl_links_wrap'		 => "24: Site Nav. Link Format",
-'csite_sep_char'		 => "25: Online Users; Separator",
-
-
-);
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Boards.php b/upload/sources/Boards.php
deleted file mode 100644
index 44a43694..00000000
--- a/upload/sources/Boards.php
+++ /dev/null
@@ -1,911 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Board index module
-|   > Module written by Matt Mecham
-|   > Date started: 17th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Boards;
-
-class Boards {
-
-    var $output   = "";
-    var $base_url = "";
-    var $html     = "";
-    var $forums   = array();
-    var $mods     = array();
-    var $cats     = array();
-    var $children = array();
-    var $nav;
-    
-    var $news_topic_id = "";
-    var $news_forum_id = "";
-    var $news_title    = "";
-    var $sep_char      = "";
-    
-    function Boards()
-    {
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
-        $this->base_url = $ibforums->base_url;
-
-        // Get more words for this invocation!
-        
-        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_boards', $ibforums->lang_id);
-        
-        $this->html = $std->load_template('skin_boards');
-        
-        $this->sep_char = trim( $this->html->active_list_sep() );
-        
-        if (! $ibforums->member['id'] )
-        {
-        	$ibforums->input['last_visit'] = time();
-        }
-        
-        $this->output .= $this->html->PageTop( $std->get_date( $ibforums->input['last_visit'], 'LONG' ) );
-        
-        // Get the forums and category info from the DB
-        
-        $last_c_id = -1;
-        
-        $DB->query("SELECT f.*, c.id as cat_id, c.position as cat_position, c.state as cat_state, c.name as cat_name, c.description as cat_desc,
-        		   c.image, c.url, m.member_name as mod_name, m.member_id as mod_id, m.is_group, m.group_id, m.group_name, m.mid
-        		   FROM ibf_forums f, ibf_categories c
-        		     LEFT JOIN ibf_moderators m ON (f.id=m.forum_id)
-        		   WHERE c.id=f.category
-        		   ORDER BY c.position, f.position");
-        		   
-        		   
-        while ( $r = $DB->fetch_row() )
-        {
-        	if ($last_c_id != $r['cat_id'])
-        	{
-        		$this->cats[ $r['cat_id'] ] = array( 'id'          => $r['cat_id'],
-        											 'position'    => $r['cat_position'],
-        											 'state'       => $r['cat_state'],
-        											 'name'        => $r['cat_name'],
-        											 'description' => $r['cat_desc'],
-        											 'image'       => $r['image'],
-        											 'url'         => $r['url'],
-        										   );
-        										   
-        		$last_c_id = $r['cat_id'];
-        	}
-        	
-        	if ($r['parent_id'] > 0)
-			{
-				$this->children[ $r['parent_id'] ][$r['id']] = $r;
-			}
-			else
-			{
-				$this->forums[ $r['id'] ] = $r;
-			}
-			
-			if ($r['mod_id'] != "")
-			{
-				$this->mods[ $r['id'] ][ $r['mid'] ] = array( 'name' => $r['mod_name'],
-															  'id'   => $r['mod_id'],
-															  'isg'  => $r['is_group'],
-															  'gname'=> $r['group_name'],
-															  'gid'  => $r['group_id'],
-															);
-			}
-        }
-        
-        //-----------------------------------
-        // What are we doing?
-        //-----------------------------------
-        
-        if ($ibforums->input['c'] != "")
-        {
-        	$this->show_single_cat();
-        	$this->nav[] = $this->cats[ $ibforums->input['c'] ]['name'];
-        }
-        else
-        {
-        	$this->process_all_cats();
-        }
-        
-        //*********************************************/
-		// Add in show online users
-		//*********************************************/
-		
-		$active = array( 'TOTAL'   => 0 ,
-						 'NAMES'   => "",
-						 'GUESTS'  => 0 ,
-						 'MEMBERS' => 0 ,
-						 'ANON'    => 0 ,
-					   );
-					   
-		$stats_html = "";
-		
-		if ($ibforums->vars['show_active'])
-		{
-			
-			if ($ibforums->vars['au_cutoff'] == "")
-			{
-				$ibforums->vars['au_cutoff'] = 15;
-			}
-			
-			// Get the users from the DB
-			
-			$cut_off = $ibforums->vars['au_cutoff'] * 60;
-			$time    = time() - $cut_off;
-			
-			
-			$DB->query("SELECT s.id, s.member_id, s.member_name, s.login_type, g.suffix, g.prefix
-			            FROM ibf_sessions s
-			              LEFT JOIN ibf_groups g ON (g.g_id=s.member_group)
-			            WHERE running_time > $time
-			            ORDER BY s.running_time DESC");
-			
-			// cache all printed members so we don't double print them
-			
-			$cached = array();
-			
-			while ($result = $DB->fetch_row() )
-			{
-				if ( strstr( $result['id'], '_session' ) )
-				{
-					if ( $ibforums->vars['spider_anon'] )
-					{
-						if ( $ibforums->member['mgroup'] == $ibforums->vars['admin_group'] )
-						{
-							$active['NAMES'] .= "{$result['member_name']}*{$this->sep_char} \n";
-						}
-					}
-					else
-					{
-						$active['NAMES'] .= "{$result['member_name']}{$this->sep_char} \n";
-					}
-				}
-				else if ($result['member_id'] == 0 )
-				{
-					$active['GUESTS']++;
-				}
-				else
-				{
-					if ( empty( $cached[ $result['member_id'] ] ) )
-					{
-						$cached[ $result['member_id'] ] = 1;
-						if ($result['login_type'] == 1)
-						{
-							if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
-							{
-								$active['NAMES'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*{$this->sep_char} \n";
-								$active['ANON']++;
-							}
-							else
-							{
-								$active['ANON']++;
-							}
-						}
-						else
-						{
-							$active['MEMBERS']++;
-							$active['NAMES'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>{$this->sep_char} \n";
-						}
-					}
-				}
-			}
-			
-			$active['NAMES'] = preg_replace( "/".preg_quote($this->sep_char)."$/", "", trim($active['NAMES']) );
-			
-			$active['TOTAL'] = $active['MEMBERS'] + $active['GUESTS'] + $active['ANON'];
-			
-			// Show a link?
-			
-			if ($ibforums->vars['allow_online_list'])
-			{
-				$active['links'] = $this->html->active_user_links();
-			}
-			
-			$ibforums->lang['active_users'] = sprintf( $ibforums->lang['active_users'], $ibforums->vars['au_cutoff'] );
-			
-			$stats_html .= $this->html->ActiveUsers($active, $ibforums->vars['au_cutoff']);
-		}
-			
-		//-----------------------------------------------
-		// Are we viewing the calendar?
-		//-----------------------------------------------
-		
-		if ($ibforums->vars['show_birthdays'])
-		{
-			
-			$a = explode( ',', gmdate( 'Y,n,j,G,i,s', time() + $std->get_time_offset() ) );
-		
-			$day   = $a[2];
-			$month = $a[1];
-			$year  = $a[0];
-			
-			$birthstring = "";
-			$count       = 0;
-			
-			$DB->query("SELECT id, name, bday_day as DAY, bday_month as MONTH, bday_year as YEAR 
-						FROM ibf_members WHERE bday_day=$day and bday_month=$month");
-			
-			while ( $user = $DB->fetch_row() )
-			{
-				$birthstring .= "<a href='{$this->base_url}showuser={$user['id']}'>{$user['name']}</a>";
-				
-				if ($user['YEAR'])
-				{
-					$pyear = $year - $user['YEAR'];  // $year = 2002 and $user['YEAR'] = 1976
-					$birthstring .= "(<b>$pyear</b>)";
-				}
-				
-				$birthstring .= $this->sep_char."\n";
-				
-				$count++;
-			}
-			
-			$birthstring = preg_replace( "/".$this->sep_char."$/", "", trim($birthstring) );
-			
-			$lang = $ibforums->lang['no_birth_users'];
-			
-			if ($count > 0)
-			{
-				$lang = ($count > 1) ? $ibforums->lang['birth_users'] : $ibforums->lang['birth_user'];
-				$stats_html .= $this->html->birthdays( $birthstring, $count, $lang  );
-			}
-			else
-			{
-				$count = "";
-				
-				if ( ! $ibforums->vars['autohide_bday'] )
-				{
-					$stats_html .= $this->html->birthdays( $birthstring, $count, $lang  );
-				}
-			}
-		}
-		
-		
-		//-----------------------------------------------
-		// Are we viewing the calendar?
-		//-----------------------------------------------
-		
-		if ($ibforums->vars['show_calendar'])
-		{
-		
-			if ($ibforums->vars['calendar_limit'] < 2)
-			{
-				$ibforums->vars['calendar_limit'] = 2;
-			}
-			
-			$our_unix         = time() + $std->get_time_offset();
-			$max_date         = $our_unix + ($ibforums->vars['calendar_limit'] * 86400);
-			
-			$DB->query("SELECT eventid, title, read_perms, priv_event, userid, unix_stamp
-			            FROM ibf_calendar_events WHERE unix_stamp > $our_unix and unix_stamp < $max_date ORDER BY unix_stamp ASC");
-			
-			$show_events = array();
-			
-			while ($event = $DB->fetch_row())
-			{
-				if ($event['priv_event'] == 1 and $ibforums->member['id'] != $event['userid'])
-				{
-					continue;
-				}
-				
-				//-----------------------------------------
-				// Do we have permission to see the event?
-				//-----------------------------------------
-				
-				if ( $event['read_perms'] != '*' )
-				{
-					if ( ! preg_match( "/(^|,)".$ibforums->member['mgroup']."(,|$)/", $event['read_perms'] ) )
-					{
-						continue;
-					}
-				}
-				
-				$c_time = date( 'j-F-y', $event['unix_stamp']);
-				
-				$show_events[] = "<a href='{$ibforums->base_url}act=calendar&amp;code=showevent&amp;eventid={$event['eventid']}' title='$c_time'>".$event['title']."</a>";
-			}
-			
-			$ibforums->lang['calender_f_title'] = sprintf( $ibforums->lang['calender_f_title'], $ibforums->vars['calendar_limit'] );
-			
-			if ( count($show_events) > 0 )
-			{
-				$event_string = implode( $this->sep_char.' ', $show_events );
-				$stats_html .= $this->html->calendar_events( $event_string  );
-			}
-			else
-			{
-				if ( ! $ibforums->vars['autohide_calendar'] )
-				{
-					$event_string = $ibforums->lang['no_calendar_events'];
-					$stats_html .= $this->html->calendar_events( $event_string  );
-				}
-			}
-		}
-		
-		//*********************************************/
-		// Add in show stats
-		//*********************************************/
-		
-		
-		if ($ibforums->vars['show_totals'])
-		{
-		
-			$DB->query("SELECT * FROM ibf_stats");
-			$stats = $DB->fetch_row();
-			
-			// Update the most active count if needed
-			
-			if ($active['TOTAL'] > $stats['MOST_COUNT'])
-			{
-				$DB->query("UPDATE ibf_stats SET MOST_DATE='".time()."', MOST_COUNT='".$active[TOTAL]."'");
-				$stats['MOST_COUNT'] = $active[TOTAL];
-				$stats['MOST_DATE']  = time();
-			}
-			
-			$most_time = $std->get_date( $stats['MOST_DATE'], 'LONG' );
-			
-			$ibforums->lang['most_online'] = str_replace( "<#NUM#>" ,   $std->do_number_format($stats['MOST_COUNT'])  , $ibforums->lang['most_online'] );
-			$ibforums->lang['most_online'] = str_replace( "<#DATE#>",                   $most_time                    , $ibforums->lang['most_online'] );
-			
-			$total_posts = $stats['TOTAL_REPLIES'] + $stats['TOTAL_TOPICS'];
-			
-			$total_posts        = $std->do_number_format($total_posts);
-			$stats['MEM_COUNT'] = $std->do_number_format($stats['MEM_COUNT']);
-			
-			$link = $ibforums->base_url."showuser=".$stats['LAST_MEM_ID'];
-			
-			$ibforums->lang['total_word_string'] = str_replace( "<#posts#>" , "$total_posts"          , $ibforums->lang['total_word_string'] );
-			$ibforums->lang['total_word_string'] = str_replace( "<#reg#>"   , $stats['MEM_COUNT']     , $ibforums->lang['total_word_string'] );
-			$ibforums->lang['total_word_string'] = str_replace( "<#mem#>"   , $stats['LAST_MEM_NAME'] , $ibforums->lang['total_word_string'] );
-			$ibforums->lang['total_word_string'] = str_replace( "<#link#>"  , $link                   , $ibforums->lang['total_word_string'] );
-			
-			$stats_html .= $this->html->ShowStats($ibforums->lang['total_word_string']);
-			
-		}
-		
-		if ($stats_html != "")
-		{
-			$this->output .= $this->html->stats_header();
-			$this->output .= $stats_html;
-			$this->output .= $this->html->stats_footer();
-		}
-		
-		//---------------------------------------
-		// Add in board info footer
-		//---------------------------------------
-		
-		$this->output .= $this->html->bottom_links();
-		
-		//---------------------------------------
-		// Check for news forum.
-		//---------------------------------------
-		
-		if ($this->news_title and $this->news_topic_id and $this->news_forum_id)
-		{
-			$t_html = $this->html->newslink( $this->news_forum_id, stripslashes($this->news_title) , $this->news_topic_id);
-			$this->output = str_replace( "<!-- IBF.NEWSLINK -->" , "$t_html" , $this->output );
-		}
-		
-		//---------------------------------------
-		// Display quick log in if we're not a member
-		//---------------------------------------
-		
-		if ($ibforums->member['id'] < 1)
-		{
-			$this->output = str_replace( "<!--IBF.QUICK_LOG_IN-->" , $this->html->quick_log_in() , $this->output );
-		}
-		
-		//---------------------------------------
-		// Showing who's chatting?
-		//---------------------------------------
-		
-		if ( $ibforums->vars['chat_account_no'] and $ibforums->vars['chat_who_on'] )
-		{
-			require_once( ROOT_PATH.'sources/lib/chat_functions.php' );
-			
-			$chat = new chat_functions();
-			
-			$chat->register_class( &$this );
-			
-			$chat_html = $chat->get_online_list();
-			
-			$this->output = str_replace( "<!--IBF.WHOSCHATTING-->", $chat_html, $this->output );
-		}
-		
-		//---------------------------------------
-		// Print as normal
-		//---------------------------------------
-
-        $print->add_output("$this->output");
-        
-        $cp = " (Powered by Invision Power Board)";
-        
-        if ($ibforums->vars['ips_cp_purchase'])
-        {
-        	$cp = "";
-        }
-        
-        $print->do_output( array( 'TITLE' => $ibforums->vars['board_name'].$cp, 'JS' => 0, 'NAV' => $this->nav ) );
-        
-	}
-
-    
-	//*********************************************/
-	//
-	// PROCESS ALL CATEGORIES
-	//
-	//*********************************************/
-	
-	function process_all_cats() {
-	
-		global $std, $DB, $ibforums;    
-        
-        foreach ($this->cats as $cat_id => $cat_data)
-        {
-        
-        	//----------------------------
-        	// Is this category turned on?
-        	//----------------------------
-        
-        	if ( $cat_data['state'] != 1 )
-        	{
-        		continue;
-        	}
-        
-            foreach ($this->forums as $forum_id => $forum_data)
-            {
-                if ($forum_data['category'] == $cat_id)
-                {
-                	//-----------------------------------
-                    // We store the HTML in a temp var so
-                    // we can make sure we have cats for
-                    // this forum, or hidden forums with a 
-                    // cat will show the cat strip - we don't
-                    // want that, no - we don't.
-                    //-----------------------------------
-                    
-                    $temp_html .= $this->process_forum($forum_id, $forum_data);
-                }
-            }
-            
-            if ($temp_html != "")
-            {
-            	$this->output .= $this->html->CatHeader_Expanded($cat_data);
-            	$this->output .= $temp_html;
-            	$this->output .= $this->html->end_this_cat();
-            }
-            
-            unset($temp_html);
-        }
-        
-        $this->output .= $this->html->end_all_cats();
-        
-    }
- 
- 
-	//*********************************************/
-	//
-	// SHOW A SINGLE CATEGORY
-	//
-	//*********************************************/   
-    
-	function show_single_cat() {
-	
-		global $std, $DB, $ibforums;    
-        
-        $cat_id = $ibforums->input['c'];
-        
-        if (!is_array( $this->cats[ $cat_id ] ) )
-        {
-        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
-        }
-        
-        $cat_data = $this->cats[ $cat_id ];
-        
-		//----------------------------
-		// Is this category turned on?
-		//----------------------------
-        
-		if ( $cat_data['state'] == 0 )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
-		}
-	
-		foreach ($this->forums as $forum_id => $forum_data)
-		{
-			if ($forum_data['category'] == $cat_id)
-			{
-				//-----------------------------------
-				// We store the HTML in a temp var so
-				// we can make sure we have cats for
-				// this forum, or hidden forums with a 
-				// cat will show the cat strip - we don't
-				// want that, no - we don't.
-				//-----------------------------------
-				
-				$temp_html .= $this->process_forum($forum_id, $forum_data);
-			}
-		}
-		
-		if ($temp_html != "")
-		{
-			$this->output .= $this->html->CatHeader_Expanded($cat_data);
-			$this->output .= $temp_html;
-			$this->output .= $this->html->end_this_cat();
-		}
-		else
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
-		}
-		unset($temp_html);
-	
-		$this->output .= $this->html->end_all_cats();
-    }
-    
-	//*********************************************/
-	//
-	// RENDER A FORUM
-	//
-	//*********************************************/   
-    
-    function process_forum($forum_id="", $forum_data="")
-    {
-    	global $std, $ibforums;
-    	
-    	
-    	if ($forum_data['subwrap'] == 1)
-    	{
-    	
-    		$printed_children = 0;
-    		$can_see_root = FALSE;
-    		
-    		//--------------------------------------
-    		// This is a sub cat forum...
-    		//--------------------------------------
-    		
-    		// Do we have any sub forums here?
-    		
-    		if ( (isset($this->children[ $forum_data['id'] ])) and (count($this->children[ $forum_data['id'] ]) > 0 ) )
-    		{
-    		
-    			// Are we allowed to see the postable forum stuff?
-    			
-    			if ($forum_data['sub_can_post'] == 1 and $forum_data['redirect_on'] != 1)
-    			{
-    				if ( $std->check_perms($forum_data['read_perms']) )
-					{
-						$forum_data['fid'] = $forum_data['id'];
-						$newest = $forum_data;
-						$can_see_root = TRUE;
-						
-						if (isset($forum_data['last_title']) and $forum_data['last_id'] != "")
-						{
-							if ( ( $ibforums->vars['index_news_link'] == 1 ) and (! empty($ibforums->vars['news_forum_id']) ) and ($ibforums->vars['news_forum_id'] == $forum_data['id']) )
-							{
-								
-							   $this->news_topic_id = $forum_data['last_id'];
-							   $this->news_forum_id = $forum_data['id'];
-							   $this->news_title    = $forum_data['last_title'];
-								
-							}
-						}
-					}
-					else
-					{
-						$newest = array();
-					}
-				}
-    		
-    			foreach($this->children[ $forum_data['id'] ] as $idx => $data)
-				{
-    				//--------------------------------------
-					// Check permissions...
-					//--------------------------------------
-					
-					if ( $std->check_perms($data['read_perms']) != TRUE )
-					{
-						continue;
-					}
-					
-					// Do the news stuff first
-					
-					if (isset($data['last_title']) and $data['last_id'] != "")
-					{
-						if ( ( $ibforums->vars['index_news_link'] == 1 ) and (! empty($ibforums->vars['news_forum_id']) ) and ($ibforums->vars['news_forum_id'] == $data['id']) )
-						{
-							
-						   $this->news_topic_id = $data['last_id'];
-						   $this->news_forum_id = $data['id'];
-						   $this->news_title    = $data['last_title'];
-							
-						}
-					}
-					
-					if ($data['last_post'] > $newest['last_post'])
-					{
-						
-						$newest['last_post']        = $data['last_post'];
-						$newest['fid']              = $data['id'];
-						//$newest['id']               = $data['id'];
-						$newest['last_id']          = $data['last_id'];
-						$newest['last_title']       = $data['last_title'];
-						$newest['password']         = $data['password'];
-						$newest['last_poster_id']   = $data['last_poster_id'];
-						$newest['last_poster_name'] = $data['last_poster_name'];
-						$newest['status']           = $data['status'];
-					}
-					
-					$newest['posts']  += $data['posts'];
-					$newest['topics'] += $data['topics'];
-					
-					$printed_children++;
-					
-				}
-				
-				if ( ($printed_children < 1) && ($can_see_root != TRUE) )
-				{
-					// If we don't have permission to view any forums
-					// and we can't post in this root forum
-					// then simply return and the row won't be printed
-					// 
-					
-					return "";
-					
-				}
-				
-				// Fix up the last of the data
-				
-				$newest['last_title'] = strip_tags($newest['last_title']);
-				$newest['last_title'] = str_replace( "&#33;" , "!" , $newest['last_title'] );
-				$newest['last_title'] = str_replace( "&quot;", "\"", $newest['last_title'] );
-				
-				if (strlen($newest['last_title']) > 30)
-				{
-					$newest['last_title'] = substr($newest['last_title'],0,27) . "...";
-					$newest['last_title'] = preg_replace( '/&(#(\d+;?)?)?(\.\.\.)?$/', '...', $newest['last_title'] );
-				}
-				if ($newest['password'] != "")
-				{
-					$newest['last_topic'] = $ibforums->lang['f_protected'];
-				}
-				else if($newest['last_title'] != "")
-				{
-					$newest['last_unread'] = $this->html->forumrow_lastunread_link($newest['fid'], $newest['last_id']);
-					$newest['last_topic'] = "<a href='{$ibforums->base_url}showtopic={$newest['last_id']}&amp;view=getnewpost' title='{$ibforums->lang['tt_gounread']}'>{$newest['last_title']}</a>";
-				}
-				else
-				{
-					$newest['last_topic'] = $ibforums->lang['f_none'];
-				}
-				
-				if ( isset($newest['last_poster_name']))
-				{
-					$newest['last_poster'] = $newest['last_poster_id'] ? "<a href='{$ibforums->base_url}showuser={$newest['last_poster_id']}'>{$newest['last_poster_name']}</a>"
-																       : $newest['last_poster_name'];
-				}
-				else
-				{
-					$newest['last_poster'] = $ibforums->lang['f_none'];
-				}
-				
-				$newest['img_new_post'] = $std->forum_new_posts($newest, $printed_children > 0 ? 1: 0);
-				
-				if ( $newest['img_new_post'] == '<{C_ON_CAT}>' )
-				{
-					$newest['img_new_post'] = $this->html->subforum_img_with_link($newest['img_new_post'], $forum_data['id']);
-				}
-			
-				$newest['last_post'] = $std->get_date($newest['last_post'], 'LONG');
-				
-				$newest['posts']  = $std->do_number_format($newest['posts']);
-				$newest['topics'] = $std->do_number_format($newest['topics']);
-				
-				foreach($newest as $k => $v)
-				{
-					if ($k == 'id')
-					{
-						continue;
-					}
-					$forum_data[$k] = $v;
-				}
-    			
-    			$forum_data['moderator'] = $this->get_moderators($forum_id);
-    			
-    			return $this->html->ForumRow($forum_data);
-    			
-    		}
-    		else
-    		{
-    			return "";
-    		}
-    	
-    	}
-    	else
-    	{
-    	
-			//--------------------------------------
-			// Check permissions...
-			//--------------------------------------
-			
-			if ( $std->check_perms($forum_data['read_perms']) != TRUE )
-			{
-				return "";
-			}
-			
-			//--------------------------------------
-			// Redirect only forum?
-			//--------------------------------------
-			
-			if ( $forum_data['redirect_on'] )
-			{
-				// Simply return with the redirect information
-				
-				if ( $forum_data['redirect_loc'] != "" )
-				{
-					$forum_data['redirect_target'] = " target='".$forum_data['redirect_loc']."' ";
-				}
-				
-				$forum_data['redirect_hits'] = $std->do_number_format($forum_data['redirect_hits']);
-				
-				return $this->html->forum_redirect_row($forum_data);
-				
-			}
-			
-			//--------------------------------------
-			// No - normal forum..
-			//--------------------------------------
-			
-			$forum_data['img_new_post'] = $std->forum_new_posts($forum_data);
-			
-			if ( $forum_data['img_new_post'] == '<{C_ON}>' )
-			{
-				$forum_data['img_new_post'] = $this->html->forum_img_with_link($forum_data['img_new_post'], $forum_data['id']);
-			}
-			
-			$forum_data['last_post'] = $std->get_date($forum_data['last_post'], 'LONG');
-						
-			$forum_data['last_topic'] = $ibforums->lang['f_none'];
-			
-			if (isset($forum_data['last_title']) and $forum_data['last_id'])
-			{
-			
-				if ( ( $ibforums->vars['index_news_link'] == 1 ) and (! empty($ibforums->vars['news_forum_id']) ) and ($ibforums->vars['news_forum_id'] == $forum_data['id']) )
-				{
-					
-				   $this->news_topic_id = $forum_data['last_id'];
-				   $this->news_forum_id = $forum_data['id'];
-				   $this->news_title    = $forum_data['last_title'];
-					
-				}
-				
-				$forum_data['last_title'] = strip_tags($forum_data['last_title']);
-				$forum_data['last_title'] = str_replace( "&#33;" , "!", $forum_data['last_title'] );
-				$forum_data['last_title'] = str_replace( "&quot;", "\"", $forum_data['last_title'] );
-					
-				if (strlen($forum_data['last_title']) > 30)
-				{
-					$forum_data['last_title'] = substr($forum_data['last_title'],0,27) . "...";
-					$forum_data['last_title'] = preg_replace( "/&(#(\d+;?)?)?\.\.\.$/", '...', $forum_data['last_title'] );
-				}
-				else
-				{
-					$forum_data['last_title'] = preg_replace( "/&(#(\d+?)?)?$/", '', $forum_data['last_title'] );
-				}
-				
-				if ($forum_data['password'] != "")
-				{
-					$forum_data['last_topic'] = $ibforums->lang['f_protected'];
-				}
-				else
-				{
-					$forum_data['last_unread'] = $this->html->forumrow_lastunread_link($forum_data['id'], $forum_data['last_id']);
-					$forum_data['last_topic']  = "<a href='{$ibforums->base_url}showtopic={$forum_data['last_id']}&amp;view=getnewpost' title='{$ibforums->lang['tt_gounread']}'>{$forum_data['last_title']}</a>";
-				}
-			}
-			
-							
-			if ( isset($forum_data['last_poster_name']))
-			{
-				$forum_data['last_poster'] = $forum_data['last_poster_id'] ? "<a href='{$ibforums->base_url}showuser={$forum_data['last_poster_id']}'>{$forum_data['last_poster_name']}</a>"
-																		   : $forum_data['last_poster_name'];
-			}
-			else
-			{
-				$forum_data['last_poster'] = $ibforums->lang['f_none'];
-			}
-	
-			//---------------------------------
-			// Moderators
-			//---------------------------------
-			
-			$forum_data['moderator'] = $this->get_moderators($forum_data['id']);
-			
-			$forum_data['posts']  = $std->do_number_format($forum_data['posts']);
-			$forum_data['topics'] = $std->do_number_format($forum_data['topics']);
-			
-			$forum_data['description'] = str_replace( "<br>", "<br />", $forum_data['description'] );
-			
-			return $this->html->ForumRow($forum_data);
-		
-		}
-                    
-	}
-	
-	//-------------------------------------
-	//
-	// Return mods for this forum in a 
-	// HTML formatted string
-	//
-	//-------------------------------------
-	
-	function get_moderators($forum_id="")
-	{
-		global $ibforums, $std, $DB;
-			
-		$mod_string = "";
-		
-		if ($forum_id == "")
-		{
-			return "";
-		}
-		
-		if (isset($this->mods[ $forum_id ] ) )
-		{
-			$mod_string = $ibforums->lang['forum_leader'].' ';
-			
-			if (is_array($this->mods[ $forum_id ]) )
-			{
-				foreach ($this->mods[ $forum_id ] as $moderator)
-				{
-					if ($moderator['isg'] == 1)
-					{
-						$mod_string .= "<a href='{$ibforums->base_url}act=Members&amp;max_results=30&amp;filter={$moderator['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0&amp;b=1'>{$moderator['gname']}</a>, ";
-					}
-					else
-					{
-						$mod_string .= "<a href='{$ibforums->base_url}showuser={$moderator['id']}'>{$moderator['name']}</a>, ";
-					}
-				}
-				
-				$mod_string = preg_replace( "!,\s+$!", "", $mod_string );
-				
-			}
-			else
-			{
-				if ($moderator['isg'] == 1)
-				{
-					$mod_string .= "<a href='{$ibforums->base_url}act=Members&amp;max_results=30&amp;filter={$this->mods[$forum_id]['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0&amp;b=1'>{$this->mods[$forum_id]['gname']}</a>, ";
-				}
-				else
-				{
-					$mod_string .= "<a href='{$ibforums->base_url}showuser={$this->mods[$forum_id]['id']}'>{$this->mods[$forum_id]['name']}</a>";
-				}
-			}
-		}
-		
-		return $mod_string;
-		
-	}
-    
-        
-}
-
-?>
diff --git a/upload/sources/Drivers/mySQL.php b/upload/sources/Drivers/mySQL.php
deleted file mode 100644
index be4314be..00000000
--- a/upload/sources/Drivers/mySQL.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > mySQL DB abstraction module
-|   > Module written by Matt Mecham
-|   > Date started: 14th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-
-class db_driver {
-
-    var $obj = array ( "sql_database"   => ""         ,
-                       "sql_user"       => "root"     ,
-                       "sql_pass"       => ""         ,
-                       "sql_host"       => "localhost",
-                       "sql_port"       => ""         ,
-                       "persistent"     => "0"         ,
-                       "sql_tbl_prefix"        => "ibf_"      ,
-                       "cached_queries" => array(),
-                       'debug'          => 0,
-                     );
-                     
-     var $query_id      = "";
-     var $connection_id = "";
-     var $query_count   = 0;
-     var $record_row    = array();
-     var $return_die    = 0;
-     var $error         = "";
-     var $failed        = 0;
-                  
-    /*========================================================================*/
-    // Connect to the database                 
-    /*========================================================================*/  
-                   
-    function connect() {
-    
-    	if ($this->obj['persistent'])
-    	{
-    	    $this->connection_id = mysql_pconnect( $this->obj['sql_host'] ,
-												   $this->obj['sql_user'] ,
-												   $this->obj['sql_pass'] 
-												);
-        }
-        else
-        {
-			$this->connection_id = mysql_connect( $this->obj['sql_host'] ,
-												  $this->obj['sql_user'] ,
-												  $this->obj['sql_pass'] 
-												);
-		}
-		
-        if ( !mysql_select_db($this->obj['sql_database'], $this->connection_id) )
-        {
-            echo ("ERROR: Cannot find database ".$this->obj['sql_database']);
-        }
-    }
-    
-    
-    
-    /*========================================================================*/
-    // Process a query
-    /*========================================================================*/
-    
-    function query($the_query, $bypass=0) {
-    	
-    	//--------------------------------------
-        // Change the table prefix if needed
-        //--------------------------------------
-        
-        if ($bypass != 1)
-        {
-			if ($this->obj['sql_tbl_prefix'] != "ibf_")
-			{
-			   $the_query = preg_replace("/ibf_(\S+?)([\s\.,]|$)/", $this->obj['sql_tbl_prefix']."\\1\\2", $the_query);
-			}
-        }
-        
-        if ($this->obj['debug'])
-        {
-    		global $Debug, $ibforums;
-    		
-    		$Debug->startTimer();
-    	}
-    	
-        $this->query_id = mysql_query($the_query, $this->connection_id);
-      
-        if (! $this->query_id )
-        {
-            $this->fatal_error("mySQL query error: $the_query");
-        }
-        
-        if ($this->obj['debug'])
-        {
-        	$endtime = $Debug->endTimer();
-        	
-        	if ( preg_match( "/^select/i", $the_query ) )
-        	{
-        		$eid = mysql_query("EXPLAIN $the_query", $this->connection_id);
-        		$ibforums->debug_html .= "<table width='95%' border='1' cellpadding='6' cellspacing='0' bgcolor='#FFE8F3' align='center'>
-										   <tr>
-										   	 <td colspan='8' style='font-size:14px' bgcolor='#FFC5Cb'><b>Select Query</b></td>
-										   </tr>
-										   <tr>
-										    <td colspan='8' style='font-family:courier, monaco, arial;font-size:14px;color:black'>$the_query</td>
-										   </tr>
-										   <tr bgcolor='#FFC5Cb'>
-											 <td><b>table</b></td><td><b>type</b></td><td><b>possible_keys</b></td>
-											 <td><b>key</b></td><td><b>key_len</b></td><td><b>ref</b></td>
-											 <td><b>rows</b></td><td><b>Extra</b></td>
-										   </tr>\n";
-				while( $array = mysql_fetch_array($eid) )
-				{
-					$type_col = '#FFFFFF';
-					
-					if ($array['type'] == 'ref' or $array['type'] == 'eq_ref' or $array['type'] == 'const')
-					{
-						$type_col = '#D8FFD4';
-					}
-					else if ($array['type'] == 'ALL')
-					{
-						$type_col = '#FFEEBA';
-					}
-					
-					$ibforums->debug_html .= "<tr bgcolor='#FFFFFF'>
-											 <td>$array[table]&nbsp;</td>
-											 <td bgcolor='$type_col'>$array[type]&nbsp;</td>
-											 <td>$array[possible_keys]&nbsp;</td>
-											 <td>$array[key]&nbsp;</td>
-											 <td>$array[key_len]&nbsp;</td>
-											 <td>$array[ref]&nbsp;</td>
-											 <td>$array[rows]&nbsp;</td>
-											 <td>$array[Extra]&nbsp;</td>
-										   </tr>\n";
-				}
-				
-				if ($endtime > 0.1)
-				{
-					$endtime = "<span style='color:red'><b>$endtime</b></span>";
-				}
-				
-				$ibforums->debug_html .= "<tr>
-										  <td colspan='8' bgcolor='#FFD6DC' style='font-size:14px'><b>mySQL time</b>: $endtime</b></td>
-										  </tr>
-										  </table>\n<br />\n";
-			}
-			else
-			{
-			  $ibforums->debug_html .= "<table width='95%' border='1' cellpadding='6' cellspacing='0' bgcolor='#FEFEFE'  align='center'>
-										 <tr>
-										  <td style='font-size:14px' bgcolor='#EFEFEF'><b>Non Select Query</b></td>
-										 </tr>
-										 <tr>
-										  <td style='font-family:courier, monaco, arial;font-size:14px'>$the_query</td>
-										 </tr>
-										 <tr>
-										  <td style='font-size:14px' bgcolor='#EFEFEF'><b>mySQL time</b>: $endtime</span></td>
-										 </tr>
-										</table><br />\n\n";
-			}
-		}
-		
-		$this->query_count++;
-        
-        $this->obj['cached_queries'][] = $the_query;
-        
-        return $this->query_id;
-    }
-    
-    
-    /*========================================================================*/
-    // Fetch a row based on the last query
-    /*========================================================================*/
-    
-    function fetch_row($query_id = "") {
-    
-    	if ($query_id == "")
-    	{
-    		$query_id = $this->query_id;
-    	}
-    	
-        $this->record_row = mysql_fetch_array($query_id, MYSQL_ASSOC);
-        
-        return $this->record_row;
-        
-    }
-
-	/*========================================================================*/
-    // Fetch the number of rows affected by the last query
-    /*========================================================================*/
-    
-    function get_affected_rows() {
-        return mysql_affected_rows($this->connection_id);
-    }
-    
-    /*========================================================================*/
-    // Fetch the number of rows in a result set
-    /*========================================================================*/
-    
-    function get_num_rows() {
-        return mysql_num_rows($this->query_id);
-    }
-    
-    /*========================================================================*/
-    // Fetch the last insert id from an sql autoincrement
-    /*========================================================================*/
-    
-    function get_insert_id() {
-        return mysql_insert_id($this->connection_id);
-    }  
-    
-    /*========================================================================*/
-    // Return the amount of queries used
-    /*========================================================================*/
-    
-    function get_query_cnt() {
-        return $this->query_count;
-    }
-    
-    /*========================================================================*/
-    // Free the result set from mySQLs memory
-    /*========================================================================*/
-    
-    function free_result($query_id="") {
-    
-   		if ($query_id == "") {
-    		$query_id = $this->query_id;
-    	}
-    	
-    	@mysql_free_result($query_id);
-    }
-    
-    /*========================================================================*/
-    // Shut down the database
-    /*========================================================================*/
-    
-    function close_db() { 
-        return mysql_close($this->connection_id);
-    }
-    
-    /*========================================================================*/
-    // Return an array of tables
-    /*========================================================================*/
-    
-    function get_table_names() {
-    
-		$result     = mysql_list_tables($this->obj['sql_database']);
-		$num_tables = @mysql_numrows($result);
-		for ($i = 0; $i < $num_tables; $i++)
-		{
-			$tables[] = mysql_tablename($result, $i);
-		}
-		
-		mysql_free_result($result);
-		
-		return $tables;
-   	}
-   	
-   	/*========================================================================*/
-    // Return an array of fields
-    /*========================================================================*/
-    
-    function get_result_fields($query_id="") {
-    
-   		if ($query_id == "")
-   		{
-    		$query_id = $this->query_id;
-    	}
-    
-		while ($field = mysql_fetch_field($query_id))
-		{
-            $Fields[] = $field;
-		}
-		
-		//mysql_free_result($query_id);
-		
-		return $Fields;
-   	}
-    
-    /*========================================================================*/
-    // Basic error handler
-    /*========================================================================*/
-    
-    function fatal_error($the_error) {
-    	global $INFO;
-    	
-    	
-    	// Are we simply returning the error?
-    	
-    	if ($this->return_die == 1)
-    	{
-    		$this->error    = mysql_error();
-    		$this->error_no = mysql_errno();
-    		$this->failed   = 1;
-    		return;
-    	}
-    	
-    	$the_error .= "\n\nmySQL error: ".mysql_error()."\n";
-    	$the_error .= "mySQL error code: ".$this->error_no."\n";
-    	$the_error .= "Date: ".date("l dS of F Y h:i:s A");
-    	
-    	$out = "<html><head><title>Invision Power Board Database Error</title>
-    		   <style>P,BODY{ font-family:arial,sans-serif; font-size:11px; }</style></head><body>
-    		   &nbsp;<br><br><blockquote><b>There appears to be an error with the {$INFO['board_name']} database.</b><br>
-    		   You can try to refresh the page by clicking <a href=\"javascript:window.location=window.location;\">here</a>, if this
-    		   does not fix the error, you can contact the board administrator by clicking <a href='mailto:{$INFO['email_in']}?subject=SQL+Error'>here</a>
-    		   <br><br><b>Error Returned</b><br>
-    		   <form name='mysql'><textarea rows=\"15\" cols=\"60\">".htmlspecialchars($the_error)."</textarea></form><br>We apologise for any inconvenience</blockquote></body></html>";
-    		   
-    
-        echo($out);
-        die("");
-    }
-    
-    /*========================================================================*/
-    // Create an array from a multidimensional array returning formatted
-    // strings ready to use in an INSERT query, saves having to manually format
-    // the (INSERT INTO table) ('field', 'field', 'field') VALUES ('val', 'val')
-    /*========================================================================*/
-    
-    function compile_db_insert_string($data) {
-    
-    	$field_names  = "";
-		$field_values = "";
-		
-		foreach ($data as $k => $v)
-		{
-			$v = preg_replace( "/'/", "\\'", $v );
-			//$v = preg_replace( "/#/", "\\#", $v );
-			$field_names  .= "$k,";
-			$field_values .= "'$v',";
-		}
-		
-		$field_names  = preg_replace( "/,$/" , "" , $field_names  );
-		$field_values = preg_replace( "/,$/" , "" , $field_values );
-		
-		return array( 'FIELD_NAMES'  => $field_names,
-					  'FIELD_VALUES' => $field_values,
-					);
-	}
-	
-	/*========================================================================*/
-    // Create an array from a multidimensional array returning a formatted
-    // string ready to use in an UPDATE query, saves having to manually format
-    // the FIELD='val', FIELD='val', FIELD='val'
-    /*========================================================================*/
-    
-    function compile_db_update_string($data) {
-		
-		$return_string = "";
-		
-		foreach ($data as $k => $v)
-		{
-			$v = preg_replace( "/'/", "\\'", $v );
-			$return_string .= $k . "='".$v."',";
-		}
-		
-		$return_string = preg_replace( "/,$/" , "" , $return_string );
-		
-		return $return_string;
-	}
-	
-	/*========================================================================*/
-    // Test to see if a field exists by forcing and trapping an error.
-    // It ain't pretty, but it do the job don't it, eh?
-    // Posh my ass.
-    // Return 1 for exists, 0 for not exists and jello for the naked guy
-    // Fun fact: The number of times I spelt 'field' as 'feild'in this part: 104
-    /*========================================================================*/
-    
-    function field_exists($field, $table) {
-		
-		$this->return_die = 1;
-		$this->error = "";
-		
-		$this->query("SELECT COUNT($field) as count FROM $table");
-		
-		$return = 1;
-		
-		if ( $this->failed )
-		{
-			$return = 0;
-		}
-		
-		$this->error = "";
-		$this->return_die = 0;
-		$this->error_no   = 0;
-		$this->failed     = 0;
-		
-		return $return;
-	}
-    
-} // end class
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Forums.php b/upload/sources/Forums.php
deleted file mode 100644
index 8554d905..00000000
--- a/upload/sources/Forums.php
+++ /dev/null
@@ -1,1047 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Forum topic index module
-|   > Module written by Matt Mecham
-|   > Date started: 14th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Forums;
-
-class Forums {
-
-    var $output    = "";
-    var $base_url  = "";
-    var $html      = "";
-    var $moderator = array();
-    var $forum     = array();
-    var $mods      = array();
-    var $show_dots = "";
-    var $nav_extra = "";
-    var $read_array = array();
-    var $board_html = "";
-    var $sub_output = "";
-    var $pinned_print = 0;
-    var $new_posts    = 0;
-    
-    //+----------------------------------------------------------------
-	//
-	// Our constructor, load words, load skin, get DB forum/cat data
-	//
-	//+----------------------------------------------------------------
-    
-    function Forums()
-    {
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
-        //+------------------------------------------
-        // Are we doing anything with "site jump?"
-        //+------------------------------------------
-        
-        switch( $ibforums->input['f'] )
-        {
-        	case 'sj_home':
-        		$std->boink_it($ibforums->base_url."act=idx");
-        		break;
-        	case 'sj_search':
-        		$std->boink_it($ibforums->base_url."act=Search");
-        		break;
-        	case 'sj_help':
-        		$std->boink_it($ibforums->base_url."act=Help");
-        		break;
-        	default:
-        		$ibforums->input['f'] = intval($ibforums->input['f']);
-        		break;
-        }
-        
-        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_forum', $ibforums->lang_id);
-
-        $this->html     = $std->load_template('skin_forum');
-        
-        //+------------------------------------------
-        // Get the forum info based on the forum ID,
-        // and get the category name, ID, etc.
-        //+------------------------------------------
-        
-        $DB->query("SELECT f.*, c.id as cat_id, c.name as cat_name
-        			FROM ibf_forums f
-        			  LEFT JOIN ibf_categories c ON (c.id=f.category)
-        			WHERE f.id=".$ibforums->input['f']);
-        
-        $this->forum = $DB->fetch_row();
-        
-        //----------------------------------------
-        // Error out if we can not find the forum
-        //----------------------------------------
-        
-        if (!$this->forum['id'])
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'is_broken_link') );
-        }
-        
-        //----------------------------------------
-        // Is it a redirect forum?
-        //----------------------------------------
-        
-        if ( $this->forum['redirect_on'] and $this->forum['redirect_url'] )
-        {
-        	// Update hits:
-        	
-        	$DB->query("UPDATE ibf_forums SET redirect_hits=redirect_hits+1 WHERE id=".$this->forum['id']);
-        	
-        	// Boink!
-        	
-        	$std->boink_it( $this->forum['redirect_url'] );
-        	
-        	// Game over man!
-        }
-        
-        //----------------------------------------
-        // If this is a sub forum, we need to get
-        // the cat details, and parent details
-        //----------------------------------------
-        
-        if ($this->forum['parent_id'] > 0)
-        {
-        
-        	$DB->query("SELECT f.id as forum_id, f.name as forum_name, c.id, c.name FROM ibf_forums f, ibf_categories c WHERE f.id='".$this->forum['parent_id']."' AND c.id=f.category");
-        	
-        	$row = $DB->fetch_row();
-        	
-        	$this->forum['cat_id']   = $row['id'];
-        	$this->forum['cat_name'] = $row['name'];
-        
-        	$this->nav_extra = "<a href='".$ibforums->base_url."showforum={$row['forum_id']}'>{$row['forum_name']}</a>";
-        }
-        
-        //--------------------------------------------------------------------------------
-        //--------------------------------------------------------------------------------
-        
-        $this->base_url = $ibforums->base_url;
-        
-		$this->forum['FORUM_JUMP'] = $std->build_forum_jump();
-
-        // Are we viewing the forum, or viewing the forum rules?
-        
-        if ($ibforums->input['act'] == 'SR')
-        {
-        	$this->show_rules();
-        }
-        else
-        {
-        	if ($this->forum['subwrap'] == 1)
-			{
-				$this->show_subforums();
-				
-				if ($this->forum['sub_can_post'])
-				{
-					$this->show_forum();
-				}
-				else
-				{
-					// No forum to show, just use the HTML in $this->sub_output
-					// or there will be no HTML to use in the str_replace!
-					
-					$this->output     = $this->sub_output;
-					$this->sub_output = "";
-				}
-			}
-			else
-			{
-        		$this->show_forum();
-        	}
-        }
-        
-        //+----------------------------------------------------------------
-		// Print it
-		//+----------------------------------------------------------------
-		
-		if ($this->sub_output != "")
-		{
-			$this->output = str_replace( "<!--IBF.SUBFORUMS-->", $this->sub_output, $this->output );
-		}
-		
-		if ($ibforums->member['id'] > 0)
-		{
-			$this->output = str_replace( "<!--IBF.SUB_FORUM_LINK-->", $this->html->show_sub_link($this->forum['id']), $this->output );
-		}
-		
-		if ( $ibforums->member['g_is_supmod'] OR $ibforums->member['is_mod'] )
-		{
-			if ( $this->forum['has_mod_posts'] )
-			{
-				$this->output = str_replace( "<!--IBF.MODLINK-->", $this->html->show_mod_link($this->forum['id']), $this->output );
-			}
-		}
-		
-		$print->add_output($this->output);
-        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->forum['name'],
-        					 	  'JS'       => 0,
-        					 	  'NAV'      => array( 
-        					 	  					   "<a href='".$this->base_url."act=SC&amp;c={$this->forum['cat_id']}'>{$this->forum['cat_name']}</a>",
-        					 	  					   $this->nav_extra,
-        					 	  					   "<a href='".$this->base_url."showforum={$this->forum['id']}'>{$this->forum['name']}</a>",
-        					 	  					 ),
-        					  ) );
-        
-     }
-     
-     //+----------------------------------------------------------------
-	 // Display any sub forums
-	 //+----------------------------------------------------------------
-     
-     
-     function show_subforums() {
-	
-		global $std, $DB, $ibforums;
-		
-		$ibforums->lang   = $std->load_words($ibforums->lang, 'lang_boards', $ibforums->lang_id);
-
-        $this->board_html = $std->load_template('skin_boards');
-        
-        $fid = $ibforums->input['f'];
-        
-        $DB->query("SELECT f.*, m.member_name as mod_name, m.member_id as mod_id, m.is_group, m.group_id, m.group_name, m.mid
-        			FROM ibf_forums f
-        			 LEFT JOIN ibf_moderators m ON (f.id=m.forum_id)
-        			WHERE parent_id='$fid'
-        			ORDER BY position");
-        
-        if ( ! $DB->get_num_rows() )
-        {
-        	return "";
-        }
-        
-        while ( $r = $DB->fetch_row() )
-        {
-        	
-			$this->forums[ $r['id'] ] = $r;
-			
-			if ($r['mod_id'] != "")
-			{
-				$this->mods[ $r['id'] ][ $r['mid'] ] = array( 'name' => $r['mod_name'],
-															  'id'   => $r['mod_id'],
-															  'isg'  => $r['is_group'],
-															  'gname'=> $r['group_name'],
-															  'gid'  => $r['group_id'],
-															);
-			}
-        }
-        
-		foreach( $this->forums as $data )
-		{
-			$temp_html .= $this->process_forum($data['id'], $data);
-		}
-    	
-		if ($temp_html != "")
-		{
-			$this->sub_output .= $this->board_html->subheader();
-			$this->sub_output .= $temp_html;
-			$this->sub_output .= $this->board_html->end_this_cat();
-		}
-		else
-		{
-			return $this->sub_output;
-		}
-		unset($temp_html);
-	
-		$this->sub_output .= $this->board_html->end_all_cats();
-    }
-    
-    
-    
-	function process_forum($forum_id="", $forum_data="")
-    {
-    	global $std, $ibforums;
-    	
-		//--------------------------------------
-		// Check permissions...
-		//--------------------------------------
-		
-		if ( $std->check_perms($forum_data['read_perms']) != TRUE )
-		{
-			return "";
-		}
-		
-		//--------------------------------------
-		// Redirect only forum?
-		//--------------------------------------
-		
-		if ( $forum_data['redirect_on'] )
-		{
-			// Simply return with the redirect information
-			
-			if ( $forum_data['redirect_loc'] != "" )
-			{
-				$forum_data['redirect_target'] = " target='".$forum_data['redirect_loc']."' ";
-			}
-			
-			$forum_data['redirect_hits'] = $std->do_number_format($forum_data['redirect_hits']);
-			
-			return $this->board_html->forum_redirect_row($forum_data);
-			
-		}
-		
-		$forum_data['img_new_post'] = $std->forum_new_posts($forum_data);
-		
-		if ( $forum_data['img_new_post'] == '<{C_ON}>' )
-		{
-			$forum_data['img_new_post'] = $this->board_html->forum_img_with_link($forum_data['img_new_post'], $forum_data['id']);
-		}
-		
-		$forum_data['last_post'] = $std->get_date($forum_data['last_post'], 'LONG');
-					
-		$forum_data['last_topic'] = $ibforums->lang['f_none'];
-
-		if (isset($forum_data['last_title']) and $forum_data['last_id'])
-		{
-			
-			$forum_data['last_title'] = strip_tags($forum_data['last_title']);
-			$forum_data['last_title'] = str_replace( "&#33;" , "!", $forum_data['last_title'] );
-			$forum_data['last_title'] = str_replace( "&quot;", "\"", $forum_data['last_title'] );
-				
-			if (strlen($forum_data['last_title']) > 30)
-			{
-				$forum_data['last_title'] = substr($forum_data['last_title'],0,27) . "...";
-				$forum_data['last_title'] = preg_replace( '/&(#(\d+;?)?)?\.\.\.$/', '...', $forum_data['last_title'] );
-			}
-			else
-			{
-				$forum_data['last_title'] = preg_replace( '/&(#(\d+?)?)?$/', '', $forum_data['last_title'] );
-			}
-			
-			if ($forum_data['password'] != "")
-			{
-				$forum_data['last_topic'] = $ibforums->lang['f_protected'];
-			}
-			else
-			{
-			    $forum_data['last_unread'] = $this->board_html->forumrow_lastunread_link($forum_data['id'], $forum_data['last_id']);
-				$forum_data['last_topic']  = "<a href='{$ibforums->base_url}showtopic={$forum_data['last_id']}&amp;view=getlastpost' title='{$ibforums->lang['tt_gounread']}'>{$forum_data['last_title']}</a>";
-			}
-		}	 
-						
-		if ( isset($forum_data['last_poster_name']))
-		{
-			$forum_data['last_poster'] = $forum_data['last_poster_id'] ? "<a href='{$ibforums->base_url}showuser={$forum_data['last_poster_id']}'>{$forum_data['last_poster_name']}</a>"
-																	   : $forum_data['last_poster_name'];
-		}
-		else
-		{
-			$forum_data['last_poster'] = $ibforums->lang['f_none'];
-		}
- 
-		//---------------------------------
-		// Moderators
-		//---------------------------------
-		
-		$forum_data['moderator'] = "";
-		
-		if (isset($this->mods[ $forum_data['id'] ] ) )
-		{
-			$forum_data['moderator'] = $ibforums->lang['forum_leader'].' ';
-			
-			if (is_array($this->mods[ $forum_data['id'] ]) )
-			{
-				foreach ($this->mods[ $forum_data['id'] ] as $moderator)
-				{
-					if ($moderator['isg'] == 1)
-					{
-						$forum_data['moderator'] .= "<a href='{$ibforums->base_url}act=Members&amp;max_results=30&amp;filter={$moderator['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0'>{$moderator['gname']}</a>, ";
-					}
-					else
-					{
-						$forum_data['moderator'] .= "<a href='{$ibforums->base_url}showuser={$moderator['id']}'>{$moderator['name']}</a>, ";
-					}
-				}
-				
-				$forum_data['moderator'] = preg_replace( "!,\s+$!", "", $forum_data['moderator'] );
-				
-			}
-			else
-			{
-				if ($moderator['isg'] == 1)
-				{
-					$forum_data['moderator'] .= "<a href='{$ibforums->base_url}act=Members&amp;max_results=30&amp;filter={$this->mods[$forum_data['id']]['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0'>{$this->mods[$forum_data['id']]['gname']}</a>, ";
-				}
-				else
-				{
-					$forum_data['moderator'] .= "<a href='{$ibforums->base_url}showuser={$this->mods[$forum_data['id']]['id']}'>{$this->mods[$forum_data['id']]['name']}</a>";
-				}
-			}
-		}
-		
-		$forum_data['posts']  = $std->do_number_format($forum_data['posts']);
-		$forum_data['topics'] = $std->do_number_format($forum_data['topics']);
-		
-		return $this->board_html->ForumRow($forum_data);
-	}
-     
-    //+----------------------------------------------------------------
-	//
-	// Show the forum rules on a separate page
-	//
-	//+----------------------------------------------------------------
-        
-	function show_rules()
-	{
-		global $DB, $ibforums, $std, $print;
-		
-		//+--------------------------------------------
-		// Do we have permission to view these rules?
-		//+--------------------------------------------
-		
-		$bad_entry = $this->check_access();
-        
-        if ($bad_entry == 1)
-        {
-        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_view_topic') );
-        }
-        
-             
-        if ( $this->forum['rules_title'] )
-        {
-        	$rules['title'] = $this->forum['rules_title'];
-        	$rules['body']  = $this->forum['rules_text'];
-        	$rules['fid']   = $this->forum['id'];
-        	
-        	$this->output .= $this->html->show_rules($rules);
-        	
-			$print->add_output("$this->output");
-			$print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -&gt; ".$this->forum['name'],
-									  'JS'       => 0,
-									  'NAV'      => array( 
-														   "<a href='".$this->base_url."act=SC&amp;c={$this->forum['cat_id']}'>{$this->forum['cat_name']}</a>",
-														   $this->forum['name']
-														 ),
-								  ) );
-		}
-		else
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_view_topic') );
-		}
-	}
-	
-	//+----------------------------------------------------------------
-	//
-	// Forum view check for authentication
-	//
-	//+----------------------------------------------------------------
-   
-	function show_forum()
-	{
-   		global $ibforums;
-		// are we checking for user authentication via the log in form
-		// for a private forum w/password protection?
-		
-		$ibforums->input['L'] == 1 ? $this->authenticate_user() : $this->render_forum();
-	}
-	
-	//+----------------------------------------------------------------
-	//
-	// Authenicate the log in for a password protected forum
-	//
-	//+----------------------------------------------------------------
-	
-	function authenticate_user() {
-		global $std, $ibforums, $print;
-		
-		if ($ibforums->input['f_password'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_blank' ) );
-		}
-		
-		if ($ibforums->input['f_password'] != $this->forum['password'])
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'wrong_pass' ) );
-		}
-		
-		$std->my_setcookie( "iBForum".$this->forum['id'], $ibforums->input['f_password'] );
-		
-		$print->redirect_screen( $ibforums->lang['logged_in'] , "showforum=".$this->forum['id'] );
-		
-	}
-	
-	//+----------------------------------------------------------------------------------
-	
-	function check_access() {
-		global $ibforums, $std, $HTTP_COOKIE_VARS;
-		
-		$return = 1;
-		
-		if ( $std->check_perms($this->forum['read_perms']) == TRUE )
-		{
-			$return = 0;
-		}
-		
-		// Do we have permission to even see the password page?
-		
-		if ($return == 0)
-		{
-			if ($this->forum['password'])
-			{
-				if ($HTTP_COOKIE_VARS[ $ibforums->vars['cookie_id'].'iBForum'.$this->forum['id'] ] == $this->forum['password'])
-				{
-					$return = 0;
-				}
-				else
-				{
-					$this->forum_login();
-				}
-			}
-		}
-		
-		return $return;
-	
-	}
-	
-	//+----------------------------------------------------------------------------------
-	
-	function forum_login() {
-		global $ibforums, $std, $DB, $HTTP_COOKIE_VARS, $print;
-		
-		if (empty($ibforums->member['id']))
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
-		}
-		
-		$this->output = $this->html->Forum_log_in( $this->forum['id'] );
-		
-		$print->add_output("$this->output");
-		
-        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->forum['name'],
-        					 	  'JS'       => 0,
-        					 	  'NAV'      => array( 
-        					 	  					   "<a href='".$this->base_url."act=SC&amp;c={$this->forum['cat_id']}'>{$this->forum['cat_name']}</a>",
-        					 	  					   "<a href='".$this->base_url."showforum={$this->forum['id']}'>{$this->forum['name']}</a>",
-        					 	  					 ),
-        					  ) );
-
-	}
-	
-	//+----------------------------------------------------------------
-	//
-	// Main render forum engine
-	//
-	//+----------------------------------------------------------------
-	
-	function render_forum()
-	{
-		global $ibforums, $DB, $std, $print, $skin_universal,$HTTP_COOKIE_VARS;
-		
-		$bad_entry = $this->check_access();
-        
-        if ($bad_entry == 1)
-        {
-        	if ($this->forum['subwrap'] == 1)
-        	{
-        		// Dont' show an error as we may have sub forums up top
-        		// Instead, copy the sub forum ouput to the main output
-        		// and return gracefully
-        		
-        		$this->output     = $this->sub_output;
-				$this->sub_output = "";
-				
-				return TRUE;
-        	}
-        	else
-        	{
-        		$std->Error( array( LEVEL => 1, MSG => 'no_permission') );
-        	}
-        }
-        
-		if ( $read = $std->my_getcookie('topicsread') )
-        {
-        	$this->read_array = unserialize(stripslashes($read));
-        }
-
-        $ibforums->input['last_visit'] = $ibforums->forum_read[ $ibforums->input['f'] ] > $ibforums->input['last_visit']
-        						       ? $ibforums->forum_read[ $ibforums->input['f'] ] : $ibforums->input['last_visit'];
-
-		$prune_value = $std->select_var( array( 
-												1 => $ibforums->input['prune_day'],
-												2 => $this->forum['prune']        ,
-												3 => '100'                        )
-									    );
-
-		$sort_key    = $std->select_var( array(
-												1 => $ibforums->input['sort_key'],
-												2 => $this->forum['sort_key']    ,
-												3 => 'last_post'                 )
-									   );
-
-		$sort_by     = $std->select_var( array(
-												1 => $ibforums->input['sort_by'],
-												2 => $this->forum['sort_order'] ,
-												3 => 'Z-A'                      )
-									   );
-    
-		$First       = $std->select_var( array(
-												1 => intval($ibforums->input['st']),
-												2 => 0                    )
-									   );
-		
-		// Figure out sort order, day cut off, etc
-		
-		$Prune = $prune_value != 100 ? (time() - ($prune_value * 60 * 60 * 24)) : 0;
-
-		$sort_keys   =  array( 'last_post'         => 'sort_by_date',
-							   'title'             => 'sort_by_topic',
-							   'starter_name'      => 'sort_by_poster',
-							   'posts'             => 'sort_by_replies',
-							   'views'             => 'sort_by_views',
-							   'start_date'        => 'sort_by_start',
-							   'last_poster_name'  => 'sort_by_last_poster',
-							 );
-
-		$prune_by_day = array( '1'    => 'show_today',
-							   '5'    => 'show_5_days',
-							   '7'    => 'show_7_days',
-							   '10'   => 'show_10_days',
-							   '15'   => 'show_15_days',
-							   '20'   => 'show_20_days',
-							   '25'   => 'show_25_days',
-							   '30'   => 'show_30_days',
-							   '60'   => 'show_60_days',
-							   '90'   => 'show_90_days',
-							   '100'  => 'show_all',
-							 );
-
-		$sort_by_keys = array( 'Z-A'  => 'descending_order',
-                         	   'A-Z'  => 'ascending_order',
-                             );
-                             
-        //+----------------------------------------------------------------                    
-        // check for any form funny business by wanna-be hackers
-		//+----------------------------------------------------------------
-		
-		if ( (!isset($sort_keys[$sort_key])) or (!isset($prune_by_day[$prune_value])) or (!isset($sort_by_keys[$sort_by])) )
-		{
-			   $std->Error( array( LEVEL=> 5, MSG =>'incorrect_use') );
-	    }
-	    
-	    $r_sort_by = $sort_by == 'A-Z' ? 'ASC' : 'DESC';
-	    
-		//+----------------------------------------------------------------
-		// Query the database to see how many topics there are in the forum
-		//+----------------------------------------------------------------
-		
-		$DB->query("SELECT COUNT(tid) as max FROM ibf_topics WHERE forum_id=".$this->forum['id']." and approved=1 and (pinned=1 or last_post > $Prune)");
-		$total_possible = $DB->fetch_row();
-		
-		//+----------------------------------------------------------------
-		// Generate the forum page span links
-		//+----------------------------------------------------------------
-		
-		$this->forum['SHOW_PAGES']
-			= $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_possible['max'],
-											'PER_PAGE'    => $ibforums->vars['display_max_topics'],
-											'CUR_ST_VAL'  => $ibforums->input['st'],
-											'L_SINGLE'    => $ibforums->lang['single_page_forum'],
-											'BASE_URL'    => $this->base_url."showforum=".$this->forum['id']."&amp;prune_day=$prune_value&amp;sort_by=$sort_by&amp;sort_key=$sort_key",
-										  )
-								   );
-								   
-								   
-		//+----------------------------------------------------------------
-		// Do we have any rules to show?
-		//+----------------------------------------------------------------
-		
-		 $this->output .= $std->print_forum_rules($this->forum);
-		
-		//+----------------------------------------------------------------
-		// Generate the poll button
-		//+----------------------------------------------------------------
-		   
-		$this->forum['POLL_BUTTON'] = $this->forum['allow_poll']
-										 ? "<a href='".$this->base_url."act=Post&amp;CODE=10&amp;f=".$this->forum['id']."'><{A_POLL}></a>"
-										 : '';
-	
-		//+----------------------------------------------------------------
-		// Start printing the page
-		//+----------------------------------------------------------------
-		
-		$this->output .= $this->html->PageTop($this->forum);
-		
-		//+----------------------------------------------------------------
-		// Do we have any topics to show?
-		//+----------------------------------------------------------------
-		
-		if ($total_possible['max'] < 1)
-		{
-			$this->output .= $this->html->show_no_matches();
-		}
-		
-		$total_topics_printed = 0;
-		
-		if ( ($ibforums->vars['show_user_posted'] == 1) and ($ibforums->member['id']) )
-		{
-			$query = "SELECT DISTINCT(ibf_posts.author_id), ibf_topics.* FROM ibf_topics
-			           LEFT JOIN ibf_posts ON 
-			           (ibf_topics.tid=ibf_posts.topic_id AND ibf_posts.author_id=".$ibforums->member['id'].")
-			           WHERE ibf_topics.forum_id=".$this->forum['id']."
-			           and ibf_topics.approved=1
-			           and (ibf_topics.pinned=1 or ibf_topics.last_post > $Prune)";
-		}
-		else
-		{
-			$query = "SELECT * from ibf_topics WHERE forum_id=".$this->forum['id']." and approved=1 and (last_post > $Prune OR pinned=1)";
-		}
-		
-		//+----------------------------------------------------------------
-		// Do we have permission to view other posters topics?
-		//+----------------------------------------------------------------
-		
-		if (!$ibforums->member['g_other_topics'])
-		{
-            $query .= " and starter_id='".$ibforums->member['id']."'";
-		}
-		
-		//+----------------------------------------------------------------
-		// Finish off the query
-		//+----------------------------------------------------------------
-		
-		$First = $First ? $First : 0;
-		
-		$query .= " ORDER BY pinned DESC, $sort_key $r_sort_by LIMIT $First,".$ibforums->vars['display_max_topics'];
-		
-		$DB->query($query);
-		
-		//+----------------------------------------------------------------
-		// Grab the rest of the topics and print them
-		//+----------------------------------------------------------------
-		
-		while ( $topic = $DB->fetch_row() )
-		{
-			$this->output .= $this->render_entry( $topic );
-			$total_topics_printed++;
-		}
-		
-		//+----------------------------------------------------------------
-		// Finish off the rest of the page
-		//+----------------------------------------------------------------
-		
-		$ibforums->lang['showing_text'] = preg_replace( "/<#MATCHED_TOPICS#>/", $total_topics_printed  , $ibforums->lang['showing_text'] );
-		$ibforums->lang['showing_text'] = preg_replace( "/<#TOTAL_TOPICS#>/"  , $total_possible['max'] , $ibforums->lang['showing_text'] );
-		
-		$sort_key_html  = "<select name='sort_key'  class='forminput'>\n";
-		$prune_day_html = "<select name='prune_day' class='forminput'>\n";
-		$sort_by_html   = "<select name='sort_by'   class='forminput'>\n";
-		
-	
-		foreach ($sort_by_keys as $k => $v)
-		{
-			$sort_by_html   .= $k == $sort_by     ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $sort_by_keys[ $k ] ] . "</option>\n"
-											      : "<option value='$k'>"          . $ibforums->lang[ $sort_by_keys[ $k ] ] . "</option>\n";
-		}
-	
-		foreach ($sort_keys as  $k => $v)
-		{
-			$sort_key_html  .= $k == $sort_key    ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $sort_keys[ $k ] ]    . "</option>\n"
-											      : "<option value='$k'>"          . $ibforums->lang[ $sort_keys[ $k ] ]    . "</option>\n";
-		}
-		foreach ($prune_by_day as  $k => $v)
-		{
-			$prune_day_html .= $k == $prune_value ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $prune_by_day[ $k ] ] . "</option>\n"
-												  : "<option value='$k'>"          . $ibforums->lang[ $prune_by_day[ $k ] ] . "</option>\n";
-		}
-	
-		$ibforums->lang['sort_text'] = preg_replace( "!<#SORT_KEY_HTML#>!", "$sort_key_html</select>"  , $ibforums->lang['sort_text'] );
-		$ibforums->lang['sort_text'] = preg_replace( "!<#ORDER_HTML#>!"   , "$sort_by_html</select>"   , $ibforums->lang['sort_text'] );
-		$ibforums->lang['sort_text'] = preg_replace( "!<#PRUNE_HTML#>!"   , "$prune_day_html</select>" , $ibforums->lang['sort_text'] );
-	
-		$this->output .= $this->html->TableEnd($this->forum);
-		
-		//+----------------------------------------------------------------
-		// If all the new topics have been read in this forum..
-		//+----------------------------------------------------------------
-		
-		if ($this->new_posts < 1)
-		{
-			$ibforums->forum_read[ $this->forum['id'] ] = time();
-			
-			$std->hdl_forum_read_cookie('set');
-		}
-		
-		//+----------------------------------------------------------------
-		// Process users active in this forum
-		//+----------------------------------------------------------------
-		
-		if ($ibforums->vars['no_au_forum'] != 1)
-		{
-			//+-----------------------------------------
-			// Get the users
-			//+-----------------------------------------
-			
-			$cut_off = ($ibforums->vars['au_cutoff'] != "") ? $ibforums->vars['au_cutoff'] * 60 : 900;
-			 
-			$time = time() - $cut_off;
-			
-			$DB->query("SELECT s.member_id, s.member_name, s.login_type, s.location, g.suffix, g.prefix, g.g_perm_id, t.forum_id, m.org_perm_id
-					    FROM ibf_sessions s
-					     LEFT JOIN ibf_groups g ON (g.g_id=s.member_group)
-					     LEFT JOIN ibf_topics t ON (t.tid=s.in_topic)
-					     LEFT JOIN ibf_members m on (s.member_id=m.id)
-					    WHERE (s.in_forum={$this->forum['id']} OR t.forum_id={$this->forum['id']})
-					    AND s.running_time > $time
-					    ORDER BY s.running_time DESC");
-
-					   
-			//+-----------------------------------------
-			// Cache all printed members so we don't double print them
-			//+-----------------------------------------
-			
-			$cached = array();
-			$active = array( 'guests' => 0, 'anon' => 0, 'members' => 0, 'names' => "");
-			
-			while ($result = $DB->fetch_row() )
-			{
-				$result['g_perm_id'] = $result['org_perm_id'] ? $result['org_perm_id'] : $result['g_perm_id'];
-				
-				if ( $this->forum['read_perms'] != '*' )
-				{
-					if ( $result['g_perm_id'] )
-					{
-						if ( ! preg_match("/(^|,)(".str_replace( ",", '|', $result['g_perm_id'] ).")(,|$)/", $this->forum['read_perms'] ) )
-						{
-							continue;
-						}
-					}
-					else
-					{
-						continue;
-					}
-				}
-				
-				if ($result['member_id'] == 0)
-				{
-					$active['guests']++;
-				}
-				else
-				{
-					if (empty( $cached[ $result['member_id'] ] ) )
-					{
-						$cached[ $result['member_id'] ] = 1;
-						
-						if ($result['login_type'] == 1)
-						{
-							if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
-							{
-								$active['names'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*, ";
-								$active['anon']++;
-							}
-							else
-							{
-								$active['anon']++;
-							}
-						}
-						else
-						{
-							$active['members']++;
-							$active['names'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>, ";
-						}
-					}
-				}
-			}
-			
-			$active['names'] = preg_replace( "/,\s+$/", "" , $active['names'] );
-			
-			$ibforums->lang['active_users_title']   = sprintf( $ibforums->lang['active_users_title']  , ($active['members'] + $active['guests'] + $active['anon'] ) );
-			$ibforums->lang['active_users_detail']  = sprintf( $ibforums->lang['active_users_detail'] , $active['guests'],$active['anon'] );
-			$ibforums->lang['active_users_members'] = sprintf( $ibforums->lang['active_users_members'], $active['members'] );
-			
-			$this->output = str_replace( "<!--IBF.FORUM_ACTIVE-->", $this->html->forum_active_users($active), $this->output );
-		
-		}
-		
-		return TRUE;
-
-    }
-     
-	//+----------------------------------------------------------------
-	//
-	// Crunches the data into pwetty html
-	//
-	//+----------------------------------------------------------------
-
-	function render_entry($topic) {
-		global $DB, $std, $ibforums;
-		
-		$topic['last_text']   = $ibforums->lang['last_post_by'];
-		
-		$topic['last_poster'] = ($topic['last_poster_id'] != 0)
-								? "<a href='{$this->base_url}showuser={$topic['last_poster_id']}'>{$topic['last_poster_name']}</a>"
-								: "-".$topic['last_poster_name']."-";
-								
-		$topic['starter']     = ($topic['starter_id']     != 0)
-								? "<a href='{$this->base_url}showuser={$topic['starter_id']}'>{$topic['starter_name']}</a>"
-								: "-".$topic['starter_name']."-";
-	 
-		if ($topic['poll_state'])
-		{
-			$topic['prefix']     = $ibforums->vars['pre_polls'].' ';
-		}
-		
-		if ( ($ibforums->member['id']) and ($topic['author_id']) )
-		{
-			$show_dots = 1;
-		}
-	
-		$topic['folder_img']     = $std->folder_icon($topic, $show_dots, $this->read_array[$topic['tid']]);
-		
-		$topic['topic_icon']     = $topic['icon_id']  ? '<img src="'.$ibforums->vars['img_url'] . '/icon' . $topic['icon_id'] . '.gif" border="0" alt="" />'
-													  : '&nbsp;';
-		
-		$topic['start_date'] = $std->get_date( $topic['start_date'], 'LONG' );
-	
-	
-		$pages = 1;
-		
-		if ($topic['posts'])
-		{
-			if ( (($topic['posts'] + 1) % $ibforums->vars['display_max_posts']) == 0 )
-			{
-				$pages = ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'];
-			}
-			else
-			{
-				$number = ( ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'] );
-				$pages = ceil( $number);
-			}
-			
-		}
-		
-		if ($pages > 1)
-		{
-			$topic['PAGES'] = "<span class='small'>({$ibforums->lang['topic_sp_pages']} ";
-			for ($i = 0 ; $i < $pages ; ++$i ) {
-				$real_no = $i * $ibforums->vars['display_max_posts'];
-				$page_no = $i + 1;
-				if ($page_no == 4) {
-					$topic['PAGES'] .= "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;st=" . ($pages - 1) * $ibforums->vars['display_max_posts'] . "'>...$pages </a>";
-					break;
-				} else {
-					$topic['PAGES'] .= "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;st=$real_no'>$page_no </a>";
-				}
-			}
-			$topic['PAGES'] .= ")</span>";
-		}
-		
-		//------------------------------------------------
-		// Format some numbers
-		//------------------------------------------------
-		
-		if ($topic['posts'] < 0) $topic['posts'] = 0;
-		
-		$topic['posts']  = $std->do_number_format($topic['posts']);
-		$topic['views']	 = $std->do_number_format($topic['views']);
-		
-		//------------------------------------------------
-		// Last time stuff...
-		//------------------------------------------------
-		
-		$last_time = $this->read_array[ $topic['tid'] ] > $ibforums->input['last_visit'] ? $this->read_array[ $topic['tid'] ] : $ibforums->input['last_visit'];
-		
-		if ($last_time  && ($topic['last_post'] > $last_time))
-		{
-			$this->new_posts++;
-			$topic['go_new_post']  = "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;view=getnewpost'><{NEW_POST}></a>";
-		}
-		else
-		{
-			$topic['go_new_post']  = "";
-		}
-	
-		$topic['last_post']  = $std->get_date( $topic['last_post'], 'SHORT' );
-		
-		//+----------------------------------------------------------------
-			
-		if ($topic['state'] == 'link')
-		{
-			$t_array = explode("&", $topic['moved_to']);
-			$topic['tid']       = $t_array[0];
-			$topic['forum_id']  = $t_array[1];
-			$topic['title']     = $topic['title'];
-			$topic['views']     = '--';
-			$topic['posts']     = '--';
-			$topic['prefix']    = $ibforums->vars['pre_moved']." ";
-			$topic['go_new_post'] = "";
-		}
-		else
-		{
-			$topic['posts'] = $this->html->who_link($topic['tid'], $topic['posts']);
-		}
-		
-		$p_start = "";
-		$p_end   = "";
-		
-		if ($topic['pinned'] == 1)
-		{
-			$topic['prefix']     = $ibforums->vars['pre_pinned'];
-			$topic['topic_icon'] = "<{B_PIN}>";
-			
-			if ($this->pinned_print == 0)
-			{
-				// we've a pinned topic, but we've not printed the pinned
-				// starter row, so..
-				
-				$p_start = $this->html->render_pinned_start();
-				
-				$this->pinned_print = 1;
-			}
-			
-			return $p_start . $this->html->render_pinned_row( $topic );
-		}
-		else
-		{
-			// This is not a pinned topic, so lets check to see if we've
-			// printed the footer yet.
-			
-			if ($this->pinned_print == 1)
-			{
-				// Nope, so..
-				$p_end = $this->html->render_pinned_end();
-				
-				$this->pinned_print = 0;
-			}
-			
-			return $p_end . $this->html->RenderRow( $topic );
-		}
-	}
-	
-	
-	//+----------------------------------------------------------------
-	//
-	// Returns the last action date
-	//
-	//+----------------------------------------------------------------
-	    
-	function get_last_date($topic) {
-		global $ibforums, $std;
-		
-		return $std->get_date( $topic['last_post'], 'SHORT' );
-		
-	}
-
-        
-}
-
-?>
diff --git a/upload/sources/Login.php b/upload/sources/Login.php
deleted file mode 100644
index 52009b6e..00000000
--- a/upload/sources/Login.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Log in / log out module
-|   > Module written by Matt Mecham
-|   > Date started: 14th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Login;
-
-class Login {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $login_html = "";
-    var $modules    = "";
-    
-    function Login()
-    {
-    	global $ibforums, $DB, $std, $print;
-    	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_login', $ibforums->lang_id);
-    	
-    	$this->login_html = $std->load_template('skin_login');
-    	
-    	
-    	if ( USE_MODULES == 1 )
-		{
-			require ROOT_PATH."modules/ipb_member_sync.php";
-			
-			$this->modules = new ipb_member_sync();
-		}
-
-    	
-    	// Are we enforcing log ins?
-    	
-    	if ($ibforums->vars['force_login'] == 1)
-    	{
-    		$msg = 'admin_force_log_in';
-    	}
-    	else
-    	{
-    		$msg = "";
-    	}
-    	
-    	// What to do?
-    	
-    	switch($ibforums->input['CODE']) {
-    		case '01':
-    			$this->do_log_in();
-    			break;
-    		case '02':
-    			$this->log_in_form();
-    			break;
-    		case '03':
-    			$this->do_log_out();
-    			break;
-    			
-    		case '04':
-    			$this->markforum();
-    			break;
-    			
-    		case '05':
-    			$this->markboard();
-    			break;
-    			
-    		case '06':
-    			$this->delete_cookies();
-    			break;
-    			
-    		case 'autologin':
-    			$this->auto_login();
-    			break;
-    			
-    		default:
-    			$this->log_in_form($msg);
-    			break;
-    	}
-    	
-    	// If we have any HTML to print, do so...
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
- 	}
- 	
- 	function auto_login()
- 	{
- 		global $ibforums, $DB, $std, $print, $sess;
- 		
- 		// Universal routine.
- 		// If we have cookies / session created, simply return to the index screen
- 		// If not, return to the log in form
- 		
- 		$ibforums->member = $sess->authorise();
- 		
- 		// If there isn't a member ID set, do a quick check ourselves.
- 		// It's not that important to do the full session check as it'll
- 		// occur when they next click a link.
- 		
- 		if ( ! $ibforums->member['id'] )
- 		{
-			$mid = intval($std->my_getcookie('member_id'));
-			$pid = $std->my_getcookie('pass_hash');
-			
-			If ($mid and $pid)
-			{
-				$DB->query("SELECT * FROM ibf_members WHERE id=$mid AND password='$pid'");
-				
-				if ( $member = $DB->fetch_row() )
-				{
-					$ibforums->member = $member;
-					$ibforums->session_id = "";
-					$std->my_setcookie('session_id', '0', -1 );
-				}
-			}
- 		}
- 		
- 		$true_words  = $ibforums->lang['logged_in'];
- 		$false_words = $ibforums->lang['not_logged_in'];
- 		$method = 'no_show';
- 		
- 		if ($ibforums->input['fromreg'] == 1)
- 		{
- 			$true_words  = $ibforums->lang['reg_log_in'];
- 			$false_words = $ibforums->lang['reg_not_log_in'];
- 			$method = 'show';
- 		}
- 		else if ($ibforums->input['fromemail'] == 1)
- 		{
- 			$true_words  = $ibforums->lang['email_log_in'];
- 			$false_words = $ibforums->lang['email_not_log_in'];
- 			$method = 'show';
- 		}
- 		else if ($ibforums->input['frompass'] == 1)
- 		{
- 			$true_words  = $ibforums->lang['pass_log_in'];
- 			$false_words = $ibforums->lang['pass_not_log_in'];
- 			$method = 'show';
- 		}
- 		
- 		if ($ibforums->member['id'])
- 		{
- 			if ($method == 'show')
- 			{
- 				$print->redirect_screen( $true_words, "" );
- 			}
- 			else
- 			{
- 				$std->boink_it($ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext']);
- 			}
- 		}
- 		else
- 		{
- 			if ($method == 'show')
- 			{
- 				$print->redirect_screen( $false_words, 'act=Login&CODE=00' );
- 			}
- 			else
- 			{
- 				$std->boink_it($ibforums->base_url.'&act=Login&CODE=00');
- 			}
- 		}
- 		
- 		
- 	}
- 	
- 	
- 	
- 	function delete_cookies()
- 	{
- 		global $ibforums, $DB, $std, $HTTP_COOKIE_VARS;
- 		
- 		if (is_array($HTTP_COOKIE_VARS))
- 		{
- 			foreach( $HTTP_COOKIE_VARS as $cookie => $value)
- 			{
- 				if (preg_match( "/^(".$ibforums->vars['cookie_id']."ibforum.*$)/i", $cookie, $match))
- 				{
- 					$std->my_setcookie( str_replace( $ibforums->vars['cookie_id'], "", $match[0] ) , '-', -1 );
- 				}
- 			}
- 		}
- 		
- 		$std->my_setcookie('pass_hash' , '-1');
- 		$std->my_setcookie('member_id' , '-1');
- 		$std->my_setcookie('session_id', '-1');
- 		$std->my_setcookie('topicsread', '-1');
- 		$std->my_setcookie('anonlogin' , '-1');
- 		$std->my_setcookie('forum_read', '-1');
- 		
-		$std->boink_it($ibforums->base_url);
-		exit();
-	}  
-	
- 	
- 	function markboard()
- 	{
- 		global $ibforums, $DB, $std;
- 		
- 		if(! $ibforums->member['id'])
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_guests') );
-		}
-		
-		$DB->query("UPDATE ibf_members SET last_visit='".time()."', last_activity='".time()."' WHERE id='".$ibforums->member['id']."'");
-		
-		$std->boink_it($ibforums->base_url);
-		exit();
-	}  
-    
-    
-    function markforum()
-    {
-        global $ibforums, $DB, $std;
-        
-        $ibforums->input['f'] = intval($ibforums->input['f']);
-        
-        if ($ibforums->input['f'] == "")
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files' ) );
-        }
-        
-        $DB->query("SELECT id, name, subwrap, parent_id FROM ibf_forums WHERE id=".$ibforums->input['f']);
-        
-        if ( ! $f = $DB->fetch_row() )
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files' ) );
-        }
-        
-        //--------------------------------------	
-        // Did we come in via the index?
-        //--------------------------------------
-        
-        if ( $ibforums->input['i'] == 1 )
-        {	
-        	//--------------------------------------
-        	// It's also a subforum, so grab all
-        	// meh kiddies. "meh kiddies"? That's Rikki's
-        	// bad influence. o_O
-        	//--------------------------------------
-        	
-        	$DB->query("SELECT id FROM ibf_forums WHERE parent_id={$ibforums->input['f']}");
-        	
-        	while ( $r = $DB->fetch_row() )
-        	{
-        		$ibforums->forum_read[ $r['id'] ] = time();
-        	}
-        }
-        
-        //--------------------------------------	
-        // Reset cookie (yum)
-        //--------------------------------------
-        
-        $ibforums->forum_read[ $ibforums->input['f'] ] = time();
-			
-		$std->hdl_forum_read_cookie('set');
-		
-		//--------------------------------------	
-        // Are we getting kicked back to the root forum (if sub forum) or index?
-        //--------------------------------------
-        
-        if ( ($f['parent_id'] > 0) AND ($ibforums->input['i'] != 1) )
-        {
-        	//--------------------------------------
-        	// Its a sub forum, lets go redirect to parent forum
-        	//--------------------------------------
-        	
-        	$std->boink_it($ibforums->base_url."act=SF&f=".$f['parent_id']);
-        }
-        else
-        {
-        	$std->boink_it($ibforums->base_url);
-        }
-        exit();
-        
-    }
-    
-    
-    
-    
-    function log_in_form($message="")
-    {
-        global $ibforums, $DB, $std, $print, $HTTP_REFERER;
-        
-        //+--------------------------------------------
-		//| Are they banned?
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['ban_ip'])
-		{
-			$ips = explode( "|", $ibforums->vars['ban_ip'] );
-			foreach ($ips as $ip)
-			{
-				$ip = preg_replace( "/\*/", '.*' , $ip );
-				if (preg_match( "/$ip/", $ibforums->input['IP_ADDRESS'] ))
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'you_are_banned' ) );
-				}
-			}
-		}
-        
-        //+--------------------------------------------
-        
-        if ($message != "")
-        {
-        	$message = $ibforums->lang[ $message ];
-        	$message = preg_replace( "/<#NAME#>/", "<b>{$ibforums->input[UserName]}</b>", $message );
-        
-			$this->output .= $this->login_html->errors($message);
-		}
-		
-		$this->output .= $this->login_html->ShowForm( $ibforums->lang['please_log_in'], $HTTP_REFERER );
-		
-		$this->nav        = array( $ibforums->lang['log_in'] );
-	 	$this->page_title = $ibforums->lang['log_in'];
-		
-		$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-        
-        exit();
-        
-    }
-    
-    //+--------------------------------------------
-    
-    function do_log_in() {
-    	global $DB, $ibforums, $std, $print, $sess, $HTTP_USER_AGENT, $HTTP_POST_VARS;
-    	
-    	$url = "";
-    	
-    	//-------------------------------------------------
-		// More unicode..
-		//-------------------------------------------------
-		
-		$len_u = $std->txt_stripslashes($HTTP_POST_VARS['UserName']);
-		
-		$len_u = preg_replace("/&#([0-9]+);/", "-", $len_u );
-		
-		$len_p = $std->txt_stripslashes($HTTP_POST_VARS['PassWord']);
-		
-		$len_p = preg_replace("/&#([0-9]+);/", "-", $len_p );
-		
-    	//-------------------------------------------------
-    	// Make sure the username and password were entered
-    	//-------------------------------------------------
-    	
-    	if ($HTTP_POST_VARS['UserName'] == "")
-    	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
-    	}
-    
-     	if ($HTTP_POST_VARS['PassWord'] == "")
-     	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_blank' ) );
-    	}   
-
-		
-		//-------------------------------------------------
-		// Check for input length
-		//-------------------------------------------------
-		
-		if (strlen($len_u) > 32)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'username_long' ) );
-		}
-		
-		if (strlen($len_p) > 32)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'pass_too_long' ) );
-		}
-		
-		$username    = strtolower(str_replace( '|', '&#124;', $ibforums->input['UserName']) );
-		$password    = md5( $ibforums->input['PassWord'] );
-		
-		//-------------------------------------------------
-		// Attempt to get the user details
-		//-------------------------------------------------
-		
-		$DB->query("SELECT id, name, mgroup, password, ip_address FROM ibf_members WHERE LOWER(name)='$username'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$member = $DB->fetch_row();
-			
-			if ( empty($member['id']) or ($member['id'] == "") )
-			{
-				$this->log_in_form( 'wrong_name' );
-			}
-			
-			if ($member['password'] != $password)
-			{
-				$this->log_in_form( 'wrong_pass' );
-			}
-			
-			//------------------------------
-			
-			if ($ibforums->input['CookieDate'])
-			{
-				$std->my_setcookie("member_id"   , $member['id'], 1);
-				$std->my_setcookie("pass_hash"   , $password, 1);
-			}
-			
-			//------------------------------
-			// Update profile if IP addr missing
-			//------------------------------
-			
-			if ( $member['ip_address'] == "" OR $member['ip_address'] == '127.0.0.1' )
-			{
-				$DB->query("UPDATE ibf_members SET ip_address='{$ibforums->input['IP_ADDRESS']}' WHERE id={$member['id']}");
-			}
-			
-			//------------------------------
-			// Create / Update session
-			//------------------------------
-			
-			$poss_session_id = "";
-			
-			if ( $cookie_id = $std->my_getcookie('session_id') )
-			{
-				$poss_session_id = $std->my_getcookie('session_id');
-			}
-			else if ( $ibforums->input['s'] )
-			{
-				$poss_session_id = $ibforums->input['s'];
-			}
-			
-			if ($poss_session_id)
-			{
-				$session_id = $poss_session_id;
-				
-				// Delete any old sessions with this users IP addy that doesn't match our
-				// session ID.
-				
-				$DB->query("DELETE FROM ibf_sessions WHERE ip_address='".$ibforums->input['IP_ADDRESS']."' AND id <> '$session_id'");
-				
-				$db_string = $DB->compile_db_update_string( array (
-																	 'member_name'  => $member['name'],
-																	 'member_id'    => $member['id'],
-																	 'running_time' => time(),
-																	 'member_group' => $member['mgroup'],
-																	 'login_type'   => $ibforums->input['Privacy'] ? 1 : 0
-														  )       );
-														  
-				$db_query = "UPDATE ibf_sessions SET $db_string WHERE id='".$session_id."'";
-			}
-			else
-			{
-				$session_id = md5( uniqid(microtime()) );
-				
-				// Delete any old sessions with this users IP addy.
-				
-				$DB->query("DELETE FROM ibf_sessions WHERE ip_address='".$ibforums->input['IP_ADDRESS']."'");
-				
-				$db_string = $DB->compile_db_insert_string( array (
-																	 'id'           => $session_id,
-																	 'member_name'  => $member['name'],
-																	 'member_id'    => $member['id'],
-																	 'running_time' => time(),
-																	 'member_group' => $member['mgroup'],
-																	 'ip_address'   => substr($ibforums->input['IP_ADDRESS'], 0, 50),
-																	 'browser'      => substr($std->clean_value($HTTP_USER_AGENT), 0, 50),
-																	 'login_type'   => $ibforums->input['Privacy'] ? 1 : 0
-														  )       );
-														 
-				$db_query = "INSERT INTO ibf_sessions (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
-			}
-			
-			$DB->query( $db_query );
-			
-			$ibforums->member           = $member;
-			$ibforums->session_id       = $session_id;
-			
-			if ($ibforums->input['referer'] && ($ibforums->input['act'] != 'Reg'))
-			{
-				$url = $ibforums->input['referer'];
-				$url = str_replace( "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}", "", $url );
-				$url = preg_replace( "!^\?!"       , ""   , $url );
-				$url = preg_replace( "!s=(\w){32}!", ""   , $url );
-				$url = preg_replace( "!act=(login|reg|lostpass)!i", "", $url );
-			}
-			
-			//-----------------------------------
-			// set our privacy cookie
-			//-----------------------------------
-			
-			if ($ibforums->input['Privacy'] == 1)
-			{
-				$std->my_setcookie( "anonlogin", 1 );
-			}
-			
-			//-----------------------------------
-			// Clear out any passy change stuff
-			//-----------------------------------
-			
-			$DB->query("DELETE FROM ibf_validating WHERE member_id={$ibforums->member['id']} AND lost_pass=1");
-			
-			//-----------------------------------
-			// Redirect them to either the board
-			// index, or where they came from
-			//-----------------------------------
-			
-			$std->my_setcookie("session_id", $ibforums->session_id, -1);
-			
-			$this->logged_in = 1;
-			
-			if ( USE_MODULES == 1 )
-			{
-				$this->modules->register_class(&$this);
-				$this->modules->on_login($member);
-			}
-			
-			if ( $ibforums->input['return'] != "" )
-			{
-				$return = urldecode($ibforums->input['return']);
-				
-				if ( preg_match( "#^http://#", $return ) )
-				{
-					$std->boink_it($return);
-				}
-			}
-			
-			$print->redirect_screen( "{$ibforums->lang[thanks_for_login]} {$ibforums->member['name']}", $url );
-			
-			
-		}
-		else
-		{
-			$this->logged_in = 0;
-			
-			if ( USE_MODULES == 1 )
-			{
-				$this->modules->register_class(&$this);
-				$this->modules->on_login($member);
-			}
-			
-			$this->log_in_form( 'wrong_name' );
-		}
-		
-	}
-	
-	
-	
-	
-	
-
-	function do_log_out()
-	{
-		global $std, $ibforums, $DB, $print, $sess, $HTTP_COOKIE_VARS;
-		
-		// Update the DB
-		
-		$DB->query("UPDATE ibf_sessions SET ".
-				     "member_name='',".
-				     "member_id='0',".
-				     "login_type='0' ".
-				     "WHERE id='". $sess->session_id ."'");
-				     
-		$DB->query("UPDATE ibf_members SET last_visit='".time()."', last_activity='".time()."' WHERE id='".$ibforums->member['id']."'");
-				     
-		// Set some cookies
-		
-		$std->my_setcookie( "member_id" , "0"  );
-		$std->my_setcookie( "pass_hash" , "0"  );
-		$std->my_setcookie( "anonlogin" , "-1" );
-		
-		if (is_array($HTTP_COOKIE_VARS))
- 		{
- 			foreach( $HTTP_COOKIE_VARS as $cookie => $value )
- 			{
- 				if (preg_match( "/^(".$ibforums->vars['cookie_id']."ibforum.*$)/i", $cookie, $match))
- 				{
- 					if ( strlen( $match[1] ) > 0 )
- 					{
- 						$std->my_setcookie( str_replace( $ibforums->vars['cookie_id'], "", $match[1] ) , '-', -1 );
- 					}
- 				}
- 			}
- 		}
-		
-		// Redirect...
-		
-		$url = "";
-		
-		if ( $ibforums->input['return'] != "" )
-		{
-			$return = urldecode($ibforums->input['return']);
-			
-			if ( preg_match( "#^http://#", $return ) )
-			{
-				$std->boink_it($return);
-			}
-		}
-		
-		$print->redirect_screen( $ibforums->lang['thanks_for_logout'], "" );
-		
-	}
-
-
-
-
-        
-}
-
-?>
diff --git a/upload/sources/Memberlist.php b/upload/sources/Memberlist.php
deleted file mode 100644
index 4faed2bc..00000000
--- a/upload/sources/Memberlist.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Show all the members
-|   > Module written by Matt Mecham
-|   > Date started: 20th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Memberlist;
-
-class Memberlist {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $html       = "";
-    var $base_url   = "";
-
-    var $first       = 0;
-    var $max_results = 10;
-    var $sort_key    = 'name';
-    var $sort_order  = 'asc';
-    var $filter      = 'ALL';
-    
-    var $mem_titles = array();
-    var $mem_groups = array();
-    
-    
-    function Memberlist()
-    {
-    	global $ibforums, $DB, $std, $print;
-    	
-    	
-    	if ($ibforums->input['CODE'] == "") $ibforums->input['CODE'] = 'listall';
-    	
-    	//--------------------------------------------
-    	// Require the HTML and language modules
-    	//--------------------------------------------
-    	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_mlist', $ibforums->lang_id );
-    	
-    	$this->html = $std->load_template('skin_mlist');
-    	
-    	$this->base_url        = $ibforums->base_url;
-    	
-    	if ($ibforums->member['g_mem_info'] != 1)
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
-    	}
-    	
-    	$see_groups = array();
-    	
-    	//--------------------------------------------
-    	// Get the member groups, member titles stuff
-    	//--------------------------------------------
-    	
-    	$DB->query("SELECT g_title, g_id, g_icon from ibf_groups WHERE g_hide_from_list <> 1 ORDER BY g_title");
-    	
-    	while ($row = $DB->fetch_row() )
-    	{
-    		$see_groups[] = $row['g_id'];
-    		
-    		$this->mem_groups[ $row['g_id'] ] = array( 'TITLE'  => $row['g_title'],
-    												   'ICON'   => $row['g_icon'],
-    											     );
-    	}
-    	
-    	unset($row);
-    	
-    	$group_string = implode( ",", $see_groups );
-    	
-    	$DB->free_result();
-    	
-    	$DB->query("SELECT title, id, posts, pips from ibf_titles ORDER BY posts DESC");
-    	
-    	while ($row = $DB->fetch_row() )
-    	{
-    		$this->mem_titles[ $row['id'] ] = array( 'TITLE'   => $row['title'],
-    												 'POSTS'   => $row['posts'],
-    												 'PIPS'    => $row['pips'],
-    												 
-    											   );
-    	}
-    	
-    	unset($row);
-    	
-    	$DB->free_result();
-    	
-    	$the_filter  = array( 'ALL' => $ibforums->lang['show_all'] );
-    	
-    	foreach($this->mem_groups as $id => $data)
-    	{
-    		if ($id == $ibforums->vars['guest_group'])
-    		{
-    			continue;
-    		}
-    		$the_filter[$id] = $data['TITLE'];
-    	}
-    	
-    	//------------------------------------------
-    	// Test for input
-    	//------------------------------------------
-    	
-    	if (isset($ibforums->input['st']))          $this->first       = intval($ibforums->input['st']);
-    	if (isset($ibforums->input['max_results'])) $this->max_results = $ibforums->input['max_results'];
-    	if (isset($ibforums->input['sort_key']))    $this->sort_key    = $ibforums->input['sort_key'];
-    	if (isset($ibforums->input['sort_order']))  $this->sort_order  = $ibforums->input['sort_order'];
-    	if (isset($ibforums->input['filter']))      $this->filter      = $ibforums->input['filter'];
-    	
-    	//------------------------------------------
-    	// Fix up the search box
-    	//------------------------------------------
-    	
-    	$ibforums->input['name'] = $std->clean_value(trim(urldecode(stripslashes($ibforums->input['name']))));
-    	
-    	if ($ibforums->input['name'] == "")
-    	{
-    		$ibforums->input['name_box'] = 'all';
-    	}
-    	
-    	//------------------------------------------
-    	// Init some arrays
-    	//------------------------------------------
-    	
-    	$the_sort_key = array( 'name'    => 'sort_by_name',
-    						   'posts'   => 'sort_by_posts',
-    						   'joined'  => 'sort_by_joined',
-    						 );
-    						 
-    	$the_max_results = array( 10  => '10',
-    							  20  => '20',
-    							  30  => '30',
-    							  40  => '40',
-    							  50  => '50',
-    						    );
-    						    
-    	$the_sort_order = array(  'desc' => 'descending_order',
-    							  'asc'  => 'ascending_order',
-    						   );
-    						   
-    	//------------------------------------------
-    	// Start the form stuff
-    	//------------------------------------------
-    						   
-    	$filter_html      = "<select name='filter' class='forminput'>\n";
-    	$sort_key_html    = "<select name='sort_key' class='forminput'>\n";
-    	$max_results_html = "<select name='max_results' class='forminput'>\n";
-    	$sort_order_html  = "<select name='sort_order' class='forminput'>\n";
-    	
-    	foreach ($the_sort_order as $k => $v) {
-			$sort_order_html .= $k == $this->sort_order ? "<option value='$k' selected>" . $ibforums->lang[ $the_sort_order[ $k ] ] . "</option>\n"
-											            : "<option value='$k'>"          . $ibforums->lang[ $the_sort_order[ $k ] ] . "</option>\n";
-		}
-     	foreach ($the_filter as $k => $v) {
-			$filter_html .= $k == $this->filter  ? "<option value='$k' selected>"         . $the_filter[ $k ] . "</option>\n"
-											            : "<option value='$k'>"          . $the_filter[ $k ] . "</option>\n";
-		}   	
-    	foreach ($the_sort_key as $k => $v) {
-			$sort_key_html .= $k == $this->sort_key ? "<option value='$k' selected>"     . $ibforums->lang[ $the_sort_key[ $k ] ] . "</option>\n"
-											            : "<option value='$k'>"          . $ibforums->lang[ $the_sort_key[ $k ] ] . "</option>\n";
-		}    	
-    	foreach ($the_max_results as $k => $v) {
-			$max_results_html .= $k == $this->max_results ? "<option value='$k' selected>". $the_max_results[ $k ] . "</option>\n"
-											            : "<option value='$k'>"          . $the_max_results[ $k ] . "</option>\n";
-		}
-		
-		$ibforums->lang['sorting_text'] = preg_replace( "/<#FILTER#>/"      , $filter_html."</select>"     , $ibforums->lang['sorting_text'] );
-    	$ibforums->lang['sorting_text'] = preg_replace( "/<#SORT_KEY#>/"    , $sort_key_html."</select>"   , $ibforums->lang['sorting_text'] );
-    	$ibforums->lang['sorting_text'] = preg_replace( "/<#SORT_ORDER#>/"  , $sort_order_html."</select>" , $ibforums->lang['sorting_text'] );
-    	$ibforums->lang['sorting_text'] = preg_replace( "/<#MAX_RESULTS#>/" , $max_results_html."</select>", $ibforums->lang['sorting_text'] );
-    	
-    	$error = 0;
-    	
-    	if (! isset($the_sort_key[ $this->sort_key ]) )       $error = 1;
-    	if (! isset($the_sort_order[ $this->sort_order ]) )   $error = 1;
-    	if (! isset($the_filter[ $this->filter ]) )           $error = 1;
-    	if (! isset($the_max_results[ $this->max_results ]) ) $error = 1;
-    	
-    	if ($error == 1 )
-    	{
-    		if ( $ibforums->input['b'] == 1 ) 
-    		{
-    			$std->Error( array( LEVEL=> 1, MSG =>'ml_error') );
-    		}
-    		else
-    		{
-    			$std->Error( array( LEVEL=> 5, MSG =>'incorrect_use') );
-    		}
-    	}
-    	
-    	//---------------------------------------------
-    	// Find out how many members match our criteria
-    	//---------------------------------------------
-    	
-    	$q_extra = "";
-    	
-    	if ($this->filter != 'ALL')
-    	{
-    		// Are we allowed to see this group?
-    		
-    		if ( ! preg_match( "/(^|,)".$this->filter."(,|$)/", $group_string ) )
-    		{
-    			$q_extra = " AND m.mgroup IN($group_string)";
-    		}
-    		else
-    		{
-    			$q_extra = " AND m.mgroup='".$this->filter."' ";
-    		}
-    	}
-    	
-    	if ($ibforums->input['name_box'] != 'all')
-    	{
-    		if ( $ibforums->input['name_box'] == 'begins' )
-    		{
-    			$q_extra .= " AND m.name LIKE '".$ibforums->input['name']."%'";
-    		}
-    		else
-    		{
-    			$q_extra .= " AND m.name LIKE '%".$ibforums->input['name']."%'";
-    		}
-    	}
-    	
-    	if ($ibforums->input['photoonly'] == 1)
-    	{
-    		$DB->query("SELECT COUNT(m.id) as total_members FROM ibf_members m
-    				    LEFT JOIN ibf_member_extra me ON me.id=m.id
-    				    LEFT JOIN ibf_groups g ON m.mgroup=g.g_id
-    				    WHERE me.photo_location <> '' AND m.id > 0  AND g.g_hide_from_list <> 1".$q_extra);
-    		
-    		$q_extra .= " AND me.photo_location <> ''";
-    	}
-    	else
-    	{
-	    	$DB->query("SELECT COUNT(m.id) as total_members FROM ibf_members m
-	    				LEFT JOIN ibf_groups g ON m.mgroup=g.g_id
-	    				WHERE m.id > 0  AND g.g_hide_from_list <> 1".$q_extra);
-	    }
-	    
-		$max = $DB->fetch_row();
-		
-		$DB->free_result();
-		
-		$links = $std->build_pagelinks(  array( 'TOTAL_POSS'  => $max['total_members'],
-												'PER_PAGE'    => $this->max_results,
-												'CUR_ST_VAL'  => $this->first,
-												'L_SINGLE'     => "",
-												'L_MULTI'      => $ibforums->lang['pages'],
-												'BASE_URL'     => $this->base_url."&amp;act=Members&amp;photoonly={$ibforums->input['photoonly']}&amp;name=".urlencode($ibforums->input['name'])."&amp;name_box={$ibforums->input['name_box']}&amp;max_results={$this->max_results}&amp;filter={$this->filter}&amp;sort_order={$this->sort_order}&amp;sort_key={$this->sort_key}"
-											  )
-									   );
-									   
-		$this->output = $this->html->start();
-									   
-		$this->output .= $this->html->Page_header( array( 'SHOW_PAGES' => $links) );  
-		
-		//-----------------------------
-		// START THE LISTING
-		//-----------------------------
-		
-		$DB->query("SELECT m.name, m.id, m.posts, m.joined, m.mgroup, m.email,m.title, m.hide_email, m.location, m.aim_name, m.icq_number,
-		                   me.photo_location, me.photo_type, me.photo_dimensions
-				    FROM ibf_members m
-				      LEFT JOIN ibf_member_extra me ON me.id=m.id
-				      LEFT JOIN ibf_groups g ON m.mgroup=g.g_id
-				    WHERE m.id > 0".$q_extra." AND g.g_hide_from_list <> 1
-				    ORDER BY m.".$this->sort_key." ".$this->sort_order."
-				    LIMIT ".$this->first.",".$this->max_results);
-		
-		while($member = $DB->fetch_row() )
-		{
-		
-			$pips = 0;
-			
-			foreach($this->mem_titles as $k => $v)
-			{
-				if ($member['posts'] >= $v['POSTS'])
-				{
-					if (!$member['title'])
-					{
-						$member['title'] = $this->mem_titles[ $k ]['TITLE'];
-					}
-					$pips = $v['PIPS'];
-					break;
-				}
-			}
-			
-			if ($this->mem_groups[ $member['mgroup'] ]['ICON'])
-			{
-				$member['pips'] = "<img src='{$ibforums->vars[TEAM_ICON_URL]}/{$this->mem_groups[ $member['mgroup'] ][ICON]}' border='0' />";
-			}
-			else
-			{
-				if ($pips)
-				{
-					if (preg_match( "/^\d+$/", $pips ) )
-					{
-						for ($i = 1; $i <= $pips; ++$i)
-						{
-							$member['pips'] .= "<{A_STAR}>";
-						}
-					}
-					else
-					{
-						$member['pips'] = "<img src='{$ibforums->vars[TEAM_ICON_URL]}/$pips' border='0' />";
-					}
-				}
-			}
-								   
-			$member['joined'] = $std->get_date( $member['joined'], 'JOINED' );
-			
-			$member['group']  = $this->mem_groups[ $member['mgroup'] ]['TITLE'];
-			
-			
-			if (!$member['hide_email'])
-			{
-				$member['member_email'] = "<a href='{$this->base_url}act=Mail&amp;CODE=00&amp;MID={$member['id']}'><{P_EMAIL}></a>";
-			}
-			else
-			{
-				$member['member_email'] = '&nbsp;';
-			}
-			
-			if ($member['icq_number'])
-			{
-				$member['icq_number'] = "<a href=\"javascript:PopUp('{$this->base_url}act=ICQ&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_ICQ}></a>";
-			}
-			else
-			{
-				$member['icq_number'] = '&nbsp;';
-			}
-			
-			if ($member['aim_name'])
-			{
-				$member['aim_name'] = "<a href=\"javascript:PopUp('{$this->base_url}act=AOL&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_AOL}></a>";
-			}
-			else
-			{
-				$member['aim_name'] = '&nbsp;';
-			}
-			
-			if ($member['photo_type'] and $member['photo_location'])
-			{
-				$member['camera'] = "<a href=\"javascript:PopUp('{$this->base_url}act=Profile&amp;CODE=showphoto&amp;MID={$member['id']}','Photo','200','250','0','1','1','1')\"><{CAMERA}></a>";
-			}
-			
-			$member['password'] = "";
-			
-			$member['posts'] = $std->do_number_format($member['posts']);
-			
-			$this->output .= $this->html->show_row($member);
-			
-		}
-		
-		$checked = $ibforums->input['photoonly'] == 1 ? 'checked="checked"' : "";
-		
-		$this->output .= $this->html->Page_end( $checked );
-		
-		$this->output .= $this->html->end( array( 'SHOW_PAGES' => $links) );
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $ibforums->lang['page_title'], 'JS' => 0, NAV => array( $ibforums->lang['page_title'] ) ) );
-    		
- 	}
- 	
- 	
-	
-}
-
-?>
diff --git a/upload/sources/Messenger.php b/upload/sources/Messenger.php
deleted file mode 100644
index ded9c656..00000000
--- a/upload/sources/Messenger.php
+++ /dev/null
@@ -1,2413 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Messenger functions
-|   > Module written by Matt Mecham
-|   > Date started: 26th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Messenger;
-
-class Messenger {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $html       = "";
-    var $email      = "";
-    
-    var $msg_stats  = array();
-    var $prefs      = "";
-    
-    var $member     = array();
-    var $m_group    = array();
-    
-    var $to_mem     = array();
-    
-    var $jump_html  = "";
-    
-    var $vid        = "in";
-    var $mem_groups = array();
-    var $mem_titles = array();
-    
-    var $parser     = "";
-    
-    var $cp_html    = "";
-    
-    function Messenger() {
-    	global $ibforums, $DB, $std, $print;
-    	
-    	//--------------------------------------------
-    	// Require the HTML and language modules
-    	//--------------------------------------------
-    	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_msg', $ibforums->lang_id);
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_ucp'   , $ibforums->lang_id);
-    	
-    	//--------------------------------------------
-    	
-    	$this->html = $std->load_template('skin_msg');
-    	
-    	//--------------------------------------------
-    	
-    	$this->cp_html = $std->load_template('skin_ucp');
-    	
-    	//--------------------------------------------
-    	
-    	$this->base_url        = $ibforums->base_url;
-    	$this->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
-    	
-    	//--------------------------------------------
-    	// Check viewing permissions, etc
-		//--------------------------------------------
-		
-		$this->member  = $ibforums->member;
-		
-		if (empty($this->member['g_use_pm'])) {
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_use_messenger' ) );
-		}
-		
-		if (empty($this->member['id'])) {
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
-		}
-		
-		//--------------------------------------------
-    	// Get the member stats data
-    	//--------------------------------------------
-    	
-    	$DB->query("SELECT vdirs, msg_total, new_msg, msg_msg_id FROM ibf_members WHERE id='".$this->member['id']."'");
-    	$this->msg_stats = $DB->fetch_row();
-    	
-    	//--------------------------------------------
-    	// Do a little set up, do a litle dance, get
-    	// down tonight! *boogie*
-    	//--------------------------------------------
-    	
-    	$this->jump_html = "<select name='VID' class='forminput'>\n";
-    	
-    	$this->msg_stats['dir_data'] = array();
-    	
-    	// Do we have VID?
-    	// No, it's just the way we walk! Haha, etc.
-    	
-    	if ($ibforums->input['VID'])
-    	{
-    		$this->vid = $ibforums->input['VID'];
-    	}
-    	
-    	if (empty($this->msg_stats['vdirs']))
-    	{
-    		$this->msg_stats['vdirs'] = "in:Inbox|sent:Sent Items";
-    	}
-    	
-    	$folder_links = "";
-    	
-    	foreach( explode( "|", $this->msg_stats['vdirs'] ) as $dir )
-    	{
-    		list ($id, $real) = explode( ":", $dir );
-    		
-    		if (empty($id))
-    		{
-    			continue;
-    		}
-    		
-    		$this->msg_stats['dir_data'][] = array( 'id' => $id, 'real' => $real );
-    		
-    		if ($this->vid == $id)
-    		{
-    			$this->msg_stats['current_dir'] = $real;
-    			$this->msg_stats['current_id']  = $id;
-    			$this->jump_html .= "<option value='$id' selected='selected'>$real</option>\n";
-    		}
-    		else
-    		{
-    			$this->jump_html .= "<option value='$id'>$real</option>\n";
-    		}
-    		
-    		if ( $id != 'in' )
-    		{
-    			$folder_links .= $this->cp_html->menu_bar_msg_folder_link($id, $real);
-    		}
-    	}
-    	
-    	$this->jump_html .= "<!--EXTRA--></select>\n\n";
-    	
-    	$menu_html = $this->cp_html->Menu_bar($this->base_url);
-    	
-    	if ( $folder_links != "" )
-		{
-			$menu_html = str_replace( "<!--IBF.FOLDER_LINKS-->", $folder_links, $menu_html );
-		}
-		
-		//--------------------------------------------
-    	// Using Sub Manager?
-    	//--------------------------------------------
-    	
-		if ( @is_dir( ROOT_PATH.'/modules/subsmanager' ) )
-		{
-			$url  = $ibforums->base_url."act=module&amp;module=subscription&amp;CODE=index";
-			$name = $ibforums->lang['new_sub_link'];
-			
-			$menu_html = str_replace( "<!--IBF.OPTION_LINKS-->", $this->cp_html->menu_bar_new_link( $url, $name ), $menu_html );
-		}
-		
-		if ($ibforums->vars['top_site_list_integrate'])
-		{
-			$menu_html = str_replace( "<!--IBF.TSLLINKS-->", $this->cp_html->tsl_links(), $menu_html );
-		}
-		
-		
-    	$print->add_output( $menu_html );
-    	
-    	
-    	//--------------------------------------------
-    	// What to do?
-    	//--------------------------------------------
-    	
-    	
-    	switch($ibforums->input['CODE']) {
-    		case '01':
-    			$this->msg_list();
-    			break;
-    		case '02':
-    			$this->contact();
-    			break;
-    		case '03':
-    			$this->view_msg();
-    			break;
-    		case '04';
-    			$this->send();
-    			break;
-    		case '05':
-    			$this->delete();
-    			break;
-    		case '06':
-    			$this->multi_act();
-    			break;
-    		case '07':
-    			$this->prefs();
-    			break;
-    		case '08':
-    			$this->do_prefs();
-    			break;
-    		case '09':
-    			$this->add_member();
-    			break;
-    		case '10':
-    			$this->del_member();
-    			break;
-    		case '11':
-    			$this->edit_member();
-    			break;
-    		case '12':
-    			$this->do_edit();
-    			break;
-    		case '14':
-    			$this->archive();
-    			break;
-    		case '15':
-    			$this->do_archive();
-    			break;
-    		case '99':
-    			$this->pm_popup();
-    			break;
-    			
-    		case '20':
-    			$this->view_saved();
-    			break;
-    			
-    		case '21':
-    			$this->edit_saved();
-    			break;
-    			
-    		case '30':
-    			$this->show_tracking();
-    			break;
-    			
-    		case '31':
-    			$this->end_tracking();
-    			break;
-    			
-    		case '32':
-    			$this->del_tracked();
-    			break;
-    			
-    		case 'delete':
-    			$this->start_empty_folders();
-    			break;
-    		case 'dofolderdelete':
-    			$this->end_empty_folders();
-    			break;
-    			
-    		default:
-    			$this->msg_list();
-    			break;
-    	}
-    	
-    	// If we have any HTML to print, do so...
-    	
-    	$fj = $std->build_forum_jump();
-		$fj = preg_replace( "!#Forum Jump#!", $ibforums->lang['forum_jump'], $fj);
-		
-		$this->output .= $this->cp_html->CP_end();
-		
-		$this->output .= $this->cp_html->forum_jump($fj);
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
- 	}
- 	
- 	/**********************************************************/
- 	// PM Pop up:
- 	//
- 	// Simpy display the pop up window
- 	/**********************************************************/
- 	
- 	function pm_popup() {
- 	
- 		global $DB, $std, $print, $ibforums;
- 		
- 		// Get the last message stuff
- 		
- 		$DB->query("SELECT m.name, msg.title, msg.msg_date, msg.from_id FROM ibf_members m, ibf_messages msg ".
- 				   "WHERE msg.member_id='".$ibforums->member['id']."' AND msg_id='".$this->msg_stats['msg_msg_id']."' ".
- 				   "AND m.id=msg.from_id");
- 				   
- 		$row = $DB->fetch_row();
- 				   
- 		// Fix up the text string...
- 		
- 		$row['msg_date'] = $std->get_date( $row['msg_date'], 'LONG' );
- 		
- 		$text = preg_replace( "/<#NAME#>/" , $row['name']    , $ibforums->lang['pmp_string'] );
- 		$text = preg_replace( "/<#TITLE#>/", $row['title']   , $text );
- 		$text = preg_replace( "/<#DATE#>/" , $row['msg_date'], $text );
- 		
- 		$html = $this->html->pm_popup($text, $this->msg_stats['msg_msg_id']);
- 		
- 		$print->pop_up_window( "PM", $html );
- 	
- 	}
- 	
- 	/**********************************************************/
- 	// Empty PM folders:
- 	//
- 	// Interface for removing PM's on a folder by folder basis
- 	/**********************************************************/
- 	
- 	function start_empty_folders()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$this->output .= $this->html->empty_folder_header();
- 		
- 		//--------------------------------------------------
- 		// Get the PM count - 1 query?
- 		//--------------------------------------------------
- 		
- 		$count = array( 'unsent' => 0 );
- 		$names = array( 'unsent' => $ibforums->lang['fd_unsent'] );
- 		
- 		foreach( $this->msg_stats['dir_data'] as $k => $v )
- 		{
- 			$count[ $v['id'] ] = 0;
- 			$names[ $v['id'] ] = $v['real'];
- 		}
- 		
- 		$DB->query("SELECT msg_id, vid FROM ibf_messages WHERE member_id={$ibforums->member['id']} LIMIT 0,1000");
- 		
- 		while( $r = $DB->fetch_row() )
- 		{
- 			if ( $r['vid'] == "" )
- 			{
- 				$count['in']++;
- 			}
- 			else
- 			{
- 				$count[ $r['vid'] ]++;
- 			}
- 		
- 		}
- 		
- 		foreach( $names as $vid => $name )
- 		{
- 			$this->output .= $this->html->empty_folder_row( $name, $vid, $count[$vid] );
- 		}
- 		
- 		$this->output .= $this->html->empty_folder_save_unread();
- 		$this->output .= $this->html->empty_folder_footer();
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	
- 	function end_empty_folders()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$names = array( 'unsent' => $ibforums->lang['fd_unsent'] );
- 		$ids   = array();
- 		$qe = "";
- 		
- 		foreach( $this->msg_stats['dir_data'] as $k => $v )
- 		{
- 			$names[ $v['id'] ] = $v['real'];
- 		}
- 		
- 		//----------------------------------------------
- 		// Did we check any boxes?
- 		//----------------------------------------------
- 		
- 		foreach( $names as $vid => $name )
- 		{
- 			if ( $ibforums->input['its_'.$vid] == 1 )
- 			{
- 				$ids[] = $vid;
- 			}
- 		}
- 		
- 		if ( count($ids) < 1 )
- 		{
- 			$std->Error( array(  'LEVEL' => 1, 'MSG' => 'fd_noneselected' ) );
- 		}
- 		
- 		//----------------------------------------------
- 		// Delete em!
- 		//----------------------------------------------
- 		
- 		if ( $ibforums->input['save_unread'] )
- 		{
- 			$qe = ' AND read_state=1';
- 		}
- 		
- 		$DB->query("DELETE FROM ibf_messages WHERE member_id={$ibforums->member['id']} AND vid IN('".implode("','", $ids)."')".$qe);
- 		
- 		$DB->query("SELECT COUNT(*) as msg_total FROM ibf_messages WHERE member_id=".$this->member['id']." AND vid <> 'unsent'");
- 		
- 		$total = $DB->fetch_row();
- 		
- 		$total['msg_total'] = $total['msg_total'] > 0 ? $total['msg_total'] : 0;
- 		
- 		$DB->query("UPDATE ibf_members SET msg_total=".$total['msg_total']." WHERE id=".$this->member['id']);
- 		
- 		$std->boink_it($this->base_url."act=Msg&CODE=delete");
- 	}
- 	
- 	
- 	/**********************************************************/
- 	// ARCHIVE:
- 	//
- 	// Allows a user to archive and email a HTML file
- 	/**********************************************************/
- 	
- 	function archive() 
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$this->jump_html = preg_replace("/<!--EXTRA-->/", "<option value='all'>".$ibforums->lang['all_folders']."</option>", $this->jump_html );
- 		
- 		$this->output .= $this->html->archive_form( $this->jump_html );
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_archive()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		require "./sources/lib/emailer.php";
-		
-		$this->email = new emailer();
- 		
- 		//----------------------------------------
- 		// Did we specify a folder, or choose all?
- 		//----------------------------------------
- 		
- 		$folder_query  = "";
- 		$msg_ids       = array();
- 		$older_newer   = '>';
- 		
- 		if ( $ibforums->input['oldnew'] == 'older' )
- 		{
- 			$older_newer = '<';
- 		}
- 		
- 		if ($ibforums->input['VID'] != 'all')
- 		{
- 			$folder_query = " AND vid='".$ibforums->input['VID']."'";
- 		}
- 		
- 		if ( $ibforums->input['dateline'] == 'all' )
- 		{
- 			$time_cut    = 0;
- 			$older_newer = '<';
- 		}
- 		else
- 		{
- 			$time_cut = time() - ($ibforums->input['dateline'] * 60 * 60 *24);
- 		}
- 		
- 		
- 		
- 		//----------------------------------------
- 		// Check the input...
- 		//----------------------------------------
- 		
- 		$ibforums->input['number'] = preg_replace( "/^(\d+)$/", "\\1", $ibforums->input['number'] );
- 		
- 		if ($ibforums->input['number'] < 5)
- 		{
- 			$ibforums->input['number'] = 5;
- 		}
- 		
- 		if ($ibforums->input['number'] > 50)
- 		{
- 			$ibforums->input['number'] = 50;
- 		}
- 		
- 		$type      = 'html';
- 		$file_name = "pm_archive.html";
- 		$ctype     = "text/html";
- 		
- 		if ($ibforums->input['type'] == 'xls')
- 		{
- 			$type      = 'xls';
- 			$file_name = "xls_importable.txt";
- 			$ctype     = "text/plain";
- 		}
- 		
- 		$output = "";
- 		
- 		//----------------------------------------
- 		// Start the datafile..
- 		//----------------------------------------
- 		
- 		if ($type == 'html')
- 		{
- 			$output .= $this->html->archive_html_header();
- 		}
- 		
- 		require "./sources/lib/post_parser.php";
-        
-        $this->parser = new post_parser();
- 		
- 		//----------------------------------------
- 		// Get the messages...
- 		//----------------------------------------
- 		
- 		
-		$archive_query = $DB->query("SELECT mg.*, m.name, m.id, mr.id as rec_id, mr.name as rec_name
-									 FROM ibf_messages mg
-									   LEFT JOIN ibf_members m ON (m.id=mg.from_id)
-									   LEFT JOIN ibf_members mr ON (mr.id=mg.recipient_id)
-									 WHERE mg.member_id={$ibforums->member['id']}
-									 AND mg.msg_date $older_newer $time_cut".$folder_query."
-									 ORDER BY mg.msg_date
-									 LIMIT 0,".$ibforums->input['number']);
- 		
- 		
- 		if ( $DB->get_num_rows($archive_query) )
- 		{
- 			while ( $r = $DB->fetch_row($archive_query) )
- 			{
- 				$info = array();
- 				
- 				$msg_ids[] = $r['msg_id'];
- 				
- 				//$from_member = $DB->query("SELECT id, name FROM ibf_members WHERE id='".$r['from_id']."'");
- 				
- 				//$from_mem = $DB->fetch_row($from_member);
- 				
- 				$info['msg_date']    = $std->get_date( $r['msg_date'], 'LONG' );
- 				$info['msg_title']   = $r['title'];
- 				$info['msg_sender']  = $r['name'];
-				$info['msg_content'] = $this->parser->convert( array( 'TEXT'    => $r['message'],
-																	  'SMILIES' => 0,
-																	  'CODE'    => $ibforums->vars['msg_allow_code'],
-																	  'HTML'    => $ibforums->vars['msg_allow_html']
-																	)
-															 );
- 				
- 				if ($type == 'xls')
- 				{
- 					$output .= '"'.$this->strip_quotes($info['msg_title']).'","'.$this->strip_quotes($info['msg_date']).'","'.$this->strip_quotes($info['msg_sender']).'","'.$this->strip_quotes($info['msg_content']).'"'."\r";
- 				}
- 				else
- 				{
- 					if ( $r['vid'] == 'sent' )
- 					{
- 						$info['msg_sender']  = $r['rec_name'];
- 						$output .= $this->html->archive_html_entry_sent($info);
- 					}
- 					else
- 					{
- 						$output .= $this->html->archive_html_entry($info);
- 					}
- 				}
- 				
- 			}
- 			
- 			if ($type == 'html')
-			{
-				$output .= $this->html->archive_html_footer();
-			}
-			
-			$num_msg = count( $msg_ids );
-			
-			if ($ibforums->input['delete'] == 'yes')
-			{
-				$msg_str = implode( ",", $msg_ids );
-				
-				if (!empty($msg_str))
-				{
-					$DB->query("DELETE FROM ibf_messages WHERE msg_id IN ($msg_str)");
-					
-					$DB->query("UPDATE ibf_members SET msg_total=msg_total-$num_msg WHERE id ='".$this->member['id']."'");
-				}
-				
-			}
-			
-			$output = str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $output );
-			
-			$this->email->get_template("pm_archive");
-			
-			$this->email->build_message( array(
-												'NAME'         => $this->member['name'],
-											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['arc_email_subject'];
-			$this->email->to      = $this->member['email'];
-			$this->email->add_attachment( $output, $file_name, $ctype );
-			$this->email->send_mail();
-			
-			
-			$ibforums->lang['arc_complete'] = preg_replace( "/<#NUM#>/", "$num_msg", $ibforums->lang['arc_complete'] );
-			
-			$this->output .= $this->html->archive_complete();
- 		
-			$this->page_title = $ibforums->lang['t_welcome'];
-			$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
-			
-		}
-		else
-		{
-			$std->Error( array(  'LEVEL' => 1, 'MSG' => 'no_archive_messages' ) );
-		}
- 		
- 		
- 	}
- 
- 	function strip_quotes($text) {
- 	
- 		return preg_replace( "/\"/", '\\\"', $text );
- 		
- 	}	
- 	
- 	/**********************************************************/
- 	// PREFS:
- 	//
- 	// Create/delete/edit messenger folders
- 	/**********************************************************/
- 	
- 	function prefs() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$this->output .= $this->html->prefs_header();
- 		
- 		$max = 1;
- 		
- 		foreach( $this->msg_stats['dir_data'] as $k => $v )
- 		{
- 			$extra = "";
- 			if ($v['id'] == 'in' or $v['id'] == 'sent')
- 			{
- 				$extra = "&nbsp;&nbsp;( ".$v['real']." - ".$ibforums->lang['cannot_remove']." )";
- 			}
- 			
- 			$this->output .= $this->html->prefs_row( array( 'ID' => $v['id'], 'REAL' => $v['real'], 'EXTRA' => $extra ) );
- 			
- 			if ( stristr( $v['id'], 'dir_' ) )
- 			{
- 				$max = intval( str_replace( 'dir_', "", $v['id'] ) ) + 1;
- 			}
- 		}
- 		
- 		$count = $max + 1;
- 		
- 		$this->output .= $this->html->prefs_add_dirs();
- 		
- 		for ($i = $count; $i < $count+3; $i++)
- 		{
- 			$this->output .= $this->html->prefs_row( array( 'ID' => 'dir_'.$i, 'REAL' => '', 'EXTRA' => '' ) );
- 		}
- 		
- 		$this->output .= $this->html->prefs_footer();
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_prefs() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		// Check to ensure than we've not tried to remove the inbox and sent items directories.
- 		
- 		if ( ($ibforums->input['sent'] == "") or ($ibforums->input['in'] == "") )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cannot_remove_dir' ) );
- 		}
- 		
- 		
- 		$v_dir = 'in:'.$ibforums->input['in'].'|sent:'.$ibforums->input['sent'];
- 		
- 		// Fetch the rest of the dirs
- 		
- 		
- 		$ids = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^dir_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$v_dir .= '|'.$match[0].':'.trim(str_replace( '|', '&#124;', $ibforums->input[$match[0]]) );
- 				}
- 			}
- 		}
- 		
- 		$DB->query("UPDATE ibf_members SET vdirs='$v_dir' WHERE id='".$this->member['id']."'");
- 		
- 		$std->boink_it($ibforums->base_url."act=Msg&CODE=07");
-		exit;
- 		
- 	}
- 	
- 	/**********************************************************/
- 	// DELETE_MEMBER:
- 	//
- 	// Removes a member from address book.
- 	/**********************************************************/
- 	
- 	function del_member() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		if (!$ibforums->input['MID'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		if (! preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		$DB->query("DELETE FROM ibf_contacts WHERE member_id='".$this->member['id']."' AND contact_id='".$ibforums->input['MID']."'");
- 		
- 		$std->boink_it($this->base_url."act=Msg&CODE=02");
-		exit;
-	}
-	
-	/**********************************************************/
- 	// EDIT_MEMBER:
- 	//
- 	// Edit a member from address book.
- 	/**********************************************************/
- 	
- 	function edit_member() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		if (!$ibforums->input['MID'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		if (! preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		
- 		$DB->query("SELECT * FROM ibf_contacts WHERE member_id='".$this->member['id']."' AND contact_id='".$ibforums->input['MID']."'");
- 		$memb = $DB->fetch_row();
- 		
- 		if (!$memb['contact_id'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		$html = "<select name='allow_msg' class='forminput'>";
- 		
- 		if ($memb['allow_msg'])
- 		{
- 			$html .= "<option value='yes' selected>{$ibforums->lang['yes']}</option><option value='no'>{$ibforums->lang['no']}";
- 		}
- 		else
- 		{
- 			$html .= "<option value='yes'>{$ibforums->lang['yes']}</option><option value='no' selected>{$ibforums->lang['no']}";
- 		}
- 		
- 		$html .= "</select>";
- 		
- 		$this->output .= $this->html->address_edit( array( 'SELECT' => $html, 'MEMBER' => $memb ) );
- 		
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."&amp;act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>",
- 								   "<a href='".$this->base_url."act=Msg&CODE=02'>".$ibforums->lang['t_book']."</a>"  );
- 		
- 	}
- 	
-	/**********************************************************/
- 	// DO_EDIT_MEMBER:
- 	//
- 	// Edit a member from address book.
- 	/**********************************************************/
- 	
- 	function do_edit() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		if (!$ibforums->input['MID'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		if (! preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		$ibforums->input['allow_msg'] = $ibforums->input['allow_msg'] == 'yes' ? 1 : 0;
- 		
- 		$DB->query("SELECT * FROM ibf_contacts WHERE member_id='".$this->member['id']."' AND contact_id='".$ibforums->input['MID']."'");
- 		$memb = $DB->fetch_row();
- 		
- 		if (!$memb['contact_id'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		$DB->query("UPDATE ibf_contacts SET contact_desc='".$ibforums->input['mem_desc']."', allow_msg='".$ibforums->input['allow_msg']."' WHERE id='".$memb['id']."'");
- 		
- 		$std->boink_it($this->base_url."act=Msg&CODE=02");
-		exit;
- 		
- 	}
- 	
- 	
- 		
- 	/**********************************************************/
- 	// CONTACT:
- 	//
- 	// Shows the address book.
- 	/**********************************************************/
- 	
- 	function contact() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$this->output .= $this->html->Address_header();
- 		
- 		$DB->query("SELECT * FROM ibf_contacts WHERE member_id='".$this->member['id']."' ORDER BY contact_name ASC");
- 		
- 		if ( $DB->get_num_rows() )
- 		{
- 		
- 			$this->output .= $this->html->Address_table_header();
- 			while ( $row = $DB->fetch_row() )
- 			{
- 				$row['text'] = $row['allow_msg']
- 							 ? $ibforums->lang['can_contact']
- 							 : $ibforums->lang['cannot_contact'];
- 							 
- 				$this->output .= $this->html->render_address_row($row);
- 			}
- 			$this->output .= $this->html->end_address_table();
- 			
- 		}
- 		else
- 		{
- 			$this->output .= $this->html->Address_none();
- 			
- 		}
- 		
- 		// Do we have a name to enter?
- 		
- 		$name_to_enter = "";
- 		
- 		if ($ibforums->input['MID'])
- 		{
- 			if ( preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
- 			{
- 				$DB->query("SELECT name, id FROM ibf_members WHERE id='".$ibforums->input['MID']."'");
- 				$memb = $DB->fetch_row();
- 				
- 				if ($memb['id'])
- 				{
- 					$name_to_enter = $memb['name'];
- 				}
- 			}
- 		}
- 		
- 		$this->output .= $this->html->address_add($name_to_enter);
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	
- 	/**********************************************************/
- 	// ADD MEMBER:
- 	//
- 	// Adds a member to the addy book.
- 	/**********************************************************/
- 	
- 	function add_member() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		if (! $ibforums->input['mem_name'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		$DB->query("SELECT name, id FROM ibf_members WHERE LOWER(name)='".$ibforums->input['mem_name']."'");
- 		$memb = $DB->fetch_row();
- 		
- 		if (! $memb['id'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
- 		}
- 		
- 		//--------------------------------------
- 		// Do we already have this member in our
- 		// address book?
- 		//--------------------------------------
- 		
- 		$DB->query("SELECT contact_id FROM ibf_contacts WHERE member_id='".$this->member['id']."' AND contact_id='".$memb['id']."'");
- 		
- 		if ( $DB->get_num_rows() )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'member_in_add_book' ) );
- 		}
- 		
- 		//--------------------------------------
- 		// Insert it into the DB
- 		//--------------------------------------
- 		
- 		$ibforums->input['allow_msg'] = $ibforums->input['allow_msg'] == 'yes' ? 1 : 0;
- 		
- 		$db_string = $std->compile_db_string( array( 
-													 'member_id'      => $this->member['id'],
-													 'contact_name'   => $memb['name'],
-													 'allow_msg'      => $ibforums->input['allow_msg'],
-													 'contact_desc'   => $ibforums->input['mem_desc'],
-													 'contact_id'     => $memb['id']
-											)      );
-		
-		$DB->query("INSERT INTO ibf_contacts (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		unset($db_string);
-		
-		// BUH BYE!
-		
-		$std->boink_it($this->base_url."act=Msg&CODE=02");
-		exit;
-	}
- 		
-
- 	
- 	/********************************************************************************************************************/
- 	// Mutli Act:
- 	//
- 	// Removes or moves messages.
- 	/**********************************************************/
- 	
- 	function multi_act() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//--------------------------------------
- 		// Get the ID's to delete
- 		//--------------------------------------
- 		
- 		$ids = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^msgid_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		$affected_ids = count($ids);
- 		
- 		if ( $affected_ids > 0 )
- 		{
- 			$id_string = implode( ",", $ids );
- 			
- 			if ($ibforums->input['delete'])
- 			{
- 				$DB->query("DELETE FROM ibf_messages WHERE member_id='".$this->member['id']."' AND msg_id IN ($id_string)");
- 				
- 				if ($ibforums->input['saved'])
- 				{
- 					// Did we delete from the saved folder? If so, don't update the msg stats and
- 					// redirect back to the saved folder.
- 					
- 					$std->boink_it($this->base_url."act=Msg&CODE=20");
- 					exit;
- 				}
- 				else
- 				{
-					$DB->query("UPDATE ibf_members SET msg_total=msg_total-$affected_ids WHERE id='".$this->member['id']."'");
-					$std->boink_it($this->base_url."act=Msg&CODE=01&VID={$this->vid}");
-					exit;
- 				}
- 				
- 			}
- 			else if ($ibforums->input['move'])
- 			{
- 				$DB->query("UPDATE ibf_messages SET vid='".$this->vid."' WHERE member_id='".$this->member['id']."' AND msg_id IN ($id_string)");
- 				$std->boink_it($this->base_url."act=Msg&CODE=01&VID={$this->vid}");
- 				exit;
- 			}
- 			else
- 			{
- 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
- 			}
- 		}
- 		else
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
- 		}
- 		
- 	}
- 	
- 	/**********************************************************/
- 	// END TRACKING
- 	//
- 	// Removes read tracked messages
- 	/**********************************************************/
- 	
- 	function end_tracking() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//--------------------------------------
- 		// Get the ID's to delete
- 		//--------------------------------------
- 		
- 		$ids = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^msgid_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		$affected_ids = count($ids);
- 		
- 		if ( $affected_ids > 0 )
- 		{
- 			$id_string = implode( ",", $ids );
- 			
- 			$DB->query("UPDATE ibf_messages SET tracking=0 WHERE tracking=1 AND read_state=1 AND from_id='".$this->member['id']."' AND msg_id IN ($id_string)");
- 					
- 			$std->boink_it($this->base_url."act=Msg&CODE=30");
- 		}
- 		else
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
- 		}
- 		
- 	}
- 	
- 	
- 	function del_tracked() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//--------------------------------------
- 		// Get the ID's to delete
- 		//--------------------------------------
- 		
- 		$ids = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^msgid_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		$affected_ids = count($ids);
- 		
- 		if ( $affected_ids > 0 )
- 		{
- 			$id_string = implode( ",", $ids );
- 			
- 			$DB->query("DELETE FROM ibf_messages WHERE tracking=1 AND read_state=0 AND from_id='".$this->member['id']."' AND msg_id IN ($id_string)");
- 					
- 			$std->boink_it($this->base_url."act=Msg&CODE=30");
- 		}
- 		else
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
- 		}
- 		
- 	}
- 	
- 	/**********************************************************/
- 	// DELETE MESSAGE:
- 	//
- 	// Removes a message.
- 	// Yes. there is no small print.
- 	/**********************************************************/
- 	
- 	function delete() {
- 		global $ibforums, $DB, $std, $print;
- 	
- 		//--------------------------------------
- 		// check for a msg ID
- 		//--------------------------------------
- 		
- 		if (!$ibforums->input['MSID'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
- 		}
- 		
- 		if (! preg_match( "/^\d+$/" , $ibforums->input['MSID'] ) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
- 		}
- 		
- 		//--------------------------------------
- 		// Delete it from the DB
- 		//--------------------------------------
- 		
- 		$DB->query("DELETE FROM ibf_messages WHERE msg_id='".$ibforums->input['MSID']."' AND member_id='".$this->member['id']."'");
- 		
- 		$DB->query("UPDATE ibf_members SET msg_total=msg_total-1 WHERE id='".$this->member['id']."'");
- 		
- 		// BYE!
- 		
- 		$std->boink_it($this->base_url."act=Msg&CODE=01&VID={$this->vid}");
- 		exit;
- 	}
- 	
- 	
- 	/**********************************************************/
- 	// VIEW MESSAGE:
- 	//
- 	// Views a message, thats it. No, it doesn't do anything else
- 	// I don't know why. It just does. Accept it and move on dude.
- 	/**********************************************************/
- 	
- 	function view_msg() {
- 		global $ibforums, $DB, $std, $print, $skin_universal;
- 		
- 		//--------------------------------------
- 		// check for a msg ID
- 		//--------------------------------------
- 		
- 		if (!$ibforums->input['MSID'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_msg' ) );
- 		}
- 		
- 		if (! preg_match( "/^\d+$/" , $ibforums->input['MSID'] ) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
- 		}
- 		
- 		//--------------------------------------
- 		// Get the message from the DB
- 		// Check to make sure it exists
- 		//--------------------------------------
- 		
- 		$DB->query("SELECT * FROM ibf_messages WHERE msg_id='".$ibforums->input['MSID']."' and member_id='".$this->member['id']."'");
- 		$msg = $DB->fetch_row();
- 		
- 		if (!$msg['msg_id'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_msg' ) );
- 		}
- 		
- 		//--------------------------------------
- 		// Did we read this in the pop up?
- 		// If so, reduce new count by 1 (this msg)
- 		// 'cos if we went via inbox, we'd have
- 		// no new msg
- 		//--------------------------------------
- 		
- 		if ($ibforums->member['new_msg'] >= 1)
- 		{
- 			$DB->query("UPDATE ibf_members SET new_msg=new_msg-1 WHERE id='".$this->member['id']."'");
- 		}
- 		
-		//--------------------------------------
- 		// Is this an unread message?
- 		//--------------------------------------
- 		
- 		if ($msg['read_state'] < 1)
- 		{
- 			$DB->query("UPDATE ibf_messages SET read_state=1, read_date='".time()."' WHERE msg_id='".$ibforums->input['MSID']."'");
- 		}
- 		
- 		
- 		//--------------------------------------
- 		// Start formatting the member and msg
- 		//--------------------------------------
- 		
- 		require "./sources/lib/post_parser.php";
-        
-        $this->parser = new post_parser();
-        
- 		
- 		$msg['msg_date'] = $std->get_date( $msg['msg_date'], 'LONG' );
- 		
- 		
- 		$DB->query("SELECT g.*, m.* ".
- 				   "FROM ibf_members m, ibf_groups g WHERE id='".$msg['from_id']."' and g.g_id=m.mgroup");
- 				   
- 		$member = $DB->fetch_row();
- 		
- 		$member = $this->parse_member( $member, $msg );
- 		
- 		$msg['message'] = $this->parser->convert( array( 'TEXT'    => $msg['message'],
-														 'SMILIES' => 1,
-														 'CODE'    => $ibforums->vars['msg_allow_code'],
-														 'HTML'    => $ibforums->vars['msg_allow_html']
-													   )
-												);
-												
-		if ($this->member['view_sigs'])
-		{
-			$member['signature'] = $this->parser->convert( array( 'TEXT'    => $member['signature'],
-																  'SMILIES' => 0,
-																  'CODE'    => $ibforums->vars['sig_allow_ibc'],
-																  'HTML'    => $ibforums->vars['sig_allow_html'],
-																  'SIGNATURE'=> 1,
-														 )      );
-			
-			if ( $ibforums->vars['sig_allow_html'] == 1 )
-			{
-				$member['signature'] = $this->parser->parse_html($member['signature'], 0);
-			}
-														 
-			$member['signature'] = $skin_universal->signature_separator($member['signature']);
-		}
-		else
-		{
-			$member['signature'] = "";
-		}
-		
-		$member['VID'] = $this->msg_stats['current_id'];
-		
-		$this->output .= $this->html->Render_msg( array( 
-														 'msg'    => $msg,
-														 'member' => $member,
-														 'jump'   => $this->jump_html
-											    )      );
-											   
-		
-		$this->page_title = $ibforums->lang['t_welcome'];
-		
-		$this->nav        = array( "<a href='".$this->base_url."&amp;act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>",
-								   "<a href='".$this->base_url."act=Msg&CODE=01&VID={$member['VID']}'>".$this->msg_stats['current_dir']."</a>"
-								 );						   
- 	
- 	}
- 	
- 	/**********************************************************/
- 	// SEND MESSAGE:
- 	//
- 	// Sends a message. Yes, it's that simple. Why so much code?
- 	// Because typing "send a message to member X" doesnt actually
- 	// do anything.
- 	/**********************************************************/
- 	
- 	function send() {
- 		global $ibforums;
- 		
- 		$ibforums->input['MODE'] ? $this->send_msg() : $this->send_form();
- 		
- 	}
- 	
- 	//+-----------------------------------------------------------
- 	
- 	function send_form($preview=0, $errors="") {
- 		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
- 		
- 		//--------------------------------------
- 		// Get some more HTML and words, oh yes.
- 		//--------------------------------------
- 		
- 		$errors = preg_replace( "/^<br>/", "", $errors );
- 		
- 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
-    	
-    	$this->post_html = $std->load_template('skin_post');
-    	
-    	if ($preview == 1)
-    	{
-    	
-    		require "./sources/lib/post_parser.php";
-        
-        	$this->parser = new post_parser();
-        	
-    		$old_msg = $this->parser->convert( array( TEXT    => $std->remove_tags($ibforums->input['Post']),
-													  SMILIES => 1,
-													  CODE    => $ibforums->vars['msg_allow_code'],
-													  HTML    => $ibforums->vars['msg_allow_html']
-													)
-											 );
-											 
-			$this->output .= $this->html->preview($old_msg);
-    	
-    	}
-    	
-    	if ($errors != "")
-    	{
-    		$this->output .= $this->html->pm_errors($errors);
-    		$preview = 1;
-    	}
-    	
-    	//--------------------------------------
- 		// Load the contacts
- 		//--------------------------------------
- 		
- 		$contacts = $this->build_contact_list();
- 		
- 		
- 		$name_to_enter = "";
- 		$old_message   = "";
- 		$old_title     = "";
-    	
-    	//--------------------------------------
- 		// Did we come from a button with a user ID?
- 		//--------------------------------------
- 		
-	
-		if (!empty($ibforums->input['MID']))
-		{
-			$DB->query("SELECT name, id FROM ibf_members WHERE id='".$ibforums->input['MID']."'");
-			$name = $DB->fetch_row();
-			
-			if ($ibforums->input['fwd'] != 1)
-			{
-				if ($name['id'])
-				{
-					$name_to_enter = $name['name'];
-				}
-			}
-		}
- 		
- 		//--------------------------------------
- 		// Are we quoting an old message?
- 		//--------------------------------------
- 		
- 		if ($preview == 1)
- 		{
- 			$old_message = $std->txt_htmlspecialchars($std->txt_stripslashes($HTTP_POST_VARS['Post']));
- 			$old_title   = preg_replace( "/'/", "&#39;", $std->txt_stripslashes($HTTP_POST_VARS['msg_title']) );
- 			
- 		}
- 		else if (!empty($ibforums->input['MSID']))
- 		{
- 			$DB->query("SELECT message, title from ibf_messages WHERE msg_id='".$ibforums->input['MSID']."' and member_id='".$this->member['id']."'");
- 			$old_msg = $DB->fetch_row();
- 			if ($old_msg['title'])
- 			{
- 				if ($ibforums->input['fwd'] == 1)
- 				{
- 					$old_title   = "Fwd:".$old_msg['title'];
- 					$old_title   = preg_replace( "/^(?:Fwd\:){1,}/i", "Fwd:", $old_title );
- 					$old_message = '[QUOTE]'.sprintf($ibforums->lang['vm_forward_text'], $name['name'])."\n\n".$old_msg['message'].'[/QUOTE]'."\n";
- 					$old_message = str_replace( "<br>", "\n", $old_message );
- 				}
- 				else
- 				{
- 					$old_title   = "Re:".$old_msg['title'];
- 					$old_title   = preg_replace( "/^(?:Re\:){1,}/i", "Re:", $old_title );
- 					$old_message = '[QUOTE]'.$old_msg['message'].'[/QUOTE]'."\n";
- 					$old_message = str_replace( "<br>", "\n", $old_message );
- 				}
- 			}
- 		}
- 		
- 		
- 		//--------------------------------------
- 		// Build up the HTML for the send form
- 		//--------------------------------------
- 		
- 		$this->output .= $this->post_html->get_javascript();
- 		
- 		$this->output .= $this->html->Send_form( array (
- 														 'CONTACTS'  => $contacts,
- 														 'MEMBER'    => $this->member,
- 														 'N_ENTER'   => $name_to_enter,
- 														 'O_TITLE'   => $old_title,
- 														 'OID'       => $ibforums->input['OID'], // Old unsent msg id for restoring saved msg - used to delete saved when sent
- 											   )       );
- 		
- 		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
- 		
- 		$this->output .= $this->post_html->pm_postbox_buttons($old_message);
- 		
- 		$this->output .= $this->html->send_form_footer();
- 		
- 		//--------------------------------------
- 		// Add in the smilies box
- 		//--------------------------------------
- 		
- 		$this->html_add_smilie_box();
-		
-		
-		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
-		
-		
-		//----------------------------------------
- 		// Do we have permission to mass PM peeps?
- 		//----------------------------------------
- 		
- 		if ($ibforums->member['g_max_mass_pm'] > 0)
- 		{
- 			$ibforums->lang['carbon_copy_desc'] = sprintf( $ibforums->lang['carbon_copy_desc'], $ibforums->member['g_max_mass_pm'] );
- 			
- 			if (isset($HTTP_POST_VARS['carbon_copy']))
- 			{
- 				$cc_box = preg_replace( "#</textarea>#i", "", $std->txt_stripslashes($HTTP_POST_VARS['carbon_copy']) );
- 			}
- 			
- 			$this->output = str_replace( "<!--IBF.MASS_PM_BOX-->", $this->html->mass_pm_box($cc_box), $this->output );
- 		}
- 		
- 	}
- 	
- 	
- 	//+-----------------------------------------------------------
- 	
- 	function edit_saved() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//--------------------------------------
- 		// Get some more HTML and words, oh yes.
- 		//--------------------------------------
- 		
- 		$errors = preg_replace( "/^<br>/", "", $errors );
- 		
- 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
-    	
-    	$this->post_html = $std->load_template('skin_post');
-    	
-    	//--------------------------------------
- 		// Load the contacts
- 		//--------------------------------------
- 		
- 		$contacts = $this->build_contact_list();
- 		
- 		$DB->query("SELECT mg.*, m.name as to_name, m.id as to_id from ibf_messages mg, ibf_members m WHERE msg_id='".$ibforums->input['MSID']."' and member_id='".$this->member['id']."' AND m.id=mg.recipient_id");
- 		$msg = $DB->fetch_row();
- 		
- 		if (!$msg['msg_id'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_msg' ) );
- 		}
- 		
- 		//--------------------------------------
- 		// Build up the HTML for the send form
- 		//--------------------------------------
- 		
- 		$this->output .= $this->html->Send_form( array (
- 														 'CONTACTS'  => $contacts,
- 														 'MEMBER'    => $this->member,
- 														 'N_ENTER'   => $msg['to_name'],
- 														 'O_TITLE'   => $msg['title'],
- 														 'OID'       => $msg['msg_id'],
- 											   )       );
- 		
- 		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
- 		
- 		$this->output .= $this->post_html->get_javascript();
- 		
- 		$this->output .= $this->post_html->postbox_buttons( str_replace( "<br>", "\n", $msg['message']) );
- 		
- 		$this->output .= $this->html->send_form_footer();
- 		
- 		//--------------------------------------
- 		// Add in the smilies box
- 		//--------------------------------------
- 		
- 		$this->html_add_smilie_box();
-		
-		
-		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
-		
-		
-		//----------------------------------------
- 		// Do we have permission to mass PM peeps?
- 		//----------------------------------------
- 		
- 		if ($ibforums->member['g_max_mass_pm'] > 0)
- 		{
- 			$ibforums->lang['carbon_copy_desc'] = sprintf( $ibforums->lang['carbon_copy_desc'], $ibforums->member['g_max_mass_pm'] );
- 			
- 			if (isset($msg['cc_users']))
- 			{
- 				$cc_box = preg_replace( "#</textarea>#i", "", $msg['cc_users'] );
- 				$cc_box = str_replace( "<br>", "\n", $cc_box );
- 			}
- 			
- 			$this->output = str_replace( "<!--IBF.MASS_PM_BOX-->", $this->html->mass_pm_box($cc_box), $this->output );
- 		}
- 		
- 	}
- 	
- 	
- 	//+-----------------------------------------------------------
- 	
- 	
- 	function send_msg() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_error'   , $ibforums->lang_id);
- 		
- 		$ibforums->input['from_contact'] = $ibforums->input['from_contact'] ? $ibforums->input['from_contact'] : '-';
- 		
- 		//----------------------------------------------------------------
- 		if ( strlen($ibforums->input['msg_title']) < 2 )
- 		{
- 			$this->send_form(0, $ibforums->lang['err_no_title']);
- 			return;
- 		}
- 		//----------------------------------------------------------------
- 		if ( strlen($ibforums->input['Post']) < 2 )
- 		{
- 			$this->send_form(0, $ibforums->lang['err_no_msg']);
- 			return;
- 		}
- 		//----------------------------------------------------------------
- 		if ($ibforums->input['from_contact'] == '-' and $ibforums->input['entered_name'] == "")
- 		{
- 			$this->send_form(0, $ibforums->lang['err_no_chosen_member']);
- 			return;
- 		}
- 		//----------------------------------------------------------------
- 		
- 		require "./sources/lib/emailer.php";
-		
-		$this->email = new emailer();
- 		
- 		//--------------------------------------
- 		// Attempt to get the reciepient details
- 		//--------------------------------------
- 		
- 		$to_member = array();
- 		
- 		$ibforums->input['entered_name'] = strtolower(str_replace( '|', '&#124;', $ibforums->input['entered_name']) );
- 		$ibforums->input['from_contact'] = strtolower(str_replace( '|', '&#124;', $ibforums->input['from_contact']) );
- 		
- 		if ($ibforums->input['from_contact'] == '-')
- 		{
- 			$query = "LOWER(name)='".$ibforums->input['entered_name']."'";
- 		}
- 		else
- 		{
- 			$query = "id='".$ibforums->input['from_contact']."'";
- 		}
- 		
- 		$DB->query("SELECT name, id, view_pop, mgroup, email_pm, language, email FROM ibf_members WHERE ".$query);
- 		$to_member = $DB->fetch_row();
- 		
- 		if (empty($to_member['id']))
- 		{
- 			$this->send_form(0, $ibforums->lang['err_no_such_member']);
- 			return;
- 		}
- 		
- 		//--------------------------------------
- 		// Are we simply saving this for later?
- 		//--------------------------------------
- 		
- 		if ($ibforums->input['save'] != "")
- 		{
- 		
-			$raw = array( 
-						  'member_id'      => $this->member['id'],
-						  'msg_date'       => time(),
-						  'read_state'     => 0,
-						  'title'          => $ibforums->input['msg_title'],
-						  'message'        => $ibforums->input['Post'],
-						  'from_id'        => $this->member['id'],
-						  'vid'            => 'unsent',
-						  'recipient_id'   => $to_member['id'],
-						  'cc_users'       => $ibforums->input['carbon_copy']
-						);
-			
-			$saved = 0;
-			
-			if ($ibforums->input['OID'])
-			{
-				// We have an OID which means that this message
-				// is already from the unsent folder, lets check that
-				// and if true, update rather than create a new unsent
-				// row
-				
-				$DB->query("SELECT msg_id from ibf_messages WHERE msg_id='".$ibforums->input['OID']."' AND member_id='".$ibforums->member['id']."' AND vid='unsent'");
-				
-				if ( $DB->get_num_rows() )
-				{
-					$saved = 1;
-					
-					$db_string = $DB->compile_db_update_string($raw);
-					
-					$DB->query("UPDATE ibf_messages SET $db_string WHERE msg_id='".$ibforums->input['OID']."'");
-				}
-			}
-			
-			if ($saved == 0)
-			{
-				$db_string = $DB->compile_db_insert_string($raw);
-					
-				$DB->query("INSERT INTO ibf_messages (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-			}
-			
- 			$print->redirect_screen( $ibforums->lang['pms_redirect'] , "&act=Msg&CODE=01" );
- 		}
- 		
- 		//--------------------------------------
- 		// Can the reciepient use the PM system?
- 		//--------------------------------------
- 		
- 		$DB->query("SELECT m.msg_total, g.g_use_pm, g.g_max_messages FROM ibf_groups g, ibf_members m WHERE m.id='".$to_member['id']."' AND g.g_id=m.mgroup");
- 		$to_msg_stats = $DB->fetch_row();
- 		
- 		if ($to_msg_stats['g_use_pm'] != 1)
- 		{
- 			$ibforums->input['MID'] = $to_member['id'];
- 			$this->send_form(0, $ibforums->lang['no_usepm_member']);
- 			return;
- 		}
- 		
- 		//--------------------------------------
- 		// Does the target member have enough room
- 		// in their inbox for a new message?
- 		//--------------------------------------
- 		
-		if ( (($to_msg_stats['msg_total']) >= $to_msg_stats['g_max_messages']) and ($to_msg_stats['g_max_messages'] > 0) )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'max_message_to' ) );
-		}
- 		
- 		//--------------------------------------
- 		// Has the reciepient blocked us?
- 		//--------------------------------------
- 		
- 		$DB->query("SELECT contact_id, allow_msg FROM ibf_contacts WHERE contact_id='".$this->member['id']."' AND member_id='".$to_member['id']."'");
- 		$can_msg = $DB->fetch_row();
- 		
- 		if ( (isset($can_msg['contact_id'])) and ($can_msg['allow_msg'] != 1) )
- 		{
- 			$ibforums->input['MID'] = $to_member['id'];
- 			$this->send_form(0, $ibforums->lang['msg_blocked']);
- 			return;
- 		}
- 		
- 		//--------------------------------------
- 		// Do we have enough room to store a
- 		// saved copy?
- 		//--------------------------------------
- 		
- 		if ($ibforums->input['add_sent'] and ($ibforums->member['g_max_messages'] > 0) )
- 		{
-			if ( ($this->msg_stats['msg_total'] + 1) >= $ibforums->member['g_max_messages'] )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'max_message_from' ) );
-			}
- 		}
- 		
- 		//----------------------------------------------------------------
- 		// Mass PM stuff
- 		//----------------------------------------------------------------
- 		
- 		$can_mass_pm = 0;
- 		$cc_array    = array();
- 		
- 		if ($ibforums->member['g_max_mass_pm'] > 0)
- 		{
- 			$can_mass_pm = 1;
- 			
- 			$ibforums->input['carbon_copy'] = strtolower(str_replace( '|', '&#124;', $ibforums->input['carbon_copy']) );
- 			
- 			if (isset($ibforums->input['carbon_copy']) and $ibforums->input['carbon_copy'] != "")
- 			{
- 				// Sort out the array
- 				
- 				$ibforums->input['carbon_copy'] = str_replace( "<br><br>", "<br>", trim($ibforums->input['carbon_copy']) );
- 				$ibforums->input['carbon_copy'] = preg_replace( "/^(<br>){1}/", "" , $ibforums->input['carbon_copy'] );
- 				$ibforums->input['carbon_copy'] = preg_replace( "/(<br>){1}$/", "" , $ibforums->input['carbon_copy'] );
- 				$ibforums->input['carbon_copy'] = preg_replace( "/<br>\s+/",  ",", $ibforums->input['carbon_copy'] );
- 				
- 				$temp_array = explode( "<br>", $ibforums->input['carbon_copy'] );
- 				
- 				if ( is_array($temp_array) and count($temp_array) > 0 )
- 				{
- 					$new_array = array();
- 					
- 					foreach( $temp_array as $name )
- 					{
- 						$name  = "'".trim(strtolower($name))."'";
- 						
- 						if (in_array( $name, $new_array ) )
- 						{
- 							continue;
- 						}
- 						
- 						$new_array[] = $name;
- 					}
- 				}
- 				
- 				if ( is_array($new_array) and count($new_array) > 0 )
- 				{
- 					$array_count = count($new_array);
- 					
- 					$DB->query("SELECT m.id, m.name, m.msg_total, m.view_pop, m.email_pm, m.language, m.email, g.g_max_messages, g.g_use_pm FROM ibf_members m, ibf_groups g ".
- 							   "WHERE LOWER(m.name) IN (".implode(",",$new_array).") ".
- 							   "AND m.mgroup=g.g_id");
- 							   
- 					if ( ! $DB->get_num_rows() )
- 					{
- 						$ibforums->input['MID'] = $to_member['id'];
- 						$this->send_form(0, $ibforums->lang['pme_no_cc_user']);
- 						return;
- 				    }
- 				    else
- 				    {
- 				    	while( $r = $DB->fetch_row() )
- 				    	{
- 				    		$cc_array[$r['id']] = $r;
- 				    	}
- 				    	
- 				    	//--------------------------------------
- 				    	
- 				    	if ( count($cc_array) > $ibforums->member['g_max_mass_pm'])
- 				    	{
- 				    		$ibforums->input['MID'] = $to_member['id'];
- 							$this->send_form(0, $ibforums->lang['pme_too_many']);
- 							return;
- 						}
- 				    	
- 				    	//--------------------------------------
- 				    	
- 				    	$cc_error = "";
- 				    	
- 				    	if ( count($cc_array) != $array_count )
- 				    	{
- 				    		foreach( $new_array as $n )
- 				    		{
- 				    			$seen = 0;
- 				    			
- 				    			foreach( $cc_array as $idx => $cc_user )
- 				    			{
- 				    				$tmp = "'".strtolower($cc_user['name'])."'";
- 				    				
- 				    				if ($tmp == $n)
- 				    				{
- 				    					$seen = 1;
- 				    				}
- 				    			}
- 				    			
- 				    			if ($seen != 1)
- 				    			{
- 				    				$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_nomem'], $n, $n );
- 				    			}
- 				    		}
- 				    	}
- 				    	
- 				    	if ($cc_error != "")
- 						{
- 							$ibforums->input['MID'] = $to_member['id'];
- 							$this->send_form(0, $cc_error);
- 							return;
- 						}
- 				    	
- 						//--------------------------------------
- 						
- 						$cc_error   = "";
- 						$cc_id_array = array();
- 						
- 						foreach($cc_array as $idx => $cc_user)
- 						{
- 							if ($cc_user['g_use_pm'] != 1)
- 							{
- 								$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_nopm'], $cc_user['name'], $cc_user['name'] );
- 							}
- 							
- 							if ($cc_user['g_max_messages'] > 0 and ($cc_user['msg_total'] + 1 > $cc_user['g_max_messages']) )
- 							{
- 								$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_maxed'], $cc_user['name'], $cc_user['name'] );
- 							}
- 							
- 							$cc_id_array[] = $cc_user['id'];
- 						}
- 						
- 						if ($cc_error != "")
- 						{
- 							$ibforums->input['MID'] = $to_member['id'];
- 							$this->send_form(0, $cc_error);
- 							return;
- 						}
- 						
- 						//--------------------------------------
- 						// Almost there! now just to check the block list..
- 						//--------------------------------------
- 						
- 						$DB->query("SELECT m.name, c.allow_msg FROM ibf_members m, ibf_contacts c WHERE contact_id='".$ibforums->member['id']."' AND member_id IN (".implode(",",$cc_id_array).") AND m.id=c.member_id");
- 						
- 						while ( $c = $DB->fetch_row() )
- 						{
- 							if ($c['allow_msg'] != 1)
- 							{
- 								$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_block'], $c['name'], $c['name'] );
- 							}
- 						}
- 						
- 						if ($cc_error != "")
- 						{
- 							$ibforums->input['MID'] = $to_member['id'];
- 							$this->send_form(0, $cc_error);
- 							return;
- 						}
- 						
- 						//--------------------------------------
- 		
- 					}
- 				}
- 				
- 			}
- 		}
- 		
- 		//--------------------------------------
- 		// Is this a preview?
- 		//--------------------------------------
- 		
- 		if ($ibforums->input['preview'] != "")
- 		{
- 			$ibforums->input['MID'] = $to_member['id'];
- 			$this->send_form(1);
- 			return;
- 		}
- 		
- 		//-----------------------------------------
- 		// Add our original ID to the pool and loop
- 		//-----------------------------------------
- 		
- 		$cc_array[$to_member['id']] = $to_member;
- 		
- 		unset($to_member);
- 		
- 		$ibforums->input['add_tracking'] = ($ibforums->input['add_tracking'] == 1) ? 1 : 0;
- 		
- 		foreach ($cc_array as $user_id => $to_member)
- 		{
- 		
-			//--------------------------------------
-			// Sort out tracking and pop us status
-			//--------------------------------------
-			
-			$show_popup =  $to_member['view_pop'];
-			
-			//--------------------------------------
-			// Enter the info into the DB
-			// Target user side.
-			//--------------------------------------
-			
-			$db_string = $std->compile_db_string( array( 
-														 'member_id'      => $to_member['id'],
-														 'msg_date'       => time(),
-														 'read_state'     => '0',
-														 'title'          => $ibforums->input['msg_title'],
-														 'message'        => $std->remove_tags($ibforums->input['Post']),
-														 'from_id'        => $this->member['id'],
-														 'vid'            => 'in',
-														 'recipient_id'   => $to_member['id'],
-														 'tracking'       => $ibforums->input['add_tracking'],
-												)      );
-			
-			$DB->query("INSERT INTO ibf_messages (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-			$new_id = $DB->get_insert_id();
-			unset($db_string);
-			
-			//-----------------------------------------------------
-			
-			$DB->query("UPDATE ibf_members SET ".
-						"msg_total = msg_total + 1, "                    .
-						"new_msg = new_msg + 1, "                        .
-						"msg_from_id='"     .$this->member['id']         .  "', ".
-						"msg_msg_id='"      . $new_id                    .  "', ".
-						"show_popup='"      . $show_popup                .  "' ".
-						"WHERE id='"        . $to_member['id']           .  "'");
-						
-			//-----------------------------------------------------
-			// Has this member requested a PM email nofity?
-			//-----------------------------------------------------
-			
-			if ($to_member['email_pm'] == 1)
-			{
-				$to_member['language'] = $to_member['language'] == "" ? 'en' : $to_member['language'];
-				
-				$this->email->get_template("pm_notify", $to_member['language']);
-			
-				$this->email->build_message( array(
-													'NAME'   => $to_member['name'],
-													'POSTER' => $ibforums->member['name'],
-													'TITLE'  => $ibforums->input['msg_title'],
-													'LINK'   => "?act=Msg&CODE=03&VID=in&MSID=$new_id",
-												  )
-											);
-											
-				$this->email->subject = $ibforums->lang['pm_email_subject'];
-				$this->email->to      = $to_member['email'];
-				$this->email->send_mail();
-			
-			}
-		}
-		
-		
- 		//-----------------------------------------------------
- 		// Add the data to the current members DB if we are
- 		// adding it to our "sent items" folder
- 		//-----------------------------------------------------
- 		
- 		if ($ibforums->input['add_sent'])
- 		{
- 		
-			$DB->query("UPDATE ibf_members SET ".
-						"msg_total = msg_total + 1 ".
-						"WHERE id='" . $this->member['id'] . "'");
-						
-			$db_string = $std->compile_db_string( array( 
-														 'member_id'      => $this->member['id'],
-														 'msg_date'       => time(),
-														 'read_state'     => 1,
-														 'title'          => $ibforums->lang['saved_sent_msg'].' '.$ibforums->input['msg_title'],
-														 'message'        => $ibforums->input['Post'],
-														 'from_id'        => $this->member['id'],
-														 'vid'            => 'sent',
-														 'recipient_id'   => $to_member['id'],
-												)      );
-			
-			
-			$DB->query("INSERT INTO ibf_messages (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-			unset($db_string);
-		}
-		
-		if ($ibforums->input['OID'])
-		{
-			// We have an OID which means that this message
-			// is already from the unsent folder, if true, 
-			// delete from unsent items.
-			
-			$DB->query("DELETE from ibf_messages WHERE msg_id='".$ibforums->input['OID']."' AND member_id='".$ibforums->member['id']."' AND vid='unsent'");
-		}	
-		
-		$text = preg_replace( "/<#FROM_MEMBER#>/"   , $this->member['name'] , $ibforums->lang['sent_text'] );
-		$text = preg_replace( "/<#TO_MEMBER#>/"     , $to_member['name']    , $text );
-		$text = preg_replace( "/<#MESSAGE_TITLE#>/" , $ibforums->input['msg_title'], $text );
-		
-		$print->redirect_screen( $text , "&act=Msg&CODE=01" );
- 		
- 	}
- 	
- 	
- 	/**********************************************************/
- 	// MSG LIST:
- 	//
- 	// Views the inbox / folder of choice
- 	/**********************************************************/
- 	
- 	function msg_list() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$sort_key = "";
- 		
- 		switch ($ibforums->input['sort'])
- 		{
- 			case 'rdate':
- 				$sort_key = 'm.msg_date ASC';
- 				break;
- 			case 'title':
- 				$sort_key = 'm.title ASC';
- 				break;
- 			case 'name':
- 				$sort_key = 'mp.name ASC';
- 				break;
- 			default:
- 				$sort_key = 'm.msg_date DESC';
- 				break;
- 		}
- 		
- 		//---------------------------------------------
- 		// Get the number of messages we have in total.
- 		//---------------------------------------------
- 		
- 		$DB->query("SELECT COUNT(*) as msg_total FROM ibf_messages WHERE member_id='".$this->member['id']."' AND vid <> 'unsent'");
- 		$total = $DB->fetch_row();
- 		
- 		$total['msg_total'] = $total['msg_total'] > 0 ? $total['msg_total'] : 0;
- 		
- 		$DB->query("UPDATE ibf_members SET msg_total=".$total['msg_total']." WHERE id=".$this->member['id']);
- 		
- 		//---------------------------------------------
- 		// Get the number of messages in our curr folder.
- 		//---------------------------------------------
- 		
- 		$DB->query("SELECT COUNT(*) as msg_total FROM ibf_messages WHERE member_id='".$this->member['id']."' AND vid='{$this->vid}'");
- 		$total_current = $DB->fetch_row();
- 		
- 		$total_current['msg_total'] = $total_current['msg_total'] > 0 ? $total_current['msg_total'] : 0;
- 		
- 		//---------------------------------------------
- 		// Make sure we've not exceeded our alloted allowance.
- 		//---------------------------------------------
- 		
- 		$info['full_messenger'] = "<br />";
- 		$info['full_text']      = "";
- 		$info['total_messages'] = $total['msg_total'];
- 		$info['img_width']      = 1;
- 		$info['vid']            = $this->vid;
- 		$info['date_order']     = $sort_key == 'm.msg_date DESC' ? 'rdate' : 'msg_date';
- 		
- 		$amount_info            = sprintf( $ibforums->lang['pmpc_info_string'], $total['msg_total'] ,$ibforums->lang['pmpc_unlimited'] );
- 		
- 		if ($ibforums->member['g_max_messages'] > 0)
- 		{
- 			$amount_info          = sprintf( $ibforums->lang['pmpc_info_string'], $total['msg_total'] ,$ibforums->member['g_max_messages'] );
- 			
- 			$info['full_percent'] = $total['msg_total'] ? sprintf( "%.0f", ( ($total['msg_total'] / $ibforums->member['g_max_messages']) * 100) ) : 0;
- 			$info['img_width']    = $info['full_percent'] > 0 ? intval($info['full_percent']) * 2.4 : 1;
- 			
- 			if ($info['img_width'] > 300)
- 			{
- 				$info['img_width'] = 300;
- 			}
- 			
- 			if ($total['msg_total'] >=$ibforums->member['g_max_messages'])
- 			{
- 				$info['full_messenger'] = "<span class='highlight'>".$ibforums->lang['folders_full']."</span>";
- 			}
- 			else
- 			{
- 				$info['full_messenger'] = str_replace( "<#PERCENT#>", $info['full_percent'], $ibforums->lang['pmpc_full_string'] );
- 			}
- 		}
- 		
- 		//---------------------------------------------
- 		// Generate Pagination
- 		//---------------------------------------------
- 		
- 		$start = intval($ibforums->input['st']) > 0 ? intval($ibforums->input['st']) : 0;
- 		$p_end = $ibforums->vars['show_max_msg_list'] > 0 ? $ibforums->vars['show_max_msg_list'] : 50;
- 	
- 		
- 		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_current['msg_total'],
-											   'PER_PAGE'    => $p_end,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "",
-											   'L_MULTI'     => $ibforums->lang['msg_pages'],
-											   'BASE_URL'    => $this->base_url."act=Msg&amp;CODE=1&amp;VID=".$this->vid."&amp;sort=".$ibforums->input['sort'],
-											 )
-									  );
- 		
- 		//---------------------------------------------
- 		// Print the header
- 		//---------------------------------------------
- 		
- 		if ($this->vid == 'sent')
- 		{
- 			$ibforums->lang['message_from'] = $ibforums->lang['message_to'];
- 			
- 			$DB->query("SELECT m.*, mp.name as from_name FROM ibf_messages m, ibf_members mp WHERE member_id='".$this->member['id']."' AND vid='".$this->vid."' and mp.id=m.recipient_id ORDER BY $sort_key LIMIT $start, $p_end");
- 		
- 		}
- 		else
- 		{
- 			$DB->query("SELECT m.*, mp.name as from_name FROM ibf_messages m, ibf_members mp WHERE member_id='".$this->member['id']."' AND vid='".$this->vid."' and mp.id=m.from_id ORDER BY $sort_key LIMIT $start, $p_end");
- 		}
- 		
- 		$this->output .= $this->html->inbox_table_header( $this->msg_stats['current_dir'], $info, $this->jump_html, $pages );
- 		
- 		//---------------------------------------------
- 		// Get the messages
- 		//---------------------------------------------
- 		
- 		
- 		if ( $DB->get_num_rows() )
- 		{
- 			while( $row = $DB->fetch_row() )
- 			{
- 				if ($this->vid == 'sent')
- 				{
- 					$row['icon'] = "<{M_READ}>";
- 				}
- 				else
- 				{
- 					$row['icon'] = $row['read_state'] == 1 ? "<{M_READ}>" : "<{M_UNREAD}>";
- 				}
- 				
- 				$row['date'] = $std->get_date( $row['msg_date'] , 'LONG' );
- 				
- 				if ($this->vid != 'sent')
- 				{
- 					$row['add_to_contacts'] = "[ <a href='{$ibforums->base_url}act=Msg&amp;CODE=02&amp;MID={$row['from_id']}'>{$ibforums->lang[add_to_book]}</a> ]";
- 				}
- 				else
- 				{
- 					$row['from_id'] = $row['recipient_id'];
- 				}
- 				
- 				$d_array = array( 'msg' => $row, 'member' => $this->member, 'stat' => $this->msg_stats );
- 				
- 				$this->output .= $this->html->inbox_row( $d_array );
- 			}
- 		}
- 		else
- 		{
- 			$this->output .= $this->html->No_msg_inbox();
- 		}
- 		
- 		
- 		$this->output .= $this->html->end_inbox($this->jump_html, $amount_info, $pages);
- 		
- 		//---------------------------------------------
- 		// Update the message stats if we have to
- 		//---------------------------------------------
- 		
- 		if ($this->msg_stats['current_id'] == 'in')
- 		{
- 			$DB->query("UPDATE ibf_members SET ".
- 					     "new_msg='0' ".
- 					     "WHERE id='".$this->member['id']."'");
- 		}
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 		
- 	}
-
-
-//+------------------------------------------------------------------------------------
-
-	/**********************************************************/
- 	// VIEW SAVED:
- 	//
- 	// View the saved folder stuff.
- 	/**********************************************************/
- 	
- 	function view_saved() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//---------------------------------------------
- 		// Print the header
- 		//---------------------------------------------
- 		
- 		$this->output .= $this->html->unsent_table_header();
- 		
- 		$DB->query("SELECT m.*, mp.name as to_name FROM ibf_messages m, ibf_members mp WHERE member_id='".$this->member['id']."' AND vid='unsent' and mp.id=m.recipient_id ORDER BY msg_date DESC");
- 		
- 		//---------------------------------------------
- 		// Get the messages
- 		//---------------------------------------------
- 		
- 		
- 		if ( $DB->get_num_rows() )
- 		{
- 			while( $row = $DB->fetch_row() )
- 			{
- 				$row['icon']     = "<{M_READ}>";
- 				$row['date']     = $std->get_date( $row['msg_date'] , 'LONG' );
- 				$row['cc_users'] = $row['cc_users'] == "" ? $ibforums->lang['no'] : $ibforums->lang['yes'];
- 				
- 				$d_array = array( 'msg' => $row, 'member' => $this->member );
- 				
- 				$this->output .= $this->html->unsent_row( $d_array );
- 			}
- 		}
- 		else
- 		{
- 			$this->output .= $this->html->No_msg_inbox();
- 		}
- 		
- 		
- 		$this->output .= $this->html->unsent_end();
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 		
- 	}
- 	
- 	
- 	function show_tracking() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//---------------------------------------------
- 		// Get all tracked and read messages
- 		//---------------------------------------------
- 		
- 		$this->output .= $this->html->trackread_table_header();
- 		
- 		$DB->query("SELECT m.*, mp.name as to_name, mp.id as memid
- 					  FROM ibf_messages m, ibf_members mp
- 					WHERE m.tracking=1
- 					   AND m.read_state=1
- 					   AND m.from_id=".$this->member['id']."
- 					   AND m.member_id=mp.id
- 					ORDER BY msg_date DESC");
-
-
- 		if ( $DB->get_num_rows() )
- 		{
- 			while( $row = $DB->fetch_row() )
- 			{
- 				$row['icon']     = "<{M_READ}>";
- 				$row['date']     = $std->get_date( $row['read_date'] , 'LONG' );
- 				$this->output .= $this->html->trackread_row( $row );
- 			}
- 		}
- 		else
- 		{
- 			$this->output .= $this->html->No_msg_inbox();
- 		}
- 		
- 		
- 		$this->output .= $this->html->trackread_end();
- 		
- 		//---------------------------------------------
- 		// Get all tracked and UNread messages
- 		//---------------------------------------------
- 		
- 		$this->output .= $this->html->trackUNread_table_header();
- 		
- 		$DB->query("SELECT m.*, mp.name as to_name, mp.id as memid FROM ibf_messages m, ibf_members mp WHERE m.tracking=1 AND m.read_state=0 AND m.from_id='".$this->member['id']."' AND m.member_id=mp.id ORDER BY msg_date DESC");
- 		
- 		if ( $DB->get_num_rows() )
- 		{
- 			while( $row = $DB->fetch_row() )
- 			{
- 				$row['icon']     = "<{M_UNREAD}>";
- 				$row['date']     = $std->get_date( $row['msg_date'] , 'LONG' );
- 				$this->output .= $this->html->trackUNread_row( $row );
- 			}
- 		}
- 		else
- 		{
- 			$this->output .= $this->html->No_msg_inbox();
- 		}
- 		
- 		
- 		$this->output .= $this->html->trackUNread_end();
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 		
- 	}
-
-
-	/*********************************************************************/
-	// Parse the member info
-	/*********************************************************************/
-	
-	function parse_member($member=array(), $row=array()) {
-		global $ibforums, $std, $DB;
-		
-		$member['avatar'] = $std->get_avatar( $member['avatar'], $ibforums->member['view_avs'], $member['avatar_size'] );
-		
-		if ($member['g_icon'])
-		{
-			$member['member_rank_img'] = "<img src='{$ibforums->vars[TEAM_ICON_URL]}/{$member['g_icon']}' border='0' />";
-		}
-		
-		$member['member_joined'] = $ibforums->lang['m_joined'].' '.$std->get_date( $member['joined'], 'JOINED' );
-		
-		$member['member_group'] = $ibforums->lang['m_group'].' '.$member['g_title'];
-		
-		$member['member_posts'] = $ibforums->lang['m_posts'].' '.$std->do_number_format($member['posts']);
-		
-		$member['member_number'] = $ibforums->lang['member_no'].' '.$std->do_number_format($member['id']);
-		
-		$member['profile_icon'] = "<a href='{$this->base_url}showuser={$member['id']}'><{P_PROFILE}></a>";
-		
-		$member['message_icon'] = "<a href='{$this->base_url}act=Msg&amp;CODE=04&amp;MID={$member['id']}'><{P_MSG}></a>";
-		
-		if (!$member['hide_email'])
-		{
-			$member['email_icon'] = "<a href='{$this->base_url}act=Mail&amp;CODE=00&amp;MID={$member['id']}'><{P_EMAIL}></a>";
-		}
-		
-		if ( $member['website'] and preg_match( "/^http:\/\/\S+$/", $member['website'] ) )
-		{
-			$member['website_icon'] = "<a href='{$member['website']}' target='_blank'><{P_WEBSITE}></a>";
-		}
-		
-		if ($member['icq_number'])
-		{
-			$member['icq_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=ICQ&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_ICQ}></a>";
-		}
-		
-		if ($member['aim_name'])
-		{
-			$member['aol_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=AOL&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_AOL}></a>";
-		}
-		
-		if ($member['yahoo'])
-		{
-			$member['yahoo_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=YAHOO&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_YIM}></a>";
-		}
-		
-		if ($member['msnname'])
-		{
-			$member['msn_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=MSN&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_MSN}></a>";
-		}
-		
-		if ($member['integ_msg'])
-		{
-			$member['integ_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=integ&amp;MID={$member['id']}','Pager','750','450','0','1','1','1')\"><{INTEGRITY_MSGR}></a>";
-		}
-		
-		if ($ibforums->member['id'])
-		{
-			$member['addresscard'] = "<a href=\"javascript:PopUp('{$this->base_url}act=Profile&amp;CODE=showcard&amp;MID={$member['id']}','AddressCard','470','300','0','1','1','1')\" title='{$ibforums->lang['ac_title']}'><{ADDRESS_CARD}></a>";
-		}
-		
-		//-----------------------------------------------------
-		
-		return $member;
-	
-	}
-
-
- 	function html_add_smilie_box()
- 	{
- 		global $ibforums, $std, $DB;
- 		
- 		$show_table = 0;
-		$count      = 0;
-		$smilies    = "<tr align='center'>\n";
-		
-		// Get the smilies from the DB
-		
-		$DB->query("SELECT * FROM ibf_emoticons WHERE clickable='1'");
-		
-		while ($elmo = $DB->fetch_row() ) {
-		
-			$show_table++;
-			$count++;
-			
-			// Make single quotes as URL's with html entites in them
-			// are parsed by the browser, so ' causes JS error :o
-			
-			if (strstr( $elmo['typed'], "&#39;" ) )
-			{
-				$in_delim  = '"';
-				$out_delim = "'";
-			}
-			else
-			{
-				$in_delim  = "'";
-				$out_delim = '"';
-			}
-			
-			$smilies .= "<td><a href={$out_delim}javascript:emoticon($in_delim".$elmo['typed']."$in_delim){$out_delim}><img src=\"".$ibforums->vars['EMOTICONS_URL']."/".$elmo['image']."\" alt='smilie' border='0' /></a>&nbsp;</td>\n";
-			
-			if ($count == $ibforums->vars['emo_per_row']) {
-				$smilies .= "</tr>\n\n<tr align='center'>";
-				$count = 0;
-			}
-		}
-		
-		if ($count != $ibforums->vars['emo_per_row']) {
-			for ($i = $count ; $i < $ibforums->vars['emo_per_row'] ; ++$i) {
-				$smilies .= "<td>&nbsp;</td>\n";
-			}
-			$smilies .= "</tr>";
-		}
-		
-		$table = $this->post_html->smilie_table();
-		
-		if ($show_table != 0) {
-			$table = preg_replace( "/<!--THE SMILIES-->/", $smilies, $table );
-			$this->output = preg_replace( "/<!--SMILIE TABLE-->/", $table, $this->output );
-		}
-		
-	}
-	
-	function build_contact_list()
-	{
-		global $DB, $std;
-		
-		$contacts = "";
- 		
- 		$DB->query("SELECT * FROM ibf_contacts WHERE member_id='".$this->member['id']."' ORDER BY contact_name");
- 		
- 		if ( $DB->get_num_rows() )
- 		{
- 			$contacts = "<select name='from_contact' class='forminput'><option value='-'>".$ibforums->lang['other']."</option>\n<option value='-'>--------------------</option>\n";
- 			
- 			while ( $entry = $DB->fetch_row() )
- 			{
- 				$contacts .= "<option value='".$entry['contact_id']."'>".$entry['contact_name']."</option>\n";
- 			}
- 			
- 			$contacts .= "</select>\n";
- 		}
- 		else
- 		{
- 			$contacts = $ibforums->lang['address_list_empty'];
- 		}
- 		
- 		return $contacts;
- 	}
-        
-}
-
-?>
diff --git a/upload/sources/Moderate.php b/upload/sources/Moderate.php
deleted file mode 100644
index 7501ad1c..00000000
--- a/upload/sources/Moderate.php
+++ /dev/null
@@ -1,2120 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Moderation core module
-|   > Module written by Matt Mecham
-|   > Date started: 19th February 2002
-|
-|   > Module Version 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Moderate;
-
-class Moderate {
-
-    var $output    = "";
-    var $base_url  = "";
-    var $html      = "";
-
-    var $moderator = "";
-    var $modfunc   = "";
-    var $forum     = array();
-    var $topic     = array();
-    
-    var $upload_dir = "";
-
-    
-    /***********************************************************************************/
-	//
-	// Our constructor, load words, load skin, print the topic listing
-	//
-	/***********************************************************************************/
-    
-    function Moderate()
-    {
-    
-        global $ibforums, $DB, $std, $print, $skin_universal, $HTTP_POST_VARS;
-        
-        //-------------------------------------
-        // Make sure this is a POST request, not a naughty IMG redirect
-        //-------------------------------------
-        
-        if ($ibforums->input['CODE'] != '04' && $ibforums->input['CODE'] != '02' && $ibforums->input['CODE'] != '20' && $ibforums->input['CODE'] != '22')
-        {
-        
-			if ($HTTP_POST_VARS['act'] == '')
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'incorrect_use') );
-			}
-			
-		}
-		
-		//-------------------------------------
-        // Nawty, Nawty!
-        //-------------------------------------
-        
-        if ($ibforums->input['CODE'] != '02' && $ibforums->input['CODE'] != '05')
-        {
-			if ($ibforums->input['auth_key'] != $std->return_md5_check() )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
-			}
-		}
-        
-        //-------------------------------------
-		// Compile the language file
-		//-------------------------------------
-		
-        $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_mod', $ibforums->lang_id);
-
-        $this->html      = $std->load_template('skin_mod');
-        
-        //-------------------------------------
-        // Check the input
-        //-------------------------------------
-        
-        if ($ibforums->input['t'])
-        {
-        	$ibforums->input['t'] = intval($ibforums->input['t']);
-        	if (! $ibforums->input['t'] )
-        	{
-        		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
-        	}
-        	else
-        	{
-        		$DB->query("SELECT tid, title, description, posts, state, starter_id, pinned, forum_id, last_post from ibf_topics WHERE tid='".$ibforums->input['t']."'");
-        		$this->topic = $DB->fetch_row();
-        		
-        		if (empty($this->topic['tid']))
-        		{
-        			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
-        		}
-        	}
-        }
-        
-        if ($ibforums->input['p'])
-        {
-        	$ibforums->input['p'] = intval($ibforums->input['p']);
-        	if (! $ibforums->input['p'] )
-        	{
-        		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
-        	}
-        }
-        
-        $ibforums->input['f'] = intval($ibforums->input['f']);
-        if (! $ibforums->input['f'] )
-        {
-        	$std->Error( array( 'LEVEL' => 1,'MSG' => 'missing_files') );
-        }
-        
-        $ibforums->input['st'] = intval($ibforums->input['st']);
-        
-        
-        //-------------------------------------
-        // Get the forum info based on the forum ID,
-        // get the category name, ID, and get the topic details
-        //-------------------------------------
-        
-        $DB->query("SELECT f.*, c.name as cat_name, c.id as cat_id from ibf_forums f, ibf_categories c WHERE f.id=".$ibforums->input['f']." and c.id=f.category");
-        
-        $this->forum = $DB->fetch_row();
-        
-        
-        //-------------------------------------
-        // Error out if we can not find the forum
-        //-------------------------------------
-        
-        if (!$this->forum['id'])
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        }
-        
-        $this->base_url = $ibforums->base_url;
-        
-        //-------------------------------------
-        // Are we a moderator?
-        //-------------------------------------
-        
-        if ($ibforums->member['id'])
-        {
-        	if ($ibforums->member['g_is_supmod'] != 1)
-        	{
-        		$DB->query("SELECT * FROM ibf_moderators WHERE forum_id=".$this->forum['id']." AND (member_id=".$ibforums->member['id']." OR (is_group=1 AND group_id=".$ibforums->member['mgroup']."))");
-        		$this->moderator = $DB->fetch_row();
-        	}
-        }
-        
-        //-------------------------------------
-        // Load mod module...
-        //-------------------------------------
-        
-        require( ROOT_PATH.'sources/lib/modfunctions.php');
-        
-        $this->modfunc = new modfunctions();
-        
-        $this->modfunc->init($this->forum);
-        
-        
-        $this->upload_dir = $ibforums->vars['upload_dir'];
-        
-        //-------------------------------------
-        // Convert the code ID's into something
-        // use mere mortals can understand....
-        //-------------------------------------
-        
-        switch ($ibforums->input['CODE'])
-        {
-        	case '02':
-        		$this->move_form();
-        		break;
-        	case '03':
-        		$this->delete_form();
-        		break;
-        	case '04':
-        		$this->delete_post();
-        		break;
-        	case '05':
-        		$this->edit_form();
-        		break;
-        	case '00':
-        		$this->close_topic();
-        		break;
-        	case '01':
-        		$this->open_topic();
-        		break;
-        	case '08':
-        		$this->delete_topic();
-        		break;
-        	case '12':
-        		$this->do_edit();
-        		break;
-        	case '14':
-        		$this->do_move();
-        		break;
-        	case '15':
-        		$this->pin_topic();
-        		break;
-        	case '16':
-        		$this->unpin_topic();
-        		break;
-        	case '17':
-        		$this->rebuild_topic();
-        		break;
-        	//-------------------------
-        	case '20':
-        		$this->poll_edit_form();
-        		break;
-        	case '21':
-        		$this->poll_edit_do();
-        		break;
-        	//-------------------------
-        	case '22':
-        		$this->poll_delete_form();
-        		break;
-        	case '23':
-        		$this->poll_delete_do();
-        		break;
-        	//-------------------------
-        	case '30':
-        		$this->unsubscribe_all_form();
-        		break;
-        	case '31':
-        		$this->unsubscribe_all();
-        		break;
-        		
-        	//-------------------------
-        	
-        	case '50':
-        		$this->split_start();
-        		break;
-        		
-        	case '51':
-        		$this->split_complete();
-        		break;
-        		
-        	//-------------------------
-        	
-        	case '60':
-        		$this->merge_start();
-        		break;
-        	case '61':
-        		$this->merge_complete();
-        		break;
-        		
-        	//-------------------------
-        	
-        	case '90':
-        		$this->topic_history();
-        		break;
-        	
-        	default:
-        		$this->moderate_error();
-        		break;
-        }
-        
-        // If we have any HTML to print, do so...
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-      
-	}
-	
-	/*************************************************/
-	// TOPIC HISTORY:
-	// ---------------
-	//
-	/*************************************************/
-	
-	
-	function topic_history() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_access_cp'] == 1) {
-			$passed = 1;
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$tid = intval($ibforums->input['t']);
-		
-		//-----------------------------------------
-		// Get all info for this topic-y-poos
-		//-----------------------------------------
-		
-		$DB->query("SELECT * FROM ibf_topics WHERE tid='$tid'");
-		
-		$topic = $DB->fetch_row();
-		
-		if ($topic['last_post'] == $topic['start_date'])
-		{
-			$avg_posts = 1;
-		}
-		else
-		{
-			$avg_posts = round( ($topic['posts'] + 1) / ((( $topic['last_post'] - $topic['start_date']) / 86400)), 1);
-		}
-		
-		if ($avg_posts < 0)
-		{
-			$avg_posts = 1;
-		}
-		
-		if ($avg_posts > ( $topic['posts'] + 1) )
-		{
-			$avg_posts = $topic['posts'] + 1;
-		}
-		
-		$data = array( 
-					   'th_topic'      => $topic['title'],
-					   'th_desc'       => $topic['description'],
-					   'th_start_date' => $std->get_date($topic['start_date'], 'LONG'),
-					   'th_start_name' => $std->make_profile_link($topic['starter_name'], $topic['starter_id'] ),
-					   'th_last_date'  => $std->get_date($topic['last_post'], 'LONG'),
-	    		 	   'th_last_name'  => $std->make_profile_link($topic['last_poster_name'], $topic['last_poster_id'] ),
-					   'th_avg_post'   => $avg_posts,
-					 );
-					 
-		$this->output .= $this->html->topic_history($data);
-		
-		$this->output .= $this->html->mod_log_start();
-		
-		// Do we have any logs in the mod-logs DB about this topic? eh? well?
-		
-		$DB->query("SELECT * FROM ibf_moderator_logs WHERE topic_id='$tid' ORDER BY ctime DESC");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$this->output .= $this->html->mod_log_none();
-		}
-		else
-		{
-			while ($row = $DB->fetch_row())
-			{
-				$row['member'] = $std->make_profile_link($row['member_name'], $row['member_id'] );
-				$row['date']   = $std->get_date($row['ctime'], 'LONG');
-				$this->output .= $this->html->mod_log_row($row);
-			}
-		}
-		
-		$this->output .= $this->html->mod_log_end();
-		
-		$this->page_title = $this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-	
-	/*************************************************/
-	// SPLIT TOPICS:
-	// ---------------
-	//
-	/*************************************************/
-	
-	
-	function split_start() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['split_merge'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		//-----------------------------------------
-		
-		require "./sources/lib/post_parser.php";
-        
-        $this->parser = new post_parser();
-        
-        //-----------------------------------------
-		
-		$jump_html = $std->build_forum_jump(0,1);
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '51' ),
-												       2 => array( 't' , $this->topic['tid'] ),
-												       3 => array( 'f' , $this->forum['id']  ),
-		 								      )      );
-		 								      
-		$this->output .= $this->html->table_top( $ibforums->lang['st_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		
-		$this->output .= $this->html->mod_exp( $ibforums->lang['st_explain'] );
-		
-		$this->output .= $this->html->split_body( $jump_html );
-		
-		//-----------------------------------------
-		// Display the posty wosty's
-		//-----------------------------------------
-		
-		$post_query = $DB->query("SELECT post, pid, post_date, author_id, author_name
-		                          FROM ibf_posts
-		                          WHERE topic_id='{$this->topic['tid']}'
-		                           AND queued <> 1
-		                          ORDER BY post_date");
-		
-		$post_count = 0;
-		
-		while ( $row = $DB->fetch_row($post_query) )
-		{
-			
-			// Limit posts to 200 chars to stop shite loads of pages
-			
-			if ( strlen($row['post']) > 800 )
-			{
-				$row['post']   = $this->parser->unconvert($row['post']);
-				$row['post']   = substr($row['post'], 0, 800) . '...';
-			}
-			
-			$row['date']   = $std->get_date( $row['post_date'], 'LONG' );
-			
-			$row['st_top_bit'] = sprintf( $ibforums->lang['st_top_bit'], $row['author_name'], $row['date'] );
-				
-			$row['post_css'] = $post_count % 2 ? 'row1' : 'row2';
-				
-			$this->output .= $this->html->split_row( $row );
-			
-			$post_count++;
-		}
-		
-		//-----------------------------------------
-		// print my bottom, er, the bottom
-		//-----------------------------------------
-        		
-		$this->output .= $this->html->split_end_form( $ibforums->lang['st_submit'] );
-		
-		$this->page_title = $ibforums->lang['st_top']." ".$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-	
-	function split_complete() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['split_merge'] == 1)
-		{
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		//------------------------------------------
-		// Check the input
-		//------------------------------------------
-		
-		if ($ibforums->input['title'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
-		}
-		
-		//------------------------------------------
-		// Get the post ID's to split
-		//------------------------------------------
-
- 		$ids   = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^post_(\d+)$/", $key, $match ) )
- 			{	
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		$affected_ids = count($ids);
- 		
- 		//------------------------------------------
- 		// Do we have enough?
- 		//------------------------------------------
- 		
- 		if ($affected_ids < 1)
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'split_not_enough' ) );
- 		}
- 		
- 		//------------------------------------------
- 		// Do we too many?
- 		//------------------------------------------
- 		
- 		$DB->query("SELECT count(pid) as cnt FROM ibf_posts WHERE topic_id={$this->topic['tid']}");
- 		
- 		$count = $DB->fetch_row();
- 		
- 		if ( $affected_ids >= $count['cnt'] )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'split_too_much' ) );
- 		}
- 		
- 		// Complete the PID string
- 		
- 		$pid_string = implode( ",", $ids );
- 		
- 		//----------------------------------------------------
-		// Check the forum we're moving this too
-		//----------------------------------------------------
-		
-		$ibforums->input['fid'] = intval($ibforums->input['fid']);
-		
-		if ($ibforums->input['fid'] != $this->forum['id'])
-		{
-			$DB->query("SELECT id, subwrap, sub_can_post FROM ibf_forums WHERE id='".$ibforums->input['fid']."'");
-			
-			if ( ! $f = $DB->fetch_row() )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
-			}
-		
-			if ($f['subwrap'] == 1 and $f['sub_can_post'] != 1)
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'forum_no_post_allowed' ) );
-			}
-		}
-		
-		//----------------------------------------------------
-		// Complete a new dummy topic
-		//----------------------------------------------------
-		
-		$new_topic = array(
-						   'title'            => $ibforums->input['title'],
-						   'description'      => $ibforums->input['desc'] ,
-						   'state'            => 'open',
-						   'posts'            => 0,
-						   'starter_id'       => 0,
-						   'starter_name'     => 0,
-						   'start_date'       => time(),
-						   'last_poster_id'   => 0,
-						   'last_poster_name' => 0,
-						   'last_post'        => time(),
-						   'icon_id'          => 0,
-						   'author_mode'      => 1,
-						   'poll_state'       => 0,
-						   'last_vote'        => 0,
-						   'views'            => 0,
-						   'forum_id'         => $ibforums->input['fid'],
-						   'approved'         => 1,
-						   'pinned'           => 0,
-						  );
-							
-		$db_string = $DB->compile_db_insert_string( $new_topic );
-		
-		$DB->query("INSERT INTO ibf_topics (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		$new_topic_id = $DB->get_insert_id();
-
-		//----------------------------------------------------
-		// Move the posts
-		//----------------------------------------------------
-		
-		$DB->query("UPDATE ibf_posts SET forum_id='".$ibforums->input['fid']."', topic_id='$new_topic_id' WHERE pid IN($pid_string)");
-		
-		//----------------------------------------------------
-		// NEW TOPIC: Get the last / first post in the "new" topic
-		//----------------------------------------------------
-		
-		$DB->query("SELECT author_id, author_name, post_date FROM ibf_posts WHERE topic_id='$new_topic_id' ORDER BY post_date DESC LIMIT 1");
-		
-		$last_post = $DB->fetch_row();
-		
-		$DB->query("SELECT pid, author_id, author_name, post_date FROM ibf_posts WHERE topic_id='$new_topic_id' ORDER BY post_date ASC LIMIT 1");
-		
-		$first_post = $DB->fetch_row();
-		
-		// Get the number of posts in this "new" topic
-		
-		$DB->query("SELECT count(pid) as posts FROM ibf_posts WHERE queued <> 1 AND topic_id='$new_topic_id'");
-		
-		$post_count = $DB->fetch_row();
-		
-		// Remove 1 from the count as we don't count the first post
-		
-		$post_count['posts']--;
-		
-		//----------------------------------------------------
-		// NEW TOPIC: Update new topic entry in DB
-		//----------------------------------------------------
-		
-		$new_topic = array(
-						   'posts'            => $post_count['posts'],
-						   'starter_id'       => $first_post['author_id'],
-						   'starter_name'     => $first_post['author_name'],
-						   'start_date'       => $first_post['post_date'],
-						   'last_poster_id'   => $last_post['author_id'],
-						   'last_poster_name' => $last_post['author_name'],
-						   'last_post'        => $last_post['post_date'],
-						   'author_mode'      => $first_post['author_id'] ? 1 : 0,
-						  );
-							
-		$db_string = $DB->compile_db_update_string( $new_topic );
-		
-		$DB->query("UPDATE ibf_topics SET $db_string WHERE tid='$new_topic_id'");
-		
-		//----------------------------------------------------
-		// NEW TOPIC: Reset the new_topic bit
-		//----------------------------------------------------
-		
-		$DB->query("UPDATE ibf_posts SET new_topic=0 WHERE topic_id='$new_topic_id'");
-		
-		$DB->query("UPDATE ibf_posts SET new_topic=1 WHERE topic_id='$new_topic_id' AND pid='".$first_post['pid']."'");
-		
-		unset($last_post);
-		unset($first_post);
-		unset($post_count);
-		unset($new_topic);
-		
-		//----------------------------------------------------
-		// OLD TOPIC: Get the last / first post in the "old" topic
-		//----------------------------------------------------
-		
-		$DB->query("SELECT author_id, author_name, post_date FROM ibf_posts WHERE topic_id='".$this->topic['tid']."' ORDER BY post_date DESC LIMIT 1");
-		
-		$last_post = $DB->fetch_row();
-		
-		$DB->query("SELECT pid, author_id, author_name, post_date FROM ibf_posts WHERE topic_id='".$this->topic['tid']."' ORDER BY post_date ASC LIMIT 1");
-		
-		$first_post = $DB->fetch_row();
-		
-		// Get the number of posts in this "new" topic
-		
-		$DB->query("SELECT count(pid) as posts FROM ibf_posts WHERE queued <> 1 AND topic_id='".$this->topic['tid']."'");
-		
-		$post_count = $DB->fetch_row();
-		
-		// Remove 1 from the count as we don't count the first post
-		
-		$post_count['posts']--;
-		
-		//----------------------------------------------------
-		// OLD TOPIC: Update new topic entry in DB
-		//----------------------------------------------------
-		
-		$new_topic = array(
-						   'posts'            => $post_count['posts'],
-						   'starter_id'       => $first_post['author_id'],
-						   'starter_name'     => $first_post['author_name'],
-						   'start_date'       => $first_post['post_date'],
-						   'last_poster_id'   => $last_post['author_id'],
-						   'last_poster_name' => $last_post['author_name'],
-						   'last_post'        => $last_post['post_date'],
-						   'author_mode'      => $first_post['author_id'] ? 1 : 0,
-						  );
-							
-		$db_string = $DB->compile_db_update_string( $new_topic );
-		
-		$DB->query("UPDATE ibf_topics SET $db_string WHERE tid='".$this->topic['tid']."'");
-		
-		//----------------------------------------------------
-		// OLD TOPIC: Reset the new_topic bit
-		//----------------------------------------------------
-		
-		$DB->query("UPDATE ibf_posts SET new_topic=0 WHERE topic_id='".$this->topic['tid']."'");
-		
-		$DB->query("UPDATE ibf_posts SET new_topic=1 WHERE topic_id='".$this->topic['tid']."' AND pid='".$first_post['pid']."'");
-		
-		//----------------------------------------------------
-		// Update the forum(s)
-		//----------------------------------------------------
-		
-		$this->recount($this->topic['forum_id']);
-		
-		if ($this->topic['forum_id'] != $ibforums->input['fid'])
-		{
-			$this->recount($ibforums->input['fid']);
-		}
-		
-		$this->moderate_log("Split topic '{$this->topic['title']}'");
-		
-		$print->redirect_screen( $ibforums->lang['st_redirect'], "act=SF&f=".$this->forum['id'] );
-		
-	}
-	
-	
-	/*************************************************/
-	// MERGE TOPICS:
-	// ---------------
-	//
-	/*************************************************/
-	
-	
-	function merge_start() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['split_merge'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '61' ),
-												       2 => array( 't' , $this->topic['tid'] ),
-												       3 => array( 'f' , $this->forum['id']  ),
-		 								      )      );
-		 								      
-		$this->output .= $this->html->table_top( $ibforums->lang['mt_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		
-		$this->output .= $this->html->mod_exp( $ibforums->lang['mt_explain'] );
-		
-		$this->output .= $this->html->merge_body( $this->topic['title'], $this->topic['description'] );	
-        		
-		$this->output .= $this->html->end_form( $ibforums->lang['mt_submit'] );
-		
-		$this->page_title = $ibforums->lang['mt_top']." ".$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	//=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
-	
-	function merge_complete() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['split_merge'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		//------------------------------------------
-		// Check the input
-		//------------------------------------------
-		
-		if ($ibforums->input['topic_url'] == "" or $ibforums->input['title'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
-		}
-		
-		//------------------------------------------
-		// Get the topic ID of the entered URL
-		//------------------------------------------
-		
-		preg_match( "/(\?|&amp;)(t|showtopic)=(\d+)($|&amp;)/", $ibforums->input['topic_url'], $match );
-		
-		$old_id = intval(trim($match[3]));
-		
-		if ($old_id == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'mt_no_topic' ) );
-		}
-		
-		
-		//------------------------------------------
-		// Get the topic from the DB
-		//------------------------------------------
-		
-		$DB->query("SELECT tid, title, forum_id, last_post, last_poster_id, last_poster_name, posts, views FROM ibf_topics WHERE tid='$old_id'");
-		
-		if ( ! $old_topic = $DB->fetch_row() )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'mt_no_topic' ) );
-		}
-		
-		//------------------------------------------
-		// Did we try and merge the same topic?
-		//------------------------------------------
-		
-		if ($old_id == $this->topic['tid'])
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'mt_same_topic' ) );
-		}
-		
-		//------------------------------------------
-		// Do we have moderator permissions for this
-		// topic (ie: in the forum the topic is in)
-		//------------------------------------------
-		
-		$pass = FALSE;
-		
-		if ( $this->topic['forum_id'] == $old_topic['forum_id'] )
-		{
-			$pass = TRUE;
-		}
-		else
-		{
-			if ( $ibforums->member['g_is_supmod'] == 1 )
-			{
-				$pass = TRUE;
-			}
-			else
-			{
-				$DB->query("SELECT mid FROM ibf_moderators WHERE forum_id=".$old_topic['forum_id']." AND (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))");
-			
-				if ( $DB->get_num_rows() )
-				{
-					$pass = TRUE;
-				}
-			}
-		}
-		
-		if ( $pass == FALSE )
-		{
-			// No, we don't have permission
-			
-			$this->moderate_error();
-			
-		}
-		
-		//----------------------------------------------------
-		// Update the posts, remove old polls, subs and topic
-		//----------------------------------------------------
-		
-		$DB->query("UPDATE ibf_posts SET forum_id='".$this->topic['forum_id']."', topic_id='".$this->topic['tid']."' WHERE topic_id='".$old_topic['tid']."'");
-		
-		$DB->query("DELETE FROM ibf_polls WHERE tid='".$old_topic['tid']."'");
-		
-		$DB->query("DELETE FROM ibf_voters WHERE tid='".$old_topic['tid']."'");
-		
-		$DB->query("DELETE FROM ibf_tracker WHERE topic_id='".$old_topic['tid']."'");
-		
-		$DB->query("DELETE FROM ibf_topics WHERE tid='".$old_topic['tid']."'");
-		
-		//----------------------------------------------------
-		// Update the newly merged topic
-		//----------------------------------------------------
-		
-		$updater = array(  'title'       => $ibforums->input['title'],
-						   'description' => $ibforums->input['desc']
-						);
-						
-		if ($old_topic['last_post'] > $this->topic['last_post'])
-		{
-			$updater['last_post']        = $old_topic['last_post'];
-			$updater['last_poster_name'] = $old_topic['last_poster_name'];
-			$updater['last_poster_id']   = $old_topic['last_poster_id'];
-		}
-		
-		// We need to now count the original post, which isn't in the "posts" field 'cos it was a new topic
-		
-		$old_topic['posts']++;
-		
-		$str = $DB->compile_db_update_string($updater);
-		
-		$DB->query("UPDATE ibf_topics SET $str,views=views+{$old_topic['views']} WHERE tid='".$this->topic['tid']."'");
-		
-		//----------------------------------------------------
-		// Fix up the "new_topic" attribute.
-		//----------------------------------------------------
-		
-		$DB->query("UPDATE ibf_posts SET new_topic=0 WHERE topic_id='".$this->topic['tid']."'");
-		
-		$DB->query("SELECT pid, author_name, author_id, post_date FROM ibf_posts WHERE topic_id='".$this->topic['tid']."' ORDER BY post_date ASC LIMIT 1");
-		
-		if ( $first_post = $DB->fetch_row() )
-		{
-			$DB->query("UPDATE ibf_posts SET new_topic=1 WHERE pid='".$first_post['pid']."'");
-		}
-		
-		//----------------------------------------------------
-		// Reset the post count for this topic
-		//----------------------------------------------------
-		
-		$amode = $first_post['author_id'] ? 1 : 0;
-		
-		$DB->query("SELECT count(pid) as posts FROM ibf_posts WHERE queued <> 1 AND topic_id='".$this->topic['tid']."'");
-		
-		if ( $post_count = $DB->fetch_row() )
-		{
-			$post_count['posts']--; //Remove first post
-			
-			$DB->query("UPDATE ibf_topics
-			           SET posts=".$post_count['posts'].",
-			           starter_name='".$first_post['author_name']."',
-					   starter_id='".$first_post['author_id']."',
-					   start_date='".$first_post['post_date']."',
-					   author_mode=$amode
-			           WHERE tid='".$this->topic['tid']."'");
-		}
-		
-		//----------------------------------------------------
-		// Update the forum(s)
-		//----------------------------------------------------
-		
-		$this->recount($this->topic['forum_id']);
-		
-		if ($this->topic['forum_id'] != $old_topic['forum_id'])
-		{
-			$this->recount($old_topic['forum_id']);
-		}
-		
-		$this->moderate_log("Merged topic '{$old_topic['title']}' with '{$this->topic['title']}'");
-		
-		$print->redirect_screen( $ibforums->lang['mt_redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid'] );
-		
-	}
-	
-	
-	/*************************************************/
-	// UNSUBSCRIBE ALL FORM:
-	// ---------------------
-	//
-	/*************************************************/
-	
-	
-	function unsubscribe_all_form() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$DB->query("SELECT COUNT(trid) as subbed FROM ibf_tracker WHERE topic_id='".$this->topic['tid']."'");
-		
-		$tracker = $DB->fetch_row();
-		
-        /*if (! $tracker = $DB->fetch_row() )
-        {
-        	$this->moderate_error();
-        }*/
-        
-        if ( $tracker['subbed'] < 1 )
-        {
-        	$text = $ibforums->lang['ts_none'];
-        }
-        else
-        {
-        	$text = sprintf($ibforums->lang['ts_count'], $tracker['subbed']);
-        }
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '31' ),
-												       2 => array( 't' , $this->topic['tid'] ),
-												       3 => array( 'f' , $this->forum['id']  ),
-		 								      )      );
-		 								      
-		$this->output .= $this->html->table_top( $ibforums->lang['ts_title']." &gt; ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		
-		$this->output .= $this->html->mod_exp( $text );		
-        		
-		$this->output .= $this->html->end_form( $ibforums->lang['ts_submit'] );
-		
-		$this->page_title = $ibforums->lang['ts_title']." &gt; ".$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	//---------------------------------
-	
-	
-	function unsubscribe_all() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		// Delete the subbies based on this topic ID
-		
-		$DB->query("DELETE FROM ibf_tracker WHERE topic_id='".$this->topic['tid']."'");
-		
-		$print->redirect_screen( $ibforums->lang['ts_redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-		
-	}
-	
-	
-	/*************************************************/
-	// EDIT POLL FORM:
-	// ---------------
-	//
-	/*************************************************/
-	
-	
-	function poll_delete_form() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['delete_topic'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$DB->query("SELECT * FROM ibf_polls WHERE tid='".$this->topic['tid']."'");
-        $poll_data = $DB->fetch_row();
-        
-        if (! $poll_data['pid'])
-        {
-        	$this->moderate_error();
-        }
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '23' ),
-												       2 => array( 't' , $this->topic['tid'] ),
-												       3 => array( 'f' , $this->forum['id']  ),
-		 								      )      );
-		 								      
-		$this->output .= $this->html->table_top( $ibforums->lang['pd_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		
-		$this->output .= $this->html->mod_exp( $ibforums->lang['pd_text'] );		
-        		
-		$this->output .= $this->html->end_form( $ibforums->lang['pd_submit'] );
-		
-		$this->page_title = $ibforums->lang['pd_top'].$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	function poll_delete_do() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['delete_topic'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		// Remove the poll
-		
-		$DB->query("DELETE FROM ibf_polls WHERE tid='".$this->topic['tid']."'");
-		
-		// Remove from poll votes
-		
-		$DB->query("DELETE FROM ibf_voters WHERE tid='".$this->topic['tid']."'");
-		
-		// Update topic
-		
-		$DB->query("UPDATE ibf_topics SET poll_state='', last_vote='', total_votes='' WHERE tid='".$this->topic['tid']."'");
-		
-		// Boing!
-		
-		$print->redirect_screen( $ibforums->lang['pd_redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-		
-	}
-	
-	
-	function poll_edit_do() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['edit_post'] == 1)
-		{
-			$passed = 1;
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$DB->query("SELECT * FROM ibf_polls WHERE tid='".$this->topic['tid']."'");
-        $poll_data = $DB->fetch_row();
-        
-        if (! $poll_data['pid'])
-        {
-        	$this->moderate_error();
-        }
-        
-        $poll_answers = unserialize(stripslashes($poll_data['choices']));
-        
-		reset($poll_answers);
-		
-		$new_poll_array = array();
-		$ids            = array();
-		$rearranged     = array();
-		
-		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^POLL_(\d+)$/", $key, $match ) )
- 			{
- 				if (isset($ibforums->input[$match[0]]))
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		//--------------------------------------------------
- 		
- 		foreach ($poll_answers as $entry)
-		{
-			$rearranged[ $entry[0] ] = array( $entry[0], $entry[1], $entry[2]);
-		}
- 		
- 		//--------------------------------------------------
- 		
- 		foreach( $ids as $nid )
- 		{
- 			//-----------------------------------
- 			// Is it a current poll thingy?
- 			//-----------------------------------
- 		
- 			if ( strlen($rearranged[ $nid ][1]) > 0 )
- 			{
- 				$new_poll_array[] = array( $rearranged[ $nid ][0], $ibforums->input['POLL_'.$nid], $rearranged[ $nid ][2]);
- 			}
- 			else
- 			{
- 				if ( strlen($ibforums->input['POLL_'.$nid]) > 0 )
- 				{
- 					$new_poll_array[] = array( $nid, $ibforums->input['POLL_'.$nid], 0);
- 				}
- 			}
-		}
-		
-		//---------------------------------
-		// Take care of any new ones...
-		//---------------------------------
-		
-		$poll_data['choices'] = addslashes(serialize($new_poll_array));
-		
-		$DB->query("UPDATE ibf_polls SET ".
-					 "choices='"  . $poll_data['choices'] . "', poll_question='".$ibforums->input['poll_question']."' ".
-					 "WHERE tid='" . $this->topic['tid']    . "'");
-					 
-		//------------------------
-		
-		// Update the topic table to change the poll_only value.
-		
-		$poll_state = $ibforums->input['pollonly'] == 1 ? 'closed' : 'open';
-		
-		$DB->query("UPDATE ibf_topics SET poll_state='$poll_state' WHERE tid='".$this->topic['tid']."'");
-		
-		$this->moderate_log("Edited a Poll");
-	
-		$print->redirect_screen( $ibforums->lang['pe_done'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-
-    }
-    
-    
-    //--------------------------------------
-	
-	
-	function poll_edit_form()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$ibforums->vars['max_poll_choices'] = $ibforums->vars['max_poll_choices'] ? $ibforums->vars['max_poll_choices'] : 10;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['edit_post'] == 1)
-		{
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$DB->query("SELECT * FROM ibf_polls WHERE tid='".$this->topic['tid']."'");
-        $poll_data = $DB->fetch_row();
-        
-        if (! $poll_data['pid'])
-        {
-        	$this->moderate_error();
-        }
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '21' ),
-												       2 => array( 't' , $this->topic['tid'] ),
-												       3 => array( 'f' , $this->forum['id']  ),
-		 								      )      );
-		 								      
-		$this->output .= $this->html->table_top( $ibforums->lang['pe_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		
-		$this->output .= $this->html->poll_edit_top();
-		
-		$poll_answers = unserialize(stripslashes($poll_data['choices']));
-		
-		reset($poll_answers);
-		
-		foreach ($poll_answers as $entry)
-		{
-			$id     = $entry[0];
-			$choice = $entry[1];
-			$votes  = $entry[2];
-			
-			$this->output .= $this->html->poll_entry($id, $choice);
-			
-		}
-		
-		if ( count($poll_answers) < $ibforums->vars['max_poll_choices'] )
-		{
-			for ( $i = count($poll_answers) ; $i <= $ibforums->vars['max_poll_choices'] ; $i++ )
-			{
-				$this->output .= $this->html->poll_edit_new_entry($i);
-			}
-		}
-			
-        		
-        $this->output .= $this->html->poll_select_form($poll_data['poll_question']);		
-        		
-		$this->output .= $this->html->end_form( $ibforums->lang['pe_submit'] );
-		
-		$this->page_title = $ibforums->lang['pe_top'].$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	/*************************************************/
-	// MOVE FORM:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function move_form() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['move_topic'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '14' ),
-												       2 => array( 'tid' , $this->topic['tid'] ),
-												       3 => array( 'sf'  , $this->forum['id']  ),
-		 								      )      );
-		 								      
-		$jump_html = $std->build_forum_jump(0,0,0);
-		 								
-		$this->output .= $this->html->table_top( $ibforums->lang['top_move']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		$this->output .= $this->html->mod_exp( $ibforums->lang['move_exp'] );
-		$this->output .= $this->html->move_form( $jump_html , $this->forum['name']);
-		$this->output .= $this->html->end_form( $ibforums->lang['submit_move'] );
-		
-		$this->page_title = $ibforums->lang['t_move'].": ".$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	/*************************************************/
-	
-	function do_move() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1) {
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['move_topic'] == 1) {
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		//----------------------------------
-		// Check for input..
-		//----------------------------------
-		
-		if ($ibforums->input['sf'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_source' ) );
-		}
-		
-		//----------------------------------
-		
-		if ($ibforums->input['move_id'] == "" or $ibforums->input['move_id'] == -1)
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
-		}
-		
-		//----------------------------------
-		
-		if ($ibforums->input['move_id'] == $ibforums->input['sf'])
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_same_forum' ) );
-		}
-		
-		//----------------------------------
-		
-		$DB->query("SELECT id, subwrap, sub_can_post, name, redirect_on FROM ibf_forums WHERE id IN(".$ibforums->input['sf'].",".$ibforums->input['move_id'].")");
-		
-		if ($DB->get_num_rows() != 2)
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
-		}
-		
-		$source = intval($ibforums->input['sf']);
-		$moveto = intval($ibforums->input['move_id']);
-		
-		$source_name = "";
-		$dest_name   = "";
-		
-		//-----------------------------------
-		// Check for an attempt to move into a subwrap forum
-		//-----------------------------------
-		
-		while ( $f = $DB->fetch_row() )
-		{
-			if ($f['id'] == $ibforums->input['sf'])
-			{
-				$source_name = $f['name'];
-			}
-			else
-			{
-				$dest_name = $f['name'];
-			}
-			
-			if ( ($f['subwrap'] == 1 and $f['sub_can_post'] != 1) OR $f['redirect_on'] == 1 )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'forum_no_post_allowed' ) );
-			}
-		}
-		
-		
-		$DB->query("SELECT * FROM ibf_topics WHERE tid='".$ibforums->input['tid']."'");
-		
-		if ( ! $this->topic = $DB->fetch_row() )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
-		}
-		
-		$ibforums->input['leave'] = $ibforums->input['leave'] == 'y' ? 1 : 0;
-		
-		$this->modfunc->topic_move($this->topic['tid'], $ibforums->input['sf'], $ibforums->input['move_id'], $ibforums->input['leave']);
-		
-		$ibforums->input['t'] = $this->topic['tid'];
-		
-		$this->moderate_log("Moved a topic from $source_name to $dest_name");
-		
-		// Resync the forums..
-		
-		$this->modfunc->forum_recount($source);
-		
-		$this->modfunc->forum_recount($moveto);
-	
-		$print->redirect_screen( $ibforums->lang['p_moved'], "act=SF&f=".$this->forum['id']."&st=".$ibforums->input['st'] );
-		
-	}
-	
-	
-	/*************************************************/
-	
-	function delete_post() {
-		global $std, $ibforums, $DB, $print;
-		
-		// Get this post id.
-		
-		$DB->query("SELECT pid,attach_file, author_id, attach_id, post_date, new_topic from ibf_posts WHERE forum_id='".$this->forum['id']."' AND topic_id='".$this->topic['tid']."' and pid='".$ibforums->input['p']."'");
-		if ( ! $post = $DB->fetch_row() )
-		{
-			$this->moderate_error();
-		}
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		else if ($this->moderator['delete_post'] == 1)
-		{
-			$passed = 1;
-		}
-		else if ( ($ibforums->member['g_delete_own_posts'] == 1) and ( $ibforums->member['id'] == $post['author_id'] ) )
-		{
-			$passed = 1;
-		}
-		else 
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		
-		// Check to make sure that this isn't the first post in the topic..
-		
-		if ($post['new_topic'] == 1)
-		{
-			$this->moderate_error('no_delete_post');
-		}
-		
-		//---------------------------------------
-		// Is there an attachment to this post?
-		//---------------------------------------
-		
-		if ($post['attach_id'] != "")
-		{
-			if (is_file($this->upload_dir."/".$post['attach_id']))
-			{
-				unlink ($this->upload_dir."/".$post['attach_id']);
-			}
-		}
-		
-		//---------------------------------------
-		// delete the post
-		//---------------------------------------
-		
-		$DB->query("DELETE from ibf_posts WHERE topic_id='".$this->topic['tid']."' and pid='".$post['pid']."'");
-		
-		//---------------------------------------
-		// Update the stats
-		//---------------------------------------
-		
-		$DB->query("UPDATE ibf_stats SET TOTAL_REPLIES=TOTAL_REPLIES-1");
-		
-		//---------------------------------------
-		// Get the latest post details
-		//---------------------------------------
-		
-		$DB->query("SELECT post_date, author_id, author_name from ibf_posts WHERE topic_id='".$this->topic['tid']."' and queued <> 1 ORDER BY pid DESC");
-		$last_post = $DB->fetch_row();
-			
-		$DB->query("UPDATE ibf_topics SET last_post='"        .$last_post['post_date']   ."', ".
-										 "last_poster_id='"   .$last_post['author_id']   ."', ".
-										 "last_poster_name='" .$last_post['author_name'] ."', ".
-										 "posts=posts-1 WHERE tid='".$this->topic['tid']."'");
-										 
-		//---------------------------------------
-		// If we deleted the last post in a topic that was
-		// the last post in a forum, best update that :D
-		//---------------------------------------
-		
-		if ($this->forum['last_id'] == $this->topic['tid'])
-		{
-			$DB->query("SELECT title, tid, last_post, last_poster_id, last_poster_name "
-					  ."FROM ibf_topics WHERE forum_id='".$this->forum['id']."' AND approved=1 "
-					  ."ORDER BY last_post DESC LIMIT 0,1");
-		          
-			$tt = $DB->fetch_row();
-			
-			$db_string = $DB->compile_db_update_string( array(
-															   last_title       => $tt['title']            ? $tt['title']            : "",
-															   last_id          => $tt['tid']              ? $tt['tid']              : "",
-															   last_post        => $tt['last_post']        ? $tt['last_post']        : "",
-															   last_poster_name => $tt['last_poster_name'] ? $tt['last_poster_name'] : "",
-															   last_poster_id   => $tt['last_poster_id']   ? $tt['last_poster_id']   : "",
-													  )      );
-			
-			$DB->query("UPDATE ibf_forums SET ".$db_string.",posts=posts-1 WHERE id='".$this->forum['id']."'");
-		}
-		
-		$this->moderate_log("Deleted a post");
-	
-		$print->redirect_screen( $ibforums->lang['post_deleted'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-
-	
-	}
-	
-	/*************************************************/
-	// DELETE TOPIC:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function delete_form() {
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['delete_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->topic['starter_id'] == $ibforums->member['id'])
-		{
-			if ($ibforums->member['g_delete_own_topics'] == 1)
-			{
-				$passed = 1;
-			}
-		}
-		
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid'])) {
-			$this->moderate_error();
-		}
-		
-		$this->output = $this->html->delete_js();
-		
-		$this->output .= $this->html_start_form( array( 1 => array( 'CODE', '08' ),
-												        2 => array( 't', $this->topic['tid'] )
-		 								       )      );
-		 								
-		$this->output .= $this->html->table_top( $ibforums->lang['top_delete']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		$this->output .= $this->html->mod_exp( $ibforums->lang['delete_topic'] );
-		$this->output .= $this->html->end_form( $ibforums->lang['submit_delete'] );
-		
-		$this->page_title = $ibforums->lang['t_delete'].": ".$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	function delete_topic()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		else if ($this->moderator['delete_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		else if ($this->topic['starter_id'] == $ibforums->member['id'])
-		{
-			if ($ibforums->member['g_delete_own_topics'] == 1)
-			{
-				$passed = 1;
-			}
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		// Do we have a linked topic to remove?
-		
-		$DB->query("SELECT tid, forum_id FROM ibf_topics WHERE state='link' AND moved_to='".$this->topic['tid'].'&'.$this->forum['id']."'");
-		
-		if ( $linked_topic = $DB->fetch_row() )
-		{
-			$DB->query("DELETE FROM ibf_topics WHERE tid='".$linked_topic['tid']."'");
-			$this->modfunc->forum_recount($linked_topic['forum_id']);
-		}
-		
-		$this->modfunc->topic_delete($this->topic['tid']);
-		
-		$this->moderate_log("Deleted a topic");
-	
-		$print->redirect_screen( $ibforums->lang['p_deleted'], "act=SF&f=".$this->forum['id'] );
-	
-	}
-	
-	
-	/*************************************************/
-	// EDIT TOPIC:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function edit_form()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['edit_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '12' ),
-												       2 => array( 't', $this->topic['tid'] )
-		 								      )      );
-		 								
-		$this->output .= $this->html->table_top( $ibforums->lang['top_edit']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
-		$this->output .= $this->html->mod_exp( $ibforums->lang['edit_topic'] );
-		$this->output .= $this->html->topictitle_fields( $this->topic['title'], $this->topic['description'] );
-		$this->output .= $this->html->end_form( $ibforums->lang['submit_edit'] );
-		
-		$this->page_title = $ibforums->lang['t_edit'].": ".$this->topic['title'];
-		
-		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
-						   );
-	}
-	
-	function do_edit()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['edit_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		if (empty($this->topic['tid']))
-		{
-			$this->moderate_error();
-		}
-		
-		if ( trim($ibforums->input['TopicTitle']) == "")
-		{
-			$std->Error( array( 'LEVEL' => 2, 'MSG' => 'no_topic_title' ) );
-		}
-		
-		$topic_title = preg_replace( "/'/", "/\\'/", $ibforums->input['TopicTitle'] );
-		$topic_desc  = preg_replace( "/'/", "/\\'/", $ibforums->input['TopicDesc']  );
-		
-		$DB->query("UPDATE ibf_topics SET title='$topic_title', description='$topic_desc' WHERE tid='".$this->topic['tid']."'");
-		
-		if ($this->topic['tid'] == $this->forum['last_id'])
-		{
-			$DB->query("UPDATE ibf_forums SET last_title='$topic_title' WHERE id='".$this->forum['id']."'");
-		}
-		
-		$this->moderate_log("Moderator edited a topic title: (ID: {$this->topic['tid']}) From '{$this->topic['title']}' to '$topic_title'");
-	
-		$print->redirect_screen( $ibforums->lang['p_edited'], "act=SF&f=".$this->forum['id'] );
-		
-		
-	}
-		
-		
-	/*************************************************/
-	// OPEN TOPIC:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function open_topic()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		if ($this->topic['state'] == 'open')
-		{
-			$this->moderate_error();
-		}
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->topic['starter_id'] == $ibforums->member['id'])
-		{
-			if ($ibforums->member['g_open_close_posts'] == 1)
-			{
-				$passed = 1;
-			}
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($this->moderator['open_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		$this->modfunc->topic_open($this->topic['tid']);
-		
-		$this->moderate_log("Opened Topic");
-	
-		$print->redirect_screen( $ibforums->lang['p_opened'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-		
-	}
-	
-
-
-	/*************************************************/
-	// CLOSE TOPIC:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function close_topic()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->topic['starter_id'] == $ibforums->member['id'])
-		{
-			if ($ibforums->member['g_open_close_posts'] == 1)
-			{
-				$passed = 1;
-			}
-		}
-		else
-		{
-			$passed = 0;
-		}
-		
-		if ($this->moderator['close_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		$this->modfunc->topic_close($this->topic['tid']);
-		
-		$this->moderate_log("Locked Topic");
-	
-		$print->redirect_screen( $ibforums->lang['p_closed'], "act=SF&f=".$this->forum['id'] );
-		
-	}
-
-
-	/*************************************************/
-	// PIN TOPIC:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function pin_topic()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		if ($this->topic['PIN_STATE'] == 1)
-		{
-			$this->moderate_error();
-		}
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['pin_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		$this->modfunc->topic_pin($this->topic['tid']);
-		
-		$this->moderate_log("Pinned Topic");
-	
-		$print->redirect_screen( $ibforums->lang['p_pinned'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-		
-	}
-	
-	/*************************************************/
-	// UNPIN TOPIC:
-	// ---------------
-	//
-	/*************************************************/
-	
-	function unpin_topic()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		if ($this->topic['pinned'] == 0)
-		{
-			$this->moderate_error();
-		}
-		
-		$passed = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$passed = 1;
-		}
-		
-		else if ($this->moderator['unpin_topic'] == 1)
-		{
-			$passed = 1;
-		}
-		else {
-			$passed = 0;
-		}
-		
-		if ($passed != 1) $this->moderate_error();
-		
-		$this->modfunc->topic_unpin($this->topic['tid']);
-		
-		$this->moderate_log("Unpinned Topic");
-	
-		$print->redirect_screen( $ibforums->lang['p_unpinned'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
-		
-	}
-	
-//+---------------------------------------------------------------------------------------------
-	
-			
-	/*************************************************/
-	// MODERATE ERROR:
-	// ---------------
-	//
-	// Function for error messages in this script
-	//
-	/*************************************************/
-	
-	function moderate_error($msg = 'moderate_no_permission') {
-		global $std;
-		
-		$std->Error( array( 'LEVEL' => 2, 'MSG' => $msg ) );
-		
-		// Make sure we exit..
-		
-		exit();
-	}
-	
-	/*************************************************/
-	// MODERATE LOG:
-	// ---------------
-	//
-	// Function for adding the mod action to the DB
-	//
-	/*************************************************/
-	
-	function moderate_log($title = 'unknown') {
-		global $std, $ibforums, $DB, $HTTP_REFERER, $QUERY_STRING;
-		
-		$this->modfunc->add_moderate_log( $ibforums->input['f'], $ibforums->input['t'], $ibforums->input['p'], $this->topic['title'], $title );
-	}
-	
-	
-	/*************************************************/
-	// Re Count topics for the forums:
-	// ---------------
-	//
-	// Handles simple moderation functions, saves on
-	// writing the same code over and over.
-	// ASS_U_ME's that the requesting user has been
-	// authenticated by this stage.
-	//
-	/*************************************************/
-	
-	function recount($fid="") {
-		global $ibforums, $root_path, $DB, $std;
-		
-		if ($fid == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_source' ) );
-		}
-		
-		// Get the topics..
-		
-		$DB->query("SELECT COUNT(tid) as count FROM ibf_topics WHERE approved=1 and forum_id='".$fid."'");
-		$topics = $DB->fetch_row();
-		
-		// Get the posts..
-		
-		$DB->query("SELECT COUNT(pid) as count FROM ibf_posts WHERE queued <> 1 and forum_id='".$fid."'");
-		$posts = $DB->fetch_row();
-		
-		// Get the forum last poster..
-		
-		$DB->query("SELECT tid, title, last_poster_id, last_poster_name, last_post FROM ibf_topics WHERE approved=1 and forum_id='".$fid."' ORDER BY last_post DESC LIMIT 0,1");
-		$last_post = $DB->fetch_row();
-		
-		// Get real post count by removing topic starting posts from the count
-		
-		$real_posts = $posts['count'] - $topics['count'];
-		
-		// Reset this forums stats
-		
-		$db_string = $DB->compile_db_update_string( array (
-															 'last_poster_id'   => $last_post['last_poster_id'],
-															 'last_poster_name' => $last_post['last_poster_name'],
-															 'last_post'        => $last_post['last_post'],
-															 'last_title'       => $last_post['title'],
-															 'last_id'          => $last_post['tid'],
-															 'topics'           => $topics['count'],
-															 'posts'            => $real_posts
-												 )        );
-												 
-		$DB->query("UPDATE ibf_forums SET $db_string WHERE id='".$fid."'");
-		
-	}
-	
-	
-	/*****************************************************/
-	// HTML: start form.
-	// ------------------
-	// Returns the HTML for the <FORM> opening tag
-	/*****************************************************/
-	
-	function html_start_form($additional_tags=array()) {
-		global $ibforums, $std;
-		
-		$form = "<form action='{$this->base_url}' method='POST' name='REPLIER'>".
-				"<input type='hidden' name='st' value='".$ibforums->input[st]."' />".
-				"<input type='hidden' name='act' value='Mod' />".
-				"<input type='hidden' name='s' value='".$ibforums->session_id."' />".
-				"<input type='hidden' name='f' value='".$this->forum['id']."' />".
-				"<input type='hidden' name='auth_key' value='".$std->return_md5_check() ."' />";
-				
-		// Any other tags to add?
-		
-		if (isset($additional_tags)) {
-			foreach($additional_tags as $k => $v) {
-				$form .= "\n<input type='hidden' name='{$v[0]}' value='{$v[1]}'>";
-			}
-		}
-		
-		return $form;
-    }
-    
-}
-
-?>
diff --git a/upload/sources/Post.php b/upload/sources/Post.php
deleted file mode 100644
index 9c69f5ec..00000000
--- a/upload/sources/Post.php
+++ /dev/null
@@ -1,1239 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Post core module
-|   > Module written by Matt Mecham
-|   > Date started: 14th February 2002
-|
-|   > Module Version 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Post;
-
-class Post {
-
-    var $output    = "";
-    var $base_url  = "";
-    var $html      = "";
-    var $parser    = "";
-    var $moderator = array();
-    var $forum     = array();
-    var $topic     = array();
-    var $category  = array();
-    var $mem_groups = array();
-    var $mem_titles = array();
-    var $obj        = array();
-    var $email      = "";
-    var $can_upload = 0;
-    var $md5_check  = "";
-    var $module     = "";
-    
-    /***********************************************************************************/
-	//
-	// Our constructor, load words, load skin, print the topic listing
-	//
-	/***********************************************************************************/
-    
-    function Post()
-    {
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
-        require ROOT_PATH."sources/lib/post_parser.php";
-        
-        $this->parser = new post_parser(1);
-        
-        require ROOT_PATH."sources/lib/emailer.php";
-		
-		$this->email = new emailer();
-        
-        //--------------------------------------
-		// Compile the language file
-		//--------------------------------------
-		
-        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
-
-        $this->html     = $std->load_template('skin_post');
-        
-        //--------------------------------------------
-    	// Get the sync module
-		//--------------------------------------------
-		
-		if ( USE_MODULES == 1 )
-		{
-			require ROOT_PATH."modules/ipb_member_sync.php";
-			
-			$this->modules = new ipb_member_sync();
-		}
-        
-        //--------------------------------------
-        // Check the input
-        //--------------------------------------
-        
-        $this->md5_check = $std->return_md5_check();
-        
-        if ($ibforums->input['t'])
-        {
-        	$ibforums->input['t'] = intval($ibforums->input['t']);
-        	if (! $ibforums->input['t'] )
-        	{
-        		$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        	}
-        }
-        
-        if ($ibforums->input['p'])
-        {
-        	$ibforums->input['p'] = intval($ibforums->input['p']);
-        	if (! $ibforums->input['p'] )
-        	{
-        		$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        	}
-        }
-        
-        $ibforums->input['f'] = intval($ibforums->input['f']);
-        if (! $ibforums->input['f'] )
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        }
-        
-        $ibforums->input['st'] = $ibforums->input['st'] ?intval($ibforums->input['st']) : 0;
-        
-        // Did the user press the "preview" button?
-        
-        $this->obj['preview_post'] = $ibforums->input['preview'];
-        
-        
-        //--------------------------------------
-        // Get the forum info based on the forum ID, get the category name, ID, and get the topic details
-        //--------------------------------------
-        
-        $DB->query("SELECT f.*, c.id as cat_id, c.name as cat_name from ibf_forums f, ibf_categories c WHERE f.id=".$ibforums->input[f]." and c.id=f.category");
-        
-        $this->forum = $DB->fetch_row();
-        
-        if ( $std->check_perms($this->forum['read_perms']) != TRUE )
-        {
-			$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
-        }
-        
-        // Can we upload stuff?
-        
-        if ( $std->check_perms($this->forum['upload_perms']) == TRUE )
-        {
-        	$this->can_upload = 1;
-        }
-        
-        // Is this forum switched off?
-        
-        if ( ! $this->forum['status'] )
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'forum_read_only') );
-        }
-        
-        //--------------------------------------
-        // Is this a password protected forum?
-        //--------------------------------------
-        
-        $pass = 0;
-		
-		if ($this->forum['password'] != "")
-		{
-			if ( ! $c_pass = $std->my_getcookie('iBForum'.$this->forum['id']) )
-			{
-				$pass = 0;
-			}
-		
-			if ( $c_pass == $this->forum['password'] )
-			{
-				$pass = 1;
-			}
-			else
-			{
-			    $pass = 0;
-			}
-		}
-		else
-		{
-			$pass = 1;
-		}
-		
-		if ($pass == 0)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
-		}
-		
-		//--------------------------------------
-        
-        if ($this->forum['parent_id'] > 0)
-        {
-        
-        	$DB->query("SELECT f.id as forum_id, f.name as forum_name, c.id, c.name FROM ibf_forums f, ibf_categories c WHERE f.id='".$this->forum['parent_id']."' AND c.id=f.category");
-        	
-        	$row = $DB->fetch_row();
-        	
-        	$this->forum['cat_id']   = $row['id'];
-        	$this->forum['cat_name'] = $row['name'];
-        	
-        }
-        
-        
-        //--------------------------------------
-        // Error out if we can not find the forum
-        //--------------------------------------
-        
-        if (!$this->forum['id'])
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        }
-        
-        $this->base_url = $ibforums->base_url;
-        
-        //--------------------------------------
-        // Is this forum moderated?
-        //--------------------------------------
-        
-        $this->obj['moderate'] = intval($this->forum['preview_posts']);
-        
-        // Can we bypass it?
-        
-        if ($ibforums->member['g_avoid_q'])
-        {
-        	$this->obj['moderate'] = 0;
-        }
-        
-		//--------------------------------------
-        // Does this member have mod_posts enabled?
-		//--------------------------------------
-         
-        if ( $ibforums->member['mod_posts'] )
-		{
-			if ( $ibforums->member['mod_posts'] == 1 )
-			{
-				$this->obj['moderate'] = 1;
-			}
-			else
-			{
-				$mod_arr = $std->hdl_ban_line( $ibforums->member['mod_posts'] );
-				
-				if ( time() >= $mod_arr['date_end'] )
-				{
-					// Update this member's profile
-					
-					$DB->query("UPDATE ibf_members SET mod_posts=0 WHERE id=".intval($ibforums->member['id']) );
-					
-					$this->obj['moderate'] = intval($this->forum['preview_posts']);
-				}
-				else
-				{
-					$this->obj['moderate'] = 1;
-				}
-			}
-		}
-        
-        //--------------------------------------
-        // Are we allowed to post at all?
-        //--------------------------------------
-        
-        if ($ibforums->member['id'])
-        {
-        	if ( $ibforums->member['restrict_post'] )
-        	{
-        		if ( $ibforums->member['restrict_post'] == 1 )
-        		{
-        			$std->Error( array( LEVEL => 1, MSG => 'posting_off') );
-        		}
-        		
-        		$post_arr = $std->hdl_ban_line( $ibforums->member['restrict_post'] );
-        		
-        		if ( time() >= $post_arr['date_end'] )
-        		{
-        			// Update this member's profile
-        			
-        			$DB->query("UPDATE ibf_members SET restrict_post=0 WHERE id=".intval($ibforums->member['id']) );
-        		}
-        		else
-        		{
-        			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'posting_off_susp', 'EXTRA' => $std->get_date($post_arr['date_end'], 'LONG') ) );
-        		}
-        		
-        	}
-        	
-        	// Flood check..
-        	
-        	if ( $ibforums->input['CODE'] != "08" and $ibforums->input['CODE'] != "09" and $ibforums->input['CODE'] != "14" and $ibforums->input['CODE'] != "15" )
-        	{
-				if ( $ibforums->vars['flood_control'] > 0 )
-				{
-					if ($ibforums->member['g_avoid_flood'] != 1)
-					{
-						if ( time() - $ibforums->member['last_post'] < $ibforums->vars['flood_control'] )
-						{
-							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'flood_control' , 'EXTRA' => $ibforums->vars['flood_control'] ) );
-						}
-					}
-				}
-				
-			}
-        	
-        }
-        else if ( $ibforums->is_bot == 1 )
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'posting_off') );
-        }
-        
-        
-        if ($ibforums->member['id'] != 0 and $ibforums->member['g_is_supmod'] == 0)
-        {
-        	$DB->query("SELECT * from ibf_moderators WHERE forum_id='".$this->forum['id']."' AND (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))");
-        	$this->moderator = $DB->fetch_row();
-        }
-        
-        //--------------------------------------
-        // Convert the code ID's into something
-        // use mere mortals can understand....
-        //--------------------------------------
-        
-        $this->obj['action_codes'] = array ( '00'  => array( '0'  , 'new_post'     ),
-        									 '01'  => array( '1'  , 'new_post'     ),
-        									 '02'  => array( '0'  , 'reply_post'   ),
-        									 '03'  => array( '1'  , 'reply_post'   ),
-        									 '06'  => array( '0'  , 'q_reply_post' ),
-        									 '07'  => array( '1'  , 'q_reply_post' ),
-        									 '08'  => array( '0'  , 'edit_post'    ),
-        									 '09'  => array( '1'  , 'edit_post'    ),
-        									 '10'  => array( '0'  , 'poll'         ),
-        									 '11'  => array( '1'  , 'poll'         ),
-        									 '14'  => array( '0'  , 'poll_after'   ),
-        									 '15'  => array( '1'  , 'poll_after'   ),
-        								   );
-        								   
-        // Make sure our input CODE element is legal.
-        
-        if (! isset($this->obj['action_codes'][ $ibforums->input['CODE'] ]) )
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        }
-        
-        // Require and run our associated library file for this action.
-        // this imports an extended class for this Post class.
-        
-        require "./sources/lib/post_" . $this->obj['action_codes'][ $ibforums->input['CODE'] ][1] . ".php";
-        
-        $post_functions = new post_functions(&$this);
-        
-        // If the first CODE array bit is set to "0" - show the relevant form.
-        // If it's set to "1" process the input.
-        
-        // We pass a reference to this classes object so we can manipulate this classes
-        // data from our sub class.
-        
-        if ($this->obj['action_codes'][ $ibforums->input['CODE'] ][0])
-        {
-        	// Make sure we have a valid auth key
-        	
-        	if ( $ibforums->input['auth_key'] != $this->md5_check )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
-			}
-        	
-        	// Make sure we have a "Guest" Name..
-        	
-        	if (!$ibforums->member['id'])
-        	{
-        	
-        		$ibforums->input['UserName'] = trim($ibforums->input['UserName']);
-        		$ibforums->input['UserName'] = str_replace( "<br>", "", $ibforums->input['UserName']);
-        		$ibforums->input['UserName'] = $ibforums->input['UserName'] ? $ibforums->input['UserName'] : 'Guest';
-        		
-        		if ($ibforums->input['UserName'] != 'Guest')
-        		{
-        			$DB->query("SELECT id FROM ibf_members WHERE LOWER(name)='".trim(strtolower($ibforums->input['UserName']))."'");
-        			
-        			if ( $DB->get_num_rows() )
-        			{
-        				$ibforums->input['UserName'] = $ibforums->vars['guest_name_pre'].$ibforums->input['UserName'].$ibforums->vars['guest_name_suf'];
-        			}
-        		}
-        		
-        	}
-        	
-        	//-------------------------------------------------------------------------
-        	// Stop the user hitting the submit button in the hope that multiple topics
-        	// or replies will be added. Or if the user accidently hits the button
-        	// twice.
-        	//-------------------------------------------------------------------------
-        	
-        	if ( $this->obj['preview_post'] == "" )
-        	{
-        	
-				if ( preg_match( "/Post,.*,(01|03|07|11)$/", $ibforums->location ) )
-				{
-					if ( time() - $ibforums->lastclick < 2 )
-					{
-						if ( $ibforums->input['CODE'] == '01' or $ibforums->input['CODE'] == '11' )
-						{
-							// Redirect to the newest topic in the forum
-							
-							
-							$DB->query("SELECT tid from ibf_topics WHERE forum_id='".$this->forum['id']."' AND approved=1 "
-									  ."ORDER BY last_post DESC LIMIT 0,1");
-									  
-							$topic = $DB->fetch_row();
-					
-							$std->boink_it($ibforums->base_url."act=ST&f=".$this->forum['id']."&t=".$topic['tid']);
-							exit();
-						}
-						else
-						{
-							// It's a reply, so simply show the topic...
-							
-							$std->boink_it($ibforums->base_url."act=ST&f=".$this->forum['id']."&t=".$ibforums->input['t']."&view=getlastpost");
-							exit();
-						}
-					}
-				}
-        	
-        	}
-        	
-        	//----------------------------------
-       
-        	$post_functions->process(&$this);
-        }
-        else
-        {
-        	$post_functions->show_form(&$this);
-        }
-        
-        
-
-	}
-	
-	/*****************************************************/
-	// Notify new topic mod Q
-	// ----------------------
-	/*****************************************************/
-	
-	function notify_new_topic_approval($tid, $title, $author)
-	{
-		global $ibforums, $DB, $std;
-		
-		if ( $this->forum['notify_modq_emails'] == "" )
-		{ 
-			return;
-		}
-		
-		$this->email->get_template("new_topic_queue_notify");
-
-		$this->email->build_message( array(
-											'TOPIC'  => $title,
-											'FORUM'  => $this->forum['name'],
-											'POSTER' => $author,
-											'DATE'   => $std->get_date( time(), 'SHORT' ),
-											'LINK'   => $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?act=modcp&fact=mod_topic&CODE=fchoice&f='.$this->forum['id'],
-										  )
-									);
-		
-		foreach( explode( ",", $this->forum['notify_modq_emails'] ) as $email )
-		{
-			$this->email->to = trim($email);
-			$this->email->send_mail();
-		}
-			
-	}
-	
-	
-	
-	/*****************************************************/
-	// topic tracker
-	// ------------------
-	// Checks and sends out the emails as needed.
-	/*****************************************************/
-	
-	function topic_tracker($tid="", $post="", $poster="", $last_post="" )
-	{
-		global $ibforums, $DB, $std;
-		
-		if ($tid == "")
-		{
-			return TRUE;
-		}
-		
-		// Get the email addy's, topic ids and email_full stuff - oh yeah.
-		// We only return rows that have a member last_activity of greater than the post itself
-		
-		$DB->query("SELECT tr.trid, tr.topic_id, m.name, m.email, m.id, m.email_full, m.language, m.last_activity, t.title, t.forum_id
-				    FROM ibf_tracker tr, ibf_topics t,ibf_members m
-				    WHERE tr.topic_id='$tid'
-				    AND tr.member_id=m.id
-				    AND m.id <> '{$ibforums->member['id']}'
-				    AND t.tid=tr.topic_id
-				    AND m.last_activity > '$last_post'");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$trids = array();
-			
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$r['language'] = $r['language'] ? $r['language'] : 'en';
-				
-				if ($r['email_full'] == 1)
-				{
-					$this->email->get_template("subs_with_post", $r['language']);
-			
-					$this->email->build_message( array(
-														'TOPIC_ID'        => $r['topic_id'],
-														'FORUM_ID'        => $r['forum_id'],
-														'TITLE'           => $r['title'],
-														'NAME'            => $r['name'],
-														'POSTER'          => $poster,
-														'POST'            => $post,
-													  )
-												);
-												
-					$this->email->subject = $ibforums->lang['tt_subject'];
-					$this->email->to      = $r['email'];
-					$this->email->send_mail();
-					
-				}
-				else
-				{
-				
-					$this->email->get_template("subs_no_post", $r['language']);
-			
-					$this->email->build_message( array(
-														'TOPIC_ID'        => $r['topic_id'],
-														'FORUM_ID'        => $r['forum_id'],
-														'TITLE'           => $r['title'],
-														'NAME'            => $r['name'],
-														'POSTER'          => $poster,
-													  )
-												);
-												
-					$this->email->subject = $ibforums->lang['tt_subject'];
-					$this->email->to      = $r['email'];
-					
-					$this->email->send_mail();
-					
-				}
-				
-				$trids[] = $r['trid'];
-			}
-		}
-		
-		//return TRUE;
-	}
-	
-	
-	
-	/*****************************************************/
-	// Forum tracker
-	// ------------------
-	// Checks and sends out the new topic notification if
-	// needed
-	/*****************************************************/
-	
-	function forum_tracker($fid="", $this_tid="", $title="", $forum_name="")
-	{
-		global $ibforums, $DB, $std;
-		
-		if ($this_tid == "")
-		{
-			return TRUE;
-		}
-		
-		if ($fid == "")
-		{
-			return TRUE;
-		}
-		
-		// Work out the time stamp needed to "guess" if the user is still active on the board
-		// We will base this guess on a period of non activity of time_now - 30 minutes.
-		
-		$time_limit = time() - (30*60);
-		
-		// Get the email addy's, topic ids and email_full stuff - oh yeah.
-		// We only return rows that have a member last_activity of greater than the post itself
-		
-		$DB->query("SELECT tr.frid, m.name, m.email, m.id, m.language, m.last_activity, m.org_perm_id, g.g_perm_id
-				    FROM ibf_forum_tracker tr,ibf_members m, ibf_groups g
-				    WHERE tr.forum_id='$fid'
-				    AND tr.member_id=m.id
-				    AND m.mgroup=g.g_id
-				    AND m.id <> '{$ibforums->member['id']}'
-				    AND m.last_activity < '$time_limit'");
-		
-		if (  $DB->get_num_rows() )
-		{
-			while ( $r = $DB->fetch_row() )
-			{
-			
-				$perm_id = ( $r['org_perm_id'] ) ? $r['org_perm_id'] : $r['g_perm_id'];
-				
-				if ($this->forum['read_perms'] != '*')
-				{
-					if ( ! preg_match("/(^|,)".str_replace( ",", '|', $perm_id )."(,|$)/", $this->forum['read_perms'] ) )
-        			{
-        				continue;
-       				}
-				}
-        
-				$r['language'] = $r['language'] ? $r['language'] : 'en';
-				
-				$this->email->get_template("subs_new_topic", $r['language']);
-		
-				$this->email->build_message( array(
-													'TOPIC_ID'        => $this_tid,
-													'FORUM_ID'        => $fid,
-													'TITLE'           => $title,
-													'NAME'            => $r['name'],
-													'POSTER'          => $ibforums->member['name'],
-													'FORUM'           => $forum_name,
-												  )
-											);
-											
-				$this->email->subject = $ibforums->lang['ft_subject'];
-				$this->email->to      = $r['email'];
-				
-				$this->email->send_mail();
-			}
-		}
-		return TRUE;
-	}
-	
-	
-	/*****************************************************/
-	// compile post
-	// ------------------
-	// Compiles all the incoming information into an array
-	// which is returned to the accessor
-	/*****************************************************/
-	
-	function compile_post()
-	{
-		global $ibforums, $std, $REQUEST_METHOD, $HTTP_POST_VARS;
-		
-		$ibforums->vars['max_post_length'] = $ibforums->vars['max_post_length'] ? $ibforums->vars['max_post_length'] : 2140000;
-		
-		//----------------------------------------------------------------
-		// Sort out some of the form data, check for posting length, etc.
-		// THIS MUST BE CALLED BEFORE CHECKING ATTACHMENTS
-		//----------------------------------------------------------------
-		
-		$ibforums->input['enablesig']   = $ibforums->input['enablesig']   == 'yes' ? 1 : 0;
-		$ibforums->input['enableemo']   = $ibforums->input['enableemo']   == 'yes' ? 1 : 0;
-		$ibforums->input['enabletrack'] = $ibforums->input['enabletrack'] ==   1   ? 1 : 0;
-		
-		//----------------------------------------------------------------
-		// Do we have a valid post?
-		//----------------------------------------------------------------
-		
-		if (strlen( trim($HTTP_POST_VARS['Post']) ) < 1)
-		{
-			if ( ! $HTTP_POST_VARS['preview'] )
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'no_post') );
-			}
-		}
-		
-		if (strlen( $HTTP_POST_VARS['Post'] ) > ($ibforums->vars['max_post_length']*1024))
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'post_too_long') );
-		}
-		
-		$post = array(
-						'author_id'   => $ibforums->member['id'] ? $ibforums->member['id'] : 0,
-						'use_sig'     => $ibforums->input['enablesig'],
-						'use_emo'     => $ibforums->input['enableemo'],
-						'ip_address'  => $ibforums->input['IP_ADDRESS'],
-						'post_date'   => time(),
-						'icon_id'     => $ibforums->input['iconid'],
-						'post'        => $this->parser->convert( array( TEXT    => $ibforums->input['Post'],
-																		SMILIES => $ibforums->input['enableemo'],
-																		CODE    => $this->forum['use_ibc'],
-																		HTML    => $this->forum['use_html']
-																	  )
-															   ),
-						'author_name' => $ibforums->member['id'] ? $ibforums->member['name'] : $ibforums->input['UserName'],
-						'forum_id'    => $this->forum['id'],
-						'topic_id'    => "",
-						'queued'      => ( $this->obj['moderate'] == 1 || $this->obj['moderate'] == 3 ) ? 1 : 0,
-						'attach_id'   => "",
-						'attach_hits' => "",
-						'attach_type' => "",
-					 );
-					 
-	    // If we had any errors, parse them back to this class
-	    // so we can track them later.
-	    
-	    $this->obj['post_errors'] = $this->parser->error;
-					 
-		return $post;
-	}
-	
-    /*****************************************************/
-	// process upload
-	// ------------------
-	// checks for an entry in the upload field, and uploads
-	// the file if it meets our criteria. This also inserts
-	// a new row into the attachments database if successful
-	/*****************************************************/
-	
-	function process_upload() {
-	
-		global $ibforums, $std, $HTTP_POST_FILES, $DB, $FILE_UPLOAD;
-		
-		//-------------------------------------------------
-		// Set up some variables to stop carpals developing
-		//-------------------------------------------------
-		
-		$FILE_NAME = $HTTP_POST_FILES['FILE_UPLOAD']['name'];
-		$FILE_SIZE = $HTTP_POST_FILES['FILE_UPLOAD']['size'];
-		$FILE_TYPE = $HTTP_POST_FILES['FILE_UPLOAD']['type'];
-		
-		// Naughty Opera adds the filename on the end of the
-		// mime type - we don't want this.
-		
-		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-		
-		$attach_data = array( 'attach_id'   => "",
-							  'attach_hits' => "",
-							  'attach_type' => "",
-							  'attach_file' => "",
-							);
-							
-		//-------------------------------------------------					
-		// Return if we don't have a file to upload
-		//-------------------------------------------------
-		
-		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
-		// I love universal languages that aren't universal.
-		
-		if ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "" or !$HTTP_POST_FILES['FILE_UPLOAD']['name'] or ($HTTP_POST_FILES['FILE_UPLOAD']['name'] == "none") ) return $attach_data;
-		
-		//-------------------------------------------------
-		// Return empty handed if we don't have permission to use
-		// uploads
-		//-------------------------------------------------
-		
-		if ( ($this->can_upload != 1) and ($ibforums->member['g_attach_max'] < 1) ) return $attach_data;
-		
-		//-------------------------------------------------
-		// Load our mime types config file.
-		//-------------------------------------------------
-		
-		require "./conf_mime_types.php";
-		
-		//-------------------------------------------------
-		// Are we allowing this type of file?
-		//-------------------------------------------------
-		
-		if ($mime_types[ $FILE_TYPE ][0] != 1)
-		{
-			$this->obj['post_errors'] = 'invalid_mime_type';
-			return $attach_data;
-		}
-		
-		//-------------------------------------------------
-		// Check the file size
-		//-------------------------------------------------
-		
-		if ($FILE_SIZE > ($ibforums->member['g_attach_max']*1024))
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'upload_to_big') );
-		}
-		
-		//-------------------------------------------------
-		// Make the uploaded file safe
-		//-------------------------------------------------
-		
-		$FILE_NAME = preg_replace( "/[^\w\.]/", "_", $FILE_NAME );
-		
-		$real_file_name = "post-".$this->forum['id']."-".time();  // Note the lack of extension!
-		
-		if (preg_match( "/\.(cgi|pl|js|asp|php|html|htm|jsp|jar)/", $FILE_NAME ))
-		{
-			$FILE_TYPE = 'text/plain';
-		}
-		
-		//-------------------------------------------------
-		// Add on the extension...
-		//-------------------------------------------------
-		
-		$ext = '.ibf';
-		
-		switch($FILE_TYPE)
-		{
-			case 'image/gif':
-				$ext = '.gif';
-				break;
-			case 'image/jpeg':
-				$ext = '.jpg';
-				break;
-			case 'image/pjpeg':
-				$ext = '.jpg';
-				break;
-			case 'image/x-png':
-				$ext = '.png';
-				break;
-			case 'image/png':
-				$ext = '.png';
-				break;
-			default:
-				$ext = '.ibf';
-				break;
-		}
-		
-		$real_file_name .= $ext;
-		
-		//-------------------------------------------------
-		// If we are previewing the post, we don't want to
-		// add the attachment to the database, so we return
-		// the array with the filename. We would have returned
-		// earlier if there was an error
-		//-------------------------------------------------
-		
-		if ($this->obj['preview_post'])
-		{
-			return array( 'FILE_NAME' => $FILE_NAME );
-		}
-		
-		//-------------------------------------------------
-		// Copy the upload to the uploads directory
-		//-------------------------------------------------
-		
-		if (! @move_uploaded_file( $HTTP_POST_FILES['FILE_UPLOAD']['tmp_name'], $ibforums->vars['upload_dir']."/".$real_file_name) )
-		{
-			$this->obj['post_errors'] = 'upload_failed';
-			return $attach_data;
-		}
-		else
-		{
-			@chmod( $ibforums->vars['upload_dir']."/".$real_file_name, 0777 );
-		}
-		
-		//-------------------------------------------------
-		// set the array, and enter the info into the DB
-		// We don't have an extension on the file in the
-		// hope that it make it more difficult to execute
-		// a script on our server.
-		//-------------------------------------------------
-		
-		$attach_data['attach_id']   = $real_file_name;
-		$attach_data['attach_hits'] = 0;
-		$attach_data['attach_type'] = $FILE_TYPE;
-		$attach_data['attach_file'] = $FILE_NAME;
-		
-		return $attach_data;
-	}
-
-		
-	
-	/*****************************************************/
-	// check_upload_ability
-	// ------------------
-	// checks to make sure the requesting browser can accept
-	// file uploads, also checks if the member group can
-	// accept uploads and returns accordingly.
-	/*****************************************************/
-	
-	function check_upload_ability() {
-		global $ibforums;
-		
-		if ( ($this->can_upload == 1) and $ibforums->member['g_attach_max'] > 0)
-		{
-			$this->obj['can_upload']   = 1;
-			$this->obj['form_extra']   = " enctype='multipart/form-data'";
-			$this->obj['hidden_field'] = "<input type='hidden' name='MAX_FILE_SIZE' value='".($ibforums->member['g_attach_max']*1024)."' />";
-		}
-		
-	}
-	
-	/*****************************************************/
-	// HTML: mod_options.
-	// ------------------
-	// Returns the HTML for the mod options drop down box
-	/*****************************************************/
-	
-	function mod_options($is_reply=0) {
-		global $ibforums, $DB;
-		
-		$can_close = 0;
-		$can_pin   = 0;
-		$can_move  = 0;
-		
-		$html = "<select id='forminput' name='mod_options' class='forminput'>\n<option value='nowt'>".$ibforums->lang['mod_nowt']."</option>\n";
-		
-		if ($ibforums->member['g_is_supmod'])
-		{
-			$can_close = 1;
-			$can_pin   = 1;
-			$can_move  = 1;
-		}
-		else if ($ibforums->member['id'] != 0)
-		{
-			if ($this->moderator['mid'] != "" )
-			{
-				if ($this->moderator['close_topic'])
-				{
-					$can_close = 1;
-				}
-				if ($this->moderator['pin_topic'])
-				{
-					$can_pin   = 1;
-				}
-				if ($this->moderator['move_topic'])
-				{
-					$can_move  = 1;
-				}
-			}
-		}
-		else
-		{
-			return "";
-		}
-		
-		if ($can_pin == 0 and $can_close == 0 and $can_move == 0)
-		{
-			return "";
-		}
-		
-		if ($can_pin)
-		{
-			$html .= "<option value='pin'>".$ibforums->lang['mod_pin']."</option>";
-		}
-		if ($can_close)
-		{
-			$html .= "<option value='close'>".$ibforums->lang['mod_close']."</option>";
-		}
-		
-		if ($can_close and $can_pin)
-		{
-			$html .= "<option value='pinclose'>".$ibforums->lang['mod_pinclose']."</option>";
-		}
-		
-		if ($can_move and $is_reply)
-		{
-			$html .= "<option value='move'>".$ibforums->lang['mod_move']."</option>";
-		}
-		
-		return $this->html->mod_options($html);
-	
-	}
-	
-	
-	/*****************************************************/
-	// HTML: start form.
-	// ------------------
-	// Returns the HTML for the <FORM> opening tag
-	/*****************************************************/
-	
-	function html_start_form($additional_tags=array()) {
-		global $ibforums;
-		
-		$form = $this->html->get_javascript();
-		
-		$form .= "<form action='{$this->base_url}' method='post' name='REPLIER' onsubmit='return ValidateForm()'".$this->obj['form_extra'].">".
-				"<input type='hidden' name='st' value='".$ibforums->input[st]."' />\n".
-				"<input type='hidden' name='act' value='Post' />\n".
-				"<input type='hidden' name='s' value='".$ibforums->session_id."' />\n".
-				"<input type='hidden' name='f' value='".$this->forum['id']."' />\n".
-				"<input type='hidden' name='auth_key' value='".$this->md5_check."' />\n".
-				$this->obj['hidden_field'];
-				
-		// Any other tags to add?
-		
-		if (isset($additional_tags)) {
-			foreach($additional_tags as $k => $v) {
-				$form .= "\n<input type='hidden' name='{$v[0]}' value='{$v[1]}' />";
-			}
-		}
-		
-		return $form;
-    }
-		
-	/*****************************************************/
-	// HTML: name fields.
-	// ------------------
-	// Returns the HTML for either text inputs or membername
-	// depending if the member is a guest.
-	/*****************************************************/
-	
-	function html_name_field() {
-		global $ibforums;
-		
-		return $ibforums->member['id'] ? $this->html->nameField_reg() : $this->html->nameField_unreg( $ibforums->input[UserName] );
-	}
-	
-	/*****************************************************/
-	// HTML: Post body.
-	// ------------------
-	// Returns the HTML for post area, code buttons and
-	// post icons
-	/*****************************************************/
-	
-	function html_post_body($raw_post="") {
-		global $ibforums;
-		
-		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
-		
-		return $this->html->postbox_buttons($raw_post);
-		
-	}
-	
-	/*****************************************************/
-	// HTML: Post Icons
-	// ------------------
-	// Returns the HTML for post area, code buttons and
-	// post icons
-	/*****************************************************/
-	
-	function html_post_icons($post_icon="") {
-		global $ibforums;
-		
-		if ($ibforums->input['iconid'])
-		{
-			$post_icon = $ibforums->input['iconid'];
-		}
-		
-		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
-		
-		$html = $this->html->PostIcons();
-		
-		if ($post_icon) {
-			$html = preg_replace( "/name=[\"']iconid[\"']\s*value=[\"']$post_icon\s?[\"']/", "name='iconid' value='$post_icon' checked", $html );
-			$html = preg_replace( "/name=[\"']iconid[\"']\s*value=[\"']0[\"']\s*checked=['\"]checked['\"]/i"  , "name='iconid' value='0'", $html );
-		}
-		return $html;
-	}
-	
-	/*****************************************************/
-	// HTML: checkboxes
-	// ------------------
-	// Returns the HTML for sig/emo/track boxes
-	/*****************************************************/
-	
-	function html_checkboxes($type="", $tid="") 
-	{
-		global $ibforums, $DB;
-		
-		$default_checked = array(
-								  'sig' => 'checked="checked"',
-						  		  'emo' => 'checked="checked"',
-						  		  'tra' => $ibforums->member['auto_track'] ? 'checked="checked"' : ''
-						        );
-						        
-		// Make sure we're not previewing them and they've been unchecked!
-		
-		if ( isset( $ibforums->input['enablesig'] ) AND ( ! $ibforums->input['enablesig'] ) )
-		{
-			$default_checked['sig'] = "";
-		}
-		
-		if ( isset( $ibforums->input['enableemo'] ) AND ( ! $ibforums->input['enableemo'] ) )
-		{
-			$default_checked['emo'] = "";
-		}
-		
-		if ( isset( $ibforums->input['enabletrack'] ) AND ( ! $ibforums->input['enabletrack'] ) )
-		{
-			$default_checked['tra'] = "";
-		}
-		else if ( isset( $ibforums->input['enabletrack'] ) AND ( $ibforums->input['enabletrack'] == 1 ) )
-		{
-			$default_checked['tra'] = 'checked="checked"';
-		}
-		
-		$this->output = str_replace( '<!--IBF.EMO-->'  , $this->html->get_box_enableemo( $default_checked['emo'] )  , $this->output );
-		
-		$this->output = str_replace( '<!--IBF.SIG-->'  , $this->html->get_box_enablesig( $default_checked['sig'] )  , $this->output );
-		
-		if ( $type == 'reply' )
-		{
-			if ( $tid and $ibforums->member['id'] )
-			{
-				$DB->query("SELECT trid FROM ibf_tracker WHERE topic_id=$tid AND member_id=".$ibforums->member['id']);
-				
-				if ( $DB->get_num_rows() )
-				{
-					$this->output = str_replace( '<!--IBF.TRACK-->',$this->html->get_box_alreadytrack(), $this->output );
-				}
-				else
-				{
-					$this->output = str_replace( '<!--IBF.TRACK-->', $this->html->get_box_enabletrack( $default_checked['tra'] ), $this->output );
-				}
-			}
-		}
-		else if ( $type != 'edit' )
-		{
-			$this->output = str_replace( '<!--IBF.TRACK-->', $this->html->get_box_enabletrack( $default_checked['tra'] ), $this->output );
-		}
-	}
-	
-    /*****************************************************/
-	// HTML: add smilie box.
-	// ------------------
-	// Inserts the clickable smilies box
-	/*****************************************************/
-	
-	function html_add_smilie_box() {
-		global $ibforums, $DB;
-		
-		$show_table = 0;
-		$count      = 0;
-		$smilies    = "<tr align='center'>\n";
-		
-		// Get the smilies from the DB
-		
-		$DB->query("SELECT * FROM ibf_emoticons WHERE clickable='1'");
-		
-		while ($elmo = $DB->fetch_row() ) {
-		
-			$show_table++;
-			$count++;
-			
-			// Make single quotes as URL's with html entites in them
-			// are parsed by the browser, so ' causes JS error :o
-			
-			if (strstr( $elmo['typed'], "&#39;" ) )
-			{
-				$in_delim  = '"';
-				$out_delim = "'";
-			}
-			else
-			{
-				$in_delim  = "'";
-				$out_delim = '"';
-			}
-			
-			$smilies .= "<td><a href={$out_delim}javascript:emoticon($in_delim".$elmo['typed']."$in_delim){$out_delim}><img src=\"".$ibforums->vars['EMOTICONS_URL']."/".$elmo['image']."\" alt='smilie' border='0' /></a>&nbsp;</td>\n";
-			
-			if ($count == $ibforums->vars['emo_per_row']) {
-				$smilies .= "</tr>\n\n<tr align='center'>";
-				$count = 0;
-			}
-		}
-		
-		if ($count != $ibforums->vars['emo_per_row']) {
-			for ($i = $count ; $i < $ibforums->vars['emo_per_row'] ; ++$i) {
-				$smilies .= "<td>&nbsp;</td>\n";
-			}
-			$smilies .= "</tr>";
-		}
-		
-		$table = $this->html->smilie_table();
-		
-		if ($show_table != 0) {
-			$table = preg_replace( "/<!--THE SMILIES-->/", $smilies, $table );
-			$this->output = preg_replace( "/<!--SMILIE TABLE-->/", $table, $this->output );
-		}
-	
-	}
-		
-	/*****************************************************/
-	// HTML: topic summary.
-	// ------------------
-	// displays the last 10 replies to the topic we're
-	// replying in.
-	/*****************************************************/
-	
-	function html_topic_summary($topic_id) {
-		
-		global $ibforums, $std, $DB;
-		
-		if (! $topic_id ) return;
-		
-		$cached_members = array();
-		
-		$this->output .= $this->html->TopicSummary_top();
-		
-		//--------------------------------------------------------------
-		// Get the posts
-		// This section will probably change at some point
-		//--------------------------------------------------------------
-		
-		$post_query = $DB->query("SELECT post, pid, post_date, author_id, author_name FROM ibf_posts WHERE topic_id=$topic_id and queued <> 1 ORDER BY pid DESC LIMIT 0,10");
-		
-		while ( $row = $DB->fetch_row($post_query) )
-		{
-			
-		    $row['author'] = $row['author_name'];
-			
-			$row['date']   = $std->get_date( $row['post_date'], 'LONG' );
-			
-			if (!$ibforums->member['view_img'])
-			{
-				// unconvert smilies first, or it looks a bit crap.
-				
-				$row['post'] = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $row['post'] );
-				
-				$row['post'] = preg_replace( "/<img src=[\"'](.+?)[\"'].+?".">/", "(IMG:<a href='\\1' target='_blank'>\\1</a>)", $row['post'] );
-			}
-			
-			$row['post']   = $this->parser->post_db_parse($row['post'], $this->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0);
-			
-			//--------------------------------------------------------------
-			// Do word wrap?
-			//--------------------------------------------------------------
-			
-			if ( $ibforums->vars['post_wordwrap'] > 0 )
-			{
-				$row['post'] = $this->parser->my_wordwrap( $row['post'], $ibforums->vars['post_wordwrap']) ;
-			}
-			
-			$row['post']   = str_replace( "<br>", "<br />", $row['post'] );
-			
-			$this->output .= $this->html->TopicSummary_body( $row );
-		}
-		
-		$this->output .= $this->html->TopicSummary_bottom();
-		
-	}
-	
-	/*****************************************************/
-	// Moderators log
-	// ------------------
-	// Simply adds the last action to the mod logs
-	/*****************************************************/
-	
-	function moderate_log($title = 'unknown', $topic_title) {
-		global $std, $ibforums, $DB, $HTTP_REFERER, $QUERY_STRING;
-		
-		$db_string = $std->compile_db_string( array (
-														'forum_id'    => $ibforums->input['f'],
-														'topic_id'    => $ibforums->input['t'],
-														'post_id'     => $ibforums->input['p'],
-														'member_id'   => $ibforums->member['id'],
-														'member_name' => $ibforums->member['name'],
-														'ip_address'  => $ibforums->input['IP_ADDRESS'],
-														'http_referer'=> $HTTP_REFERER,
-														'ctime'       => time(),
-														'topic_title' => $topic_title,
-														'action'      => $title,
-														'query_string'=> $QUERY_STRING,
-													)
-										    );
-		
-		$DB->query("INSERT INTO ibf_moderator_logs (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-	}
-        
-}
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Register.php b/upload/sources/Register.php
deleted file mode 100644
index 9d699f9b..00000000
--- a/upload/sources/Register.php
+++ /dev/null
@@ -1,1582 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Registration functions
-|   > Module written by Matt Mecham
-|   > Date started: 16th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Register;
-
-class Register {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $html       = "";
-    var $email      = "";
-    var $modules    = "";
-    
-    function Register() {
-    	global $ibforums, $DB, $std, $print;
-    	
-    	//--------------------------------------------
-    	// Require the HTML and language modules
-    	//--------------------------------------------
-    	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_register', $ibforums->lang_id );
-    	
-    	$this->html = $std->load_template('skin_register');
-    	
-    	$this->base_url        = $ibforums->base_url;
-    	$this->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
-    	
-    	//--------------------------------------------
-    	// Get the emailer module
-		//--------------------------------------------
-		
-		require ROOT_PATH."sources/lib/emailer.php";
-		
-		$this->email = new emailer();
-		
-		if ( USE_MODULES == 1 )
-		{
-			require ROOT_PATH."modules/ipb_member_sync.php";
-			
-			$this->modules = new ipb_member_sync();
-		}
-    	
-    	//--------------------------------------------
-    	// What to do?
-    	//--------------------------------------------
-    	
-    	switch($ibforums->input['CODE'])
-    	{
-    		case '02':
-    			$this->create_account();
-    			break;
-    			
-    		case '03':
-    			$this->validate_user();
-    			break;
-
-    		case '05':
-    			$this->show_manual_form();
-    			break;
-    			
-    		case '06':
-    			$this->show_manual_form('lostpass');
-    			break;
-    			
-    		case 'lostpassform':
-    			$this->show_manual_form('lostpass');
-    			break;
-    			
-    		case '07':
-    			$this->show_manual_form('newemail');
-    			break;
-    			
-    		case '10':
-    			$this->lost_password_start();
-    			break;
-    		case '11':
-    			$this->lost_password_end();
-    			break;
-    			
-    		case '12':
-    			$this->coppa_perms_form();
-    			break;
-    			
-    		case 'coppa_two':
-    			$this->coppa_two();
-    			break;
-    			
-    		case 'image':
-    			$this->show_image();
-    			break;
-    			
-    		case 'reval':
-    			$this->revalidate_one();
-    			break;
-    			
-    		case 'reval2':
-    			$this->revalidate_two();
-    			break;
-
-    		default:
-    			if ($ibforums->vars['use_coppa'] == 1 and $ibforums->input['coppa_pass'] != 1)
-    			{
-    				$this->coppa_start();
-    			}
-    			else
-    			{
-    				$this->show_reg_form();
-    			}
-    			break;
-    	}
-    	
-    	// If we have any HTML to print, do so...
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
- 	}
- 	
- 	/*****************************************************/
-	// Show "check revalidate form" er.. form. thing.
-	// ------------------
-	//  
-	/*****************************************************/
-	
-	function revalidate_one($errors="") {
-		global $ibforums, $DB;
-		
-		if ($errors != "")
-    	{
-    		$this->output .= $this->html->errors( $ibforums->lang[$errors]);
-    	}
-    	
-    	$name = $ibforums->member['id'] == "" ? '' : $ibforums->member['name'];
-		
-		$this->output     .= $this->html->show_revalidate_form($name);
-		$this->page_title = $ibforums->lang['rv_title'];
-		$this->nav        = array( $ibforums->lang['rv_title'] );
-	
-	}
-	
-	function revalidate_two()
-	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS;
-		
-		//------------------------------------------
-		// Check in the DB for entered member name
-		//------------------------------------------
-		
-		if ( $HTTP_POST_VARS['username'] == "" )
-		{
-			$this->revalidate_one('err_no_username');
-			return;
-		}
-		
-		$DB->query("SELECT * FROM ibf_members WHERE LOWER(name)='".strtolower($ibforums->input['username'])."'");
-		
-		if ( ! $member = $DB->fetch_row() )
-		{
-			$this->revalidate_one('err_no_username');
-			return;
-		}
-		
-		//------------------------------------------
-		// Check in the DB for any validations
-		//------------------------------------------
-		
-		$DB->query("SELECT * FROM ibf_validating WHERE member_id=".intval($member['id']));
-		
-		if ( ! $val = $DB->fetch_row() )
-		{
-			$this->revalidate_one('err_no_validations');
-			return;
-		}
-		
-		//------------------------------------------
-		// Which type is it then?
-		//------------------------------------------
-		
-		if ( $val['lost_pass'] == 1 )
-		{
-			$this->email->get_template("lost_pass");
-				
-			$this->email->build_message( array(
-												'NAME'         => $member['name'],
-												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform&uid=".$member['id']."&aid=".$val['vid'],
-												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform",
-												'EMAIL'        => $member['email'],
-												'ID'           => $member['id'],
-												'CODE'         => $val['vid'],
-												'IP_ADDRESS'   => $ibforums->input['IP_ADDRESS'],
-											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['lp_subject'].' '.$ibforums->vars['board_name'];
-			$this->email->to      = $member['email'];
-			
-			$this->email->send_mail();
-		}
-		else if ( $val['new_reg'] == 1 )
-		{
-			$this->email->get_template("reg_validate");
-					
-			$this->email->build_message( array(
-												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&uid=".$member['id']."&aid=".$val['vid'],
-												'NAME'         => $member['name'],
-												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=05",
-												'EMAIL'        => $member['email'],
-												'ID'           => $member['id'],
-												'CODE'         => $val['vid'],
-											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['email_reg_subj']." ".$ibforums->vars['board_name'];
-			$this->email->to      = $member['email'];
-			
-			$this->email->send_mail();
-		}
-		else if ( $val['email_chg'] == 1 )
-		{
-			$this->email->get_template("newemail");
-				
-			$this->email->build_message( array(
-												'NAME'         => $member['name'],
-												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&type=newemail&uid=".$member['id']."&aid=".$val['vid'],
-												'ID'           => $member['id'],
-												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=07",
-												'CODE'         => $val['vid'],
-											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['ne_subject'].' '.$ibforums->vars['board_name'];
-			$this->email->to      = $email_one;
-		}
-		else
-		{
-			$this->revalidate_one('err_no_validations');
-			return;
-		}
-		
-		$this->output .= $this->html->show_revalidated();
-		
-		$this->page_title = $ibforums->lang['rv_title'];
-		$this->nav        = array( $ibforums->lang['rv_title'] );
-	}
- 	
- 	
- 	/*****************************************************/
-	// Coppa Start
-	// ------------------
-	// Asks the registree if they are an old git or not
-	/*****************************************************/
-	
-	function coppa_perms_form()
-	{
-		global $ibforums, $DB, $std;
-		
-		echo($this->html->coppa_form());
-		exit();
-	}
-	
-	
-	
-	function coppa_start()
-	{
-		global $ibforums, $DB, $std;
-		
-		$coppa_date = date( 'j-F y', mktime(0,0,0,date("m"),date("d"),date("Y")-13) );
-		
-		$ibforums->lang['coppa_form_text'] = str_replace( "<#FORM_LINK#>", "<a href='{$ibforums->base_url}act=Reg&amp;CODE=12'>{$ibforums->lang['coppa_link_form']}</a>", $ibforums->lang['coppa_form_text']);
-		
-		$this->output .= $this->html->coppa_start($coppa_date);
-		
-		$this->page_title = $ibforums->lang['coppa_title'];
-		
-    	$this->nav        = array( $ibforums->lang['coppa_title'] );
- 	
- 	}
- 	
- 	function coppa_two()
-	{
-		global $ibforums, $DB, $std;
-		
-		$ibforums->lang['coppa_form_text'] = str_replace( "<#FORM_LINK#>", "<a href='{$ibforums->base_url}act=Reg&amp;CODE=12'>{$ibforums->lang['coppa_link_form']}</a>", $ibforums->lang['coppa_form_text']);
-		
-		$this->output .= $this->html->coppa_two();
-		
-		$this->page_title = $ibforums->lang['coppa_title'];
-		
-    	$this->nav        = array( $ibforums->lang['coppa_title'] );
- 	
- 	}
- 	
- 	/*****************************************************/
-	// lost_password_start
-	// ------------------
-	// Simply shows the lostpassword form
-	// What do you want? Blood?
-	/*****************************************************/
-	
-	function lost_password_start($errors="")
-	{
-		global $ibforums, $DB, $std;
-		
-		if ($ibforums->vars['bot_antispam'])
-		{
-			// Sort out the security code
-				
-			$r_date = time() - (60*60*6);
-			
-			// Remove old reg requests from the DB
-			
-			$DB->query("DELETE FROM ibf_reg_antispam WHERE ctime < '$r_date'");
-			
-			// Set a new ID for this reg request...
-			
-			$regid = md5( uniqid(microtime()) );
-			
-			// Set a new 6 character numerical string
-			
-			mt_srand ((double) microtime() * 1000000);
-			
-			$reg_code = mt_rand(100000,999999);
-			
-			// Insert into the DB
-			
-			$str = $DB->compile_db_insert_string( array (
-															'regid'      => $regid,
-															'regcode'    => $reg_code,
-															'ip_address' => $ibforums->input['IP_ADDRESS'],
-															'ctime'      => time(),
-												)       );
-												
-			$DB->query("INSERT INTO ibf_reg_antispam ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		}
-		
-		$this->page_title = $ibforums->lang['lost_pass_form'];
-		
-    	$this->nav        = array( $ibforums->lang['lost_pass_form'] );
-    	
-    	if ($errors != "")
-    	{
-    		$this->output .= $this->html->errors( $ibforums->lang[$errors]);
-    	}
-
-    	$this->output    .= $this->html->lost_pass_form($regid);
-    	
-    	if ($ibforums->vars['bot_antispam'] == 'gd')
-		{
-			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam_gd( $regid ), $this->output );
-		}
-		else if ($ibforums->vars['bot_antispam'] == 'gif')
-		{
-			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam( $regid ), $this->output );
-		}
-    }
-    
-    
-    
-    
-    function lost_password_end()
-    {
-    	global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
-    	
-    	if ($ibforums->vars['bot_antispam'])
-		{
-			//--------------------------------------
-			// Security code stuff
-			//--------------------------------------
-			
-			if ($ibforums->input['regid'] == "")
-			{
-				$this->lost_password_start('err_reg_code');
-				return;
-			}
-			
-			$DB->query("SELECT * FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['regid']))."'");
-			
-			if ( ! $row = $DB->fetch_row() )
-			{
-				$this->show_reg_form('err_reg_code');
-				return;
-			}
-			
-			if ( trim( intval($ibforums->input['reg_code']) ) != $row['regcode'] )
-			{
-				$this->lost_password_start('err_reg_code');
-				return;
-			}
-		}
-		
-    	//--------------------------------------
-    	// Back to the usual programming! :o
-    	//--------------------------------------
-    	
-    	if ($HTTP_POST_VARS['member_name'] == "")
-    	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
-    	}
-    	
-    	//------------------------------------------------------------
-		// Check for input and it's in a valid format.
-		//------------------------------------------------------------
-		
-		$member_name = trim(strtolower($ibforums->input['member_name']));
-		
-		if ($member_name == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
-		}
-    	
-    	//------------------------------------------------------------
-		// Attempt to get the user details from the DB
-		//------------------------------------------------------------
-		
-		$DB->query("SELECT name, id, email, mgroup FROM ibf_members WHERE LOWER(name)='$member_name'");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
-		}
-		else
-		{
-			$member = $DB->fetch_row();
-			
-			//------------------------------------------------------------
-			// Is there a validation key? If so, we'd better not touch it
-			//------------------------------------------------------------
-			
-			if ($member['id'] == "")
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
-			}
-			
-			$validate_key = md5( $std->make_password() . time() );
-			
-			//------------------------------------------------------------
-			// Update the DB for this member.
-			//------------------------------------------------------------
-			
-			$db_str = $DB->compile_db_insert_string( array (
-															 'vid'         => $validate_key,
-															 'member_id'   => $member['id'],
-															 'real_group'  => $member['mgroup'],
-															 'temp_group'  => $member['mgroup'],
-															 'entry_date'  => time(),
-															 'coppa_user'  => 0,
-															 'lost_pass'   => 1,
-															 'ip_address'  => $ibforums->input['IP_ADDRESS']
-												   )       );
-			
-			$DB->query("INSERT INTO ibf_validating ({$db_str['FIELD_NAMES']}) VALUES({$db_str['FIELD_VALUES']})");
-			
-			//------------------------------------------------------------
-			// Send out the email.
-			//------------------------------------------------------------
-			
-    		$this->email->get_template("lost_pass");
-				
-			$this->email->build_message( array(
-												'NAME'         => $member['name'],
-												'PASSWORD'     => $new_pass,
-												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform&uid=".$member['id']."&aid=".$validate_key,
-												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform",
-												'EMAIL'        => $member['email'],
-												'ID'           => $member['id'],
-												'CODE'         => $validate_key,
-												'IP_ADDRESS'   => $ibforums->input['IP_ADDRESS'],
-											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['lp_subject'].' '.$ibforums->vars['board_name'];
-			$this->email->to      = $member['email'];
-			
-			$this->email->send_mail();
-			
-			$this->output = $this->html->show_lostpasswait( $member );
-		}
-    	
-    	$this->page_title = $ibforums->lang['lost_pass_form'];
-    }
- 	
- 	/*****************************************************/
-	// show_reg_form
-	// ------------------
-	// Simply shows the registration form, no - really! Thats
-	// all it does. It doesn't make the tea or anything.
-	// Just the registration form, no more - no less.
-	// Unless your server went down, then it's just useless.
-	/*****************************************************/   
-    
-    function show_reg_form($errors = "") {
-    	global $ibforums, $DB, $std;
-    	
-    	if ($ibforums->vars['no_reg'] == 1)
-    	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'reg_off' ) );
-    	}
-    	
-    	if ($ibforums->vars['reg_auth_type'])
-    	{
-    		$ibforums->lang['std_text'] .= "<br>" . $ibforums->lang['email_validate_text'];
-    	}
-    	
-    	$this->bash_dead_validations();
-    	
-    	//-----------------------------------------------
-		// Clean out anti-spam stuffy
-		//-----------------------------------------------
-		
-		if ($ibforums->vars['bot_antispam'])
-		{
-		
-			// Get a time roughly 6 hours ago...
-			
-			$r_date = time() - (60*60*6);
-			
-			// Remove old reg requests from the DB
-			
-			$DB->query("DELETE FROM ibf_reg_antispam WHERE ctime < '$r_date'");
-			
-			// Set a new ID for this reg request...
-			
-			$regid = md5( uniqid(microtime()) );
-			
-			// Set a new 6 character numerical string
-			
-			mt_srand ((double) microtime() * 1000000);
-			
-			$reg_code = mt_rand(100000,999999);
-			
-			// Insert into the DB
-			
-			$str = $DB->compile_db_insert_string( array (
-															'regid'      => $regid,
-															'regcode'    => $reg_code,
-															'ip_address' => $ibforums->input['IP_ADDRESS'],
-															'ctime'      => time(),
-												)       );
-												
-			$DB->query("INSERT INTO ibf_reg_antispam ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		
-		}
-    	
-    	//-----------------------------------------------
-		// Custom profile fields stuff
-		//-----------------------------------------------
-		
-		$required_output = "";
-		$optional_output = "";
-		$field_data     = array();
-		
-		$DB->query("SELECT * from ibf_pfields_data WHERE fedit=1 AND fshowreg=1 ORDER BY forder");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			$form_element = "";
-			
-			if ( $row['freq'] == 1 )
-			{
-				$ftype = 'required_output';
-			}
-			else
-			{
-				$ftype = 'optional_output';
-			}
-			
-			if ( $row['ftype'] == 'drop' )
-			{
-				$carray = explode( '|', trim($row['fcontent']) );
-				
-				$d_content = "";
-				
-				foreach( $carray as $entry )
-				{
-					$value = explode( '=', $entry );
-					
-					$ov = trim($value[0]);
-					$td = trim($value[1]);
-					
-					if ($ov !="" and $td !="")
-					{
-						$d_content .= "<option value='$ov'>$td</option>\n";
-					}
-				}
-				
-				if ($d_content != "")
-				{
-					$form_element = $this->html->field_dropdown( 'field_'.$row['fid'], $d_content );
-				}
-			}
-			else if ( $row['ftype'] == 'area' )
-			{
-				$form_element = $this->html->field_textarea( 'field_'.$row['fid'], $ibforums->input['field_'.$row['fid']] );
-			}
-			else
-			{
-				$form_element = $this->html->field_textinput( 'field_'.$row['fid'], $ibforums->input['field_'.$row['fid']] );
-			}
-			
-			${$ftype} .= $this->html->field_entry( $row['ftitle'], $row['fdesc'], $form_element );
-		}
-    	
-    	$this->page_title = $ibforums->lang['registration_form'];
-    	$this->nav        = array( $ibforums->lang['registration_form'] );
-    	
-    	$coppa = ($ibforums->input['coppa_user'] == 1) ? 1 : 0;
-    	
-    	if ($errors != "")
-    	{
-    		$this->output .= $this->html->errors( $ibforums->lang[$errors]);
-    	}
-
-    	$this->output    .= $this->html->ShowForm( array( 'TEXT'        => $ibforums->lang['std_text'],
-    												      'RULES'       => $ibforums->lang['click_wrap'],
-    												      'coppa_user'  => $coppa,
-    											 )      );
-    											 
-    	if ($ibforums->vars['bot_antispam'] == 'gd')
-		{
-			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam_gd( $regid ), $this->output );
-		}
-		else if ($ibforums->vars['bot_antispam'] == 'gif')
-		{
-			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam( $regid ), $this->output );
-		}
-    	
-    	if ($required_output != "")
-		{
-			$this->output = str_replace( "<!--{REQUIRED.FIELDS}-->", "\n".$required_output, $this->output );
-		}
-		
-		if ($optional_output != "")
-		{
-			$this->output = str_replace( "<!--{OPTIONAL.FIELDS}-->", $this->html->optional_title()."\n".$optional_output, $this->output );
-		}
-		
-		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-    		$this->modules->on_register_form();
-   		}
-   	}
-    
-   	/*****************************************************/
-	// create_account
-	// ------------------
-	// Now this is a really good subroutine. It adds the member
-	// to the members table in the database. Yes, really fancy
-	// this one. It also finds the time to see if we need to
-	// check any email verification type malarky before we
-	// can use this brand new account. It's like buying a new
-	// car and getting it towed home and being told the keys
-	// will be posted later. Although you can't polish this
-	// routine while you're waiting.
-	/*****************************************************/ 
-	
-	function create_account()
-	{
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
-		
-		if ($HTTP_POST_VARS['act'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
-		}
-		
-		if ($ibforums->vars['no_reg'] == 1)
-    	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'reg_off' ) );
-    	}
-    	
-    	$coppa = ($ibforums->input['coppa_user'] == 1) ? 1 : 0;
-    	
-    	//----------------------------------
-		// Custom profile field stuff
-		//----------------------------------
-		
-		$custom_fields = array();
-		
-		$DB->query("SELECT * from ibf_pfields_data WHERE fedit=1");
-		
-		while ( $row = $DB->fetch_row() )
-		{
-			if ($row['freq'] == 1)
-			{
-				if ($HTTP_POST_VARS[ 'field_'.$row['fid'] ] == "")
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
-				}
-			}
-			
-			if ($row['fmaxinput'] > 0)
-			{
-				if (strlen($HTTP_POST_VARS[ 'field_'.$row['fid'] ]) > $row['fmaxinput'])
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cf_to_long', 'EXTRA' => $row['ftitle'] ) );
-				}
-			}
-			
-			$custom_fields[ 'field_'.$row['fid'] ] = str_replace( '<br>', "\n", $ibforums->input[ 'field_'.$row['fid'] ] );
-		}
-		
-		//---------------------------------------
-		// Trim off the username and password
-		
-		$in_username = trim( str_replace( '|', '&#124;' , $ibforums->input['UserName'] ) );
-		$in_password = trim($ibforums->input['PassWord']);
-		$in_email    = strtolower( trim($ibforums->input['EmailAddress']) );
-		
-		$ibforums->input['EmailAddress_two'] = strtolower( trim($ibforums->input['EmailAddress_two']) );
-		
-		if ($ibforums->input['EmailAddress_two'] != $in_email)
-		{
-			$this->show_reg_form('err_email_address_match');
-			return;
-		}
-		
-		// Remove multiple spaces in the username
-		
-		$in_username = preg_replace( "/\s{2,}/", " ", $in_username );
-		
-		//-------------------------------------------------
-		// More unicode..
-		//-------------------------------------------------
-		
-		$len_u = $in_username;
-		
-		$len_u = preg_replace("/&#([0-9]+);/", "-", $len_u );
-		
-		$len_p = $in_password;
-		
-		$len_p = preg_replace("/&#([0-9]+);/", "-", $len_p );
-		
-		//+--------------------------------------------
-		//| Check for errors in the input.
-		//+--------------------------------------------
-		
-		if (empty($in_username))
-		{
-			$this->show_reg_form('err_no_username');
-			return;
-		}
-		if (strlen($len_u) < 3)
-		{
-			$this->show_reg_form('err_no_username');
-			return;
-		}
-		if (strlen($len_u) > 32) 
-		{
-			$this->show_reg_form('err_no_username');
-			return;
-		}
-		if (empty($in_password))
-		{
-			$this->show_reg_form('err_no_password');
-			return;
-		}
-		if (strlen($len_p) < 3)
-		{
-			$this->show_reg_form('err_no_password');
-			return;
-		}
-		if (strlen($len_p) > 32) 
-		{
-			$this->show_reg_form('err_no_password');
-			return;
-		}
-		if ($ibforums->input['PassWord_Check'] != $in_password)
-		{
-			$this->show_reg_form('err_pass_match');
-			return;
-		}
-		if (strlen($in_email) < 6)
-		{
-			$this->show_reg_form('err_invalid_email');
-			return;
-		}
-		
-		//+--------------------------------------------
-		//| Check the email address
-		//+--------------------------------------------
-		
-		$in_email = $std->clean_email($in_email);
-		
-		if (! $in_email )
-		{
-			$this->show_reg_form('err_invalid_email');
-			return;
-		}
-		
-		//+--------------------------------------------
-		//| Is this name already taken?
-		//+--------------------------------------------
-		
-		$DB->query("SELECT id FROM ibf_members WHERE LOWER(name)='".strtolower($in_username)."'");
-		$name_check = $DB->fetch_row();
-		
-		if ($name_check['id'])
-		{
-			$this->show_reg_form('err_user_exists');
-			return;
-		}
-		
-		if (strtolower($in_username) == 'guest')
-		{
-			$this->show_reg_form('err_user_exists');
-			return;
-		}
-		
-		//+--------------------------------------------
-		//| Is this email addy taken?
-		//+--------------------------------------------
-		
-		if (! $ibforums->vars['allow_dup_email'] )
-		{
-			$DB->query("SELECT id FROM ibf_members WHERE email='".$in_email."'");
-			$email_check = $DB->fetch_row();
-			if ($email_check['id'])
-			{
-				$this->show_reg_form('err_email_exists');
-				return;
-			}
-		}
-		
-		//+--------------------------------------------
-		//| Are they in the reserved names list?
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['ban_names'])
-		{
-			$names = explode( "|" , $ibforums->vars['ban_names'] );
-			foreach ($names as $n)
-			{
-				if ( $n == "" )
-				{
-					continue;
-				}
-				
-				if (preg_match( "/".preg_quote($n, '/' )."/i", $in_username ))
-				{
-					$this->show_reg_form('err_user_exists');
-					return;
-				}
-			}
-		}	
-		
-		//+--------------------------------------------
-		//| Are they banned?
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['ban_ip'])
-		{
-			$ips = explode( "|", $ibforums->vars['ban_ip'] );
-			
-			foreach ($ips as $ip)
-			{
-				$ip = preg_replace( "/\*/", '.*' , $ip );
-				
-				if ( $ip == "" )
-				{
-					continue;
-				}
-				
-				if (preg_match( "/^$ip/", $ibforums->input['IP_ADDRESS'] ))
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'you_are_banned' ) );
-				}
-			}
-		}
-		
-		if ($ibforums->vars['ban_email'])
-		{
-			$ips = explode( "|", $ibforums->vars['ban_email'] );
-			foreach ($ips as $ip)
-			{
-				$ip = preg_replace( "/\*/", '.*' , $ip );
-				if (preg_match( "/$ip/", $in_email ))
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'you_are_banned' ) );
-				}
-			}
-		}
-		
-		//+--------------------------------------------
-		//| Check the reg_code
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['bot_antispam'])
-		{
-			if ($ibforums->input['regid'] == "")
-			{
-				$this->show_reg_form('err_reg_code');
-				return;
-			}
-			
-			$DB->query("SELECT * FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['regid']))."'");
-			
-			if ( ! $row = $DB->fetch_row() )
-			{
-				$this->show_reg_form('err_reg_code');
-				return;
-			}
-			
-			if ( trim( intval($ibforums->input['reg_code']) ) != $row['regcode'] )
-			{
-				$this->show_reg_form('err_reg_code');
-				return;
-			}
-			
-			$DB->query("DELETE FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['regid']))."'");
-		}
-		
-		//+--------------------------------------------
-		//| Build up the hashes
-		//+--------------------------------------------
-		
-		$mem_group = $ibforums->vars['member_group'];
-		
-		//+--------------------------------------------
-		//| Are we asking the member or admin to preview?
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['reg_auth_type'])
-		{
-			$mem_group = $ibforums->vars['auth_group'];
-		}
-		else if ($coppa == 1)
-		{
-			$mem_group = $ibforums->vars['auth_group'];
-		}
-		
-		//+--------------------------------------------
-		//| Find the highest member id, and increment it
-		//| auto_increment not used for guest id 0 val.
-		//+--------------------------------------------
-		
-		$DB->query("SELECT MAX(id) as new_id FROM ibf_members");
-		$r = $DB->fetch_row();
-		
-		$member_id = $r['new_id'] + 1;
-		
-		$member = array(
-						 'id'              => $member_id,
-						 'name'            => $in_username,
-						 'password'        => $in_password,
-						 'email'           => $in_email,
-						 'mgroup'          => $mem_group,
-						 'posts'           => 0,
-						 'avatar'          => 'noavatar',
-						 'joined'          => time(),
-						 'ip_address'      => $ibforums->input['IP_ADDRESS'],
-						 'time_offset'     => $ibforums->vars['time_offset'],
-						 'view_sigs'       => 1,
-						 'email_pm'        => 1,
-						 'view_img'        => 1,
-						 'view_avs'        => 1,
-						 'restrict_post'   => 0,
-						 'view_pop'        => 1,
-						 'vdirs'           => "in:Inbox|sent:Sent Items",
-						 'msg_total'       => 0,
-						 'new_msg'         => 0,
-						 'coppa_user'      => $coppa,
-						 'language'        => $ibforums->vars['default_language'],
-					   );
-					   
-		
-					   
-		//+--------------------------------------------
-		//| Insert into the DB
-		//+--------------------------------------------
-		
-		$member['password'] = md5( $member['password'] );
-		
-		$db_string = $std->compile_db_string( $member );
-		
-		$DB->query("INSERT INTO ibf_members (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-		$DB->query("INSERT INTO ibf_member_extra (id) VALUES ($member_id)");
-		
-		unset($db_string);
-		
-		//+--------------------------------------------
-		//| Insert into the custom profile fields DB
-		//+--------------------------------------------
-		
-		// Ensure deleted members profile fields are removed.
-		
-		$DB->query("DELETE FROM ibf_pfields_content WHERE member_id=".$member['id']);
-		
-		$custom_fields['member_id'] = $member['id'];
-			
-		$db_string = $DB->compile_db_insert_string($custom_fields);
-			
-		$DB->query("INSERT INTO ibf_pfields_content (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
-		
-		unset($db_string);
-		
-		//+--------------------------------------------
-		
-		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-    		$this->modules->on_create_account($member);
-    		
-    		if ( $this->modules->error == 1 )
-    		{
-    			return;
-    		}
-   		}
-		
-		//+--------------------------------------------
-		
-		$validate_key = md5( $std->make_password() . time() );
-		$time         = time();
-		
-		
-		if ($coppa != 1)
-		{
-			if ( ($ibforums->vars['reg_auth_type'] == 'user') or ($ibforums->vars['reg_auth_type'] == 'admin') ) {
-			
-				// We want to validate all reg's via email, after email verificiation has taken place,
-				// we restore their previous group and remove the validate_key
-				
-				$db_str = $DB->compile_db_insert_string( array (
-																 'vid'         => $validate_key,
-																 'member_id'   => $member['id'],
-																 'real_group'  => $ibforums->vars['member_group'],
-																 'temp_group'  => $ibforums->vars['auth_group'],
-																 'entry_date'  => $time,
-																 'coppa_user'  => $coppa,
-																 'new_reg'     => 1,
-																 'ip_address'  => $member['ip_address']
-													   )       );
-				
-				$DB->query("INSERT INTO ibf_validating ({$db_str['FIELD_NAMES']}) VALUES({$db_str['FIELD_VALUES']})");
-				
-				
-				if ( $ibforums->vars['reg_auth_type'] == 'user' )
-				{
-				
-					$this->email->get_template("reg_validate");
-					
-					$this->email->build_message( array(
-														'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&uid=".urlencode($member_id)."&aid=".urlencode($validate_key),
-														'NAME'         => $member['name'],
-														'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=05",
-														'EMAIL'        => $member['email'],
-														'ID'           => $member_id,
-														'CODE'         => $validate_key,
-													  )
-												);
-												
-					$this->email->subject = "Registration at ".$ibforums->vars['board_name'];
-					$this->email->to      = $member['email'];
-					
-					$this->email->send_mail();
-					
-					$this->output     = $this->html->show_authorise( $member );
-					
-				}
-				else if ( $ibforums->vars['reg_auth_type'] == 'admin' )
-				{
-					$this->output     = $this->html->show_preview( $member );
-				}
-				
-				if ($ibforums->vars['new_reg_notify']) {
-					
-					$date = $std->get_date( time(), 'LONG' );
-					
-					$this->email->get_template("admin_newuser");
-				
-					$this->email->build_message( array(
-														'DATE'         => $date,
-														'MEMBER_NAME'  => $member['name'],
-													  )
-												);
-												
-					$this->email->subject = "New Registration at ".$ibforums->vars['board_name'];
-					$this->email->to      = $ibforums->vars['email_in'];
-					$this->email->send_mail();
-				}
-				
-				$this->page_title = $ibforums->lang['reg_success'];
-				
-				$this->nav        = array( $ibforums->lang['nav_reg'] );
-			}
-	
-			else
-			{
-				
-				// We don't want to preview, or get them to validate via email.
-				
-				$DB->query("UPDATE ibf_stats SET ".
-							 "MEM_COUNT=MEM_COUNT+1, ".
-							 "LAST_MEM_NAME='" . $member['name'] . "', ".
-							 "LAST_MEM_ID='"   . $member['id']   . "'");
-							 
-				if ($ibforums->vars['new_reg_notify']) {
-					
-					$date = $std->get_date( time(), 'LONG' );
-					
-					$this->email->get_template("admin_newuser");
-				
-					$this->email->build_message( array(
-														'DATE'         => $date,
-														'MEMBER_NAME'  => $member['name'],
-													  )
-												);
-												
-					$this->email->subject = "New Registration at ".$ibforums->vars['board_name'];
-					$this->email->to      = $ibforums->vars['email_in'];
-					$this->email->send_mail();
-				}
-				
-				$std->my_setcookie("member_id"   , $member['id']      , 1);
-				$std->my_setcookie("pass_hash"   , $member['password'], 1);
-					
-				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&fromreg=1');
-			}
-		}
-		else
-		{
-			// This is a COPPA user, so lets tell them they registered OK and redirect to the form.
-			
-			$db_str = $DB->compile_db_insert_string( array (
-															 'vid'         => $validate_key,
-															 'member_id'   => $member['id'],
-															 'real_group'  => $ibforums->vars['member_group'],
-															 'temp_group'  => $ibforums->vars['auth_group'],
-															 'entry_date'  => $time,
-															 'coppa_user'  => $coppa,
-															 'new_reg'     => 1,
-															 'ip_address'  => $member['ip_address']
-												   )       );
-			
-			$DB->query("INSERT INTO ibf_validating ({$db_str['FIELD_NAMES']}) VALUES({$db_str['FIELD_VALUES']})");
-			
-			$print->redirect_screen( $ibforums->lang['cp_success'], 'act=Reg&CODE=12' );
-		}
-				
-	} 
-    
-    /*****************************************************/
-	// validate_user
-	// ------------------
-	// Leave a message after the tone, and I'll amuse myself
-	// by pulling faces when hearing the message later.
-	/*****************************************************/
-	
-	function validate_user() {
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
-		
-		//------------------------------------------------------------
-		// Check for input and it's in a valid format.
-		//------------------------------------------------------------
-		
-		$in_user_id      = intval(trim(urldecode($ibforums->input['uid'])));
-		$in_validate_key = trim(urldecode($ibforums->input['aid']));
-		$in_type         = trim($ibforums->input['type']);
-		
-		if ($in_type == "")
-		{
-			$in_type = 'reg';
-		}
-		
-		//------------------------------------------------------------
-		
-		if (! preg_match( "/^(?:[\d\w]){32}$/", $in_validate_key ) )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
-		}
-		
-		//------------------------------------------------------------
-		
-		if (! preg_match( "/^(?:\d){1,}$/", $in_user_id ) )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
-		}
-		
-		//------------------------------------------------------------
-		// Attempt to get the profile of the requesting user
-		//------------------------------------------------------------
-		
-		$DB->query("SELECT * FROM ibf_members WHERE id=$in_user_id");
-		
-		if ( ! $member = $DB->fetch_row() )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_mem' ) );
-		}
-		
-		//------------------------------------------------------------
-		// Get validating info..
-		//------------------------------------------------------------
-		
-		$DB->query("SELECT * FROM ibf_validating WHERE member_id=$in_user_id");
-		
-		if ( ! $validate = $DB->fetch_row() )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
-		}
-		
-		if (($validate['new_reg'] == 1) && ($ibforums->vars['reg_auth_type'] == "admin")) 
-		{ 
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key_not_allow' ) ); 
-		} 
-		
-		if ($validate['vid'] != $in_validate_key)
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_key_wrong' ) );
-		}
-		else
-		{
-			//------------------------------------------------------------
-			// REGISTER VALIDATE
-			//------------------------------------------------------------
-			
-			if ($in_type == 'reg')
-			{
-				if ( $validate['new_reg'] != 1 )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
-				}
-				
-				if (empty($validate['real_group']))
-				{
-					$validate['real_group'] = $ibforums->vars['member_group'];
-				}
-				
-				$DB->query("UPDATE ibf_members SET mgroup=".intval($validate['real_group'])." WHERE id=".intval($member['id']));
-				
-				if ( USE_MODULES == 1 )
-				{
-					$this->modules->register_class(&$this);
-    				$this->modules->on_group_change($member['id'], $validate['real_group']);
-    			}
-    			
-				//------------------------------------------------------------
-				// Update the stats...
-				//------------------------------------------------------------
-			
-				$DB->query("UPDATE ibf_stats SET ".
-							 "MEM_COUNT=MEM_COUNT+1, ".
-							 "LAST_MEM_NAME='" . $member['name'] . "', ".
-							 "LAST_MEM_ID='"   . $member['id']   . "'");
-							 
-							 
-				$std->my_setcookie("member_id"   , $member['id']      , 1);
-				$std->my_setcookie("pass_hash"   , $member['password'], 1);
-				
-				//------------------------------------------------------------
-				// Remove "dead" validation
-				//------------------------------------------------------------
-				
-				$DB->query("DELETE FROM ibf_validating WHERE vid='".$validate['vid']."' OR (member_id={$member['id']} AND new_reg=1)");
-				
-				$this->bash_dead_validations();
-					
-				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&fromreg=1');
-							 
-			}
-			
-			//------------------------------------------------------------
-			// LOST PASS VALIDATE
-			//------------------------------------------------------------
-			
-			else if ($in_type == 'lostpass')
-			{
-				if ($validate['lost_pass'] != 1)
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'lp_no_pass' ) );
-				}
-				
-				if ( $HTTP_POST_VARS['pass1'] == "" )
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'pass_blank' ) );
-				}
-				
-				if ( $HTTP_POST_VARS['pass2'] == "" )
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'pass_blank' ) );
-				}
-				
-				$pass_a = trim($ibforums->input['pass1']);
-				$pass_b = trim($ibforums->input['pass2']);
-				
-				if ( strlen($pass_a) < 3 )
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'pass_too_short' ) );
-				}
-				
-				if ( $pass_a != $pass_b )
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'pass_no_match' ) );
-				}
-				
-				$new_pass = md5($pass_a);
-				
-				$DB->query("UPDATE ibf_members SET password='$new_pass' WHERE id=".intval($member['id']));
-				
-				$std->my_setcookie("member_id"   , $member['id']  , 1);
-				$std->my_setcookie("pass_hash"   , $new_pass      , 1);
-				
-				//------------------------------------------------------------
-				// Remove "dead" validation
-				//------------------------------------------------------------
-				
-				$DB->query("DELETE FROM ibf_validating WHERE vid='".$validate['vid']."' OR (member_id={$member['id']} AND lost_pass=1)");
-				
-				$this->bash_dead_validations();
-					
-				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&frompass=1');
-			
-			}
-			
-			//------------------------------------------------------------
-			// EMAIL ADDY CHANGE
-			//------------------------------------------------------------
-			
-			else if ($in_type == 'newemail')
-			{
-				if ( $validate['email_chg'] != 1 )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
-				}
-				
-				if (empty($validate['real_group']))
-				{
-					$validate['real_group'] = $ibforums->vars['member_group'];
-				}
-				
-				$DB->query("UPDATE ibf_members SET mgroup=".intval($validate['real_group'])." WHERE id=".intval($member['id']));
-				
-				if ( USE_MODULES == 1 )
-				{
-					$this->modules->register_class(&$this);
-    				$this->modules->on_group_change($member['id'], $validate['real_group']);
-    			}
-    			
-				$std->my_setcookie("member_id"   , $member['id']      , 1);
-				$std->my_setcookie("pass_hash"   , $member['password'], 1);
-				
-				//------------------------------------------------------------
-				// Remove "dead" validation
-				//------------------------------------------------------------
-				
-				$DB->query("DELETE FROM ibf_validating WHERE vid='".$validate['vid']."' OR (member_id={$member['id']} AND email_chg=1)");
-				
-				$this->bash_dead_validations();
-					
-				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&fromemail=1');
-			}
-			
-		} 
-		
-	} 
-    
-    /*****************************************************/
-	// show_board_rules
-	// ------------------
-	// o_O  ^^
-	/*****************************************************/
-	
-	function show_board_rules() {
-		global $ibforums, $DB;
-		
-		$DB->query("SELECT RULES_TEXT from ib_forum_rules WHERE ID='00'");
-		$rules = $DB->fetch_row();
-		
-		$this->output     = $this->html->show_rules($rules);
-		$this->page_title = $ibforums->lang['board_rules'];
-		$this->nav        = array( $ibforums->lang['board_rules'] );
-	
-	}
-	
-	/*****************************************************/
-	// show_manual_form
-	// ------------------
-	// This feature is not available in an auto option
-	/*****************************************************/
-	
-	function show_manual_form($type='reg') {
-		global $ibforums, $std, $DB;
-		
-		if ( $type == 'lostpass' )
-		{
-		
-			$this->output = $this->html->show_lostpass_form();
-			
-			//------------------------------------------------------------
-			// Check for input and it's in a valid format.
-			//------------------------------------------------------------
-			
-			if ( $ibforums->input['uid'] AND $ibforums->input['aid'] )
-			{ 
-			
-				$in_user_id      = intval(trim(urldecode($ibforums->input['uid'])));
-				$in_validate_key = trim(urldecode($ibforums->input['aid']));
-				$in_type         = trim($ibforums->input['type']);
-				
-				if ($in_type == "")
-				{
-					$in_type = 'reg';
-				}
-				
-				//------------------------------------------------------------
-				
-				if (! preg_match( "/^(?:[\d\w]){32}$/", $in_validate_key ) )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
-				}
-				
-				//------------------------------------------------------------
-				
-				if (! preg_match( "/^(?:\d){1,}$/", $in_user_id ) )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
-				}
-				
-				//------------------------------------------------------------
-				// Attempt to get the profile of the requesting user
-				//------------------------------------------------------------
-				
-				$DB->query("SELECT id, name, password, email FROM ibf_members WHERE id=$in_user_id");
-				
-				if ( ! $member = $DB->fetch_row() )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_mem' ) );
-				}
-				
-				//------------------------------------------------------------
-				// Get validating info..
-				//------------------------------------------------------------
-				
-				$DB->query("SELECT * FROM ibf_validating WHERE member_id=$in_user_id and vid='$in_validate_key' and lost_pass=1");
-				
-				if ( ! $validate = $DB->fetch_row() )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
-				}
-				
-				$this->output = str_replace( "<!--IBF.INPUT_TYPE-->", $this->html->show_lostpass_form_auto($in_validate_key, $in_user_id), $this->output );
-			}
-			else
-			{
-				$this->output = str_replace( "<!--IBF.INPUT_TYPE-->", $this->html->show_lostpass_form_manual(), $this->output );
-			}
-		}
-		else
-		{
-			$this->output     = $this->html->show_dumb_form($type);
-		}
-		
-		$this->page_title = $ibforums->lang['activation_form'];
-		$this->nav        = array( $ibforums->lang['activation_form'] );
-	
-	}
-	
-	function show_image()
-	{
-		global $ibforums, $DB, $std;
-		
-		
-		if ( $ibforums->input['rc'] == "" )
-		{
-			return false;
-		}
-		
-		// Get the info from the db
-		
-		$DB->query("SELECT * FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['rc']))."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			return false;
-		}
-		
-		//--------------------------------------------
-		// Using GD?
-		//--------------------------------------------
-		
-		if ( $ibforums->vars['bot_antispam'] == 'gd' )
-		{
-			$std->show_gd_img($row['regcode']);
-		}
-		else
-		{
-		
-			//--------------------------------------------
-			// Using normal then, check for "p"
-			//--------------------------------------------
-			
-			if ( $ibforums->input['p'] == "" )
-			{
-				return false;
-			}
-			
-			$p = intval($ibforums->input['p']) - 1; //substr starts from 0, not 1 :p
-			
-			$this_number = substr( $row['regcode'], $p, 1 );
-			
-			$std->show_gif_img($this_number);
-		}
-		
-	}
-	
-	
-	
-	function bash_dead_validations()
-	{
-		global $ibforums, $std, $DB;
-		
-		$mids = array();
-		$vids = array();
-		
-		// If enabled, remove validating new_reg members & entries from members table
-		
-		if ( intval($ibforums->vars['validate_day_prune']) > 0 )
-		{
-			$less_than = time() - $ibforums->vars['validate_day_prune']*86400;
-			
-			$DB->query("SELECT v.vid, v.member_id, m.posts
-			               FROM ibf_validating v
-			             LEFT JOIN ibf_members m ON (v.member_id=m.id)
-					    WHERE v.new_reg=1
-					    AND v.coppa_user <> 1
-					    AND v.entry_date < $less_than
-					    AND lost_pass <> 1");
-			
-			while( $i = $DB->fetch_row() )
-			{
-				if ( intval($i['posts']) < 1 )
-				{
-					$mids[] = $i['member_id'];
-					$vids[] = "'".$i['vid']."'";
-				}
-			}
-			
-			// Remove non-posted validating members
-			
-			if ( count($mids) > 0 )
-			{
-				$DB->query("DELETE FROM ibf_members WHERE id IN(".implode(",",$mids).")");
-				$DB->query("DELETE FROM ibf_member_extra WHERE id IN(".implode(",",$mids).")");
-				$DB->query("DELETE FROM ibf_pfields_content WHERE member_id IN(".implode(",",$mids).")");
-				$DB->query("DELETE FROM ibf_validating WHERE vid IN(".implode(",",$vids).")");
-				
-				if ( USE_MODULES == 1 )
-				{
-					$this->modules->register_class(&$this);
-					$this->modules->on_delete($mids);
-				}
-			}
-		}
-	}
-	
-        
-}
-
-?>
diff --git a/upload/sources/Search.php b/upload/sources/Search.php
deleted file mode 100644
index 157e0932..00000000
--- a/upload/sources/Search.php
+++ /dev/null
@@ -1,1751 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Searching procedures
-|   > Module written by Matt Mecham
-|   > Date started: 24th February 2002
-|
-|	> Module Version Number: 1.1.0
-+--------------------------------------------------------------------------
-*/
-
-$idx = new Search;
-
-class Search {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $html       = "";
-    
-    var $first      = 0;
-    
-    var $search_type = 'posts';
-    var $sort_order  = 'desc';
-    var $sort_key    = 'last_post';
-    var $search_in   = 'posts';
-    var $prune       = '30';
-    var $st_time     = array();
-    var $end_time    = array();
-    var $st_stamp    = "";
-    var $end_stamp   = "";
-    var $result_type = "topics";
-    var $parser      = "";
-    var $load_lib    = 'search_mysql_man';
-    var $lib         = "";
-    
-    var $mysql_version   = "";
-	var $true_version    = "";
-    
-    function Search()
-    {
-    	global $ibforums, $DB, $std, $print;
-    	
-    	if (! $ibforums->vars['allow_search'])
-    	{
-    		$std->Error( array( LEVEL => 1, MSG => 'search_off') );
-    	}
-    	
-    	if ($ibforums->member['g_use_search'] != 1)
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
-    	}
-    	
-    	if ( $read = $std->my_getcookie('topicsread') )
-        {
-        	$this->read_array = unserialize(stripslashes($read));
-        }
-    	
-    	//---------------------------------------
-		// Get the mySQL version.
-		// Adapted from phpMyAdmin
-		//---------------------------------------
-		
-		$DB->query("SELECT VERSION() AS version");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			$DB->query("SHOW VARIABLES LIKE 'version'");
-			$row = $DB->fetch_row();
-		}
-		
-		$this->true_version = $row['version'];
-		
-		$no_array = explode( '.', preg_replace( "/^(.+?)[-_]?/", "\\1", $row['version']) );
-		
-		$one   = (!isset($no_array) || !isset($no_array[0])) ? 3  : $no_array[0];
-		$two   = (!isset($no_array[1]))                      ? 21 : $no_array[1];
-		$three = (!isset($no_array[2]))                      ? 0  : $no_array[2];
-		
-   		$this->mysql_version = (int)sprintf('%d%02d%02d', $one, $two, intval($three));
-    	
-    	
-    	if ($ibforums->input['CODE'] == "") $ibforums->input['CODE'] = '00';
-    	
-    	//--------------------------------------------
-    	// Sort out the required search library
-    	//--------------------------------------------
-    	
-    	$method = isset($ibforums->vars['search_sql_method']) ? $ibforums->vars['search_sql_method'] : 'man';
-    	$sql    = isset($ibforums->vars['sql_driver'])        ? $ibforums->vars['sql_driver']        : 'mysql';
-    	
-    	$this->load_lib = 'search_'.strtolower($sql).'_'.$method.'.php';
-    	
-    	require ( "./sources/lib/".$this->load_lib );
-    	
-    	//--------------------------------------------
-    	// Require the HTML and language modules
-    	//--------------------------------------------
-    	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_search', $ibforums->lang_id );
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_forum' , $ibforums->lang_id );
-    	
-    	$this->html = $std->load_template('skin_search'); 
-    	
-    	$this->base_url = $ibforums->base_url;
-    	
-    	//--------------------------------------------
-    	// Suck in libby
-    	//--------------------------------------------
-    	
-    	$this->lib = new search_lib(&$this);
-    	
-    	$ibforums->input['st'] = intval($ibforums->input['st']);
-    	
-    	if ( $ibforums->input['st'] )
-    	{
-    		$this->first = $ibforums->input['st'];
-    	}
-    	
-    	//--------------------------------------------
-    	// What to do?
-    	//--------------------------------------------
-    	
-    	if (! isset($ibforums->member['g_use_search']) )
-    	{
-    		$std->Error( array( LEVEL => 1, MSG => 'cant_use_feature') );
-    	}
-    	
-    	switch($ibforums->input['CODE']) {
-    		case '01':
-    			$this->do_search();
-    			break;
-    		case 'getnew':
-    			$this->get_new_posts();
-    			break;
-    		case 'getactive':
-    			$this->get_active();
-    			break;
-    		case 'show':
-    			$this->show_results();
-    			break;
-    		case 'getreplied':
-    			$this->get_replies();
-    			break;
-    		case 'lastten':
-    			$this->get_last_ten();
-    			break;
-    		case 'getalluser':
-    			$this->get_all_user();
-    			break;
-    		case 'simpleresults':
-    			$this->show_simple_results();
-    			break;
-    		case 'explain':
-    			$this->show_boolean_explain();
-    			break;
-    		default:
-    			$this->show_form();
-    			break;
-    	}
-    	
-    	// If we have any HTML to print, do so...
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
- 	}
- 	
- 	//-----------------------------------------------------
-	// Do simple search
-	//-----------------------------------------------------
-	
-	function show_simple_results()
-	{
-    	global $ibforums, $DB, $std, $print;
-    	
-    	$result = $this->lib->do_simple_search();
-    }
-    
-    //-----------------------------------------------------
-	// Get all posts by a member
-	//-----------------------------------------------------
- 	
- 	function get_all_user() {
-		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
-		
-		//------------------------------------
-		// Do we have flood control enabled?
-		//------------------------------------
-		
-		if ($ibforums->member['g_search_flood'] > 0)
-		{
-			$flood_time = time() - $ibforums->member['g_search_flood'];
-			
-			// Get any old search results..
-			
-			$DB->query("SELECT id FROM ibf_search_results WHERE (member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'");
-			
-			if ( $DB->get_num_rows() )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
-			}
-		}
-		
-		$ibforums->input['forums'] = 'all';
-		
-		$forums = $this->get_searchable_forums();
-		
-		$mid    = intval($ibforums->input['mid']);
-		
-		//------------------------------------
-		// Do we have any forums to search in?
-		//------------------------------------
-		
-		if ($forums == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
-		}
-		
-		if ($mid == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-	
-		//------------------------------------------------
-		// Get the topic ID's to serialize and store into
-		// the database
-		//------------------------------------------------
-		
-		$DB->query("SELECT pid FROM ibf_posts WHERE queued <> 1 AND forum_id IN($forums) AND author_id=$mid");
-	
-		$max_hits = $DB->get_num_rows();
-		
-		$posts  = "";
-		
-		while ($row = $DB->fetch_row() )
-		{
-			$posts .= $row['pid'].",";
-		}
-	
-		$DB->free_result();
-		
-		$posts  = preg_replace( "/,$/", "", $posts );
-		
-		//------------------------------------------------
-		// Do we have any results?
-		//------------------------------------------------
-		
-		if ($posts == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		//------------------------------------------------
-		// If we are still here, store the data into the database...
-		//------------------------------------------------
-		
-		$unique_id = md5(uniqid(microtime(),1));
-		
-		$str = $DB->compile_db_insert_string( array (
-														'id'         => $unique_id,
-														'search_date'=> time(),
-														'post_id'    => $posts,
-														'post_max'   => $max_hits,
-														'sort_key'   => $this->sort_key,
-														'sort_order' => $this->sort_order,
-														'member_id'  => $ibforums->member['id'],
-														'ip_address' => $ibforums->input['IP_ADDRESS'],
-											   )        );
-		
-		$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		
-		$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&nav=au&CODE=show&searchid=$unique_id&search_in=posts&result_type=posts" );
-		exit();
-		
-	}
- 	
- 	//---------------------------------
- 	
- 	function get_new_posts()
- 	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
-		
-		if ( ! $ibforums->member['id'] )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		//------------------------------------
-		// Do we have flood control enabled?
-		//------------------------------------
-		
-		if ($ibforums->member['g_search_flood'] > 0)
-		{
-			$flood_time = time() - $ibforums->member['g_search_flood'];
-			
-			// Get any old search results..
-			
-			$DB->query("SELECT id FROM ibf_search_results WHERE (member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'");
-			
-			if ( $DB->get_num_rows() )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
-			}
-		}
-		
-		$ibforums->input['forums'] = 'all';
-		$ibforums->input['nav']    = 'lv';
-		
-		$forums = $this->get_searchable_forums();
-		
-		//------------------------------------
-		// Do we have any forums to search in?
-		//------------------------------------
-		
-		if ($forums == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
-		}
-	
-		//------------------------------------------------
-		// Get the topic ID's to serialize and store into
-		// the database
-		//------------------------------------------------
-		
-		$DB->query("SELECT t.tid FROM ibf_topics t
-					WHERE t.approved=1 AND t.forum_id IN($forums) AND t.last_post > '".$ibforums->member['last_visit']."'");
-	
-		$max_hits = $DB->get_num_rows();
-		
-		$posts  = "";
-		
-		while ($row = $DB->fetch_row() )
-		{
-			$posts .= $row['tid'].",";
-		}
-	
-		$DB->free_result();
-		
-		$posts  = preg_replace( "/,$/", "", $posts );
-		
-		//------------------------------------------------
-		// Do we have any results?
-		//------------------------------------------------
-		
-		if ($posts == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		//------------------------------------------------
-		// If we are still here, store the data into the database...
-		//------------------------------------------------
-		
-		$unique_id = md5(uniqid(microtime(),1));
-		
-		$str = $DB->compile_db_insert_string( array (
-														'id'         => $unique_id,
-														'search_date'=> time(),
-														'topic_id'    => $posts,
-														'topic_max'   => $max_hits,
-														'sort_key'   => $this->sort_key,
-														'sort_order' => $this->sort_order,
-														'member_id'  => $ibforums->member['id'],
-														'ip_address' => $ibforums->input['IP_ADDRESS'],
-											   )        );
-		
-		$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		
-		$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&nav=lv&CODE=show&searchid=$unique_id&search_in=topics&result_type=topics" );
-		exit();
-		
-	}
- 	
- 	
- 	//--------------------------------------------------------
- 	
- 	function get_last_ten()
- 	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
-		
-		$ibforums->input['forums'] = 'all';
-		
-		$forums = $this->get_searchable_forums();
-		
-		//------------------------------------
-		// Do we have any forums to search in?
-		//------------------------------------
-		
-		if ($forums == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
-		}
-		
-		if ( $read = $std->my_getcookie('topicsread') )
-        {
-        	$this->read_array = unserialize(stripslashes($read));
-        }
-	
-		//------------------------------------------------
-		// Get the topic ID's to serialize and store into
-		// the database
-		//------------------------------------------------
-		
-		$DB->query("SELECT p.*, t.*, f.id as forum_id, f.name as forum_name FROM ibf_forums f, ibf_posts p, ibf_topics t WHERE p.queued <> 1 AND p.forum_id IN($forums) AND p.author_id='".$ibforums->member['id']."' AND t.tid=p.topic_id AND f.id=p.forum_id ORDER BY p.post_date DESC LIMIT 0,10");
-	
-		if ( $DB->get_num_rows() )
-		{
-		
-			require "./sources/lib/post_parser.php";
-       		$this->parser = new post_parser();
-       		
-			$this->output .= $this->html->start_as_post( array( 'SHOW_PAGES' => $links ) );
-			
-			while ($row = $DB->fetch_row() )
-			{
-				$row['keywords'] = $url_words;
-				$row['post_date'] = $std->get_date( $row['post_date'],'LONG' );
-				
-				if ( $ibforums->vars['post_wordwrap'] > 0 )
-				{
-					$row['post'] = $this->parser->my_wordwrap( $row['post'], $ibforums->vars['post_wordwrap']) ;
-				}
-			
-				$this->output .= $this->html->RenderPostRow( $this->parse_entry($row, 1) );
-			}
-			
-			$this->output .= $this->html->end_as_post(array( 'SHOW_PAGES' => $links ));
-		}
-		else
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-	
-		$DB->free_result();
-		
-		$this->page_title = $ibforums->lang['nav_lt'];
-		
-		$this->nav = array( $ibforums->lang['nav_lt'] );
-		
-	}
- 	
- 	//--------------------------------------------------------
- 	
- 	function get_replies()
- 	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
-		
-		//------------------------------------
-		// Do we have flood control enabled?
-		//------------------------------------
-		
-		if ($ibforums->member['g_search_flood'] > 0)
-		{
-			$flood_time = time() - $ibforums->member['g_search_flood'];
-			
-			// Get any old search results..
-			
-			$DB->query("SELECT id FROM ibf_search_results WHERE (member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'");
-			
-			if ( $DB->get_num_rows() )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
-			}
-		}
-		
-		$ibforums->input['forums'] = 'all';
-		$ibforums->input['nav']    = 'lv';
-		
-		$forums = $this->get_searchable_forums();
-		
-		//------------------------------------
-		// Do we have any forums to search in?
-		//------------------------------------
-		
-		if ($forums == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
-		}
-	
-		//------------------------------------------------
-		// Get the topic ID's to serialize and store into
-		// the database
-		//------------------------------------------------
-		
-		$DB->query("SELECT tid FROM ibf_topics WHERE starter_id='".$ibforums->member['id']."'
-		            AND last_post > ".$ibforums->member['last_visit']." AND forum_id IN($forums) AND approved=1");
-	
-		$max_hits = $DB->get_num_rows();
-		
-		$topics  = "";
-		
-		while ($row = $DB->fetch_row() )
-		{
-			$topics .= $row['tid'].",";
-		}
-	
-		$DB->free_result();
-		
-		$topics  = preg_replace( "/,$/", "", $topics );
-		
-		//------------------------------------------------
-		// Do we have any results?
-		//------------------------------------------------
-		
-		if ($topics == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		//------------------------------------------------
-		// If we are still here, store the data into the database...
-		//------------------------------------------------
-		
-		$unique_id = md5(uniqid(microtime(),1));
-		
-		$str = $DB->compile_db_insert_string( array (
-														'id'         => $unique_id,
-														'search_date'=> time(),
-														'topic_id'   => $topics,
-														'topic_max'  => $max_hits,
-														'sort_key'   => $this->sort_key,
-														'sort_order' => $this->sort_order,
-														'member_id'  => $ibforums->member['id'],
-														'ip_address' => $ibforums->input['IP_ADDRESS'],
-											   )        );
-		
-		$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		
-		$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&nav=gr&CODE=show&searchid=$unique_id&search_in=posts&result_type=topics" );
-		exit();
-		
-	}
-	
-	//------------------------------------------------
-	// Show pop-up window
-	//------------------------------------------------
-	
-	function show_boolean_explain()
- 	{
- 		global $DB, $std, $ibforums, $print;
- 		
- 		$print->pop_up_window( $ibforums->lang['be_link'], $this->html->boolean_explain_page() );
-		
- 	}
-	
-	//------------------------------------------------
-	// Show main form
-	//------------------------------------------------
- 	
- 	
- 	function show_form()
- 	{
- 		global $DB, $std, $ibforums;
- 		
- 		$last_cat_id = -1;
- 		
- 		$the_hiddens = "";
-		
-		$DB->query("SELECT f.id as forum_id, f.parent_id, f.subwrap, f.sub_can_post, f.name as forum_name, f.position, f.read_perms, c.id as cat_id, c.name as cat_name
-		            FROM ibf_forums f
-		              LEFT JOIN ibf_categories c ON (c.id=f.category)
-		              WHERE c.state <> 0
-		            ORDER BY c.position, f.position");
-		
-		$forum_keys = array();
-		$cat_keys   = array();
-		$children   = array();
-		$subs       = array();
-		$subwrap    = array();
-			
-		while ( $i = $DB->fetch_row() )
-		{
-			$selected = '';
-			
-			if ($ibforums->input['f'] and $ibforums->input['f'] == $i['forum_id'])
-			{
-				$selected = ' selected="selected"';
-			}
-			
-			if ( $i['subwrap'] == 1 )
-			{
-				$is_sub  = $ibforums->lang['is_sub'];
-				$sub_css = " class='sub' ";
-				$subwrap[ $i['forum_id'] ] = 1;
-				
-			}
-			
-			if ($i['subwrap'] == 1 and $i['sub_can_post'] != 1)
-			{
-				$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "<option value=\"{$i['forum_id']}\"".$sub_css."$selected>&middot;&middot;&nbsp;{$i['forum_name']}$is_sub</option>\n";
-			}
-			else
-			{
-				if ( $std->check_perms($i['read_perms']) == TRUE )
-				{
-					if ($i['parent_id'] > 0)
-					{
-						$children[ $i['parent_id'] ][] = "<option value=\"{$i['forum_id']}\"$selected>&middot;&middot;&middot;&middot;&nbsp;{$i['forum_name']}</option>\n";
-					}
-					else
-					{
-						$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "<option value=\"{$i['forum_id']}\"".$sub_css."$selected>&middot;&middot;&nbsp;{$i['forum_name']}$is_sub</option>\n";
-					}
-				}
-				else
-				{
-					continue;
-				}
-			}
-			
-			if ($last_cat_id != $i['cat_id'])
-			{
-				$cat_keys[ $i['cat_id'] ] = "<option value=\"c_{$i['cat_id']}\" class='cat'>{$i['cat_name']}</option>\n";
-				$last_cat_id = $i['cat_id'];
-			}
-			
-			unset($is_sub);
-			unset($sub_css);
-		}
-		
-		foreach($cat_keys as $cat_id => $cat_text)
-		{
-			if ( is_array( $forum_keys[$cat_id] ) && count( $forum_keys[$cat_id] ) > 0 )
-			{
-				$the_html .= $cat_text;
-				
-				foreach($forum_keys[$cat_id] as $idx => $forum_text)
-				{
-					if ( $subwrap[$idx] != 1 )
-					{
-						$the_html .= $forum_text;
-					}
-					else
-					{
-						if (count($children[$idx]) > 0)
-						{
-							$the_html .= $forum_text;
-							
-							foreach($children[$idx] as $ii => $tt)
-							{
-								$the_html .= $tt;
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		$init_sel = "";
-		
-		if ( $ibforums->input['f'] == "" )
-		{
-			$init_sel = ' selected="selected"';
-		}
-		
-		$forums   = "<select name='forums[]' class='forminput' size='10' multiple='multiple'>\n"
-		           ."<option value='all'".$init_sel.">".$ibforums->lang['all_forums']."</option>"
-		           . $the_html
-		           . "</select>";
-		
-		if ( $ibforums->input['mode'] == 'simple' )
-		{
-			if ( $ibforums->vars['search_sql_method'] == 'ftext' )
-			{
-				$this->output = $this->html->simple_form($forums);
-			}
-			else
-			{
-				$this->output = $this->html->Form($forums);
-			}
-		}
-		else if ( $ibforums->input['mode'] == 'adv' )
-		{
-			$this->output = $this->html->Form($forums);
-			
-			if ( $ibforums->vars['search_sql_method'] == 'ftext' )
-			{
-				$this->output = str_replace( "<!--IBF.SIMPLE_BUTTON-->", $this->html->form_simple_button(), $this->output );
-			}
-		}
-		else
-		{
-			// No mode specified..
-			
-			if ( $ibforums->vars['search_default_method'] == 'simple' )
-			{
-				if ( $ibforums->vars['search_sql_method'] == 'ftext' )
-				{
-					$this->output = $this->html->simple_form($forums);
-				}
-				else
-				{
-					$this->output = $this->html->Form($forums);
-				}
-			}
-			else
-			{
-				// Default..
-				
-				$this->output = $this->html->Form($forums);
-				
-				if ( $ibforums->vars['search_sql_method'] == 'ftext' )
-				{
-					$this->output = str_replace( "<!--IBF.SIMPLE_BUTTON-->", $this->html->form_simple_button(), $this->output );
-				}
-			}
-		}
-		
-		if ( $this->mysql_version >= 40010 AND $ibforums->vars['search_sql_method'] == 'ftext' )
-		{
-			$this->output = str_replace( "<!--IBF.BOOLEAN_EXPLAIN-->", $this->html->boolean_explain_link(), $this->output );
-		}
-		
-		$this->page_title = $ibforums->lang['search_title'];
-		$this->nav        = array( $ibforums->lang['search_form'] );
-		
- 	}
- 	
- 	
-
-	function do_search()
-	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
-		
-		//------------------------------------
-		// Do we have flood control enabled?
-		//------------------------------------
-		
-		if ($ibforums->member['g_search_flood'] > 0)
-		{
-			$flood_time = time() - $ibforums->member['g_search_flood'];
-			
-			// Get any old search results..
-			
-			$DB->query("SELECT id FROM ibf_search_results WHERE (member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'");
-			
-			if ( $DB->get_num_rows() )
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
-			}
-		}
-		
-		//------------------------------------------------
-		// init main search
-		//------------------------------------------------
-		
-		$result = $this->lib->do_main_search();
-		
-		//------------------------------------------------
-		// Do we have any results?
-		//------------------------------------------------
-		
-		if ($result['topic_id'] == "" and $result['post_id'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		//------------------------------------------------
-		// If we are still here, store the data into the database...
-		//------------------------------------------------
-		
-		$unique_id = md5(uniqid(microtime(),1));
-		
-		$str = $DB->compile_db_insert_string( array (
-														'id'         => $unique_id,
-														'search_date'=> time(),
-														'topic_id'   => $result['topic_id'],
-														'topic_max'  => $result['topic_max'],
-														'sort_key'   => $this->sort_key,
-														'sort_order' => $this->sort_order,
-														'member_id'  => $ibforums->member['id'],
-														'ip_address' => $ibforums->input['IP_ADDRESS'],
-														'post_id'    => $result['post_id'],
-														'post_max'   => $result['post_max'],
-											)        );
-		
-		$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		
-		$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&CODE=show&searchid=$unique_id&search_in=".$this->search_in."&result_type=".$this->result_type."&highlite=".urlencode(trim($result['keywords'])) );
-
-	}
-	
-	/******************************************************/
-	// Show Results
-	// Shows the results of the search
-	/******************************************************/
-	
-	function show_results()
-	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS;
-		
-        $this->result_type = $ibforums->input['result_type'];
-        $this->search_in   = $ibforums->input['search_in'];
-		
-		//------------------------------------------------
-		// We have a search ID, so lets get the parsed results.
-		// Delete old search queries (older than 24 hours)
-		//------------------------------------------------
-		
-		$t_time = time() - (60*60*24);
-		
-		$DB->query("DELETE FROM ibf_search_results WHERE search_date < '$t_time'");
-		
-		$this->unique_id = $ibforums->input['searchid'];
-		
-		if ($this->unique_id == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		$DB->query("SELECT * FROM ibf_search_results WHERE id='{$this->unique_id}'");
-		$sr = $DB->fetch_row();
-		
-		$tmp_topics     = $sr['topic_id'];
-		$topic_max_hits = "";//$sr['topic_max'];
-		$tmp_posts      = $sr['post_id'];
-		$post_max_hits  = "";//$sr['post_max'];
-		
-		$this->sort_order = $sr['sort_order'];
-		$this->sort_key   = $sr['sort_key'];
-		
-		//------------------------------------------------
-		// Remove duplicates from the topic_id and post_id
-		//------------------------------------------------
-		
-		$topics = ",";
-		$posts  = ",";
-		
-		foreach( explode( ",", $tmp_topics) as $tid )
-		{
-			if ( ! preg_match( "/,$tid,/", $topics ) )
-			{
-				$topics .= "$tid,";
-				$topic_max_hits++;
-			}
-		}
-		
-		//-------------------------------------
-		
-		foreach( explode( ",", $tmp_posts) as $pid )
-		{
-			if ( ! preg_match( "/,$pid,/", $posts ) )
-			{
-				$posts .= "$pid,";
-				$post_max_hits++;
-			}
-		}
-		
-		$topics = str_replace( ",,", ",", $topics );
-		$posts  = str_replace( ",,", ",", $posts  );
-		
-		//-------------------------------------
-		
-		if ($topics == "," and $posts == ",")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-		}
-		
-		$url_words = $this->convert_highlite_words($ibforums->input['highlite']);
-		
-		
-									  
-		if ($this->result_type == 'topics')
-		{
-			if ($this->search_in == 'titles')
-			{
-				$this->output .= $this->start_page($topic_max_hits);
-				
-				$DB->query("SELECT t.*, f.id as forum_id, f.name as forum_name
-							FROM ibf_topics t, ibf_forums f
-							 WHERE t.tid IN(0{$topics}-1) and f.id=t.forum_id
-							 ORDER BY t.pinned DESC, ".$this->sort_key." ".$this->sort_order."
-							LIMIT ".$this->first.",25");
-			}
-			else
-			{
-				//--------------------------------------------
-				// we have tid and pid to sort out, woohoo NOT
-				//--------------------------------------------
-				
-				if ($posts != ",")
-				{
-					$DB->query("SELECT topic_id FROM ibf_posts WHERE pid IN(0{$posts}0)");
-					
-					while ( $pr = $DB->fetch_row() )
-					{
-						if ( ! preg_match( "/,".$pr['topic_id'].",/", $topics ) )
-						{
-							$topics .= $pr['topic_id'].",";
-							$topic_max_hits++;
-						}
-					}
-					
-					$topics = str_replace( ",,", ",", $topics );
-				}
-				
-				$this->output .= $this->start_page($topic_max_hits);
-							
-				$DB->query("SELECT t.*, f.id as forum_id, f.name as forum_name
-							FROM ibf_topics t
-							 LEFT JOIN ibf_forums f ON (f.id=t.forum_id)
-							 WHERE t.tid IN(0{$topics}0)
-							 ORDER BY t.pinned DESC, t.".$this->sort_key." ".$this->sort_order."
-							LIMIT ".$this->first.",25");
-				
-			}
-			
-			//--------------------------------------------
-			
-			if ( $DB->get_num_rows() )
-			{
-				while ( $row = $DB->fetch_row() )
-				{
-					$row['keywords'] = $url_words;
-					$this->output .= $this->html->RenderRow( $this->parse_entry($row) );
-				
-				}
-			}
-			else
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-			}
-			
-			//--------------------------------------------
-			
-			$this->output .= $this->html->end(array( 'SHOW_PAGES' => $this->links ));
-		
-		}
-		else //--------------------------------------------
-		{
-		
-			
-			require "./sources/lib/post_parser.php";
-       		$this->parser = new post_parser();
-       		
-			if ($this->search_in == 'titles')
-			{
-				$this->output .= $this->start_page($topic_max_hits, 1);
-				            
-				$DB->query("SELECT t.*, p.pid, p.author_id, p.author_name, p.post_date, p.post, f.id as forum_id, f.name as forum_name
-				            FROM ibf_topics t
-				              LEFT JOIN ibf_posts p ON (t.tid=p.topic_id AND p.new_topic=1)
-				              LEFT JOIN ibf_forums f ON (f.id=t.forum_id)
-				            WHERE t.tid IN(0{$topics}-1)
-				            ORDER BY p.post_date DESC
-				            LIMIT ".$this->first.",25");
-			}
-			else
-			{
-				if ($topics != ",")
-				{
-					$DB->query("SELECT pid FROM ibf_posts WHERE topic_id IN(0{$topics}0) AND new_topic=1");
-					
-					while ( $pr = $DB->fetch_row() )
-					{
-						if ( ! preg_match( "/,".$pr['pid'].",/", $posts ) )
-						{
-							$posts .= $pr['pid'].",";
-							$post_max_hits++;
-						}
-					}
-					
-					$posts = str_replace( ",,", ",", $posts );
-				}
-				
-				$this->output .= $this->start_page($post_max_hits, 1);
-				
-				$DB->query("SELECT t.*, p.pid, p.author_id, p.author_name, p.post_date, p.post, f.id as forum_id, f.name as forum_name, f.use_html, g.g_dohtml
-							FROM ibf_posts p
-							  LEFT JOIN ibf_topics t ON (t.tid=p.topic_id)
-							  LEFT JOIN ibf_forums f ON (f.id=p.forum_id)
-							  LEFT JOIN ibf_members m ON (m.id=p.author_id)
-							  LEFT JOIN ibf_groups g ON (m.mgroup=g.g_id)
-							WHERE p.pid IN(0{$posts}0)
-							ORDER BY p.post_date DESC
-							LIMIT ".$this->first.",25");
-			}
-			
-			while ( $row = $DB->fetch_row() )
-			{
-				$row['keywords']  = $url_words;
-				$row['post_date'] = $std->get_date( $row['post_date'],'LONG' );
-				
-				//--------------------------------------------------------------
-				// Parse HTML tag on the fly
-				//--------------------------------------------------------------
-				
-				if ( $row['use_html'] == 1 )
-				{
-					// So far, so good..
-					
-					if ( stristr( $row['post'], '[dohtml]' ) )
-					{
-						// [doHTML] tag found..
-						
-						$parse = ($row['use_html'] AND $row['g_dohtml']) ? 1 : 0;
-						
-						$row['post'] = $this->parser->post_db_parse($row['post'], $parse );
-					}
-				}
-				
-				//--------------------------------------------------------------
-				// Do word wrap?
-				//--------------------------------------------------------------
-				
-				if ( $ibforums->vars['post_wordwrap'] > 0 )
-				{
-					$row['post'] = $this->parser->my_wordwrap( $row['post'], $ibforums->vars['post_wordwrap']) ;
-				}
-				
-				$this->output .= $this->html->RenderPostRow( $this->parse_entry($row, 1) );
-			
-			}
-			
-			$this->output .= $this->html->end_as_post(array( 'SHOW_PAGES' => $this->links ));
-		}
-		
-		$this->page_title = $ibforums->lang['search_results'];
-		
-		if ( $ibforums->input['nav'] == 'lv' )
-		{
-			$this->nav = array( $ibforums->lang['nav_since_lv'] );
-		}
-		else if ( $ibforums->input['nav'] == 'lt' )
-		{
-			$this->nav = array( $ibforums->lang['nav_lt'] );
-		}
-		else if ( $ibforums->input['nav'] == 'au' )
-		{
-			$this->nav = array( $ibforums->lang['nav_au'] );
-		}
-		else
-		{
-			$this->nav = array( "<a href='{$this->base_url}&act=Search'>{$ibforums->lang['search_form']}</a>", $ibforums->lang['search_title'] );
-		}
-		
-		
-	}
-	
-	function start_page($amount, $is_post = 0)
-	{
-		global $ibforums, $DB, $std;
-		
-		$url_words = $this->convert_highlite_words($ibforums->input['highlite']);
-		
-		$this->links = $std->build_pagelinks( array( TOTAL_POSS  => $amount,
-											   PER_PAGE    => 25,
-											   CUR_ST_VAL  => $this->first,
-											   L_SINGLE    => "",
-											   L_MULTI     => $ibforums->lang['search_pages'],
-											   BASE_URL    => $this->base_url."act=Search&nav=".$ibforums->input['nav']."&CODE=show&searchid=".$this->unique_id."&search_in=".$this->search_in."&result_type=".$this->result_type."&hl=".$url_words,
-											 )
-									  );
-									  
-		if ($is_post == 0)
-		{
-			return $this->html->start( array( 'SHOW_PAGES' => $this->links ) );
-		}
-		else
-		{
-			return $this->html->start_as_post( array( 'SHOW_PAGES' => $this->links ) );
-		}
-			
-	}
-
-	/******************************************************/
-	// Get active
-	// Show all topics posted in / created between a user
-	// definable amount of days..
-	/******************************************************/
-	
-	function get_active() {
-		global $ibforums, $DB, $std, $HTTP_POST_VARS;
-		
-		
-		//------------------------------------
-		// If we don't have a search ID (searchid)
-		// then it's a fresh query.
-		//
-		//------------------------------------
-		
-		if (! isset($ibforums->input['searchid']) )
-		{
-		
-			//------------------------------------
-			// Do we have any start date input?
-			//------------------------------------
-			
-			if ($ibforums->input['st_day'] == "")
-			{
-				// No? Lets work out the start date as 24hrs ago
-				$ibforums->input['st_day'] = 1;
-				$this->st_stamp = time() - (60*60*24);
-				
-			}
-			else
-			{
-				$ibforums->input['st_day'] = preg_replace( "/s/", "", $ibforums->input['st_day']);
-				$this->st_stamp = time() - (60*60*24*$ibforums->input['st_day']);
-			}
-			
-			
-			//------------------------------------
-			// Do we have any END date input?
-			//------------------------------------
-			
-			if ($ibforums->input['end_day'] == "")
-			{
-				// No? Lets work out the end date as now
-				
-				$this->end_stamp = time();
-				$ibforums->input['end_day'] = 0;
-				
-			}
-			else
-			{
-				$ibforums->input['end_day'] = preg_replace( "/e/", "", $ibforums->input['end_day']);
-				$this->end_stamp = time() - (60*60*24*$ibforums->input['end_day']);
-			}
-			
-			
-			//------------------------------------
-			// Synchronise our input data
-			//------------------------------------
-			
-			$ibforums->input['forums'] = 'all';
-			
-			$forums = $this->get_searchable_forums();
-			
-			//------------------------------------
-			// Do we have any forums to search in?
-			//------------------------------------
-			
-			if ($forums == "")
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
-			}
-		
-			
-			$query = "SELECT DISTINCT(t.tid)
-					  FROM ibf_posts p
-					    LEFT JOIN ibf_topics t ON ( t.approved=1 and p.topic_id=t.tid)
-					  WHERE p.post_date BETWEEN ".$this->st_stamp." AND ".$this->end_stamp."
-					    AND p.forum_id IN($forums)
-					    AND p.queued <> 1
-					  ORDER BY t.last_post DESC
-					  LIMIT 0,200";
-					  
-			//------------------------------------------------
-			// Get the topic ID's to serialize and store into
-			// the database
-			//------------------------------------------------
-			
-			$DB->query($query);
-		
-			$max_hits = $DB->get_num_rows();
-		
-			$topics = "";
-			
-			while ($row = $DB->fetch_row() )
-			{
-				$topics .= $row['tid'].",";
-			}
-		
-			$DB->free_result();
-			
-			$topics = preg_replace( "/,$/", "", $topics );
-			
-			//------------------------------------------------
-			// Do we have any results?
-			//------------------------------------------------
-			
-			if ($topics == "")
-			{
-				$this->output .= $this->html->active_start( array( 'SHOW_PAGES' => "" ) );
-				$this->output .= $this->html->active_none();
-				$this->output .= $this->html->end("");
-				$this->page_title = $ibforums->lang['search_results'];
-				$this->nav        = array( "<a href='{$this->base_url}&act=Search'>{$ibforums->lang['search_form']}</a>", $ibforums->lang['search_title'] );
-				return ""; // return empty handed
-			}
-			
-			//------------------------------------------------
-			// If we are still here, store the data into the database...
-			//------------------------------------------------
-			
-			$unique_id = md5(uniqid(microtime(),1));
-			
-			$str = $DB->compile_db_insert_string( array (
-														'id'         => $unique_id,
-														'search_date'=> time(),
-														'topic_id'   => $topics,
-														'topic_max'  => $max_hits,
-														'sort_key'   => $this->sort_key,
-														'sort_order' => $this->sort_order,
-														'member_id'  => $ibforums->member['id'],
-														'ip_address' => $ibforums->input['IP_ADDRESS'],
-											   )        );
-		
-			$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-						
-		}
-		else 
-		{
-			//------------------------------------------------
-			// We have a search ID, so lets get the parsed results.
-			// Delete old search queries (older than 24 hours)
-			//------------------------------------------------
-			
-			$t_time = time() - (60*60*24);
-			
-			$this->first = intval($ibforums->input['st']) != "" ? intval($ibforums->input['st']) : 0;
-			
-			$DB->query("DELETE FROM ibf_search_results WHERE search_date < '$t_time'");
-			
-			$unique_id = $ibforums->input['searchid'];
-			
-			$DB->query("SELECT * FROM ibf_search_results WHERE id='$unique_id'");
-			$sr = $DB->fetch_row();
-			
-			$topics   = $sr['topic_id'];
-			$max_hits = $sr['topic_max'];
-			
-			$this->sort_order = $sr['sort_order'];
-			$this->sort_key   = $sr['sort_key'];
-			
-			if ($topics == "")
-			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
-			}
-		}
-		
-		// Our variables are centralised, lets get the array slice depending on our $this->first
-		// position.
-		
-		$topic_string = implode( "," , array_slice( explode(",",$topics), $this->first, 25 ) );
-		
-		$topic_string = str_replace(  " "   , "", $topic_string );
-		$topic_string = preg_replace( "/,$/", "", $topic_string );
-			
-		$url_words = urlencode(trim($keywords));
-			
-		$links = $std->build_pagelinks( array( TOTAL_POSS  => $max_hits,
-											   PER_PAGE    => 25,
-											   CUR_ST_VAL  => $this->first,
-											   L_SINGLE    => "",
-											   L_MULTI     => $ibforums->lang['search_pages'],
-											   BASE_URL    => $this->base_url."act=Search&CODE=getactive&searchid=$unique_id",
-											 )
-									  );
-									  
-		
-		
-		$this->output .= $this->html->active_start( array( 'SHOW_PAGES' => $links ) );
-		
-		// Regex in our selected values.
-		
-		$this->output = preg_replace( "/(<option value='s".$ibforums->input['st_day']."')/" , "\\1 selected", $this->output );
-		$this->output = preg_replace( "/(<option value='e".$ibforums->input['end_day']."')/", "\\1 selected", $this->output );
-		
-		$DB->query("SELECT t.*, f.id as forum_id, f.name as forum_name
-		             FROM ibf_topics t, ibf_forums f
-		            WHERE t.tid IN($topic_string) and f.id=t.forum_id
-		            ORDER BY ".$this->sort_key." ".$this->sort_order." LIMIT 0,25");
-		
-		while ( $row = $DB->fetch_row() )
-		{
-			$row['keywords'] = $url_words;
-			$this->output .= $this->html->RenderRow( $this->parse_entry($row) );
-		
-		}
-		
-		$this->page_title = $ibforums->lang['search_results'];
-		$this->nav        = array( "<a href='{$this->base_url}act=Search'>{$ibforums->lang['search_form']}</a>", $ibforums->lang['search_title'] );
-		
-		$this->output .= $this->html->end( array( 'SHOW_PAGES' => $links ) );
-		
-	}
-    
-    
-    
-    
-    
-	function parse_entry($topic, $view_as_post=0) {
-		global $DB, $std, $ibforums;
-		
-		$topic['last_text']   = $ibforums->lang[last_post_by];
-		
-		$topic['last_poster'] = ($topic['last_poster_id'] != 0)
-								? "<b><a href='{$this->base_url}showuser={$topic['last_poster_id']}'>{$topic['last_poster_name']}</a></b>"
-								: "-".$topic['last_poster_name']."-";
-								
-		$topic['starter']     = ($topic['starter_id']     != 0)
-								? "<a href='{$this->base_url}showuser={$topic['starter_id']}'>{$topic['starter_name']}</a>"
-								: "-".$topic['starter_name']."-";
-	 
-		if ($topic['poll_state'])
-		{
-			$topic['prefix']     = $ibforums->vars['pre_polls'].' ';
-		}
-	
-		$topic['folder_img']     = $std->folder_icon($topic, "", $this->read_array[$topic['tid']]);
-		
-		$topic['topic_icon']     = $topic['icon_id']  ? '<img src="'.$ibforums->vars['img_url'] . '/icon' . $topic['icon_id'] . '.gif" border="0" alt="">'
-													  : '&nbsp;';
-															  
-		if ($topic['pinned'])
-		{
-			$topic['topic_icon'] = "<{B_PIN}>";
-			$topic['prefix']     = $ibforums->vars['pre_pinned'];
-		}
-		
-		$topic['topic_start_date'] = $std->get_date( $topic['start_date'], 'LONG' );
-	
-	
-		$pages = 1;
-		
-		if ($topic['posts'])
-		{
-			if ( (($topic['posts'] + 1) % $ibforums->vars['display_max_posts']) == 0 )
-			{
-				$pages = ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'];
-			}
-			else
-			{
-				$number = ( ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'] );
-				$pages = ceil( $number);
-			}
-			
-		}
-		
-		if ($pages > 1)
-		{
-			$topic['PAGES'] = "<span class='small'>({$ibforums->lang['topic_sp_pages']} ";
-			for ($i = 0 ; $i < $pages ; ++$i ) {
-				$real_no = $i * $ibforums->vars['display_max_posts'];
-				$page_no = $i + 1;
-				if ($page_no == 4) {
-					$topic['PAGES'] .= "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;st=" . ($pages - 1) * $ibforums->vars['display_max_posts'] . "&hl={$topic['keywords']}'>...$pages </a>";
-					break;
-				} else {
-					$topic['PAGES'] .= "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;st=$real_no&amp;hl={$topic['keywords']}'>$page_no </a>";
-				}
-			}
-			$topic['PAGES'] .= ")</span>";
-		}
-		
-		if ($topic['posts'] < 0) $topic['posts'] = 0;
-		
-		$last_time = $this->read_array[ $topic['tid'] ] > $ibforums->input['last_visit'] ? $this->read_array[ $topic['tid'] ] : $ibforums->input['last_visit'];
-		
-		if ($last_time  && ($topic['last_post'] > $last_time))
-		{
-			$topic['go_last_page'] = "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;view=getlastpost'><{GO_LAST_ON}></a>";
-			$topic['go_new_post']  = "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;view=getnewpost'><{NEW_POST}></a>";
-		
-		}
-		else
-		{
-			$topic['go_last_page'] = "<a href='{$this->base_url}showtopic={$topic['tid']}&amp;view=getlastpost'><{GO_LAST_OFF}></a>";
-			$topic['go_new_post']  = "";
-		}
-		
-		// Do the quick goto last page icon stuff
-		
-		$maxpages = ($pages - 1) * $ibforums->vars['display_max_posts'];
-		if ($maxpages < 0) $maxpages = 0;
-		
-		$topic['last_post']  = $std->get_date($topic['last_post'], 'LONG');
-			
-		if ($topic['state'] == 'link')
-		{
-			$t_array = explode("&", $topic['moved_to']);
-			$topic['tid']       = $t_array[0];
-			$topic['forum_id']  = $t_array[1];
-			$topic['title']     = $topic['title'];
-			$topic['views']     = '--';
-			$topic['posts']     = '--';
-			$topic['prefix']    = $ibforums->vars['pre_moved']." ";
-			$topic['go_new_post'] = "";
-		}
-		
-		if ($topic['pinned'] == 1)
-		{
-			$topic['prefix']     = $ibforums->vars['pre_pinned'];
-			$topic['topic_icon'] = "<{B_PIN}>";
-			
-		}
-		
-		if ($view_as_post == 1)
-		{
-			if ( $ibforums->vars['search_post_cut'] )
-			{
-				$topic['post'] = substr( $this->parser->unconvert($topic['post'] ), 0, $ibforums->vars['search_post_cut']) . '...';
-				$topic['post'] = str_replace( "\n", "<br />", $topic['post'] );
-			}
-			
-			if ($topic['author_id'])
-			{
-				$topic['author_name'] = "<b><a href='{$this->base_url}showuser={$topic['author_id']}'>{$topic['author_name']}</a></b>";
-			}
-			
-			// Highlighting?
-			
-			if ($topic['keywords'])
-			{
-			
-				$keywords = str_replace( "+", " ", $topic['keywords'] );
-				
-				if ( preg_match("/,(and|or),/i", $keywords) )
-				{
-					while ( preg_match("/,(and|or),/i", $keywords, $match) )
-					{
-						$word_array = explode( ",".$match[1].",", $keywords );
-						
-						if (is_array($word_array))
-						{
-							foreach ($word_array as $keywords)
-							{
-								$topic['post'] = preg_replace( "/(^|\s)(".preg_quote($keywords, "/").")(\s|$)/i", "\\1<span class='searchlite'>\\2</span>\\3", $topic['post'] );
-							}
-						}
-					}
-				}
-				else
-				{
-					$topic['post'] = preg_replace( "/(^|\s)(".preg_quote($keywords, "/").")(\s|,|$)/i", "\\1<span class='searchlite'>\\2</span>\\3", $topic['post'] );
-				}
-			}
-		}
-		
-		$topic['posts'] = $std->do_number_format($topic['posts']);
-		$topic['views'] = $std->do_number_format($topic['views']);
-		return $topic;
-	}
-        
-     
-        
-    function filter_keywords($words="", $name=0) {
-    
-    	// force to lowercase and swop % into a safer version
-    	
-    	$words = trim( strtolower( str_replace( "%", "\\%", $words) ) );
-    	
-    	// Remove trailing boolean operators
-    	
-    	$words = preg_replace( "/\s+(and|or)$/" , "" , $words );
-    	
-    	// Swop wildcard into *SQL percent
-    	
-    	//$words = str_replace( "*", "%", $words );
-    	
-    	// Make safe underscores
-    	
-    	$words = str_replace( "_", "\\_", $words );
-    	
-    	$words = str_replace( '|', "&#124;", $words );
-    	
-    	// Remove crap
-    	
-    	if ($name == 0)
-    	{
-    		$words = preg_replace( "/[\|\[\]\{\}\(\)\,:\\\\\/\"']|&quot;/", "", $words );
-    	}
-    	
-    	// Remove common words..
-    	
-    	$words = preg_replace( "/^(?:img|quote|code|html|javascript|a href|color|span|div)$/", "", $words );
-    	
-    	return " ".preg_quote($words)." ";
-    }
-    
-    
-    function filter_ftext_keywords($words="") {
-    
-    	// force to lowercase and swop % into a safer version
-    	
-    	$words = trim($words);
-    	$words = str_replace( '|', "&#124;", $words );
-    	
-    	// Remove crap
-    	
-    	$words = str_replace( "&quot;", '"', $words );
-    	//$words = str_replace( "&lt;"  , "<", $words );
-    	$words = str_replace( "&gt;"  , ">", $words );
-    	$words = str_replace( "%"     , "" , $words );
-    	
-    	// Remove common words..
-    	
-    	$words = preg_replace( "/^(?:img|quote|code|html|javascript|a href|color|span|div)$/", "", $words );
-    	
-    	return $words;
-    
-    }
-    
-    //------------------------------------------------------
-    // Make the hl words nice and stuff
-    //------------------------------------------------------
-    
-    function convert_highlite_words($words="")
-    {
-    	$words = trim(urldecode($words));
-    	
-    	// Convert booleans to something easy to match next time around
-    	
-    	$words = preg_replace("/\s+(and|or)(\s+|$)/i", ",\\1,", $words);
-    	
-    	// Convert spaces to plus signs
-    	
-    	$words = preg_replace("/\s/", "+", $words);
-    	
-    	return $words;
-    }
-        
-    //------------------------------------------------------
-    // Get the searchable forums
-    //------------------------------------------------------    
-        
-    function get_searchable_forums()
-    {
-    	global $ibforums, $DB, $std, $HTTP_POST_VARS;
-    	
-    	$forum_array  = array();
-    	$forum_string = "";
-    	$sql_query    = "";
-    	$check_sub    = 0;
-    	
-    	$cats         = array();
-    	$forums       = array();
-    	
-    	// If we have an array of "forums", loop
-    	// through and build our *SQL IN( ) statement.
-    	
-    	//------------------------------------------------
-    	// Check for an array
-    	//------------------------------------------------
-    	
-    	if ( is_array( $HTTP_POST_VARS['forums'] )  )
-    	{
-    	
-    		if ( in_array( 'all', $HTTP_POST_VARS['forums'] ) )
-    		{
-    			//--------------------------------------------
-    			// Searching all forums..
-    			//--------------------------------------------
-    			
-    			$sql_query = "SELECT c.state, f.id, f.read_perms, f.password FROM ibf_forums f, ibf_categories c WHERE c.id=f.category AND c.state <> 0";
-    		
-    		}
-    		else
-    		{
-				//--------------------------------------------
-				// Go loopy loo
-				//--------------------------------------------
-				
-				foreach( $HTTP_POST_VARS['forums'] as $l )
-				{
-					if ( preg_match( "/^c_/", $l ) )
-					{
-						$cats[] = intval( str_replace( "c_", "", $l ) );
-					}
-					else
-					{
-						$forums[] = intval($l);
-					}
-				}
-				
-				//--------------------------------------------
-				// Do we have cats? Give 'em to Charles!
-				//--------------------------------------------
-				
-				if ( count( $cats ) )
-				{
-					$sql_query = "SELECT id, read_perms, password, subwrap from ibf_forums WHERE category IN(".implode(",",$cats).")";
-					$boolean   = "OR";
-				}
-				else
-				{
-					$sql_query = "SELECT id, read_perms, password, subwrap from ibf_forums";
-					$boolean   = "WHERE";
-				}
-				
-				if ( count( $forums ) )
-				{
-					if ($ibforums->input['searchsubs'] == 1)
-					{
-						$sql_query .= " $boolean (id IN(".implode(",",$forums).") or parent_id IN(".implode(",",$forums).") )";
-					}
-					else
-					{
-						$sql_query .= " $boolean id IN(".implode(",",$forums).")";
-					}
-				}
-				
-				if ( $sql_query == "" )
-				{
-					// Return empty..
-					
-					return;
-				}
-    		}
-    		
-    		//--------------------------------------------
-    		// Run query and finish up..
-    		//--------------------------------------------
-			
-			$DB->query( $sql_query );
-				
-			while ($i = $DB->fetch_row())
-			{
-				if ( $this->check_access($i) )
-				{
-					$forum_array[] = $i['id'];
-				}
-			}
-		}
-		else
-		{
-			//--------------------------------------------
-			// Not an array...
-			//--------------------------------------------
-			
-			if ( $ibforums->input['forums'] == 'all' )
-			{
-				$DB->query("SELECT c.state, f.id, f.read_perms, f.password FROM ibf_forums f, ibf_categories c WHERE c.id=f.category AND c.state <> 0");
-				
-				while ($i = $DB->fetch_row())
-				{
-					if ( $this->check_access($i) )
-					{
-						$forum_array[] = $i['id'];
-					}
-				}
-			}
-			else
-			{
-				if ( $ibforums->input['forums'] != "" )
-				{
-					$l = $ibforums->input['forums'];
-					
-					//--------------------------------------------
-					// Single  Cat
-					//--------------------------------------------
-					
-					if ( preg_match( "/^c_/", $l ) )
-					{
-						$c = intval( str_replace( "c_", "", $l ) );
-						
-						if ($c)
-						{
-							$DB->query("SELECT id, read_perms, password FROM ibf_forums WHERE category=$c");
-							
-							while ($i = $DB->fetch_row())
-							{
-								if ( $this->check_access($i) )
-								{
-									$forum_array[] = $i['id'];
-								}
-							}
-						}
-					}
-					else
-					{
-						//--------------------------------------------
-						// Single forum
-						//--------------------------------------------
-					
-						$f = intval($l);
-						
-						if ($f)
-						{
-							$qe = ($ibforums->input['searchsubs'] == 1) ? " OR parent_id=$f " : "";
-							
-							$DB->query("SELECT id, read_perms, password FROM ibf_forums WHERE id=$f".$qe);
-							
-							while ($i = $DB->fetch_row())
-							{
-								if ( $this->check_access($i) )
-								{
-									$forum_array[] = $i['id'];
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-    					
-    	$forum_string = implode( "," , $forum_array );
-    	
-    	return $forum_string;
-    	
-    }
-        
-    
-    function check_access($i)
-    {
-    	global $std, $ibforums;
-    	
-    	$can_read = TRUE;
-        
-        if ($i['password'] != "")
-		{
-			if ( ! $c_pass = $std->my_getcookie('iBForum'.$i['id']) )
-			{
-				$can_read = FALSE;
-			}
-		
-			if ( $c_pass == $i['password'] )
-			{
-				$can_read = TRUE;
-			}
-			else
-			{
-				$can_read = FALSE;
-			}
-		}
-		
-		if ($can_read == TRUE)
-		{
-			if ( $std->check_perms($i['read_perms']) == TRUE )
-			{
-				$can_read = TRUE;
-			}
-			else
-			{
-				$can_read = FALSE;
-			}
-		}
-		
-		return $can_read;
-	}
-        
-}
-
-?>
diff --git a/upload/sources/Topics.php b/upload/sources/Topics.php
deleted file mode 100644
index c1cb2cbf..00000000
--- a/upload/sources/Topics.php
+++ /dev/null
@@ -1,1795 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Topic display module
-|   > Module written by Matt Mecham
-|   > Date started: 18th February 2002
-|
-|	> Module Version Number: 1.1.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Topics;
-
-class Topics {
-
-    var $output    = "";
-    var $base_url  = "";
-    var $html      = "";
-    var $moderator = array();
-    var $forum     = array();
-    var $topic     = array();
-    var $category  = array();
-    var $mem_titles = array();
-    var $mod_action = array();
-    var $poll_html  = "";
-    var $colspan    = 0;
-    var $parser     = "";
-    var $mimetypes  = "";
-    var $nav_extra  = "";
-    var $read_array = array();
-    var $mod_panel_html = "";
-    var $warn_range = 0;
-    var $warn_done  = 0;
-    var $pfields    = array();
-    var $pfields_dd = array();
-    var $md5_check  = "";
-    
-    /***********************************************************************************/
-	//
-	// Our constructor, load words, load skin, print the topic listing
-	//
-	/***********************************************************************************/
-    
-    function Topics()
-    {
-    
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
-        $this->md5_check = $std->return_md5_check();
-         
-        //-------------------------------------
-		// Compile the language file
-		//-------------------------------------
-		
-        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_topic', $ibforums->lang_id);
-
-        $this->html     = $std->load_template('skin_topic');
-        
-        require ROOT_PATH."sources/lib/post_parser.php";
-        
-        $this->parser = new post_parser();
-        
-        //-------------------------------------
-        // Check the input
-        //-------------------------------------
-        
-        $ibforums->input['t'] = intval($ibforums->input['t']);
-        
-		if ( $ibforums->input['t'] < 0  )
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-		}
-		
-		
-        //-------------------------------------
-        // Get the forum info based on the forum ID,
-        // get the category name, ID, and get the topic details
-        //-------------------------------------
-        
-        if ( ! $ibforums->topic_cache['tid'] )
-        {
-			$DB->query("SELECT t.*, f.topic_mm_id, f.name as forum_name, f.quick_reply, f.id as forum_id, f.read_perms, f.reply_perms, f.parent_id, f.use_html,
-							   f.start_perms, f.allow_poll, f.password, f.posts as forum_posts, f.topics as forum_topics, f.upload_perms,
-							   f.show_rules, f.rules_text, f.rules_title,
-							   c.name as cat_name, c.id as cat_id
-						FROM ibf_topics t, ibf_forums f , ibf_categories c where t.tid=".$ibforums->input['t']." and f.id = t.forum_id and f.category=c.id");
-			
-			$this->topic = $DB->fetch_row();
-        }
-        else
-        {
-        	$this->topic = $ibforums->topic_cache;
-        }
-        
-        $this->forum = array( 'id'           => $this->topic['forum_id']          ,
-        					  'name'         => $this->topic['forum_name']        ,
-        					  'posts'        => $this->topic['forum_posts']       ,
-        					  'topics'       => $this->topic['forum_topics']      ,
-        					  'read_perms'   => $this->topic['read_perms']        ,
-        					  'reply_perms'  => $this->topic['reply_perms']       , 
-        					  'allow_poll'   => $this->topic['allow_poll']        ,
-        					  'upload_perms' => $this->topic['upload_perms']      ,
-        					  'parent_id'    => $this->topic['parent_id']         ,
-        					  'password'     => $this->topic['password']          ,
-        					  'quick_reply'  => $this->topic['quick_reply']       ,
-        					  'use_html'     => $this->topic['use_html']          ,
-        					  'topic_mm_id'  => $this->topic['topic_mm_id']       
-        					);
-        					
-        $this->category = array( 'name'   => $this->topic['cat_name'],
-        						 'id'     => $this->topic['cat_id']  ,
-        				       );
-        				       
-        $ibforums->input['f'] = $this->forum['id'];
-        
-        //-------------------------------------
-        // Error out if we can not find the forum
-        //-------------------------------------
-        
-        if (!$this->forum['id'])
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'is_broken_link') );
-        }
-        
-        //-------------------------------------
-        // Error out if we can not find the topic
-        //-------------------------------------
-        
-        if (!$this->topic['tid'])
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'is_broken_link') );
-        }
-        
-        //-------------------------------------
-        // Error out if the topic is not approved
-        //-------------------------------------
-        
-        if ($this->topic['approved'] != 1)
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-        }
-        
-        //-------------------------------------
-        // If this forum is a link, then 
-        // redirect them to the new location
-        //-------------------------------------
-        
-        if ($this->topic['state'] == 'link')
-        {
-        	$f_stuff = explode("&", $this->topic['moved_to']);
-        	$print->redirect_screen( $ibforums->lang['topic_moved'], "showtopic={$f_stuff[0]}" );
-        }
-        
-        //-------------------------------------
-        // Unserialize the read array and parse into
-        // array
-        //-------------------------------------
-        
-        if ( $read = $std->my_getcookie('topicsread') )
-        {
-        	$this->read_array = unserialize(stripslashes($read));
-        	
-        	if (! is_array($this->read_array) )
-        	{
-        		$this->read_array = array();
-        	}
-        }
-        
-        //--------------------------------------------------------------------
-        // Are we looking for an older / newer topic?
-        //--------------------------------------------------------------------
-        
-        if ( isset($ibforums->input['view']) )
-        {
-        	if ($ibforums->input['view'] == 'new')
-        	{
-        		$DB->query("SELECT * from ibf_topics WHERE forum_id=".$this->forum['id']." AND approved=1 AND state <> 'link' AND last_post > ".$this->topic['last_post']." "
-        		          ."ORDER BY last_post ASC LIMIT 0,1");
-        		          
-        		if ( $DB->get_num_rows() )
-        		{
-        			$this->topic = $DB->fetch_row();
-        			$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']);
-        			//$ibforums->input['t'] = $this->topic['tid'];
-        		}
-        		else
-        		{
-        			$std->Error( array( LEVEL => 1, MSG => 'no_newer') );
-        		}
-        	}
-        	else if ($ibforums->input['view'] == 'old')
-        	{
-        		$DB->query("SELECT * from ibf_topics WHERE forum_id=".$this->forum['id']." AND approved=1 AND state <> 'link' AND last_post < ".$this->topic['last_post']." "
-        		          ."ORDER BY last_post DESC LIMIT 0,1");
-        		          
-        		if ( $DB->get_num_rows() )
-        		{
-        			$this->topic = $DB->fetch_row();
-        			$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']);
-        			//$ibforums->input['t'] = $this->topic['tid'];
-        		}
-        		else
-        		{
-        			$std->Error( array( LEVEL => 1, MSG => 'no_older') );
-        		}
-        	}
-        	else if ($ibforums->input['view'] == 'getlastpost')
-        	{
-        		
-        		$this->return_last_post();
-				
-			}
-			else if ($ibforums->input['view'] == 'getnewpost')
-			{
-				
-				$st  = 0;
-				$pid = "";
-				
-				$last_time = isset($this->read_array[ $this->topic['tid'] ]) ? $this->read_array[ $this->topic['tid'] ] : $ibforums->input['last_visit'];
-			
-				$DB->query("SELECT pid, post_date FROM ibf_posts WHERE queued <> 1 AND topic_id='".$this->topic['tid']."' AND post_date > '".$last_time."' ORDER BY post_date LIMIT 1");
-				
-				if ( $post = $DB->fetch_row() )
-				{
-				
-					$pid = "&#entry".$post['pid'];
-				
-					$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE topic_id='".$this->topic['tid']."' AND pid <= '".$post['pid']."'");
-					
-					$cposts = $DB->fetch_row();
-					
-					if ( (($cposts['posts']) % $ibforums->vars['display_max_posts']) == 0 )
-					{
-						$pages = ($cposts['posts']) / $ibforums->vars['display_max_posts'];
-					}
-					else
-					{
-						$number = ( ($cposts['posts']) / $ibforums->vars['display_max_posts'] );
-						$pages = ceil( $number);
-					}
-					
-					$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
-					
-					$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&st=$st".$pid);
-					exit();
-				}
-				else
-				{
-					$this->return_last_post();
-				}
-			}
-			else if ($ibforums->input['view'] == 'findpost')
-			{
-				$pid = intval($ibforums->input['p']);
-				
-				if ( $pid > 0 )
-				{
-					$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE topic_id='".$this->topic['tid']."' AND pid <= '".$pid."'");
-					
-					$cposts = $DB->fetch_row();
-					
-					if ( (($cposts['posts']) % $ibforums->vars['display_max_posts']) == 0 )
-					{
-						$pages = ($cposts['posts']) / $ibforums->vars['display_max_posts'];
-					}
-					else
-					{
-						$number = ( ($cposts['posts']) / $ibforums->vars['display_max_posts'] );
-						$pages = ceil( $number);
-					}
-					
-					$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
-					
-					$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&st=$st"."&#entry".$pid);
-					exit();
-				}
-				else
-				{
-					$this->return_last_post();
-				}
-			}
-		}
-        
-        $this->base_url = $ibforums->base_url;
-        
-		$this->forum['JUMP'] = $std->build_forum_jump();
-		
-        //-------------------------------------
-        // Check viewing permissions, private forums,
-        // password forums, etc
-        //-------------------------------------
-        
-        if ( (!$this->topic['pinned']) and ( ( ! $ibforums->member['g_other_topics'] ) AND ( $this->topic['starter_id'] != $ibforums->member['id'] ) ) )
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
-        }
-        
-        $bad_entry = $this->check_access();
-        
-        if ($bad_entry == 1)
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
-        }      
-        
-        //-------------------------------------
-        // Update the topic views counter
-        //-------------------------------------
-        
-        $DB->query("UPDATE ibf_topics SET views=views+1 WHERE tid='".$this->topic['tid']."'");
-        
-        //-------------------------------------
-        // Update the topic read cookie
-        //-------------------------------------
-        
-        if ($ibforums->member['id'])
-        {
-			$this->read_array[$this->topic['tid']] = time();
-			
-			$std->my_setcookie('topicsread', serialize($this->read_array), -1 );
-        }
-        
-        //----------------------------------------
-        // If this is a sub forum, we need to get
-        // the cat details, and parent details
-        //----------------------------------------
-        
-        if ($this->forum['parent_id'] > 0)
-        {
-        
-        	$DB->query("SELECT f.id as forum_id, f.name as forum_name, c.id, c.name FROM ibf_forums f, ibf_categories c WHERE f.id=".$this->forum['parent_id']." AND c.id=f.category");
-        	
-        	$row = $DB->fetch_row();
-        	
-        	$this->category['id']   = $row['id'];
-        	$this->category['name'] = $row['name'];
-        
-        	$this->nav_extra = "<a href='".$this->base_url."showforum={$row['forum_id']}'>{$row['forum_name']}</a>";
-        }
-        
-        
- 		//-------------------------------------
- 		// Get all the member groups and
- 		// member title info
- 		//-------------------------------------
-        
-        $DB->query("SELECT id, title, pips, posts from ibf_titles ORDER BY posts DESC");
-        while ($i = $DB->fetch_row())
-        {
-         	$this->mem_titles[ $i['id'] ] = array(
-												 'TITLE' => $i['title'],
-												 'PIPS'  => $i['pips'],
-												 'POSTS' => $i['posts'],
-											   );
-        }
-        
-        //-------------------------------------
-        // Are we a moderator?
-        //-------------------------------------
-		
-		if ( ($ibforums->member['id']) and ($ibforums->member['g_is_supmod'] != 1) )
-		{
-			$DB->query("SELECT * FROM ibf_moderators WHERE forum_id=".$this->forum['id']." AND (member_id=".$ibforums->member['id']." OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))");
-			$this->moderator = $DB->fetch_row();
-		}
-		
-		$this->mod_action = array( 'CLOSE_TOPIC'  => '00',
-								   'OPEN_TOPIC'   => '01',
-								   'MOVE_TOPIC'   => '02',
-								   'DELETE_TOPIC' => '03',
-								   'EDIT_TOPIC'   => '05',
-								   'PIN_TOPIC'    => '15',
-								   'UNPIN_TOPIC'  => '16',
-								   'UNSUBBIT'     => '30',
-								   'SPLIT_TOPIC'  => '50',
-								   'MERGE_TOPIC'  => '60',
-								   'TOPIC_HISTORY' => '90',
-								 );
-		
-		
-		//-------------------------------------
-        // Get the reply, and posting buttons
-        //------------------------------------- 
-        
-        $this->topic['POLL_BUTTON'] = $this->forum['allow_poll']
-										 ? "<a href='".$this->base_url."act=Post&amp;CODE=10&amp;f=".$this->forum['id']."'><{A_POLL}></a>"
-										 : '';
-										 
-		$this->topic['REPLY_BUTTON']  = $this->reply_button();
-		
-		
-		//-------------------------------------
-		// Generate the forum page span links
-		//-------------------------------------
-		
-		if ($ibforums->input['hl'])
-		{
-			$hl = '&amp;hl='.$ibforums->input['hl'];
-		}
-		
-		$this->topic['SHOW_PAGES']
-			= $std->build_pagelinks( array( 'TOTAL_POSS'  => ($this->topic['posts']+1),
-											'PER_PAGE'    => $ibforums->vars['display_max_posts'],
-											'CUR_ST_VAL'  => $ibforums->input['st'],
-											'L_SINGLE'    => "",
-											'BASE_URL'    => $this->base_url."showtopic=".$this->topic['tid'].$hl,
-										  )
-								   );
-								   
-		if ( ($this->topic['posts'] + 1) > $ibforums->vars['display_max_posts'])
-		{
-			$this->topic['go_new'] = $this->html->golastpost_link($this->forum['id'], $this->topic['tid'] );
-		}
-								   
-		
-		//-------------------------------------
-		// Fix up some of the words
-		//-------------------------------------
-		
-		$this->topic['TOPIC_START_DATE'] = $std->get_date( $this->topic['start_date'], 'LONG' );
-		
-		$ibforums->lang['topic_stats'] = preg_replace( "/<#START#>/", $this->topic['TOPIC_START_DATE'], $ibforums->lang['topic_stats']);
-		$ibforums->lang['topic_stats'] = preg_replace( "/<#POSTS#>/", $this->topic['posts']           , $ibforums->lang['topic_stats']);
-		
-		if ($this->topic['description'])
-		{
-			$this->topic['description'] = ', '.$this->topic['description'];
-		}
-		
-
-		//-------------------------------------
-		// Render the page top
-		//-------------------------------------
-		
-		$this->output .= $this->html->PageTop( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
-		
-		//-------------------------------------
-		// Do we have a poll?
-		//-------------------------------------
-		
-		if ($this->topic['poll_state'])
-		{
-			$this->output = str_replace( "<!--{IBF.POLL}-->", $this->parse_poll(), $this->output );
-		}
-		else
-		{
-			// Can we start a poll? Is this our topic and is it still open?
-			
-			if ( $this->topic['state'] != "closed" AND $ibforums->member['id'] AND $ibforums->member['g_post_polls'] AND $this->forum['allow_poll'] )
-			{
-				if ( 
-					 ( ($this->topic['starter_id'] == $ibforums->member['id']) AND ($ibforums->vars['startpoll_cutoff'] > 0) AND ( $this->topic['start_date'] + ($ibforums->vars['startpoll_cutoff'] * 3600) > time() ) )
-					 OR ( $ibforums->member['g_is_supmod'] == 1 )
-				   )
-				{
-					$this->output = str_replace( "<!--{IBF.START_NEW_POLL}-->", $this->html->start_poll_link($this->forum['id'], $this->topic['tid']), $this->output );
-				}
-			}
-		}
-		
-		//--------------------------------------------
-		// Extra queries?
-		//--------------------------------------------
-		
-		$join_profile_query = "";
-		$join_get_fields    = "";
-		
-		if ( $ibforums->vars['custom_profile_topic'] == 1 )
-		{
-			//--------------------------------------------
-			// Get the data for the profile fields
-			//--------------------------------------------
-			
-			$DB->query("SELECT fid, ftype, fhide, fcontent FROM ibf_pfields_data");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$this->pfields['field_'.$r['fid']] = $r;
-				
-				if ( $r['ftype'] == 'drop' )
-				{
-					foreach( explode( '|', $r['fcontent'] ) as $i )
-					{
-						list($k, $v) = explode( '=', $i, 2 );
-						
-						$this->pfields_dd['field_'.$r['fid']][$k] = $v;
-					}
-				}
-			}
-		
-			$join_profile_query = "LEFT JOIN ibf_pfields_content pc ON (pc.member_id=p.author_id)";
-			$join_get_fields    = ", pc.*";
-		}
-		
-		//--------------------------------------------
-		// Grab the posts we'll need
-		//--------------------------------------------
-		
-		$first = intval($ibforums->input['st']);
-		
-		if ( $ibforums->vars['post_order_column'] != 'post_date' )
-		{
-			$ibforums->vars['post_order_column'] = 'pid';
-		}
-		
-		if ( $ibforums->vars['post_order_sort'] != 'desc' )
-		{
-			$ibforums->vars['post_order_sort'] = 'asc';
-		}
-		
-		//--------------------------------------------
-		// Optimized query?
-		// MySQL.com insists that forcing LEFT JOIN or
-		// STRAIGHT JOIN helps the query optimizer, so..
-		//--------------------------------------------
-		   
-		$DB->query( "SELECT p.*,
-				    m.id,m.name,m.mgroup,m.email,m.joined,m.avatar,m.avatar_size,m.posts,m.aim_name,m.icq_number,
-				    m.signature, m.website,m.yahoo,m.integ_msg,m.title,m.hide_email,m.msnname, m.warn_level, m.warn_lastwarn,
-				    g.g_id, g.g_title, g.g_icon, g.g_dohtml $join_get_fields
-				    FROM ibf_posts p
-				      LEFT JOIN ibf_members m ON (p.author_id=m.id)
-				      LEFT JOIN ibf_groups g ON (g.g_id=m.mgroup)
-				      $join_profile_query
-				    WHERE p.topic_id=".$this->topic['tid']." and p.queued != 1
-				    ORDER BY p.{$ibforums->vars['post_order_column']} {$ibforums->vars['post_order_sort']} LIMIT $first, ".$ibforums->vars['display_max_posts']);
-				    
-		if ( ! $DB->get_num_rows() )
-		{
-			if ($first >= $ibforums->vars['display_max_posts'])
-			{
-				// Get the correct number of replies...
-				
-				$newq = $DB->query("SELECT COUNT(pid) as pcount FROM ibf_posts p, ibf_members m WHERE p.topic_id=".$this->topic['tid']." and p.queued !=1 AND p.author_id=m.id");
-				$pcount = $DB->fetch_row($newq);
-				
-				$pcount['pcount'] = $pcount['pcount'] > 0 ? $pcount['pcount'] - 1 : 0;
-				
-				// Update the post table...
-				
-				if ($pcount['pcount'] > 1)
-				{
-					$DB->query("UPDATE ibf_topics SET posts=".$pcount['pcount']." WHERE tid='".$this->topic['tid']."'");
-				}
-				
-				$std->boink_it($ibforums->base_url."act=ST&f={$this->forum['id']}&t={$this->topic['tid']}&view=getlastpost");
-				exit();
-			}
-		}
-				
-				    
-		$cached_members = array();
-		
-		//-------------------------------------
-		// Format and print out the topic list
-		//-------------------------------------
-		
-		$post_count = 0;  // Use this as our master bater, er... I mean counter.
-		
-		while ( $row = $DB->fetch_row() )
-		{
-		
-			$poster = array();
-		
-			// Get the member info. We parse the data and cache it.
-			// It's likely that the same member posts several times in
-			// one page, so it's not efficient to keep parsing the same
-			// data
-			
-			if ($row['author_id'] != 0)
-			{
-				// Is it in the hash?
-				if ( isset($cached_members[ $row['author_id'] ]) )
-				{
-					// Ok, it's already cached, read from it
-					$poster = $cached_members[ $row['author_id'] ];
-					$row['name_css'] = 'normalname';
-				}
-				else
-				{
-					$row['name_css'] = 'normalname';
-					$poster = $this->parse_member( &$row );
-					// Add it to the cached list
-					$cached_members[ $row['author_id'] ] = $poster;
-				}
-			}
-			else
-			{
-				// It's definately a guest...
-				$poster = $std->set_up_guest( $row['author_name'] );
-				$row['name_css'] = 'unreg';
-			}
-			
-			//--------------------------------------------------------------
-			
-			$row['post_css'] = $post_count % 2 ? 'post1' : 'post2';
-			
-			
-			//--------------------------------------------------------------
-			
-			if ( ($row['append_edit'] == 1) and ($row['edit_time'] != "") and ($row['edit_name'] != "") )
-			{
-				$e_time = $std->get_date( $row['edit_time'] , 'LONG' );
-				
-				$row['post'] .= "<br /><br /><span class='edit'>".sprintf($ibforums->lang['edited_by'], $row['edit_name'], $e_time)."</span>";
-			}
-			
-			//--------------------------------------------------------------
-			
-			if (!$ibforums->member['view_img'])
-			{
-				// unconvert smilies first, or it looks a bit crap.
-				
-				$row['post'] = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $row['post'] );
-				
-				$row['post'] = preg_replace( "/<img src=[\"'](.+?)[\"'].+?".">/", "(IMG:<a href='\\1' target='_blank'>\\1</a>)", $row['post'] );
-			}
-			
-			//--------------------------------------------------------------
-			
-			if ($ibforums->input['hl'])
-			{
-				$keywords = str_replace( "+", " ", $ibforums->input['hl'] );
-				
-				if ( preg_match("/,(and|or),/i", $keywords) )
-				{
-					while ( preg_match("/,(and|or),/i", $keywords, $match) )
-					{
-						$word_array = explode( ",".$match[1].",", $keywords );
-						
-						if (is_array($word_array))
-						{
-							foreach ($word_array as $keywords)
-							{
-								$row['post'] = preg_replace( "/(^|\s)(".preg_quote($keywords, '/').")(\s|,|\.|!|<br|$)/is", "\\1<span class='searchlite'>\\2</span>\\3", $row['post'] );
-							}
-						}
-					}
-				}
-				else
-				{
-					while( preg_match( "/(^|\s)(".preg_quote($keywords, '/').")(\s|,|\.|!|<br|$)/i", $row['post'] ) )
-					{
-						$row['post'] = preg_replace( "/(^|\s)(".preg_quote($keywords, '/').")(\s|,|\.|!|<br|$)/is", "\\1<span class='searchlite'>\\2</span>\\3", $row['post'] );
-					}
-				}
-			}
-				
-			//--------------------------------------------------------------
-			
-			if ( ($post_count != 0 and $first == 0) or ($first > 0) )
-			{
-				$row['delete_button'] = $this->delete_button($row['pid'], $poster);
-			}
-			
-			
-			$row['edit_button']   = $this->edit_button($row['pid'], $poster, $row['post_date']);
-			$row['post_date']     = $std->get_date( $row['post_date'], 'LONG' );
-			$row['post_icon']     = $row['icon_id']
-							  ? "<img src='".$ibforums->vars['img_url']."/icon{$row['icon_id']}.gif' alt='' />&nbsp;&nbsp;"
-							  : "";
-			
-			$row['ip_address']  = $this->view_ip($row, $poster);
-			
-			$row['report_link'] = (($ibforums->vars['disable_reportpost'] != 1) and ( $ibforums->member['id'] ))
-							    ? $this->html->report_link($row)
-							    : "";
-			
-			//--------------------------------------------------------------
-							  
-			if ($row['attach_id'])
-			{
-				//----------------------------------------------------
-				// If we've not already done so, lets grab our mime-types
-				//----------------------------------------------------
-				
-				if ( !is_array($this->mimetypes) )
-				{
-					require "./conf_mime_types.php";
-					$this->mimetypes = $mime_types;
-					unset($mime_types);
-				}
-				
-				//----------------------------------------------------
-				// Is it an image, and are we viewing the image in the post?
-				//----------------------------------------------------
-				
-				if ( 
-					 ($ibforums->vars['show_img_upload'])
-					   and
-					 (
-					 	   $row['attach_type'] == 'image/gif'
-					 	or $row['attach_type'] == 'image/jpeg'
-					 	or $row['attach_type'] == 'image/pjpeg'
-					 	or $row['attach_type'] == 'image/x-png'
-					 	or $row['attach_type'] == 'image/png'
-					 )
-					)
-				{
-					if ( $ibforums->vars['siu_thumb'] AND $ibforums->vars['siu_width'] AND $ibforums->vars['siu_height'] )
-					{
-						//----------------------------------------------------
-						// Tom Thumb!
-						//----------------------------------------------------
-						
-						$img_size = array();
-						
-						$img_size = @GetImageSize( $ibforums->vars['upload_url']."/".$row['attach_id'] );
-						
-						if ( $img_size[0] < 1 )
-						{
-							$img_size    = array();
-							$img_size[0] = $ibforums->vars['siu_width'] + 1;
-							$img_size[1] = $ibforums->vars['siu_height']+ 1;
-						}
-						
-						//----------------------------------------------------
-						// Do we need to scale?
-						//----------------------------------------------------
-						
-						if ( ( $img_size[0] <= $ibforums->vars['siu_width'] ) AND ( $img_size[1] <= $ibforums->vars['siu_height'] ) )
-						{
-							$row['attachment'] = $this->html->Show_attachments_img( $row['attach_id'] );
-						}
-						else
-						{
-							$im = $std->scale_image( array(
-															'max_width'  => $ibforums->vars['siu_width'],
-															'max_height' => $ibforums->vars['siu_height'],
-															'cur_width'  => $img_size[0],
-															'cur_height' => $img_size[1]
-												   )      );
-												   
-							$row['attachment'] = $this->html->Show_attachments_img_thumb( $row['attach_id'], $im['img_width'], $im['img_height'], $row['pid'] );
-						}
-					}
-					else
-					{
-						//----------------------------------------------------
-						// Standard size..
-						//----------------------------------------------------
-						
-						$row['attachment'] = $this->html->Show_attachments_img( $row['attach_id'] );
-					}
-				}
-				else
-				{
-					//----------------------------------------------------
-					// Full attachment thingy
-					//----------------------------------------------------
-					
-					$row['attachment'] = $this->html->Show_attachments( array (
-																				'hits'  => $row['attach_hits'],
-																				'image' => $this->mimetypes[ $row['attach_type'] ][1],
-																				'name'  => $row['attach_file'],
-																				'pid'   => $row['pid'],
-																	  )  	  );
-				}
-			}
-			
-			//--------------------------------------------------------------
-			// Siggie stuff
-			//--------------------------------------------------------------
-			
-			$row['signature'] = "";
-			
-			if ($poster['signature'] and $ibforums->member['view_sigs'])
-			{
-				if ($row['use_sig'] == 1)
-				{
-					if ( $ibforums->vars['sig_allow_html'] == 1 )
-					{
-						$poster['signature'] = $this->parser->parse_html($poster['signature'], 0);
-					}
-					
-					if ( $ibforums->vars['post_wordwrap'] > 0 )
-					{
-						$poster['signature'] = $this->parser->my_wordwrap( $poster['signature'], $ibforums->vars['post_wordwrap']) ;
-					}
-					
-					$row['signature'] = $skin_universal->signature_separator($poster['signature']);
-				}
-			}
-			
-			//--------------------------------------------------------------
-			// Fix up the membername so it links to the members profile
-			//--------------------------------------------------------------
-			
-			if ($poster['id'])
-			{
-				$poster['name'] = "<a href='{$this->base_url}showuser={$poster['id']}'>{$poster['name']}</a>";
-			}
-			
-			//--------------------------------------------------------------
-			// Parse HTML tag on the fly
-			//--------------------------------------------------------------
-			
-			if ( $this->forum['use_html'] == 1 )
-			{
-				// So far, so good..
-				
-				if ( stristr( $row['post'], '[dohtml]' ) )
-				{
-					// [doHTML] tag found..
-					
-					$parse = ($this->forum['use_html'] AND $row['g_dohtml']) ? 1 : 0;
-					
-					$row['post'] = $this->parser->post_db_parse($row['post'], $parse );
-				}
-			}
-			
-			//--------------------------------------------------------------
-			// Do word wrap?
-			//--------------------------------------------------------------
-			
-			if ( $ibforums->vars['post_wordwrap'] > 0 )
-			{
-				$row['post'] = $this->parser->my_wordwrap( $row['post'], $ibforums->vars['post_wordwrap']) ;
-			}
-			
-			//--------------------------------------------------------------
-			// A bit hackish - but there are lots of <br> => <br /> changes to make
-			//--------------------------------------------------------------
-			
-			$row['post']      = str_replace( "<br>", "<br />", $row['post'] );
-			$row['signature'] = str_replace( "<br>", "<br />", $row['signature'] );
-			
-			$this->output .= $this->html->RenderRow( $row, $poster );
-			
-			$post_count++;
-				
-		}
-		
-		//-------------------------------------
-		// Print the footer
-		//-------------------------------------
-		
-		$this->output .= $this->html->TableFooter( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
-		
-		//+----------------------------------------------------------------
-		// Process users active in this forum
-		//+----------------------------------------------------------------
-		
-		if ($ibforums->vars['no_au_topic'] != 1)
-		{	
-			//+-----------------------------------------
-			// Get the users
-			//+-----------------------------------------
-			
-			$cut_off = ($ibforums->vars['au_cutoff'] != "") ? $ibforums->vars['au_cutoff'] * 60 : 900;
-			 
-			$time = time() - $cut_off;
-					   
-			$DB->query("SELECT s.member_id, s.member_name, s.login_type, s.location, g.suffix, g.prefix, g.g_perm_id, m.org_perm_id
-					    FROM ibf_sessions s
-					     LEFT JOIN ibf_groups g ON (g.g_id=s.member_group)
-					     LEFT JOIN ibf_members m on (s.member_id=m.id)
-					    WHERE s.in_topic={$this->topic['tid']}
-					    AND s.running_time > $time
-					     ORDER BY s.running_time DESC");
-			
-			//+-----------------------------------------
-			// Cache all printed members so we don't double print them
-			//+-----------------------------------------
-			
-			$cached = array();
-			$active = array( 'guests' => 0, 'anon' => 0, 'members' => 0, 'names' => "");
-			
-			while ($result = $DB->fetch_row() )
-			{
-				// Quick check
-				
-				$result['g_perm_id'] = $result['org_perm_id'] ? $result['org_perm_id'] : $result['g_perm_id'];
-				
-				if ( $this->forum['read_perms'] != '*' )
-				{
-					if ( $result['g_perm_id'] )
-					{
-						if ( ! preg_match("/(^|,)(".str_replace( ",", '|', $result['g_perm_id'] ).")(,|$)/", $this->forum['read_perms'] ) )
-						{
-							continue;
-						}
-					}
-					else
-					{
-						continue;
-					}
-				}
-				
-				if ($result['member_id'] == 0)
-				{
-					$active['guests']++;
-				}
-				else
-				{
-					if (empty( $cached[ $result['member_id'] ] ) )
-					{
-						$cached[ $result['member_id'] ] = 1;
-						
-						if ($result['login_type'] == 1)
-						{
-							if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
-							{
-								$active['names'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*, ";
-								$active['anon']++;
-							}
-							else
-							{
-								$active['anon']++;
-							}
-						}
-						else
-						{
-							$active['members']++;
-							$active['names'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>, ";
-						}
-					}
-				}
-			}
-			
-			$active['names'] = preg_replace( "/,\s+$/", "" , $active['names'] );
-			
-			$ibforums->lang['active_users_title']   = sprintf( $ibforums->lang['active_users_title']  , ($active['members'] + $active['guests'] + $active['anon'] ) );
-			$ibforums->lang['active_users_detail']  = sprintf( $ibforums->lang['active_users_detail'] , $active['guests'],$active['anon'] );
-			$ibforums->lang['active_users_members'] = sprintf( $ibforums->lang['active_users_members'], $active['members'] );
-			
-			
-			$this->output = str_replace( "<!--IBF.TOPIC_ACTIVE-->", $this->html->topic_active_users($active), $this->output );
-		
-		}
-	
-		//+----------------------------------------------------------------
-		// Print it
-		//+----------------------------------------------------------------
-		
-		$this->output = str_replace( "<!--IBF.MOD_PANEL-->", $this->moderation_panel(), $this->output );
-		
-		// Enable quick reply box?
-		
-		if (   ( $this->topic['quick_reply'] == 1 )
-		   and ( $std->check_perms( $this->topic['reply_perms']) == TRUE )
-		   and ( $this->topic['state'] != 'closed' ) )
-		{
-			$show = "none";
-			
-			$sqr = $std->my_getcookie("open_qr");
-			
-			if ( $sqr == 1 )
-			{
-				$show = "show";
-			}
-			$this->output = str_replace( "<!--IBF.QUICK_REPLY_CLOSED-->", $this->html->quick_reply_box_closed(), $this->output );
-			$this->output = str_replace( "<!--IBF.QUICK_REPLY_OPEN-->"  , $this->html->quick_reply_box_open($this->topic['forum_id'], $this->topic['tid'], $show, $this->md5_check), $this->output );
-		}
-		
-		$this->output = str_replace( "<!--IBF.TOPIC_OPTIONS_CLOSED-->", $this->html->topic_opts_closed(), $this->output );
-		$this->output = str_replace( "<!--IBF.TOPIC_OPTIONS_OPEN-->"  , $this->html->topic_opts_open($this->topic['forum_id'], $this->topic['tid']), $this->output );
-		
-		$this->topic['id'] = $this->topic['forum_id'];
-		
-		$this->output = str_replace( "<!--IBF.FORUM_RULES-->", $std->print_forum_rules($this->topic), $this->output );
-		
-		//+----------------------------------------------------------------
-		// Topic multi-moderation - yay!
-		//+----------------------------------------------------------------
-		
-		$this->output = str_replace( "<!--IBF.MULTIMOD-->", $this->multi_moderation(), $this->output );
-		
-		// Pass it to our print routine
-		
-		$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> {$this->topic['title']}",
-        					 	  'JS'       => 1,
-        					 	  'NAV'      => array( 
-        					 	  					   "<a href='".$this->base_url."act=SC&amp;c={$this->category['id']}'>{$this->category['name']}</a>",
-        					 	  					   $this->nav_extra,
-        					 	  					   "<a href='".$this->base_url."showforum={$this->forum['id']}'>{$this->forum['name']}</a>",
-        					 	  					 ),
-        					  ) );
-				        
-	}
-	
-	//--------------------------------------------------------------
-	// Parse the member info
-	//--------------------------------------------------------------
-	
-	function parse_member($member=array()) {
-		global $ibforums, $std, $DB;
-	
-		$member['avatar'] = $std->get_avatar( $member['avatar'], $ibforums->member['view_avs'], $member['avatar_size'] );
-		
-		$pips = 0;
-		
-		foreach($this->mem_titles as $k => $v)
-		{
-			if ($member['posts'] >= $v['POSTS'])
-			{
-				if (!$member['title'])
-				{
-					$member['title'] = $this->mem_titles[ $k ]['TITLE'];
-				}
-				$pips = $v['PIPS'];
-				break;
-			}
-		}
-		
-		
-		if ($member['g_icon'])
-		{
-			$member['member_rank_img'] = "<img src='{$ibforums->vars[TEAM_ICON_URL]}/{$member['g_icon']}' border='0' alt='Group Icon' />";
-		}
-		else
-		{
-			if ($pips)
-			{
-				if ( preg_match( "/^\d+$/", $pips ) )
-				{
-					for ($i = 1; $i <= $pips; ++$i)
-					{
-						$member['member_rank_img'] .= "<{A_STAR}>";
-					}
-				}
-				else
-				{
-					$member['member_rank_img'] = "<img src='{$ibforums->vars['TEAM_ICON_URL']}/$pips' border='0' alt='*' />";
-				}
-			}
-		}
-							   
-		$member['member_joined'] = $ibforums->lang['m_joined'].' '.$std->get_date( $member['joined'], 'JOINED' );
-		
-		$member['member_group'] = $ibforums->lang['m_group'].' '.$member['g_title'];
-		
-		$member['member_posts'] = $ibforums->lang['m_posts'].' '.$std->do_number_format($member['posts']);
-		
-		$member['member_number'] = $ibforums->lang['member_no'].' '.$std->do_number_format($member['id']);
-		
-		$member['profile_icon'] = "<a href='{$this->base_url}showuser={$member['id']}'><{P_PROFILE}></a>";
-		
-		$member['message_icon'] = "<a href='{$this->base_url}act=Msg&amp;CODE=04&amp;MID={$member['id']}'><{P_MSG}></a>";
-		
-		if (!$member['hide_email'])
-		{
-			$member['email_icon'] = "<a href='{$this->base_url}act=Mail&amp;CODE=00&amp;MID={$member['id']}'><{P_EMAIL}></a>";
-		}
-		
-		if ( $member['website'] and preg_match( "/^http:\/\/\S+$/", $member['website'] ) )
-		{
-			$member['website_icon'] = "<a href='{$member['website']}' target='_blank'><{P_WEBSITE}></a>";
-		}
-		
-		if ($member['icq_number'])
-		{
-			$member['icq_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=ICQ&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_ICQ}></a>";
-		}
-		
-		if ($member['aim_name'])
-		{
-			$member['aol_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=AOL&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_AOL}></a>";
-		}
-		
-		if ($member['yahoo'])
-		{
-			$member['yahoo_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=YAHOO&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_YIM}></a>";
-		}
-		
-		if ($member['msnname'])
-		{
-			$member['msn_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=MSN&amp;MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_MSN}></a>";
-		}
-		
-		if ($member['integ_msg'])
-		{
-			$member['integ_icon'] = "<a href=\"javascript:PopUp('{$this->base_url}act=integ&amp;MID={$member['id']}','Pager','750','450','0','1','1','1')\"><{INTEGRITY_MSGR}></a>";
-		}
-		
-		if ($ibforums->member['id'])
-		{
-			$member['addresscard'] = "<a href=\"javascript:PopUp('{$this->base_url}act=Profile&amp;CODE=showcard&amp;MID={$member['id']}','AddressCard','470','300','0','1','1','1')\" title='{$ibforums->lang['ac_title']}'><{ADDRESS_CARD}></a>";
-		}
-		
-		//--------------------------------------------------------------
-		// Warny porny?
-		//--------------------------------------------------------------
-		
-		if ( $ibforums->vars['warn_on'] and ( ! stristr( $ibforums->vars['warn_protected'], ','.$member['mgroup'].',' ) ) )
-		{
-			if (
-			    ( $ibforums->member['is_mod'] AND $ibforums->member['allow_warn'] )
-				or ( $ibforums->member['g_is_supmod'] == 1 )
-				or ( $ibforums->vars['warn_show_own'] and ( $ibforums->member['id'] == $member['id'] ) )
-			   )
-			{
-				// Work out which image to show.
-				
-				if ( ! $ibforums->vars['warn_show_rating'] )
-				{
-					if ( $member['warn_level'] <= $ibforums->vars['warn_min'] )
-					{
-						$member['warn_img']     = '<{WARN_0}>';
-						$member['warn_percent'] = 0;
-					}
-					else if ( $member['warn_level'] >= $ibforums->vars['warn_max'] )
-					{
-						$member['warn_img']     = '<{WARN_5}>';
-						$member['warn_percent'] = 100;
-					}
-					else
-					{
-						
-						$member['warn_percent'] = $member['warn_level'] ? sprintf( "%.0f", ( ($member['warn_level'] / $ibforums->vars['warn_max']) * 100) ) : 0;
-						
-						if ( $member['warn_percent'] > 100 )
-						{
-							$member['warn_percent'] = 100;
-						}
-						
-						if ( $member['warn_percent'] >= 81 )
-						{
-							$member['warn_img'] = '<{WARN_5}>';
-						}
-						else if ( $member['warn_percent'] >= 61 )
-						{
-							$member['warn_img'] = '<{WARN_4}>';
-						}
-						else if ( $member['warn_percent'] >= 41 )
-						{
-							$member['warn_img'] = '<{WARN_3}>';
-						}
-						else if ( $member['warn_percent'] >= 21 )
-						{
-							$member['warn_img'] = '<{WARN_2}>';
-						}
-						else if ( $member['warn_percent'] >= 1 )
-						{
-							$member['warn_img'] = '<{WARN_1}>';
-						}
-						else
-						{
-							$member['warn_img'] = '<{WARN_0}>';
-						}
-					}
-					
-					if ( $member['warn_percent'] < 1 )
-					{
-						$member['warn_percent'] = 0;
-					}
-					
-					$member['warn_text']  = $this->html->warn_level_warn($member['id'], $member['warn_percent'] );
-					
-				}
-				else
-				{
-					// Ratings mode..
-					
-					$member['warn_text']  = $ibforums->lang['tt_rating'];
-					$member['warn_img']   = $this->html->warn_level_rating($member['id'], $member['warn_level'], $ibforums->vars['warn_min'], $ibforums->vars['warn_max']);
-				}
-								
-				if ( ( $ibforums->member['is_mod'] AND $ibforums->member['allow_warn'] ) or ( $ibforums->member['g_is_supmod'] == 1 ) )
-				{
-					$member['warn_add']   = "<a href='{$ibforums->base_url}act=warn&amp;type=add&amp;mid={$member['id']}&amp;t={$this->topic['tid']}&amp;st=".intval($ibforums->input['st'])."' title='{$ibforums->lang['tt_warn_add']}'><{WARN_ADD}></a>";
-					$member['warn_minus'] = "<a href='{$ibforums->base_url}act=warn&amp;type=minus&amp;mid={$member['id']}&amp;t={$this->topic['tid']}&amp;st=".intval($ibforums->input['st'])."' title='{$ibforums->lang['tt_warn_minus']}'><{WARN_MINUS}></a>";
-				}
-			}
-		}
-		
-		//--------------------------------------------------------------
-		// Profile fields stuff
-		//--------------------------------------------------------------
-		
-		if ( $ibforums->vars['custom_profile_topic'] == 1 )
-		{
-			foreach( $this->pfields as $id => $pf )
-			{
-				if ( $member[ $id ] != "" )
-				{
-					if ( $pf['fhide'] == 1 and $ibforums->member['g_is_supmod'] != 1 )
-					{
-						$member[ $id ] = "";
-					}
-					else if ( $pf['ftype'] == 'drop' )
-					{
-						$member[ $id ] = $this->pfields_dd[$id][$member[ $id ]]; // You just know that's going to make no sense tomorrow.
-					}
-				}
-			}
-		}
-		
-		return $member;
-	
-	}
-	
-	//--------------------------------------------------------------
-	// Render the delete button
-	//--------------------------------------------------------------
-	
-	function delete_button($post_id, $poster)
-	{
-		global $ibforums, $std;
-		
-		if ($ibforums->member['id'] == "" or $ibforums->member['id'] == 0)
-		{
-			return "";
-		}
-		
-		$button = "<a href=\"javascript:delete_post('{$this->base_url}act=Mod&amp;CODE=04&amp;f={$this->forum['id']}&amp;t={$this->topic['tid']}&amp;p={$post_id}&amp;st={$ibforums->input[st]}&amp;auth_key=".$this->md5_check."')\"><{P_DELETE}></a>";
-		
-		if ($ibforums->member['g_is_supmod']) return $button;
-		if ($this->moderator['delete_post']) return $button;
-		if ($poster['id'] == $ibforums->member['id'] and ($ibforums->member['g_delete_own_posts'])) return $button;
-		return "";
-	}
-	
-	//--------------------------------------------------------------
-	// Render the edit button
-	//--------------------------------------------------------------
-	
-	function edit_button($post_id, $poster, $post_date)
-	{
-		global $ibforums;
-		
-		if ($ibforums->member['id'] == "" or $ibforums->member['id'] == 0)
-		{
-			return "";
-		}
-		
-		$button = "<a href=\"{$this->base_url}act=Post&amp;CODE=08&amp;f={$this->forum['id']}&amp;t={$this->topic['tid']}&amp;p={$post_id}&amp;st={$ibforums->input[st]}\"><{P_EDIT}></a>";
-		
-		if ($ibforums->member['g_is_supmod']) return $button;
-		
-		if ($this->moderator['edit_post']) return $button;
-		
-		if ($poster['id'] == $ibforums->member['id'] and ($ibforums->member['g_edit_posts']))
-		{
-		
-			// Have we set a time limit?
-			
-			if ($ibforums->member['g_edit_cutoff'] > 0)
-			{
-				if ( $post_date > ( time() - ( intval($ibforums->member['g_edit_cutoff']) * 60 ) ) )
-				{
-					return $button;
-				}
-				else
-				{
-					return "";
-				}
-			}
-			else
-			{
-				return $button;
-			}
-		}
-		
-		return "";
-	}
-	
-	
-	//--------------------------------------------------------------
-	// Render the IP address
-	//--------------------------------------------------------------
-	
-	function view_ip($row, $poster)
-	{
-		global $ibforums;
-		
-		if ($ibforums->member['g_is_supmod'] != 1 && $this->moderator['view_ip'] != 1)
-		{
-			return "";
-		}
-		else
-		{
-			$row['ip_address'] = $poster['mgroup'] == $ibforums->vars['admin_group']
-						  ? "[ ---------- ]"
-						  : "[ <a href='{$ibforums->base_url}act=modcp&amp;CODE=ip&amp;incoming={$row['ip_address']}' target='_blank'>{$row['ip_address']}</a> ]";
-			return $this->html->ip_show($row['ip_address']);
-		}
-	
-	}
-	
-	//--------------------------------------------------------------
-	// Render the topic multi-moderation
-	//--------------------------------------------------------------
-	
-	function multi_moderation()
-	{
-		global $ibforums, $std, $DB;
-		
-		$mm_html = "";
-		
-		$pass_go = FALSE;
-		
-		if ( $ibforums->member['id'] )
-		{
-			if ( $ibforums->member['g_is_supmod'] )
-			{
-				$pass_go = TRUE;
-			}
-			else if ( $this->moderator['can_mm'] == 1 )
-			{
-				$pass_go = TRUE;
-			}
-		}
-		
-		if ( $pass_go != TRUE )
-		{
-			return "";
-		}
-		
-		$this->forum['topic_mm_id'] = $std->clean_perm_string($this->forum['topic_mm_id']);
-		
-		if ( $this->forum['topic_mm_id'] == "" )
-		{
-			return "";
-		}
-		
-		//----------------------------------------
-		// Get the topic mod thingies
-		//----------------------------------------
-		
-		$DB->query("SELECT mm_id, mm_title FROM ibf_topic_mmod WHERE mm_id IN(".implode( ",", explode( ",", $this->forum['topic_mm_id'] ) ).") ORDER BY mm_title");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$mm_html = $this->html->mm_start($this->topic['tid']);
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$mm_html .= $this->html->mm_entry( $r['mm_id'], $r['mm_title'] );
-			}
-			
-			$mm_html .= $this->html->mm_end();
-		}
-		
-		return $mm_html;
-	}
-	
-	//--------------------------------------------------------------
-	// Render the moderator links
-	//--------------------------------------------------------------
-	
-	function moderation_panel() {
-		global $ibforums, $std;
-		
-		$mod_links = "";
-		
-		if (!isset($ibforums->member['id'])) return "";
-		
-		$skcusgej = 0;
-		
-		if ($ibforums->member['id'] == $this->topic['starter_id'])
-		{
-			$skcusgej = 1;
-		}
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$skcusgej = 1;
-		}
-		
-		if ($this->moderator['mid'] != "")
-		{
-			$skcusgej = 1;
-		}
-		
-		if ($skcusgej == 0)
-		{
-		   		return "";
-		}
-		
-		$actions = array( 'MOVE_TOPIC', 'CLOSE_TOPIC', 'OPEN_TOPIC', 'DELETE_TOPIC', 'EDIT_TOPIC', 'PIN_TOPIC', 'UNPIN_TOPIC', 'UNSUBBIT', 'MERGE_TOPIC', 'SPLIT_TOPIC' );
-		
-		foreach( $actions as $key )
-		{
-			if ($ibforums->member['g_is_supmod'])
-			{
-				$mod_links .= $this->append_link($key);
-			}
-			elseif ($this->moderator['mid'])
-			{
-				if ($key == 'MERGE_TOPIC' or $key == 'SPLIT_TOPIC')
-				{
-					if ($this->moderator['split_merge'] == 1)
-					{
-						$mod_links .= $this->append_link($key);
-					}
-				}
-				else
-				{
-					if ($this->moderator[ strtolower($key) ])
-					{
-						$mod_links .= $this->append_link($key);
-					}
-				}
-			}
-			elseif ($key == 'OPEN_TOPIC' or $key == 'CLOSE_TOPIC')
-			{
-				if ($ibforums->member['g_open_close_posts'])
-				{
-					$mod_links .= $this->append_link($key);
-				}
-			}
-			elseif ($key == 'DELETE_TOPIC')
-			{
-				if ($ibforums->member['g_delete_own_topics'])
-				{
-					$mod_links .= $this->append_link($key);
-				}
-			}
-		}
-		
-		if ($ibforums->member['g_access_cp'] == 1)
-		{
-			$mod_links .= $this->append_link('TOPIC_HISTORY');
-		}
-		
-		if ($mod_links != "")
-		{
-			return $this->html->Mod_Panel($mod_links, $this->forum['id'], $this->topic['tid'], $this->md5_check);
-			
-		}
-	
-	}
-	
-	function append_link( $key="" ) {
-		global $ibforums;
-		
-		if ($key == "") return "";
-		
-		if ($this->topic['state'] == 'open'   and $key == 'OPEN_TOPIC') return "";
-		if ($this->topic['state'] == 'closed' and $key == 'CLOSE_TOPIC') return "";
-		if ($this->topic['state'] == 'moved'  and ($key == 'CLOSE_TOPIC' or $key == 'MOVE_TOPIC')) return "";
-		if ($this->topic['pinned'] == 1 and $key == 'PIN_TOPIC')   return "";
-		if ($this->topic['pinned'] == 0 and $key == 'UNPIN_TOPIC') return "";
-		
-		++$this->colspan;
-		
-		return $this->html->mod_wrapper($this->mod_action[$key], $ibforums->lang[ $key ]);
-	}
-	
-	//--------------------------------------------------------------
-	// Render the reply button
-	//--------------------------------------------------------------
-
-	function reply_button()
-	{
-		global $ibforums;
-		
-		if ($this->topic['state'] == 'closed')
-		{
-			// Do we have the ability to post in
-			// closed topics?
-			
-			if ($ibforums->member['g_post_closed'] == 1)
-			{
-				return "<a href='{$this->base_url}act=Post&amp;CODE=02&amp;f=".$this->forum['id']."&amp;t=".$this->topic['tid']."'><{A_LOCKED_B}></a>";
-			}
-			else
-			{
-				return "<{A_LOCKED_B}>";
-			}
-		}
-		
-		if ($this->topic['state'] == 'moved')
-		{
-			return "<{A_MOVED_B}>";
-		}
-		
-		if ($this->topic['poll_state'] == 'closed')
-		{
-			return "<{A_POLLONLY_B}>";
-		}
-		
-		return "<a href='{$this->base_url}act=Post&amp;CODE=02&amp;f=".$this->forum['id']."&amp;t=".$this->topic['tid']."'><{A_REPLY}></a>";
-	
-	}
-	
-	function check_access()
-	{
-		global $ibforums, $std, $HTTP_COOKIE_VARS;
-		
-		$return = 1;
-		
-		if ( $std->check_perms($this->forum['read_perms']) == TRUE )
-		{
-			$return = 0;
-		}
-		
-		if ($this->forum['password'] != "")
-		{
-		
-			if ( ! $c_pass = $std->my_getcookie('iBForum'.$this->forum['id']) )
-			{
-				return 1;
-			}
-		
-			if ( $c_pass == $this->forum['password'] )
-			{
-				return 0;
-			}
-			else
-			{
-			    return 1;
-			}
-		}
-		
-		return $return;
-	
-	}
-	
-	//--------------------------------------------------------------
-	// Process and parse the poll
-	//--------------------------------------------------------------  
-	
-	function parse_poll()
-	{
-	    global $ibforums, $DB, $std;
-	    
-	    $html        = "";
-	    $check       = 0;
-	    $poll_footer = "";
-	    
-	    $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
-        
-        $this->poll_html = $std->load_template('skin_poll');
-        
-        //----------------------------------
-        // Get the poll information...
-        //----------------------------------
-        
-        $DB->query("SELECT * FROM ibf_polls WHERE tid=".$this->topic['tid']);
-        $poll_data = $DB->fetch_row();
-        
-        if (! $poll_data['pid']) {
-        	return;
-        }
-        
-        if ( ! $poll_data['poll_question'] )
-        {
-        	$poll_data['poll_question'] = $this->topic['title'];
-        }
-        
-        //----------------------------------
-        
-        $delete_link = "";
-        $edit_link   = "";
-        $can_edit    = 0;
-        $can_delete  = 0;
-        
-        if ($this->moderator['edit_post'])
-        {
-        	$can_edit = 1;
-        }
-        if ($this->moderator['delete_post'])
-        {
-        	$can_delete = 1;
-        }
-        
-        if ($ibforums->member['g_is_supmod'] == 1)
-        {
-        	$can_edit   = 1;
-        	$can_delete = 1;
-        }
-        
-        if ($can_edit == 1)
-        {
-        	$edit_link   = $this->poll_html->edit_link($this->topic['tid'], $this->forum['id'], $this->md5_check );
-        }
-        
-        if ($can_delete == 1)
-        {
-        	$delete_link = $this->poll_html->delete_link($this->topic['tid'], $this->forum['id'], $this->md5_check );
-        }
-        
-        //----------------------------------
-        
-        $voter = array( 'id' => 0 );
-        
-        //----------------------------------
-        // Have we voted in this poll?
-        //----------------------------------
-        
-        $DB->query("SELECT member_id from ibf_voters WHERE member_id=".$ibforums->member['id']." and tid=".$this->topic['tid']);
-        $voter = $DB->fetch_row();
-        
-        if ($voter['member_id'] != 0)
-        {
-        	$check = 1;
-        	$poll_footer = $ibforums->lang['poll_you_voted'];
-        }
-        
-        if ( ($poll_data['starter_id'] == $ibforums->member['id']) and ($ibforums->vars['allow_creator_vote'] != 1) )
-        {
-        	$check = 1;
-        	$poll_footer = $ibforums->lang['poll_you_created'];
-        }
-        	
-        if (! $ibforums->member['id'] ) {
-        	$check = 1;
-        	$poll_footer = $ibforums->lang['poll_no_guests'];
-        }
-        
-        //----------------------------------
-        // is the topic locked?
-        //----------------------------------
-        
-        if ( $this->topic['state'] == 'closed' )
-        {
-        	$check = 1;
-        	$poll_footer = '&nbsp;';
-        }
-        
-        if ( $ibforums->vars['allow_result_view'] == 1 )
-        {
-        	if ( $ibforums->input['mode'] == 'show' )
-        	{
-        		$check       = 1;
-        		$poll_footer = "";
-        	}
-        }
-        
-        if ($check == 1)
-        {
-        	//---------------------
-        	// Show the results
-        	//---------------------
-        	
-        	$total_votes = 0;
-        	
-        	$html = $this->poll_html->poll_header($this->topic['tid'], $poll_data['poll_question'], $edit_link, $delete_link);
-        	
-        	$poll_answers = unserialize(stripslashes($poll_data['choices']));
-        	
-        	reset($poll_answers);
-        	foreach ($poll_answers as $entry)
-        	{
-        		$id     = $entry[0];
-        		$choice = $entry[1];
-        		$votes  = $entry[2];
-        		
-        		$total_votes += $votes;
-        		
-        		if ( strlen($choice) < 1 )
-        		{
-        			continue;
-        		}
-        		
-        		if ($ibforums->vars['poll_tags'])
-        		{
-        			$choice = $this->parser->parse_poll_tags($choice);
-        		}
-        		if ( $ibforums->vars['post_wordwrap'] > 0 )
-				{
-					$choice = $this->parser->my_wordwrap( $choice, $ibforums->vars['post_wordwrap']) ;
-				}
-        		
-        		$percent = $votes == 0 ? 0 : $votes / $poll_data['votes'] * 100;
-        		$percent = sprintf( '%.2f' , $percent );
-        		$width   = $percent > 0 ? (int) $percent * 2 : 0;
-        		$html   .= $this->poll_html->Render_row_results($votes, $id, $choice, $percent, $width);
-        	}
-        	
-        	$html   .= $this->poll_html->show_total_votes($total_votes);
-        	
-        }
-        else
-        {
-        	$poll_answers = unserialize(stripslashes($poll_data['choices']));
-        	reset($poll_answers);
-        	
-        	//---------------------
-        	// Show poll form
-        	//---------------------
-        	
-        	$html = $this->poll_html->poll_header($this->topic['tid'], $poll_data['poll_question'], $edit_link, $delete_link);
-        	
-        	foreach ($poll_answers as $entry)
-        	{
-        		$id     = $entry[0];
-        		$choice = $entry[1];
-        		$votes  = $entry[2];
-        		
-        		if ( strlen($choice) < 1 )
-        		{
-        			continue;
-        		}
-        		
-        		if ($ibforums->vars['poll_tags'])
-        		{
-        			$choice = $this->parser->parse_poll_tags($choice);
-        		}
-        		if ( $ibforums->vars['post_wordwrap'] > 0 )
-				{
-					$choice = $this->parser->my_wordwrap( $choice, $ibforums->vars['post_wordwrap']) ;
-				}
-        		
-        		$html   .= $this->poll_html->Render_row_form($votes, $id, $choice);
-        	}
-        	
-        }
-        
-        $html .= $this->poll_html->ShowPoll_footer();
-        
-        if ( $poll_footer != "" )
-        {
-        	//-----------------------------
-        	// Already defined..
-        	//-----------------------------
-        	
-        	$html = str_replace( "<!--IBF.VOTE-->", $poll_footer, $html );
-        }
-        else
-        {
-        	//-----------------------------
-        	// Not defined..
-        	//-----------------------------
-        	
-        	if ( $ibforums->vars['allow_result_view'] == 1 )
-        	{
-        		if ( $ibforums->input['mode'] == 'show' )
-        		{
-        			// We are looking at results..
-        			
-        			$html = str_replace( "<!--IBF.SHOW-->", $this->poll_html->button_show_voteable(), $html );
-        		}
-        		else
-        		{
-        			$html = str_replace( "<!--IBF.SHOW-->", $this->poll_html->button_show_results(), $html );
-        			$html = str_replace( "<!--IBF.VOTE-->", $this->poll_html->button_vote(), $html );
-        		}
-        	}
-        	else
-        	{
-        		//-----------------------------
-        		// Do not allow result viewing
-        		//-----------------------------
-        		
-        		$html = str_replace( "<!--IBF.VOTE-->", $this->poll_html->button_vote(), $html );
-        		$html = str_replace( "<!--IBF.SHOW-->", $this->poll_html->button_null_vote(), $html );
-        	}
-        		
-        }
-        
-        $html = str_replace( "<!--IBF.POLL_JS-->", $this->poll_html->poll_javascript($this->topic['tid'], $this->forum['id']), $html );
-        
-        return $html;
-	}
-	
-	
-	function return_last_post()
-	{
-		global $ibforums, $DB, $std;
-		
-		$st = 0;
-        	
-		if ($this->topic['posts'])
-		{
-			if ( (($this->topic['posts'] + 1) % $ibforums->vars['display_max_posts']) == 0 )
-			{
-				$pages = ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts'];
-			}
-			else
-			{
-				$number = ( ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts'] );
-				$pages = ceil( $number);
-			}
-			
-			$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
-		}
-		
-		$DB->query("SELECT pid FROM ibf_posts WHERE queued <> 1 AND topic_id='".$this->topic['tid']."' ORDER BY pid DESC LIMIT 1");
-		$post = $DB->fetch_row();
-		
-		$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&st=$st&"."#entry".$post['pid']);
-		exit();
-				
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/upload/sources/Usercp.php b/upload/sources/Usercp.php
deleted file mode 100644
index c218cdce..00000000
--- a/upload/sources/Usercp.php
+++ /dev/null
@@ -1,2123 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > UserCP functions
-|   > Module written by Matt Mecham
-|   > Date started: 14th February 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-$idx = new UserCP;
-
-class UserCP {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $html       = "";
-    var $parser;
-
-    var $member     = array();
-    var $m_group    = array();
-    
-    var $jump_html  = "";
-    var $parser     = "";
-    
-    var $links      = array();
-    
-    var $bio        = "";
-    var $notes      = "";
-    var $size       = "m";
-    
-    var $email      = "";
-    var $md5_check  = "";
-    
-    var $modules    = "";
-    
-    var $lib;
-    
-    function UserCP()
-    {
-    	global $ibforums, $DB, $std, $print;
-    	
-    	require "./sources/lib/post_parser.php";
-        
-        $this->parser = new post_parser();
-        
-        $this->md5_check = $std->return_md5_check();
-        
-        //--------------------------------------------
-    	// Get the emailer module
-		//--------------------------------------------
-		
-		require "./sources/lib/emailer.php";
-		
-		$this->email = new emailer();
-		
-		//--------------------------------------------
-    	// Get the sync module
-		//--------------------------------------------
-		
-		if ( USE_MODULES == 1 )
-		{
-			require ROOT_PATH."modules/ipb_member_sync.php";
-			
-			$this->modules = new ipb_member_sync();
-		}
-        
-    	if ($ibforums->input['CODE'] == "") $ibforums->input['CODE'] = 00;
-    	
-    	//--------------------------------------------
-    	// Require the HTML and language modules
-    	//--------------------------------------------
-    	
-    	$ibforums->lang = $std->load_words($ibforums->lang, 'lang_post'  , $ibforums->lang_id );
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_ucp'   , $ibforums->lang_id );
-		
-		require "./sources/lib/usercp_functions.php";
-    	
-    	$this->html = $std->load_template('skin_ucp');
-    	
-    	$this->base_url        = $ibforums->base_url;
-    	$this->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
-    	
-    	//--------------------------------------------
-    	// Check viewing permissions, etc
-		//--------------------------------------------
-		
-		$this->member  = $ibforums->member;
-		
-		if ( empty($this->member['id']) or $this->member['id'] == "" or $this->member['id'] == 0 )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
-		}
-		
-		// Get more member info..
-    	
-    	$DB->query("SELECT m.*, me.notes,me.ta_size,me.photo_type,me.photo_location,me.photo_dimensions 
-    			   FROM ibf_members m
-    			   LEFT JOIN ibf_member_extra me ON(me.id=m.id)
-    			   WHERE m.id='".$this->member['id']."'");
-    			   
-    	$this->member = $DB->fetch_row();
-		
-		$this->links = $this->member['links'];
-		$this->notes = $this->member['notes'];
-		$this->size  = $this->member['ta_size'] ? $this->member['ta_size'] : $this->size;
-		
-		//--------------------------------------------
-    	// Print the top button menu
-    	//--------------------------------------------
-    	
-    	$menu_html = $this->html->Menu_bar($this->base_url);
-    	
-    	//--------------------------------------------
-    	// If no messenger, remove the links!
-    	//--------------------------------------------
-    	
-    	if ( ! $ibforums->member['g_use_pm'])
-        {
-        	$menu_html = preg_replace( "/<!-- Messenger -->.+?<!-- End Messenger -->/s", "", $menu_html );
-        }
-        else
-        {
-        	//--------------------------------------------
-    		// Print folder links
-    		//--------------------------------------------
-    		
-    		$folder_links = "";
-    		
-			if (empty($this->member['vdirs']))
-			{
-				$this->member['vdirs'] = "in:Inbox|sent:Sent Items";
-			}
-			
-			
-			foreach( explode( "|", $this->member['vdirs'] ) as $dir )
-			{
-				list ($id, $real) = explode( ":", $dir );
-				
-				if ( empty($id) or ( $id == 'in' ) )
-				{
-					continue;
-				}
-				
-				$folder_links .= $this->html->menu_bar_msg_folder_link($id, $real);
-			}
-			
-			if ( $folder_links != "" )
-			{
-				$menu_html = str_replace( "<!--IBF.FOLDER_LINKS-->", $folder_links, $menu_html );
-			}
-        }
-		
-		//--------------------------------------------
-    	// Using Sub Manager?
-    	//--------------------------------------------
-    	
-		if ( @is_dir( ROOT_PATH.'/modules/subsmanager' ) )
-		{
-			$url  = $ibforums->base_url."act=module&amp;module=subscription&amp;CODE=index";
-			$name = $ibforums->lang['new_sub_link'];
-			
-			$menu_html = str_replace( "<!--IBF.OPTION_LINKS-->", $this->html->menu_bar_new_link( $url, $name ), $menu_html );
-		}
-		
-		if ($ibforums->vars['top_site_list_integrate'])
-		{
-			$menu_html = str_replace( "<!--IBF.TSLLINKS-->", $this->html->tsl_links(), $menu_html );
-		}
-		
-		
-    	$print->add_output( $menu_html );
-    	
-    	
-    	
-    	$this->lib    = new usercp_functions(&$this);
-    	
-    	
-    	//--------------------------------------------
-    	// What to do?
-    	//--------------------------------------------
-    	
-    	
-    	switch($ibforums->input['CODE']) {
-    		case '00':
-    			$this->splash();
-    			break;
-    		case '01':
-    			$this->personal();
-    			break;
-    		//------------------------------
-    		case '02':
-    			$this->email_settings();
-    			break;
-    		case '03':
-    			$this->do_email_settings();
-    			break;
-    		//------------------------------
-    		case '04':
-    			$this->board_prefs();
-    			break;
-    		case '05':
-    			$this->do_board_prefs();
-    			break;
-    		//------------------------------
-    		case '06':
-    			$this->skin_langs();
-    			break;
-    		case '07':
-    			$this->do_skin_langs();
-    			break;
-    		//------------------------------
-    		case '08':
-    			$this->email_change();
-    			break;
-    		case '09':
-    			$this->do_email_change();
-    			break;
-    		//------------------------------
-    		case '21':
-    			$this->do_personal();
-    			break;
-    		case '20':
-    			$this->update_notepad();
-    			break;
-    		//------------------------------
-    		case '22':
-    			$this->signature();
-    			break;
-    		case '23':
-    			$this->do_signature();
-    			break;
-    		//------------------------------
-    		case '24':
-    			$this->avatar();
-    			break;
-    		case '25':
-    			$this->do_avatar();
-    			break;
-    		//------------------------------
-    		case '26':
-    			$this->tracker();
-    			break;
-    		case '27':
-    			$this->do_delete_tracker();
-    			break;
-    		//------------------------------
-    		case '28':
-    			$this->pass_change();
-    			break;
-    		case '29':
-    			$this->do_pass_change();
-    			break;
-    		//------------------------------
-    		
-    		case '50':
-    			$this->forum_tracker();
-    			break;
-    		case '51':
-    			$this->remove_forum_tracker();
-    			break;
-    			
-    		//-------------------------------
-    		
-    		case 'show_image':
-    			$this->show_image();
-    			break;
-    			
-    		case 'photo':
-    			$this->photo();
-    			break;
-    			
-    		case 'dophoto':
-    			$this->lib->do_photo();
-    			break;
-    			
-    		case 'getgallery':
-    			$this->avatar_gallery();
-    			break;
-    			
-    		case 'setinternalavatar':
-    			$this->lib->set_internal_avatar();
-    			break;
-    		
-    		default:
-    			$this->splash();
-    			break;
-    	}
-    	
-    	// If we have any HTML to print, do so...
-    	
-    	$fj = $std->build_forum_jump();
-		$fj = preg_replace( "!#Forum Jump#!", $ibforums->lang['forum_jump'], $fj);
-		
-		$this->output .= $this->html->CP_end();
-		
-		$this->output .= $this->html->forum_jump($fj, $links);
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 1, NAV => $this->nav ) );
-    		
- 	}
- 	
- 	//*******************************************************************/
- 	//| Photo:
- 	//|
- 	//| Change / Add / Edit Users Photo
- 	//*******************************************************************/
- 	
- 	function photo()
- 	{
- 		global $ibforums, $DB, $std;
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 		if ( $ibforums->member['g_photo_max_vars'] == "" or $ibforums->member['g_photo_max_vars'] == "::" )
- 		{
- 			// Nothing set up yet...
- 			
- 			$this->output .= $this->html->dead_section();
- 			return;
- 		}
- 		
- 		//----------------------------------------------------------------
- 		// SET DIMENSIONS
- 		//----------------------------------------------------------------
- 		
- 		list($p_max, $p_width, $p_height) = explode( ":", $ibforums->member['g_photo_max_vars'] );
- 		
- 		if ( $p_max )
- 		{
- 			$ibforums->lang['pph_max']  = sprintf( $ibforums->lang['pph_max'], $p_max );
- 			$ibforums->lang['pph_max'] .= sprintf( $ibforums->lang['pph_max2'], $p_width, $p_height );
- 		}
- 		else
- 		{
- 			$ibforums->lang['pph_max'] = sprintf( $ibforums->lang['pph_max2'], $p_width, $p_height );
- 		}
- 		
- 		list($p_w, $p_h) = explode( ",", $this->member['photo_dimensions'] );
- 		
- 		$cur_photo = $ibforums->lang['pph_none'];
- 		$cur_type  = "";
- 		$url_photo = "";
- 		
- 		$width  = ( $p_w ) ? "width='$p_w'"  : "";
- 		$height = ( $p_h ) ? "height='$p_h'" : "";
- 		
- 		$show_size = str_replace( ",", " X ", $this->member['photo_dimensions'] );
- 		
- 		//----------------------------------------------------------------
- 		// TYPE?
- 		//----------------------------------------------------------------
- 		
- 		if ( $this->member['photo_type'] == 'upload' )
- 		{
- 			$cur_type  = $ibforums->lang['pph_t_upload'];
- 			$cur_photo = "<img src=\"".$ibforums->vars['upload_url']."/".$this->member['photo_location']."\" $width $height alt='Photo' />";
- 		}
- 		else if ( $this->member['photo_type'] == 'url' )
- 		{
- 			$cur_type  = $ibforums->lang['pph_t_url'];
- 			$cur_photo = "<img src=\"".$this->member['photo_location']."\" $width $height alt='Photo' />";
- 			$url_photo = $this->member['photo_location'];
- 		}
- 		
- 		//----------------------------------------------------------------
- 		// SHOW THE FORM
- 		//----------------------------------------------------------------
- 		
- 		$this->output .= $this->html->photo_page($cur_photo, $cur_type, $url_photo, $show_size, $this->md5_check);
- 		
- 		if ($p_max)
- 		{
- 			$this->output = str_replace( "<!--IPB.UPLOAD-->", $this->html->photo_page_upload($p_max * 1024), $this->output );
- 		}
- 		
- 		$size_html = $ibforums->vars['disable_ipbsize'] ? $this->html->photo_page_mansize() : $this->html->photo_page_autosize();
- 		
- 		$this->output = str_replace( "<!--IPB.SIZE-->", $size_html, $this->output );
- 		
- 	}
- 	
- 	
- 	//*******************************************************************/
- 	//| Forum tracker
- 	//|
- 	//| What, you need a definition with that title?
- 	//| What are you doing poking around in the code for anyway?
- 	//*******************************************************************/
- 	
- 	function remove_forum_tracker() {
- 		global $ibforums, $std, $DB;
- 		
- 		if ($ibforums->input['f'] == 'all')
- 		{
- 			$DB->query("DELETE FROM ibf_forum_tracker WHERE member_id='".$this->member['id']."'");
- 		}
- 		else
- 		{
- 			$id = intval($ibforums->input['f']);
- 			
- 			$DB->query("DELETE FROM ibf_forum_tracker WHERE member_id='".$this->member['id']."' AND forum_id='$id'");
- 		}
- 			
- 	    $std->boink_it($this->base_url."act=UserCP&CODE=50");
- 		
- 	}
- 	
- 	function forum_tracker()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$this->output .= $this->html->forum_subs_header();
- 		
- 		//----------------------------------------------------------
- 		// Query the DB for the subby toppy-ics - at the same time
- 		// we get the forum and topic info, 'cos we rule.
- 		//----------------------------------------------------------
- 		
- 		$DB->query("SELECT t.frid, t.start_date, f.*, c.id as cat_id, c.name as cat_name
- 		            FROM ibf_forum_tracker t
- 		             LEFT JOIN ibf_forums f ON (t.forum_id=f.id)
- 		             LEFT JOIN ibf_categories c ON (c.id=f.category)
- 		            WHERE t.member_id='".$this->member['id']."'
- 		            ORDER BY c.position, f.position");
- 		          
- 		if ( $DB->get_num_rows() )
- 		{
- 		
- 			$last_cat_id = -1;
- 		
- 			while( $forum = $DB->fetch_row() )
- 			{
- 			
- 				if ($last_cat_id != $forum['cat_id'])
- 				{
- 					$last_cat_id = $forum['cat_id'];
- 					
- 					$this->output .= $this->html->subs_forum_row($forum['cat_id'], $forum['cat_name']);
- 				}
- 				
- 				$forum['folder_icon'] = $std->forum_new_posts($forum);
- 				
- 				$forum['last_post'] = $std->get_date($forum['last_post'], 'LONG');
-						
-				$forum['last_topic'] = $ibforums->lang['f_none'];
- 				
- 				$forum['last_title'] = str_replace( "&#33;" , "!", $forum['last_title'] );
-				$forum['last_title'] = str_replace( "&quot;", "\"", $forum['last_title'] );
-					
-				if (strlen($forum['last_title']) > 30)
-				{
-					$forum['last_title'] = substr($forum['last_title'],0,27) . "...";
-					$forum['last_title'] = preg_replace( '/&(#(\d+;?)?)?\.\.\.$/', '...', $forum['last_title'] );
-				}
-				
-				if ($forum['password'] != "")
-				{
-					$forum['last_topic'] = $ibforums->lang['f_none'];
-				}
-				else
-				{
-					$forum['last_topic'] = "<a href='{$ibforums->base_url}showtopic={$forum['last_id']}&view=getlastpost'>{$forum['last_title']}</a>";
-				}
-			 
-							
-				if ( isset($forum['last_poster_name']))
-				{
-					$forum['last_poster'] = $forum['last_poster_id'] ? "<a href='{$ibforums->base_url}showuser={$forum['last_poster_id']}'>{$forum['last_poster_name']}</a>"
-																	 : $forum['last_poster_name'];
-				}
-				else
-				{
-					$forum['last_poster'] = $ibforums->lang['f_none'];
-				}
- 			
-				
-				
-				$this->output .= $this->html->forum_subs_row($forum);
-			}
-			
-		}
-		else
-		{
-			$this->output .= $this->html->forum_subs_none();
-		}
-		
-		$this->output .= $this->html->forum_subs_end();
- 		
-		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	
- 	//*******************************************************************/
- 	//| pass change:
- 	//|
- 	//| Change the users password.
- 	//*******************************************************************/
- 	
- 	function pass_change()
- 	{
- 		global $ibforums, $DB, $std;
- 		
- 		$this->output    .= $this->html->pass_change();
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_pass_change()
- 	{
- 		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
- 		
- 		if ( $HTTP_POST_VARS['current_pass'] == "" or empty($HTTP_POST_VARS['current_pass']) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		$cur_pass = trim($ibforums->input['current_pass']);
- 		$new_pass = trim($ibforums->input['new_pass_1']);
- 		$chk_pass = trim($ibforums->input['new_pass_2']);
- 		
- 		//--------------------------------------------
- 		
- 		if ( ( empty($new_pass) ) or ( empty($chk_pass) ) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		if ($new_pass != $chk_pass)
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_no_match' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		if (md5($cur_pass) != $this->member['password'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'wrong_pass' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		$md5_pass = md5($new_pass);
- 		
- 		//--------------------------------------------
- 		// Update the DB
- 		//--------------------------------------------
- 		
- 		$DB->query("UPDATE ibf_members SET password='$md5_pass' WHERE id='".$this->member['id']."'");
- 		
- 		//--------------------------------------------
- 		// Update the cookie..
- 		//--------------------------------------------
- 		
- 		$std->my_setcookie( 'pass_hash', $md5_pass, 1 );
- 		
- 		//--------------------------------------------
- 		// Use sync module?
- 		//--------------------------------------------
- 		
- 		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-    		$this->modules->on_pass_change($ibforums->member['id'], $new_pass);
-   		}
- 		
- 		//--------------------------------------------
- 		// Redirect...
- 		//--------------------------------------------
- 		
- 		$print->redirect_screen( $ibforums->lang['pass_redirect'], 'act=UserCP&CODE=00' );
- 		
- 	}
- 	
- 	
- 	//*******************************************************************/
- 	//| email change:
- 	//|
- 	//| Change the users email address
- 	//*******************************************************************/
- 	
- 	function email_change($msg="") {
- 		global $ibforums, $DB, $std;
- 		
- 		$txt = $ibforums->lang['ce_current'].$this->member['email'];
- 		
- 		if ($ibforums->vars['reg_auth_type'])
- 		{
- 			$txt .= $ibforums->lang['ce_auth'];
- 		}
- 		
- 		if ($ibforums->vars['bot_antispam'])
- 		{
-			//-----------------------------------------------
-			// Set up security code
-			//-----------------------------------------------
-			
-			// Get a time roughly 6 hours ago...
-			
-			$r_date = time() - (60*60*6);
-			
-			// Remove old reg requests from the DB
-			
-			$DB->query("DELETE FROM ibf_reg_antispam WHERE ctime < '$r_date'");
-			
-			// Set a new ID for this reg request...
-			
-			$regid = md5( uniqid(microtime()) );
-			
-			// Set a new 6 character numerical string
-			
-			mt_srand ((double) microtime() * 1000000);
-			
-			$reg_code = mt_rand(100000,999999);
-			
-			// Insert into the DB
-			
-			$str = $DB->compile_db_insert_string( array (
-															'regid'      => $regid,
-															'regcode'    => $reg_code,
-															'ip_address' => $ibforums->input['IP_ADDRESS'],
-															'ctime'      => time(),
-												)       );
-												
-			$DB->query("INSERT INTO ibf_reg_antispam ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-		}
- 		
- 		$this->output    .= $this->html->email_change($txt, $ibforums->lang[$msg]);
- 		
- 		if ($ibforums->vars['bot_antispam'])
- 		{
- 		
-			if ($ibforums->vars['bot_antispam'] == 'gd')
-			{
-				$this->output = str_replace( "<!--ANTIBOT-->", $this->html->email_change_gd($regid), $this->output );
-			}
-			else
-			{
-				$this->output = str_replace( "<!--ANTIBOT-->", $this->html->email_change_img($regid), $this->output );
-			}
- 		
- 		}
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	
- 	
- 	function do_email_change()
- 	{
- 		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
- 		
- 		if ($HTTP_POST_VARS['in_email_1'] == "")
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
- 		}
- 		
- 		if ($HTTP_POST_VARS['in_email_2'] == "")
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		if ($ibforums->member['mgroup'] == $ibforums->vars['auth_group'])
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'email_change_v' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		if ( $ibforums->member['password'] !=  md5($ibforums->input['password']) )
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'wrong_pass' ) );
- 		}
- 		
- 		//--------------------------------------------
- 		
- 		$email_one    = strtolower( trim($ibforums->input['in_email_1']) );
- 		$email_two    = strtolower( trim($ibforums->input['in_email_2']) );
- 		
- 		if ($email_one != $email_two)
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'email_addy_mismatch' ) );
-		}
-		
-		//--------------------------------------------
-		
-		$email_one = $std->clean_email($email_one);
-		
-		if ( $email_one == "" )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_email' ) );
-		}
-		
-		//--------------------------------------------
-		
-		if (! $ibforums->vars['allow_dup_email'] )
-		{
-			$DB->query("SELECT id FROM ibf_members WHERE email='".$email_one."'");
-			
-			$email_check = $DB->fetch_row();
-			
-			if ($email_check['id'])
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'email_exists' ) );
-			}
-		}
-		
-		//--------------------------------------------
-		// Check in banned list
-		//--------------------------------------------
-		
-		if ($ibforums->vars['ban_email'])
-		{
-			$ips = explode( "|", $ibforums->vars['ban_email'] );
-			
-			foreach ($ips as $ip)
-			{
-				$ip = preg_replace( "/\*/", '.*' , $ip );
-				
-				if ( preg_match( "/$ip/", $email_one ) )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'banned_email' ) );
-				}
-			}
-		}
-		
-		if ($ibforums->vars['bot_antispam'])
- 		{
-			//---------------------------
-			// Check the security code:
-			//---------------------------
-			
-			if ($ibforums->input['regid'] == "")
-			{
-				$this->email_change('err_security_code');
-				return "";
-			}
-			
-			$DB->query("SELECT * FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['regid']))."'");
-			
-			if ( ! $row = $DB->fetch_row() )
-			{
-				$this->email_change('err_security_code');
-				return "";
-			}
-			
-			if ( trim( intval($ibforums->input['reg_code']) ) != $row['regcode'] )
-			{
-				$this->email_change('err_security_code');
-				return "";
-			}
-			
-			$DB->query("DELETE FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['regid']))."'");
-		}
-		
-		//--------------------------------------------
- 		// Use sync module?
- 		//--------------------------------------------
- 		
- 		if ( USE_MODULES == 1 )
-		{
-			$this->modules->register_class(&$this);
-    		$this->modules->on_email_change($ibforums->member['id'], $email_one);
-   		}
-		
-		//--------------------------
-		
-		if ($ibforums->vars['reg_auth_type'])
-		{
-			$validate_key = md5( $std->make_password() . time() );
-			
-			//--------------------------------------------
-			// Update the new email, but enter a validation key
-			// and put the member in "awaiting authorisation"
-			// and send an email..
-			//--------------------------------------------
-			
-			$db_str = $DB->compile_db_insert_string( array (
-															 'vid'         => $validate_key,
-															 'member_id'   => $this->member['id'],
-															 'real_group'  => $this->member['mgroup'],
-															 'temp_group'  => $ibforums->vars['auth_group'],
-															 'entry_date'  => time(),
-															 'coppa_user'  => 0,
-															 'email_chg'   => 1,
-															 'ip_address'  => $ibforums->input['IP_ADDRESS']
-												   )       );
-			
-			$DB->query("INSERT INTO ibf_validating ({$db_str['FIELD_NAMES']}) VALUES({$db_str['FIELD_VALUES']})");
-			
-			$DB->query("UPDATE ibf_members SET mgroup=".$ibforums->vars['auth_group'].", email='$email_one' WHERE id=".$this->member['id']);
-			
-			// Update their session with the new member group
-			
-			if ($ibforums->session_id)
-			{
-				$DB->query("UPDATE ibf_sessions SET member_name='', member_id=0, member_group=".$ibforums->vars['guest_group']." WHERE member_id=".$this->member['id']." and id='".$ibforums->session_id."'");
- 			}
- 			
- 			// Kill the cookies to stop auto log in
- 			
- 			$std->my_setcookie( 'pass_hash'  , '-1', 0 );
- 			$std->my_setcookie( 'member_id'  , '-1', 0 );
- 			$std->my_setcookie( 'session_id' , '-1', 0 );
- 			
- 			// Dispatch the mail, and return to the activate form.
- 			
- 			$this->email->get_template("newemail");
-				
-			$this->email->build_message( array(
-												'NAME'         => $this->member['name'],
-												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&type=newemail&uid=".$this->member['id']."&aid=".$validate_key,
-												'ID'           => $this->member['id'],
-												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=07",
-												'CODE'         => $validate_key,
-											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['lp_subject'].' '.$ibforums->vars['board_name'];
-			$this->email->to      = $email_one;
-			
-			$this->email->send_mail();
-			
-			$print->redirect_screen( $ibforums->lang['ce_redirect'], 'act=Reg&CODE=07' );
-		}
-		else
-		{
-			// No authorisation needed, change email addy and return
-			
-			$DB->query("UPDATE ibf_members SET email='$email_one' WHERE id='".$this->member['id']."'");
-			
-			$print->redirect_screen( $ibforums->lang['email_changed_now'], 'act=UserCP&CODE=00' );
-			
-		}
- 	}
- 	
- 	//*******************************************************************/
- 	//| tracker:
- 	//|
- 	//| Print the subscribed topics listings
- 	//*******************************************************************/
- 	
- 	function tracker() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$this->output .= $this->html->subs_header();
- 		
- 		//----------------------------------------------------------
- 		// Are we checking for auto-prune?
- 		//----------------------------------------------------------
- 		
- 		$auto_explain = $ibforums->lang['no_auto_prune'];
- 		
- 		if ($ibforums->vars['subs_autoprune'] > 0)
- 		{
-			if ( time() % 2 )
-			{
-				// Every now and again..
-				
-				$time_limit = time() - ($ibforums->vars['subs_autoprune'] * 86400);
-				
-				$DB->query("SELECT tr.trid FROM ibf_tracker tr, ibf_topics t WHERE t.tid=tr.topic_id AND t.last_post < '$time_limit'");
-				
-				$trids = array();
-				
-				while ( $r = $DB->fetch_row() )
-				{
-					$trids[] = $r['trid'];
-				}
-				
-				if (count($trids) > 0)
-				{
-					$DB->query("DELETE FROM ibf_tracker WHERE trid IN (".implode(",",$trids).")");
-				}
-			}
-			
-			$auto_explain = sprintf( $ibforums->lang['auto_prune'], $ibforums->vars['subs_autoprune'] );
- 		}
- 		
- 		//----------------------------------------------------------
- 		// Do we have an incoming date cut?
- 		//----------------------------------------------------------
- 		
- 		$date_cut   = intval($ibforums->input['datecut']) != "" ? intval($ibforums->input['datecut']) : 30;
- 		
- 		$date_query = $date_cut != 1000 ? " AND t.last_post > '".(time() - ($date_cut*86400))."' " : "";
- 		
- 		//----------------------------------------------------------
- 		// Query the DB for the subby toppy-ics - at the same time
- 		// we get the forum and topic info, 'cos we rule.
- 		//----------------------------------------------------------
- 		
- 		$DB->query("SELECT s.trid, s.member_id, s.topic_id, s.last_sent, s.start_date as track_started, t.*, f.id as forum_id, f.name as forum_name, f.read_perms "
- 		          ."FROM ibf_tracker s, ibf_topics t, ibf_forums f "
- 		          ."WHERE s.member_id='".$this->member['id']."' AND t.tid=s.topic_id AND f.id=t.forum_id $date_query"
- 		          ."ORDER BY f.id, t.last_post DESC");
- 		          
- 		if ( $DB->get_num_rows() )
- 		{
- 		
- 			$last_forum_id = -1;
- 		
- 			while( $topic = $DB->fetch_row() )
- 			{
- 			
- 				if ($last_forum_id != $topic['forum_id'])
- 				{
- 					$last_forum_id = $topic['forum_id'];
- 					
- 					$this->output .= $this->html->subs_forum_row($topic['forum_id'], $topic['forum_name']);
- 				}
- 			
-				$topic['last_poster'] = ($topic['last_poster_id'] != 0)
-										? "<b><a href='{$this->base_url}act=Profile&CODE=03&MID={$topic['last_poster_id']}'>{$topic['last_poster_name']}</a></b>"
-										: "-".$topic['last_poster_name']."-";
-									
-				$topic['starter']     = ($topic['starter_id']     != 0)
-										? "<a href='{$this->base_url}act=Profile&CODE=03&MID={$topic['starter_id']}'>{$topic['starter_name']}</a>"
-										: "-".$topic['starter_name']."-";
-			 
-				if ($topic['poll_state'])
-				{
-					$topic['prefix']     = $ibforums->vars['pre_polls'].' ';
-				}
-			
-				$topic['folder_icon']    = $std->folder_icon($topic);
-				
-				$topic['topic_icon']     = $topic['icon_id']  ? '<img src="'.$ibforums->vars[html_url] . '/icon' . $topic['icon_id'] . '.gif" border="0" alt="">'
-										 : '&nbsp;';
-																	  
-				if ($topic['pinned'])
-				{
-					$topic['topic_icon']       = "<{B_PIN}>";
-				}
-				
-				$topic['start_date'] = $std->get_date( $topic['track_started'], 'LONG' );
-				
-				if ($topic['description'])
-				{
-					$topic['description'] = $topic['description'].'<br>';
-				}
-			
-			
-				$pages = 1;
-				
-				if ($topic['posts'])
-				{
-					if ( (($topic['posts'] + 1) % $ibforums->vars['display_max_posts']) == 0 )
-					{
-						$pages = ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'];
-					}
-					else
-					{
-						$number = ( ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'] );
-						$pages = ceil( $number);
-					}
-					
-				}
-				
-				if ($pages > 1) {
-					$topic['PAGES'] = "<span class='small'>({$ibforums->lang['topic_sp_pages']} ";
-					for ($i = 0 ; $i < $pages ; ++$i ) {
-						$real_no = $i * $ibforums->vars['display_max_posts'];
-						$page_no = $i + 1;
-						if ($page_no == 4) {
-							$topic['PAGES'] .= "<a href='{$this->base_url}act=ST&f={$this->forum['id']}&t={$topic['tid']}&st=" . ($pages - 1) * $ibforums->vars['display_max_posts'] . "'>...$pages </a>";
-							break;
-						} else {
-							$topic['PAGES'] .= "<a href='{$this->base_url}act=ST&f={$this->forum['id']}&t={$topic['tid']}&st=$real_no'>$page_no </a>";
-						}
-					}
-					$topic['PAGES'] .= ")</span>";
-				}
-				
-				if ($topic['posts'] < 0) $topic['posts'] = 0;
-				
-				// Do the quick goto last page icon stuff
-				
-				$topic['last_post_date']  = $std->get_date( $topic['last_post'], 'LONG' );
-				
-				$this->output .= $this->html->subs_row($topic);
-			}
-			
-		}
-		else
-		{
-			$this->output .= $this->html->subs_none();
-		}
-		
-		// Build date box
-		
-		$date_box = "<option value='1'>".$ibforums->lang['subs_today']."</option>\n";
-		
-		foreach( array( 1,7,14,21,30,60,90,365 ) as $day )
-		{
-			$selected = $day == $date_cut ? ' selected' : '';
-				
-			$date_box .= "<option value='$day'$selected>".sprintf( $ibforums->lang['subs_day'], $day )."</option>\n";
-		}
-		
-		$date_box .= "<option value='1000'>".$ibforums->lang['subs_all']."</option>\n";
-			
-		$this->output .= $this->html->subs_end($auto_explain, $date_box);
- 		
-		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_delete_tracker() {
- 		global $ibforums, $std, $DB;
- 		
- 		//--------------------------------------
- 		// Get the ID's to delete
- 		//--------------------------------------
- 		
- 		if ($ibforums->input['request_method'] != 'post')
- 		{
- 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
- 		}
- 		
- 		$ids = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^id-(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		if ( count($ids) > 0 )
- 		{
- 			$DB->query("DELETE from ibf_tracker WHERE member_id='".$this->member['id']."' and trid IN (".implode( ",", $ids ).")");
- 		}
- 			
- 	    $std->boink_it($this->base_url."act=UserCP&CODE=26");
- 		
- 	}
- 	
- 	//*******************************************************************/
- 	//| SKIN LANGS:
- 	//|
- 	//| Change skin and languages prefs.
- 	//*******************************************************************/
- 	
- 	function skin_langs() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		// A serialized array holds our langauge settings.
- 		// The array is: 1 => array( '$dir', '$name'), 2 => ... etc
- 		
- 		
- 		$lang_array = array();
- 		
- 		$lang_select = "<select name='u_language' class='forminput'>\n";
-		
-		$DB->query("SELECT ldir, lname FROM ibf_languages");
-		
-		while ( $l = $DB->fetch_row() )
-		{
-			$lang_select .= $l['ldir'] == $this->member['language'] ? "<option value='{$l['ldir']}' selected>{$l['lname']}</option>"
- 															        : "<option value='{$l['ldir']}'>{$l['lname']}</option>";
-		}
- 		
- 		$lang_select .= "</select>";
- 		
- 		$this->output .= $this->html->skin_lang_header($lang_select, $this->md5_check);
- 		
- 		if ($ibforums->vars['allow_skins'] == 1)
- 		{
- 			
- 			$DB->query("SELECT uid, sid, sname FROM ibf_skins WHERE hidden <> 1");
- 			
- 			if ( $DB->get_num_rows() )
- 			{
- 			
-				$skin_select = "<select name='u_skin' class='forminput'>\n";
-			
-				while ( $s = $DB->fetch_row() )
-				{
-					$skin_select .= $s['sid'] == $this->member['skin'] ? "<option value='{$s['sid']}' selected>{$s['sname']}</option>"
-																       : "<option value='{$s['sid']}'>{$s['sname']}</option>";
-				}
-				
-				$skin_select .= "</select>";
-				
-			}
-		
-			$this->output .= $this->html->settings_skin($skin_select);
-		}
-		
-		$this->output .= $this->html->skin_lang_end();
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_skin_langs() {
- 	
- 		$this->lib->do_skin_langs();
- 		
- 	}
- 	
- 	
- 	//*******************************************************************/
- 	//| BOARD PREFS:
- 	//|
- 	//| Set up view avatar, sig, time zone, etc.
- 	//*******************************************************************/
- 	
- 	function board_prefs() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$time = $std->get_date( time(), 'LONG' );
- 		
- 		// Do we have a user stored offset, or use the board default:
- 		
- 		$offset = ( $ibforums->member['time_offset'] != "" ) ? $ibforums->member['time_offset'] : $ibforums->vars['time_offset'];
- 		
- 		$time_select = "<select name='u_timezone' class='forminput'>";
- 		
- 		// Loop through the langauge time offsets and names to build our
- 		// HTML jump box.
- 		
- 		foreach( $ibforums->lang as $off => $words )
- 		{
- 			if (preg_match("/^time_(\S+)$/", $off, $match))
- 			{
-				$time_select .= $match[1] == $offset ? "<option value='{$match[1]}' selected='selected'>$words</option>"
-												     : "<option value='{$match[1]}'>$words</option>";
- 			}
- 		}
- 		
- 		$time_select .= "</select>";
- 		
- 		// Print out the header..
- 		
- 		if ($ibforums->member['dst_in_use'])
- 		{
- 			$dst_check = 'checked';
- 		}
- 		else
- 		{
- 			$dst_check = '';
- 		}
- 		
- 		//---------------------
- 		
- 		if ($ibforums->vars['postpage_contents'] == "")
-		{
-			$ibforums->vars['postpage_contents'] = '5,10,15,20,25,30,35,40';
-		}
-		
-		if ($ibforums->vars['topicpage_contents'] == "")
-		{
-			$ibforums->vars['topicpage_contents'] = '5,10,15,20,25,30,35,40';
-		}
- 		
- 		list($post_page, $topic_page) = explode( "&", $ibforums->member['view_prefs'] );
- 		
- 		if ($post_page == "")
- 		{
- 			$post_page = -1;
- 		}
- 		if ($topic_page == "")
- 		{
- 			$topic_page = -1;
- 		}
- 		
- 		$pp_a = array();
- 		$tp_a = array();
- 		$post_select  = "";
- 		$topic_select = "";
- 		
- 		$pp_a[] = array( '-1', $ibforums->lang['pp_use_default'] );
- 		$tp_a[] = array( '-1', $ibforums->lang['pp_use_default'] );
- 		
- 		foreach( explode( ',', $ibforums->vars['postpage_contents'] ) as $n )
- 		{
- 			$n      = intval(trim($n));
- 			$pp_a[] = array( $n, $n );
- 		}
- 		
- 		foreach( explode( ',', $ibforums->vars['topicpage_contents'] ) as $n )
- 		{
- 			$n      = intval(trim($n));
- 			$tp_a[] = array( $n, $n );
- 		}
- 		
- 		//---------------------
- 		
- 		foreach( $pp_a as $id => $data )
- 		{
- 			$post_select .= ($data[0] == $post_page) ? "<option value='{$data[0]}' selected='selected'>{$data[1]}\n" : "<option value='{$data[0]}'>{$data[1]}\n";
- 		}
- 		
- 		foreach( $tp_a as $id => $data )
- 		{
- 			$topic_select .= ($data[0] == $topic_page) ? "<option value='{$data[0]}' selected='selected'>{$data[1]}\n" : "<option value='{$data[0]}'>{$data[1]}\n";
- 		}
- 		
- 		
- 		//---------------------
- 		
- 		$this->output .= $this->html->settings_header($this->member, $time_select, $time, $dst_check, $this->md5_check);
- 		
- 		$hide_sess   = $std->my_getcookie('hide_sess');
- 		
- 		$open_qreply = $std->my_getcookie("open_qr");
- 		
- 		if ( $open_qreply == FALSE )
- 		{
- 			$open_qreply = 0;
- 		}
- 		
- 		// View avatars, signatures and images..
- 		
- 		$view_ava  = "<select name='VIEW_AVS' class='forminput'>";
- 		$view_sig  = "<select name='VIEW_SIGS' class='forminput'>";
- 		$view_img  = "<select name='VIEW_IMG' class='forminput'>";
- 		$view_pop  = "<select name='DO_POPUP' class='forminput'>";
- 		$html_sess = "<select name='HIDE_SESS' class='forminput'>";
- 		$html_qr   = "<select name='OPEN_QR' class='forminput'>";
- 		
- 		$view_ava .= $this->member['view_avs'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
- 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
- 		
- 		$view_sig .= $this->member['view_sigs'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
- 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
- 		
- 		$view_img .= $this->member['view_img'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
- 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
- 											  
- 		$view_pop .= $this->member['view_pop'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
- 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
- 		
- 		$html_sess .= $hide_sess == 1          ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
- 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
- 		
- 		$html_qr   .= $open_qreply == 1        ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
- 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
- 		
- 		
- 		
- 		
- 		$this->output .= $this->html->settings_end( array ( 'IMG'  => $view_img."</select>",
- 															'SIG'  => $view_sig."</select>",
- 															'AVA'  => $view_ava."</select>",
- 															'POP'  => $view_pop."</select>",
- 															'SESS' => $html_sess."</select>",
- 															'QR'   => $html_qr."</select>",
- 															'TPS'  => $topic_select,
- 															'PPS'  => $post_select,
- 												  )       );
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
-
- 	function do_board_prefs() {
- 	
- 		$this->lib->do_board_prefs();
- 		
- 	}
- 	
- 	//*******************************************************************/
- 	//| EMAIL SETTINGS:
- 	//|
- 	//| Set up the email stuff.
- 	//*******************************************************************/
- 	
- 	function email_settings() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		// PM_REMINDER: First byte = Email PM when received new
- 		//   			Second byte= Show pop-up when new PM received
- 						
- 		
- 		$info = array();
- 		
- 		foreach ( array(hide_email, allow_admin_mails, email_full, email_pm, auto_track) as $k )
- 		{
- 			if (!empty($this->member[ $k ]))
- 			{
- 				$info[$k] = 'checked';
- 			}
- 		}
- 		
- 		$info['key'] = $this->md5_check;
- 		
- 		$this->output .= $this->html->email($info);
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_email_settings() {
- 	
- 		$this->lib->do_email_settings();
- 		
- 	}
- 	
- 	
- 	//*******************************************************************/
- 	//| custom sort routine:
- 	//|
- 	//| Like wot is seys on the tin
- 	//*******************************************************************/
- 	
- 	function sort_avatars($a, $b)
- 	{
- 		$aa = strtolower($a[1]);
- 		$bb = strtolower($b[1]);
- 		
- 		if ( $aa == $bb ) return 0;
- 		
- 		return ( $aa > $bb ) ? 1 : -1;
- 	}
- 	
- 	
- 	//*******************************************************************/
- 	//| AVATAR:
- 	//|
- 	//| Displays the avatar choices
- 	//*******************************************************************/
- 	
- 	function avatar_gallery()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		$avatar_gallery    = array();
- 		$av_categories     = array( 0 => array( "root", $ibforums->lang['av_root'] ) );
- 		
- 		$av_cat_selected   = preg_replace( "/[^\w\s_\-]/", "", $ibforums->input['av_cat'] );
- 		$av_cat_found      = FALSE;
- 		$av_human_readable = "";
- 		
- 		if ($av_cat_selected == 'root')
- 		{
- 			$av_cat_selected   = "";
- 			$av_human_readable = $ibforums->lang['av_root'];
- 		}
- 		
- 		//------------------------------------------
- 		// Get the avatar categories
- 		//------------------------------------------
- 		
- 		$dh = opendir( $ibforums->vars['html_dir'].'avatars' );
- 		
- 		while ( $file = readdir( $dh ) )
- 		{
-			if ( is_dir( $ibforums->vars['html_dir'].'avatars'."/".$file ) )
-			{
-				if ( $file != "." && $file != ".." )
-				{
-					if ( $file == $av_cat_selected )
-					{
-						$av_cat_found      = TRUE;
-						$av_human_readable = str_replace( "_", " ", $file );
-					}
-					
-					$av_categories[] = array( $file, str_replace( "_", " ", $file ) );
-				}
-			}
- 		}
- 		
- 		closedir( $dh );
- 		
- 		//------------------------------------------
- 		// SORT IT OUT YOU MUPPET!!
- 		//------------------------------------------
- 		
- 		usort( $av_categories, array( 'UserCP', 'sort_avatars' ) );
- 		reset( $av_categories );
- 		
- 		//------------------------------------------
- 		// Did we find the directory?
- 		//------------------------------------------
- 		
- 		if ($av_cat_selected)
- 		{
- 			if ( $av_cat_found != TRUE )
- 			{
- 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'av_no_gallery' ) );
- 			}
- 			
- 			$av_cat_real = "/".$av_cat_selected;
- 		}
- 		
- 		//------------------------------------------
- 		// Get the avatar images for this category
- 		//------------------------------------------
- 		
- 		$dh = opendir( $ibforums->vars['html_dir'].'avatars'.$av_cat_real);
- 		
- 		while ( $file = readdir( $dh ) )
- 		{
- 			if ( ! preg_match( "/^..?$|^index|^\.ds_store|^\.htaccess/i", $file ) )
- 			{
- 				if ( is_file( $ibforums->vars['html_dir'].'avatars'.$av_cat_real."/".$file) )
- 				{
- 					if ( preg_match( "/\.(gif|jpg|jpeg|png|swf)$/i", $file ) )
- 					{
- 						$av_gall_images[] = $file;
- 					}
- 				}
- 			}
- 		}
- 		
- 		//------------------------------------------
- 		// SORT IT OUT YOU PLONKER!!
- 		//------------------------------------------
- 		
- 		if ( is_array($av_gall_images) and count($av_gall_images) )
- 		{
- 			natcasesort($av_gall_images);
- 			reset($av_gall_images);
- 		}
- 		
- 		//------------------------------------------
- 		// Render drop down box..
- 		//------------------------------------------
- 		
- 		$av_gals = "<select name='av_cat' class='forminput'>\n";
- 		
- 		foreach( $av_categories as $cat )
- 		{
- 			$av_gals .= "<option value='".$cat[0]."'>".$cat[1]."</option>\n";
- 		}
- 		
- 		$av_gals .= "</select>\n";
- 		
- 		closedir( $dh );
- 		
- 		$gal_cols = $ibforums->vars['av_gal_cols'] == "" ? 5 : $ibforums->vars['av_gal_cols'];
- 		$gal_rows = $ibforums->vars['av_gal_rows'] == "" ? 3 : $ibforums->vars['av_gal_rows'];
- 		
- 		$gal_found = count($av_gall_images);
- 		
- 		//------------------------------------------
- 		// Produce the avatar gallery sheet
- 		//------------------------------------------
- 		
- 		$this->output .= $this->html->avatar_gallery_start_table($av_human_readable,$av_gals,urlencode($av_cat_selected), $this->md5_check);
- 		
- 		$c = 0;
- 		
- 		if ( is_array($av_gall_images) and count($av_gall_images) )
- 		{
-			foreach( $av_gall_images as $img )
-			{
-				$c++;
-				
-				if ($c == 1)
-				{
-					$this->output .= $this->html->avatar_gallery_start_row();
-				}
-				
-				$this->output .= $this->html->avatar_gallery_cell_row(
-																	  $av_cat_real."/".$img,
-																	  str_replace( "_", " ", preg_replace( "/^(.*)\.\w+$/", "\\1", $img ) ),
-																	  urlencode($img)
-																	);
-				
-				
-				if ($c == $gal_cols)
-				{
-					$this->output .= $this->html->avatar_gallery_end_row();
-					
-					$c = 0;
-				}
-				
-			}
- 		}
- 		
- 		if ($c != $gal_cols)
- 		{
-			for ($i = $c ; $i < $gal_cols ; ++$i)
-			{
-				$this->output .= $this->html->avatar_gallery_blank_row();
-			}
-			
-			$this->output .= $this->html->avatar_gallery_end_row();
-		}
- 		
- 		$this->output .= $this->html->avatar_gallery_end_table();
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	//----------------------------------------------------------------------
- 	
- 	function avatar()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//------------------------------------------
- 		// Organise the dimensions
- 		//------------------------------------------
- 		
- 		list( $this->member['AVATAR_WIDTH'] , $this->member['AVATAR_HEIGHT']  ) = explode ("x", $this->member['avatar_size']);
- 		list( $ibforums->vars['av_width']   , $ibforums->vars['av_height']    ) = explode ("x", $ibforums->vars['avatar_dims']);
- 		list( $w, $h ) = explode ( "x", $ibforums->vars['avatar_def'] );
- 		
- 		//------------------------------------------
- 		// Get the users current avatar to display
- 		//------------------------------------------
- 		
- 		$my_avatar = $std->get_avatar( $this->member['avatar'], 1, $this->member['avatar_size'] );
- 		
- 		$my_avatar = $my_avatar ? $my_avatar : 'noavatar';
- 		
- 		//------------------------------------------
- 		// Get the avatar gallery
- 		//------------------------------------------
- 		
- 		$avatar_gallery    = array();
- 		$av_categories = array( 0 => array( "root", $ibforums->lang['av_root'] ) );
- 		
- 		//------------------------------------------
- 		// Get the avatar categories
- 		//------------------------------------------
- 		
- 		$dh = opendir( $ibforums->vars['html_dir'].'avatars' );
- 		
- 		while ( $file = readdir( $dh ) )
- 		{
-			if ( is_dir( $ibforums->vars['html_dir'].'avatars'."/".$file ) )
-			{
-				if ( $file != "." && $file != ".." )
-				{
-					if ( $file == $av_cat_selected )
-					{
-						$av_cat_found = TRUE;
-					}
-					
-					$av_categories[] = array( $file, str_replace( "_", " ", $file ) );
-				}
-			}
- 		}
- 		
- 		closedir( $dh );
- 		
- 		usort( $av_categories, array( 'UserCP', 'sort_avatars' ) );
- 		reset( $av_categories );
- 		
- 		//------------------------------------------
- 		// Get the avatar gallery selected
- 		//------------------------------------------
- 		
- 		$url_avatar = "http://";
- 		 		
- 		$avatar_type = "na";
- 		
- 		if ( ($this->member['avatar'] != "") and ($this->member['avatar'] != "noavatar") )
- 		{
- 			if ( preg_match( "/^upload:/", $this->member['avatar'] ) )
- 			{
- 				$avatar_type = "upload";
- 			}
-			else if ( !preg_match( "/^http/i", $this->member['avatar'] ) )
-			{
-				$avatar_type = "gallery";
-			}
-			else
-			{
-				$url_avatar = $this->member['avatar'];
-				$avatar_type = "url";
-			}
- 		}
- 		
- 		//------------------------------------------
- 		// Render drop down box..
- 		//------------------------------------------
- 		
- 		$av_gals = "<select name='av_cat' class='forminput'>\n";
- 		
- 		foreach( $av_categories as $cat )
- 		{
- 			$av_gals .= "<option value='".$cat[0]."'>".$cat[1]."</option>\n";
- 		}
- 		
- 		$av_gals .= "</select>\n";
- 		
- 		
- 		//------------------------------------------
- 		// Rest of the form..
- 		//------------------------------------------
- 		
- 		$formextra   = "";
- 		$hidden_field = "";
- 		
- 		if ($ibforums->member['g_avatar_upload'] == 1)
- 		{
- 			$formextra    = " enctype='multipart/form-data'";
-			$hidden_field = "<input type='hidden' name='MAX_FILE_SIZE' value='".($ibforums->vars['avup_size_max']*1024)."' />";
-		}
- 		
- 		$this->output .= $this->html->avatar_main( array (
-															'MEMBER'               => $this->member,
-															'avatar_galleries'     => $av_gals,
-															'current_url_avatar'   => $url_avatar,
-															'current_avatar_image' => $my_avatar,
-															'current_avatar_type'  => $ibforums->lang['av_t_'.$avatar_type],
-															'current_avatar_dims'  => $this->member['avatar_size'] == "x" ? "" : $this->member['avatar_size'],
-												 )  , $formextra, $hidden_field, $this->md5_check     );
-		
-		//------------------------------------------
- 		// Autosizing or manual sizing?
- 		//------------------------------------------
- 												 
-		$size_html = $ibforums->vars['disable_ipbsize'] ? $this->html->avatar_mansize() : $this->html->avatar_autosize();
- 		
-		//------------------------------------------
- 		// Can we use a URL avatar?
- 		//------------------------------------------
- 		
- 		if ($ibforums->vars['avatar_url'])
- 		{											 
- 			$this->output = str_replace( "<!--IBF.EXTERNAL_TITLE-->",  $this->html->avatar_external_title(), $this->output );
- 			$this->output = str_replace( "<!--IBF.URL_AVATAR-->",  $this->html->avatar_url_field($url_avatar), $this->output );
- 			$this->output = str_replace( "<!--IPB.SIZE-->", $size_html, $this->output );
- 			$ibforums->lang['av_text_url'] = sprintf( $ibforums->lang['av_text_url'], $ibforums->vars['av_width'], $ibforums->vars['av_height'] );
- 		}
- 		else
- 		{
- 			$ibforums->lang['av_text_url'] = "";
- 		}
- 		
- 		//------------------------------------------
- 		// Can we use an uploaded avatar?
- 		//------------------------------------------
- 		
-		if ($ibforums->member['g_avatar_upload'] == 1)
-		{
-			$this->output = str_replace( "<!--IBF.EXTERNAL_TITLE-->",  $this->html->avatar_external_title(), $this->output );
-			$this->output = str_replace( "<!--IBF.UPLOAD_AVATAR-->", $this->html->avatar_upload_field($text), $this->output );
-			$this->output = str_replace( "<!--IPB.SIZE-->", $size_html, $this->output );
-			$ibforums->lang['av_text_upload'] = sprintf( $ibforums->lang['av_text_upload'], $ibforums->vars['avup_size_max'] );
-		}
-		else
-		{
-			$ibforums->lang['av_text_upload'] = "";
-		}
-		
-		//------------------------------------------
- 		// If yes, show little thingy at top
- 		//------------------------------------------
- 		
- 		$ibforums->lang['av_allowed_files'] = sprintf($ibforums->lang['av_allowed_files'], implode (' .', explode( "|", $ibforums->vars['avatar_ext'] ) ) );
- 		
- 		if ( $ibforums->vars['allow_flash'] != 1 )
-		{
-			$ibforums->lang['av_allowed_files'] = str_replace( ".swf", "", $ibforums->lang['av_allowed_files'] );
-		}
-		
-		$this->output = str_replace( "<!--IBF.LIMITS_AVATAR-->", $this->html->avatar_limits(), $this->output );
-		
- 			
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_avatar() {
- 	
- 		$this->lib->do_avatar();
- 		
- 	}
- 	
- 	//*******************************************************************/
- 	//| SIGNATURE:
- 	//|
- 	//| Displays the signature form
- 	//*******************************************************************/
- 	
- 	function signature()
- 	{
- 		global $ibforums, $DB, $std, $print;
- 		
-		$t_sig = $this->parser->unconvert( $this->member['signature'], $ibforums->vars['sig_allow_ibc'], $ibforums->vars['sig_allow_html'] );
-		
-		$ibforums->lang['the_max_length'] = $ibforums->vars['max_sig_length'] ? $ibforums->vars['max_sig_length'] : 0;
-		
-		if ( $ibforums->vars['sig_allow_html'] == 1 )
-		{
-			$this->member['signature'] = $this->parser->parse_html($this->member['signature'], 0);
-		}
- 		
- 		$this->output .= $this->html->signature($this->member['signature'], $t_sig, $std->return_md5_check());
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 		
- 	}
- 	
- 	function do_signature() {
- 	
- 		$this->lib->do_signature();
- 	
- 	}
- 	
- 	//*******************************************************************/
- 	//| PERSONAL:
- 	//|
- 	//| Displays the personal info form
- 	//*******************************************************************/
- 	
- 	function personal() {
- 		global $ibforums, $DB, $std, $print;
- 		
- 		//-----------------------------------------------
-		// Check to make sure that we can edit profiles..
-		//-----------------------------------------------
-		
-		if (empty($ibforums->member['g_edit_profile']))
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cant_use_feature' ) );
-		}
-		
-		//-----------------------------------------------
-		// Format the birthday drop boxes..
-		//-----------------------------------------------
-		
-		$date = getdate();
-		
-		$day  = "<option value='0'>--</option>";
-		$mon  = "<option value='0'>--</option>";
-		$year = "<option value='0'>--</option>";
-		
-		for ( $i = 1 ; $i < 32 ; $i++ )
-		{
-			$day .= "<option value='$i'";
-			
-			$day .= $i == $this->member['bday_day'] ? "selected>$i</option>" : ">$i</option>";
-		}
-		
-		for ( $i = 1 ; $i < 13 ; $i++ )
-		{
-			$mon .= "<option value='$i'";
-			
-			$mon .= $i == $this->member['bday_month'] ? "selected>{$ibforums->lang['month'.$i]}</option>" : ">{$ibforums->lang['month'.$i]}</option>";
-		}
-		
-		$i = $date['year'] - 1;
-		$j = $date['year'] - 100;
-		
-		for ( $i ; $j < $i ; $i-- )
-		{
-			$year .= "<option value='$i'";
-			
-			$year .= $i == $this->member['bday_year'] ? "selected>$i</option>" : ">$i</option>";
-		}
-		
-		//-----------------------------------------------
-		// Custom profile fields stuff
-		//-----------------------------------------------
-		
-		$required_output = "";
-		$optional_output = "";
-		$field_data     = array();
-		
-		$DB->query("SELECT * from ibf_pfields_content WHERE member_id='".$ibforums->member['id']."'");
-		
-		while ( $content = $DB->fetch_row() )
-		{
-			foreach($content as $k => $v)
-			{
-				if ( preg_match( "/^field_(\d+)$/", $k, $match) )
-				{
-					$field_data[ $match[1] ] = $v;
-					//break;
-				}
-			}
-		}
-		
-		$DB->query("SELECT * from ibf_pfields_data WHERE fedit=1 ORDER BY forder");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			$form_element = "";
-			
-			if ( $row['freq'] == 1 )
-			{
-				$ftype = 'required_output';
-			}
-			else
-			{
-				$ftype = 'optional_output';
-			}
-			
-			if ( $row['ftype'] == 'drop' )
-			{
-				$carray = explode( '|', trim($row['fcontent']) );
-				
-				$d_content = "";
-				
-				foreach( $carray as $entry )
-				{
-					$value = explode( '=', $entry );
-					
-					$ov = trim($value[0]);
-					$td = trim($value[1]);
-					
-					if ($ov !="" and $td !="")
-					{
-						$d_content .= ($field_data[$row['fid']] == $ov) ? "<option value='$ov' selected>$td</option>\n"
-																		: "<option value='$ov'>$td</option>\n";
-					}
-				}
-				
-				if ($d_content != "")
-				{
-					$form_element = $this->html->field_dropdown( 'field_'.$row['fid'], $d_content );
-				}
-			}
-			else if ( $row['ftype'] == 'area' )
-			{
-				$form_element = $this->html->field_textarea( 'field_'.$row['fid'], $field_data[$row['fid']] );
-			}
-			else
-			{
-				$form_element = $this->html->field_textinput( 'field_'.$row['fid'], $field_data[$row['fid']] );
-			}
-			
-			${$ftype} .= $this->html->field_entry( $row['ftitle'], $row['fdesc'], $form_element );
-		}
-		
-		//-----------------------------------------------
-		// Format the interest / location boxes
-		//-----------------------------------------------
-		
-		$this->member['location']  = $this->parser->unconvert( $this->member['location']  );
- 		$this->member['interests'] = $this->parser->unconvert( $this->member['interests'] );
- 		
- 		$this->member['key']       = $this->md5_check;
- 		
-		//-----------------------------------------------
-		// Suck up the HTML and swop some tags if need be
-		//-----------------------------------------------
-		
-		$this->output .= $this->html->personal_panel($this->member);
-		
-		if ( ($ibforums->vars['post_titlechange']) and ($this->member['posts'] > $ibforums->vars['post_titlechange']) )
-		{
-			$t_html = $this->html->member_title($this->member['title']);
-			$this->output = preg_replace( "/<!--\{MEMBERTITLE\}-->/", $t_html, $this->output );
-		}
-		
-		$t_html = $this->html->birthday($day, $mon, $year);
-		
-		$this->output = preg_replace( "/<!--\{BIRTHDAY\}-->/", $t_html, $this->output );
-		
-		//-----------------------------------------------
-		// Add in the custom fields if we need to.
-		//-----------------------------------------------
-		
-		if ($required_output != "")
-		{
-			$this->output = str_replace( "<!--{REQUIRED.FIELDS}-->", $this->html->required_title()."\n".$required_output.$this->html->required_end(), $this->output );
-		}
-		
-		if ($optional_output != "")
-		{
-			$this->output = str_replace( "<!--{OPTIONAL.FIELDS}-->", "\n".$optional_output, $this->output );
-		}
-		
-		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
-		
-	}
-	
-	function do_personal() {
-		
-		// Hand it straight to our library to keep this code clean and compact.
-		
-		$this->lib->do_profile();
-		
-	}
-	
-	
-	
- 	
- 	//*******************************************************************/
- 	//| SPLASH:
- 	//|
- 	//| Displays the intro screen
- 	//*******************************************************************/
- 	
- 	function splash() {
- 		global $ibforums, $DB, $std, $print;
- 		
-		//-----------------------------------------------
-		// Format the basic data
-		//-----------------------------------------------
-		
-		$info['MEMBER_EMAIL']    = $this->member['email'];
-		$info['DATE_REGISTERED'] = $std->get_date( $this->member['joined'], 'LONG' );
-		$info['MEMBER_POSTS']    = $this->member['posts'];
-		
-		$info['DAILY_AVERAGE']   = $ibforums->lang['no_posts'];
-		
-		if ($this->member['posts'] > 0 )
-		{
-			$diff = time() - $this->member['joined'];
-			$days = ($diff / 3600) / 24;
-			$days = $days < 1 ? 1 : $days;
-			$info['DAILY_AVERAGE']  = sprintf('%.2f', ($this->member['posts'] / $days) );
-		}
-		
-		//---------------------------------------------
- 		// Get the number of messages we have in total.
- 		//---------------------------------------------
- 		
- 		$DB->query("SELECT COUNT(*) as msg_total FROM ibf_messages WHERE member_id='".$this->member['id']."'");
- 		$total = $DB->fetch_row();
- 		
- 		//---------------------------------------------
- 		// Make sure we've not exceeded our alloted allowance.
- 		//---------------------------------------------
- 		
- 		$info['full_messenger'] = "";
- 		$info['full_percent']   = "";
- 		$info['space_free']     = "Unlimited";
- 		$info['total_messages'] = $total['msg_total'];
- 		
- 		if ($ibforums->member['g_max_messages'] > 0)
- 		{
- 			if ($total['msg_total'] >= $ibforums->member['g_max_messages'])
- 			{
- 				$info['full_messenger'] = "<span class='highlight'>".$ibforums->lang['folders_full']."</span>";
- 			}
- 			
- 			$info['full_percent'] = $total['msg_total'] ? sprintf( "%.0f", ( ($total['msg_total'] / $ibforums->member['g_max_messages']) * 100) ) : 0;
- 			$info['full_percent'] = "(". $info['full_percent'] .'% '. $ibforums->lang['total_capacity'] . ")";
- 			$info['space_free']   = $ibforums->member['g_max_messages'] - $total['msg_total'];
- 		}
- 		
-		
-		//-----------------------------------------------
-		// Write the data..
-		//-----------------------------------------------
-		
-		$s_array = array( 's' => 5 ,
-						  'm' => 7 ,
-						  'l' => 15
-						);
-		
-		$info['NOTES'] = $this->notes ? $this->notes : $ibforums->lang['note_pad_empty'];
-		
-		$info['SIZE']  = $s_array[$this->size];
-		
-		$info['SIZE_CHOICE'] = "";
-		
-		//------------------------------------
-		// If someone has cheated, fix it now.
-		//-------------------------------------
-		
-		if ( empty($info['SIZE']) )
-		{
-			$info['SIZE'] = '5';
-		}
-		
-		//-------------------------------------
-		// Make the choice HTML.
-		//-------------------------------------
-		
-		foreach ($s_array as $k => $v)
-		{
-			if ($v == $info['SIZE'])
-			{
-				$info['SIZE_CHOICE'] .= "<option value='$k' selected>{$ibforums->lang['ta_'.$k]}</option>";
-			}
-			else
-			{
-				$info['SIZE_CHOICE'] .= "<option value='$k'>{$ibforums->lang['ta_'.$k]}</option>";
-			}
-		}
- 		
- 		$info['NOTES'] = preg_replace( "/<br>/", "\n", $info['NOTES'] );
- 		
- 		$this->output .= $this->html->splash($info);
- 		
- 		// If no messenger, remove the links!
-    	
-    	if ( ! $ibforums->member['g_use_pm'])
-        {
-        	$this->output = preg_replace( "/<!-- MSG -->.+?<!-- END MSG -->/s", "", $this->output );
-        }
- 		
- 		$this->page_title = $ibforums->lang['t_welcome'];
- 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
- 	}
- 	
- 	
- 	
- 	
- 	
- 	
- 	//*******************************************************************/
- 	//| UPDATE_NOTEPAD:
- 	//|
- 	//| Displays the intro screen
- 	//*******************************************************************/
- 	
- 	function update_notepad() {
- 		global $ibforums, $DB, $std, $HTTP_POST_VARS;
- 		
- 		// Do we have an entry for this member?
- 		
- 		if ($HTTP_POST_VARS['act'] == "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
-		}
-		//+----------------------------------------
- 		
- 		$DB->query("SELECT id from ibf_member_extra WHERE id='".$this->member['id']."'");
- 		
- 		if ( $DB->get_num_rows() )
- 		{ 
- 			$DB->query("UPDATE ibf_member_extra SET notes='".$ibforums->input['notes']."', ta_size='".$ibforums->input['ta_size']."' WHERE id='".$this->member['id']."'");
- 		}
- 		else
- 		{
- 			$DB->query("INSERT INTO ibf_member_extra (id, notes, ta_size) ".
- 			           " VALUES ('".$this->member['id']."', '".$ibforums->input['notes']."', '".$ibforums->input['ta_size']."')");
- 		}
- 		
- 		$std->boink_it($this->base_url."act=UserCP&CODE=00");
- 		exit;
- 	}
- 	
- 	
- 	function show_image()
-	{
-		global $ibforums, $DB, $std;
-		
-		
-		if ( $ibforums->input['rc'] == "" )
-		{
-			return false;
-		}
-		
-		// Get the info from the db
-		
-		$DB->query("SELECT * FROM ibf_reg_antispam WHERE regid='".trim(addslashes($ibforums->input['rc']))."'");
-		
-		if ( ! $row = $DB->fetch_row() )
-		{
-			return false;
-		}
-		
-		//--------------------------------------------
-		// Using GD?
-		//--------------------------------------------
-		
-		if ( $ibforums->vars['bot_antispam'] == 'gd' )
-		{
-			$std->show_gd_img($row['regcode']);
-		}
-		else
-		{
-		
-			//--------------------------------------------
-			// Using normal then, check for "p"
-			//--------------------------------------------
-			
-			if ( $ibforums->input['p'] == "" )
-			{
-				return false;
-			}
-			
-			$p = intval($ibforums->input['p']) - 1; //substr starts from 0, not 1 :p
-			
-			$this_number = substr( $row['regcode'], $p, 1 );
-			
-			$std->show_gif_img($this_number);
-		}
-		
-	}
-        
-}
-
-?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_administration.php b/upload/sources/admin/ad_administration.php
new file mode 100644
index 00000000..937c9931
--- /dev/null
+++ b/upload/sources/admin/ad_administration.php
@@ -0,0 +1,3201 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Administration Module
+|   > Module written by Matt Mecham
+|   > Date started: 27th January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_administration {
+
+	var $functions = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Require and RUN !! THERES A BOMB
+		//-----------------------------------------
+		
+		$ibforums->admin->page_detail = "The cache manager allows you to view the contents of your cache and update them.";
+		$ibforums->admin->page_title  = "Cache Manager";
+
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		// What to do...
+		//-----------------------------------------
+		
+		switch($ibforums->input['code'])
+		{
+			
+			case 'cacheend':
+				$this->cache_end();
+				break;
+				
+			case 'viewcache':
+				$this->view_cache();
+				break;
+				
+			case 'bbcode':
+				$this->bbcode_start();
+			    break;
+			    
+			case 'bbcode_add':
+				$this->bbcode_form('add');
+				break;
+				
+			case 'bbcode_doadd':
+				$this->bbcode_save('add');
+				break;
+				
+			case 'bbcode_edit':
+				$this->bbcode_form('edit');
+				break;
+				
+			case 'bbcode_doedit':
+				$this->bbcode_save('edit');
+				break;
+				
+			case 'bbcode_test':
+				$this->bbcode_test();
+				break;
+				
+			case 'bbcode_delete':
+				$this->bbcode_delete();
+				break;
+				
+			case 'bbcode_export':
+				$this->bbcode_export();
+				break;
+				
+			case 'bbcode_import':
+				$this->bbcode_import();
+				break;
+				
+			//-----------------------------------------
+			// Emu?
+			//-----------------------------------------
+			
+			case 'emo':
+				$this->emoticon_start();
+				break;
+				
+			case 'emo_packsplash':
+				$this->emoticon_pack_splash();
+				break;
+				
+			case 'emo_packexport':
+				$this->emoticon_pack_export();
+				break;
+			
+			case 'emo_packimport':
+				$this->emoticon_pack_import();
+				break;
+				
+			case 'emo_manage':
+				$this->emoticon_manage();
+				break;
+				
+			case 'emo_doedit':
+				$this->emoticon_edit();
+				break;
+					
+			case 'emo_doadd':
+				$this->emoticon_add();
+				break;
+				
+			case 'emo_remove':
+				$this->emoticon_remove();
+				break;
+				
+			case 'emo_setadd':
+				$this->emoticon_setalter($type='add');
+				break;
+				
+			case 'emo_setedit':
+				$this->emoticon_setalter($type='edit');
+				break;
+				
+			case 'emo_setremove':
+				$this->emoticon_setremove();
+				break;
+			
+			case 'emo_upload':
+				$this->emoticon_upload();		
+			
+			//-----------------------------------------
+			// Badword
+			//-----------------------------------------
+			
+			case 'badword':
+				$this->badword_start();
+				break;
+				
+			case 'badword_add':
+				$this->badword_add();
+				break;
+				
+			case 'badword_remove':
+				$this->badword_remove();
+				break;
+				
+			case 'badword_edit':
+				$this->badword_edit();
+				break;
+				
+			case 'badword_doedit':
+				$this->badword_doedit();
+				break;
+				
+			case 'badword_export':
+				$this->badword_export();
+				break;
+				
+			case 'badword_import':
+				$this->badword_import();
+				break;
+				
+			//-----------------------------------------
+			// BAN (d-aid)
+			//-----------------------------------------
+			
+			case 'ban':
+				$this->ban_start();
+				break;
+			case 'ban_add':
+				$this->ban_add();
+				break;
+			case 'ban_delete':
+				$this->ban_delete();
+				break;
+				
+			default:
+				$this->cache_start();
+				break;
+		}
+	}
+	
+	//-----------------------------------------
+	// BAN: Rebuild cache
+	//-----------------------------------------
+	
+	function ban_rebuildcache()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->cache['banfilters'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'ban_content', 'from' => 'banfilters', 'where' => "ban_type='ip'" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['banfilters'][] = $r['ban_content'];
+		}
+		
+		$std->update_cache( array( 'name' => 'banfilters', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	// BAN: DELETE
+	//-----------------------------------------
+	
+	function ban_delete()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ids = array();
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^id_(\d+)$/", $key, $match ) )
+			{
+				if ( $ibforums->input[$match[0]] )
+				{
+					$ids[] = $match[1];
+				}
+			}
+		}
+		
+		if ( count( $ids ) )
+		{
+			$DB->simple_construct( array( 'delete' => 'banfilters', 'where' => 'ban_id IN('.implode( ",",$ids ).')' ) );
+			$DB->simple_exec();
+		}
+		
+		$this->ban_rebuildcache();
+		
+		$ibforums->main_msg = "Ban filters removed";
+		$this->ban_start();
+	}
+	
+	//-----------------------------------------
+	// BAN: ADD
+	//-----------------------------------------
+	
+	function ban_add()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ( ! $ibforums->input['bantext'] )
+		{
+			$ibforums->main_msg = "You must enter something to add to the ban filters!";
+			$this->ban_start();
+		}
+		
+		//-----------------------------------------
+		// Check for existing entry
+		//-----------------------------------------
+		
+		$result = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'banfilters', 'where' => "ban_content='{$ibforums->input['bantext']}' and ban_type='{$ibforums->input['bantype']}'" ) );
+		
+		if ( $result['ban_id'] )
+		{
+			$ibforums->main_msg = "Duplicate entry, entry not added to the ban filters database.";
+			$this->ban_start();
+		}
+		
+		$DB->do_insert( 'banfilters', array( 'ban_type' => $ibforums->input['bantype'], 'ban_content' => $ibforums->input['bantext'], 'ban_date' => time() ) );
+		
+		$this->ban_rebuildcache();
+		
+		$ibforums->main_msg = "Ban filter added";
+		
+		$this->ban_start();
+		
+	}
+	
+	//-----------------------------------------
+	// BAN: START
+	//-----------------------------------------
+	
+	function ban_start()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Ban Control";
+		
+		$ibforums->admin->page_detail = "This section allows you to modify, delete or add IP addresses, email addresses and reserved names to the ban filters.
+										 <br /><strong>You can use * as a wildcard in any IP or email filter. (Example: 127.0.*, *@yahoo.com)</strong>";
+		
+		//-----------------------------------------
+		// Get things
+		//-----------------------------------------
+		
+		$ban = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'banfilters', 'order' => 'ban_date desc' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ban[ $r['ban_type'] ][ $r['ban_id'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// SHOW THEM!
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'ban_delete'),
+												 				 2 => array( 'act'   , 'admin'  ),
+									     			    )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "1%" );							     			    
+		$ibforums->adskin->td_header[] = array( "Entry"    , "80%" );
+		$ibforums->adskin->td_header[] = array( "Date Added"     , "20%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Ban Control" );
+		
+		//-----------------------------------------
+		// Banned IP Addresses
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic("Banned IP Addresses", "left", "pformstrip");
+		
+		if ( is_array( $ban['ip'] ) and count( $ban['ip'] ) )
+		{
+			foreach ( $ban['ip'] as $id => $entry )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<input type='checkbox' name='id_{$entry['ban_id']}' value='1' />",
+																		 $entry['ban_content'],
+																	 	 $std->get_date( $entry['ban_date'], 'SHORT' ),
+																)      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("No Entered Banned IP Addresses", "left", "tdrow1");
+		}
+		
+		//-----------------------------------------
+		// Banned Email Addresses
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic("Banned Email Addresses", "left", "pformstrip");
+		
+		if ( is_array( $ban['email'] ) and count( $ban['email'] ) )
+		{
+			foreach ( $ban['email'] as $id => $entry )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<input type='checkbox' name='id_{$entry['ban_id']}' value='1' />",
+																		 $entry['ban_content'],
+																	 	 $std->get_date( $entry['ban_date'], 'SHORT' ),
+																)      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("No Entered Banned Email Addresses", "left", "tdrow1");
+		}
+		
+		//-----------------------------------------
+		// Banned Names
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic("Non-Registerable Names", "left", "pformstrip");
+		
+		if ( is_array( $ban['name'] ) and count( $ban['name'] ) )
+		{
+			foreach ( $ban['name'] as $id => $entry )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<input type='checkbox' name='id_{$entry['ban_id']}' value='1' />",
+																		 $entry['ban_content'],
+																	 	 $std->get_date( $entry['ban_date'], 'SHORT' ),
+																)      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("No Entered Names", "left", "tdrow1");
+		}
+		
+		$end_it_now = "<div align='left' style='float:left;width:auto;'>
+		 			   <input type='submit' value='Delete Selected' class='realdarkbutton' />
+					   </div></form>
+					   <div align='center'><form method='post' action='{$ibforums->base_url}&act=admin&code=ban_add'><input type='text' size='30' class='textinput' value='' name='bantext' />
+					   <select class='dropdown' name='bantype'><option value='ip'>IP Address</option><option value='email'>Email Address</option><option value='name'>Name</option></select>
+					   <input type='submit' value='Add New Filter' class='realdarkbutton' /></form></div>";
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_basic( $end_it_now, "center", "pformstrip");									 
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+
+		
+	}
+	
+	//-----------------------------------------
+	// BADWORDS: Import
+	//-----------------------------------------
+	
+	function badword_import()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$content = $ibforums->admin->import_xml( 'ipb_badwords.xml' );
+		
+		//-----------------------------------------
+		// Got anything?
+		//-----------------------------------------
+		
+		if ( ! $content )
+		{
+			$ibforums->main_msg = "Upload failed, ipb_badwords.xml was either missing or empty";
+			$this->emoticon_pack_splash();
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		//-----------------------------------------
+		// Get current badwords
+		//-----------------------------------------
+		
+		$words = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'badwords', 'order' => 'type' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$words[ $r['type'] ] = 1;
+		}
+		
+		//-----------------------------------------
+		// pArse
+		//-----------------------------------------
+		
+		foreach( $xml->xml_array['badwordexport']['badwordgroup']['badword'] as $idx => $entry )
+		{
+			$type    = $entry['type']['VALUE'];
+			$swop    = $entry['swop']['VALUE'];
+			$m_exact = $entry['m_exact']['VALUE'];
+			
+			if ( $words[ $type ] )
+			{
+				continue;
+			}
+			
+			if ( $type )
+			{
+				$DB->do_insert( 'badwords', array( 'type' => $type, 'swop' => $swop, 'm_exact' => $m_exact ) );
+			}
+		}
+		
+		$this->badword_rebuildcache();
+                    
+		$ibforums->main_msg = "Badword XML file import completed";
+		
+		$this->badword_start();
+	
+	}
+	
+	//-----------------------------------------
+	// BADWORD: Export
+	//-----------------------------------------
+	
+	function badword_export()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Start...
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'badwordexport', array( 'exported' => time() ) );
+		
+		//-----------------------------------------
+		// Get emo group
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'badwordgroup' );
+		
+		$DB->simple_construct( array( 'select' => 'type, swop, m_exact', 'from' => 'badwords', 'order' => 'type' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$content = array();
+			
+			foreach ( $r as $k => $v )
+			{
+				$content[] = $xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[] = $xml->xml_build_entry( 'badword', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'badwordgroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $xml->xml_document, 'ipb_badwords.xml' );
+	}
+	
+	//-----------------------------------------
+	// BADWORD: Start
+	//-----------------------------------------
+	
+	function badword_start()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You can add/edit and remove bad word filters in this section.<br>The badword filter allows you to globally replace words from a members post, signature and topic title.<br><br><b>Loose matching</b>: If you entered 'hell' as a bad word, it will replace 'hell' and 'hello' with either your replacement if entered or 6 hashes (case insensitive)<br><br><b>Exact matching</b>: If you entered 'hell' as a bad word, it will replace 'hell' only with either your replacement if entered or 6 hashes (case insensitive)";
+		$ibforums->admin->page_title  = "Bad Word Filter";
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'badword_add' ),
+												  			     2 => array( 'act'   , 'admin'       ),
+									     			  )      );
+		
+		$ibforums->adskin->td_header[] = array( "Before"  , "30%" );
+		$ibforums->adskin->td_header[] = array( "After"   , "30%" );
+		$ibforums->adskin->td_header[] = array( "Method"  , "20%" );
+		$ibforums->adskin->td_header[] = array( "Edit"    , "10%" );
+		$ibforums->adskin->td_header[] = array( "Remove"  , "10%" );
+		
+		//-----------------------------------------
+		// Start table
+		//-----------------------------------------
+		
+		$export_button = $ibforums->adskin->js_make_button("Export Filters", $ibforums->base_url."&act=admin&code=badword_export");
+		
+		$table = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+				  <tr>
+				  <td align='left' width='100%' style='font-weight:bold;font-size:11px;color:#FFF'>Current Filters</td>
+				  <td align='right' nowrap='nowrap' style='padding-right:2px'>{$export_button}</td>
+				  </tr>
+				  </table>";
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $table );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'badwords', 'order' => 'type' ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $r = $DB->fetch_row() )
+			{
+				$words[] = $r;
+			}
+			
+			//usort($words, array( 'ad_settings', 'perly_word_sort' ) );
+			
+			foreach($words as $idx => $r)
+			{
+			
+				$replace = $r['swop']    ? stripslashes($r['swop']) : '######';
+				
+				$method  = $r['m_exact'] ? 'Exact' : 'Loose';
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( stripslashes($r['type']),
+														  $replace,
+														  $method,
+														  "<center><a href='".$ibforums->adskin->base_url."&act=admin&code=badword_edit&id={$r['wid']}'>Edit</a></center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=admin&code=badword_remove&id={$r['wid']}'>Remove</a></center>",
+												 )      );
+			}
+			
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		$ibforums->adskin->td_header[] = array( "Before"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "After"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "Method"  , "20%" );
+		
+		//-----------------------------------------
+		// Add new filter
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Add a new filter" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( $ibforums->adskin->form_input('before'),
+												  $ibforums->adskin->form_input('after'),
+												  $ibforums->adskin->form_dropdown( 'match', array( 0 => array( 1, 'Exact'  ), 1 => array( 0, 'Loose' ) ) )
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Add Filter');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// IMPORT: Start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		//-----------------------------------------
+		// IMPORT: Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'badword_import' ),
+															   2 => array( 'act'   , 'admin'      ),
+															   3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+													  ) , "uploadform", " enctype='multipart/form-data'"     );
+													
+													  			
+		$ibforums->html .= $ibforums->adskin->start_table( "Import a Badword List" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													 		 "<b>Upload XML Badword List</b><div style='color:gray'>Browse your computer for 'ipb_badwords.xml' or 'ipb_badwords.xml.gz'. Duplicate entries will not be imported.</div>",
+													  		$ibforums->adskin->form_upload(  )
+													   )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Import");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// BADWORD: Complete Edit
+	//-----------------------------------------
+	
+	function badword_doedit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['before'] == "")
+		{
+			$ibforums->admin->error("You must enter a word to replace, silly!");
+		}
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must pass a valid filter id, silly!");
+		}
+		
+		$ibforums->input['match'] = $ibforums->input['match'] ? 1 : 0;
+		
+		strlen($ibforums->input['swop']) > 1 ?  $ibforums->input['swop'] : "";
+		
+		$DB->do_update( 'badwords', array( 'type'    => $ibforums->input['before'],
+										   'swop'    => $ibforums->input['after'],
+										   'm_exact' => $ibforums->input['match'],
+								  ), "wid='".$ibforums->input['id']."'"  );
+												  
+		$this->badword_rebuildcache();
+		
+		$ibforums->main_msg = "Filter edited";
+		
+		$this->badword_start();
+	}
+	
+	//-----------------------------------------
+	// BADWORD:  Edit
+	//-----------------------------------------
+	
+	function badword_edit()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You may edit the chosen filter below";
+		$ibforums->admin->page_title  = "Bad Word Filter";
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must pass a valid filter id, silly!");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'badwords', 'where' => "wid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $r = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("We could not find that filter in the database");
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'badword_doedit' ),
+												 			     2 => array( 'act'   , 'admin'     ),
+												  			     3 => array( 'id'    , $ibforums->input['id'] ),
+									                    )      );
+		
+		
+		
+		$ibforums->adskin->td_header[] = array( "Before"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "After"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "Method"  , "20%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Edit a filter" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( $ibforums->adskin->form_input('before', stripslashes($r['type']) ),
+												  			     $ibforums->adskin->form_input('after' , stripslashes($r['swop']) ),
+												  			     $ibforums->adskin->form_dropdown( 'match', array( 0 => array( 1, 'Exact'  ), 1 => array( 0, 'Loose' ) ), $r['m_exact'] )
+													    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Edit Filter');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// BADWORD: Remove badowrd
+	//-----------------------------------------
+	
+	function badword_remove()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must pass a valid filter id, silly!");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'badwords', 'where' => "wid='".$ibforums->input['id']."'" ) );
+		
+		$this->badword_rebuildcache();
+		
+		$ibforums->main_msg = "Filter removed";
+		
+		$this->badword_start();
+	}
+	
+	//-----------------------------------------
+	// BADWORD: Add badword
+	//-----------------------------------------
+	
+	function badword_add()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['before'] == "")
+		{
+			$ibforums->admin->error("You must enter a word to replace, silly!");
+		}
+		
+		$ibforums->input['match'] = $ibforums->input['match'] ? 1 : 0;
+		
+		strlen($ibforums->input['swop']) > 1 ?  $ibforums->input['swop'] : "";
+		
+		$DB->do_insert( 'badwords', array( 'type'    => $ibforums->input['before'],
+										   'swop'    => $ibforums->input['after'],
+										   'm_exact' => $ibforums->input['match'],
+								  )      );
+		
+		$this->badword_rebuildcache();
+		
+		$ibforums->main_msg = "New filter added";
+		
+		$this->badword_start();
+	}
+	
+	//-----------------------------------------
+	// BADWORD Rebuild Cache
+	//-----------------------------------------
+	
+	function badword_rebuildcache()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->cache['badwords'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'type,swop,m_exact', 'from' => 'badwords' ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['badwords'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'badwords', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	
+	//-----------------------------------------
+	// EMOTICON Set add
+	//-----------------------------------------
+	
+	function emoticon_setalter($type='add')
+	{
+		global $ibforums, $DB,  $std;
+	
+		$name = preg_replace( "/[^a-zA-Z0-9\-_]/", "", $ibforums->input['emoset'] );
+		
+		if ($name == "")
+		{
+			$ibforums->main_msg = "No valid folder name was entered, please try again using only alphanumerics (A-Z, a-z, 0-9)";
+			$this->emoticon_start();
+		}
+		
+		//-----------------------------------------
+		// Safe mode?
+		//-----------------------------------------
+		
+		if ( SAFE_MODE_ON )
+		{
+			$ibforums->main_msg = "SAFE MODE DETECTED: IPB cannot create or edit folders for you, please create or edit the folder manually using FTP in 'style_emoticons'";
+			$this->emoticon_start();
+		}
+		
+		//-----------------------------------------
+		// Directory exists?
+		//-----------------------------------------
+		
+		if ( file_exists( CACHE_PATH.'style_emoticons/'.$name ) )
+		{
+			$ibforums->main_msg = "'style_emoticons/$name' already exists, please choose another name.";
+			$this->emoticon_start();
+		}
+		
+		if ( $type == 'add' )
+		{
+			//-----------------------------------------
+			// Create directory?
+			//-----------------------------------------
+			
+			if ( @mkdir( CACHE_PATH.'style_emoticons/'.$name, 0777 ) )
+			{
+				@chmod( CACHE_PATH.'style_emoticons/'.$name, 0777 );
+				
+				$ibforums->main_msg = "New Folder Added";
+				$this->emoticon_start();
+			}
+			else
+			{
+				$ibforums->main_msg = "IPB cannot create a new folder for you, please create the folder manually using FTP in 'style_emoticons'";
+				$this->emoticon_start();
+			}
+		}
+		else
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = "Missing directory name, please try again.";
+				$this->emoticon_start();
+			}
+			
+			//-----------------------------------------
+			// Rename directory?
+			//-----------------------------------------
+			
+			if ( @rename( CACHE_PATH.'style_emoticons/'.$ibforums->input['id'], CACHE_PATH.'style_emoticons/'.$name ) )
+			{
+				if ( file_exists( CACHE_PATH.'style_emoticons/'.$name ) )
+				{
+					//-----------------------------------------
+					// Update the emos
+					//-----------------------------------------
+					
+					$DB->do_update( 'emoticons', array( 'emo_set' => $name ), "emo_set='".$ibforums->input['id']."'" );
+				}
+				
+				$this->emoticon_rebuildcache();
+				
+				$ibforums->main_msg = "Folder renamed.";
+				$this->emoticon_start();
+			}
+			else
+			{
+				$ibforums->main_msg = "IPB cannot rename this folder for you.";
+				$this->emoticon_start();
+			}
+		}
+	}
+	
+	//-----------------------------------------
+	// EMOTICON Edit
+	//-----------------------------------------
+	
+	function emoticon_edit()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->main_msg = "No emoticon group ID was passed";
+			$this->emoticon_start();
+		}
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^emo_type_(\d+)$/", $key, $match ) )
+			{
+				if ( isset( $ibforums->input[$match[0]]) )
+				{
+					$typed = $ibforums->input[$match[0]];
+					$click = $ibforums->input['emo_click_'.$match[1] ];
+					
+					$typed = str_replace( '&#092;', "", $typed );
+					
+					if ( $typed and $match[1] )
+					{
+						$DB->do_update( 'emoticons', array( 'clickable' => intval($click), 'typed' => $typed ), 'id='.$match[1] );
+					}
+				}
+			}
+		}
+		
+		$this->emoticon_rebuildcache();
+		
+		$ibforums->main_msg = "Emoticons updated";
+		
+		$this->emoticon_manage();
+	
+	}
+	
+	//-----------------------------------------
+	// EMOTICON Remove
+	//-----------------------------------------
+	
+	function emoticon_remove()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->main_msg = "No emoticon group ID was passed";
+			$this->emoticon_start();
+		}
+		
+		if ($ibforums->input['eid'] == "")
+		{
+			$ibforums->main_msg = "No emoticon ID was passed";
+			$this->emoticon_manage();
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'emoticons', 'where' => "id=".intval($ibforums->input['eid']) ) );
+		
+		$this->emoticon_rebuildcache();
+		
+		$ibforums->main_msg = "Emoticon removed";
+		
+		$this->emoticon_manage();
+	}
+	
+	//-----------------------------------------
+	// EMOTICON ADD
+	//-----------------------------------------
+	
+	function emoticon_add()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->main_msg = "No emoticon group ID was passed";
+			$this->emoticon_start();
+		}
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^emo_type_(\d+)$/", $key, $match ) )
+			{
+				if ( isset( $ibforums->input[$match[0]]) )
+				{
+					$typed = $ibforums->input[$match[0]];
+					$click = $ibforums->input['emo_click_'.$match[1] ];
+					$add   = $ibforums->input['emo_add_'.$match[1] ];
+					$image = $ibforums->input['emo_image_'.$match[1] ];
+					$set   = trim($ibforums->input['id']);
+					
+					$typed = str_replace( '&#092;', "", $typed );
+					
+					if ( $ibforums->input['addall'] )
+					{
+						$add = 1;
+					}
+					
+					if ( $add and $typed and $image )
+					{
+						$DB->do_insert( 'emoticons', array( 'clickable' => intval($click), 'typed' => $typed, 'image' => $image, 'emo_set' => $set ) );
+					}
+				}
+			}
+		}
+		
+		$this->emoticon_rebuildcache();
+		
+		$ibforums->main_msg = "Emoticons updated";
+		
+		$this->emoticon_manage();
+	}
+	
+	
+	//-----------------------------------------
+	// EMOTICON Upload
+	//-----------------------------------------
+	
+	function emoticon_upload()
+	{
+		global $ibforums, $DB, $std;
+		
+		$overwrite = 1;
+		
+		//-----------------------------------------
+		// Which folders?
+		//-----------------------------------------
+		
+		$directories = array();
+		$first_dir   = '';
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^dir_(.*)$/", $key, $match ) )
+			{
+				if ( $ibforums->input[$match[0]] == 1 )
+				{
+					$directories[] = $match[1];
+				}
+			}
+		}
+		
+		if ( ! count( $directories ) )
+		{
+			$ibforums->main_msg = "You did not choose any emoticon folders to upload into!";
+			$this->emoticon_start();
+		}
+		
+		//-----------------------------------------
+		// Excuse me, can you shift?
+		//-----------------------------------------
+		
+		$first_dir = array_shift( $directories );
+		
+		//-----------------------------------------
+		// Loopy loo?
+		//-----------------------------------------
+		
+		foreach( array( 1,2,3,4 ) as $i )
+		{
+			$field     = 'upload_'.$i;
+			
+			$FILE_NAME = $_FILES[$field]['name'];
+			$FILE_SIZE = $_FILES[$field]['size'];
+			$FILE_TYPE = $_FILES[$field]['type'];
+			
+			//-----------------------------------------
+			// Naughty Opera adds the filename on the end of the
+			// mime type - we don't want this.
+			//-----------------------------------------
+			
+			$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
+			
+			//-----------------------------------------					
+			// Naughty Mozilla likes to use "none" to indicate an empty upload field.
+			// I love universal languages that aren't universal.
+			//-----------------------------------------
+			
+			if ( $_FILES[$field]['name'] == "" or ! $_FILES[$field]['name'] or ($_FILES[$field]['name'] == "none") )
+			{
+				continue;
+			}
+			
+			//-----------------------------------------
+			// Copy the upload to the uploads directory
+			//-----------------------------------------
+			
+			if ( ! @move_uploaded_file( $_FILES[ $field ]['tmp_name'], CACHE_PATH.'style_emoticons/'.$first_dir."/".$FILE_NAME) )
+			{
+				$ibforums->main_msg = "The upload failed, sorry!";
+				$this->emoticon_start();
+			}
+			else
+			{
+				@chmod( CACHE_PATH.'style_emoticons/'.$first_dir."/".$FILE_NAME, 0777 );
+				
+				//-----------------------------------------
+				// Copy to other folders
+				//-----------------------------------------
+				
+				if ( is_array( $directories ) and count( $directories ) )
+				{
+					foreach ( $directories as $newdir )
+					{
+						if ( file_exists( CACHE_PATH.'style_emoticons/'.$newdir."/".$FILE_NAME ) )
+						{
+							if ( $overwrite != 1 )
+							{
+								continue;
+							}
+						}
+						
+						if( @copy( CACHE_PATH.'style_emoticons/'.$first_dir."/".$FILE_NAME, CACHE_PATH.'style_emoticons/'.$newdir."/".$FILE_NAME ) )
+						{
+							@chmod( CACHE_PATH.'style_emoticons/'.$newdir."/".$FILE_NAME, 0777 );
+						}
+					}
+				}
+			}
+		}
+		
+		$ibforums->main_msg = "Uploads complete!";
+		$this->emoticon_start();
+	}
+	
+	
+	//-----------------------------------------
+	// EMOTICON Start
+	//-----------------------------------------
+	
+	function emoticon_start()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ( ! is_dir( CACHE_PATH. 'style_emoticons') )
+		{
+			$ibforums->admin->error("Could not locate the emoticons directory - make sure the 'style_emoticons' path is set correctly");
+			$ibforums->admin->output();
+		}
+		
+		//-----------------------------------------
+		// Start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"          , "1%" );
+		$ibforums->adskin->td_header[] = array( "Emoticon Folder" , "30%" );
+		$ibforums->adskin->td_header[] = array( "Upload"          , "5%" );
+		$ibforums->adskin->td_header[] = array( "# Disk Folder"   , "15%" );
+		$ibforums->adskin->td_header[] = array( "# Emo. Group"    , "15%" );
+		$ibforums->adskin->td_header[] = array( "Group Options"   , "20%" );
+		
+		//-----------------------------------------
+		// Get emoticon count
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'admin_emo_count', array() );
+		$DB->cache_exec_query();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$emo_db[ $r['emo_set'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Get emoticon folders
+		//-----------------------------------------
+		
+		$emodirs = array();
+		
+		$dh = opendir( CACHE_PATH.'style_emoticons' );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if (($file != ".") && ($file != ".."))
+ 			{
+				if ( is_dir(CACHE_PATH.'style_emoticons/'.$file) )
+				{
+					$emodirs[] = $file;
+				}
+ 			}
+ 		}
+ 		closedir( $dh );
+		
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= "<script type='text/javascript'>
+							function addfolder()
+							{
+								document.macroform.emoset.value       = '';
+								document.macroform.code.value         = 'emo_setadd';
+								document.macroform.submitbutton.value = 'Add Folder';
+								scroll(0,0);
+								togglediv( 'popbox', 1 );
+								return false;
+							}
+							
+							function editfolder(id)
+							{
+								document.macroform.submitbutton.value = 'Edit Folder Name';
+								document.macroform.id.value     = id;
+								document.macroform.code.value   = 'emo_setedit';
+								document.macroform.emoset.value = id;
+								scroll(0,0);
+								togglediv( 'popbox', 1 );
+								return false;
+							}
+							</script>
+							<div align='center' style='position:absolute;width:99%;display:none;text-align:center' id='popbox'>
+							 <form name='macroform' action='{$ibforums->adskin->base_url}' method='post'>
+							 <input type='hidden' name='act' value='admin' />
+							 <input type='hidden' name='code' value='emo_setadd' />
+							 <input type='hidden' name='id' value='' />
+							 <table cellspacing='0' width='500' align='center' cellpadding='6' style='background:#EEE;border:2px outset #555;'>
+							 <tr>
+							  <td width='1%' nowrap='nowrap' valign='top' align='center'>
+							   <b>Folder name (alphanumerics only)</b><br><input class='textinput' name='emoset' type='text' size='40' />
+							   <br /><br />
+							   <center><input type='submit' class='realbutton' value='Add Folder' name='submitbutton' /> <input type='button' class='realdarkbutton' value='Close' onclick=\"togglediv('popbox');\" /></center>
+							  </td>
+							 </tr>
+							 </table>
+							 </form>
+							</div>";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'emo_upload' ),
+																 2 => array( 'act'   , 'admin'      ),
+																 3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+														) , "uploadform", " enctype='multipart/form-data'"     );
+													  			
+		$ibforums->html .= $ibforums->adskin->start_table( "Current Emoticon Folders" );
+		
+		foreach( $emodirs as $dir )
+		{
+			$files = $this->emoticon_get_folder_contents( $dir );
+			$count = intval( count($files) );
+			
+			if ( is_writeable( './style_emoticons/'.$dir ) )
+			{
+				$icon     = 'icon_can_write.gif';
+				$title    = 'This folder is writeable and new emoticons can be added';
+				$checkbox = "<input type='checkbox' name='dir_{$dir}' value='1' />";
+			}
+			else
+			{
+				$icon     = 'icon_cannot_write.gif';
+				$title    = 'This folder is NOT writeable and the CHMOD must be changed';
+				$checkbox = "-";
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array(
+														  "<center><img src='{$ibforums->skin_url}/emoticon_folder.gif' border='0'></center>",
+														  "<table width='100%' border='0'>
+														  	<tr>
+														  	 <td width='99%' align='left'><a href='{$ibforums->base_url}&act=admin&code=emo_manage&id={$dir}' title='Manage this emoticon set'><b>{$dir}</b></a></td>
+														  	 <td width='1%' align='right'><img src='{$ibforums->skin_url}/{$icon}' title='{$title}' alt='$icon' /></td>
+														  	</tr>
+														  </table>",
+														  "<center>{$checkbox}</center>",
+														  "<center>{$count}</center>",
+														  "<center>".intval($emo_db[ $dir ]['count'])."</center>",
+														  "<center><input type='button' class='realbutton' value='Edit' onclick=\"editfolder('$dir');\" />&nbsp;".
+														  $ibforums->adskin->js_make_button("Manage"       , $ibforums->base_url."&act=admin&code=emo_manage&id={$dir}").'&nbsp;'.
+														  $ibforums->adskin->js_make_button("Remove"       , $ibforums->base_url."&act=admin&code=emo_setremove&id={$dir}")
+														  ."</center>"
+												           )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( array(  "<div align='center'><input type='button' class='realbutton' value='Create New Folder' onclick=\"addfolder();\" /></div>", 6, 'pformstrip' )  ) );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->page_detail = "You may add/edit or remove emoticons in this section.";
+		$ibforums->admin->page_title   = "Emoticon Control";
+		
+		if ( SAFE_MODE_ON )
+		{
+			$ibforums->admin->page_detail .= "<b>SAFE MODE ON:</b> The upload functions will not operate as you are running PHP in safe mode.";
+			$ibforums->html .= "</form>";
+		}
+		else
+		{
+			$ibforums->html .= "<div class='tableborder'>
+								 <div class='maintitle'>Upload Emoticons</div>
+								 <table width='100%' border='0' cellpadding='4' cellspacing='0'>
+								 <tr>
+								  <td width='50%' class='tdrow1' align='center'><input type='file' value='{$_POST['upload_1']}' class='realbutton' name='upload_1' size='30' /></td>
+								  <td width='50%' class='tdrow2' align='center'><input type='file' class='realbutton' name='upload_2' size='30' /></td>
+								 </tr>
+								 <tr>
+								  <td width='50%' class='tdrow1' align='center'><input type='file' class='realbutton' name='upload_3' size='30' /></td>
+								  <td width='50%' class='tdrow2' align='center'><input type='file' class='realbutton' name='upload_4' size='30' /></td>
+								 </tr>
+								 </table>
+								 <div class='pformstrip' align='center'><input type='submit' value='Upload emoticons into checked folders' class='realdarkbutton' /></form></div>
+								</div>";
+		}
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// EMOTICON Remove set
+	//-----------------------------------------
+	
+	function emoticon_setremove()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_detail = "Remove an IPB emoticon pack.";
+		$ibforums->admin->page_title  = "Emoticon Management";
+		
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = "No emoticon set was passed.";
+			$this->emoticon_start();
+		}
+		
+		//-----------------------------------------
+		// Splash or mash?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['do'] )
+		{
+			//-----------------------------------------
+			// Do it
+			//-----------------------------------------
+			
+			if ( $ibforums->input['emo_set'] == 'd' )
+			{
+				$ibforums->admin->rm_dir( CACHE_PATH.'style_emoticons/'.$ibforums->input['id'] );
+				$DB->simple_exec_query( array( 'delete' => 'emoticons', 'where' => "emo_set='{$ibforums->input['id']}'" ) );
+			}
+			else
+			{
+				$ibforums->admin->copy_dir( CACHE_PATH.'style_emoticons/'.$ibforums->input['id'], CACHE_PATH.'style_emoticons/'.$ibforums->input['emo_set'] );
+				$ibforums->admin->rm_dir( CACHE_PATH.'style_emoticons/'.$ibforums->input['id'] );
+				
+				//-----------------------------------------
+				// Merge, don't overwrite
+				//-----------------------------------------
+			
+				$old_emo_db = array();
+				
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='".$ibforums->input['id']."'" ) );
+				$DB->simple_exec();
+		
+				while( $r = $DB->fetch_row() )
+				{
+					$old_emo_db[ $r['image'] ] = $r;
+				}
+				
+				$new_emo_db = array();
+				$new_typed  = array();
+				$new_image  = array();
+				
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='".$ibforums->input['emo_set']."'" ) );
+				$DB->simple_exec();
+				
+				while( $r = $DB->fetch_row() )
+				{
+					$new_emo_db[ $r['image'] ] = $r;
+					$new_typed[ $r['typed'] ]  = 1;
+					$new_image[ $r['image'] ]  = 1;
+				}
+				
+				$keep_ids   = array();
+				$delete_ids = array();
+				
+				foreach( $old_emo_db as $image => $data )
+				{
+					if ( $new_image[ $image ] or $new_typed[ $data['typed'] ] )
+					{
+						$delete_ids[] = $data['id'];
+					}
+					else
+					{
+						$keep_ids[] = $data['id'];
+					}
+				}
+				
+				//-----------------------------------------
+				// Delete...
+				//-----------------------------------------
+				
+				if ( count($delete_ids) )
+				{
+					$DB->simple_exec_query( array( 'delete' => 'emoticons', 'where' => "id IN(".implode(",",$delete_ids).")" ) );
+				}
+				
+				//-----------------------------------------
+				// Keep...
+				//-----------------------------------------
+				
+				if ( count($keep_ids) )
+				{
+					$DB->do_update( 'emoticons', array( 'emo_set' => $ibforums->input['emo_set'] ), "id IN(".implode(",",$keep_ids).")" );
+				}
+			}
+			
+			$this->emoticon_rebuildcache();
+			
+			$ibforums->main_msg = "Emoticon folder removed.";
+			$this->emoticon_start();
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get emoticon folders
+			//-----------------------------------------
+			
+			$emodirs = array();
+			$emodd   = array( 0=> array( 'd', "Don't move, just delete" ) );
+			
+			$dh = opendir( CACHE_PATH.'style_emoticons' );
+			
+			while ( $file = readdir( $dh ) )
+			{
+				if (($file != ".") && ($file != ".."))
+				{
+					if ( is_dir(CACHE_PATH.'style_emoticons/'.$file) )
+					{
+						if ( $file != $ibforums->input['id'] )
+						{
+							$emodirs[] = $file;
+							$emodd[]   = array( $file, "Move to: ".$file );
+						}
+					}
+				}
+			}
+			
+			closedir( $dh );
+			
+			if ( count ( $emodirs ) < 1 )
+			{
+				$ibforums->main_msg = "CANNOT REMOVE: This is the last emoticon group and cannot be removed";
+				$this->emoticon_start();
+			}
+			
+			//-----------------------------------------
+			// Show form
+			//-----------------------------------------
+		
+			$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+			
+			//-----------------------------------------
+			// EXPORT: Start output
+			//-----------------------------------------
+			
+			$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'emo_setremove' ),
+																	 2 => array( 'act'   , 'admin'         ),
+																	 3 => array( 'id'    , $ibforums->input['id'] ),
+																	 4 => array( 'do'    , 1               ),
+															)      );
+																	
+			$ibforums->html .= $ibforums->adskin->start_table( "REMOVING EMOTICON SET: ".$ibforums->input['id'] );
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array(
+																  "<b>Move or delete remaining emoticons in this set?</b><div style='color:gray'>If you're moving them to an existing group, only non-duplicate images and activation words will be kept.</div>",
+																  $ibforums->adskin->form_dropdown( 'emo_set', $emodd )
+														   )      );
+			
+			
+			$ibforums->html .= $ibforums->adskin->end_form("REMOVE EMOTICON GROUP");
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+			
+			
+			$ibforums->admin->output();
+		}
+	}
+	
+	//-----------------------------------------
+	// EMOTICON Import/Export Pack Splash
+	//-----------------------------------------
+	
+	function emoticon_pack_splash()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_detail = "Export or import IPB emoticon packs.";
+		$ibforums->admin->page_title  = "Emoticon Management";
+		
+		if ( ! is_dir( CACHE_PATH. 'style_emoticons') )
+		{
+			$ibforums->admin->error("Could not locate the emoticons directory - make sure the 'style_emoticons' path is set correctly");
+			$ibforums->admin->output();
+		}
+		
+		//-----------------------------------------
+		// Get emoticon count
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'admin_emo_count', array() );
+		$DB->cache_exec_query();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$emo_db[ $r['emo_set'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Get emoticon folders
+		//-----------------------------------------
+		
+		$emodirs = array();
+		$emodd   = array();
+		
+		$dh = opendir( CACHE_PATH.'style_emoticons' );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if (($file != ".") && ($file != ".."))
+ 			{
+				if ( is_dir(CACHE_PATH.'style_emoticons/'.$file) )
+				{
+					$emodirs[] = $file;
+					$emodd[]   = array( $file, $file );
+				}
+ 			}
+ 		}
+ 		closedir( $dh );
+ 		
+		//-----------------------------------------
+		// EXPORT: Start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		//-----------------------------------------
+		// EXPORT: Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'emo_packexport' ),
+															     2 => array( 'act'   , 'admin'      ),
+													    )      );
+													  			
+		$ibforums->html .= $ibforums->adskin->start_table( "Export an Emoticon Pack" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													            "<b>Export which emoticon group?</b><div style='color:gray'>An IPB Emoticon Pack is an XMLarchive of the images and activation words (i.e. :smile:)</div>",
+													            $ibforums->adskin->form_dropdown( 'emo_set', $emodd )
+													   )      );
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Export");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// IMPORT: Start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		//-----------------------------------------
+		// IMPORT: Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'emo_packimport' ),
+																 2 => array( 'act'   , 'admin'      ),
+																 3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+														) , "uploadform", " enctype='multipart/form-data'"     );
+													
+													  			
+		$ibforums->html .= $ibforums->adskin->start_table( "Import an Emoticon Pack" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													  		"<b>Import into which emoticon group?</b><div style='color:gray'>An IPB Emoticon Pack is an XMLarchive of the images and activation words (i.e. :smile:)</div>",
+													  		$ibforums->adskin->form_dropdown( 'emo_set', $emodd )
+													   )      );
+													   
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													  		"<b><u>OR</u> Import into a new group named:</b><div style='color:gray'>Enter the name of the new emoticon group.</div>",
+													  		$ibforums->adskin->form_input( 'new_emo_set' )
+													   )      );
+													   
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													 		 "<b>Overwrite existing images and activation words?</b><div style='color:gray'>If yes, new images replace old</div>",
+													  		$ibforums->adskin->form_yes_no( 'overwrite' )
+													   )      );
+													   
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													 		 "<b>Upload XML Emoticon Archive</b><div style='color:gray'>Browse your computer for 'ipb_emoticons.xml' or 'ipb_emoticons.xml.gz'</div>",
+													  		$ibforums->adskin->form_upload(  )
+													   )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Import");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// EMOTICON EXPORT! EXPORT! EX... oh, that's abort isn't it?
+	//-----------------------------------------
+	
+	function emoticon_pack_export()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		require( KERNEL_PATH.'class_xmlarchive.php' );
+
+		$xmlarchive = new class_xmlarchive();
+		
+		//-----------------------------------------
+		// Checkdamoonah
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['emo_set'] )
+		{
+			$this->ibforums->msg = "You must specify which emoticon group you wish to export";
+		}
+		
+		//-----------------------------------------
+		// Get emowticuns
+		//-----------------------------------------
+		
+		$emo_db = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='".$ibforums->input['emo_set']."'" ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$emo_db[ $r['image'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Get ;) :D folders
+		//-----------------------------------------
+		
+		$emodirs = array();
+		$emodd   = array();
+		
+		$dh = opendir( CACHE_PATH.'style_emoticons/'.$ibforums->input['emo_set'] );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if (($file != ".") && ($file != ".."))
+ 			{
+ 				if ( $emo_db[ $file ] != "" )
+ 				{
+					$files_to_add[] = CACHE_PATH.'style_emoticons/'.$ibforums->input['emo_set'].'/'.$file;
+				}
+ 			}
+ 		}
+ 		
+ 		closedir( $dh );
+ 		
+		//-----------------------------------------
+		// Add um into the ark-hive
+		//-----------------------------------------
+		
+		foreach( $files_to_add as $f )
+		{
+			$xmlarchive->xml_add_file( $f );
+		}
+		
+		//-----------------------------------------
+		// Create the database archive...
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'emoticonexport', array( 'exported' => time(), 'name' => $ibforums->input['emo_set'] ) );
+		
+		//-----------------------------------------
+		// Get emo group
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'emogroup' );
+		
+		foreach( $emo_db as $i => $r )
+		{
+			$content = array();
+			
+			$content[] = $xml->xml_build_simple_tag( 'typed'    , $r['typed'] );
+			$content[] = $xml->xml_build_simple_tag( 'image'    , $r['image'] );
+			$content[] = $xml->xml_build_simple_tag( 'clickable', $r['clickable'] );
+			
+			$entry[] = $xml->xml_build_entry( 'emoticon', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'emogroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Add in emoticons doc to archive
+		//-----------------------------------------
+		
+		$xmlarchive->xml_add_file_contents( $xml->xml_document, 'emoticon_data.xml' );
+		
+		$xmlarchive->xml_create_archive();
+		
+		//-----------------------------------------
+		// Create archive and send to
+		// browser.
+		//-----------------------------------------
+		
+		$imagearchive = $xmlarchive->xml_get_contents();
+		
+		$ibforums->admin->show_download( $imagearchive, 'ipb_emoticons.xml' );
+	
+	}
+	
+	
+	//-----------------------------------------
+	// IMPORT THE EMOTICONS
+	//-----------------------------------------
+	
+	function emoticon_pack_import()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$content = $ibforums->admin->import_xml( 'ipb_emoticons.xml' );
+		
+		//-----------------------------------------
+		// Got anything?
+		//-----------------------------------------
+		
+		if ( ! $content )
+		{
+			$ibforums->main_msg = "Upload failed, ipb_emoticons.xml was either missing or empty";
+			$this->emoticon_pack_splash();
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		require( KERNEL_PATH.'class_xmlarchive.php' );
+
+		$xmlarchive = new class_xmlarchive();
+		
+		$xmlarchive->xml_read_archive_data( $content );
+		
+		//-----------------------------------------
+		// Get the datafile
+		//-----------------------------------------
+		
+		$emoticons     = array();
+		$emoticon_data = array();
+		
+		foreach( $xmlarchive->file_array as $f )
+		{
+			if ( $f['filename'] == 'emoticon_data.xml' )
+			{
+				$emoticon_data = $f['content'];
+			}
+			else
+			{
+				$emoticons[ $f['filename'] ] = $f['content'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $emoticon_data );
+		
+		//-----------------------------------------
+		//  New set, old set - we're set!
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['emo_set'] and ! $ibforums->input['new_emo_set'] )
+		{
+			$this->ibforums->msg = "You must specify which emoticon group you wish to import into";
+		}
+		
+		$emo_set_dir = $ibforums->input['emo_set'];
+		
+		$ibforums->input['new_emo_set'] = preg_replace( "/[^a-zA-Z0-9\-_]/", "",$ibforums->input['new_emo_set'] );
+		
+		if ( $ibforums->input['new_emo_set'] )
+		{
+			$emo_set_dir = $ibforums->input['new_emo_set'];
+			
+			//-----------------------------------------
+			// Directory exists?
+			//-----------------------------------------
+			
+			if ( file_exists( CACHE_PATH.'style_emoticons/'.$emo_set_dir ) )
+			{
+				$ibforums->main_msg = "'style_emoticons/$emo_set_dir' already exists, please choose another name.";
+				$this->emoticon_pack_splash();
+			}
+		
+			//-----------------------------------------
+			// Create directory?
+			//-----------------------------------------
+			
+			if ( @mkdir( CACHE_PATH.'style_emoticons/'.$emo_set_dir, 0777 ) )
+			{
+				@chmod( CACHE_PATH.'style_emoticons/'.$emo_set_dir, 0777 );
+			}
+			else
+			{
+				$ibforums->main_msg = "IPB cannot create a new folder for you, please create the folder manually using FTP in 'style_emoticons'";
+				$this->emoticon_pack_splash();
+			}
+		}
+		
+		//-----------------------------------------
+		// Are we over writing?
+		//-----------------------------------------
+		
+		$emo_image = array();
+		$emo_typed = array();
+		
+		if ( $ibforums->input['overwrite'] != 1  )
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='".$emo_set_dir."'" ) );
+			$DB->simple_exec();
+		
+			while( $r = $DB->fetch_row() )
+			{
+				$emo_image[ $r['image'] ] = 1;
+				$emo_typed[ $r['typed'] ] = 1;
+			}
+		}
+		
+		foreach( $xml->xml_array['emoticonexport']['emogroup']['emoticon'] as $idx => $entry )
+		{
+			$image = $entry['image']['VALUE'];
+			$typed = $entry['typed']['VALUE'];
+			$click = $entry['clickable']['VALUE'];
+			
+			if ( $emo_image[ $image ] or $emo_typed[ $typed ] )
+			{
+				continue;
+			}
+			
+			@unlink( CACHE_PATH.'style_emoticons/'.$emo_set_dir.'/'.$image );
+			
+			$DB->simple_exec_query( array( 'delete' => 'emoticons', 'where' => "typed='$typed' and image='$image' and emo_set='$emo_set_dir'" ) );
+			
+			if ( $FH = fopen( CACHE_PATH.'style_emoticons/'.$emo_set_dir.'/'.$image, 'wb' ) )
+			{
+				if ( fwrite( $FH, $emoticons[ $image ] ) )
+				{
+					fclose( $FH );
+					
+					$DB->do_insert( 'emoticons', array( 'typed' => $typed, 'image' => $image, 'clickable' => $click, 'emo_set' => $emo_set_dir ) );
+				}
+			}
+		}
+		
+		$this->emoticon_rebuildcache();
+                    
+		$ibforums->main_msg = "Emoticon XMLarchive import completed";
+		
+		$this->emoticon_start();
+	
+	}
+	
+	
+	//-----------------------------------------
+	// EMOTICON Manage
+	//-----------------------------------------
+	
+	function emoticon_manage()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['id'] = trim($ibforums->input['id']);
+		
+		$ibforums->admin->nav[] = array( 'act=admin&code=emo', 'Emoticons Manager' );
+		$ibforums->admin->nav[] = array( '', 'Managing Set '.$ibforums->input['id'] );
+		
+		$ibforums->admin->page_detail = "You may add/edit or remove emoticons in this section.<br>Clickable refers to emoticons that are in the posting screens 'Clickable Emoticons' table.";
+		$ibforums->admin->page_title  = "Emoticon Control";
+		
+		//-----------------------------------------
+		// Get emoticons for this group
+		//-----------------------------------------
+		
+		$emo_db   = array();
+		$emo_file = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'emoticons', 'where' => "emo_set='".$ibforums->input['id']."'", 'order' => 'clickable DESC' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$emo_db[ $r['image'] ] = $r;
+		}
+		
+		$emo_file  = array();
+		$emo_rfile = $this->emoticon_get_folder_contents( $ibforums->input['id'] );
+		
+		foreach( $emo_rfile as $ef )
+		{
+			$emo_file[ $ef ] = $ef;
+		}
+					
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+		
+		$per_row  = 5;
+		$td_width = 100 / $per_row;
+		
+		$ibforums->html .= "<div class='tableborder'>
+							 <div class='maintitle'>Assigned Emoticons in set '{$ibforums->input['id']}'</div>
+							 <form action='{$ibforums->base_url}&act=admin&code=emo_doedit&id={$ibforums->input['id']}' method='post'>
+							 <table cellpadding='4' cellspacing='0' border='0' width='100%'>
+						   ";
+						   
+		$count      = 0;
+		$smilies    = "<tr align='center'>\n";
+		$poss_names = array();
+		
+		foreach( $emo_db as $image => $data )
+		{
+			$count++;
+			
+			unset( $emo_file[ $image ] );
+			
+			if ( $data['clickable'] )
+			{
+				$click = 'checked="checked"';
+				$class = 'tdrow1';
+			}
+			else
+			{
+				$click = '';
+				$class = 'tdrow2';
+			}
+			
+			$smilies .= "<td width='{$td_width}%' align='center' class='$class'>
+						  <fieldset>
+						  	<legend><strong>{$image}</strong></legend>
+						  	<img src='style_emoticons/{$ibforums->input['id']}/{$image}' border='0' />&nbsp;&nbsp;&nbsp;&nbsp;<a href='{$ibforums->base_url}&act=admin&code=emo_remove&eid={$data['id']}&id={$ibforums->input['id']}' title='Remove this emoticon'><img src='{$ibforums->skin_url}/emo_delete.gif' border='0' alt='Delete' /></a>
+						  	<br />
+						  	<input type='textinput' class='realbutton' size='10' name='emo_type_{$data['id']}' value='{$data['typed']}' />
+						  	<br /><br />Clickable? <input type='checkbox'  name='emo_click_{$data['id']}' value='1' {$click} />
+						  </fieldset>
+						 </td>";
+			
+			if ($count == $per_row )
+			{
+				$smilies .= "</tr>\n\n<tr align='center'>";
+				$count = 0;
+			}
+			
+			$poss_names[$data['typed']] = $data['typed'];
+		}
+		
+		if ( $count > 0 and $count != $per_row )
+		{
+			for ($i = $count ; $i < $per_row ; ++$i)
+			{
+				$smilies .= "<td class='tdrow2'>&nbsp;</td>\n";
+			}
+			
+			$smilies .= "</tr>";
+		}
+		
+		
+		$ibforums->html .= $smilies;
+		
+		$ibforums->html .= "</table>
+							<div class='pformstrip' align='center'><input type='submit' class='realbutton' value='Update Emoticons' /></form></div></div><br />";
+		
+		
+		//-----------------------------------------
+		// Images left in the dir?
+		//-----------------------------------------
+		
+		if ( count( $emo_file ) )
+		{
+			$ibforums->html .= "<div class='tableborder'>
+								<div class='maintitle'>Unassigned images in folder '{$ibforums->input['id']}'</div>
+								<form action='{$ibforums->base_url}&act=admin&code=emo_doadd&id={$ibforums->input['id']}' method='post'>
+								<table cellpadding='4' cellspacing='0' border='0' width='100%'>
+							  ";
+							  
+			$count   = 0;
+			$smilies = "<tr align='center'>\n";
+			
+			$master_count = 0;
+			
+			foreach( $emo_file as $image )
+			{
+				$count++;
+				$master_count++;
+				
+				$poss_name = ':'.preg_replace( "/(.*)(\..+?)$/", "\\1", $image ).':';
+				
+				if ( $poss_names[ $poss_name ] )
+				{
+					$poss_name = preg_replace( "/:$/", "2:", $poss_name );
+				}
+				
+				$smilies .= "<td width='{$td_width}%' align='center' class='tdrow1'>
+							  <fieldset>
+								<legend><strong>{$image}</strong></legend>
+								<img src='style_emoticons/{$ibforums->input['id']}/{$image}' border='0' />&nbsp;&nbsp;<b>Add</b> <input name='emo_add_{$master_count}' type='checkbox' value='1' />
+								<br />
+								Type: <input type='textinput' class='realbutton' size='10' name='emo_type_{$master_count}' value='$poss_name' />
+								<br /><br />Clickable? <input type='checkbox' name='emo_click_{$master_count}' value='1' />
+								<input type='hidden' name='emo_image_{$master_count}' value='{$image}' />
+							  </fieldset>
+							 </td>";
+				
+				if ($count == $per_row )
+				{
+					$smilies .= "</tr>\n\n<tr align='center'>";
+					$count = 0;
+				}
+			}
+			
+			if ( $count > 0 and $count != $per_row )
+			{
+				for ($i = $count ; $i < $per_row ; ++$i)
+				{
+					$smilies .= "<td class='tdrow1'>&nbsp;</td>\n";
+				}
+				
+				$smilies .= "</tr>";
+			}
+			
+			
+			$ibforums->html .= $smilies;
+			
+			$ibforums->html .= "</table>
+								<div class='pformstrip' align='center'><input type='submit' class='realbutton' value='Add Checked Emoticons' />&nbsp;&nbsp;<input type='submit' name='addall' class='realbutton' value='Add All Emoticons' /></form></div></div>";
+		}
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// EMOTICON Rebuild Cache
+	//-----------------------------------------
+	
+	function emoticon_rebuildcache()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->cache['emoticons'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['emoticons'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	// EMOTICON Get folder contents
+	//-----------------------------------------
+	
+	function emoticon_get_folder_contents($folder='default')
+	{
+		global $ibforums, $std, $DB;
+		
+		$files = array();
+		
+		//-----------------------------------------
+		// Get emoticon folders
+		//-----------------------------------------
+		
+		$dh = opendir( CACHE_PATH.'style_emoticons/'.$folder );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if ( ($file != ".") && ($file != "..") )
+ 			{
+				if ( preg_match( "/\.(?:gif|jpg|jpeg|png|swf)$/i", $file ) )
+				{
+					$files[] = $file;
+				}
+ 			}
+ 		}
+ 		
+ 		closedir( $dh );
+ 		
+ 		return $files;
+ 	}
+ 	
+ 	//-----------------------------------------
+	// BBCODE: Import
+	//-----------------------------------------
+	
+	function bbcode_import()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$content = $ibforums->admin->import_xml( 'ipb_bbcode.xml' );
+		
+		//-----------------------------------------
+		// Got anything?
+		//-----------------------------------------
+		
+		if ( ! $content )
+		{
+			$ibforums->main_msg = "Upload failed, ipb_bbcode.xml was either missing or empty";
+			$this->emoticon_pack_splash();
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		//-----------------------------------------
+		// Get current badwords
+		//-----------------------------------------
+		
+		$tags = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$tags[ $r['bbcode_tag'] ] = 1;
+		}
+		
+		//-----------------------------------------
+		// pArse
+		//-----------------------------------------
+		
+		if ( ! is_array( $xml->xml_array['bbcodeexport']['bbcodegroup']['bbcode'][0]  ) )
+		{
+			$xml->xml_array['bbcodeexport']['bbcodegroup']['bbcode'][0] = $xml->xml_array['bbcodeexport']['bbcodegroup']['bbcode'];
+		}
+		
+		foreach( $xml->xml_array['bbcodeexport']['bbcodegroup']['bbcode'] as $idx => $entry )
+		{
+			$bbcode_title     = $entry['bbcode_title']['VALUE'];
+			$bbcode_desc      = $entry['bbcode_desc']['VALUE'];
+			$bbcode_tag       = $entry['bbcode_tag']['VALUE'];
+			$bbcode_replace   = $entry['bbcode_replace']['VALUE'];
+			$bbcode_useoption = $entry['bbcode_useoption']['VALUE'];
+			$bbcode_example   = $entry['bbcode_example']['VALUE'];
+			
+			if ( $tags[ $bbcode_tag ] )
+			{
+				continue;
+			}
+			
+			if ( $bbcode_tag )
+			{
+				$bbarray = array(
+								 'bbcode_title'     => $bbcode_title,
+								 'bbcode_desc'      => $bbcode_desc,
+								 'bbcode_tag'       => $bbcode_tag,
+								 'bbcode_replace'   => $std->txt_safeslashes($bbcode_replace),
+								 'bbcode_useoption' => $bbcode_useoption,
+								 'bbcode_example'   => $bbcode_example,
+								);
+								
+				$DB->do_insert( 'custom_bbcode', $bbarray );
+			}
+		}
+		
+		$this->bbcode_rebuildcache();
+                    
+		$ibforums->main_msg = "BBCode XML file import completed";
+		
+		$this->bbcode_start();
+	
+	}
+		
+	//-----------------------------------------
+	// BBCODE: Export
+	//-----------------------------------------
+	
+	function bbcode_export()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Start...
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'bbcodeexport', array( 'exported' => time() ) );
+		
+		//-----------------------------------------
+		// Get emo group
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'bbcodegroup' );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$content = array();
+			
+			foreach ( $r as $k => $v )
+			{
+				$content[] = $xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[] = $xml->xml_build_entry( 'bbcode', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'bbcodegroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $xml->xml_document, 'ipb_bbcode.xml' );
+	}
+	
+	//-----------------------------------------
+	// BBCODE Remove
+	//-----------------------------------------
+	
+	function bbcode_delete()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = "No ID was passed, please try again.";
+			$this->bbcode_start();
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'custom_bbcode', 'where' => 'bbcode_id='.$ibforums->input['id'] ) );
+		
+		$this->bbcode_rebuildcache();
+		
+		$this->bbcode_start();
+	}
+	
+	//-----------------------------------------
+	// BBCODE Rebuild Cache
+	//-----------------------------------------
+	
+	function bbcode_rebuildcache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['bbcode'] = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode' ) );
+		$bbcode = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($bbcode) )
+		{
+			$ibforums->cache['bbcode'][] = $r;
+		}
+
+		$std->update_cache( array( 'name' => 'bbcode', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	// BBCODE Test
+	//-----------------------------------------
+	
+	function bbcode_test()
+	{
+		global $ibforums, $DB, $std;
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode', 'order' => 'bbcode_title' ) );
+		$DB->simple_exec();
+		
+		$t = $_POST['bbtest'];
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			if ( substr_count( $row['bbcode_replace'], '{content}' ) > 1 )
+			{
+				//-----------------------------------------
+				// Slightly slower
+				//-----------------------------------------
+				
+				if ( $row['bbcode_useoption'] )
+				{
+					preg_match_all( "#(\[".$row['bbcode_tag']."=(?:&quot;|&\#39;)?(.+?)(?:&quot;|&\#39;)?\])(.+?)(\[/".$row['bbcode_tag']."\])#si", $t, $match );
+					
+					for ($i=0; $i < count($match[0]); $i++)
+					{
+						$tmp = $row['bbcode_replace'];
+						$tmp = str_replace( '{option}' , $match[2][$i], $tmp );
+						$tmp = str_replace( '{content}', $match[3][$i], $tmp );
+						$t   = str_replace( $match[0][$i], $tmp, $t );
+					}
+				}
+				else
+				{
+					preg_match_all( "#(\[".$row['bbcode_tag']."\])(.+?)(\[/".$row['bbcode_tag']."\])#si", $t, $match );
+
+					for ($i=0; $i < count($match[0]); $i++)
+					{
+						$tmp = $row['bbcode_replace'];
+						$tmp = str_replace( '{content}', $match[2][$i], $tmp );
+						$t   = str_replace( $match[0][$i], $tmp, $t );
+					}
+				}
+			}
+			else
+			{
+				$replace = explode( '{content}', $row['bbcode_replace'] );
+				
+				if ( $row['bbcode_useoption'] )
+				{
+					$t = preg_replace( "#\[".$row['bbcode_tag']."=(?:&quot;|&\#39;)?(.+?)(?:&quot;|&\#39;)?\]#si", str_replace( '{option}', "\\1", $replace[0] ), $t );
+				}
+				else
+				{
+					$t = preg_replace( '#\['.$row['bbcode_tag'].'\]#i' , $replace[0], $t );
+				}
+				
+				$t = preg_replace( '#\[/'.$row['bbcode_tag'].'\]#i', $replace[1], $t );
+			}
+		}
+		
+		$ibforums->main_msg = "<b>BBCode Test:</b><br /><br />".$t;
+		
+		$this->bbcode_start();
+	}
+	
+	//-----------------------------------------
+	// BBCODE Save Form
+	//-----------------------------------------
+	
+	function bbcode_save($type='add')
+	{
+		global $ibforums, $DB, $std;
+	
+		if ( $type == 'edit' )
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again";
+				$this->bbcode_form($type);
+			}
+		}
+		
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['bbcode_title'] or ! $ibforums->input['bbcode_tag'] or ! $ibforums->input['bbcode_replace'] )
+		{
+			$ibforums->main_msg = "You must complete the form fully.";
+			$this->bbcode_form($type);
+		}
+		
+		if ( ! strstr( $ibforums->input['bbcode_replace'], '{content}' ) )
+		{
+			$ibforums->main_msg = "You must use {content} somewhere in the BBCode replacement section.";
+			$this->bbcode_form($type);
+		}
+		
+		if ( ! strstr( $ibforums->input['bbcode_replace'], '{option}' ) AND $ibforums->input['bbcode_useoption'] )
+		{
+			$ibforums->main_msg = "You must use {option} somewhere in the BBCode replacement section or set 'Use Option in tag?' to 'no'.";
+			$this->bbcode_form($type);
+		}
+		
+		$array = array( 'bbcode_title'     => $ibforums->input['bbcode_title'],
+						'bbcode_desc'      => $std->txt_safeslashes( $_POST['bbcode_desc'] ),
+						'bbcode_tag'       => $ibforums->input['bbcode_tag'],
+						'bbcode_replace'   => $std->txt_safeslashes( $_POST['bbcode_replace'] ),
+						'bbcode_example'   => $std->txt_safeslashes( $_POST['bbcode_example'] ),
+						'bbcode_useoption' => $ibforums->input['bbcode_useoption'] );
+						
+		if ( $type == 'add' )
+		{
+			$DB->do_insert( 'custom_bbcode', $array );
+			$ibforums->main_msg = 'New BBCode Added';
+		}
+		else
+		{
+			$DB->do_update( 'custom_bbcode', $array, 'bbcode_id='.$ibforums->input['id'] );
+			$ibforums->main_msg = 'Custom BBCode Edited';
+		}
+		
+		$this->bbcode_rebuildcache();
+		
+		$this->bbcode_start();
+	
+	}
+	
+	
+	//-----------------------------------------
+	// BBCODE Start Form
+	//-----------------------------------------
+	
+	function bbcode_form($type='add')
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_detail = "The BBCode manager allows you to add new custom BBCode.";
+		$ibforums->admin->page_title  = "BBCode Manager";
+		
+		if ( $type == 'edit' )
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again";
+				$this->bbcode_start();
+			}
+			
+			$bbcode = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'custom_bbcode', 'where' => 'bbcode_id='.$ibforums->input['id'] ) );
+			
+			$button = "Edit BBCode";
+			$code   = 'bbcode_doedit';
+			$title  = "Editing BBCode: ".$bbcode['bbcode_title'];
+		}
+		else
+		{
+			$bbcode = array();
+			$code   = 'bbcode_doadd';
+			$title  = "Adding a new custom BBCode";
+			$button = "Add BBCode";
+		}
+		
+		//-----------------------------------------
+		// Show the codes mahn!
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'admin'    ),
+															   2 => array( 'code' , $code      ),
+															   3 => array( 'id'   , $ibforums->input['id'] )
+													  )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $title );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom BBCode Title</b><div style='color:gray'>Used on the BBCode pop-up legend</div>",
+															   $ibforums->adskin->form_input( 'bbcode_title', $ibforums->input['bbcode_title'] ? $ibforums->input['bbcode_title'] : $bbcode['bbcode_title'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom BBCode Description</b><div style='color:gray'>Used on the BBCode pop-up legend</div>",
+															   $ibforums->adskin->form_textarea( 'bbcode_desc', $ibforums->input['bbcode_desc'] ? $ibforums->input['bbcode_desc'] : $bbcode['bbcode_desc'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom BBCode Example</b><div style='color:gray'>Used on the BBCode pop-up legend<br />Use the tag in the example: [tag]This is an example![/tag]</div>",
+															   $ibforums->adskin->form_textarea( 'bbcode_example', $ibforums->input['bbcode_example'] ? $ibforums->input['bbcode_example'] : $bbcode['bbcode_example'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom BBCode Tag</b><div style='color:gray'>Example: For [tag] enter <b>tag</b></div>",
+															   '[ '.$ibforums->adskin->form_simple_input( 'bbcode_tag', $ibforums->input['bbcode_tag'] ? $ibforums->input['bbcode_tag'] : $bbcode['bbcode_tag'], 10).' ]'
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Use Option in tag?</b><div style='color:gray'>Use to create [tag=option] style tags</div>",
+															   $ibforums->adskin->form_yes_no( 'bbcode_useoption', $ibforums->input['bbcode_useoption'] ? $ibforums->input['bbcode_useoption'] : $bbcode['bbcode_useoption'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom BBCode Replacement</b><div style='color:gray'>&lt;tag&gt;{content}&lt;/tag&gt;<br />&lt;tag thing='{option}'&gt;{content}&lt;/tag&gt;</div>",
+															   $ibforums->adskin->form_textarea( 'bbcode_replace', $ibforums->input['bbcode_replace'] ? $ibforums->input['bbcode_replace'] : $bbcode['bbcode_replace'] )
+													 )      );
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_form( $button );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "<br /><div class='tableborder'><div class='tdrow1' style='padding:6px'><b>More Information</b><br />When adding the BBCode replacement, don't forget to add the {content} block where you wish the tag content to go when parsed.<br />
+						    If you are using an option <b>[tag=option][/tag]</b> tag, don't forget to add in {option} in the BBCode replacement where you want the option to go.</div></div>";
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// BBCODE Splash
+	//-----------------------------------------
+	
+	function bbcode_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_detail = "The BBCode manager allows you to add new custom BBCode.";
+		$ibforums->admin->page_title  = "BBCode Manager";
+		
+		//-----------------------------------------
+		// Show the codes mahn!
+		//-----------------------------------------
+									     
+		$ibforums->adskin->td_header[] = array( "Title"    , "30%" );
+		$ibforums->adskin->td_header[] = array( "Tag"      , "40%" );
+		$ibforums->adskin->td_header[] = array( "Options"  , "30%" );
+		
+		$export_button = $ibforums->adskin->js_make_button("Export BBCode", $ibforums->base_url."&act=admin&code=bbcode_export");
+		
+		$table = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+				  <tr>
+				  <td align='left' width='100%' style='font-weight:bold;font-size:11px;color:#FFF'>Your custom BBCodes</td>
+				  <td align='right' nowrap='nowrap' style='padding-right:2px'>{$export_button}</td>
+				  </tr>
+				  </table>";
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $table );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode', 'order' => 'bbcode_title' ) );
+		$DB->simple_exec();
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			if ( $row['bbcode_useoption'] )
+			{
+				$option = '={option}';
+			}
+			else
+			{
+				$option = '';
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$row['bbcode_title']."</b>",
+																	 '['.$row['bbcode_tag'].$option.']{content}[/'.$row['bbcode_tag'].']',
+																	 "<div align='center'>".
+																	  $ibforums->adskin->js_make_button("Edit"  , $ibforums->base_url."&act=admin&code=bbcode_edit&id={$row['bbcode_id']}").'&nbsp;'.
+																	  $ibforums->adskin->js_make_button("Delete", $ibforums->base_url."&act=admin&code=bbcode_delete&id={$row['bbcode_id']}")
+																	 ."</div>",
+														   )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "<div class='tableborder'><div class='pformstrip' align='center'>".$ibforums->adskin->js_make_button("Add New BBCode"  , $ibforums->base_url."&act=admin&code=bbcode_add")."</div></div>";
+		
+		$ibforums->html .= "<br />";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'admin'       ),
+															     2 => array( 'code' , 'bbcode_test' ),
+													  )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Test your custom BBCode" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Test your BBCode",
+																$ibforums->adskin->form_textarea( 'bbtest', $_POST['bbtest'] ),
+														 )      );
+														 
+		$ibforums->html .= $ibforums->adskin->end_form("Run Test");
+														 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// IMPORT: Start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		//-----------------------------------------
+		// IMPORT: Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'bbcode_import' ),
+															   2 => array( 'act'   , 'admin'      ),
+															   3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+													  ) , "uploadform", " enctype='multipart/form-data'"     );
+													
+													  			
+		$ibforums->html .= $ibforums->adskin->start_table( "Import a BBCode List" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													 		 "<b>Upload XML BBCode List</b><div style='color:gray'>Browse your computer for 'ipb_bbcode.xml' or 'ipb_bbcode.xml.gz'. Duplicate [tag] entries will not be imported.</div>",
+													  		 $ibforums->adskin->form_upload(  )
+													   )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Import");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// DO VIEW
+	//-----------------------------------------
+	
+	function view_cache()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = "No ID was passed, please try again";
+			$this->cache_start();
+		}
+		
+		$row = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='{$ibforums->input['id']}'" ) );
+		
+		ob_start();
+		if ( $row['cs_array'] )
+		{
+			print_r( unserialize($std->txt_stripslashes($row['cs_value'])) );
+		}
+		else
+		{
+			print $row['cs_value'];
+		}
+		
+		$out = ob_get_contents();
+		ob_end_clean();
+		
+		$ibforums->html = "<pre>".htmlentities($out)."</pre>";
+		
+		$ibforums->admin->print_popup();
+		
+	}
+		
+	
+	//-----------------------------------------
+	// DO UPDATE
+	//-----------------------------------------
+	
+	function cache_end()
+	{
+		global $ibforums, $DB, $std;
+		
+		$action = "";
+		
+		foreach( $ibforums->input as $k => $v )
+		{
+			if ( strstr( $k, 'update_' ) and $v != "" )
+			{
+				$action = str_replace( 'update_', '', $k );
+				break;
+			}
+		}
+		
+		switch ( $action )
+		{
+			//-----------------------------------------
+			// Forum cache
+			//-----------------------------------------
+			
+			case 'forum_cache':
+			
+				$std->update_forum_cache();
+				
+				$ibforums->main_msg = 'Forum Cache Updated';
+				break;
+				
+			//-----------------------------------------
+			// Group Cache
+			//-----------------------------------------
+			
+			case 'group_cache':
+				$ibforums->cache['group_cache'] = array();
+			
+				$DB->simple_construct( array( 'select' => "*",
+											  'from'   => 'groups'
+									 )      );
+				
+				$DB->simple_exec();
+				
+				while ( $i = $DB->fetch_row() )
+				{
+					$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+				}
+				
+				$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Group Cache Updated';
+				break;
+				
+			//-----------------------------------------
+			// Systemvars
+			//-----------------------------------------
+			
+			case 'systemvars':
+				$ibforums->cache['systemvars'] = array();
+				
+				$result = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'mail_queue' ) );
+				
+				$ibforums->cache['systemvars']['mail_queue'] = intval( $result['cnt'] );
+				
+				$std->update_cache( array( 'name' => 'systemvars', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				require_once( ROOT_PATH.'sources/lib/task_functions.php' );
+				$task = new task_functions();
+				$task->save_next_run_stamp();
+				
+				$ibforums->main_msg = 'System Variables Updated';
+				break;
+				
+			//-----------------------------------------
+			// Skin ID cache
+			//-----------------------------------------
+			
+			case 'skin_id_cache':
+				require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+    			$admin = new admin_cache_functions();
+    		
+    			$admin->_rebuild_skin_id_cache();
+				
+				$ibforums->main_msg = 'Skin ID Cache Updated';
+				break;
+				
+			//-----------------------------------------
+			// Moderators
+			//-----------------------------------------
+			
+			case 'moderators':
+			
+				$ibforums->cache['moderators'] = array();
+			
+				$DB->simple_construct( array( 'select' => "*",
+											  'from'   => 'moderators'
+									 )      );
+				
+				$DB->simple_exec();
+				
+				while ( $i = $DB->fetch_row() )
+				{
+					$ibforums->cache['moderators'][ $i['mid'] ] = $i;
+				}
+				
+				$std->update_cache( array( 'name' => 'moderators', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Moderators Updated';
+				break;
+				
+			//-----------------------------------------
+			// Stats
+			//-----------------------------------------
+			
+			case 'stats':
+			
+				
+				
+				
+				$ibforums->main_msg = 'Statistics Updated';
+				break;
+				
+			//-----------------------------------------
+			// Ranks
+			//-----------------------------------------
+			
+			case 'ranks':
+			
+				$ibforums->cache['ranks'] = array();
+        	
+				$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+											  'from'   => 'titles',
+											  'order'  => "posts DESC",
+									)      );
+									
+				$DB->simple_exec();
+							
+				while ($i = $DB->fetch_row())
+				{
+					$ibforums->cache['ranks'][ $i['id'] ] = array(
+																  'TITLE' => $i['title'],
+																  'PIPS'  => $i['pips'],
+																  'POSTS' => $i['posts'],
+																);
+				}
+				
+				$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Ranks Updated';
+				break;
+				
+			//-----------------------------------------
+			// Profile Fields
+			//-----------------------------------------
+			
+			case 'profilefields':
+			
+				$ibforums->cache['profilefields'] = array();
+				
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'order' => 'pf_position' ) );
+								 
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					$ibforums->cache['profilefields'][ $r['pf_id'] ] = $r;
+				}
+				
+				$std->update_cache( array( 'name' => 'profilefields', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Profile Fields Updated';
+				break;
+				
+			//-----------------------------------------
+			// Calendar
+			//-----------------------------------------
+			
+			case 'calendar':
+			
+				require_once( ROOT_PATH.'sources/lib/task_functions.php' );
+				$func = new task_functions();
+				
+				require_once( ROOT_PATH.'sources/tasks/calendarevents.php' );
+				
+				$task = new task_item();
+				$task->register_class( $func );
+				$task->restrict_log = 1;
+				$task->run_task();
+				
+				$ibforums->main_msg = 'Calendar Events Updated';
+				break;
+				
+			//-----------------------------------------
+			// Birthdays
+			//-----------------------------------------
+			
+			case 'birthdays':
+			
+				require_once( ROOT_PATH.'sources/lib/task_functions.php' );
+				$func = new task_functions();
+				
+				require_once( ROOT_PATH.'sources/tasks/calendarevents.php' );
+				
+				$task = new task_item();
+				$task->register_class( $func );
+				$task->restrict_log = 1;
+				$task->run_task();
+				
+				$ibforums->main_msg = 'Birthdays Updated';
+				break;
+				
+			//-----------------------------------------
+			// Multimoderation
+			//-----------------------------------------
+			
+			case 'multimod':
+			
+				$ibforums->cache['multimod'] = array();
+        	
+				$DB->simple_construct( array(
+										 'select' => '*',
+										 'from'   => 'topic_mmod',
+										 'order'  => 'mm_title'
+								 )      );
+									
+				$DB->simple_exec();
+							
+				while ($i = $DB->fetch_row())
+				{
+					$ibforums->cache['multimod'][ $i['mm_id'] ] = $i;
+				}
+				
+				$std->update_cache( array( 'name' => 'multimod', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Multi-Moderation Updated';
+				break;
+				
+			//-----------------------------------------
+			// BBCODE
+			//-----------------------------------------
+			
+			case 'bbcode':
+			
+				$this->bbcode_rebuildcache();
+			
+				$ibforums->main_msg = 'BBCode Updated';
+				break;
+				
+			//-----------------------------------------
+			// SETTINGS
+			//-----------------------------------------
+			
+			case 'settings':
+				
+				$ibforums->cache['settings'] = array();
+			
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+				$info = $DB->simple_exec();
+			
+				while ( $r = $DB->fetch_row($info) )
+				{
+					$value = $r['conf_value'] != "" ?  $r['conf_value'] : $r['conf_default'];
+			
+					if ( $value == '{blank}' )
+					{
+						$value = '';
+					}
+			
+					$ibforums->cache['settings'][ $r['conf_key'] ] = $value;
+				}
+				
+				$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Settings Updated';
+				break;
+				
+			//-----------------------------------------
+			// EMOTICONS
+			//-----------------------------------------
+			
+			case 'emoticons':
+			
+				$this->emoticon_rebuildcache();
+			
+				$ibforums->main_msg = 'Emoticons Updated';
+				break;
+				
+			//-----------------------------------------
+			// BADWORDS
+			//-----------------------------------------
+			
+			case 'badwords':
+				
+				$this->badword_rebuildcache();
+				
+				$ibforums->main_msg = 'Badwords Updated';
+				break;
+			
+			//-----------------------------------------
+			// LANGUAGES
+			//-----------------------------------------
+			
+			case 'languages':
+			
+				$ibforums->cache['languages'] = array();
+		
+				$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					$ibforums->cache['languages'][] = $r;
+				}
+				
+				$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Languages Updated';
+				break;
+			
+			//-----------------------------------------
+			// BAN FILTERS
+			//-----------------------------------------
+				
+			case 'banfilters':
+			
+				$this->ban_rebuildcache();
+				
+				$ibforums->main_msg = 'Banfilters Updated';
+				break;
+			
+			//-----------------------------------------
+			// ATTACHMENT TYPES
+			//-----------------------------------------
+				
+			case 'attachtypes':
+				$ibforums->cache['attachtypes'] = array();
+			
+				$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+				$DB->simple_exec();
+			
+				while ( $r = $DB->fetch_row() )
+				{
+					$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+				}
+				
+				$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+				
+				$ibforums->main_msg = 'Attachment Types Updated';
+				break;
+				
+			//-----------------------------------------
+			// Announcements
+			//-----------------------------------------
+				
+			case 'announcements':
+			
+				require_once( ROOT_PATH.'sources/announcements.php' );
+				$announcements = new announcements();
+				$announcements->announce_recache();
+				
+				$ibforums->main_msg = 'Announcements Updated';
+				break;
+					
+			default:
+				$ibforums->main_msg = 'No valid cache was specified to update';
+				break;
+		}
+		
+		$this->cache_start();
+		
+	}
+	
+	//-----------------------------------------
+	// SHOW CACHE FORM
+	//-----------------------------------------
+	
+	function cache_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Map
+		//-----------------------------------------
+		
+		$map = array( 'forum_cache'   => 'All forum information and data',
+					  'group_cache'   => 'All member group infomation and data',
+					  'systemvars'    => 'System runtime variables',
+					  'skin_id_cache' => 'Skin set information and data',
+					  'moderators'    => 'All moderator information and data',
+					  'stats'         => 'Board stats, such as total posts, etc',
+					  'ranks'         => 'Member titles and rank information',
+					  'profilefields' => 'Custom profile field information',
+					  'birthdays'     => 'Members birthdays',
+					  'calendar'      => 'Forthcoming calendar events',
+					  'multimod'      => 'Multi-moderation information and data',
+					  'bbcode'        => "Custom BBCode information and data",
+					  'settings'      => "Board settings and variables",
+					  'emoticons'     => 'Emoticon information and data',
+					  'badwords'      => 'Bad Word Filters information and data',
+					  'languages'     => 'Language Set information',
+					  'banfilters'    => 'Banned IP addresses',
+					  'attachtypes'   => 'Attachment Types information',
+					  'announcements' => 'Announcements cache',
+					);
+					
+		
+		//-----------------------------------------
+		// REBUILD CACHES
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'admin'    ),
+															     2 => array( 'code' , 'cacheend' ),
+												    	  )      );
+									     
+		$ibforums->adskin->td_header[] = array( "Title"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "Size"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Options"  , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Your Cache" );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'order' => 'cs_key' ) );
+		$DB->simple_exec();
+		
+		$used = array();
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			if ( ! in_array( $row['cs_key'], array_keys( $map ) ) )
+			{
+				continue;
+			}
+			
+			$used[ $row['cs_key'] ] = $row['cs_key'];
+			
+			$size = ceil( intval( strlen( $row['cs_value'] ) ) / 1024 );
+																   
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$row['cs_key']."</b><div style='color:gray'>{$map[ $row['cs_key'] ]}</div>",
+																   $size.' kb',
+																   "<div align='center'>
+																    <input type='submit' name='update_{$row['cs_key']}' value='Update' class='realbutton' />
+																    <input type='button' onclick=\"pop_win('act=admin&code=viewcache&id={$row['cs_key']}','Preview', 400,600)\" value='View' class='realbutton' />
+																   </div>",
+														 )      );
+		}
+		
+		if ( count( $used ) != count( $map ) )
+		{
+			foreach( $map as $k => $v )
+			{
+				if ( in_array( $k, array_keys( $used ) ) )
+				{
+					continue;
+				}
+				else
+				{
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$k."</b><div style='color:gray'>{$map[ $k ]}</div>",
+																	   '0 kb',
+																	   "<div align='center'>
+																		<input type='submit' name='update_{$k}' value='Update' class='realbutton' />
+																		<input type='button' onclick=\"pop_win('act=admin&code=viewcache&id={$k}','Preview', 400,600)\" value='View' class='realbutton' />
+																	   </div>",
+															 )      );
+				}
+				
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_form();
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	function perly_length_sort($a, $b)
+	{
+		if ( strlen($a['typed']) == strlen($b['typed']) )
+		{
+			return 0;
+		}
+		return ( strlen($a['typed']) > strlen($b['typed']) ) ? -1 : 1;
+	}
+	
+	function perly_word_sort($a, $b)
+	{
+		if ( strlen($a['type']) == strlen($b['type']) )
+		{
+			return 0;
+		}
+		return ( strlen($a['type']) > strlen($b['type']) ) ? -1 : 1;
+	}
+	
+	
+	
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_adminlogs.php b/upload/sources/admin/ad_adminlogs.php
new file mode 100644
index 00000000..48b4a2a8
--- /dev/null
+++ b/upload/sources/admin/ad_adminlogs.php
@@ -0,0 +1,336 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Logs Stuff
+|   > Module written by Matt Mecham
+|   > Date started: 11nd September 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_adminlogs
+{
+
+	var $base_url;
+	var $colours = array();
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		// Make sure we're a root admin, or else!
+		//-----------------------------------------
+		
+		if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+		{
+			$ibforums->admin->error("Sorry, these functions are for the root admin group only");
+		}
+		
+		$this->colours  = array(
+								"cat"      => "green",
+								"forum"    => "darkgreen",
+								"mem"      => "red",
+								'group'    => "purple",
+								'mod'      => 'orange',
+								'op'       => 'darkred',
+								'help'     => 'darkorange',
+								'modlog'   => 'steelblue',
+				   			   );
+		
+
+		switch($ibforums->input['code'])
+		{
+			case 'view':
+				$this->view();
+				break;
+				
+			case 'remove':
+				$this->remove();
+				break;
+				
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function view()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$start = $ibforums->input['st'] ? $ibforums->input['st'] : 0;
+		
+		$ibforums->admin->page_detail = "Viewing all actions by a administrator";
+		$ibforums->admin->page_title  = "Administration Logs Manager";
+	
+		if ($ibforums->input['search_string'] == "")
+		{
+			$DB->simple_construct( array( 'select' => 'COUNT(id) as count', 'from' => 'admin_logs', 'where' => "member_id=".intval($ibforums->input['mid']) ) );
+			$DB->simple_exec();
+		
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=adminlog&mid={$ibforums->input['mid']}&code=view";
+			
+			$DB->cache_add_query( 'adminlogs_view_one', array( 'mid' => $ibforums->input['mid'], 'limit_a' => $start ) );
+			$DB->cache_exec_query();
+		
+		}
+		else
+		{
+			$ibforums->input['search_string'] = urldecode($ibforums->input['search_string']);
+			
+			$dbq = "m.".$ibforums->input['search_type']." LIKE '%".$ibforums->input['search_string']."%'";
+			
+			$DB->simple_construct( array( 'select' => 'COUNT(m.id) as count', 'from' => 'admin_logs m', 'where' => $dbq ) );
+			$DB->simple_exec();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=adminlog&code=view&search_type={$ibforums->input['search_type']}&search_string=".urlencode($ibforums->input['search_string']);
+			
+			$DB->cache_add_query( 'adminlogs_view_two', array( 'dbq' => $dbq, 'limit_a' => $start ) );
+			$DB->cache_exec_query();
+		}
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
+											   'PER_PAGE'    => 20,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Pages: ",
+											   'BASE_URL'    => $ibforums->base_url.$query,
+											 )
+									  );
+									  
+		$ibforums->admin->page_detail = "You may view and remove actions performed by your administrators";
+		$ibforums->admin->page_title  = "Administrator Logs Manager";
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "20%" );
+		$ibforums->adskin->td_header[] = array( "Action Perfomed"        , "40%" );
+		$ibforums->adskin->td_header[] = array( "Time of action"         , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP address"             , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Admin Logs" );
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'center', 'pformstrip');
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$row['ctime'] = $ibforums->admin->get_date( $row['ctime'], 'LONG' );
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$row['name']}</b>",
+														  "<span style='color:{$this->colours[$row['act']]}'>{$row['note']}</span>",
+														  "{$row['ctime']}",
+														  "{$row['ip_address']}",
+												 )      );
+			
+			
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'center', 'pformstrip');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function remove()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You did not select a member ID to remove by!");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'admin_logs', 'where' => "member_id=".$ibforums->input['mid'] ) );
+		
+		$std->boink_it($ibforums->base_url."&act=adminlog");
+	}
+	
+	
+	//-----------------------------------------
+	// SHOW ALL LANGUAGE PACKS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$form_array = array();
+	
+		$ibforums->admin->page_detail = "You may view and remove actions performed by your administrators in mission critical areas of the administration CP (such as forum control, member control, group control, help files and moderator log management).";
+		$ibforums->admin->page_title  = "Administration Logs Manager";
+		
+		//-----------------------------------------
+		// LAST FIVE ACTIONS
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'adminlogs_view_list_current', array() );
+		$DB->cache_exec_query();
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "20%" );
+		$ibforums->adskin->td_header[] = array( "Action Perfomed"        , "40%" );
+		$ibforums->adskin->td_header[] = array( "Time of action"         , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP address"             , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Last 5 Admin Actions" );
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$row['ctime'] = $ibforums->admin->get_date( $row['ctime'], 'LONG' );
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$row['name']}</b>",
+														  "<span style='color:{$this->colours[$row['act']]}'>{$row['note']}</span>",
+														  "{$row['ctime']}",
+														  "{$row['ip_address']}",
+												 )      );
+			
+			
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "30%" );
+		$ibforums->adskin->td_header[] = array( "Actions Perfomed"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "View all by member"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Remove all by member"   , "30%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Admininstration Logs" );
+		
+		$DB->cache_add_query( 'adminlogs_view_list_current_two', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$r['name']}</b>",
+													  "<center>{$r['act_count']}</center>",
+													  "<center><a href='".$ibforums->adskin->base_url."&act=adminlog&code=view&mid={$r['member_id']}'>View</a></center>",
+													  "<center><a href='".$ibforums->adskin->base_url."&act=adminlog&code=remove&mid={$r['member_id']}'>Remove</a></center>",
+											 )      );
+		}
+			
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'view'     ),
+												  2 => array( 'act'   , 'adminlog'       ),
+									     )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Admin Logs" );
+		
+		$form_array = array(
+							  0 => array( 'note'      , 'Action Performed' ),
+							  1 => array( 'ip_address',  'IP Address'  ),
+							  2 => array( 'member_id' , 'Member ID' ),
+							  3 => array( 'act'        , 'ACT Setting'  ),
+							  4 => array( 'code'       , 'CODE Setting'  ),
+						   );
+			
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search for...</b>" ,
+										  		  $ibforums->adskin->form_input( "search_string")
+								 )      );
+								 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search in...</b>" ,
+										  		  $ibforums->adskin->form_dropdown( "search_type", $form_array)
+								 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_attachments.php b/upload/sources/admin/ad_attachments.php
new file mode 100644
index 00000000..bdfb8aff
--- /dev/null
+++ b/upload/sources/admin/ad_attachments.php
@@ -0,0 +1,1052 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2004 Invision Power Services
+|   http://www.ibforums.com
+|   ========================================
+|   Web: http://www.ibforums.com
+|   Email: phpboards@ibforums.com
+|   Licence Info: phpib-licence@ibforums.com
++---------------------------------------------------------------------------
+|
+|   > Admin: Attachment Functions
+|   > Module written by Matt Mecham
+|   > Date started: Saturday 13th March
+|   > (Ooh, 13th! Note: First ever IPB module to be started
+|   >  on a Saturday!)
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_attachments {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std, $ibforums;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=attach', 'Attachments Manager' );
+		
+		$ibforums->admin->page_detail = "This section will allow you to manage your member's attachments and attachment permissions";
+		$ibforums->admin->page_title  = "Attachments Manager";
+		
+		//-----------------------------------------
+		// StRT!
+		//-----------------------------------------
+
+		switch( $ibforums->input['code'] )
+		{
+			case 'types':
+				$this->attach_type_start();
+				break;
+			case 'attach_add':
+				$this->attach_type_form('add');
+				break;
+			case 'attach_doadd':
+				$this->attach_type_save('add');
+				break;
+			case 'attach_edit':
+				$this->attach_type_form('edit');
+				break;
+			case 'attach_delete':
+				$this->attach_type_delete();
+				break;
+			case 'attach_doedit':
+				$this->attach_type_save('edit');
+				break;
+			case 'attach_export':
+				$this->attach_type_export();
+				break;
+			case 'attach_import':
+				$this->attach_type_import();
+				break;
+			//-----------------------------------------
+			// Stats
+			//-----------------------------------------
+			case 'stats':
+				$this->attach_stats_start();
+				break;
+			//-----------------------------------------
+			// Bulk Remove
+			//-----------------------------------------	
+			case 'attach_bulk_remove':
+				$this->attach_bulk_remove();
+				break;
+			//-----------------------------------------
+			// Search
+			//-----------------------------------------	
+			case 'search':
+				$this->attach_search_start();
+				break;
+			case 'attach_search_complete':
+				$this->attach_search_complete();
+				break;
+			//-----------------------------------------
+			// Default:
+			//-----------------------------------------
+			default:
+				$this->attach_type_start();
+				break;
+		}
+	}
+	
+	//-----------------------------------------
+	//
+	// SEARCH: Complete
+	//
+	//-----------------------------------------
+	
+	function attach_search_complete()
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		$show = intval($ibforums->input['show']);
+		
+		$show = $show > 100 ? 100 : $show;
+		
+		//-----------------------------------------
+		// Get attachment details
+		//-----------------------------------------
+		
+		$ibforums->cache['attachtypes'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Build URL
+		//-----------------------------------------
+		
+		$url = "";
+		$url_components = array( 'extension', 'filesize', 'filesize_gt', 'days', 'days_gt', 'hits', 'hits_gt', 'filename', 'authorname', 'onlyimage' );
+		
+		foreach( $url_components as $u )
+		{
+			$url .= $u.'='.$ibforums->input[ $u ].'&';
+		}
+		
+		$url .= 'orderby='.$ibforums->input['orderby'].'&sort='.$ibforums->input['sort'].'&show='.$ibforums->input['show'];
+		
+		//-----------------------------------------
+		// Build Query
+		//-----------------------------------------
+		
+		$queryfinal = "";
+		$query      = array();
+		
+		if ( $ibforums->input['extension'] )
+		{
+			$query[] = 'a.attach_ext="'.strtolower( str_replace( ".", "", $ibforums->input['extension'] ) ).'"';
+		}
+		
+		if ( $ibforums->input['filesize'] )
+		{
+			$gt = $ibforums->input['filesize_gt'] == 'gt' ? '>=' : '<';
+			
+			$query[] = "a.attach_filesize $gt ".intval($ibforums->input['filesize']*1024);
+		}
+		
+		if ( $ibforums->input['days'] )
+		{
+			$day_break = time() - intval( $ibforums->input['days'] * 86400 );
+			
+			$gt = $ibforums->input['days_gt'] == 'lt' ? '>=' : '<';
+			
+			$query[] = "a.attach_date $gt ".$day_break;
+		}
+		
+		if ( $ibforums->input['hits'] )
+		{
+			$gt = $ibforums->input['hits_gt'] == 'gt' ? '>=' : '<';
+			
+			$query[] = "a.attach_hits $gt ".$ibforums->input['hits'];
+		}
+		
+		if ( $ibforums->input['filename'] )
+		{
+			$query[] = 'LOWER(a.attach_file) LIKE "%'.strtolower( $ibforums->input['filename'] ).'%"';
+		}
+		
+		if ( $ibforums->input['authorname'] )
+		{
+			$query[] = 'LOWER(p.author_name) LIKE "%'.strtolower( $ibforums->input['authorname'] ).'%"';
+		}
+		
+		if ( $ibforums->input['onlyimage'] )
+		{
+			$query[] = 'a.attach_is_image=1';
+		}
+		
+		if ( count($query) )
+		{
+			$queryfinal = 'AND '. implode( " AND ", $query );
+		}
+		
+		$DB->cache_add_query( 'attachments_search_complete', array( 'queryfinal' => $queryfinal,
+																	'orderby'    => $ibforums->input['orderby'],
+																	'sort'       => $ibforums->input['sort'],
+																	'limit_b'    => $show ) );
+		$DB->cache_exec_query();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'attach_bulk_remove'   ),
+												                 2 => array( 'act'   , 'attach'  ),
+												                 3 => array( 'return', 'search'   ),
+												                 4 => array( 'url'   , $url      ),
+									                    )      );
+									                    		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		$ibforums->adskin->td_header[] = array( "Attachment", "20%" );
+		$ibforums->adskin->td_header[] = array( "Size"      , "10%" );
+		$ibforums->adskin->td_header[] = array( "Author"    , "15%" );
+		$ibforums->adskin->td_header[] = array( "Topic"     , "25%" );
+		$ibforums->adskin->td_header[] = array( "Posted    ", "25%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Attachments: Search Results" );
+
+		while ( $r = $DB->fetch_row() )
+		{
+			$r['stitle'] = $std->txt_truncate($r['title'], 30);
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<img src='style_images/{$ibforums->skin['_imagedir']}/{$ibforums->cache['attachtypes'][ $r['attach_ext'] ]['atype_img']}' border='0' />" ,
+																	 "<a href='index.php?act=attach&type=post&id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a>",
+																     $std->size_format($r['attach_filesize']),
+																     $r['author_name'],
+																     "<a href='index.php?showtopic={$r['tid']}&view=findpost&p={$r['attach_pid']}' target='_blank' title='{$r['title']}'>{$r['stitle']}</a>",
+																     $std->get_date( $r['post_date'], 'SHORT', 1 ),
+																     "<div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div>",
+													        )      );
+		}
+		
+		$removebutton = "<input type='submit' value='Delete Checked Attachments' class='realdarkbutton'></form>";
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( $removebutton, "right", "pformstrip");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// PRINT
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// SEARCH: Start
+	//
+	//-----------------------------------------
+	
+	function attach_search_start()
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// HEADER
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Attachments" );
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'attach_search_complete' ),
+												                 2 => array( 'act'   , 'attach'  ),
+									                    )      );
+									                    
+		$gt_array = array( 0 => array( 'gt', 'More Than' ), 1 => array( 'lt', 'Less Than' ) );
+		
+		//-----------------------------------------
+		// FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match File Extension</b><div style='color:gray'>Leave blank to omit</div>",
+												 				 $ibforums->adskin->form_simple_input( 'extension', $_POST['extension'], 10 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match File Size (in kb)</b><div style='color:gray'>Leave blank to omit</div>",
+																 $ibforums->adskin->form_dropdown( 'filesize_gt', $gt_array, $_POST['filesize_gt'] ).' '.
+												 				 $ibforums->adskin->form_simple_input( 'filesize', $_POST['filesize'], 10 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match Posted <em>n</em> Days</b><div style='color:gray'>Leave blank to omit</div>",
+																 $ibforums->adskin->form_dropdown( 'days_gt', $gt_array, $_POST['days_gt'] ).' '.
+												 				 $ibforums->adskin->form_simple_input( 'days', $_POST['days'], 10 ).' ago',
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match Viewed <em>n</em> Times</b><div style='color:gray'>Leave blank to omit</div>",
+																 $ibforums->adskin->form_dropdown( 'hits_gt', $gt_array, $_POST['hits_gt'] ).' '.
+												 				 $ibforums->adskin->form_simple_input( 'hits', $_POST['hits'], 10 ).' times',
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match File Name</b><div style='color:gray'>Leave blank to omit</div>",
+												 				 $ibforums->adskin->form_simple_input( 'filename', $_POST['filename'], 30 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match Post Author Name</b><div style='color:gray'>Leave blank to omit</div>",
+												 				 $ibforums->adskin->form_simple_input( 'authorname', $_POST['authorname'], 30 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Match Only Images?</b><div style='color:gray'>If 'yes', this search will only return image attachments.</div>",
+												 				 $ibforums->adskin->form_yes_no( 'onlyimage', $_POST['onlyimage'], 30 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Order Results By</b>",
+																 $ibforums->adskin->form_dropdown( 'orderby', array( 0 => array( 'date'    , 'Attach Date'      ),
+																 										             1 => array( 'hits'    , 'Attach Views'     ),
+																 										             2 => array( 'filesize', 'Attach File Size' ),
+																 										             3 => array( 'file'    , 'Attach File Name' ),
+																 										           ), $_POST['orderby'] ).' '.
+																 $ibforums->adskin->form_dropdown( 'sort'   , array( 0 => array( 'desc'   , 'Descending [9-0]'  ),
+																 													 1 => array( 'asc'    , 'Ascending [0-9]'   ),
+																 										           ), $_POST['sort'] )
+																 										        
+												 				 
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Show <em>n</em> Results</b><div style='color:gray'>Maximum is 100 regardless of your entry</div>",
+												 				 $ibforums->adskin->form_simple_input( 'show', $_POST['show'] ? $_POST['show'] : 25, 10 ),
+														)      );
+														
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	//
+	// BULK REMOVE
+	//
+	//-----------------------------------------
+	
+	function attach_bulk_remove()
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^attach_(\d+)$/", $key, $match ) )
+			{
+				if ( $ibforums->input[$match[0]] )
+				{
+					$ids[] = $match[1];
+				}
+			}
+		}
+		
+		$attach_tid = array();
+		
+		if ( count( $ids ) )
+		{
+			//-----------------------------------------
+			// Get attach details?
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'attachments_bulk_remove', array( 'ids' => $ids ) );
+			$DB->cache_exec_query();
+			
+			$attach_ids = array();
+			
+			while ( $killmeh = $DB->fetch_row() )
+			{
+				if ( $killmeh['attach_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
+				}
+				if ( $killmeh['attach_thumb_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+				}
+				
+				$attach_tid[ $killmeh['topic_id'] ] = $killmeh['topic_id'];
+			}
+			
+			$DB->simple_exec_query( array( 'delete' => 'attachments', 'where' => "attach_id IN(".implode(",",$ids).")" ) );
+			
+			//-----------------------------------------
+			// Recount topic upload marker
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'sources/post.php' );
+			
+			$postlib = new post();
+			
+			foreach( $attach_tid as $apid => $tid )
+			{
+				$postlib->pf_recount_topic_attachments($tid);
+			}
+		}
+		
+		$ibforums->main_msg = "Attachments Removed";
+		
+		if ( $ibforums->input['return'] == 'stats' )
+		{
+			$this->attach_stats_start();
+		}
+		else
+		{
+			if ( $_POST['url'] )
+			{
+				foreach( explode( '&', $_POST['url'] ) as $u )
+				{
+					list ( $k, $v ) = explode( '=', $u );
+					
+					$ibforums->input[ $k ] = $v;
+				}
+			}
+			
+			$this->attach_search_complete();
+		}
+	}
+	
+	//-----------------------------------------
+	//
+	// STATS: Start
+	//
+	//-----------------------------------------
+	
+	function attach_stats_start()
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Get attachment details
+		//-----------------------------------------
+		
+		$ibforums->cache['attachtypes'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		$ibforums->adskin->td_header[] = array( "{none}", "30%" );
+		$ibforums->adskin->td_header[] = array( "{none}", "20%" );
+		$ibforums->adskin->td_header[] = array( "{none}", "30%" );
+		$ibforums->adskin->td_header[] = array( "{none}", "20%" );
+		
+		//-----------------------------------------
+		// Get quick stats
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Attachments: Overview" );
+		
+		$stats = $DB->simple_exec_query( array( 'select' => 'count(*) as count, sum(attach_filesize) as sum',
+ 												'from'   => 'attachments' ) );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Number of Attachments</b>" , $std->do_number_format($stats['count']),
+																 "<b>Attachments Disk Usage</b>", $std->size_format($stats['sum']),
+													   )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'attach_bulk_remove'   ),
+												                 2 => array( 'act'   , 'attach'  ),
+												                 3 => array( 'return', 'stats'   ),
+									                    )      );
+									                    
+		//-----------------------------------------
+		// Recent 5 Attachments
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		$ibforums->adskin->td_header[] = array( "Attachment", "20%" );
+		$ibforums->adskin->td_header[] = array( "Size"      , "10%" );
+		$ibforums->adskin->td_header[] = array( "Author"    , "15%" );
+		$ibforums->adskin->td_header[] = array( "Topic"     , "25%" );
+		$ibforums->adskin->td_header[] = array( "Posted    ", "25%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Attachments: Last 5 Attached" );
+		
+		$DB->cache_add_query( 'attachments_last_x', array( 'order' => 'attach_date' ) );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$r['stitle'] = $std->txt_truncate($r['title'], 30);
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<img src='style_images/{$ibforums->skin['_imagedir']}/{$ibforums->cache['attachtypes'][ $r['attach_ext'] ]['atype_img']}' border='0' />" ,
+																	 "<a href='index.php?act=attach&type=post&id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a>",
+																     $std->size_format($r['attach_filesize']),
+																     $r['author_name'],
+																     "<a href='index.php?showtopic={$r['tid']}&view=findpost&p={$r['attach_pid']}' target='_blank' title='{$r['title']}'>{$r['stitle']}</a>",
+																     $std->get_date( $r['post_date'], 'SHORT', 1 ),
+																     "<div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div>",
+													        )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Largest 5 Attachments
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		$ibforums->adskin->td_header[] = array( "Attachment", "20%" );
+		$ibforums->adskin->td_header[] = array( "Size"      , "10%" );
+		$ibforums->adskin->td_header[] = array( "Author"    , "15%" );
+		$ibforums->adskin->td_header[] = array( "Topic"     , "25%" );
+		$ibforums->adskin->td_header[] = array( "Posted    ", "25%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Attachments: Largest 5 Topic Attachments" );
+		
+		$DB->cache_add_query( 'attachments_last_x', array( 'order' => 'attach_filesize' ) );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$r['stitle'] = $std->txt_truncate($r['title'], 30);
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<img src='style_images/{$ibforums->skin['_imagedir']}/{$ibforums->cache['attachtypes'][ $r['attach_ext'] ]['atype_img']}' border='0' />" ,
+																	 "<a href='index.php?act=attach&type=post&id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a>",
+																     $std->size_format($r['attach_filesize']),
+																     $r['author_name'],
+																     "<a href='index.php?showtopic={$r['tid']}&view=findpost&p={$r['attach_pid']}' target='_blank' title='{$r['title']}'>{$r['stitle']}</a>",
+																     $std->get_date( $r['post_date'], 'SHORT', 1 ),
+																     "<div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div>",
+													        )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Most popular
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		$ibforums->adskin->td_header[] = array( "Attachment", "20%" );
+		$ibforums->adskin->td_header[] = array( "Viewed"    , "10%" );
+		$ibforums->adskin->td_header[] = array( "Author"    , "15%" );
+		$ibforums->adskin->td_header[] = array( "Topic"     , "25%" );
+		$ibforums->adskin->td_header[] = array( "Posted    ", "25%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "1%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Attachments: Top 5 Most Viewed" );
+		
+		$DB->cache_add_query( 'attachments_last_x', array( 'order' => 'attach_hits' ) );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$r['stitle'] = $std->txt_truncate($r['title'], 30);
+			
+			$size = $std->size_format($r['attach_filesize']);
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<img src='style_images/{$ibforums->skin['_imagedir']}/{$ibforums->cache['attachtypes'][ $r['attach_ext'] ]['atype_img']}' border='0' />" ,
+																	 "<a title='{$size}' href='index.php?act=attach&type=post&id={$r['attach_id']}' target='_blank'>{$r['attach_file']}</a>",
+																     $r['attach_hits'],
+																     $r['author_name'],
+																     "<a href='index.php?showtopic={$r['tid']}&view=findpost&p={$r['attach_pid']}' target='_blank' title='{$r['title']}'>{$r['stitle']}</a>",
+																     $std->get_date( $r['post_date'], 'SHORT', 1 ),
+																     "<div align='center'><input type='checkbox' name='attach_{$r['attach_id']}' value='1' /></div>",
+													        )      );
+		}
+		
+		$removebutton = "<input type='submit' value='Delete Checked Attachments' class='realdarkbutton'></form>";
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( $removebutton, "right", "pformstrip");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// PRINT
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	}
+	
+	
+	
+	//-----------------------------------------
+	// TYPE: Import
+	//-----------------------------------------
+	
+	function attach_type_import()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$content = $ibforums->admin->import_xml( 'ipb_attachtypes.xml' );
+		
+		//-----------------------------------------
+		// Got anything?
+		//-----------------------------------------
+		
+		if ( ! $content )
+		{
+			$ibforums->main_msg = "Upload failed, ipb_attachtypes.xml was either missing or empty";
+			$this->attach_type_start();
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		//-----------------------------------------
+		// Get current badwords
+		//-----------------------------------------
+		
+		$types = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments_type', 'order' => "atype_extension" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$types[ $r['atype_extension'] ] = 1;
+		}
+		
+		//-----------------------------------------
+		// pArse
+		//-----------------------------------------
+		
+		foreach( $xml->xml_array['attachtypesexport']['attachtypesgroup']['attachtype'] as $idx => $entry )
+		{
+			$insert_array = array( 'atype_extension' => $entry['atype_extension']['VALUE'],
+								   'atype_mimetype'  => $entry['atype_mimetype']['VALUE'],
+								   'atype_post'      => $entry['atype_post']['VALUE'],
+								   'atype_photo'     => $entry['atype_photo']['VALUE'],
+								   'atype_img'       => $entry['atype_img']['VALUE']
+								 );
+			
+			if ( $types[ $entry['atype_extension']['VALUE'] ] )
+			{
+				continue;
+			}
+			
+			if ( $entry['atype_extension']['VALUE'] and $entry['atype_mimetype']['VALUE'] )
+			{
+				$DB->do_insert( 'attachments_type', $insert_array );
+			}
+		}
+		
+		$this->attach_type_rebuildcache();
+                    
+		$ibforums->main_msg = "Attachment Types XML file import completed";
+		
+		$this->attach_type_start();
+	
+	}
+	
+	//-----------------------------------------
+	//
+	// TYPES: Export
+	//
+	//-----------------------------------------
+	
+	function attach_type_export()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Start...
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'attachtypesexport', array( 'exported' => time() ) );
+		
+		//-----------------------------------------
+		// Get emo group
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'attachtypesgroup' );
+		
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img',
+									  'from'   => 'attachments_type',
+									  'order'  => "atype_extension" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$content = array();
+			
+			foreach ( $r as $k => $v )
+			{
+				$content[] = $xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[] = $xml->xml_build_entry( 'attachtype', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'attachtypesgroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $xml->xml_document, 'ipb_attachtypes.xml' );
+	}
+	
+	//-----------------------------------------
+	//
+	// TYPES: DELETE
+	//
+	//-----------------------------------------
+	
+	function attach_type_delete()
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		$DB->simple_exec_query( array( 'delete' => 'attachments_type', 'where' => 'atype_id='.$ibforums->input['id'] ) );
+		
+		$this->attach_type_rebuildcache();
+		
+		$ibforums->main_msg = "Attachment type deleted";
+		
+		$this->attach_type_start();
+	}
+	
+	//-----------------------------------------
+	//
+	// TYPES: SAVE (edit / add)
+	//
+	//-----------------------------------------
+	
+	function attach_type_save( $type='add' )
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		//-----------------------------------------
+		// check basics
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['atype_extension'] or ! $ibforums->input['atype_mimetype'] )
+		{
+			$ibforums->main_msg = "You must enter at least an extension and mime-type before continuing.";
+			$this->attach_type_form( $type );
+		}
+		
+		$save_array = array( 'atype_extension' => str_replace( ".", "", $ibforums->input['atype_extension'] ),
+							 'atype_mimetype'  => $ibforums->input['atype_mimetype'],
+							 'atype_post'      => $ibforums->input['atype_post'],
+							 'atype_photo'     => $ibforums->input['atype_photo'],
+							 'atype_img'       => $ibforums->input['atype_img']
+						   );
+		
+		if ( $type == 'add' )
+		{
+			//-----------------------------------------
+			// Check for existing..
+			//-----------------------------------------
+			
+			$attach = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'attachments_type', 'where' => "atype_extension='".$save_array['atype_extension']."'" ) );
+			
+			if ( $attach['atype_id'] )
+			{
+				$ibforums->main_msg = "The extension '{$save_array['atype_extension']}' already exists, please choose another extension.";
+				$this->attach_type_form($type);
+			}
+			
+			$DB->do_insert( 'attachments_type', $save_array );
+			
+			$ibforums->main_msg = "Attachment type added";
+			
+		}
+		else
+		{
+			$DB->do_update( 'attachments_type', $save_array, 'atype_id='.$ibforums->input['id'] );
+			
+			$ibforums->main_msg = "Attachment type edited";
+		}
+		
+		$this->attach_type_rebuildcache();
+		
+		$this->attach_type_start();
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// TYPES: FORM (edit / add)
+	//
+	//-----------------------------------------
+	
+	function attach_type_form( $type='add' )
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+		$ibforums->input['id']     = intval($ibforums->input['id']);
+		$ibforums->input['baseon'] = intval($ibforums->input['baseon']);
+		
+		if ( $type == 'add' )
+		{
+			$code   = 'attach_doadd';
+			$button = 'Add New Attachment Type';
+			
+			if ( $ibforums->input['baseon'] )
+			{
+				$attach = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'attachments_type', 'where' => 'atype_id='.$ibforums->input['baseon'] ) );
+			}
+			else
+			{
+				$attach = array();
+			}
+			
+			//-----------------------------------------
+			// Generate 'base on'
+			//-----------------------------------------
+			
+			$dd = "";
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments_type', 'order' => 'atype_extension' ) );
+			$DB->simple_exec();
+		
+			while( $r = $DB->fetch_row() )
+			{
+				$dd .= "<option value='{$r['atype_id']}'>Base on: {$r['atype_extension']}</option>\n";
+			}
+			
+			$title = "
+					  <div style='float:right;width:auto;padding-right:3px;'>
+					  <form method='post' action='{$ibforums->base_url}&act=attach&code=attach_add'>
+					  <select name='baseon' class='realbutton'>{$dd}</select> &nbsp;<input type='submit' value='Go' class='realdarkbutton' />
+					  </form>
+					  </div><div style='padding-bottom:5px'>{$button}</div>";
+			
+		}
+		else
+		{
+			$code   = 'attach_doedit';
+			$button = 'Edit Attachment Type';
+			$title  = $button;
+			$attach = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'attachments_type', 'where' => 'atype_id='.$ibforums->input['id'] ) );
+		
+			if ( ! $attach['atype_id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again.";
+				$this->attach_type_start();
+			}
+		}
+		
+		//-----------------------------------------
+		// HEADER
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $title );
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $code     ),
+												                 2 => array( 'act'   , 'attach'  ),
+												                 3 => array( 'id'    , $ibforums->input['id'] )
+									                    )      );
+		
+		//-----------------------------------------
+		// FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Attachment File Extension</b><div style='color:gray'>This is the (usually) three character filename suffix.<br />You don't need to add the '.' before the extension</div>",
+												 				 $ibforums->adskin->form_simple_input( 'atype_extension', $_POST['atype_extension'] ? $_POST['atype_extension'] : $attach['atype_extension'], 10 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Attachment Mime-Type</b><div style='color:gray'>Unsure what the correct mime-type is?. <a href='http://www.utoronto.ca/webdocs/HTMLdocs/Book/Book-3ed/appb/mimetype.html' target='_blank'>Try looking here</a></div>",
+												 				 $ibforums->adskin->form_simple_input( 'atype_mimetype', $_POST['atype_mimetype'] ? $_POST['atype_mimetype'] : $attach['atype_mimetype'], 40 ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow this attachment in posts?</b>",
+												 				 $ibforums->adskin->form_yes_no( 'atype_post', $_POST['atype_post'] ? $_POST['atype_post'] : $attach['atype_post'] ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow this attachment in avatars / personal photos?</b>",
+												 				 $ibforums->adskin->form_yes_no( 'atype_photo', $_POST['atype_photo'] ? $_POST['atype_photo'] : $attach['atype_photo'] ),
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Attachment Mini-Image</b><div style='color:gray'>This is the little icon that represents the attachment type in a post.</div>",
+												 				 $ibforums->adskin->form_simple_input( 'atype_img', $_POST['atype_img'] ? $_POST['atype_img'] : $attach['atype_img'], 40 ),
+														)      );	
+		
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// TYPES: Start
+	//
+	//-----------------------------------------
+	
+	function attach_type_start()
+	{
+		global $ibforums, $DB, $std, $ibforums;
+		
+									                  
+		$ibforums->adskin->td_header[] = array( "&nbsp;"        , "1%" );
+		$ibforums->adskin->td_header[] = array( "Extension"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Mime-Type"     , "40%" );
+		$ibforums->adskin->td_header[] = array( "+Post"         , "10%" );
+		$ibforums->adskin->td_header[] = array( "+Avatar"       , "10%" );
+		$ibforums->adskin->td_header[] = array( "Options"       , "20%" );
+		
+		$export_button = $ibforums->adskin->js_make_button("Export Attachment Types", $ibforums->base_url."&act=attach&code=attach_export");
+		
+		$table = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+				  <tr>
+				  <td align='left' width='100%' style='font-weight:bold;font-size:11px;color:#FFF'>Attachment Types</td>
+				  <td align='right' nowrap='nowrap' style='padding-right:2px'>{$export_button}</td>
+				  </tr>
+				  </table>";
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $table );
+		
+		//-----------------------------------------
+		// Get 'em
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments_type', 'order' => 'atype_extension' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$checked_img    = "<img src='{$ibforums->adskin->img_url}/acp_check.gif' border='0' alt='X' />";
+			$apost_checked  = $r['atype_post']  ? $checked_img : '&nbsp;';
+			$aphoto_checked = $r['atype_photo'] ? $checked_img : '&nbsp;';
+			
+			$edit   = $ibforums->adskin->js_make_button("Edit", "{$ibforums->base_url}&act=attach&code=attach_edit&id={$r['atype_id']}" );
+			$delete = $ibforums->adskin->js_make_button("Delete", "{$ibforums->base_url}&act=attach&code=attach_delete&id={$r['atype_id']}", 'realdarkbutton' );
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<img src='style_images/{$ibforums->skin['_imagedir']}/{$r['atype_img']}' border='0' />",
+												 					 ".<strong>{$r['atype_extension']}</strong>",
+												 					 $r['atype_mimetype'],
+												 					 "<div align='center'>{$apost_checked}</div>",
+												 					 "<div align='center'>{$aphoto_checked}</div>",
+												 					 "<div align='center'>{$edit} &nbsp; &nbsp; {$delete}</div>",
+														   )      );
+		}
+		
+		$add_new = $ibforums->adskin->js_make_button("Add New Attachment Type", "{$ibforums->base_url}&act=attach&code=attach_add" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( $add_new, "center", "pformstrip");		
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// IMPORT: Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'attach_import' ),
+															     2 => array( 'act'   , 'attach'        ),
+															     3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+													    ) , "uploadform", " enctype='multipart/form-data'"     );
+													
+													  			
+		$ibforums->html .= $ibforums->adskin->start_table( "Import an Attachment Types List" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													 		    "<b>Upload XML Attachment Types List</b><div style='color:gray'>Browse your computer for 'ipb_attachtypes.xml' or 'ipb_attachtypes.xml.gz'. Duplicate entries will not be imported.</div>",
+													  		    $ibforums->adskin->form_upload(  )
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Import");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	//
+	// TYPES: Rebuild Cache
+	//
+	//-----------------------------------------
+	
+	function attach_type_rebuildcache()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->cache['attachtypes'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	
+	
+	
+	
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_emailerror.php b/upload/sources/admin/ad_emailerror.php
new file mode 100644
index 00000000..5a6ddd03
--- /dev/null
+++ b/upload/sources/admin/ad_emailerror.php
@@ -0,0 +1,382 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Email Error Logs Stuff
+|   > Module written by Matt Mecham
+|   > Date started: 7th April 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_emailerror
+{
+
+	
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		// Make sure we're a root admin, or else!
+		//-----------------------------------------
+		
+		if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+		{
+			$ibforums->admin->error("Sorry, these functions are for the root admin group only");
+		}
+		
+
+		switch($ibforums->input['code'])
+		{
+			case 'list':
+				$this->list_current();
+				break;
+				
+			case 'remove':
+				$this->remove_entries();
+				break;
+				
+		    case 'viewemail':
+		    	$this->view_email();
+		    	break;
+				
+				
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// View a single email.
+	//-----------------------------------------
+	
+	function view_email()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again");
+		}
+		
+		$id = intval($ibforums->input['id']);
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'mail_error_logs', 'where' => "mlog_id=$id" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again ($id)");
+		}
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $row['mlog_subject'] );
+	
+		$row['mlog_date']    = $ibforums->admin->get_date( $row['mlog_date'], 'LONG' );
+		$row['mlog_content'] = nl2br($row['mlog_content']);
+		
+		$row['mlog_msg']        = $row['mlog_msg']        ? $row['mlog_msg']        : '<em>No Info</em>';
+		$row['mlog_code']       = $row['mlog_code']       ? $row['mlog_code']       : '<em>No Info</em>';
+		$row['mlog_smtp_error'] = $row['mlog_smtp_error'] ? $row['mlog_smtp_error'] : '<em>No Info</em>';
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+																  "<strong>From:</strong> &lt;{$row['mlog_from']}&gt;
+																  <br /><strong>To:</strong> &lt;{$row['mlog_to']}&gt;
+																  <br /><strong>Sent:</strong> {$row['mlog_date']}
+																  <br /><strong>Subject:</strong> {$row['mlog_subject']}
+																  <hr />
+																  <br />{$row['mlog_content']}....
+																  <hr />
+																  <br />IPB ERROR: {$row['mlog_msg']}
+																  <br />SMTP CODE: {$row['mlog_code']}
+																  <br />SMTP ERROR: {$row['mlog_smtp_error']}
+																  "
+													   )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+	}
+	
+	//-----------------------------------------
+	// Remove row(s)
+	//-----------------------------------------
+	
+	function remove_entries()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ( $ibforums->input['type'] == 'all' )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'mail_error_logs' ) );
+		}
+		else
+		{
+			$ids = array();
+		
+			foreach ($ibforums->input as $k => $v)
+			{
+				if ( preg_match( "/^id_(\d+)$/", $k, $match ) )
+				{
+					if ($ibforums->input[ $match[0] ])
+					{
+						$ids[] = $match[1];
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			
+			if ( count($ids) < 1 )
+			{
+				$ibforums->admin->error("You did not select any email log entries to approve or delete");
+			}
+			
+			$DB->simple_exec_query( array( 'delete' => 'mail_error_logs', 'where' => "mlog_id IN (".implode(',', $ids ).")" ) );
+		}
+		
+		$ibforums->admin->save_log("Removed email error log entries");
+		
+		$std->boink_it($ibforums->base_url."&act=emailerror");
+	}
+	
+	//-----------------------------------------
+	// SHOW EMAIL ERROR LOGS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->html .= $ibforums->adskin->js_pop_win();
+		
+		$form_array = array();
+		
+		$start = intval($ibforums->input['st']);
+	
+		$ibforums->admin->page_detail = "Stored email error logs";
+		$ibforums->admin->page_title  = "Email Error Logs Manager";
+		
+		//-----------------------------------------
+		// Check URL parameters
+		//-----------------------------------------
+		
+		$url_query = array();
+		$db_query  = array();
+		
+		if ( $ibforums->input['type'] != "" )
+		{
+			$ibforums->admin->page_title .= " (Search Results)";
+		
+			switch( $ibforums->input['type'] )
+			{
+				case 'subject':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "mlog_subject LIKE '%{$string}%'" : "mlog_subject='{$string}'";
+					break;
+				case 'email_from':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "mlog_from LIKE '%{$string}%'" : "mlog_from='{$string}'";
+					break;
+				case 'email_to':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "mlog_to LIKE '%{$string}%'" : "mlog_to='{$string}'";
+					break;
+				case 'error':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "mlog_msg LIKE '%{$string}%' or mlog_smtp_msg LIKE '%{$string}%'" : "mlog_msg='{$string} or mlog_smtp_msg='{$string}'";
+					break;
+				
+				default:
+					//
+					break;
+			}
+		}
+		
+		//-----------------------------------------
+		// LIST 'EM
+		//-----------------------------------------
+		
+		$dbe = "";
+		$url = "";
+		
+		if ( count($db_query) > 0 )
+		{
+			$dbe = implode(' AND ', $db_query );
+		}
+		
+		if ( count($url_query) > 0 )
+		{
+			$url = '&'.implode( '&', $url_query);
+		}
+		
+		$DB->simple_construct( array( 'select' => 'count(*) as cnt', 'from' => 'mail_error_logs', 'where' => $dbe ) );
+		$DB->simple_exec();
+		
+		$count = $DB->fetch_row();
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['cnt'],
+											   'PER_PAGE'    => 25,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Pages: ",
+											   'BASE_URL'    => $ibforums->base_url.'&act=emailerror'.$url,
+											 )
+									  );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'mail_error_logs', 'where' => $dbe, 'order' => 'mlog_date DESC', 'limit' => array( $start, 25 ) ) );
+		$DB->simple_exec();
+					
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'remove'     ),
+												                 2 => array( 'act'   , 'emailerror' ),
+									                    )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"         , "1%" );
+		$ibforums->adskin->td_header[] = array( "To"             , "20%" );
+		$ibforums->adskin->td_header[] = array( "Subject"        , "20%" );
+		$ibforums->adskin->td_header[] = array( "Error MSG"      , "30%" );
+		$ibforums->adskin->td_header[] = array( "Date"           , "20%" );
+
+		$ibforums->html .= $ibforums->adskin->start_table( "Logged Emails Errors" );
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+				$row['mlog_date'] = $ibforums->admin->get_date( $row['mlog_date'], 'SHORT' );
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+																		"<center><input type='checkbox' class='checkbox' name='id_{$row['mlog_id']}' value='1' /></center>",
+																		'<b>'.$row['mlog_to'].'</b>',
+																		"<a href='javascript:pop_win(\"&act=emailerror&code=viewemail&id={$row['mlog_id']}\", \"{$row['mlog_id']}\",400,350)' title='Read email'>".$row['mlog_subject']."</a>",
+																		$row['mlog_msg'].'<br />'.$row['mlog_code']. '&nbsp;'.$row['mlog_smtp_msg'],
+																		$row['mlog_date'],
+															   )      );
+			
+			
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic('<div style="float:left;width:auto"><input type="submit" value="Remove Checked" id="button" />&nbsp;<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;Remove all?</div><div align="right">'.$links.'</div></form>', 'left', 'pformstrip');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'list'       ),
+												                 2 => array( 'act'   , 'emailerror' ),
+									                    )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Email Error Logs" );
+		
+		$form_array = array(
+							  0 => array( 'subject'    , 'Email Subject'      ),
+							  2 => array( 'email_from' , 'From Email Address' ),
+							  3 => array( 'email_to'   , 'To Email Address'   ),
+							  4 => array( 'error'      , 'Error Message'      ),
+						   );
+						   
+		$type_array = array(
+							  0 => array( 'exact'      , 'is exactly' ),
+							  1 => array( 'loose'      , 'contains'   ),
+						   );
+			
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search where</b> &nbsp;"
+																 . $ibforums->adskin->form_dropdown( "type" , $form_array, $_POST['type'])  ." "
+																 . $ibforums->adskin->form_dropdown( "match", $type_array, $_POST['match']) ." "
+																 . $ibforums->adskin->form_input( "string", $_POST['string']),
+													   )      );
+								 
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->nav[] = array( 'act=emailerror', 'Email Error Logs (Show all)' );
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_emaillogs.php b/upload/sources/admin/ad_emaillogs.php
new file mode 100644
index 00000000..65c876b4
--- /dev/null
+++ b/upload/sources/admin/ad_emaillogs.php
@@ -0,0 +1,494 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Email Logs Stuff
+|   > Module written by Matt Mecham
+|   > Date started: 11nd September 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_emaillogs
+{
+
+	var $base_url;
+	var $colours = array();
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		
+		// Make sure we're a root admin, or else!
+		
+		if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+		{
+			$ibforums->admin->error("Sorry, these functions are for the root admin group only");
+		}
+		
+		switch($ibforums->input['code'])
+		{
+			case 'list':
+				$this->list_current();
+				break;
+				
+			case 'remove':
+				$this->remove_entries();
+				break;
+				
+		    case 'viewemail':
+		    	$this->view_email();
+		    	break;
+				
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// View a single email.
+	//-----------------------------------------
+	
+	function view_email()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again");
+		}
+		
+		$id = intval($ibforums->input['id']);
+		
+		$DB->cache_add_query( 'emaillogs_view_email', array( 'id' => $id ) );
+		$DB->cache_exec_query();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again ($id)");
+		}
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $row['email_subject'] );
+	
+		
+		
+		$row['email_date'] = $ibforums->admin->get_date( $row['email_date'], 'LONG' );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													"<strong>From:</strong> {$row['name']} &lt;{$row['from_email_address']}&gt;
+													<br /><strong>To:</strong> {$row['to_name']} &lt;{$row['to_email_address']}&gt;
+													<br /><strong>Sent:</strong> {$row['email_date']}
+													<br /><strong>From IP:</strong> {$row['from_ip_address']}
+													<br /><strong>Subject:</strong> {$row['email_subject']}
+													<hr>
+													<br />{$row['email_content']}
+												    "
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+	}
+	
+
+	
+	//-----------------------------------------
+	// Remove row(s)
+	//-----------------------------------------
+	
+	function remove_entries()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ( $ibforums->input['type'] == 'all' )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'email_logs' ) );
+		}
+		else
+		{
+			$ids = array();
+		
+			foreach ($ibforums->input as $k => $v)
+			{
+				if ( preg_match( "/^id_(\d+)$/", $k, $match ) )
+				{
+					if ($ibforums->input[ $match[0] ])
+					{
+						$ids[] = $match[1];
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			
+			if ( count($ids) < 1 )
+			{
+				$ibforums->admin->error("You did not select any email log entries to approve or delete");
+			}
+			
+			$DB->simple_exec_query( array( 'delete' => 'email_logs', 'where' => " email_id IN (".implode(',', $ids ).")" ) );
+		}
+		
+		$ibforums->admin->save_log("Removed email log entries");
+		
+		$std->boink_it($ibforums->base_url."&act=emaillog");
+		exit();
+	
+	
+	}
+	
+	
+
+	
+	
+	//-----------------------------------------
+	// SHOW ALL LANGUAGE PACKS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->html .= $ibforums->adskin->js_pop_win();
+		
+		$form_array = array();
+		
+		$start = intval($ibforums->input['st']);
+	
+		$ibforums->admin->page_detail = "Stored email logs";
+		$ibforums->admin->page_title  = "Email Logs Manager";
+		
+		//-----------------------------------------
+		// Check URL parameters
+		//-----------------------------------------
+		
+		$url_query = array();
+		$db_query  = array();
+		
+		if ( $ibforums->input['type'] != "" )
+		{
+			$ibforums->admin->page_title .= " (Search Results)";
+		
+			switch( $ibforums->input['type'] )
+			{
+				case 'fromid':
+					$url_query[] = 'type=fromid';
+					$url_query[] = 'id='.intval($ibforums->input['id']);
+					$db_query[]  = 'email.from_member_id='.intval($ibforums->input['id']);
+					break;
+				case 'toid':
+					$url_query[] = 'type=toid';
+					$url_query[] = 'id='.intval($ibforums->input['id']);
+					$db_query[]  = 'email.to_member_id='.intval($ibforums->input['id']);
+					break;
+				case 'subject':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "email.email_subject LIKE '%{$string}%'" : "email.email_subject='{$string}'";
+					break;
+				case 'content':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "email.email_content LIKE '%{$string}%'" : "email.email_content='{$string}'";
+					break;
+				case 'email_from':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "email.from_email_address LIKE '%{$string}%'" : "email.from_email_address='{$string}'";
+					break;
+				case 'email_to':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					$db_query[]  = $ibforums->input['match'] == 'loose' ? "email.to_email_address LIKE '%{$string}%'" : "email.to_email_address='{$string}'";
+					break;
+				case 'name_from':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					
+					if ( $ibforums->input['match'] == 'loose' )
+					{
+						$DB->simple_construct( array( 'select' => 'id,name', 'from' => 'members', 'where' => "name LIKE '%{$string}%'" ) );
+						$DB->simple_exec();
+		
+						if ( ! $DB->get_num_rows() )
+						{
+							$ibforums->admin->error("No matches found in the email logs");
+						}
+						
+						$ids = array();
+						
+						while ( $r = $DB->fetch_row() )
+						{
+							$ids[] = $r['id'];
+						}
+						
+						$db_query[] = 'email.from_member_id IN('.implode( ',', $ids ).')';
+					}
+					else
+					{
+						$DB->simple_construct( array( 'select' => 'id,name', 'from' => 'members', 'where' => "name='{$string}'" ) );
+						$DB->simple_exec();
+						
+						if ( ! $DB->get_num_rows() )
+						{
+							$ibforums->admin->error("No matches found in the email logs");
+						}
+						
+						$r = $DB->fetch_row();
+						
+						$db_query[] = 'email.from_member_id IN('.$r['id'].')';
+					}
+					
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					break;
+				case 'name_to':
+					$string = urldecode($ibforums->input['string']);
+					if ( $string == "" )
+					{
+						$ibforums->admin->error("You must enter something to search by");
+					}
+					
+					if ( $ibforums->input['match'] == 'loose' )
+					{
+						$DB->simple_construct( array( 'select' => 'id,name', 'from' => 'members', 'where' => "name LIKE '%{$string}%'" ) );
+						$DB->simple_exec();
+						
+						if ( ! $DB->get_num_rows() )
+						{
+							$ibforums->admin->error("No matches found in the email logs");
+						}
+						
+						$ids = array();
+						
+						while ( $r = $DB->fetch_row() )
+						{
+							$ids[] = $r['id'];
+						}
+						
+						$db_query[] = 'email.to_member_id IN('.implode( ',', $ids ).')';
+					}
+					else
+					{
+						$DB->simple_construct( array( 'select' => 'id,name', 'from' => 'members', 'where' => "name='{$string}'" ) );
+						$DB->simple_exec();
+					
+						if ( ! $DB->get_num_rows() )
+						{
+							$ibforums->admin->error("No matches found in the email logs");
+						}
+						
+						$r = $DB->fetch_row();
+						
+						$db_query[] = 'email.to_member_id IN('.$r['id'].')';
+					}
+					
+					$url_query[] = 'type='.$ibforums->input['type'];
+					$url_query[] = 'string='.urlencode($string);
+					break;
+				default:
+					//
+					break;
+			}
+		}
+		
+		$url_query[] = 'match='.$ibforums->input['match'];
+		
+		//-----------------------------------------
+		// LIST 'EM
+		//-----------------------------------------
+		
+		$dbe = "";
+		$url = "";
+		
+		if ( count($db_query) > 0 )
+		{
+			$dbe = implode(' AND ', $db_query );
+		}
+		
+		if ( count($url_query) > 0 )
+		{
+			$url = '&'.implode( '&', $url_query);
+		}
+		
+		$DB->simple_construct( array( 'select' => 'count(email.email_id) as cnt',
+									  'from'   => 'email_logs email',
+									  'where'  => $dbe ) );
+		$DB->simple_exec();
+		
+		$count = $DB->fetch_row();
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['cnt'],
+											   'PER_PAGE'    => 25,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Pages: ",
+											   'BASE_URL'    => $ibforums->base_url.'&act=emaillog'.$url,
+											 )
+									  );
+		if ( $dbe )
+		{
+			$dbe = 'WHERE '.$dbe;
+		}
+		
+		$DB->cache_add_query( 'emaillogs_list_current', array( 'dbe' => $dbe, 'limit_a' => $start ) );
+		$DB->cache_exec_query();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'remove'     ),
+												                 2 => array( 'act'   , 'emaillog'       ),
+									                    )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"         , "5%" );
+		$ibforums->adskin->td_header[] = array( "From Member"    , "20%" );
+		$ibforums->adskin->td_header[] = array( "Subject"        , "30%" );
+		$ibforums->adskin->td_header[] = array( "To Member"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "Sent Time"      , "25%" );
+
+		$ibforums->html .= $ibforums->adskin->start_table( "Logged Emails" );
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$row['email_date'] = $ibforums->admin->get_date( $row['email_date'], 'SHORT' );
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														  "<center><input type='checkbox' class='checkbox' name='id_{$row['email_id']}' value='1' /></center>",
+														  "<a href='{$ibforums->base_url}&act=emaillog&code=list&type=fromid&id={$row['id']}' title='Show all from this member'><img src='{$ibforums->adskin->img_url}/acp_search.gif' border='0' alt='..by id'></a>&nbsp;<b><a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?act=Profile&MID={$row['id']}' title='Members profile (new window)' target='blank'>{$row['name']}</a></b>",
+														  "<a href='javascript:pop_win(\"&act=emaillog&code=viewemail&id={$row['email_id']}\",400,400)' title='Read email'>{$row['email_subject']}</a>",
+														  "<a href='{$ibforums->base_url}&act=emaillog&code=list&type=toid&id={$row['to_id']}' title='Show all sent to this member'><img src='{$ibforums->adskin->img_url}/acp_search.gif' border='0' alt='..by id'></a>&nbsp;<a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?act=Profile&MID={$row['to_id']}'  title='Members profile (new window)' target='blank'>{$row['to_name']}</a>",
+														  "{$row['email_date']}",
+												 )      );
+			
+			
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic('<div style="float:left;width:auto"><input type="submit" value="Remove Checked" id="button" />&nbsp;<input type="checkbox" id="checkbox" name="type" value="all" />&nbsp;Remove all?</div><div align="right">'.$links.'</div></form>', 'left', 'pformstrip');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'list'     ),
+												  2 => array( 'act'   , 'emaillog'       ),
+									     )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Email Logs" );
+		
+		$form_array = array(
+							  0 => array( 'subject'    , 'Email Subject'    ),
+							  1 => array( 'content'    , 'Email Body' ),
+							  2 => array( 'email_from' , 'From Email Address' ),
+							  3 => array( 'email_to'   , 'To Email Address'   ),
+							  4 => array( 'name_from'  , 'From Member Name'),
+							  5 => array( 'name_to'    , 'To Member Name' ),
+						   );
+						   
+		$type_array = array(
+							  0 => array( 'exact'      , 'is exactly' ),
+							  1 => array( 'loose'      , 'contains'   ),
+						   );
+			
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search where</b> &nbsp;"
+												  . $ibforums->adskin->form_dropdown( "type", $form_array) ." "
+												  . $ibforums->adskin->form_dropdown( "match", $type_array) ." "
+												  . $ibforums->adskin->form_input( "string"),
+										  		
+								 )      );
+								 
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->nav[] = array( 'act=emaillog', 'Email Logs (Show all)' );
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_forums.php b/upload/sources/admin/ad_forums.php
new file mode 100644
index 00000000..3a3b94bc
--- /dev/null
+++ b/upload/sources/admin/ad_forums.php
@@ -0,0 +1,1629 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Forum functions
+|   > Module written by Matt Mecham
+|   > Date started: 1st march 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_forums {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $forums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$forums->forums_init();
+		
+		require ROOT_PATH.'sources/admin/admin_forum_functions.php';
+		
+		$this->forumfunc = new admin_forum_functions();
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'new':
+				$this->do_form('new');
+				break;
+			case 'donew':
+				$this->do_new();
+				break;
+			//-----------------------------------------
+			case 'edit':
+				$this->do_form('edit');
+				break;
+			case 'doedit':
+				$this->do_edit();
+				break;
+			//-----------------------------------------
+			case 'pedit':
+				$this->perm_edit_form();
+				break;
+			case 'pdoedit':
+				$this->perm_do_edit();
+				break;
+			//-----------------------------------------
+			case 'reorder':
+				$this->reorder_form();
+				break;
+			case 'doreorder':
+				$this->do_reorder();
+				break;
+			case 'doreordercat':
+				$this->do_reorder();
+				break;
+			//-----------------------------------------
+			case 'delete':
+				$this->delete_form();
+				break;
+			case 'dodelete':
+				$this->do_delete();
+				break;
+			//-----------------------------------------
+			case 'recount':
+				$this->recount();
+				break;
+			//-----------------------------------------
+			case 'empty':
+				$this->empty_form();
+				break;
+			case 'doempty':
+				$this->do_empty();
+				break;
+			//-----------------------------------------
+			case 'frules':
+				$this->show_rules();
+				break;
+			case 'dorules':
+				$this->do_rules();
+				break;
+			//-----------------------------------------
+			case 'skinedit':
+				$this->skin_edit();
+				break;
+			case 'doskinedit':
+				$this->do_skin_edit();
+				break;
+			//-----------------------------------------	
+			default:
+				$this->show_forums();
+				break;
+		}
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Edit forum skins
+	//
+	//-----------------------------------------
+	
+	function skin_edit()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("Could not determine the forum ID to empty.");
+		}
+		
+		$forum = $forums->forum_by_id[ $ibforums->input['f'] ];
+		
+		//-----------------------------------------
+		// Make sure we have a legal forum
+		//-----------------------------------------
+		
+		if ( ! $forum['id'] )
+		{
+			$ibforums->admin->error("Could not resolve that forum ID");
+		}
+		
+		if ( ! $forum['skin_id'] )
+		{
+			$forum['skin_id'] = -1;
+		}
+		
+		//-----------------------------------------
+		// Get skins..
+		//-----------------------------------------
+		
+		$tmp = $ibforums->skin['_setid'];
+		
+		$ibforums->skin['_setid'] = $forum['skin_id'];
+		
+		require_once( ROOT_PATH.'sources/classes/class_display.php' );
+		$display = new display();
+		
+		$skin_list = $display->_build_skin_list();
+		
+		$ibforums->skin['_setid'] = $tmp;
+		
+		//-----------------------------------------
+		// Do form..
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title  = "Forum Skin Options";
+		$ibforums->admin->page_detail = "You may choose to either add or remove a skin set to this forum. The skin choice will override the users choice.";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doskinedit'),
+																 2 => array( 'act'   , 'forum'  ),
+																 3 => array( 'f'     , $ibforums->input['f'] ),
+														   ) );
+		
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Skin choices for forum: {$forum['name']}" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Apply which skin to this forum?</b>" ,
+																 "<select class='dropdown' name='fsid'><option value='-1'>--None / Remove All--</option>{$skin_list}</select>"
+														 )      );
+														 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Apply to all children of this forum (all sub-forums)</b>" ,
+																 $ibforums->adskin->form_yes_no( 'apply_to_children' )
+														 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit forum skin options");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Complete forum skin edit
+	/*-------------------------------------------------------------------------*/
+	
+	function do_skin_edit()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("Could not determine the forum ID to apply this skin to.");
+		}
+		
+		$forum = $forums->forum_by_id[ $ibforums->input['f'] ];
+		
+		//-----------------------------------------
+		// Make sure we have a legal forum
+		//-----------------------------------------
+		
+		$DB->do_update( 'forums', array( 'skin_id' => $ibforums->input['fsid'] ), 'id='.$ibforums->input['f'] );
+		
+		//-----------------------------------------
+		// Find children?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['apply_to_children'] )
+		{
+			//-----------------------------------------
+			// Get children!
+			//-----------------------------------------
+			
+			$ids = $forums->forums_get_children( $ibforums->input['f'] );
+			
+			if ( count( $ids ) )
+			{
+				$DB->do_update( 'forums', array( 'skin_id' => $ibforums->input['fsid'] ), 'id IN ('.implode(",",$ids).')' );
+			}
+		}
+		
+		$ibforums->main_msg = "Forum skin updated";
+		
+		$this->recache_forums();
+		
+		$forums->forums_init();
+		
+		$ibforums->input['f'] = "";
+		
+		$this->show_forums();
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Show forum rules
+	//
+	//-----------------------------------------
+	
+	function show_rules()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("Could not determine the forum ID to empty.");
+		}
+		
+		$DB->simple_construct( array( 'select' => 'id, name, show_rules, rules_title, rules_text', 'from' => 'forums', 'where' => "id=".$ibforums->input['f'] ) );
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		// Make sure we have a legal forum
+		//-----------------------------------------
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$ibforums->admin->error("Could not resolve that forum ID");
+		}
+		
+		$forum = $DB->fetch_row();
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title  = "Forum Rules";
+		$ibforums->admin->page_detail = "You may edit, add, remove or change the state of the forum rules display";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dorules'),
+																 2 => array( 'act'   , 'forum'  ),
+																 3 => array( 'f'     , $ibforums->input['f'] ),
+														   ) );
+		
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Forum Rules set up" );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Display method</b>" ,
+																 $ibforums->adskin->form_dropdown( "show_rules",
+																					   array( 
+																							   0 => array( '0' , 'Don\'t Show' ),
+																							   1 => array( '1' , 'Show Link Only' ),
+																							   2 => array( '2' , 'Show full text' )
+																							),
+																					   $forum['show_rules']
+																					 )
+														)      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rules Title</b>" ,
+																 $ibforums->adskin->form_input("title", $std->txt_stripslashes(str_replace( "'", '&#039;', $forum['rules_title'])))
+														)      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rules Text</b><br>(HTML Editing Mode)" ,
+																 $ibforums->adskin->form_textarea( "body", $std->txt_stripslashes($forum['rules_text']), 65, 20 )
+														)      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit forum rules");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	function do_rules()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("Could not determine the forum ID to empty.");
+		}
+		
+		$rules = array( 
+						'rules_title'    => $ibforums->admin->make_safe($std->txt_stripslashes($HTTP_POST_VARS['title'])),
+						'rules_text'     => $ibforums->admin->make_safe($std->txt_stripslashes($HTTP_POST_VARS['body'])),
+						'show_rules'     => $ibforums->input['show_rules']
+					  );
+					  
+		$DB->do_update( 'forums', $rules, 'id='.$ibforums->input['f'] );
+		
+		$this->recache_forums();
+		
+		$ibforums->admin->done_screen("Forum Rules Updated", "Forum Control", "act=forum" );
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// RECOUNT FORUM: Recounts topics and posts
+	//
+	//-----------------------------------------
+	
+	function recount($f_override="")
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		if ($f_override != "")
+		{
+			// Internal call, remap
+			
+			$ibforums->input['f'] = $f_override;
+		}
+		
+		require_once( ROOT_PATH.'sources/lib/modfunctions.php' );
+		$modfunc = new modfunctions();
+		
+		$modfunc->forum_recount($ibforums->input['f']);
+
+		$this->recache_forums();
+		
+		$ibforums->admin->save_log("Recounted posts in forum '{$forums->forum_by_id[$ibforums->input['f']]['name']}'");
+		
+		$ibforums->admin->done_screen("Forum Resynchronised", "Forum Control", "act=forum", 'redirect' );
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// EMPTY FORUM: Removes all topics and posts, etc.
+	//
+	//-----------------------------------------
+	
+	function empty_form()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$form_array = array();
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("Could not determine the forum ID to empty.");
+		}
+		
+		$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'forums', 'where' => "id=".$ibforums->input['f'] ) );
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		// Make sure we have a legal forum
+		//-----------------------------------------
+		
+		if ( !$DB->get_num_rows() )
+		{
+			$ibforums->admin->error("Could not resolve that forum ID");
+		}
+		
+		$forum = $DB->fetch_row();
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title = "Empty Forum '{$forum['name']}'";
+		
+		$ibforums->admin->page_detail = "This WILL DELETE ALL TOPICS, POSTS AND POLLS.<br>The forum itself will not be deleted - please ensure you wish to carry out this action before continuing.";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doempty'),
+												  2 => array( 'act'   , 'forum'     ),
+												  3 => array( 'f'     , $ibforums->input['f']  ),
+												  4 => array( 'name' , $forum['name'] ),
+											) );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Empty Forum '{$forum['name']}" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Forum to empty: </b>" , $forum['name'] )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Empty this forum");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	
+	function do_empty()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Get module
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/lib/modfunctions.php' );
+		$modfunc = new modfunctions();
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("Could not determine the source forum ID.");
+		}
+		
+		//-----------------------------------------
+		// Check to make sure its a valid forum.
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, posts, topics', 'from' => 'forums', 'where' => "id=".$ibforums->input['f'] ) );
+		$DB->simple_exec();
+		
+		if ( ! $forum = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not get the forum details for the forum to empty");
+		}
+		
+		$DB->simple_construct( array( 'select' => 'tid', 'from' => 'topics', 'where' => "forum_id=".$ibforums->input['f'] ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// What to do..
+		//-----------------------------------------
+		
+		while( $t = $DB->fetch_row($outer) )
+		{
+			$modfunc->topic_delete($t['tid']);
+		}
+		
+		//-----------------------------------------
+		// Rebuild stats
+		//-----------------------------------------
+		
+		$modfunc->forum_recount($ibforums->input['f']);
+		$modfunc->stats_recount();
+		
+		//-----------------------------------------
+		// Rebuild forum cache
+		//-----------------------------------------
+		
+		$this->recache_forums();
+		
+		$ibforums->admin->save_log("Emptied forum '{$ibforums->input['name']}' of all posts");
+		
+		$ibforums->admin->done_screen("Forum Emptied", "Forum Control", "act=forum", 'redirect' );
+		
+	}
+	
+	
+	
+	//-----------------------------------------
+	//
+	// REMOVE FORUM
+	//
+	//-----------------------------------------
+	
+	function delete_form()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		$form_array = array();
+		
+		$ibforums->input['f'] = intval($ibforums->input['f']);
+		
+		if ( ! $ibforums->input['f'] )
+		{
+			$ibforums->admin->error("Could not determine the forum ID to delete.");
+		}
+		
+		$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'forums', 'order' => 'position' ) );
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		// Make sure we have more than 1
+		// forum..
+		//-----------------------------------------
+		
+		if ( $DB->get_num_rows() < 2 )
+		{
+			$ibforums->admin->error("Can not remove this forum, please create another before attempting to remove this one");
+		}
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ($r['id'] == $ibforums->input['f'])
+			{
+				$name = $r['name'];
+				continue;
+			}
+		}
+		
+		$form_array = $this->forumfunc->ad_forums_forum_list(1);
+		
+		//-----------------------------------------
+		// Count the number of topics
+		//-----------------------------------------
+		
+		$posts = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'topics', 'where' => 'forum_id='.$ibforums->input['f'] ) );
+		
+		//-----------------------------------------
+		// Count the number of children
+		//-----------------------------------------
+		
+		$children = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'forums', 'where' => 'parent_id='.$ibforums->input['f'] ) );
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title = "Removing forum '$name'";
+		
+		$ibforums->admin->page_detail = "Before we remove this forum, if this forum is not empty, we need to determine what to do with any topics and posts you may have left in this forum.";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dodelete'),
+																 2 => array( 'act'   , 'forum'     ),
+																 3 => array( 'f'     , $ibforums->input['f']  ),
+														   ) );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		// Main form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Required" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Forum to remove: </b>" , $name )      );
+		
+		if ( $posts['count'] )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Move all <i>existing topics and posts in this forum</i> to which forum?</b>" ,
+																	$ibforums->adskin->form_dropdown( "MOVE_ID", $form_array )
+														  )      );
+			
+		}
+		
+		if ( $children['count'] )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Move all <i>children forums</i> to which forum?</b>" ,
+																	$ibforums->adskin->form_dropdown( "new_parent_id", $form_array )
+														  )      );
+		}
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_form( "Remove Forum" );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// PROCESS DELETE
+	//-----------------------------------------
+	
+	function do_delete()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['f']             = intval($ibforums->input['f']);
+		$ibforums->input['MOVE_ID']       = intval($ibforums->input['MOVE_ID']);
+		$ibforums->input['new_parent_id'] = intval($ibforums->input['new_parent_id']);
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forums', 'where' => "id=".$ibforums->input['f'] ) );
+		$DB->simple_exec();
+		
+		$forum = $DB->fetch_row();
+		
+		if ( ! $ibforums->input['f'] )
+		{
+			$ibforums->admin->error("Could not determine the source forum ID.");
+		}
+		
+		if ( ! $ibforums->input['new_parent_id'] )
+		{
+			$ibforums->input['new_parent_id'] = -1;
+		}
+		else
+		{
+			if ( $ibforums->input['new_parent_id'] == $ibforums->input['f'] )
+			{
+				$ibforums->main_msg = "You cannot move children forums to the forum you're removing!";
+				$this->delete_form();
+			}
+		}
+		
+		require_once( ROOT_PATH.'sources/lib/modfunctions.php' );
+		$modfunc = new modfunctions();
+		
+		//-----------------------------------------
+		// Move stuff
+		//-----------------------------------------
+		
+		if ( $ibforums->input['MOVE_ID'] )
+		{
+			if ( $ibforums->input['MOVE_ID'] == $ibforums->input['f'] )
+			{
+				$ibforums->main_msg = "You cannot move topics into the forum you're removing!";
+				$this->delete_form();
+			}
+			
+			//-----------------------------------------
+			// Move topics...
+			//-----------------------------------------
+			
+			$DB->do_update( 'topics', array( 'forum_id' => $ibforums->input['MOVE_ID'] ), 'forum_id='.$ibforums->input['f'] );
+			
+			//-----------------------------------------
+			// Move polls...
+			//-----------------------------------------
+			
+			$DB->do_update( 'polls', array( 'forum_id' => $ibforums->input['MOVE_ID'] ), 'forum_id='.$ibforums->input['f'] );
+			
+			//-----------------------------------------
+			// Move voters...
+			//-----------------------------------------
+			
+			$DB->do_update( 'voters', array( 'forum_id' => $ibforums->input['MOVE_ID'] ), 'forum_id='.$ibforums->input['f'] );
+			
+			$modfunc->forum_recount( $ibforums->input['MOVE_ID'] );
+		}
+		
+		//-----------------------------------------
+		// Delete the forum
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'forums', 'where' => "id=".$ibforums->input['f'] ) );
+		
+		//-----------------------------------------
+		// Delete any moderators, if any..
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'moderators', 'where' => "forum_id=".$ibforums->input['f'] ) );
+		
+		//-----------------------------------------
+		// Delete forum subscriptions
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'forum_tracker', 'where' => "forum_id=".$ibforums->input['f'] ) );
+		
+		//-----------------------------------------
+		// Update children
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['new_parent_id'] )
+		{
+			$ibforums->input['new_parent_id'] = -1;
+		}
+		
+		$DB->do_update( 'forums', array( 'parent_id' => $ibforums->input['new_parent_id'] ), "parent_id={$ibforums->input['f']}" );
+		
+		//-----------------------------------------
+		// Rebuild forum cache
+		//-----------------------------------------
+		
+		$this->recache_forums();
+		
+		//-----------------------------------------
+		// Rebuild moderator cache
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_moderator.php' );
+		$moderator = new ad_moderator();
+		
+		$moderator->rebuild_moderator_cache();
+		
+		$ibforums->admin->save_log("Removed forum '{$forum['name']}'");
+		
+		$ibforums->admin->done_screen("Forum Removed", "Forum Control", "act=forum", 'redirect' );
+		
+	}
+
+	//-----------------------------------------
+	// DO NEW FORUM
+	//-----------------------------------------
+	
+	function do_new()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['name'] = trim($ibforums->input['name']);
+		
+		if ($ibforums->input['name'] == "")
+		{
+			$ibforums->admin->error("You must enter a forum title");
+		}
+		
+		// Get the new forum id. We could use auto_incrememnt, but we need the ID to use as the default
+		// forum position...
+		
+		$DB->simple_construct( array( 'select' => 'MAX(id) as top_forum', 'from' => 'forums' ) );
+		$DB->simple_exec();
+		
+		$row = $DB->fetch_row();
+		
+		if ($row['top_forum'] < 1) $row['top_forum'] = 0;
+		
+		$row['top_forum']++;
+		
+		$perms = $ibforums->admin->compile_forum_perms();
+		
+		$perm_array = addslashes(serialize(array(
+												  'start_perms'  => $perms['START'],
+												  'reply_perms'  => $perms['REPLY'],
+												  'read_perms'   => $perms['READ'],
+												  'upload_perms' => $perms['UPLOAD'],
+												  'show_perms'   => $perms['SHOW']
+ 								)		  )     );
+		
+		$DB->do_insert( 'forums', array (
+										  'id'                      => $row['top_forum'],
+										  'position'                => $row['top_forum'],
+										  'topics'                  => 0,
+										  'posts'                   => 0,
+										  'last_post'               => "",
+										  'last_poster_id'          => "",
+										  'last_poster_name'        => "",
+										  'name'                    => $ibforums->input['name'],
+										  'description'             => $std->my_nl2br( $std->txt_stripslashes($_POST['description']) ),
+										  'use_ibc'                 => $ibforums->input['use_ibc'],
+										  'use_html'                => $ibforums->input['use_html'],
+										  'status'                  => $ibforums->input['status'],
+										  'password'                => $ibforums->input['password'],
+										  'last_id'                 => "",
+										  'last_title'              => "",
+										  'sort_key'                => $ibforums->input['sort_key'],
+										  'sort_order'              => $ibforums->input['sort_order'],
+										  'prune'                   => $ibforums->input['prune'],
+										  'show_rules'              => 0,
+										  'preview_posts'           => $ibforums->input['preview_posts'],
+										  'allow_poll'              => $ibforums->input['allow_poll'],
+										  'allow_pollbump'          => $ibforums->input['allow_pollbump'],
+										  'inc_postcount'           => $ibforums->input['inc_postcount'],
+										  'parent_id'               => $ibforums->input['parent_id'],
+										  'sub_can_post'            => $ibforums->input['sub_can_post'],
+										  'quick_reply'             => $ibforums->input['quick_reply'],
+										  'redirect_on'             => $ibforums->input['redirect_on'],
+										  'redirect_hits'           => $ibforums->input['redirect_hits'],
+										  'redirect_url'            => $ibforums->input['redirect_url'],
+										  'redirect_loc'		      => $ibforums->input['redirect_loc'],
+										  'notify_modq_emails'      => $ibforums->input['notify_modq_emails'],
+										  'permission_array'        => $perm_array,
+										  'permission_showtopic'    => $ibforums->input['permission_showtopic'],
+										  'permission_custom_error' => $std->my_nl2br( $std->txt_stripslashes($_POST['permission_custom_error']) ),
+										  
+								)       );
+												  
+		$this->recache_forums();
+		
+		$ibforums->admin->save_log("Forum '{$ibforums->input['name']}' created");
+		
+		$ibforums->admin->done_screen("Forum {$ibforums->input['name']} created", "Forum Control", "act=forum", 'redirect' );
+	}
+	
+	
+
+	//-----------------------------------------
+	//
+	// EDIT FORUM
+	//
+	//-----------------------------------------
+
+	function do_form($type='edit')
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		
+		$ibforums->admin->page_detail = "This section will allow you to add or edit an existing forum. If you wish to adjust the forum permissions (who has the ability to
+							   			 start, reply and read topics) click on 'Edit Permissions on the Forums and Categories overview.";
+		
+		if ( $type == 'edit' )
+		{
+			if ($ibforums->input['f'] == "")
+			{
+				$ibforums->admin->error("You didn't choose a forum to edit, duh!");
+			}
+			
+			$this->forumfunc->exclude_from_list = $ibforums->input['f'];
+			
+			$forum = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'forums', 'where' => 'id='.$ibforums->input['f'] ) );
+			
+			if ($forum['id'] == "")
+			{
+				$ibforums->admin->error("Could not retrieve the forum data based on ID {$ibforums->input['f']}");
+			}
+			
+			$title  = "Editing Forum: {$forum['name']}";
+			$button = "Edit Forum";
+			$code   = "doedit";
+			
+			$basic_title = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							<tr>
+							 <td align='left' width='40%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;'>Basic Settings for {$forum['name']}</td>
+							 <td align='right' width='60%'>".
+							 $ibforums->adskin->js_make_button("Edit Forum Rules"  , $ibforums->base_url."&act=forum&code=frules&f={$ibforums->input['f']}")."&nbsp;".
+						     $ibforums->adskin->js_make_button("Edit Skin Settings", $ibforums->base_url."&act=forum&code=skinedit&f={$ibforums->input['f']}")."&nbsp;".
+						     $ibforums->adskin->js_make_button("Recount Forum"     , $ibforums->base_url."&act=forum&code=recount&f={$ibforums->input['f']}")
+							 ."&nbsp;&nbsp;</td>
+							</tr>
+							</table>";
+			
+							 
+		}
+		else
+		{
+			$f_name = "";
+		
+			if ($_GET['name'] != "")
+			{
+				$f_name = $std->txt_stripslashes(urldecode($_GET['name']));
+			}
+			
+			if ( $ibforums->input['c'] == 1 )
+			{
+				$subcanpost = 0;
+			}
+			else
+			{
+				$subcanpost = 1;
+			}
+			
+			if ( ! $ibforums->input['p'] )
+			{
+				$parentid = -1;
+			}
+			else
+			{
+				$parentid = $ibforums->input['p'];
+			}
+			
+			$forum = array(
+							'sub_can_post' => $subcanpost,
+							'name'         => $f_name,
+							'parent_id'    => $parentid,
+							'use_ibc'      => 1,
+							'quick_reply'  => 1,
+							'allow_poll'   => 1,
+							'prune'        => 100,
+							'sort_key'     => 'last_post',
+							'sort_order'   => 'Z-A',
+							'inc_postcount'=> 1,
+						  );
+						  
+			$title  = "Add a forum";
+			$button = "Add Forum";
+			$code   = "donew";
+			$basic_title = 'Basic Settings';
+		}
+		
+		$forumlist = $this->forumfunc->ad_forums_forum_list();
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title = $title;
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $code  ),
+															   2 => array( 'act'   , 'forum'   ),
+															   3 => array( 'f'     , $ibforums->input['f']  ),
+															   4 => array( 'name'  , $forum['name'] ),
+														 ) );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $basic_title );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Forum Name</b>" ,
+																	  $ibforums->adskin->form_input("name", $forum['name'])
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Forum Description</b><br>You may use HTML - linebreaks 'Auto-Magically' converted to &lt;br&gt;" ,
+																	  $ibforums->adskin->form_textarea("description", $std->my_br2nl( $forum['description']) )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Add to which parent?</b><br>" ,
+																	  $ibforums->adskin->form_dropdown("parent_id", $forumlist, $forum['parent_id'])
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Forum State</b>" ,
+																	  $ibforums->adskin->form_dropdown( "status",
+																								array( 
+																										0 => array( 1, 'Active' ),
+																										1 => array( 0, 'Read Only Archive'  ),
+																									 ),
+																							$forum['status']
+																						  )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Act as a normal forum not as a category?</b><br />If you DON'T make this a normal forum, new posts won't be allowed and existing topics and posts won't show.<br><b>If 'no' you can skip the rest of this form as the settings will have no effect and this forum will act like a category.</b>" ,
+																	  $ibforums->adskin->form_yes_no(
+																						  "sub_can_post",
+																						  $forum['sub_can_post'],
+																						  array(
+																								  'yes' => " onclick=\"ShowHide('main_div', 'maindivoff');\" ",
+																								  'no'  => " onclick=\"ShowHide('main_div', 'maindivoff');\" "
+																							   )
+																						) . $extra
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		
+		$md_show  = ($forum['sub_can_post'] == 1 OR $forum['parent_id'] > 0) ? 'show' : 'none';
+		$md2_show = ($forum['sub_can_post'] == 1 OR $forum['parent_id'] > 0) ? 'none' : 'show';
+		
+		$ibforums->html .= "\n<div id='main_div' style='display:$md_show'>\n";
+		
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Forum Redirect Options" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>URL to redirect this forum to</b>" ,
+																	  $ibforums->adskin->form_input("redirect_url", $forum['redirect_url'])
+															 )      );
+										 
+		/*$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Target to redirect to?</b><br>Leave blank or use '_self' to load in same browser window" ,
+																	  $ibforums->adskin->form_input("redirect_loc", $forum['redirect_loc'])
+															 )      );*/
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Switch on the URL redirect?</b><br>If 'yes' you can skip the rest of this form as the settings will have no effect and this forum will act like as a redirect link. Current posts will not be accessible when on." ,
+																	  $ibforums->adskin->form_yes_no("redirect_on",
+																						 $forum['redirect_on'],
+																						  array(
+																								  'yes' => " onclick=\"ShowHide('canpost', 'canpostoff');\" ",
+																								  'no'  => " onclick=\"ShowHide('canpost', 'canpostoff');\" "
+																							   )
+																						 )
+															 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Redirect clicks to date</b>" ,
+																	  $ibforums->adskin->form_input("redirect_hits", $forum['redirect_hits'])
+															 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Permission Settings" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow members who can see the forum but cannot read topics to see the topic list?</b><br />If yes, the member will be able to see the topic titles but will not be able to read the topic posts when clicked." ,
+																$ibforums->adskin->form_yes_no("permission_showtopic", $forum['permission_showtopic'] )
+													   )      );
+													   
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom 'Permission Denied' Message</b><br>You may use HTML - linebreaks 'Auto-Magically' converted to &lt;br&gt;.<br />If left blank, a default 'permission denied' error is used." ,
+															   $ibforums->adskin->form_textarea("permission_custom_error", $std->my_br2nl( $forum['permission_custom_error']) )
+													  )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Postable Forum Settings" );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow HTML to be posted (when group permissions allow)?</b><br />This will allow HTML to be posted and executed" ,
+																	  $ibforums->adskin->form_yes_no("use_html", $forum['use_html'] )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow BBCode to be posted?</b>" ,
+																	  $ibforums->adskin->form_yes_no("use_ibc", $forum['use_ibc'] )
+															 )      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Turn on the Quick Reply Box?</b>" ,
+																	  $ibforums->adskin->form_yes_no("quick_reply", $forum['quick_reply'] )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow Polls in this forum (when allowed)?</b>" ,
+																	  $ibforums->adskin->form_yes_no("allow_poll", $forum['allow_poll'] )
+															 )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow votes to bump a topic?</b>" ,
+																	  $ibforums->adskin->form_yes_no("allow_pollbump", $forum['allow_pollbump'] )
+															 )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Posts in this forum increase member's cumulative post count?</b>" ,
+																	  $ibforums->adskin->form_yes_no("inc_postcount", $forum['inc_postcount'] )
+															 )      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Moderate postings?</b><br>(Requires a moderator to manually add posts/topics to the forum)" ,
+																	  $ibforums->adskin->form_dropdown("preview_posts", array(
+																										 0 => array( 0, 'No' ),
+																										 1 => array( 1, 'Moderate all new topics and all replies' ),
+																										 2 => array( 2, 'Moderate new topics but don\'t moderate replies' ),
+																										 3 => array( 3, 'Moderate replies but don\'t moderate new topics' ),
+																										   ),
+																									$forum['preview_posts'] )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email addresses to send new topic awaiting approval notification?</b><br>(Leave this box empty if you do not require this)<br />Separate many with a comma (add@ress1.com,add@ress2.com)" ,
+																	  $ibforums->adskin->form_input("notify_modq_emails", $forum['notify_modq_emails'])
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Require password access?<br>Enter the password here</b><br>(Leave this box empty if you do not require this)" ,
+																	  $ibforums->adskin->form_input("password", $forum['password'])
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Default date cut off for topic display</b>" ,
+																	  $ibforums->adskin->form_dropdown( "prune",
+																								array( 
+																										0 => array( 1, 'Today' ),
+																										1 => array( 5, 'Last 5 days'  ),
+																										2 => array( 7, 'Last 7 days'  ),
+																										3 => array( 10, 'Last 10 days' ),
+																										4 => array( 15, 'Last 15 days' ),
+																										5 => array( 20, 'Last 20 days' ),
+																										6 => array( 25, 'Last 25 days' ),
+																										7 => array( 30, 'Last 30 days' ),
+																										8 => array( 60, 'Last 60 days' ),
+																										9 => array( 90, 'Last 90 days' ),
+																										10=> array( 100,'Show All'     ),
+																									 ),
+																							$forum['prune']
+																						  )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Default sort key</b>" ,
+																	  $ibforums->adskin->form_dropdown( "sort_key",
+																								array( 
+																										0 => array( 'last_post', 'Date of the last post' ),
+																										1 => array( 'title'    , 'Topic Title' ),
+																										2 => array( 'starter_name', 'Topic Starters Name' ),
+																										3 => array( 'posts'    , 'Topic Posts' ),
+																										4 => array( 'views'    , 'Topic Views' ),
+																										5 => array( 'start_date', 'Date topic started' ),
+																										6 => array( 'last_poster_name'   , 'Name of the last poster' ),
+																									 ),
+																							$forum['sort_key']
+																						  )
+															 )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Default sort order</b>" ,
+																	  $ibforums->adskin->form_dropdown( "sort_order",
+																								array( 
+																										0 => array( 'Z-A', 'Descending (Z - A, 0 - 10)' ),
+																										1 => array( 'A-Z', 'Ascending (A - Z, 10 - 0)' ),
+																									 ),
+																							$forum['sort_order']
+																						  )
+															 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "\n<!--END MAIN DIV--></div>\n
+		                   <div id='maindivoff' class='offdiv' style='display:$md2_show'>
+		                     <div class='tableborder'>
+						       <div class='maintitle'><a href=\"javascript:ShowHide('main_div', 'maindivoff');\"><img src='{$ibforums->adskin->img_url}/plus.gif'></a>&nbsp;<a href=\"javascript:ShowHide('main_div', 'maindivoff');\">Postable Forum Settings</a></div>
+						     </div>
+		                 </div><br />\n";
+		                 
+		                
+		if ( $type == 'edit' )
+		{
+			$ibforums->html .= $ibforums->adskin->end_form_standalone("Edit this forum");
+		}
+		else
+		{
+		
+			$ibforums->adskin->td_header[] = array( "Name"          , "40%" );
+			$ibforums->adskin->td_header[] = array( "Show Forum"    , "12%" );
+			$ibforums->adskin->td_header[] = array( "Read Topics"   , "12%" );
+			$ibforums->adskin->td_header[] = array( "Reply Topics"  , "12%" );
+			$ibforums->adskin->td_header[] = array( "Start Topics"  , "12%" );
+			$ibforums->adskin->td_header[] = array( "Upload"        , "12%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table("Permission Access Levels");
+			
+			$ibforums->html .= $ibforums->adskin->build_group_perms( $forum['show_perms'], $forum['read_perms'], $forum['start_perms'], $forum['reply_perms'], $forum['upload_perms']);
+		
+			
+			$ibforums->html .= $ibforums->adskin->end_form("Create this forum");
+											 
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=forum', 'Manage Forums' );
+		$ibforums->admin->nav[] = array( '', 'Add/Edit Forum' );
+		
+		$ibforums->admin->output();
+			
+			
+	}
+
+
+	//-----------------------------------------
+	
+	function do_edit()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		$ibforums->input['name'] = trim($ibforums->input['name']);
+		
+		if ($ibforums->input['name'] == "")
+		{
+			$ibforums->admin->error("You must enter a forum title");
+		}
+		
+		//-----------------------------------------
+		// Are we trying to do something stupid
+		// like running with scissors or moving
+		// the parent of a forum into itself
+		// spot?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['parent_id'] != $forums->forum_by_id[ $ibforums->input['f'] ]['parent_id'] )
+		{
+			// Get children and make sure we're trying to impossible
+			
+			$ids = $forums->forums_get_children( $ibforums->input['f'] );
+			$ids[] = $ibforums->input['f'];
+			
+			if ( in_array( $ibforums->input['parent_id'], $ids ) )
+			{
+				$ibforums->admin->error("Sorry, that is not possible. You are attempting to move a parent forum into its own child structure. Please go back and choose a different parent forum.");
+			}
+		}
+		
+		$DB->do_update( 'forums', array (
+															
+										  'name'                    => $ibforums->input['name'],
+										  'description'             => $std->my_nl2br( $std->txt_stripslashes($_POST['description']) ),
+										  'use_ibc'                 => $ibforums->input['use_ibc'],
+										  'use_html'                => $ibforums->input['use_html'],
+										  'status'                  => $ibforums->input['status'],
+										  'password'                => $ibforums->input['password'],
+										  'sort_key'                => $ibforums->input['sort_key'],
+										  'sort_order'              => $ibforums->input['sort_order'],
+										  'prune'                   => $ibforums->input['prune'],
+										  'preview_posts'           => $ibforums->input['preview_posts'],
+										  'allow_poll'              => $ibforums->input['allow_poll'],
+										  'allow_pollbump'          => $ibforums->input['allow_pollbump'],
+										  'inc_postcount'           => $ibforums->input['inc_postcount'],
+										  'parent_id'               => $ibforums->input['parent_id'],
+										  'sub_can_post'            => $ibforums->input['sub_can_post'],
+										  'quick_reply'             => $ibforums->input['quick_reply'],
+										  'redirect_on'             => $ibforums->input['redirect_on'],
+										  'redirect_hits'           => $ibforums->input['redirect_hits'],
+										  'redirect_url'            => $ibforums->input['redirect_url'],
+										  'redirect_loc'		    => $ibforums->input['redirect_loc'],
+										  'notify_modq_emails'      => $ibforums->input['notify_modq_emails'],
+										  'permission_showtopic'    => $ibforums->input['permission_showtopic'],
+										  'permission_custom_error' => $std->my_nl2br( $std->txt_stripslashes($_POST['permission_custom_error']) ),
+										  
+								)  , "id={$ibforums->input['f']}"  );
+												  
+		$ibforums->admin->save_log("Forum '{$ibforums->input['name']}' edited");
+		
+		$this->recache_forums();
+		
+		$ibforums->admin->done_screen("Forum {$ibforums->input['name']} Edited", "Forum Control", "act=forum", 'redirect' );
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// EDIT FORUM
+	//
+	//-----------------------------------------
+	
+	function perm_edit_form()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		//-----------------------------------------
+		// check..
+		//-----------------------------------------
+		
+		if ($ibforums->input['f'] == "")
+		{
+			$ibforums->admin->error("You didn't choose a forum to edit, duh!");
+		}
+		
+		//-----------------------------------------
+		// Get this forum details
+		//-----------------------------------------
+		
+		$forum = $forums->forum_by_id[$ibforums->input['f']];
+		
+		//-----------------------------------------
+		// Next id...
+		//-----------------------------------------
+		
+		$next     = "";
+		$previous = "";
+		
+		$relative = $this->get_next_id( $ibforums->input['f'] );
+		
+		if ( $relative['next'] > 0 )
+		{
+			$next = "<input type='submit' name='donext' value='Save and Edit Next' class='realdarkbutton' />";
+		}
+		
+		if ( $relative['previous'] > 0 )
+		{
+			$previous = "<input type='submit' name='doprevious' value='Save and Edit Previous' class='realdarkbutton' />";
+		}
+		
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		if ($forum['id'] == "")
+		{
+			$ibforums->admin->error("Could not retrieve the forum data based on ID {$ibforums->input['f']}");
+		}
+		
+		$ibforums->admin->page_title = "Edit permissions for ".$forum['name'];
+		
+		$ibforums->admin->page_detail = "<b>Forum access permissions</b><br>(Check box for access, uncheck to not allow access)<br>If you deny read access for a permission mask, they will not see the forum";
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'    , 'pdoedit'              ),
+																 2 => array( 'act'     , 'forum'                ),
+																 3 => array( 'f'       , $ibforums->input['f']  ),
+																 4 => array( 'name'    , $forum['name']         ),
+																 5 => array( 'nextid'  , $relative['next']      ),
+																 6 => array( 'previd'  , $relative['previous']  ),
+														   ) );
+											
+		$ibforums->adskin->td_header[] = array( "Name"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "Show Forum"    , "12%" );
+		$ibforums->adskin->td_header[] = array( "Read Topics"   , "12%" );
+		$ibforums->adskin->td_header[] = array( "Reply Topics"  , "12%" );
+		$ibforums->adskin->td_header[] = array( "Start Topics"  , "12%" );
+		$ibforums->adskin->td_header[] = array( "Upload"        , "12%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $forums->forum_by_id[ $forum['parent_id'] ]['name'].' / '.$forum['name'].' / '."Permission Access Levels");
+		
+		$ibforums->html .= $ibforums->adskin->build_group_perms( $forum['show_perms'], $forum['read_perms'], $forum['start_perms'], $forum['reply_perms'], $forum['upload_perms']);
+									 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "<div class='tableborder'><div class='pformstrip' align='center'>$previous
+							<input type='submit' value='Save Only' class='realbutton' />
+							<input type='submit' name='reload' value='Save and Reload' class='realbutton' />
+							$next</div></div></form>";
+		
+		$ibforums->admin->nav[] = array( 'act=forum', 'Manage Forums' );
+		$ibforums->admin->nav[] = array( '', 'Permissions for forum '.$forum['name'] );
+		
+		$ibforums->admin->output();
+			
+			
+	}
+	
+	//-----------------------------------------
+	// Get next forum ID
+	//-----------------------------------------
+	
+	function get_next_id($fid)
+	{
+		global $forums;
+		
+		$nextid = 0;
+		$ids    = array();
+		$index  = 0;
+		$count  = 0;
+		
+		foreach( $forums->forum_cache['root'] as $id => $forum_data )
+		{
+			$ids[ $count ] = $forum_data['id'];
+			
+			if ( $forum_data['id'] == $fid )
+			{
+				$index = $count;
+			}
+			
+			$count++;
+			
+			if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+			{
+				foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+				{
+					$children = $forums->forums_get_children( $forum_data['id'] );
+					
+					$ids[ $count ] = $forum_data['id'];
+			
+					if ( $forum_data['id'] == $fid )
+					{
+						$index = $count;
+					}
+					
+					$count++;
+					
+					if ( is_array($children) and count($children) )
+					{
+						foreach( $children as $kid )
+						{
+							$ids[ $count ] = $kid;
+			
+							if ( $kid == $fid )
+							{
+								$index = $count;
+							}
+							
+							$count++;
+						}
+					}
+				}
+			}
+		}
+		
+		return array( 'next' => $ids[ $index + 1 ], 'previous' => $ids[ $index - 1 ] );
+	}
+	
+	//-----------------------------------------
+	// RECACHE FORUMS
+	//-----------------------------------------
+
+	function recache_forums()
+	{
+		global $ibforums, $DB, $std;
+		
+		$std->update_forum_cache();
+	}
+
+	//-----------------------------------------
+	// SAVE PERM CHANGES
+	//-----------------------------------------
+
+	function perm_do_edit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$perms = $ibforums->admin->compile_forum_perms();
+		
+		$DB->do_update( 'forums', array( 'permission_array' => addslashes(serialize(array(
+																						   'start_perms'  => $perms['START'],
+																						   'reply_perms'  => $perms['REPLY'],
+																						   'read_perms'   => $perms['READ'],
+																						   'upload_perms' => $perms['UPLOAD'],
+																						   'show_perms'   => $perms['SHOW']
+							    		)		  						 )         )      ), 'id='.$ibforums->input['f']);
+												  
+		
+		
+		$ibforums->admin->save_log("Forum access permission edited in '{$ibforums->input['name']}'");
+		
+		$this->recache_forums();
+		
+		if ( $ibforums->input['doprevious'] and $ibforums->input['previd'] > 0 )
+		{
+			$ibforums->main_msg = 'Forum permissions edited';
+			
+			$ibforums->input['f'] = $ibforums->input['previd'];
+			
+			$std->boink_it( $ibforums->base_url."&act=forum&code=pedit&f={$ibforums->input['f']}" );
+		}
+		else if ( $ibforums->input['donext'] and $ibforums->input['nextid'] > 0 )
+		{
+			$ibforums->main_msg = 'Forum permissions edited';
+			
+			$ibforums->input['f'] = $ibforums->input['nextid'];
+			
+			$std->boink_it( $ibforums->base_url."&act=forum&code=pedit&f={$ibforums->input['f']}" );
+		}
+		else if ( $ibforums->input['reload'] )
+		{
+			$std->boink_it( $ibforums->base_url."&act=forum&code=pedit&f={$ibforums->input['f']}" );
+		}
+		else
+		{
+			$ibforums->admin->done_screen("Forum Access Permissions Edited", "Forum Control", "act=forum", 'redirect' );
+		}
+	}
+	
+	//-----------------------------------------
+	//
+	// RE-ORDER FORUMS
+	//
+	//-----------------------------------------
+	
+	function reorder_form()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		if ( ! $ibforums->input['f'] )
+		{
+			$ibforums->admin->error("Cannot go any further, not F passed");
+		}
+		
+		$ibforums->admin->page_detail = "Simply select the position you require for each forum and submit the form to complete the re-order.";
+		
+		$this->forumfunc->type = 'reorder';
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doreorder'),
+												  2 => array( 'act'   , 'forum'     ),
+										 )      );
+		
+		$temp_html = "";
+		
+		$this->forumfunc->forum_show_cat($forums->forum_by_id[ $ibforums->input['f'] ]);
+			
+		$depth_guide = "";
+		
+		if ( is_array( $forums->forum_cache[ $ibforums->input['f'] ] ) )
+		{
+			foreach( $forums->forum_cache[ $ibforums->input['f'] ] as $id => $forum_data )
+			{
+				$temp_html .= $this->forumfunc->render_forum($forum_data, $depth_guide);
+				
+				$temp_html = $this->forumfunc->forum_build_children( $forum_data['id'], $temp_html, $depth_guide . $forums->depth_guide );
+			}
+		}
+			
+		$ibforums->html .= $temp_html;
+		
+		$this->forumfunc->forum_end_cat($forums->forum_by_id[ $ibforums->input['f'] ]);
+		
+		$ibforums->html .= $ibforums->adskin->end_form_standalone("Re-order");
+		
+		$ibforums->admin->output();
+			
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Re order the root forums
+	//
+	//-----------------------------------------
+	
+	function do_reorder()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^f_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[ $match[1] ] = $ibforums->input[$match[0]];
+ 				}
+ 			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Save changes
+ 		//-----------------------------------------
+ 		
+ 		if ( count($ids) )
+ 		{ 
+ 			foreach( $ids as $forum_id => $new_position )
+ 			{
+ 				$DB->do_update( 'forums', array( 'position' => intval($new_position) ), 'id='.$forum_id );
+ 			}
+ 		}
+ 		
+ 		// Reload forums
+ 		
+ 		$this->recache_forums();
+ 		
+ 		$std->boink_it( $ibforums->base_url.'&act=forum' );
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// SHOW THE FORUMS WOOHOO, ETC
+	//
+	//-----------------------------------------
+	
+	function show_forums()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		$ibforums->admin->page_title   = "Category and Forums Overview";
+		$ibforums->admin->page_detail  = "You can manage your forums from here. Roll your mouse over the icons for more information.";
+		
+		//-----------------------------------------
+		// Nav
+		//-----------------------------------------
+		
+		if ( $ibforums->input['f'] )
+		{
+			$nav = $forums->forums_breadcrumb_nav($ibforums->input['f'], '&act=forum&f=');
+			
+			if ( is_array($nav) and count($nav) > 1 )
+			{
+				array_shift($nav);
+				
+				$ibforums->html .= "<div class='navstrip'><a href='{$ibforums->base_url}&act=forum'>Forums</a> &gt; ".implode( " &gt; ", $nav )."</div><br />";
+			}
+		}
+		
+		$this->forumfunc->type = 'manage';
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doreordercat'),
+													             2 => array( 'act'   , 'forum'     ),
+													    )      );
+		
+		$this->forumfunc->forums_list_forums();
+		
+		$choose = "<select name='roots' class='realbutton'>";
+		
+		foreach( $forums->forum_cache['root'] as $fid => $fdata )
+		{
+			$choose .= "<option value='{$fid}'>{$fdata['name']}</option>\n";
+		}
+		
+		$choose .= "</select>";
+		
+		//-----------------------------------------
+		// Printy
+		//-----------------------------------------
+		
+		$html = "<script type='text/javascript'>
+				 function gochildrenofthecorn()
+				 {
+				 	var chosenroot = document.forms[0].roots.options[document.forms[0].roots.selectedIndex].value;
+				 	
+				 	self.location.href = '{$ibforums->base_url}&act=forum&code=reorder&f=' + chosenroot;
+				 }
+				 </script>	
+				 <table cellpadding='0' cellspacing='0' width='100%' border='0'>
+				 <tr>
+				  <td align='left' valign='middle'>{$choose}&nbsp;<input type='button' class='realbutton' value='Reorder Children' onclick='gochildrenofthecorn()'/></td>
+				  <td align='right'>".$ibforums->adskin->js_make_button("Add New Root Forum", $ibforums->base_url."&act=forum&code=new&c=1")."
+				  &nbsp;&nbsp;<input type='submit' value='Reorder Root Forums' class='realbutton' /></form>
+				  </td>
+				 </tr>
+				 </table>";
+		
+		$ibforums->html .= $ibforums->adskin->add_standalone_row($html, 'left');
+		
+		$ibforums->admin->nav[] = array( '', 'Manage Forums' );
+		
+		$ibforums->admin->output();
+		
+	}
+	
+		
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_gallery.php b/upload/sources/admin/ad_gallery.php
new file mode 100644
index 00000000..531d214f
--- /dev/null
+++ b/upload/sources/admin/ad_gallery.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Gallery Module
+|   ========================================
+|   by Joshua Williams
+|   (c) 2001 - 2003 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisiongallery.com
+|   Email: josh@invisiongallery.com
++---------------------------------------------------------------------------
+|
+|   > Main Admin Module
+|   > Script written by Joshua Williams
+|
++--------------------------------------------------------------------------
+*/
+
+$idx = new ad_gallery();
+
+class ad_gallery {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->page_title = "Invision Gallery Manager";
+		
+		$ibforums->admin->page_detail = "You can set up and manage your gallery in this section.";
+		
+		$ibforums->admin->nav[] = array( 'act=gallery'              , 'Invision Gallery Manager Home' );
+		
+		//-----------------------------------------
+		// Do some set up
+		//-----------------------------------------
+		
+		if ( ! @is_dir( ROOT_PATH.'/modules/gallery' ) )
+		{
+			$std->boink_it("http://www.invisiongallery.com/?why");
+		}
+		else
+		{
+			define( 'IPB_CALLED', 1 );
+    		$DB->load_cache_file( ROOT_PATH . 'sources/sql/'.SQL_DRIVER.'_gallery_queries.php', 'gallery_sql_queries' );
+    		$DB->load_cache_file( ROOT_PATH . 'sources/sql/'.SQL_DRIVER.'_gallery_admin_queries.php', 'gallery_admin_sql_queries' );
+            
+            $section = ( $ibforums->input['code'] ) ? "ad_{$ibforums->input['code']}" : "ad_cats";
+
+			require ROOT_PATH.'modules/gallery/lib/gallery_library.php';
+			require ROOT_PATH.'modules/gallery/admin/'.$section.'.php';
+			
+			$PLUGIN = new ad_plugin_gallery_sub();
+            $PLUGIN->auto_run();
+		}		
+	}		
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_groups.php b/upload/sources/admin/ad_groups.php
new file mode 100644
index 00000000..8f4fd82d
--- /dev/null
+++ b/upload/sources/admin/ad_groups.php
@@ -0,0 +1,2251 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Forum functions
+|   > Module written by Matt Mecham
+|   > Date started: 17th March 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_groups {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		$forums->forums_init();
+		
+		require ROOT_PATH.'sources/admin/admin_forum_functions.php';
+		
+		$this->forumfunc = new admin_forum_functions();
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'doadd':
+				$this->save_group('add');
+				break;
+				
+			case 'add':
+				$this->group_form('add');
+				break;
+				
+			case 'edit':
+				$this->group_form('edit');
+				break;
+			
+			case 'doedit':
+				$this->save_group('edit');
+				break;
+			
+			case 'delete':
+				$this->delete_form();
+				break;
+			
+			case 'dodelete':
+				$this->do_delete();
+				break;
+				
+			//-----------------------------------------	
+				
+			case 'fedit':
+				$this->forum_perms();
+				break;
+				
+			case 'pdelete':
+				$this->delete_mask();
+				break;
+				
+			case 'dofedit':
+				$this->do_forum_perms();
+				break;
+				
+			case 'permsplash':
+				$this->permsplash();
+				break;
+				
+			case 'view_perm_users':
+				$this->view_perm_users();
+				break;
+					
+			case 'remove_mask':
+				$this->remove_mask();
+				break;
+				
+			case 'preview_forums':
+				$this->preview_forums();
+				break;
+				
+			case 'dopermadd':
+				$this->add_new_perm();
+				break;
+				
+			case 'donameedit':
+				$this->edit_name_perm();
+				break;
+			//-----------------------------------------			
+					
+					
+						
+			default:
+				$this->main_screen();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// Member group /forum mask permission form thingy doodle do yes. Viewing Perm users
+	//
+	//-----------------------------------------
+	
+	function delete_mask()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for a valid ID
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'forum_perms', 'where' => "perm_id=".$ibforums->input['id'] ) );
+		
+		$old_id = intval($ibforums->input['id']);
+		
+		//-----------------------------------------
+		// Remove from forums...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, permission_array', 'from' => 'forums' ) );
+		$get = $DB->simple_exec();
+		
+		while( $f = $DB->fetch_row($get) )
+		{
+			$d_str = "";
+			$d_arr = unserialize(stripslashes( $f['permission_array'] ) );
+			
+			$perms = unserialize(stripslashes( $f['permission_array'] ) );
+			
+			foreach( array( 'read_perms', 'reply_perms', 'start_perms', 'upload_perms', 'show_perms' ) as $perm_bit )
+			{
+				if ($perms[ $perm_bit ] != '*')
+				{
+					if ( preg_match( "/(^|,)".$old_id."(,|$)/", $perms[ $perm_bit ]) )
+					{
+						$perms[ $perm_bit ] = preg_replace( "/(^|,)".$old_id."(,|$)/", "\\1\\2", $perms[ $perm_bit ] );
+						
+						$d_arr[ $perm_bit ] = $this->clean_perms( $perms[ $perm_bit ] );
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Do we have anything to save?
+			//-----------------------------------------
+			
+			if ( count($d_arr) > 0 )
+			{
+				//-----------------------------------------
+				// Sure?..
+				//-----------------------------------------
+				
+				$string = addslashes(serialize( $d_arr ) );
+				
+				if ( strlen($string) > 5)
+				{
+					$DB->do_update( 'forums', array( 'permission_array' => $string ), 'id='.$f['id'] );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Recache forums
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_forums.php' );
+		$ad_forums = new ad_forums();
+		$ad_forums->recache_forums();
+		
+		$this->permsplash();
+	}
+	
+	//-----------------------------------------
+	
+	
+	function add_new_perm()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['new_perm_name'] = trim($ibforums->input['new_perm_name']);
+		
+		if ($ibforums->input['new_perm_name'] == "")
+		{
+			$ibforums->admin->error("You must enter a name");
+		}
+		
+		$copy_id = $ibforums->input['new_perm_copy'];
+		
+		//-----------------------------------------
+		// UPDATE DB
+		//-----------------------------------------
+		
+		$DB->do_insert( 'forum_perms', array( 'perm_name' => $ibforums->input['new_perm_name'] ) );
+		
+		$new_id = $DB->get_insert_id();
+		
+		if ( $copy_id != 'none' )
+		{
+			//-----------------------------------------
+			// Add new mask to forum accesses
+			//-----------------------------------------
+		
+			$old_id = intval($copy_id);
+			
+			if ( ($new_id > 0) and ($old_id > 0) )
+			{
+				$DB->simple_construct( array( 'select' => 'id, permission_array', 'from' => 'forums' ) );
+				$get = $DB->simple_exec();
+				
+				while( $f = $DB->fetch_row($get) )
+				{
+					$d_str = "";
+					$d_arr = unserialize(stripslashes( $f['permission_array'] ) );
+					
+					$perms = unserialize(stripslashes( $f['permission_array'] ) );
+			
+					foreach( array( 'read_perms', 'reply_perms', 'start_perms', 'upload_perms', 'show_perms' ) as $perm_bit )
+					{
+						if ( $perms[ $perm_bit ] != '*')
+						{
+							if ( preg_match( "/(^|,)".$old_id."(,|$)/", $perms[ $perm_bit ]) )
+							{
+								$d_arr[ $perm_bit ] = $this->clean_perms( $perms[ $perm_bit ] ) . ",".$new_id;
+							}
+						}
+					}
+					
+					//-----------------------------------------
+					// Do we have anything to save?
+					//-----------------------------------------
+					
+					if ( count($d_arr) > 0 )
+					{
+						$string = addslashes(serialize( $d_arr ) );
+						
+						//-----------------------------------------
+						// Sure?..
+						//-----------------------------------------
+						
+						if ( strlen($string) > 5)
+						{
+							$DB->do_update( 'forums', array( 'permission_array' => $string ), 'id='.$f['id'] );
+						}
+					}
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Recache forums
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_forums.php' );
+		$ad_forums = new ad_forums();
+		$ad_forums->recache_forums();
+		
+		$this->permsplash();
+	}
+	
+	//-----------------------------------------
+	// Preview masks
+	//-----------------------------------------
+	
+	function preview_forums()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		//-----------------------------------------
+		// Check for a valid ID
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		if ( ! $perms = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
+		}
+		
+		//-----------------------------------------
+		// What we doin'?
+		//-----------------------------------------
+		
+		switch( $ibforums->input['t'] )
+		{
+			case 'start':
+				$human_type = 'Start Topics';
+				$code_word  = 'start_perms';
+				break;
+				
+			case 'reply':
+				$human_type = 'Reply To Topics';
+				$code_word  = 'reply_perms';
+				break;
+			
+			case 'show':
+				$human_type = 'Show Forums';
+				$code_word  = 'show_perms';
+				break;
+				
+			case 'upload':
+				$human_type = 'Upload Attachments';
+				$code_word  = 'upload_perms';
+				break;
+				
+			default:
+				$human_type = 'View Forum';
+				$code_word  = 'read_perms';
+				break;
+		}
+		
+		//-----------------------------------------
+		// Get all members using that ID then!
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "$human_type" , "100%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Preview using: " . $perms['perm_name'] );
+		
+		$the_html   = "";
+		
+		$perm_id    = intval($ibforums->input['id']);
+		
+		$theforums  = $this->forumfunc->ad_forums_forum_list(1);
+		
+		foreach( $theforums as $i => $v )
+		{
+			$id   = $v[0];
+			$name = $v[1];
+			
+			if ($forums->forum_by_id[$id][ $code_word ] == '*')
+			{
+				$the_html[] = $name;
+			}
+			else if (preg_match( "/(^|,)".$perm_id."(,|$)/", $forums->forum_by_id[$id][ $code_word ]) )
+			{
+				$the_html[] = $name;
+			}
+			else
+			{
+				//-----------------------------------------
+				// CAN'T ACCESS
+				//-----------------------------------------
+				
+				$the_html[] = "<span style='color:gray'>".$name."</span>";
+			}
+		}
+			
+		$html = implode( "<br />", $the_html );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( $html ) );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'preview_forums' ),
+																 2 => array( 'act'   , 'group'   ),
+																 3 => array( 'id'    , $ibforums->input['id']      ),
+														)      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Legend & Info" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													"Can $human_type for this forum",
+													"<input type='text' readonly='readonly' style='border:1px solid black;background-color:black;size=30px' name='blah'>"
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													"CANNOT $human_type for this forum",
+													"<input type='text' readonly='readonly' style='border:1px solid gray;background-color:gray;size=30px' name='blah'>"
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													"Test with...",
+													$ibforums->adskin->form_dropdown( 't',
+																		array( 0 => array( 'start', 'Start Topics'    ),
+																			   1 => array( 'reply', 'Reply To Topics' ),
+																			   2 => array( 'read' , 'Read Forum'      ),
+																			   3 => array( 'show' , 'Show Forum'      ),
+																			   4 => array( 'upload', 'Upload Forum'   ),
+																			  ), $ibforums->input['t'] )
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form( "Update" );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+							   
+	}
+	
+	//===========================================================================
+	
+	function remove_mask()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for a valid ID
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the member ID, please try again");
+		}
+		
+		//-----------------------------------------
+		// Get, check and reset
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, name, org_perm_id', 'from' => 'members', 'where' => "id=".intval($ibforums->input['id']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $mem = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the member ID, please try again");
+		}
+		
+		if ( $ibforums->input['pid'] == 'all' )
+		{
+			$DB->do_update( 'members', array( 'org_perm_id' => 0 ), 'id='.intval($ibforums->input['id']));
+		}
+		else
+		{
+			$ibforums->input['pid'] = intval($ibforums->input['pid']);
+			
+			$pid_array = explode( ",", $mem['org_perm_id'] );
+			
+			if ( count($pid_array) < 2 )
+			{
+				$DB->do_update( 'members', array( 'org_perm_id' => 0 ), 'id='.intval($ibforums->input['id']));
+			}
+			else
+			{
+				$new_arr = array();
+				
+				foreach( $pid_array as $sid )
+				{
+					if ( $sid != $ibforums->input['pid'] )
+					{
+						$new_arr[] = $sid;
+					}
+				}
+				
+				$DB->do_update( 'members', array( 'org_perm_id' => implode(",",$new_arr) ), 'id='.intval($ibforums->input['id']));
+			}	
+		}
+			
+		//-----------------------------------------
+		// Get all members using that ID then!
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Result" );
+		
+		
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Removed the custom permission mask from <b>{$mem['name']}</b>." )      );
+	
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+							   
+	}
+	
+	//===========================================================================
+	
+	
+	function view_perm_users()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for a valid ID
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		if ( ! $perms = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the permission mask setty doodle thingy ID, please try again");
+		}
+		
+		//-----------------------------------------
+		// Get all members using that ID then!
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "User Details" , "50%" );
+		$ibforums->adskin->td_header[] = array( "Action"       , "50%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= "<script language='javascript' type='text/javascript'>
+						 <!--
+						  function pop_close_and_stop( id )
+						  {
+						  	opener.location = \"{$ibforums->adskin->base_url}&act=mem&code=doform&MEMBER_ID=\" + id;
+						  	self.close();
+						  }
+						  //-->
+						  </script>";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Members using: " . $perms['perm_name'] );
+		
+		$DB->simple_construct( array( 'select' => 'id, name, email, posts, org_perm_id',
+									  'from'   => 'members',
+									  'where'  => "(org_perm_id IS NOT NULL AND org_perm_id <> 0)",
+									  'order'  => 'name' ) );
+		$outer = $DB->simple_exec();
+		
+		while( $r = $DB->fetch_row($outer) )
+		{
+			$exp_pid = explode( ",", $r['org_perm_id'] );
+			
+			foreach( explode( ",", $r['org_perm_id'] ) as $pid )
+			{
+				if ( $pid == $ibforums->input['id'] )
+				{
+					if ( count($exp_pid) > 1 )
+					{
+						$extra = "<li>Also using: <em style='color:red'>";
+						
+						$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id IN ({$r['org_perm_id']}) AND perm_id <> {$ibforums->input['id']}" ) );
+						$DB->simple_exec();
+						
+						while ( $mr = $DB->fetch_row() )
+						{
+							$extra .= $mr['perm_name'].",";
+						}
+						
+						$extra = preg_replace( "/,$/", "", $extra );
+						
+						$extra .= "</em>";
+					}
+					else
+					{
+						$extra = "";
+					}
+					
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "<div style='font-weight:bold;font-size:11px;padding-bottom:6px;margin-bottom:3px;border-bottom:1px solid #000'>{$r['name']}</div>
+															   <li>Posts: {$r['posts']}
+															   <li>Email: {$r['email']}
+															   $extra" ,
+															  "&#149;&nbsp;<a href='{$ibforums->adskin->base_url}&amp;act=group&amp;code=remove_mask&amp;id={$r['id']}&amp;pid=$pid' title='Remove this mask from the user (will not remove all if they have multimasks'>Remove This Mask</a>
+															   <br />&#149;&nbsp;<a href='{$ibforums->adskin->base_url}&amp;act=group&amp;code=remove_mask&amp;id={$r['id']}&amp;pid=all' title='Remove all user masks'>Remove All Masks</a>
+															   <br /><br />&#149;&nbsp;<a href='javascript:pop_close_and_stop(\"{$r['id']}\");'>Edit Member</a>",
+													 )      );
+				}
+			}
+		}
+		
+						     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+							   
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Member group /forum mask permission form thingy doodle do yes.
+	//
+	//-----------------------------------------
+	
+	
+	function permsplash()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Forum Permission Mask [ HOME ]";
+		
+		$ibforums->admin->page_detail = "You can manage your forum permission masks from this section.";
+		
+		$ibforums->admin->page_detail .= "<br /><b>Used by Groups</b> relates to the member groups that use this permission mask
+								<br /><b>Used by Members</b> relates to the number of members that have this permission mask set to over ride the group used permission mask
+							    <br /><b>Preview</b> the forums this mask has access to in a quick, convenient format
+							   ";
+								
+		
+		//-----------------------------------------
+		// Get the names for the perm masks w/id
+		//-----------------------------------------
+		
+		$perms = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$perms[ $r['perm_id'] ] = $r['perm_name'];
+		}
+		
+		//-----------------------------------------
+		// Get the number of members using this mask
+		// as an over ride
+		//-----------------------------------------
+		
+		$mems = array();
+		
+		$DB->cache_add_query( 'groups_permsplash', array() );
+		$DB->cache_exec_query();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			if ( strstr($r['org_perm_id'] , "," ) )
+			{
+				foreach( explode( ",", $r['org_perm_id'] ) as $pid )
+				{
+					$mems[ $pid ] += $r['count'];
+				}
+			}
+			else
+			{
+				$mems[ $r['org_perm_id'] ] += $r['count'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Get the member group names and the mask
+		// they use
+		//-----------------------------------------
+		
+		$groups = array();
+		
+		$DB->simple_construct( array( 'select' => 'g_id, g_title, g_perm_id', 'from' => 'groups' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			if ( strstr($r['g_perm_id'] , "," ) )
+			{
+				foreach( explode( ",", $r['g_perm_id'] ) as $pid )
+				{
+					$groups[ $pid ][] = $r['g_title'];
+				}
+			}
+			else
+			{
+				$groups[ $r['g_perm_id'] ][] = $r['g_title'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Print the splash screen
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Mask Name"          , "20%" );
+		$ibforums->adskin->td_header[] = array( "Used by Group(s)"   , "20%" );
+		$ibforums->adskin->td_header[] = array( "Used by Mem(s)"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Preview"            , "10%" );
+		$ibforums->adskin->td_header[] = array( "Edit"               , "15%" );
+		$ibforums->adskin->td_header[] = array( "Delete"             , "15%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->js_pop_win();
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Forum Permission Masks" );
+		
+		foreach( $perms as $id => $name )
+		{
+			$groups_used = "";
+			
+			$is_active = 0;
+			
+			if ( is_array( $groups[ $id ] ) )
+			{
+				foreach( $groups[ $id ] as $bleh => $g_title )
+				{
+					$groups_used .= $g_title . "<br />";
+				}
+				
+				$is_active = 1;
+				
+			}
+			else
+			{
+				$groups_used = "<center><i>None</i></center>";
+			}
+			
+			$mems_used = 0;
+			
+			if ( $mems[ $id ] > 0 )
+			{
+				$is_active = 1;
+				$mems_used = $mems[ $id ] . " (<a href='javascript:pop_win(\"&amp;act=group&amp;code=view_perm_users&amp;id=$id\", \"User\", \"500\",\"350\");' title='View the member names of those using this mask in a new window'>View</a>)";
+			}
+			
+			if ( $is_active > 0 )
+			{
+				$delete = "<i>Can't, in use</i>";
+			}
+			else
+			{
+				$delete = "<a href='{$ibforums->adskin->base_url}&amp;act=group&amp;code=pdelete&amp;id=$id'>Delete</a>";
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>$name</b>" ,
+													  "$groups_used",
+													  "<center>$mems_used</center>",
+													  "<center><a href='javascript:pop_win(\"&amp;act=group&amp;code=preview_forums&amp;id=$id&amp;t=read\", \"400\",\"350\");' title='See what this group can see..'>Preview</a></center>",
+													  "<center><a href='{$ibforums->adskin->base_url}&amp;act=group&amp;code=fedit&amp;id=$id'>Edit</a></center>",
+													  "<center>$delete</center>",
+											 )      );
+		
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$dlist = array();
+		
+		$dlist[] = array( 'none', 'Do not inherit' );
+		
+		foreach( $perms as $id => $name )
+		{
+			$dlist[] = array( $id, $name );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dopermadd' ),
+												  2 => array( 'act'   , 'group'   ),
+									     )      );
+									     
+		
+		$ibforums->adskin->td_header[] = array( "{none}" , "60%" );
+		$ibforums->adskin->td_header[] = array( "{none}" , "40%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Create a new permission mask" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Permission Mask Name</b>" ,
+												  $ibforums->adskin->form_input( 'new_perm_name' ),
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Inherit forum permission mask from...</b>" ,
+												 $ibforums->adskin->form_dropdown( 'new_perm_copy', $dlist ),
+										 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Create");
+						     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		
+		$ibforums->admin->output();
+			
+			
+	}
+	
+	
+	
+	function forum_perms()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the group ID, please try again");
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title = "Forum Permission Mask [ EDIT ]";
+		
+		$ibforums->admin->page_detail = "You can manage your forum permission masks from this section.";
+		
+		$ibforums->admin->page_detail .= "<br />Simply check the boxes to allow permission for that action, or uncheck the box to deny permission for that action.
+							   <br /><b>Global</b> indicates that all present and future permission masks have access to that action and as such, cannot be changed";
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		$group = $DB->fetch_row();
+		
+		$gid   = $group['perm_id'];
+		$gname = $group['perm_name'];
+		
+		//-----------------------------------------
+		//| EDIT NAME
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'donameedit' ),
+												  				 2 => array( 'act'   , 'group'   ),
+															     3 => array( 'id'    , $gid      ),
+									                    )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rename Group: ".$group['perm_name'] );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Mask Name</b>" ,
+												                 $ibforums->adskin->form_input("perm_name", $gname )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit Name");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//| MAIN FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dofedit' ),
+												                 2 => array( 'act'   , 'group'   ),
+												                 3 => array( 'id'    , $gid      ),
+									                    )      );
+		
+		$ibforums->adskin->td_header[] = array( "Forum Name"   , "25%" );
+		$ibforums->adskin->td_header[] = array( "Show"         , "10%" );
+		$ibforums->adskin->td_header[] = array( "Read"         , "10%" );
+		$ibforums->adskin->td_header[] = array( "Reply"        , "10%" );
+		$ibforums->adskin->td_header[] = array( "Start"        , "10%" );
+		$ibforums->adskin->td_header[] = array( "Upload"       , "10%" );
+		
+		$forum_data = $this->forumfunc->ad_forums_forum_data();
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Forum Access Permissions for ".$group['perm_name'] );
+		
+		foreach( $forum_data as $id => $r )
+		{
+			$show   = "";
+			$read   = "";
+			$start  = "";
+			$reply  = "";
+			$upload = "";
+			
+			$global = '<center id="mgyellow"><i>Global</i></center>';
+			
+			if ($r['show_perms'] == '*')
+			{
+				$show = $global;
+			}
+			else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['show_perms'] ) )
+			{
+				$show = "<center id='mgyellow'><input type='checkbox' name='show_".$r['id']."' value='1' checked></center>";
+			}
+			else
+			{
+				$show = "<center id='mgyellow'><input type='checkbox' name='show_".$r['id']."' value='1'></center>";
+			}
+			
+			//-----------------------------------------
+			
+			$global = '<center id="mgblue"><i>Global</i></center>';
+			
+			if ($r['read_perms'] == '*')
+			{
+				$read = $global;
+			}
+			else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['read_perms'] ) )
+			{
+				$read = "<center id='mgblue'><input type='checkbox' name='read_".$r['id']."' value='1' checked></center>";
+			}
+			else
+			{
+				$read = "<center id='mgblue'><input type='checkbox' name='read_".$r['id']."' value='1'></center>";
+			}
+			
+			//-----------------------------------------
+			
+			$global = '<center id="mgred"><i>Global</i></center>';
+			
+			if ($r['start_perms'] == '*')
+			{
+				$start = $global;
+			}
+			else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['start_perms'] ) )
+			{
+				$start = "<center id='mgred'><input type='checkbox' name='start_".$r['id']."' value='1' checked></center>";
+			}
+			else
+			{
+				$start = "<center id='mgred'><input type='checkbox' name='start_".$r['id']."' value='1'></center>";
+			}
+			
+			//-----------------------------------------
+			
+			$global = '<center id="mggreen"><i>Global</i></center>';
+			
+			if ($r['reply_perms'] == '*')
+			{
+				$reply = $global;
+			}
+			else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['reply_perms'] ) )
+			{
+				$reply = "<center id='mggreen'><input type='checkbox' name='reply_".$r['id']."' value='1' checked></center>";
+			}
+			else
+			{
+				$reply = "<center id='mggreen'><input type='checkbox' name='reply_".$r['id']."' value='1'></center>";
+			}
+			
+			//-----------------------------------------
+			
+			$global = '<center id="memgroup"><i>Global</i></center>';
+			
+			if ($r['upload_perms'] == '*')
+			{
+				$upload = $global;
+			}
+			else if ( preg_match( "/(^|,)".$gid."(,|$)/", $r['upload_perms'] ) )
+			{
+				$upload = "<center id='memgroup'><input type='checkbox' name='upload_".$r['id']."' value='1' checked></center>";
+			}
+			else
+			{
+				$upload = "<center id='memgroup'><input type='checkbox' name='upload_".$r['id']."' value='1'></center>";
+			}
+			
+			//-----------------------------------------
+			
+			if ( $r['root_forum'] )
+			{
+				$css = 'pformstrip';
+			}
+			else
+			{
+				$css = '';
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array(
+																	 "<b>".$r['depthed_name']."</b>",
+																	 $show,
+																	 $read,
+																	 $reply,
+																	 $start,
+																	 $upload
+										 					) ,$css  );
+		
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Update Forum Permissions");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	function edit_name_perm()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for legal ID
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve that group ID");
+		}
+		
+		if ( $ibforums->input['perm_name'] == "" )
+		{
+			$ibforums->admin->error("You must enter a name");
+		}
+		
+		$gid = $ibforums->input['id'];
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		if ( ! $gr = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Not a valid group ID");
+		}
+		
+		$DB->do_update( 'forum_perms', array( 'perm_name' => $ibforums->input['perm_name'] ), 'perm_id='.$ibforums->input['id'] );
+		
+		$ibforums->admin->save_log("Forum Access Permissions Name Edited for Mask: '{$gr['perm_name']}'");
+		
+		$ibforums->admin->done_screen("Forum Access Permissions Updated", "Permission Mask Control", "act=group&code=permsplash" );
+	}
+	
+	
+	
+	function do_forum_perms()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for legal ID
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve that group ID");
+		}
+		
+		$gid = $ibforums->input['id'];
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'where' => "perm_id=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		if ( ! $gr = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Not a valid group ID");
+		}
+		
+		//-----------------------------------------
+		// Pull the forum data..
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forums', 'order' => "position ASC" ) );
+		$forum_q = $DB->simple_exec();
+		
+		while ( $row = $DB->fetch_row( $forum_q ) )
+		{
+			$perms = unserialize(stripslashes( $row['permission_array'] ) );
+			
+			$read   = "";
+			$reply  = "";
+			$start  = "";
+			$upload = "";
+			$show   = "";
+			
+			//-----------------------------------------
+			// Is this global?
+			//-----------------------------------------
+			
+			if ($perms['read_perms'] == '*')
+			{
+				$read = '*';
+				
+			}
+			else
+			{
+				//-----------------------------------------
+				// Split the set IDs
+				//-----------------------------------------
+				
+				$read_ids = explode( ",", $perms['read_perms'] );
+				
+				if ( is_array($read_ids) )
+				{
+				   foreach ($read_ids as $i)
+				   {
+					   //-----------------------------------------
+					   // If it's the current ID, skip
+					   //-----------------------------------------
+					   
+					   if ($gid == $i)
+					   {
+						   continue;
+					   }
+					   else
+					   {
+						   $read .= $i.",";
+					   }
+				   }
+				}
+				//-----------------------------------------
+				// Was the box checked?
+				//-----------------------------------------
+				
+				if ($ibforums->input[ 'read_'.$row['id'] ] == 1)
+				{
+					// Add our group ID...
+					
+					$read .= $gid.",";
+				}
+				
+				// Tidy..
+				
+				$read = preg_replace( "/,$/", "", $read );
+				$read = preg_replace( "/^,/", "", $read );
+				
+			}
+			
+			//-----------------------------------------
+			// Reply topics..
+			//-----------------------------------------
+				
+			if ($perms['reply_perms'] == '*')
+			{
+				$reply = '*';
+			}
+			else
+			{
+				$reply_ids = explode( ",", $perms['reply_perms'] );
+				
+				if ( is_array($reply_ids) )
+				{
+					foreach ($reply_ids as $i)
+					{
+						if ($gid == $i)
+						{
+							continue;
+						}
+						else
+						{
+							$reply .= $i.",";
+						}
+					}
+				
+				}
+				
+				if ($ibforums->input[ 'reply_'.$row['id'] ] == 1)
+				{
+					$reply .= $gid.",";
+				}
+				
+				$reply = preg_replace( "/,$/", "", $reply );
+				$reply = preg_replace( "/^,/", "", $reply );
+			}
+			
+			//-----------------------------------------
+			// Start topics..
+			//-----------------------------------------
+				
+			if ($perms['start_perms'] == '*')
+			{
+				$start = '*';
+			}
+			else
+			{
+				$start_ids = explode( ",", $perms['start_perms'] );
+				
+				if ( is_array($start_ids) )
+				{
+				
+					foreach ($start_ids as $i)
+					{
+						if ($gid == $i)
+						{
+							continue;
+						}
+						else
+						{
+							$start .= $i.",";
+						}
+					}
+				
+				}
+				
+				if ($ibforums->input[ 'start_'.$row['id'] ] == 1)
+				{
+					$start .= $gid.",";
+				}
+				
+				$start = preg_replace( "/,$/", "", $start );
+				$start = preg_replace( "/^,/", "", $start );
+			}
+			
+			//-----------------------------------------
+			// Upload topics..
+			//-----------------------------------------
+				
+			if ($perms['upload_perms'] == '*')
+			{
+				$upload = '*';
+			}
+			else
+			{
+				$upload_ids = explode( ",", $perms['upload_perms'] );
+				
+				if ( is_array($upload_ids) )
+				{
+				
+					foreach ($upload_ids as $i)
+					{
+						if ($gid == $i)
+						{
+							continue;
+						}
+						else
+						{
+							$upload .= $i.",";
+						}
+					}
+				
+				}
+				
+				if ($ibforums->input[ 'upload_'.$row['id'] ] == 1)
+				{
+					$upload .= $gid.",";
+				}
+				
+				$upload = preg_replace( "/,$/", "", $upload );
+				$upload = preg_replace( "/^,/", "", $upload );
+			}
+			
+			//-----------------------------------------
+			// Show topics..
+			//-----------------------------------------
+				
+			if ($perms['show_perms'] == '*')
+			{
+				$show = '*';
+			}
+			else
+			{
+				$show_ids = explode( ",", $perms['show_perms'] );
+				
+				if ( is_array($show_ids) )
+				{
+					foreach ($show_ids as $i)
+					{
+						if ($gid == $i)
+						{
+							continue;
+						}
+						else
+						{
+							$show .= $i.",";
+						}
+					}
+				
+				}
+				
+				if ($ibforums->input[ 'show_'.$row['id'] ] == 1)
+				{
+					$show .= $gid.",";
+				}
+				
+				$show = preg_replace( "/,$/", "", $show );
+				$show = preg_replace( "/^,/", "", $show );
+			}
+			
+			//-----------------------------------------
+			// Update the DB...
+			//-----------------------------------------
+			
+			$DB->do_update( 'forums', array( 'permission_array' => addslashes(serialize(array(
+																						   'start_perms'  => $start,
+																						   'reply_perms'  => $reply,
+																						   'read_perms'   => $read,
+																						   'upload_perms' => $upload,
+																						   'show_perms'   => $show
+							    		)		  						 )         )      ), 'id='.$row['id']);
+			
+		}
+		
+		//-----------------------------------------
+		// Recache forums
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_forums.php' );
+		$adforums = new ad_forums();
+		
+		$adforums->recache_forums();
+		
+		$ibforums->admin->save_log("Forum Access Permissions Edited for Mask: '{$gr['perm_name']}'");
+		
+		$ibforums->admin->done_screen("Forum Access Permissions Updated", "Permission Mask Control", "act=group&code=permsplash", 'redirect' );
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// Delete a group
+	//
+	//-----------------------------------------
+	
+	function delete_form()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the group ID, please try again");
+		}
+		
+		if ($ibforums->input['id'] < 5)
+		{
+			$ibforums->admin->error("You can not move the preset groups. You can rename them and edit the functionality");
+		}
+		
+		$ibforums->admin->page_title = "Deleting a User Group";
+		
+		$ibforums->admin->page_detail = "Please check to ensure that you are attempting to remove the correct group.";
+		
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(id) as users', 'from' => 'members', 'where' => "mgroup=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		$black_adder = $DB->fetch_row();
+		
+		if ($black_adder['users'] < 1)
+		{
+			$black_adder['users'] = 0;
+		}
+		
+		$DB->simple_construct( array( 'select' => 'g_title', 'from' => 'groups', 'where' => "g_id=".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		$group = $DB->fetch_row();
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'where' => "g_id <> ".$ibforums->input['id'] ) );
+		$DB->simple_exec();
+		
+		$mem_groups = array();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$mem_groups[] = array( $r['g_id'], $r['g_title'] );
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dodelete'  ),
+																 2 => array( 'act'   , 'group'     ),
+																 3 => array( 'id'    , $ibforums->input['id']   ),
+																 4 => array( 'name'  , $group['g_title'] ),
+														)      );
+									     
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Removal Confirmation: ".$group['g_title'] );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Number of users in this group</b>" ,
+												  "<b>".$black_adder['users']."</b>",
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Move users in this group to...</b>" ,
+												  $ibforums->adskin->form_dropdown("to_id", $mem_groups )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Delete this group");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+			
+	}
+	
+	function do_delete()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the group ID, please try again");
+		}
+		
+		if ($ibforums->input['to_id'] == "")
+		{
+			$ibforums->admin->error("No move to group ID was specified. /me cries.");
+		}
+		
+		// Check to make sure that the relevant groups exist.
+		
+		$DB->simple_construct( array( 'select' => 'g_id', 'from' => 'groups', 'where' => "g_id IN(".$ibforums->input['id'].",".$ibforums->input['to_id'].")" ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() != 2 )
+		{
+			$ibforums->admin->error("Could not resolve the ID's passed to group deletion");
+		}
+		
+		$DB->do_update( 'members', array( 'mgroup' => $ibforums->input['to_id'] ), 'mgroup='.$ibforums->input['id'] );
+		
+		$DB->simple_exec_query( array( 'delete' => 'groups', 'where' => "g_id=".$ibforums->input['id'] ) );
+		
+		// Look for promotions in case we have members to be promoted to this group...
+		
+		$DB->simple_construct( array( 'select' => 'g_id', 'from' => 'groups', 'where' => "g_promotion LIKE '{$ibforums->input['id']}&%'" ) );
+		$prq = $DB->simple_exec();
+		
+		while ( $row = $DB->fetch_row($prq) )
+		{
+			$DB->do_update( 'groups', array( 'g_promotion' => '-1&-1' ), 'g_id='.$row['g_id'] );
+		}
+		
+		// Remove from moderators table
+		
+		$DB->simple_exec_query( array( 'delete' => 'moderators', 'where' => "is_group=1 AND group_id=".$ibforums->input['id'] ) );
+		
+		$ibforums->admin->save_log("Member Group '{$ibforums->input['name']}' removed");
+		
+		$ibforums->admin->done_screen("Group Removed", "Group Control", "act=group" );
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Save changes to DB
+	//
+	//-----------------------------------------
+	
+	function save_group($type='edit')
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['g_title'] == "")
+		{
+			$ibforums->admin->error("You must enter a group title.");
+		}
+		
+		if ($type == 'edit')
+		{
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("Could not resolve the group id");
+			}
+			
+			if ($ibforums->input['id'] == $ibforums->vars['admin_group'] and $ibforums->input['g_access_cp'] != 1)
+			{
+				$ibforums->admin->error("You can not remove the ability to access the admin control panel for this group");
+			}
+		}
+		
+		//-----------------------------------------
+		// Sort out the perm mask id things
+		//-----------------------------------------
+		
+		if ( is_array( $_POST['permid'] ) )
+		{
+			$perm_id = implode( ",", $_POST['permid'] );
+		}
+		else
+		{
+			$ibforums->admin->error("No permission masks chosen");
+		}
+		
+		// Build up the hashy washy for the database ..er.. wase.
+		
+		$prefix = preg_replace( "/&#39;/", "'" , $std->txt_safeslashes($_POST['prefix']) );
+		$prefix = preg_replace( "/&lt;/" , "<" , $prefix          );
+		$suffix = preg_replace( "/&#39;/", "'" , $std->txt_safeslashes($_POST['suffix']) );
+		$suffix = preg_replace( "/&lt;/" , "<" , $suffix          );
+		
+		$promotion_a = '-1'; //id
+		$promotion_b = '-1'; // posts
+		
+		if ($ibforums->input['g_promotion_id'] > 0)
+		{
+			$promotion_a = $ibforums->input['g_promotion_id'];
+			$promotion_b = $ibforums->input['g_promotion_posts'];
+		}
+		
+		//if ($ibforums->input['g_max_messages'] == 0)
+		//{
+			//$ibforums->input['g_max_messages'] = -1;
+		//}
+		
+		//list($p_max, $p_width, $p_height) = explode( ":", $group['g_photo_max_vars'] );
+		
+		if ( $ibforums->input['g_attach_per_post'] and $ibforums->input['g_attach_max'] > 0 )
+		{
+			if ( $ibforums->input['g_attach_per_post'] > $ibforums->input['g_attach_max'] )
+			{
+				$ibforums->main_msg = "You cannot specify a per post limit greater than the globally allowed limit.";
+				$this->group_form('edit');
+			}
+		}
+		
+		$ibforums->input['p_max']    = str_replace( ":", "", $ibforums->input['p_max'] );
+		$ibforums->input['p_width']  = str_replace( ":", "", $ibforums->input['p_width'] );
+		$ibforums->input['p_height'] = str_replace( ":", "", $ibforums->input['p_height'] );
+		
+		$db_string = array(
+							 'g_view_board'         => $ibforums->input['g_view_board'],
+							 'g_mem_info'           => $ibforums->input['g_mem_info'],
+							 'g_other_topics'       => $ibforums->input['g_other_topics'],
+							 'g_use_search'         => $ibforums->input['g_use_search'],
+							 'g_email_friend'       => $ibforums->input['g_email_friend'],
+							 'g_invite_friend'      => $ibforums->input['g_invite_friend'],
+							 'g_edit_profile'       => $ibforums->input['g_edit_profile'],
+							 'g_post_new_topics'    => $ibforums->input['g_post_new_topics'],
+							 'g_reply_own_topics'   => $ibforums->input['g_reply_own_topics'],
+							 'g_reply_other_topics' => $ibforums->input['g_reply_other_topics'],
+							 'g_edit_posts'         => $ibforums->input['g_edit_posts'],
+							 'g_edit_cutoff'        => $ibforums->input['g_edit_cutoff'],
+							 'g_delete_own_posts'   => $ibforums->input['g_delete_own_posts'],
+							 'g_open_close_posts'   => $ibforums->input['g_open_close_posts'],
+							 'g_delete_own_topics'  => $ibforums->input['g_delete_own_topics'],
+							 'g_post_polls'         => $ibforums->input['g_post_polls'],
+							 'g_vote_polls'         => $ibforums->input['g_vote_polls'],
+							 'g_use_pm'             => $ibforums->input['g_use_pm'],
+							 'g_is_supmod'          => $ibforums->input['g_is_supmod'],
+							 'g_access_cp'          => $ibforums->input['g_access_cp'],
+							 'g_title'              => trim($ibforums->input['g_title']),
+							 'g_can_remove'         => $ibforums->input['g_can_remove'],
+							 'g_append_edit'        => $ibforums->input['g_append_edit'],
+							 'g_access_offline'     => $ibforums->input['g_access_offline'],
+							 'g_avoid_q'            => $ibforums->input['g_avoid_q'],
+							 'g_avoid_flood'        => $ibforums->input['g_avoid_flood'],
+							 'g_icon'               => trim($std->txt_safeslashes($_POST['g_icon'])),
+							 'g_attach_max'         => $ibforums->input['g_attach_max'],
+							 'g_avatar_upload'      => $ibforums->input['g_avatar_upload'],
+							 'g_calendar_post'      => $ibforums->input['g_calendar_post'],
+							 'g_max_messages'       => $ibforums->input['g_max_messages'],
+							 'g_max_mass_pm'        => $ibforums->input['g_max_mass_pm'],
+							 'g_search_flood'       => $ibforums->input['g_search_flood'],
+							 'prefix'               => $prefix,
+							 'suffix'               => $suffix,
+							 'g_promotion'          => $promotion_a.'&'.$promotion_b,
+							 'g_hide_from_list'     => $ibforums->input['g_hide_from_list'],
+							 'g_post_closed'        => $ibforums->input['g_post_closed'],
+							 'g_perm_id'			=> $perm_id,
+							 'g_photo_max_vars'	    => $ibforums->input['p_max'].':'.$ibforums->input['p_width'].':'.$ibforums->input['p_height'],
+							 'g_dohtml'			    => $ibforums->input['g_dohtml'],
+							 'g_edit_topic'			=> $ibforums->input['g_edit_topic'],
+							 'g_email_limit'		=> intval($ibforums->input['join_limit']).':'.intval($ibforums->input['join_flood']),
+							 'g_bypass_badwords'    => $ibforums->input['g_bypass_badwords'],
+							 'g_can_msg_attach'     => $ibforums->input['g_can_msg_attach'],
+							 'g_attach_per_post'    => $ibforums->input['g_attach_per_post'],
+						  );
+						  
+		if ($type == 'edit')
+		{
+			$DB->do_update( 'groups', $db_string, 'g_id='.$ibforums->input['id'] );
+			
+			// Update the title of the group held in the mod table incase it changed.
+			
+			$DB->do_update( 'moderators', array( 'group_name' => trim($ibforums->input['g_title']) ), 'group_id='.$ibforums->input['id'] );
+			
+			$ibforums->admin->save_log("Edited Group '{$ibforums->input['g_title']}'");
+			
+			$this->rebuild_group_cache();
+			
+			$ibforums->admin->done_screen("Group Edited", "Group Control", "act=group", 'redirect' );
+			
+		}
+		else
+		{
+			$DB->do_insert( 'groups', $db_string );
+			
+			$ibforums->admin->save_log("Added Group '{$ibforums->input['g_title']}'");
+			
+			$this->rebuild_group_cache();
+			
+			$ibforums->admin->done_screen("Group Added", "Group Control", "act=group", 'redirect' );
+		}
+	}
+	
+	//-----------------------------------------
+	// Rebuild group cache
+	//-----------------------------------------
+	
+	function rebuild_group_cache()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->cache['group_cache'] = array();
+			
+		$DB->simple_construct( array( 'select' => "*",
+									  'from'   => 'groups'
+							 )      );
+		
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	
+	//-----------------------------------------
+	// Clean Perm string
+	//-----------------------------------------
+	
+	function clean_perms($str)
+	{
+		$str = preg_replace( "/,$/", "", $str );
+		$str = str_replace(  ",,", ",", $str );
+		
+		return $str;
+	}
+	
+	//-----------------------------------------
+	//
+	// Add / edit group
+	//
+	//-----------------------------------------
+	
+	function group_form($type='edit')
+	{
+		global $ibforums, $DB,  $std;
+		
+		$all_groups = array( 0 => array ('none', 'Don\'t Promote') );
+		
+		if ($type == 'edit')
+		{
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("No group id to select from the database, please try again.");
+			}
+			
+			if ( $ibforums->vars['admin_group'] == $ibforums->input['id'] )
+			{
+				if ( $ibforums->member['mgroup'] != $ibforums->vars['admin_group'] )
+				{
+					$ibforums->admin->error("Sorry, you are unable to edit that group as it's the root admin group");
+				}
+			}
+			
+			$form_code = 'doedit';
+			$button    = 'Complete Edit';
+				
+		}
+		else
+		{
+			$form_code = 'doadd';
+			$button    = 'Add Group';
+		}
+		
+		if ($ibforums->input['id'] != "")
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'groups', 'where' => "g_id=".$ibforums->input['id'] ) );
+			$DB->simple_exec();
+		
+			$group = $DB->fetch_row();
+			
+			$DB->simple_construct( array( 'select' => 'g_id, g_title',
+										  'from'   => 'groups',
+										  'where'  => "g_id <> {$ibforums->input['id']}",
+										  'order'  => 'g_title' ) );
+		}
+		else
+		{
+			$group = array();
+			
+			$DB->simple_construct( array( 'select' => 'g_id, g_title',
+										  'from'   => 'groups',
+										  'order'  => 'g_title' ) );
+		}
+		
+		//-----------------------------------------
+		// sort out the promotion stuff
+		//-----------------------------------------
+		
+		list($group['g_promotion_id'], $group['g_promotion_posts']) = explode( '&', $group['g_promotion'] );
+		
+		if ($group['g_promotion_posts'] < 1)
+		{
+			$group['g_promotion_posts'] = '';
+		}
+		
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $r['g_id'] == $ibforums->vars['admin_group'] )
+			{
+				continue;
+			}
+			
+			$all_groups[] = array( $r['g_id'], $r['g_title'] );
+		}
+		
+		//-----------------------------------------
+		
+		$perm_masks = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$perm_masks[] = array( $r['perm_id'], $r['perm_name'] );
+		}
+		
+		//-----------------------------------------
+		
+		if ($type == 'edit')
+		{
+			$ibforums->admin->page_title = "Editing User Group ".$group['g_title'];
+		}
+		else
+		{
+			$ibforums->admin->page_title = 'Adding a new user group';
+			$group['g_title'] = 'New Group';
+		}
+		
+		$guest_legend = "";
+		
+		if ($group['g_id'] == $ibforums->vars['guest_group'])
+		{
+			$guest_legend = "</b><br><i>(Does not apply to guests)</i>";
+		}
+		
+		$ibforums->admin->page_detail = "Please double check the information before submitting the form.";
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= "<script language='javascript'>
+						 <!--
+						  function checkform() {
+						  
+						  	isAdmin = document.forms[0].g_access_cp;
+						  	isMod   = document.forms[0].g_is_supmod;
+						  	
+						  	msg = '';
+						  	
+						  	if (isAdmin[0].checked == true)
+						  	{
+						  		msg += 'Members in this group can access the Admin Control Panel\\n\\n';
+						  	}
+						  	
+						  	if (isMod[0].checked == true)
+						  	{
+						  		msg += 'Members in this group are super moderators.\\n\\n';
+						  	}
+						  	
+						  	if (msg != '')
+						  	{
+						  		msg = 'Security Check\\n--------------\\nMember Group Title: ' + document.forms[0].g_title.value + '\\n--------------\\n\\n' + msg + 'Is this correct?';
+						  		
+						  		formCheck = confirm(msg);
+						  		
+						  		if (formCheck == true)
+						  		{
+						  			return true;
+						  		}
+						  		else
+						  		{
+						  			return false;
+						  		}
+						  	}
+						  }
+						 //-->
+						 </script>\n";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $form_code  ),
+																 2 => array( 'act'   , 'group'     ),
+																 3 => array( 'id'    , $ibforums->input['id']   ),
+														) , 'adform', "onSubmit='return checkform()'" );
+									     
+		
+		list($p_max, $p_width, $p_height) = explode( ":", $group['g_photo_max_vars'] );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$prefix = preg_replace( "/'/", "&#39;", $group['prefix'] );
+		$prefix = preg_replace( "/</", "&lt;" , $prefix          );
+		$suffix = preg_replace( "/'/", "&#39;", $group['suffix'] );
+		$suffix = preg_replace( "/</", "&lt;" , $suffix          );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Global Settings", "Basic Group Settings" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Group Title</b>" ,
+												  $ibforums->adskin->form_input("g_title", $group['g_title'] )
+									     )      );
+									     
+		//-----------------------------------------
+		// Sort out default array
+		//-----------------------------------------
+		
+		$ibforums->html .=
+		"<script type='text/javascript'>
+			
+			var show   = '';
+		";
+		
+		foreach ($perm_masks as $id => $d)
+		{
+			$ibforums->html .= " 		perms_$d[0] = '$d[1]';\n";
+		}
+		
+		$ibforums->html .=
+		"	
+			var show = '';
+			
+		 	function saveit(f)
+		 	{
+		 		show = '';
+		 		
+		 		for (var i = 0 ; i < f.options.length; i++)
+				{
+					if (f.options[i].selected)
+					{
+						tid  = f.options[i].value;
+						show += '\\n' + eval('perms_'+tid);
+					}
+				}
+			}
+			
+			function show_me()
+			{
+				if (show == '')
+				{
+					show = 'No change detected\\nClick on the multi-select box to activate';
+				}
+				
+				alert('Selected Permission Masks\\n---------------------------------\\n' + show);
+			}
+			
+		</script>";
+		
+		$arr = explode( ",", $group['g_perm_id'] );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Use Forum Permission Access...</b><br>You may choose more than one" ,
+												  $ibforums->adskin->form_multiselect("permid[]", $perm_masks, $arr, 5, 'onfocus="saveit(this)"; onchange="saveit(this)";' )."<a href='javascript:show_me();'>Show me selected masks</a>"
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Group Icon Image</b><div style='color:gray'>Can be a relative link, i.e. <b>style_images/1/folder_team_icons/admin.gif</b><br />or it can a full URL starting with <b>'http://'</b><br/ >Use <b>style_images/<#IMG_DIR#>/folder_team_icons/{image}</b> (replace {image} with the image name) to dynamically load the image from the style_image folder based on the member's skin choice.</div>" ,
+												  $ibforums->adskin->form_textarea("g_icon", $group['g_icon'] )
+									     )      );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Online List Format [Prefix]</b><br>(Can be left blank)<br>(Example:&lt;span style='color:red'&gt;)" ,
+												  $ibforums->adskin->form_input("prefix", $prefix )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Online List Format [Suffix]</b><br>(Can be left blank)<br>(Example:&lt;/span&gt;)" ,
+												  $ibforums->adskin->form_input("suffix", $suffix )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Hide this group from the member list?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_hide_from_list", $group['g_hide_from_list'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Upload Permissions", "Manage permissions for PM and post uploads, etc" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>GLOBAL: Max total global file space for all uploads (Inc. PMs and posts) (in KB)</b>".$ibforums->adskin->js_help_link('mg_upload')."<div class='graytext'>Enter -1 to disable uploads or enter 0 to disable the limit</div>" ,
+																 $ibforums->adskin->form_input("g_attach_max", $group['g_attach_max'] ). ' (currently: '.$std->size_format( $group['g_attach_max'] * 1024 ).')'
+														)      );
+														
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>PER POST: Max total file space allowed in each post or PM (in KB)</b>".$ibforums->adskin->js_help_link('mg_upload')."<div class='graytext'>Enter 0 to disable a per post limit. This number must be less than the global amount.</div>" ,
+																 $ibforums->adskin->form_input("g_attach_per_post", $group['g_attach_per_post'] ). ' (currently: '.$std->size_format( $group['g_attach_per_post'] * 1024 ).')'
+														)      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>PERSONAL PHOTO: Max upload file size (in KB)</b><br>(Leave blank to disallow uploads)" ,
+																 $ibforums->adskin->form_input("p_max", $p_max )."<br />"
+																 ."Max Width (px): <input type='text' size='3' class='textinput' name='p_width' value='{$p_width}'> "
+																 ."Max Height (px): <input type='text' size='3' class='textinput' name='p_height' value='{$p_height}'>"
+														)      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>AVATARS: Allow avatar uploads?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_avatar_upload", $group['g_avatar_upload'] )
+									     )      );
+									     						     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>PMs: Allow PM attachments?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_can_msg_attach", $group['g_can_msg_attach'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Global Permissions", "Restricting what this group can do" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can view board?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_view_board", $group['g_view_board'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can view OFFLINE board?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_access_offline", $group['g_access_offline'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can view member profiles and the member list?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_mem_info", $group['g_mem_info'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can view other members topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_other_topics", $group['g_other_topics'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can use search?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_use_search", $group['g_use_search'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Number of seconds for search flood control</b><br>Stops search abuse, enter 0 or leave blank for no flood control" ,
+												  $ibforums->adskin->form_input("g_search_flood", $group['g_search_flood'] )
+									     )      );
+									     
+		list( $limit, $flood ) = explode( ":", $group['g_email_limit'] );					     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can email members from the board?</b><br />Leave bottom section blank to remove limits $guest_legend</b>" ,
+												  $ibforums->adskin->form_yes_no("g_email_friend", $group['g_email_friend'] )
+												 ."<br />Only allow ". $ibforums->adskin->form_simple_input("join_limit", $limit, 2 )." emails in a 24hr period"
+												 ."<br />...and only allow 1 email every ".$ibforums->adskin->form_simple_input("join_flood", $flood, 2 )." minutes"
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can edit own profile info?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_edit_profile", $group['g_edit_profile'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can use PM system?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_use_pm", $group['g_use_pm'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Max. Number users allowed to mass PM?$guest_legend<br>(Enter 0 or leave blank to disable mass PM)" ,
+												  $ibforums->adskin->form_input("g_max_mass_pm", $group['g_max_mass_pm'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Max. Number of storable messages?$guest_legend" ,
+												  $ibforums->adskin->form_input("g_max_messages", $group['g_max_messages'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Posting Permissions", "Restrict where this group can post" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can post new topics (where allowed)?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_post_new_topics", $group['g_post_new_topics'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can reply to OWN topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_reply_own_topics", $group['g_reply_own_topics'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can reply to OTHER members topics (where allowed)?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_reply_other_topics", $group['g_reply_other_topics'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can edit own posts?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_edit_posts", $group['g_edit_posts'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Edit time restriction (in minutes)?$guest_legend<br>Denies user edit after the time set has passed. Leave blank or enter 0 for no restriction" ,
+												  $ibforums->adskin->form_input("g_edit_cutoff", $group['g_edit_cutoff'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow user to remove 'Edited by' legend?$guest_legend</b>" ,
+												  $ibforums->adskin->form_yes_no("g_append_edit", $group['g_append_edit'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can delete own posts?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_delete_own_posts", $group['g_delete_own_posts'] )
+									     )      );
+									     						     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can open/close own topics?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_open_close_posts", $group['g_open_close_posts'] )
+									     )      );							     
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can edit own topic title & description?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_edit_topic", $group['g_edit_topic'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can delete own topics?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_delete_own_topics", $group['g_delete_own_topics'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can start new polls (where allowed)?$guest_legend</b>" ,
+												  $ibforums->adskin->form_yes_no("g_post_polls", $group['g_post_polls'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can vote in polls (where allowed)?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_vote_polls", $group['g_vote_polls'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can avoid flood control?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_avoid_flood", $group['g_avoid_flood'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can avoid moderation queues?</b>" ,
+												  $ibforums->adskin->form_yes_no("g_avoid_q", $group['g_avoid_q'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can add events to the calendar?$guest_legend</b>" ,
+												  $ibforums->adskin->form_yes_no("g_calendar_post", $group['g_calendar_post'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can post HTML?$guest_legend</b><br />".$ibforums->adskin->js_help_link('mg_dohtml') ,
+												  $ibforums->adskin->form_yes_no("g_dohtml", $group['g_dohtml'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can bypass the bad word filter?$guest_legend</b><br />" ,
+												  $ibforums->adskin->form_yes_no("g_bypass_badwords", $group['g_bypass_badwords'] )
+									     )      );
+									     					     							     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Moderation Permissions", "Allow or deny this group moderation abilities" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Is Super Moderator (can moderate anywhere)?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_is_supmod", $group['g_is_supmod'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can access the Admin CP?$guest_legend" ,
+												  $ibforums->adskin->form_yes_no("g_access_cp", $group['g_access_cp'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Allow user group to post in 'closed' topics?" ,
+												  $ibforums->adskin->form_yes_no("g_post_closed", $group['g_post_closed'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Group Promotion" );
+		
+		if ($group['g_id'] == $ibforums->vars['admin_group'])
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Choose 'Don't Promote' to disable promotions</b><br>".$ibforums->adskin->js_help_link('mg_promote') ,
+													  "Feature disable for the root admin group, after all - if you're at the top where can you be promoted to?"
+											 )      );
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Choose 'Don't Promote' to disable promotions</b>$guest_legend<br>".$ibforums->adskin->js_help_link('mg_promote') ,
+													  'Promote members of this group to: '.$ibforums->adskin->form_dropdown("g_promotion_id", $all_groups, $group['g_promotion_id'] )
+													 .'<br>when they reach '.$ibforums->adskin->form_simple_input('g_promotion_posts', $group['g_promotion_posts'] ).' posts'
+											 )      );
+		}
+		
+									     
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+			
+			
+	}
+
+	//-----------------------------------------
+	//
+	// Show "Management Screen
+	//
+	//-----------------------------------------
+	
+	function main_screen()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "User Groups";
+		
+		$ibforums->admin->page_detail = "User Grouping is a quick and powerful way to organise your members. There are 4 preset groups that you cannot remove (Validating, Guest, Member and Admin) although you may edit these at will. A good example of user grouping is to set up a group called 'Moderators' and allow them access to certain forums other groups do not have access to.<br>Forum access allows you to make quick changes to that groups forum read, write and reply settings. You may do this on a forum per forum basis in forum control.";
+		
+		$g_array = array();
+		
+		$ibforums->adskin->td_header[] = array( "Group Title"    , "30%" );
+		$ibforums->adskin->td_header[] = array( "Access ACP?"    , "15%" );
+		$ibforums->adskin->td_header[] = array( "Super Mod?"     , "15%" );
+		$ibforums->adskin->td_header[] = array( "Members"        , "10%" );
+		$ibforums->adskin->td_header[] = array( "Edit Group"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Delete"         , "10%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "User Group Management" );
+		
+		$DB->cache_add_query( 'groups_main_screen', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+		
+			$del  = '&nbsp;';
+			$mod  = '&nbsp;';
+			$adm  = '&nbsp;';
+			
+			if ($r['g_id'] > 4)
+			{
+				$del = "<center><a href='{$ibforums->base_url}&act=group&code=delete&id=".$r['g_id']."'>Delete</a></center>";
+			}
+			//-----------------------------------------
+			if ($r['g_access_cp'] == 1)
+			{
+				$adm = '<center><span style="color:red">Yes</span></center>';
+			}
+			//-----------------------------------------
+			if ($r['g_is_supmod'] == 1)
+			{
+				$mod = '<center><span style="color:red">Yes</span></center>';
+			}
+			
+			if ($r['g_id'] != 1 and $r['g_id'] != 2)
+			{
+				$total_linkage = "<a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?act=Members&max_results=30&filter={$r['g_id']}&sort_order=asc&sort_key=name&st=0' target='_blank' title='List Users'>".$r['prefix'].$r['g_title'].$r['suffix']."</a>";
+			}
+			else
+			{
+				$total_linkage = $r['prefix'].$r['g_title'].$r['suffix'];
+			}
+			
+			if ( $ibforums->vars['admin_group'] == $r['g_id'] )
+			{
+				$is_root = " ( ROOT )";
+			}
+			else
+			{
+				$is_root = "";
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>$total_linkage</b> $is_root" ,
+												      $adm,
+												      $mod,
+												      "<center>".$r['count']."</center>",
+												      "<center><a href='{$ibforums->base_url}&act=group&code=edit&id=".$r['g_id']."'>Edit Group</a></center>",
+												      $del
+												      
+									     )      );
+									     
+			$g_array[] = array( $r['g_id'], $r['g_title'] );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic("&nbsp;", "center", "tdrow1");
+
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'add' ),
+												  2 => array( 'act'   , 'group'     ),
+									     )      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Add a new member group" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Base new group on...</b>" ,
+												  $ibforums->adskin->form_dropdown("id", $g_array, 3 )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Set up New Group");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+		
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_help.php b/upload/sources/admin/ad_help.php
new file mode 100644
index 00000000..ac347cc9
--- /dev/null
+++ b/upload/sources/admin/ad_help.php
@@ -0,0 +1,298 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Help Control functions
+|   > Module written by Matt Mecham
+|   > Date started: 2nd April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_help
+{
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'edit':
+				$this->show_form('edit');
+				break;
+			case 'new':
+				$this->show_form('new');
+				break;
+			
+			case 'doedit':
+				$this->doedit();
+				break;
+				
+			case 'donew':
+				$this->doadd();
+				break;
+				
+			case 'remove':
+				$this->remove();
+				break;
+			
+			//-----------------------------------------
+			default:
+				$this->list_files();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// HELP FILE FUNCTIONS
+	//-----------------------------------------
+	
+	function doedit()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must pass a valid emoticon id, silly!");
+		}
+		
+		$text  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['text'] ) );
+		//$title = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['title'] ) );
+		$desc  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['description'] ) );
+		
+		$text  = preg_replace( "/\\\/", "&#092;", $text );
+		
+		$DB->do_update( 'faq', array( 'title'       => $ibforums->input['title'],
+									  'text'        => $text,
+									  'description' => $desc,
+							 ) , "id=".intval($ibforums->input['id'])     );
+		
+		$ibforums->admin->save_log("Edited help files");
+		
+		$std->boink_it($ibforums->adskin->base_url."&act=help");
+		exit();
+			
+		
+	}
+	
+	//=====================================================
+	
+	
+	function show_form($type='new')
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You may add/edit and remove help files below.";
+		$ibforums->admin->page_title  = "Help File Management";
+		
+		//-----------------------------------------
+		
+		if ($type != 'new')
+		{
+		
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("You must pass a valid help file id, silly!");
+			}
+		
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'faq', 'where' => "id=".intval($ibforums->input['id']) ) );
+			$DB->simple_exec();
+		
+			if ( ! $r = $DB->fetch_row() )
+			{
+				$ibforums->admin->error("We could not find that help file in the database");
+			}
+		
+			//-----------------------------------------
+			
+			$button = 'Edit this Help File';
+			$code   = 'doedit';
+		}
+		else
+		{
+			$r = array();
+			$button = 'Add this Help File';
+			$code   = 'donew';
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $code ),
+												  2 => array( 'act'   , 'help'     ),
+												  3 => array( 'id'    , $ibforums->input['id'] ),
+									     )      );
+		
+		
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "20%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "80%" );
+		
+		$r['text'] = preg_replace( "/<br>/i", "\n", stripslashes($r['text']) );
+ 		
+ 		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $button );
+		
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Help File Title",
+												  $ibforums->adskin->form_input('title'  , stripslashes($r['title']) ),
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Help File Description",
+												  $ibforums->adskin->form_textarea('description', stripslashes($r['description']) ),
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Help File Text",
+												  $ibforums->adskin->form_textarea('text', $r['text'], "60", "10" ),
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//=====================================================
+	
+	function remove()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must pass a valid help file id, silly!");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'faq', 'where' => "id=".$ibforums->input['id'] ) );
+	
+		$ibforums->admin->save_log("Removed a help file");
+		
+		$std->boink_it($ibforums->adskin->base_url."&act=help");
+		exit();
+			
+		
+	}
+	
+	//=====================================================
+	
+	function doadd()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ($ibforums->input['title'] == "")
+		{
+			$ibforums->admin->error("You must enter a title, silly!");
+		}
+		
+		
+		
+		$text  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['text'] ) );
+		$title = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['title'] ) );
+		$desc  = preg_replace( "/\n/", "<br>", stripslashes($HTTP_POST_VARS['description'] ) );
+		
+		$text  = preg_replace( "/\\\/", "&#092;", $text );
+		
+		$DB->do_insert( 'faq', array( 'title'       => $title,
+									  'text'        => $text,
+									  'description' => $desc,
+							 )      );
+												  
+		$ibforums->admin->save_log("Added a help file");
+		
+		$std->boink_it($ibforums->adskin->base_url."&act=help");
+		exit();
+			
+		
+	}
+	
+	//=====================================================
+	
+	function list_files()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You may add/edit and remove help files below.";
+		$ibforums->admin->page_title  = "Help File Management";
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Title"  , "50%" );
+		$ibforums->adskin->td_header[] = array( "Edit"   , "30%" );
+		$ibforums->adskin->td_header[] = array( "Remove" , "20%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Current Help Files" );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'faq', 'order' => "id" ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $r = $DB->fetch_row() )
+			{
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".stripslashes($r['title'])."</b><br>".stripslashes($r['description']),
+														  "<center><a href='".$ibforums->adskin->base_url."&act=help&code=edit&id={$r['id']}'>Edit</a></center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=help&code=remove&id={$r['id']}'>Remove</a></center>",
+												 )      );
+												   
+			
+				
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic("<a href='".$ibforums->adskin->base_url."&act=help&code=new'>Add New Help File</a>", "center", "title" );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_imagemacros.php b/upload/sources/admin/ad_imagemacros.php
new file mode 100644
index 00000000..2b01c859
--- /dev/null
+++ b/upload/sources/admin/ad_imagemacros.php
@@ -0,0 +1,470 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Skin -> Image Macro functions
+|   > Module written by Matt Mecham
+|   > Date started: 4th April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_imagemacros {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'edit':
+				$this->show_macros();
+				break;
+				
+			case 'doedit':
+				$this->edit_set_name();
+				break;
+				
+			case 'macroremove':
+				$this->macro_remove();
+				break;
+				
+			case 'doeditmacro':
+				$this->macro_edit();
+				break;
+				
+			case 'doaddmacro':
+				$this->macro_add();
+				break;
+				
+			default:
+				print "No action"; exit();
+				break;
+		}
+	}
+	
+	//-----------------------------------------
+	// Remove macro
+	//-----------------------------------------
+	
+	function macro_remove()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing macro ID, go back and try again");
+		}
+		
+		$id = intval($ibforums->input['id']);
+		$p  = intval($ibforums->input['p']);
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_macro', 'where' => "macro_id='".$ibforums->input['mid']."'" ) );
+		
+		//-----------------------------------------
+		// Recache macros
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_recache_macros($id, $p);
+		
+		//-----------------------------------------
+		// Bounce back
+		//-----------------------------------------
+		
+		$ibforums->input['id'] = $id;
+		$ibforums->main_msg = "Macro removed!";
+		$this->show_macros();
+	}
+	
+	//-----------------------------------------
+	// Apply the edit to the DB
+	//-----------------------------------------
+	
+	function macro_edit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing image set ID, go back and try again");
+		}
+		
+		$id = intval($ibforums->input['id']);
+		$p  = intval($ibforums->input['p']);
+		
+		$key = $DB->add_slashes( $std->txt_safeslashes($_POST['variable']) );
+		$val = $DB->add_slashes( $std->txt_UNhtmlspecialchars($std->txt_safeslashes($_POST['replacement']) ) );
+		
+		//-----------------------------------------
+		// Get macro for examination..
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_macro', 'where' => "macro_id='".$ibforums->input['mid']."'" ) );
+		$DB->simple_exec();
+		
+ 		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not retrieve the record from the DB");
+		}
+		
+		//-----------------------------------------
+		// Is this our macro set?
+		//-----------------------------------------
+		
+		if ( $row['macro_set'] == $id )
+		{
+			//-----------------------------------------
+			// Okay, update...
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'update' => 'skin_macro', 'set' => "macro_value='$key', macro_replace='$val'", 'where' => "macro_id=".$ibforums->input['mid'] ) );
+			$DB->simple_exec();
+		}
+		else
+		{
+			//-----------------------------------------
+			// No? OK - best add it as a 'new' macro
+			//-----------------------------------------
+			
+			$DB->manual_addslashes = 1;
+			$DB->do_insert( 'skin_macro', array (
+												'macro_value'         => $key,
+												'macro_replace'       => $val,
+												'macro_can_remove'    => 1,
+												'macro_set'           => $id
+										)      );
+										
+			$DB->manual_addslashes = 0;
+		}
+		
+		
+		//-----------------------------------------
+		// Recache macros
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_recache_macros($id, $p);
+		
+		//-----------------------------------------
+		// Bounce back
+		//-----------------------------------------
+		
+		$ibforums->input['id'] = $id;
+		$this->show_macros();
+	}
+	
+	//-----------------------------------------
+	// ADD MACRO
+	//-----------------------------------------
+	
+	function macro_add()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing macro set ID, go back and try again");
+		}
+		
+		$id = intval($ibforums->input['id']);
+		$p  = intval($ibforums->input['p']);
+		
+		$DB->do_insert( 'skin_macro', array (
+											 'macro_value'         => $std->txt_safeslashes($_POST['variable']),
+											 'macro_replace'       => $std->txt_UNhtmlspecialchars($std->txt_safeslashes($_POST['replacement'])),
+											 'macro_can_remove'    => 1,
+											 'macro_set'           => $id
+									 )      );
+		
+		//-----------------------------------------
+		// Recache macros
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_recache_macros($id, $p);
+		
+		//-----------------------------------------
+		// Bounce back
+		//-----------------------------------------
+		
+		$ibforums->input['id'] = $id;
+		$this->show_macros();
+		
+	}
+	
+	
+	
+	//-----------------------------------------
+	// Show macros
+	//-----------------------------------------
+	
+	function show_macros()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing macro set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		$this_set      = "";
+		
+		if ( $ibforums->input['p'] > 0 )
+		{
+			$in = ','.$ibforums->input['p'];
+		}
+		
+		//-----------------------------------------
+		// Get macros
+		//-----------------------------------------
+		
+		$macros = $ibforums->cache_func->_get_macros($ibforums->input['id'], $ibforums->input['p']);
+		
+		//-----------------------------------------
+		// Get img_dir this set is using...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_skin_set_id='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		$skin = $DB->fetch_row();
+		
+		$ibforums->admin->page_detail = "To edit a macro, simply click on the 'edit' link of the appropriate macro.";
+										 
+		$ibforums->admin->page_title  = "Manage Replacement Macros in Set: {$skin['set_name']}";
+		
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->js_no_specialchars();
+		$ibforums->html .= $ibforums->adskin->js_checkdelete();
+		
+													  
+		$ibforums->html .= "<script type='text/javascript'>
+							function editmacro(id, variable, replace)
+							{
+								document.macroform.code.value         = 'doeditmacro';
+								document.macroform.submitbutton.value = 'Edit This Macro';
+								document.macroform.mid.value          = id;
+								document.macroform.variable.value     = variable;
+								document.macroform.replacement.value  = replace;
+								scroll(0,0);
+								togglediv( 'popbox', 1 );
+								return false;
+							}
+							function addmacro(id)
+							{
+								document.macroform.code.value         = 'doaddmacro';
+								document.macroform.submitbutton.value = 'Add This Macro';
+								document.macroform.mid.value          = id;
+								document.macroform.variable.value     = '';
+								document.macroform.replacement.value  = '';
+								scroll(0,0);
+								togglediv( 'popbox', 1 );
+								return false;
+							}
+							function removemacro(url)
+							{
+								checkdelete(url);
+							}
+							</script>
+							<div class='tableborder'>
+							<div class='maintitle'>
+							<div align='center' style='position:absolute;width:99%;display:none;text-align:center' id='popbox'>
+							 <form name='macroform' action='{$ibforums->adskin->base_url}' method='post'>
+							 <input type='hidden' name='act' value='image' />
+							 <input type='hidden' name='code' value='' />
+							 <input type='hidden' name='mid' value='' />
+							 <input type='hidden' name='id' value='{$ibforums->input['id']}' />
+							 <input type='hidden' name='p' value='{$ibforums->input['p']}' />
+							 <table cellspacing='0' width='500' align='center' cellpadding='6' style='background:#EEE;border:2px outset #555;'>
+							 <tr>
+							  <td width='1%' nowrap='nowrap' valign='top'>
+							   <b>Variable</b><br><input class='textinput' name='variable' type='text' size='20' />
+							   <br /><br />
+							   <center><input type='submit' class='realbutton' value='Edit Macro' name='submitbutton' /> <input type='button' class='realdarkbutton' value='Close' onclick=\"togglediv('popbox');\" /></center>
+							  </td>
+							  <td width='99%'><b>Replacement</b><br /><textarea class='textinput' name='replacement' style='width:100%;height:50px'></textarea></td>
+							 </tr>
+							 </table>
+							 </form>
+							</div>
+							<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							<tr>
+							<td align='left' width='100%' style='font-weight:bold;font-size:11px;color:#FFF'>Manage Replacement Macros</td>
+							<td align='right' nowrap='nowrap' style='padding-right:2px'><input type='button' class='realdarkbutton' value='Add Macro' onclick=\"addmacro('{$ibforums->input['id']}');\" /></td>
+							</tr>
+							</table>
+							</div>
+							</div>
+							
+						   ";
+			
+		$ibforums->html .= "<div class='tableborder'>\n<div class='tablepad'>\n<table width='100%' cellspacing='0' cellpadding='0' border='0'>";											  
+		
+		$this->unaltered    = "<img src='{$ibforums->skin_url}/skin_item_unaltered.gif' border='0' alt='-' title='Unaltered from parent skin set' />&nbsp;";
+		$this->altered      = "<img src='{$ibforums->skin_url}/skin_item_altered.gif' border='0' alt='+' title='Altered from parent skin set' />&nbsp;";
+		$this->inherited    = "<img src='{$ibforums->skin_url}/skin_item_inherited.gif' border='0' alt='|' title='Inherited from parent skin set' />&nbsp;";
+		
+		//-----------------------------------------
+		// Loop and print
+		//-----------------------------------------
+		
+		foreach( $macros as $name => $row )
+		{
+			$real = $std->txt_htmlspecialchars( $row['macro_replace'] );
+			
+			//-----------------------------------------
+			// Altered?
+			//-----------------------------------------
+			
+			if ( $row['macro_set'] == $ibforums->input['id'] )
+			{
+				$altered_image = $this->altered;
+				$css_info      = '#FFDCD8';
+			}
+			else if ( $row['macro_set'] == 1 )
+			{
+				$altered_image = $this->unaltered;
+				$css_info      = '#EEE';
+			}
+			else
+			{
+				$altered_image = $this->inherited;
+				$css_info      = '#FFF2D3';
+			}
+			
+			//-----------------------------------------
+			// Figure out quotes
+			//-----------------------------------------
+			
+			$out_quote = '"';
+			$in_quote  = "'";
+			
+			if ( preg_match( "/&#039;/", $real ) )
+			{
+				$out_quote = "'";
+				$in_quote  = '"';
+			}
+			
+			$preview = str_replace( "<#IMG_DIR#>", $skin['set_image_dir'], $row['macro_replace'] );
+			
+			if ( $row['macro_set'] > 1 and $row['macro_set'] == $ibforums->input['id'] )
+			{
+				$remove_button = "<input type='button' class='realbutton' name='remove' value='Revert' onclick=\"removemacro('act=image&code=macroremove&mid={$row['macro_id']}&id={$ibforums->input['id']}&p={$ibforums->input['p']}');\" />";
+			}
+			else
+			{
+				$remove_button = "";
+			}
+			
+			//-----------------------------------------
+			// Not an image?
+			//-----------------------------------------
+			
+			if ( ! preg_match( "#img\s{1,}src=#i", $row['macro_replace'] ) )
+			{
+				$preview = substr( $real, 0, 200 );
+			}
+			
+			$edit_button = "<input type='button' class='realbutton' value='Change' onclick={$out_quote}editmacro( {$in_quote}{$row['macro_id']}{$in_quote}, {$in_quote}{$row['macro_value']}{$in_quote}, {$in_quote}$real{$in_quote});{$out_quote} />";
+			
+			//-----------------------------------------
+			// Render row
+			//-----------------------------------------
+			
+			$style = "padding:4px;border-bottom:1px solid #DDD;background:{$css_info}";
+			
+			$ibforums->html .= "<tr>
+								 <!--<td style='$style' align='center' width='1%'><img src='{$ibforums->skin_url}/skin_macro.gif' alt='Macro' title='ID: {$row['macro_id']}' style='vertical-align:middle' /></td>-->
+								 <td style='$style' align='left' width='1%' nowrap='nowrap'>$altered_image
+								  &nbsp;&lt;{<span style='font-size:11px;font-weight:bold' title='ID: {$row['macro_id']}. SET: {$row['macro_set']}' href='#' >{$row['macro_value']}</span>}&gt;
+								  </td>
+								 <td style='$style;padding-right:3px;text-align:center;' align='center' width='99%' align='center'>$preview</td>
+								 <td style='$style' align='right' width='40%' nowrap='nowrap'>$remove_button $edit_button</td>
+								</tr>
+								
+								";
+		}
+									     
+										 
+		$ibforums->html .= "</table>
+						   </div>
+						   <div class='pformstrip' align='center'>
+						    <input type='button' class='realdarkbutton' value='Add Macro' onclick=\"addmacro('{$ibforums->input['id']}');\" />
+						   </div>
+						   </div>";
+		
+		$ibforums->html .= $ibforums->adskin->skin_jump_menu_wrap();
+		
+		//-----------------------------------------
+		// Show altered / unaltered
+		// legend
+		//-----------------------------------------
+		
+		$ibforums->html .= "<br />
+							<div><strong>Replace Macro Example</strong><br />
+							If you added a key of 'green_font' and a replacement of '&lt;font color='green'>', each instance of <span style='color:red'><b>&lt;{green_font}&gt;</b></span> would be converted to &lt;font color='green'>
+							<br /><b>&lt;#IMG_DIR#></b> is available to any macro, this is automatically replaced with the name of the image directory you choose when using this macro set in a skin
+							</div><br />
+							<div><strong>Replacement Macro Legend:</strong><br />
+							{$this->altered} This item has been customized for this skin set.
+							<br />{$this->unaltered} This item has not been customized from the master skin set.
+							<br />{$this->inherited} This item has inherited customizations from the parent skin set.
+							</div>";
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( '' ,'Editing Replacement Macros in Set '.$skin['set_name'] );
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_index.php b/upload/sources/admin/ad_index.php
new file mode 100644
index 00000000..a8d03c44
--- /dev/null
+++ b/upload/sources/admin/ad_index.php
@@ -0,0 +1,604 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin "welcome" screen functions
+|   > Module written by Matt Mecham
+|   > Date started: 1st march 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_index {
+
+	var $mysql_version = "";
+	
+	function auto_run()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title  = "Welcome to the Invision Power Board Administration CP";
+		$ibforums->admin->page_detail = "Clicking on one of the links in the left menu pane will show you the relevant options for that administration category.<br />Each option will contain further information on configuration, etc.";
+		
+		
+		//-----------------------------------------
+		// Get MySQL & PHP Version
+		//-----------------------------------------
+		
+		$DB->sql_get_version();
+   		
+   		$phpv = phpversion();
+   		
+   		$phpmethod = @php_sapi_name();
+   		
+   		//-----------------------------------------
+   		// Upgrade history?
+   		//-----------------------------------------
+   		
+   		$upgrade_history = array();
+   		$latest_version  = array();
+   		
+   		$DB->simple_construct( array( 'select' => '*', 'from' => 'upgrade_history', 'order' => 'upgrade_version_id DESC' ) );
+   		$DB->simple_exec();
+   		
+   		while( $r = $DB->fetch_row() )
+   		{
+   			if ( $r['upgrade_version_id'] > $latest_version['upgrade_version_id'] )
+   			{
+   				$latest_version = $r;
+   			}
+   			
+   			$upgrade_history[] = $r;
+   		}
+   		
+		//-----------------------------------------
+		// Got reg code?
+		//-----------------------------------------
+		
+		$reg_html = "";
+		$reg_end  = "";
+		
+		//-----------------------------------------
+		// Got real version number?
+		//-----------------------------------------
+		
+		if ( $ibforums->version == 'v2.0.0 ' )
+		{
+			$ibforums->version = 'v'.$latest_version['upgrade_version_human'];
+		}
+		
+		if ( $ibforums->acpversion == '20010' )
+		{
+			$ibforums->acpversion = $latest_version['upgrade_version_id'];
+		}
+		
+		$version_info = "<a href='http://www.invisionboard.com/download.cgi' target='_blank'><img border='0' src='http://www.invisionboard.com/acp/versioncheck/?v={$ibforums->acpversion}' vspace='10'></a>
+		<br /><b><a href='http://www.php.net' target='_blank'>PHP</a> VERSION:</b> $phpv ($phpmethod), <b>SQL:</b> (".strtoupper(SQL_DRIVER).") ".$DB->true_version."
+		<br />IPB Version {$ibforums->version} (ID: {$ibforums->acpversion})";
+		
+		if ( $ibforums->vars['ipb_reg_number'] )
+		{
+			list( $a, $b, $c, $d, $e ) = explode( '-', $ibforums->vars['ipb_reg_number'] );
+			
+			if ( strlen($e) > 9 )
+			{
+				$reg_end = "Registered until: <span style='color:green'>". $ibforums->admin->get_date( $e, 'SHORT' )."</span>";
+			}
+			else
+			{
+				$reg_end = "Registered for life";
+			}
+			
+			$reg_html = "<div style='border:1px dotted #555;padding:6px;background-color:#EEF2F7;'>
+							<b style='font-size:12px;color:#336699'>Registered Invision Power Board</b>
+							<br />Thank you for registering your Invision Power Board!
+							<br /><br />Please visit your <a href='http://customer.invisionpower.com' target='_blank'>client area</a> for news, updates and support.
+							<br />$reg_end
+						</div>";
+		}
+		else
+		{
+			$reg_html = "<div style='border:1px dotted #555;padding:6px;background-color:#EEF2F7;'>
+							<b style='font-size:12px;color:#AA0000'>Unregistered Invision Power Board</b>
+							<br />This copy of Invision Power Board is unregistered.
+							<br /><br />Why register? <a href='http://www.invisionboard.com/?whyregister' target='_blank'>click here</a> to find out!
+							<br />Go on, <a href='http://www.invisionboard.com/download.cgi?subc=register' target='_blank'> register today!</a> you know it makes sense!
+						</div>";
+		}
+		
+		//-----------------------------------------
+		// Notepad
+		//-----------------------------------------
+		
+		if ( $ibforums->input['save'] == 1 )
+		{
+			$DB->do_update( 'cache_store', array( 'cs_value' => $std->txt_stripslashes($_POST['notes']) ), "cs_key='adminnotes'" );
+		}
+		
+		$text = "You can use this section to keep notes for yourself and other admins, etc.";
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='adminnotes'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $notes = $DB->fetch_row() )
+		{
+			$DB->do_insert( 'cache_store', array( 'cs_key' => 'adminnotes', 'cs_value' => $text ) );
+		
+			$notes = array( 'cs_key' => 'adminnotes', 'cs_value' => $text );
+		}
+		
+		$ad_notes = "<form action='{$ibforums->base_url}&act=index&save=1' method='post'>
+					 <textarea name='notes' style='background-color:#F9FFA2;border:1px solid #CCC;width:95%;font-family:verdana;font-size:10px' rows='7' cols='25'>".stripslashes($notes['cs_value'])."</textarea>
+				     <div align='center'><input type='submit' value='Save Admin Notes' style='background-color:#F9FFA2;border:1px solid #999;;font-family:verdana;font-size:10px' /></div>
+				     </form>";
+		
+		//-----------------------------------------
+		// Printy-poos
+		//-----------------------------------------
+		
+		$ibforums->html .= "<table width='100%' border='0' cellpadding='0' cellspacing='0'>
+						 <tr>
+						  <td width='49%' valign='middle' align='center' style='padding:6px;background-color:#FAFFAF;'>{$ad_notes}</td>
+						  <td style='width:10px'>&nbsp;</td>
+						  <td width='49%' valign='top' align='left'>{$version_info}<br /><br />{$reg_html}</td>
+						 </tr>
+						 </table><br />\n";
+		
+		//-----------------------------------------
+		// Make sure the uploads path is correct
+		//-----------------------------------------
+		
+		$uploads_size = 0;
+		
+		if ($dh = opendir( $ibforums->vars['upload_dir'] ))
+		{
+			while ( $file = readdir( $dh ) )
+			{
+				if ( !preg_match( "/^..?$|^index/i", $file ) )
+				{
+					$uploads_size += @filesize( $ibforums->vars['upload_dir'] . "/" . $file );
+				}
+			}
+			closedir( $dh );
+		}
+		
+		// This piece of code from Jesse's (jesse@jess.on.ca) contribution
+		// to the PHP manual @ php.net
+		
+		if ($uploads_size >= 1048576)
+		{
+			$uploads_size = round($uploads_size / 1048576 * 100 ) / 100 . " mb";
+		}
+		else if ($uploads_size >= 1024)
+		{
+			$uploads_size = round($uploads_size / 1024 * 100 ) / 100 . " k";
+		}
+		else
+		{
+			$uploads_size = $uploads_size . " bytes";
+		}
+		
+		//-----------------------------------------
+		// Trashed skin?
+		//-----------------------------------------
+		
+		$skinmsg = $DB->simple_exec_query( array( "select" => '*', 'from' =>  "cache_store", "where" => "cs_key='skinpanic'" ) );
+		
+		if ( $skinmsg['cs_value'] == 'rebuildemergency' )
+		{
+			$ibforums->html .= "<div style='color:red;border:1px solid red;background:#FFC0C3;padding:10px'>
+								<span style='font-size:20px;font-weight:bold'>Warning: A Skin error occured</span>
+								<br /><br />
+								Either you or one of your members encountered a skin error. The following took place
+								automatically:
+								<ul>
+								 <li>They were asked to clear their skin settings</li>
+								 <li>They were asked to click a link to attempt access in the ACP</li>
+								 <li>The ACP picked up the skin error and rebuilt the skin ID cache, the default skin and it may have turned on safe mode skins</li>
+								</ul>
+								<b>What to do now</b>
+								<ul>
+								 <li>Firstly, if you don't wish to use safe mode skins, check the CHMOD value of the 'skin_cache' directory to make sure IPB can write into that directory</li>
+								 <li>If the permissions are correct, check your 'System Settings -&gt; General Configuration' settings to check the value of 'Safe Mode Skins' - disable if not required</li>
+								 <li>As a precaution, rebuild all your skins by following the link below</li>
+								</ul>
+								<b>&gt;&gt; <a href='{$ibforums->base_url}&act=sets&code=rebuildalltemplates&removewarning=1'>REBUILD ALL SKIN CACHES & REMOVE THIS WARNING</a> &lt;&lt;</b>
+								</div><br /><br />";
+		}
+		
+		if ( $skinmsg['cs_value'] == 'rebuildupgrade' )
+		{
+			$ibforums->html .= "<div style='color:red;border:1px solid red;background:#FFC0C3;padding:10px'>
+								<span style='font-size:20px;font-weight:bold'>An upgrade has been performed</span>
+								<br /><br />
+								You'll need to update all your skin caches to ensure the new template bits have been added correctly.
+								<br /><br /><b>&gt;&gt; <a href='{$ibforums->base_url}&act=sets&code=rebuildalltemplates&removewarning=1'>REBUILD ALL SKIN CACHES & REMOVE THIS WARNING</a> &lt;&lt;</b>
+								</div><br /><br />";
+		}
+		
+		//-----------------------------------------
+		// INSTALLER PRESENT?
+		//-----------------------------------------
+		
+		$sm_install = 0;
+		$lock_file  = 0;
+		
+		if ( @file_exists( ROOT_PATH . 'sm_install.php' ) )
+		{
+			$sm_install = 1;
+		}
+		
+		if ( @file_exists( ROOT_PATH . 'install.lock' ) )
+		{
+			$lock_file = 1;
+		}
+		
+		if ( $sm_install == 1 ) 
+		{
+			if ( $lock_file != 1 )
+			{
+				$ibforums->html .= "<div style='color:red;border:1px solid red;background:#FFC0C3;padding:10px'>
+				                   <span style='font-size:20px;font-weight:bold'>Warning: Unlocked Installer Still Present</span>
+				                   <br /><br /><span style='font-size:14px;'>Remove <b>sm_install.php</b> from your server at once!
+				                   <br />Leaving it on your server WILL compromise the security of your system.</span></div><br /><br />";
+			}
+			else
+			{
+				$ibforums->html .= "<div style='color:red;border:1px solid red;background:#FFE1E2;padding:10px'>
+				                   <span style='font-size:14px;font-weight:bold'>Warning: Installer Still Present</span>
+				                   <br /><br /><span style='font-size:10px;'>Although the installer appears to be locked, we recommend you remove it
+				                   from your server for security.
+				                   <br />Simply remove <b>sm_install.php</b> from your installation to remove this message.</span></div><br /><br />";
+			}
+		}
+		
+		
+		//-----------------------------------------
+		// BOARD OFFLINE?
+		//-----------------------------------------
+		
+		if ($ibforums->vars['board_offline'])
+		{
+			
+			$ibforums->adskin->td_header[] = array( "&nbsp;", "100%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Offline Notice" );
+			
+
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "Your board is currently offline<br><br>&raquo; <a href='{$ibforums->base_url}&act=op&code=findsetting&key=boardoffline%2Fonline'>Turn Board Online</a>"
+											 )      );
+											 
+			$ibforums->html .= $ibforums->adskin->end_table();
+		
+			$ibforums->html .= $ibforums->adskin->add_td_spacer();
+		}
+		
+		//-----------------------------------------
+		// Quick clicks + Upgrade History
+		//-----------------------------------------
+		
+		$ibforums->html .= "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+						    <tr>
+						     <td width='49%' valign='top'>";
+						     
+		$ibforums->html .= $ibforums->adskin->start_form();
+		
+		$ibforums->adskin->td_header[] = array( "{none}"  , "30%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "30%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Quick Clicks" );
+		
+		$ibforums->html .= "
+				
+					<script language='javascript'>
+					<!--
+					  function edit_member() {
+						
+						if (document.forms[1].username.value == \"\") {
+							alert(\"You must enter a username!\");
+						} else {
+							window.parent.body.location = '{$ibforums->adskin->base_url}' + '&act=mem&code=searchresults&searchtype=normal&name=' + escape(document.forms[1].username.value);
+						}
+					  }
+					  
+					  function new_forum() {
+						
+						if (document.forms[1].forum_name.value == \"\") {
+							alert(\"You must enter a forum name!\");
+						} else {
+							window.parent.body.location = '{$ibforums->adskin->base_url}' + '&act=forum&code=new&name=' + escape(document.forms[1].forum_name.value);
+						}
+					  }
+					  
+					  function phplookup() {
+						
+						if (document.forms[1].phpfunc.value == \"\") {
+							alert(\"You must enter a PHP function!\");
+						} else {
+							window.parent.body.location = 'http://www.php.net/' + escape(document.forms[1].phpfunc.value);
+						}
+					  }
+					//-->
+					
+					</script>
+					<form name='DOIT' action=''>
+						
+		";
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Edit Member:",
+																 "<input type='text' style='width:100%' class='textinput' name='username' value='Enter name here' onfocus='this.value=\"\"'>",
+																 "<input type='button' value='Find Member' id='button' onClick='edit_member()'>"
+														)      );
+		
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Add New Forum:",
+																 "<input type='text' style='width:100%' name='forum_name' class='textinput' value='Forum title here' onfocus='this.value=\"\"'>",
+																 "<input type='button' value='Add Forum' id='button' onClick='new_forum()'>"
+														)      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "PHP Function:",
+																 "<input type='text' style='width:100%' name='phpfunc' class='textinput' value='PHP function here' onfocus='this.value=\"\"'>",
+																 "<input type='button' value='Look-up' id='button' onClick='phplookup()'>"
+														)      );
+		
+		$ibforums->html .= "</form>";
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "</td>
+		 				    <td style='width:10px'>&nbsp;</td>
+		 				    <td width='49%' valign='top'>";
+		 				    
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Upgrade History" );				    
+		
+		foreach( $upgrade_history as $r )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( $r['upgrade_version_human'] .' ('.$r['upgrade_version_id'].')',
+																	 $std->get_date( $r['upgrade_date'], 'SHORT' )
+															)      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "</td>
+							</tr>
+							</table>";
+		
+		//-----------------------------------------
+		// ADMINS USING CP
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Name"           , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP Address"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Log In"         , "20%" );
+		$ibforums->adskin->td_header[] = array( "Last Click"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Location"       , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Administrators using the CP" );
+		
+		$t_time = time() - 60*10;
+		
+		$DB->simple_construct( array( 'select' => 'session_member_name, session_location, session_log_in_time, session_running_time, session_ip_address',
+									  'from'   => 'admin_sessions',
+									  'where'  => "session_running_time > $t_time" ) );
+		$DB->simple_exec();
+		
+		$time_now = time();
+		
+		$seen_name = array();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $seen_name[ $r['session_member_name'] ] == 1 )
+			{
+				continue;
+			}
+			else
+			{
+				$seen_name[ $r['session_member_name'] ] = 1;
+			}
+			
+			$log_in = $time_now - $r['session_log_in_time'];
+			$click  = $time_now - $r['session_running_time'];
+			
+			if ( ($log_in / 60) < 1 )
+			{
+				$log_in = sprintf("%0d", $log_in) . " seconds ago";
+			}
+			else
+			{
+				$log_in = sprintf("%0d", ($log_in / 60) ) . " minutes ago";
+			}
+			
+			if ( ($click / 60) < 1 )
+			{
+				$click = sprintf("%0d", $click) . " seconds ago";
+			}
+			else
+			{
+				$click = sprintf("%0d", ($click / 60) ) . " minutes ago";
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array (
+														$r['session_member_name'],
+														"<center><a href='javascript:alert(\"Host Name: ".@gethostbyaddr($r['session_ip_address'])."\")' title='Get host name'>".$r['session_ip_address']."</a></center>",
+														"<center>".$log_in."</center>",
+														"<center>".$click."</center>",
+														"<center>".$r['session_location']."</center>",
+											 )       );
+		}
+		
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_spacer();
+		
+		//-----------------------------------------
+		
+		
+		if ($ibforums->member['mgroup'] == $ibforums->vars['admin_group'])
+		{
+			//-----------------------------------------
+			// LAST 5 Admin Actions
+			//-----------------------------------------
+			
+			$ibforums->adskin->td_header[] = array( "Member Name"            , "20%" );
+			$ibforums->adskin->td_header[] = array( "Action Performed"        , "40%" );
+			$ibforums->adskin->td_header[] = array( "Time of action"         , "20%" );
+			$ibforums->adskin->td_header[] = array( "IP address"             , "20%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Last 5 Admin Actions" );
+			
+			$DB->cache_add_query( 'index_admin_logs', array() );
+			$DB->cache_exec_query();
+			
+			if ( $DB->get_num_rows() )
+			{
+				while ( $rowb = $DB->fetch_row() )
+				{
+					$rowb['ctime'] = $ibforums->admin->get_date( $rowb['ctime'] );
+					
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$rowb['name']}</b>",
+															  "{$rowb['note']}",
+															  "{$rowb['ctime']}",
+															  "{$rowb['ip_address']}",
+													 )      );
+				
+				
+				}
+			}
+			else
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+			}
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+			
+			//-----------------------------------------
+			
+			$ibforums->html .= $ibforums->adskin->add_td_spacer();
+		}
+		
+		//-----------------------------------------
+		// Bots stuff
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['spider_sense'] )
+		{
+			//-----------------------------------------
+			// Get bot names
+			//-----------------------------------------
+			
+			foreach( explode( "\n", $ibforums->vars['search_engine_bots'] ) as $bot )
+			{
+				list($ua, $n) = explode( "=", $bot );
+				
+				$this->bot_map[ strtolower($ua) ] = $n;
+			}
+		
+			$ibforums->adskin->td_header[] = array( "Search Bot"   , "20%" );
+			$ibforums->adskin->td_header[] = array( "Date"         , "25%" );
+			$ibforums->adskin->td_header[] = array( "Query"        , "20%" );
+			$ibforums->adskin->td_header[] = array( "Query"        , "35%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Last 10 Search Engine Spiders Hits" );
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'spider_logs', 'order' => 'entry_date DESC', 'limit' => array( 0,10) ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>".$this->bot_map[ strtolower($r['bot']) ]."&nbsp;</strong>",
+																		 $ibforums->admin->get_date( $r['entry_date'], 'SHORT' ),
+																		 $r['ip_address'].'&nbsp;',
+																		 $r['query_string'].'&nbsp;'
+																)      );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+			
+			$ibforums->html .= $ibforums->adskin->add_td_spacer();
+		}
+		
+		//-----------------------------------------
+		// Stats
+		//-----------------------------------------
+		
+		$reg = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as reg', 'from' => 'validating', 'where' => 'lost_pass <> 1' ) );
+		
+		$reg['reg'] = intval( $reg['reg'] );
+		
+		$coppa = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as coppa', 'from' => 'validating', 'where' => 'coppa_user=1' ) );
+		
+		$coppa['coppa'] = intval( $coppa['coppa'] );
+		
+		
+		
+		$ibforums->adskin->td_header[] = array( "Definition", "25%" );
+		$ibforums->adskin->td_header[] = array( "Value"     , "25%" );
+		$ibforums->adskin->td_header[] = array( "Definition", "25%" );
+		$ibforums->adskin->td_header[] = array( "Value"     , "25%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "System Overview" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Total Unique Topics"    , intval($ibforums->cache['stats']['total_topics']),
+																 "Total Replies to topics", intval($ibforums->cache['stats']['total_replies']),
+														)      );
+		 								 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Total Members", intval($ibforums->cache['stats']['mem_count']), "Public Upload Folder Size", $uploads_size ) );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod'>Users awaiting validation</a>" , $reg['reg'],
+																 "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod'>COPPA Requests</a> from 'Users awaiting validation' total", $coppa['coppa'],
+														)      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		$ibforums->admin->output();
+		
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_ips.php b/upload/sources/admin/ad_ips.php
similarity index 65%
rename from upload/sources/Admin/ad_ips.php
rename to upload/sources/admin/ad_ips.php
index feb2387d..95edfd68 100644
--- a/upload/sources/Admin/ad_ips.php
+++ b/upload/sources/admin/ad_ips.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,6 +19,7 @@
 |   > Date started: 17th October 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
 +--------------------------------------------------------------------------
 */
 
@@ -31,9 +31,6 @@ if ( ! defined( 'IN_ACP' ) )
 }
 
 
-$idx = new ad_ips();
-
-
 class ad_ips {
 
 	var $base_url;
@@ -44,12 +41,13 @@ class ad_ips {
 	
 	var $version = "1.1";
 
-	function ad_ips() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -58,9 +56,9 @@ class ad_ips {
 			unset($$k);
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		switch($IN['code'])
+		switch($ibforums->input['code'])
 		{
 		
 			case 'news':
@@ -87,7 +85,7 @@ class ad_ips {
 				$this->purchase();
 				break;
 				
-			//-------------------------
+			//-----------------------------------------
 			default:
 				exit();
 				break;
@@ -100,7 +98,7 @@ class ad_ips {
 	
 	function news()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
 		@header("Location: ".$this->url."?news");
 		exit();
@@ -108,7 +106,7 @@ class ad_ips {
 	
 	function updates()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
 		//@header("Location: ".$this->url."?updates&version=".$this->version);
 		@header("Location: ".$this->url."?updates");
@@ -117,15 +115,15 @@ class ad_ips {
 	
 	function docs()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
-		@header("Location: ".$this->url."?docs");
+		@header("Location: http://www.invisionpower.com/documentation/showdoc.php");
 		exit();
 	}
 	
 	function support()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
 		@header("Location: ".$this->url."?support");
 		exit();
@@ -133,7 +131,7 @@ class ad_ips {
 	
 	function host()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
 		@header("Location: ".$this->url."?host");
 		exit();
@@ -141,7 +139,7 @@ class ad_ips {
 	
 	function purchase()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
 		@header("Location: ".$this->url."?purchase");
 		exit();
diff --git a/upload/sources/admin/ad_languages.php b/upload/sources/admin/ad_languages.php
new file mode 100644
index 00000000..359d9fe6
--- /dev/null
+++ b/upload/sources/admin/ad_languages.php
@@ -0,0 +1,1294 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Language functions
+|   > Module written by Matt Mecham
+|   > Date started: 22nd April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_languages {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			
+			case 'add':
+				$this->add_language();
+				break;
+				
+			case 'edit':
+				$this->do_form('edit');
+				break;
+				
+			case 'edit2':
+				$this->show_file();
+				break;
+				
+			case 'doadd':
+				$this->save_wrapper('add');
+				break;
+				
+			case 'doedit':
+				$this->save_langfile();
+				break;
+				
+			case 'remove':
+				$this->remove();
+				break;
+				
+			case 'editinfo':
+				$this->edit_info();
+				break;
+				
+			case 'export':
+				$this->export();
+				break;
+				
+			case 'import':
+				$this->import();
+				break;
+				
+			case 'doimport':
+				$this->doimport();
+				break;
+				
+			case 'makedefault':
+				$this->make_default();
+				break;
+			
+			case 'swap':
+				$this->member_swap();
+				break;
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Swap members choice
+	//-----------------------------------------
+	
+	function member_swap()
+	{
+		global $ibforums, $DB, $std;
+		
+		$new_dir = "";
+		$old_dir = "";
+		
+		if ( $ibforums->input['old'] and $ibforums->input['new'] )
+		{
+			if ( $ibforums->input['old'] != 'none' )
+			{
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid IN ( {$ibforums->input['old']}, {$ibforums->input['new']})" ) );
+				$DB->simple_exec();
+			}
+			else
+			{
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid={$ibforums->input['new']}" ) );
+				$DB->simple_exec();
+			}
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				if (  $r['lid'] == $ibforums->input['old'] )
+				{
+					$old_dir = $r['ldir'];
+				}
+				
+				if (  $r['lid'] == $ibforums->input['new'] )
+				{
+					$new_dir = $r['ldir'];
+				}
+			}
+			
+			if ( $new_dir and $old_dir )
+			{
+				$DB->do_update( 'members', array( 'language' => $new_dir ), "language='{$old_dir}'" );
+			}
+			else if ( $ibforums->input['old'] == 'none' )
+			{
+				$DB->do_update( 'members', array( 'language' => $new_dir ), "language='' or language IS NULL" );
+			}
+		}
+		
+		$ibforums->main_msg = "Member's language choice updated";
+		$this->list_current();
+	}
+	
+	//-----------------------------------------
+	// Rebuild CACHE
+	//-----------------------------------------
+	
+	function rebuild_cache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['languages'] = array();
+		
+		$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['languages'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	
+	function make_default()
+	{
+		global $ibforums, $DB,  $std, $HTTP_GET_VARS;
+	
+		$new_dir = stripslashes(urldecode(trim($HTTP_GET_VARS['id'])));
+		
+		if ($new_dir == "")
+		{
+			$ibforums->admin->error("Could not resolve the new ID for the default lang pack stuff thingy thanks");
+		}
+		
+		// Update conf file 
+		
+		$ibforums->admin->rebuild_config( array( 'default_language' => $new_dir ) );
+		
+		// Bring it all back to yoooo!
+		
+		$std->boink_it($ibforums->adskin->base_url."&act=lang");
+	
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// IMPORT - DO IT
+	/*-------------------------------------------------------------------------*/
+	
+	function doimport()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$messages = array();
+		
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['lang_name'] )
+		{
+			$ibforums->admin->error("You must enter a name for this language import!");
+		}
+		
+		if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+		{
+			//-----------------------------------------
+			// check and load from server
+			//-----------------------------------------
+			
+			if ( ! $ibforums->input['lang_location'] )
+			{
+				$ibforums->main_msg = "No upload file was found and no filename was specified.";
+				$this->import();
+			}
+			
+			if ( ! file_exists( ROOT_PATH . $ibforums->input['lang_location'] ) )
+			{
+				$ibforums->main_msg = "Could not find the file to open at: " . ROOT_PATH . $ibforums->input['lang_location'];
+				$this->import();
+			}
+			
+			if ( preg_match( "#\.gz$#", $ibforums->input['lang_location'] ) )
+			{
+				if ( $FH = @gzopen( ROOT_PATH.$ibforums->input['lang_location'], 'rb' ) )
+				{
+					while ( ! @gzeof( $FH ) )
+					{
+						$content .= @gzread( $FH, 1024 );
+					}
+					
+					@gzclose( $FH );
+				}
+			}
+			else
+			{
+				if ( $FH = @fopen( ROOT_PATH.$ibforums->input['lang_location'], 'rb' ) )
+				{
+					$content = @fread( $FH, filesize(ROOT_PATH.$ibforums->input['lang_location']) );
+					@fclose( $FH );
+				}
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get uploaded schtuff
+			//-----------------------------------------
+			
+			$tmp_name = $_FILES['FILE_UPLOAD']['name'];
+			$tmp_name = preg_replace( "#\.gz$#", "", $tmp_name );
+			
+			$content  = $ibforums->admin->import_xml( $tmp_name );
+		}
+		
+		//-----------------------------------------
+		// Check dirs, etc
+		//-----------------------------------------
+		
+		$safename = substr( str_replace( " ", "", strtolower( preg_replace( "[^a-zA-Z0-9]", "", $ibforums->input['lang_name'] ) ) ), 0, 10 );
+		
+		if ( @file_exists( ROOT_PATH.'lang/'.$safename ) )
+		{
+			$safename = $safename . substr( time(), 5, 10 );
+		}
+		
+		if ( ! $content )
+		{
+			$ibforums->main_msg = "The XML file appears to be empty - please check the form and try again";
+			$this->import();
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		//-----------------------------------------
+		// pArse
+		//-----------------------------------------
+		
+		$lang_array = array();
+		
+		foreach( $xml->xml_array['languageexport']['languagegroup']['langbit'] as $idx => $entry )
+		{
+			$key   = $entry['key']['VALUE'];
+			$value = $entry['value']['VALUE'];
+			$file  = $entry['file']['VALUE'];
+			
+			$lang_array[ $file ][ $key ] = $value;
+		}
+		
+		//-----------------------------------------
+		// Sort...
+		//-----------------------------------------
+		
+		ksort($lang_array);
+		
+		if ( ! count( $lang_array ) )
+		{
+			$ibforums->main_msg = "The XML file appears to be empty - please check the form and try again";
+			$this->import();
+		}
+		
+		//-----------------------------------------
+		// Attempt dir creation
+		//-----------------------------------------
+		
+		if ( ! @mkdir( ROOT_PATH.'lang/'.$safename, 0777 ) )
+		{
+			$ibforums->main_msg = "Cannot create the directory '$safename' in the './lang' directory - please check directory permissions on 'lang' and try again.";
+			$this->import();
+		}
+		else
+		{
+			@chmod( ROOT_PATH.'lang/'.$safename, 0777 );
+		}
+		
+		//print "<pre>"; print_r( $new_file_array ); exit();
+		
+		//-----------------------------------------
+		// Loop, sort - compile and save
+		//-----------------------------------------
+		
+		foreach( $lang_array as $file => $data )
+		{
+			$new_file_array = array();
+			
+			$real_name      = 'lang_'.$file.'.php';
+			
+			foreach( $lang_array[ $file ] as $k => $v )
+			{
+				$new_file_array[ $k ] = $v;
+			}
+			
+			ksort($new_file_array);
+			
+			if ( count( $new_file_array ) )
+			{
+				$file_contents = "<?php\n\n";;
+				
+				foreach( $new_file_array as $k => $v )
+				{
+					$file_contents .= "\n".'$lang['."'$k'".']  = "'.addslashes($v).'";';
+				}
+				
+				$file_contents .= "\n?>";
+				
+				if ( $FH = @fopen( ROOT_PATH.'lang/'.$safename.'/'.$real_name, 'w' ) )
+				{
+					@fwrite( $FH, $file_contents, strlen( $file_contents ) );
+					@fclose( $FH );
+				
+					$messages[] = "'lang_{$file}.php' imported correctly!";
+				}
+				else
+				{
+					$messages[] = "Cannot create 'lang_{$file}.php' - skipping...";
+				}
+				
+			}
+			else
+			{
+				$messages[] = "'lang_{$file}.php' appears to be empty - skipping...";
+			}
+			
+			unset($new_file_array);
+			unset($file_contents);
+		}
+		
+		//-----------------------------------------
+		// Write to DB
+		//-----------------------------------------
+		
+		$DB->do_insert( 'languages', array(
+											'ldir'    => $safename,
+											'lname'   => $ibforums->input['lang_name'],
+											'lauthor' => $xml->xml_array['languageexport']['ATTRIBUTES']['author'],
+											'lemail'  => $xml->xml_array['languageexport']['ATTRIBUTES']['email'],
+					  )                   );
+		
+		$this->rebuild_cache();
+		
+		$ibforums->main_msg = "Import attempt completed<br />".implode( "\n<br />", $messages );
+		$this->import();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Import XML Archive (FORM)
+	/*-------------------------------------------------------------------------*/
+	
+	function import()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "This section will allow you to import an XML file containing all the language data.";
+		$ibforums->admin->page_title  = "Language Pack Import";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'          , 'doimport'    ),
+																 2 => array( 'act'           , 'lang'        ),
+																 3 => array( 'MAX_FILE_SIZE' , '10000000000' ),
+													 ) , "uploadform", " enctype='multipart/form-data'"      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "50%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "50%" );
+
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Import an XML language file" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Upload XML language file from your computer</b><div style='color:gray'>The file must begin with 'ipb_language' and end with either '.xml' or '.xml.gz'</div>" ,
+										  				         $ibforums->adskin->form_upload(  )
+								                        )      );
+								                        
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b><u>OR</u> enter the filename of the XML language file</b><div style='color:gray'>The file must be uploaded into the forum's root folder</div>" ,
+										  				         $ibforums->adskin->form_input( 'lang_location', 'ipb_language.xml.gz'  )
+								                        )      );
+								                        
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Enter the name for this new language set</b><div style='color:gray'>For example: English, US, German, DE...</div>" ,
+										  				         $ibforums->adskin->form_input( 'lang_name', ''  )
+								                        )      );
+	
+		$ibforums->html .= $ibforums->adskin->end_form("Import XML Language Set");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// EXPORT: Export languages into XML download
+	/*-------------------------------------------------------------------------*/
+	
+	function export()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// check
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// Get data from DB
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the information from the database");
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Set up..
+		//-----------------------------------------
+		
+		$lang_dir = ROOT_PATH."lang/".$row['ldir'];
+		
+		if ( ! is_dir($lang_dir) )
+		{
+			$ibforums->admin->error("Could not locate $lang_dir, is the directory there?");
+		}
+		
+		$lang_files = array( 'boards','buddy','calendar','emails', 'email_content', 'error','forum','global','help','legends','login','mlist',
+							 'mod','msg','online','portal','post','printpage','profile','register','search','stats','subscriptions','topic','ucp'
+						   );
+		
+		//-----------------------------------------
+		// Start XML
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'languageexport', array( 'exported' => time(), 'author' => $row['lauthor'], 'email' => $row['lemail'] ) );
+		
+		$xml->xml_add_group( 'languagegroup' );
+		
+		//-----------------------------------------
+		// Get all the lang bits
+		//-----------------------------------------
+		
+		foreach( $lang_files as $file )
+		{
+			if ( @is_file( $lang_dir.'/lang_'.$file.'.php' ) )
+			{
+				$lang = array();
+				
+				require( $lang_dir.'/lang_'.$file.'.php' );
+				
+				foreach( $lang as $k => $v )
+				{
+					$content   = array();
+					
+					$content[] = $xml->xml_build_simple_tag( 'key'  , $k    );
+					$content[] = $xml->xml_build_simple_tag( 'value', $v    );
+					$content[] = $xml->xml_build_simple_tag( 'file' , $file );
+					
+					$entry[] = $xml->xml_build_entry( 'langbit', $content );
+				}
+			}
+		}
+		
+		$xml->xml_add_entry_to_group( 'languagegroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+
+		$ibforums->admin->show_download( $xml->xml_document, 'ipb_language.xml' );
+	}
+	
+	
+	
+	
+	
+	function show_file()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the information from the database");
+		}
+		
+		//-----------------------------------------
+		
+		$lang_dir   = ROOT_PATH."lang/".$row['ldir'];
+		
+		$form_array = array();
+		
+		$lang_file = $lang_dir."/".$ibforums->input['lang_file'];
+	
+		
+		if ( ! is_writeable($lang_dir) )
+		{
+			$ibforums->admin->error("Cannot write into '$lang_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
+		}
+		
+		if (! file_exists($lang_file) )
+		{
+			$ibforums->admin->error("Cannot locate {$ibforums->input['lang_file']} in '$lang_dir', please go back and check the input");
+		}
+		else
+		{
+			require $lang_file;
+		}
+		
+		if ($ibforums->input['lang_file'] == 'email_content.php')
+		{
+			$is_email = 1;
+		}
+		
+		if ( ! is_writeable($lang_file) )
+		{
+			$ibforums->admin->error("Cannot write to '$lang_file', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
+		}
+	
+	
+		$ibforums->admin->page_detail = "You may edit any of the language information below.";
+		$ibforums->admin->page_title  = "Edit Language set: ".$row['lname'];
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'      , 'doedit'    ),
+																 2 => array( 'act'       , 'lang'      ),
+																 3 => array( 'id'        , $ibforums->input['id']   ),
+																 4 => array( 'lang_file' , $ibforums->input['lang_file']   ),
+														)      );
+														
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Block Name" , "20%" );
+		$ibforums->adskin->td_header[] = array( "Content"    , "80%" );
+
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Language Text: ".$ibforums->input['lang_file'] );
+									     
+		foreach($lang as $k => $v)
+		{
+			//-----------------------------------------
+			// Swop < and > into ascii entities
+			// to prevent textarea breaking html
+			//-----------------------------------------
+			
+			$v = stripslashes($v);
+			
+			$v = preg_replace("/&/", "&#38;", $v );
+			$v = preg_replace("/</", "&#60;", $v );
+			$v = preg_replace("/>/", "&#62;", $v );
+			$v = preg_replace("/'/", "&#39;", $v );
+			
+			$rows = 5;
+			
+			$cols = 70;
+				
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+																	  "&lt;ibf.lang.<b>".$k."</b>&gt;",
+																	  $ibforums->adskin->form_textarea('XX_'.$k, $v, $cols, $rows),
+														   )      );
+		}
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit this file");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// Edit language pack information
+	//-----------------------------------------
+	
+	function edit_info()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the information from the database");
+		}
+		
+		$final['lname'] = stripslashes($_POST['lname']);
+		
+		if (isset($_POST['lname']))
+		{
+			$final['lauthor'] = stripslashes($_POST['lauthor']);
+			$final['lemail']  = stripslashes($_POST['lemail']);
+		}
+		
+		$DB->do_update( 'languages', $final, "lid='".$ibforums->input['id']."'" );
+		
+		$this->rebuild_cache();
+		
+		$ibforums->admin->done_screen("Language pack information updated", "Manage language sets", "act=lang" );
+		
+	}
+	
+	//-----------------------------------------
+	// Add language pack
+	//-----------------------------------------
+	
+	
+	function add_language()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language set ID, go back and try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query that language set from the DB, so there");
+		}
+		
+		//-----------------------------------------
+		
+		//-----------------------------------------
+		
+		if ( ! is_writeable(ROOT_PATH.'lang') )
+		{
+			$ibforums->admin->error("The directory 'lang' is not writeable by this script. Please check the permissions on that directory. CHMOD to 0777 if in doubt and try again");
+		}
+		
+		//-----------------------------------------
+		
+		if ( ! is_dir(ROOT_PATH.'lang/'.$row['ldir']) )
+		{
+			$ibforums->admin->error("Could not locate the original language set to copy, please check and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$row['lname'] = $row['lname'].".2";
+		
+		// Insert a new row into the DB...
+		
+		$final = array();
+		
+		foreach($row as $k => $v)
+		{
+			if ($k == 'lid')
+			{
+				continue;
+			}
+			else
+			{
+				$final[ $k ] = $v;
+			}
+		}
+		
+		$DB->do_insert( 'languages', $final );
+		
+		$new_id = $DB->get_insert_id();
+		
+		//-----------------------------------------
+		
+		if ( ! $ibforums->admin->copy_dir( $ibforums->vars['base_dir'].'lang/'.$row['ldir'] , $ibforums->vars['base_dir'].'lang/'.$new_id ) )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'languages', 'where' => "lid='$new_id'" ) );
+			
+			$ibforums->admin->error( $ibforums->admin->errors );
+		}
+		else
+		{
+			$DB->do_update( 'languages', array( 'ldir' => $new_id ), "lid='$new_id'" );
+		}
+		
+		//-----------------------------------------
+		// Pass to edit / add form...
+		//-----------------------------------------
+		
+		$this->rebuild_cache();
+		
+		$this->do_form('add', $new_id);
+	
+	}
+	
+	//-----------------------------------------
+	// REMOVE WRAPPERS
+	//-----------------------------------------
+	
+	function remove()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		//-----------------------------------------
+		
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing image set ID, go back and try again");
+		}
+		
+		if ($ibforums->input['id'] == 1)
+		{
+			$ibforums->admin->error("You cannot remove this language pack.");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the language information from the database");
+		}
+		
+		// Is it default??????????????? ok enuff
+		
+		if ($ibforums->vars['default_language'] == "")
+		{
+			$ibforums->vars['default_language'] = 'en';
+		}
+		
+		if ($row['ldir'] == $ibforums->vars['default_language'])
+		{
+			$ibforums->admin->error("You cannot remove this language pack while it is the default language directory. Please select another pack to be the default and try again");
+		}
+		
+		$DB->do_update( 'members', array( 'language' => $ibforums->vars['default_language'] ), "language='{$row['ldir']}'" );
+		
+		if ( $ibforums->admin->rm_dir( $ibforums->vars['base_dir']."lang/".$row['ldir'] ) )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+			
+			$this->rebuild_cache();
+			
+			$std->boink_it($ibforums->adskin->base_url."&act=lang");
+			exit();
+		}
+		else
+		{
+			$ibforums->admin->error("Could not remove the language pack files, please check the CHMOD permissions to ensure that this script has the correct permissions to allow this");
+		}
+	}
+	
+	
+	
+	//-----------------------------------------
+	// ADD / EDIT IMAGE SETS
+	//-----------------------------------------
+	
+	function save_langfile()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language set ID, go back and try again");
+		}
+		
+		if ($ibforums->input['lang_file'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language filename, go back and try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the language information from the database");
+		}
+		
+		$lang_file = ROOT_PATH."lang/".$row['ldir']."/".$ibforums->input['lang_file'];
+		
+		if (! file_exists( $lang_file ) )
+		{
+			$ibforums->admin->error("Could not locate $lang_file, is it there?");
+		}
+		
+		if (! is_writeable( $lang_file ) )
+		{
+			$ibforums->admin->error("Cannot write to $lang_file, please chmod to 0666 or better and try again");
+		}
+		
+		$barney = array();
+		
+		foreach ($ibforums->input as $k => $v)
+		{
+			if ( preg_match( "/^XX_(\S+)$/", $k, $match ) )
+			{
+				if ( isset($ibforums->input[ $match[0] ]) )
+				{
+					$v = preg_replace("/&#39;/", "'", stripslashes($_POST[ $match[0] ]) );
+					$v = preg_replace("/&#60;/", "<",  $v );
+					$v = preg_replace("/&#62;/", ">", $v );
+					$v = preg_replace("/&#38;/", "&", $v );
+					$v = preg_replace("/\r/", "", $v );
+				
+					$barney[ $match[1] ] = $v;
+				}
+			}
+		}
+		
+		if ( count($barney) < 1 )
+		{
+			$ibforums->admin->error("Oopsie, something has gone wrong - did you leave all the fields blank?");
+		}
+		
+		$start = "<?php\n\n";
+		
+		foreach($barney as $key => $text)
+		{
+			$text   = preg_replace("/\n{1,}$/", "", $text);
+			$start .= "\n".'$lang['."'$key'".']  = "'.addslashes($text).'";';
+		}
+		
+		$start .= "\n\n?".">";
+		
+		if ($fh = fopen( $lang_file, 'w') )
+		{
+			fwrite($fh, $start, strlen($start) );
+			fclose($fh);
+		}
+		else
+		{
+			$ibforums->admin->error("Could not write back to $lang_file");
+		}
+		
+		if ( $ibforums->input['id'] )
+		{
+			$ibforums->admin->done_screen("Set updated", "Manage Language Sets", "act=lang&code=edit&id={$ibforums->input['id']}", 'redirect' );
+		}
+		else
+		{
+			$ibforums->admin->done_screen("Set updated", "Manage Language Sets", "act=lang", 'redirect' );
+		}
+	}
+	
+	//-----------------------------------------
+	// EDIT SPLASH
+	//-----------------------------------------
+	
+	function do_form( $method='add', $id="" )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		
+		if ($id != "")
+		{
+			$ibforums->input['id'] = $id;
+		}
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing language set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages', 'where' => "lid='".$ibforums->input['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the information from the database");
+		}
+		
+		//-----------------------------------------
+		
+		$lang_dir = $ibforums->vars['base_dir']."lang/".$row['ldir'];
+		
+		$form_array = array();
+	
+		if ($method != 'add')
+		{
+			if ( ! is_writeable($lang_dir) )
+			{
+				$ibforums->admin->error("Cannot write into '$lang_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.");
+			}
+		}
+		
+		//-----------------------------------------
+		
+		if ( is_dir($lang_dir) )
+		{
+			$handle = opendir($lang_dir);
+			
+			while (($filename = readdir($handle)) !== false)
+			{
+				if (($filename != ".") && ($filename != ".."))
+				{
+					if (preg_match("/^index/", $filename))
+					{
+						continue;
+					}
+					
+					if (preg_match("/\.php$/", $filename))
+					{
+						$form_array[] = array( $filename, preg_replace( "/\.php$/", "", $filename ) );
+					}
+				}
+			}
+				
+			closedir($handle);
+		}
+		
+		if ($row['lauthor'] and $row['lemail'])
+		{
+			$author = "<br><br>This language set <b>'{$row['lname']}'</b> was created by <a href='mailto:{$row['lemail']}' target='_blank'>{$row['lauthor']}</a>";
+		}
+		else if ($row['lauthor'])
+		{
+			$author = "<br><br>This language set <b>'{$row['lname']}'</b> was created by {$row['lauthor']}";
+		}
+		
+		//-----------------------------------------
+	
+		$ibforums->admin->page_detail = "Please choose which language section you wish to edit below.$author $url";
+		$ibforums->admin->page_title  = "Edit Language set";
+		
+		//-----------------------------------------
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'editinfo'    ),
+																 2 => array( 'act'   , 'lang'       ),
+																 3 => array( 'id'    , $ibforums->input['id']     ),
+														)      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Edit language set information" );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+													"<b>Language Set Name</b>",
+													$ibforums->adskin->form_input('lname', $row['lname']),
+									     )      );
+									     
+		if ($method == 'add')
+		{
+									     
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<b>Language set author name:</b>",
+														$ibforums->adskin->form_input('lauthor', $row['lauthor']),
+											 )      );
+											 
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<b>Language set author email:</b>",
+														$ibforums->adskin->form_input('lemail', $row['lemail']),
+											 )      );
+											 
+		}
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit language set details");
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+									     
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'edit2'    ),
+												  2 => array( 'act'   , 'lang'     ),
+												  3 => array( 'id'    , $ibforums->input['id']   ),
+									     )      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Edit language files in set '".$row['lname']."'" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+													"<b>Please select a language file to edit</b>",
+													$ibforums->adskin->form_dropdown('lang_file', $form_array),
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit this language file");
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+									     
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// SHOW ALL LANGUAGE PACKS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->vars['default_language'] == "")
+		{
+			$ibforums->vars['default_language'] = 'en';
+		}
+		
+		$form_array = array();
+	
+		$ibforums->admin->page_detail = "You can edit, remove and create new language packs from this section";
+		$ibforums->admin->page_title  = "Manage Language Sets";
+		
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'languages_list_current', array() );
+		$DB->cache_exec_query();
+		
+		$used_ids = array();
+		$show_array = array();
+		
+		$ibforums->html .= $ibforums->adskin->js_checkdelete();
+		
+		if ( $DB->get_num_rows() )
+		{
+		
+			$ibforums->adskin->td_header[] = array( "Title"        , "40%" );
+			$ibforums->adskin->td_header[] = array( "Members"      , "30%" );
+			$ibforums->adskin->td_header[] = array( "Export"       , "10%" );
+			$ibforums->adskin->td_header[] = array( "Edit"         , "10%" );
+			$ibforums->adskin->td_header[] = array( "Remove"       , "10%" );
+		
+			$ibforums->html .= $ibforums->adskin->start_table( "Current Language Packs In Use" );
+			
+			while ( $r = $DB->fetch_row() )
+			{
+			
+				if ($ibforums->vars['default_language'] == $r['ldir'])
+				{
+					$root = "<span style='color:red;font-weight:bold'> (Default Language)</span>";
+				}
+				else
+				{
+					$root = " ( <a href='{$ibforums->adskin->base_url}&act=lang&code=makedefault&id=".urlencode($r['ldir'])."'>Make Default Language</a> )";
+				}
+			
+				$show_array[ $r['lid'] ] .= stripslashes($r['lname'])."<br>";
+			
+				if ( in_array( $r['lid'], $used_ids ) )
+				{
+					continue;
+				}
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".stripslashes($r['lname'])."</b> $root",
+														  "<center>{$r['mcount']}</center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=lang&code=export&id={$r['lid']}'>Export</a></center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=lang&code=edit&id={$r['lid']}'>Edit</a></center>",
+														  "<center><a href='javascript:checkdelete(\"act=lang&code=remove&id={$r['lid']}\")'>Remove</a></center>",
+												 )      );
+												   
+				$used_ids[] = $r['lid'];
+				
+				$form_array[] = array( $r['lid'], $r['lname'] );
+				
+			}
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		if ( count($used_ids) < 1 )
+		{
+			$used_ids[] = '0';
+		}
+		
+		$DB->simple_construct( array( 'select' => 'lid, ldir, lname', 'from' => 'languages', 'where' => "lid NOT IN(".implode(",",$used_ids).")" ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() )
+		{
+		
+			$ibforums->adskin->td_header[] = array( "Title"  , "40%" );
+			$ibforums->adskin->td_header[] = array( "Export" , "10%" );
+			$ibforums->adskin->td_header[] = array( "Edit"   , "30%" );
+			$ibforums->adskin->td_header[] = array( "Remove" , "20%" );
+		
+			$ibforums->html .= $ibforums->adskin->start_table( "Current Unallocated Language Packs" );
+			
+			
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				
+				if ($ibforums->vars['default_language'] == $r['ldir'])
+				{
+					$root = "<span style='color:red;font-weight:bold'> (Default Language)</span>";
+				}
+				else
+				{
+					$root = " ( <a href='{$ibforums->adskin->base_url}&act=lang&code=makedefault&id=".urlencode($r['ldir'])."'>Make Default Language</a> )";
+				}
+			
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".stripslashes($r['lname'])."</b> $root",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=lang&code=export&id={$r['lid']}'>Export</a></center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=lang&code=edit&id={$r['lid']}'>Edit</a></center>",
+														  "<center><a href='javascript:checkdelete(\"act=lang&code=remove&id={$r['lid']}\")'>Remove</a></center>",
+												 )      );
+												 
+				$form_array[] = array( $r['lid'], $r['lname'] );
+												   
+			}
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		//-----------------------------------------
+		// Create new set?
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'add'     ),
+												  				 2 => array( 'act'   , 'lang'    ),
+									     				)      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Create Language Set" );
+			
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Base new language set on...</b>" ,
+										  		 			      $ibforums->adskin->form_dropdown( "id", $form_array)
+								 						)      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Create new Language set");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Create new set?
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'swap'     ),
+												  				 2 => array( 'act'   , 'lang'    ),
+									     				)      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Swap Member's Language Choice" );
+			
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Member's that now use language set...</b>" ,
+										  		 			      $ibforums->adskin->form_dropdown( "old", array_merge( array( -1 => array( 'none', 'No preference stored - using default' ) ), $form_array ) )
+								 						)      );
+								 						
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Update to use language set...</b>" ,
+										  		 			      $ibforums->adskin->form_dropdown( "new", $form_array)
+								 						)      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Swap Member&#039;s Choice");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_member.php b/upload/sources/admin/ad_member.php
new file mode 100644
index 00000000..b0ce8214
--- /dev/null
+++ b/upload/sources/admin/ad_member.php
@@ -0,0 +1,3283 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Forum functions
+|   > Module written by Matt Mecham
+|   > Date started: 1st march 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_member {
+
+	var $base_url;
+	var $modules = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+    	// Get the sync module
+		//-----------------------------------------
+		
+		if ( USE_MODULES == 1 )
+		{
+			require ROOT_PATH."modules/ipb_member_sync.php";
+			
+			$this->modules = new ipb_member_sync();
+		}
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=mem&code=edit', 'Edit Member Search Form' );
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'doform':
+				$this->member_do_edit_form();
+				break;
+			case 'doedit':
+				$this->member_do_edit();
+				break;
+			//-----------------------------------------
+			case 'unsuspend':
+				$this->member_unsuspend();
+				break;
+			//-----------------------------------------
+			case 'add':
+				$this->member_add_form();
+				break;
+			case 'doadd':
+				$this->member_do_add();
+				break;
+			//-----------------------------------------
+			case 'doprune':
+				$this->member_doprune();
+				break;
+			//-----------------------------------------
+			// ranks / titles
+			//-----------------------------------------
+			case 'title':
+				$this->titles_start();
+				break;
+			case 'rank_edit':
+				$this->titles_rank_setup('edit');
+				break;
+			case 'rank_add':
+				$this->titles_rank_setup('add');
+				break;
+			case 'do_add_rank':
+				$this->titles_add_rank();
+				break;
+			case 'do_rank_edit':
+				$this->titles_edit_rank();
+				break;
+			case 'rank_delete':
+				$this->titles_delete_rank();
+				break;
+			
+			//-----------------------------------------
+			case 'mod':
+				$this->view_mod();
+				break;
+			case 'domod':
+				$this->domod();
+				break;
+			//-----------------------------------------
+			case 'changename':
+				$this->member_change_name_start();
+				break;
+			case 'dochangename':
+				$this->member_change_name_complete();
+				break;
+			//-----------------------------------------	
+			
+			case 'banmember':
+				$this->member_suspend_start();
+				break;
+				
+			case 'dobanmember':
+				$this->member_suspend_complete();
+				break;
+			//-----------------------------------------
+			// Change Passy
+			//-----------------------------------------
+			case 'changepassword':
+				$this->member_password_start();
+				break;
+			case 'dochangepassword':
+				$this->member_password_complete();
+				break;
+			//-----------------------------------------
+			// Member search
+			//-----------------------------------------
+			case 'search':
+				$this->search_form();
+				break;
+			case 'searchresults':
+				$this->search_results();
+				break;
+			//-----------------------------------------
+			// Delete / Prune
+			//-----------------------------------------
+			case 'member_delete':
+				$this->member_delete();
+				break;
+				
+			default:
+				$this->search_form();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// PASS: START
+	//
+	//-----------------------------------------
+	
+	function member_password_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['password'] )
+		{
+			$ibforums->main_msg = "You must enter a password!";
+			$this->member_password_start();
+		}
+		
+		$salt = $ibforums->converge->generate_password_salt(5);
+		$salt = str_replace( '\\', "\\\\", $salt );
+		
+		$key  = $ibforums->converge->generate_auto_log_in_key();
+		
+		$md5_once = md5( trim($ibforums->input['password']) );
+		
+		$converge = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'members_converge', 'where' => 'converge_id='.$ibforums->input['id'] ) );
+		
+		$save_array = array();
+		
+		if ( $ibforums->input['newsalt'] )
+		{
+			$save_array['converge_pass_salt'] = $salt;
+			$save_array['converge_pass_hash'] = md5( md5($salt) . $md5_once );
+		}
+		else
+		{
+			$save_array['converge_pass_hash'] = md5( md5( $converge['converge_pass_salt'] ) . $md5_once );
+		}
+		
+		$DB->do_update( 'members_converge', $save_array, 'converge_id='.$ibforums->input['id'] );
+		
+		if ( $ibforums->input['newkey'] )
+		{
+			$DB->do_update( 'members', array( 'member_login_key' => $key ), 'id='.$ibforums->input['id'] );
+		}
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_query = "";
+		
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_query .= '&'.$bit.'='.trim($ibforums->input[ $bit ]);
+		}
+		
+		$ibforums->admin->save_log("Members Password Changed ( id: {$ibforums->input['id']} )");
+		
+		$ibforums->admin->done_screen("Password Changed", "Member Search", "act=mem".$page_query, "redirect" );
+	}
+	
+	//-----------------------------------------
+	//
+	// PASS: START
+	//
+	//-----------------------------------------
+	
+	function member_password_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_array = array( 1 => array( 'code'  , 'dochangepassword'  ),
+							 2 => array( 'act'   , 'mem'       ),
+							 3 => array( 'id'    , $ibforums->input['id']  ),
+						   );
+									     				
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_array[] = array( $bit, trim($ibforums->input[ $bit ]) );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( $page_array );
+									     		
+		//-----------------------------------------
+		// Get member
+		//-----------------------------------------
+		
+		$member = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'members', 'where' => 'id='.$ibforums->input['id'] ) );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Change password for member: {$member['name']}" );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Enter the new password</strong>" ,
+												  			     $ibforums->adskin->form_input('password' ),
+									     			    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Create new password salt?</b><div style='color:gray'>If set to 'yes', a new password salt will be generated. Useful if a member is having trouble logging in.</div>" ,
+												  				 $ibforums->adskin->form_yes_no( "newsalt", 1 )
+									     				)      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Create new log in key?</b><div style='color:gray'>If set to 'yes', a new cookie log in key will be generated. Useful if a member is having trouble logging in. Any current cookies will not work.</div>" ,
+												  				 $ibforums->adskin->form_yes_no( "newkey", 1 )
+									     				)      );
+									     									     
+		$ibforums->html .= $ibforums->adskin->end_form("Change Password");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// TEMP BANNING
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_suspend_start()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Account Suspension";
+		
+		$ibforums->admin->page_detail = "Automated temporary member suspension. Simply choose the duration of the suspension and submit the form below";
+		
+		$contents = "{membername},\nYour member account at {$ibforums->vars['board_name']} has been temporarily suspended.\n\nYour account will not be functional until {date_end} (depending on your timezone). This is an automated process and you do not need to do anything to expediate the unsuspension process.\n\nBoard Address: {$ibforums->vars['board_url']}/index.php";
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify a valid member id, please go back and try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "id=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $member = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("We could not match that ID in the members database");
+		}
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_array = array( 1 => array( 'code'  , 'dobanmember'  ),
+							 2 => array( 'act'   , 'mem'       ),
+							 3 => array( 'mid'   , $ibforums->input['mid']  ),
+						   ) ;
+									     				
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_array[] = array( $bit, trim($ibforums->input[ $bit ]) );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( $page_array );
+									     		
+		$ban = $std->hdl_ban_line( $member['temp_ban'] );
+		
+		$units = array( 0 => array( 'h', 'Hours' ), 1 => array( 'd', 'Days' ) );
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Account Suspension", "Note: If this member is already suspended, any new setting will restart the ban" );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Suspend {$member['name']} for...</strong>" ,
+												                 $ibforums->adskin->form_input('timespan', $ban['timespan'], "text", "", '5' ) . '&nbsp;' . $ibforums->adskin->form_dropdown('units', $units, $ban['units'] ),
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email notification to this member?</b><br>(If so, you may edit the email below)" ,
+												                 $ibforums->adskin->form_yes_no( "send_email", 0 )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email contents</b><br>(Tags: {membername} = member's name, {date_end} = ban end)" ,
+												                 $ibforums->adskin->form_textarea( "email_contents", $contents )
+									                    ), "", 'top'       );
+									     									     
+		$ibforums->html .= $ibforums->adskin->end_form("Suspend This Account");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// SUSPEND COMPLETE
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_suspend_complete()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		$ibforums->admin->page_title = "Account Suspension";
+		
+		$ibforums->admin->page_detail = "Automated temporary member suspension. Confirmation and information";
+		
+		$ibforums->input['mid'] = intval($ibforums->input['mid']);
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify a valid member id, please go back and try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "id=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $member = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("We could not match that ID in the members database");
+		}
+		
+		//-----------------------------------------
+		// Work out end date
+		//-----------------------------------------
+		
+		$ibforums->input['timespan'] = intval($ibforums->input['timespan']);
+		
+		if ( $ibforums->input['timespan'] == "" )
+		{
+			$new_ban = "";
+		}
+		else
+		{
+			$new_ban = $std->hdl_ban_line( array( 'timespan' => intval($ibforums->input['timespan']), 'unit' => $ibforums->input['units']  ) );
+		}
+		
+		$show_ban = $std->hdl_ban_line( $new_ban );
+			
+		//-----------------------------------------
+		// Update and show confirmation
+		//-----------------------------------------
+			
+		$DB->do_update( 'members', array( 'temp_ban' => $new_ban ), "id=".$ibforums->input['mid'] );
+		
+		// I say, did we choose to email 'dis member?
+		
+		if ($ibforums->input['send_email'] == 1)
+		{
+			// By golly, we did!
+			
+			require "./sources/classes/class_email.php";
+		
+			$this->email = new emailer();
+			
+			$msg = trim($std->txt_stripslashes($_POST['email_contents']));
+			
+			$msg = str_replace( "{membername}", $member['name']       , $msg );
+			$msg = str_replace( "{date_end}"  , $ibforums->admin->get_date( $show_ban['date_end'], 'LONG') , $msg );
+			
+			$this->email->message = $this->email->clean_message($msg);
+			$this->email->subject = "Account Suspension Notification";
+			$this->email->to      = $member['email'];
+			$this->email->send_mail();
+		}
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_query = "";
+		
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_query .= '&'.$bit.'='.trim($ibforums->input[ $bit ]);
+		}
+		
+		$ibforums->admin->save_log("Suspended Member(s) ( {$member['name']} )");
+		
+		$ibforums->admin->done_screen("Suspended Member(s)", "Member Search", "act=mem".$page_query, "redirect" );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Unsuspend
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_unsuspend()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify a valid member id, please go back and try again");
+		}
+		
+		if ($ibforums->input['mid'] == 'all')
+		{
+			$DB->do_update( 'members', array( 'temp_ban' => $new_ban ), "" );
+			
+			$ibforums->admin->save_log("Unsuspended all member accounts");
+		
+			$msg = "All Accounts Unsuspended";
+		}
+		else
+		{
+			$mid = intval($ibforums->input['mid']);
+			
+			$DB->do_update( 'members', array( 'temp_ban' => $new_ban ), "id=$mid" );
+			
+			$DB->simple_construct( array( 'select' => 'name', 'from' => 'members', 'where' => "id=$mid" ) );
+			$DB->simple_exec();
+			
+			$member = $DB->fetch_row();
+			
+			$ibforums->admin->save_log("Unsuspended {$member['name']}");
+		
+			$msg = "{$member['name']} Unsuspended";
+		}
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_query = "";
+		
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_query .= '&'.$bit.'='.trim($ibforums->input[ $bit ]);
+		}
+		
+		$ibforums->admin->done_screen($msg, "Member Search", "act=mem".$page_query, "redirect" );
+		
+	}
+	
+	
+	
+	
+		
+	/*-------------------------------------------------------------------------*/
+	//
+	// CHANGE MEMBER NAME
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_change_name_complete()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		$ibforums->input['new_name'] = str_replace( '|', '&#124;', $ibforums->input['new_name'] );
+		
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify a valid member id, please go back and try again");
+		}
+		
+		if ($ibforums->input['new_name'] == "")
+		{
+			$this->change_name_start("You must enter a new name for this member");
+			exit();
+		}
+		
+		//-----------------------------------------
+		// Select
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "id=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $member = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("We could not match that ID in the members database");
+		}
+		
+		$mid = $ibforums->input['mid']; // Save me poor ol' carpels
+		
+		if ($ibforums->input['new_name'] == $member['name'])
+		{
+			$this->member_change_name_start("The new name is the same as the old name, that is illogical captain");
+			exit();
+		}
+		
+		//-----------------------------------------
+		// Check to ensure that his member name hasn't already been taken.
+		//-----------------------------------------
+		
+		$new_name = trim($ibforums->input['new_name']);
+		
+		$DB->cache_add_query( 'login_getmember', array( 'username' => strtolower($new_name) ) );
+		$DB->cache_exec_query();
+	
+		if ( $DB->get_num_rows() )
+		{
+			$this->member_change_name_start("The name '$new_name' already exists, please choose another");
+			exit();
+		}
+		
+		//-----------------------------------------
+		// If one gets here, one can assume that the new name is correct for one, er...one.
+		// So, lets do the converteroo
+		//-----------------------------------------
+		
+		$DB->do_update( 'members'       , array( 'name'             => $new_name ), "id="            .$mid );
+		$DB->do_update( 'contacts'      , array( 'contact_name'     => $new_name ), "contact_id="    .$mid );
+		$DB->do_update( 'forums'        , array( 'last_poster_name' => $new_name ), "last_poster_id=".$mid );
+		$DB->do_update( 'moderator_logs', array( 'member_name'      => $new_name ), "member_id="     .$mid );
+		$DB->do_update( 'moderators'    , array( 'member_name'      => $new_name ), "member_id="     .$mid );
+		$DB->do_update( 'posts'         , array( 'author_name'      => $new_name ), "author_id="     .$mid );
+		$DB->do_update( 'sessions'      , array( 'member_name'      => $new_name ), "member_id="     .$mid );
+		$DB->do_update( 'topics'        , array( 'starter_name'     => $new_name ), "starter_id="    .$mid );
+		$DB->do_update( 'topics'        , array( 'last_poster_name' => $new_name ), "last_poster_id=".$mid );
+		
+		//-----------------------------------------
+		// Recache moderators
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH .'sources/admin/ad_moderator.php' );
+		$admod = new ad_moderator();
+		
+		$admod->rebuild_moderator_cache();
+				
+		//-----------------------------------------
+		// I say, did we choose to email 'dis member?
+		//-----------------------------------------
+		
+		if ($ibforums->input['send_email'] == 1)
+		{
+			//-----------------------------------------
+			// By golly, we did!
+			//-----------------------------------------
+			
+			require "./sources/classes/class_email.php";
+		
+			$this->email = new emailer();
+			
+			$msg = trim($HTTP_POST_VARS['email_contents']);
+			
+			$msg = str_replace( "{old_name}", $member['name'], $msg );
+			$msg = str_replace( "{new_name}", $new_name      , $msg );
+			
+			$this->email->message = $this->email->clean_message($msg);
+			$this->email->subject = "Member Name Change Notification";
+			$this->email->to      = $member['email'];
+			$this->email->send_mail();
+		}
+		
+		$ibforums->admin->save_log("Changed Member Name '{$member['name']}' to '$new_name'");
+		
+		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+			$this->modules->on_name_change($mid, $new_name );
+		}
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_query = "";
+		
+		$ibforums->input['name'] = $new_name;
+		
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_query .= '&'.$bit.'='.trim($ibforums->input[ $bit ]);
+		}
+		
+		$ibforums->admin->done_screen("Member's Name Changed", "Member Search", "act=mem".$page_query, "redirect" );
+	}
+	
+	
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Change name complete
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_change_name_start($message="")
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Change Member Name";
+		
+		$ibforums->admin->page_detail = "You may enter a new name for this member.";
+		
+		//-----------------------------------------
+		// check
+		//-----------------------------------------
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You must specify a valid member id, please go back and try again");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "id=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $member = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("We could not match that ID in the members database");
+		}
+		
+		$contents = "{old_name},\nAn administrator has changed your member name on {$ibforums->vars['board_name']}.\n\nYour new name is: {new_name}\n\nPlease remember this as you may need to use this new name when you log in next time.\nBoard Address: {$ibforums->vars['board_url']}/index.php";
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_array = array( 1 => array( 'code'  , 'dochangename'  ),
+							 2 => array( 'act'   , 'mem'       ),
+							 3 => array( 'mid'   , $ibforums->input['mid']  ),
+						   );
+									     				
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_array[] = array( $bit, trim($ibforums->input[ $bit ]) );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( $page_array );
+		
+		//-----------------------------------------
+		// start form
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Change Member Name" );
+		
+		if ($message != "")
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Error Message:</b>" ,
+												                 	  "<b><span style='color:red'>$message</span></b>",
+									                    	 )      );
+		}
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Current Member's Name</b>" ,
+												                 $member['name'],
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>New Members Name</b>" ,
+												                 $ibforums->adskin->form_input( "new_name", $ibforums->input['new_name'] )
+									                    )      );
+
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email notification to this member?</b><br>(If so, you may edit the email below)" ,
+												                 $ibforums->adskin->form_yes_no( "send_email", 1 )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email contents</b><br>(Tags: {old_name} = current name, {new_name} = new name)" ,
+												                 $ibforums->adskin->form_textarea( "email_contents", $contents )
+									                    )      );
+									     									     
+		$ibforums->html .= $ibforums->adskin->end_form("Change this members name");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+
+	//-----------------------------------------
+	//
+	// Moderation control...
+	//
+	//-----------------------------------------
+	
+	function domod()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ids = array();
+		
+		foreach ($ibforums->input as $k => $v)
+		{
+			if ( preg_match( "/^mid_(\d+)$/", $k, $match ) )
+			{
+				if ($ibforums->input[ $match[0] ])
+				{
+					$ids[] = $match[1];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		
+		if ( count($ids) < 1 )
+		{	
+			$ibforums->admin->error("You did not select any members to approve or delete");
+		}
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['type'] == 'approve')
+		{
+		
+			//-----------------------------------------
+			
+			require ROOT_PATH."sources/classes/class_email.php";
+			
+			$email = new emailer();
+			
+			$email->get_template("complete_reg");
+			
+			$email->build_message( "" );
+			
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'member_domod', array( 'ids' => $ids ) );
+			$main = $DB->cache_exec_query();
+			
+			while( $row = $DB->fetch_row( $main ) )
+			{
+				if ($row['mgroup'] != $ibforums->vars['auth_group'])
+				{
+					continue;
+				}
+				
+				if ($row['real_group'] == "")
+				{
+					$row['real_group'] = $ibforums->vars['member_group'];
+				}
+				
+				$DB->do_update( 'members', array( 'mgroup' => $row['real_group'] ), "id=".$row['id'] );
+				
+				$email->subject = "Account validated at ".$ibforums->vars['board_name'];
+				
+				$email->to = $row['email'];
+				
+				$email->send_mail();
+				
+				if ( USE_MODULES == 1 )
+				{
+					$this->modules->register_class(&$this);
+					$this->modules->on_group_change($row['id'], $row['real_group']);
+				}
+			}
+			
+			$DB->simple_exec_query( array( 'delete' => 'validating', 'where' => "member_id IN(".implode( ",",$ids ).")" ) );
+			
+			$DB->simple_construct( array( 'select' => 'id, name',
+										  'from'   => 'members',
+										  'where'  => "mgroup <> ".$ibforums->vars['auth_group'],
+										  'order'  => 'id DESC',
+										  'limit'  => array( 0,1 ) ) );
+			$DB->simple_exec();
+			
+			$r = $DB->fetch_row();
+
+			$ibforums->admin->save_log("Approved Queued Registrations");
+			
+			$ibforums->admin->done_screen( count($ids)." Members Approved", "Manage Registrations", "act=mem&code=mod" );	
+			
+		}
+		else
+		{
+			$DB->simple_exec_query( array( 'delete' => 'members'        , 'where' => "id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'member_extra'   , 'where' => "id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'message_text'   , 'where' => "msg_author_id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'message_topics' , 'where' => "mt_owner_id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'contacts'       , 'where' => "member_id IN(".implode( ",",$ids ).") or contact_id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'validating'     , 'where' => "member_id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'pfields_content', 'where' => "member_id IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'warn_logs'      , 'where' => "wlog_mid IN(".implode( ",",$ids ).")" ) );
+			$DB->simple_exec_query( array( 'delete' => 'members_converge', 'where' => "converge_id IN(".implode( ",",$ids ).")" ) );
+			
+			$DB->do_update( 'posts' , array( 'author_id'  => 0 ), "author_id  IN(".implode( ",",$ids ).")" );
+			$DB->do_update( 'topics', array( 'starter_id' => 0 ), "starter_id IN(".implode( ",",$ids ).")" );
+			
+			if ( USE_MODULES == 1 )
+			{
+				$this->modules->register_class(&$this);
+				$this->modules->on_delete($ids);
+			}
+			
+			$ibforums->admin->save_log("Denied Queued Registrations");
+			
+			$ibforums->admin->done_screen( count($ids)." Members Removed", "Manage Registrations", "act=mem&code=mod" );
+		}
+		
+	}
+	
+	
+	//-----------------------------------------
+	
+	function view_mod()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title  = "Manage User Registration/Email Change Queues";
+		
+		$ibforums->admin->page_detail = "This section allows you to allow or deny registrations where you have requested that an administrator previews new accounts before allowing full membership. It will also allow you to complete or deny new email address changes.<br><br>This form will also allow you to complete the registrations for those who did not receive an email.";
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(vid) as mcount', 'from' => 'validating', 'where' => "lost_pass <> 1" ) );
+		$DB->simple_exec();
+		
+		$row = $DB->fetch_row();
+		
+		$cnt = $row['mcount'] < 1 ? 0 : $row['mcount'];
+		
+		$st = intval($ibforums->input['st']);
+		
+		$ord = $ibforums->input['ord'] == 'asc' ? 'asc' : 'desc';
+		
+		$new_ord  = $ord  == 'asc' ? 'desc' : 'asc';
+		
+		switch ($ibforums->input['sort'])
+		{
+			case 'mem':
+				$col = 'm.name';
+				break;
+			case 'email':
+				$col = 'm.email';
+				break;
+			case 'sent':
+				$col = 'v.entry_date';
+				break;
+			case 'posts':
+				$col = 'm.posts';
+				break;
+			case 'reg':
+				$col = 'm.joined';
+				break;
+			default:
+				$col = 'v.entry_date';
+				break;
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'domod'  ),
+																 2 => array( 'act'   , 'mem'    ),
+														)      );
+									     
+		$ibforums->adskin->td_header[] = array( "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod&st=$st&sort=mem&ord=$new_ord'>Member Name</a>"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "Where?"            , "20%" );
+		$ibforums->adskin->td_header[] = array( "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod&st=$st&sort=email&ord=$new_ord'>Email Address</a>"     , "15%" );
+		$ibforums->adskin->td_header[] = array( "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod&st=$st&sort=sent&ord=$new_ord'>Email Sent</a>"        , "10%" );
+		$ibforums->adskin->td_header[] = array( "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod&st=$st&sort=posts&ord=$new_ord'>Posts</a>"             , "10%" );
+		$ibforums->adskin->td_header[] = array( "<a href='{$ibforums->adskin->base_url}&act=mem&code=mod&st=$st&sort=reg&ord=$new_ord'>Reg. On</a>"           , "10%" );
+		$ibforums->adskin->td_header[] = array( "Age" , "10%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"            , "5%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Users awaiting authorisation" );
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $cnt,
+											   'PER_PAGE'    => 75,
+											   'CUR_ST_VAL'  => $st,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Multiple Pages",
+											   'BASE_URL'    => $ibforums->adskin->base_url."&act=mem&code=mod",
+									  )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<b>$cnt users require registration or email change validation</b>", "center", "catrow2");
+		
+		if ($cnt > 0)
+		{
+			$DB->cache_add_query( 'member_view_mod', array( 'col' => $col, 'ord' => $ord, 'st' => $st ) );
+			$DB->cache_exec_query();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				if ($r['coppa_user'] == 1)
+				{
+					$coppa = ' ( COPPA Request )';
+				}
+				else
+				{
+					$coppa = "";
+				}
+				
+				$where = ( $r['lost_pass'] ? 'Lost Password' : ( $r['new_reg'] ? "Registering" : ( $r['email_chg'] ? "Email Change" : 'N/A' ) ) );
+				
+				//$age = floor( ( time() - $r['entry_date'] ) / 86400 );
+				
+				$hours  = floor( ( time() - $r['entry_date'] ) / 3600 );
+				
+				$days   = intval( $hours / 24 );
+				
+				$rhours = intval( $hours - ($days * 24) );
+				
+				if ( $r['name'] == "" )
+				{
+					$r['name'] = "<em>Deleted Member</em>";
+				}
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$r['name']."</b>$coppa" ,
+																		 "<center>$where</center>",
+																		 $r['email'],
+																		 "<center>".$std->get_date( $r['entry_date'], 'JOINED' )."</center>",
+																		 "<center>{$r['posts']}</center>",
+																		 "<center>".$std->get_date( $r['joined'], 'JOINED' )."</center>",
+																		 "<center><strong><span style='color:red'>$days d</span>, $rhours h</center>",
+																		 "<center><input type='checkbox' name='mid_{$r['member_id']}' value='1'></center>"
+															)      );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "$links", "left", "catrow2");
+	
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<select name='type' id='dropdown'><option value='approve'>Approve these Accounts</option><option value='delete'>DELETE these accounts</option></select>", "center", "catrow2" );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Go!");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+		
+		
+	//-----------------------------------------
+	//
+	// MEMBER RANKS...
+	//
+	//-----------------------------------------
+	
+	function titles_recache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['ranks'] = array();
+        	
+		$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+									  'from'   => 'titles',
+									  'order'  => "posts DESC",
+							)      );
+							
+		$DB->simple_exec();
+					
+		while ($i = $DB->fetch_row())
+		{
+			$ibforums->cache['ranks'][ $i['id'] ] = array(
+														  'TITLE' => $i['title'],
+														  'PIPS'  => $i['pips'],
+														  'POSTS' => $i['posts'],
+														);
+		}
+		
+		$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	
+	
+	function titles_start()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Member Ranking Set Up";
+		
+		$ibforums->admin->page_detail = "This section allows you to modify, delete or add extra ranks.<br>If you wish to display pips below the members name, enter the number of pips. If you wish to use a custom image, simply enter the image name in the pips box. Note, these custom images must reside in the 'style_images/{img_dir}/folder_team_icons' directory of your installation";
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Title"      , "30%" );
+		$ibforums->adskin->td_header[] = array( "Min Posts"  , "10%" );
+		$ibforums->adskin->td_header[] = array( "Pips"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"     , "20%" );
+		
+		//-----------------------------------------
+		// Parse macro
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_default=1" ) );
+		$DB->simple_exec();
+		
+		$mid = $DB->fetch_row();
+		
+		$DB->simple_construct( array( 'select' => 'macro_replace', 'from' => 'skin_macro', 'where' => "macro_set=1 AND macro_value='A_STAR'" ) );
+		$DB->simple_exec();
+    	           
+    	$row = $DB->fetch_row();
+
+    	$row['A_STAR'] = str_replace( "<#IMG_DIR#>", $mid['set_image_dir'], $row['macro_replace'] );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Titles/Ranks" );
+		
+		//-----------------------------------------
+		// Lets get on with it...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'titles', 'order' => "posts" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$img = "";
+			
+			if ( preg_match( "/^\d+$/", $r['pips'] ) )
+			{
+				for ($i = 1; $i <= $r['pips']; $i++)
+				{
+					$img .= $row['A_STAR'];
+					
+				}
+			}
+			else
+			{
+				$img = "<img src='style_images/{$mid['set_image_dir']}/folder_team_icons/{$r['pips']}' border='0'>";
+			}
+				
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$r['title']."</b>" ,
+																	 $r['posts'],
+																	 $img,
+																	 "<a href='{$ibforums->adskin->base_url}&act=mem&code=rank_edit&id={$r['id']}'>Edit</a>",
+																	 "<a href='{$ibforums->adskin->base_url}&act=mem&code=rank_delete&id={$r['id']}'>Delete</a>",
+															)      );
+		}
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'do_add_rank'  ),
+												 				 2 => array( 'act'   , 'mem'       ),
+									   				    )      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Add a Member Rank" );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rank Title</b>" ,
+												  $ibforums->adskin->form_input( "title" )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Minimum number of posts needed</b>" ,
+												  $ibforums->adskin->form_input( "posts" )
+									     )      );
+
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Number of pips</b><div class='graytext'>Or pip image - image must be uploaded into 'style_images/{img_dir}/folder_team_icons'</div>" ,
+												  $ibforums->adskin->form_input( "pips" )
+									     )      );
+									     									     
+		$ibforums->html .= $ibforums->adskin->end_form("Add this rank");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	
+	function titles_add_rank()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// check for input
+		//-----------------------------------------
+		
+		foreach( array( 'posts', 'title', 'pips' ) as $field )
+		{
+			if ($ibforums->input[ $field ] == "")
+			{
+				$ibforums->admin->error("You must complete the form fully");
+			}
+		}
+		
+		//-----------------------------------------
+		// Add it to the DB
+		//-----------------------------------------
+		
+		$DB->do_insert( 'titles', array(
+										 'posts'  => trim($ibforums->input['posts']),
+										 'title'  => trim($ibforums->input['title']),
+										 'pips'   => trim($ibforums->input['pips']),
+							  )       );
+		
+		$this->titles_recache();
+												  
+		$ibforums->admin->done_screen("Rank Added", "Member Ranking Control", "act=mem&code=title", 'redirect' );					
+		
+		
+	}
+	
+	//-----------------------------------------
+	
+	function titles_delete_rank()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// check for input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("We could not match that ID");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'titles', 'where' => "id='".$ibforums->input['id']."'" ) );
+		
+		$this->titles_recache();
+		
+		$ibforums->admin->save_log("Removed Rank Setting");
+		
+		$ibforums->admin->done_screen("Rank Removed", "Member Ranking Control", "act=mem&code=title", 'redirect' );
+		
+	}
+	
+	//-----------------------------------------
+	
+	function titles_edit_rank()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// check for input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("We could not match that ID");
+		}
+		
+		//-----------------------------------------
+		
+		foreach( array( 'posts', 'title', 'pips' ) as $field )
+		{
+			if ($ibforums->input[ $field ] == "")
+			{
+				$ibforums->admin->error("You must complete the form fully");
+			}
+		}
+		
+		//-----------------------------------------
+		// Add it to the DB
+		//-----------------------------------------
+		
+		$DB->do_update( 'titles', array (
+										   'posts'  => trim($ibforums->input['posts']),
+										   'title'  => trim($ibforums->input['title']),
+										   'pips'   => trim($ibforums->input['pips']),
+								) , "id='".$ibforums->input['id']."'"  );
+								
+		$this->titles_recache();
+												  
+		$ibforums->admin->save_log("Edited Rank Setting");
+		
+		$ibforums->admin->done_screen("Rank Edited", "Member Ranking Control", "act=mem&code=title", 'redirect' );					
+		
+		
+	}
+	
+	//-----------------------------------------
+	
+	function titles_rank_setup($mode='edit')
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Member Rank Set Up";
+		
+		$ibforums->admin->page_detail = "If you wish to display pips below the members name, enter the number of pips. If you wish to use a custom image, simply enter the image name in the pips box. Note, these custom images must reside in the 'style_images/{img_dir}/folder_team_icons' directory of your installation";
+		
+		if ($mode == 'edit')
+		{
+			$form_code = 'do_rank_edit';
+			
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("No rank ID was set, please try again");
+			}
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'titles', 'where' => "id='".$ibforums->input['id']."'" ) );
+			$DB->simple_exec();
+		
+			$rank = $DB->fetch_row();
+			
+			$button = "Complete Edit";
+		}
+		else
+		{
+			$form_code = 'do_add_rank';
+			$rank = array( 'posts' => "", 'title' => "", 'pips' => "");
+			$button = "Add this rank";
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $form_code  ),
+																 2 => array( 'act'   , 'mem'       ),
+																 3 => array( 'id'    , $rank['id'] ),
+														)      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Ranks" );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rank Title</b>" ,
+												  $ibforums->adskin->form_input( "title", $rank['title'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Minimum number of posts needed</b>" ,
+												  $ibforums->adskin->form_input( "posts", $rank['posts'] )
+									     )      );
+
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Number of pips</b><br>(Or pip image)" ,
+												  $ibforums->adskin->form_input( "pips", $rank['pips'] )
+									     )      );
+									     									     
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	
+	function member_prune_confirm($ids=array(), $query)
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Got members?
+		//-----------------------------------------
+		
+		if ( count($ids) < 101)
+		{
+			foreach( $ids as $i => $n )
+			{
+				$member_arr[] = "<a href='index.php?showuser={$n[0]}' target='_blank'>{$n[1]}</a>";
+			}
+		}
+		
+		$ibforums->admin->page_title = "Member Pruning";
+		
+		$ibforums->admin->page_detail = "Please confirm your action.";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doprune' ),
+												  				 2 => array( 'act'   , 'mem'     ),
+												  				 3 => array( 'query' , str_replace( "'", '&#39;', $query ) ),
+									     				 )      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Prune Confirmation" );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Number of members to prune</b>" ,
+												  				 count($ids)
+									     				)      );
+									     
+		if ( count($member_arr) > 0 )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Members to prune</b>" ,
+												    		  implode( '<br />', $member_arr )
+											                )      );
+		}
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Complete Member Pruning");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// COMPLETE PRUNE
+	//
+	//-----------------------------------------
+	
+	function member_doprune()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Make sure we have *something*
+		//-----------------------------------------
+		
+		$query = trim(urldecode($std->txt_stripslashes($_POST['query'])));
+		
+		$query = str_replace( "&lt;" , "<", $query );
+		$query = str_replace( "&gt;" , ">", $query );
+		$query = str_replace( '&#39;', "'", $query );
+		
+		if ($query == "")
+		{
+			$ibforums->admin->error("Prune query error, no query to use");
+		}
+		
+		//-----------------------------------------
+		// Get the member ids...
+		//-----------------------------------------
+		
+		$ids = array();
+		
+		$DB->query($query);
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ($i = $DB->fetch_row())
+			{
+				if ( $i['memid'] )
+				{
+					$ids[] = $i['memid'];
+				}
+				else if ( $i['id'] )
+				{
+					$ids[] = $i['id'];
+				}
+			}
+		}
+		else
+		{
+			$ibforums->admin->error("Could not find any members that matched the prune criteria");
+		}
+		
+		$this->member_delete_do($ids);
+		
+		$ibforums->admin->done_screen("Member Account(s) Deleted", "Member Control", "act=mem" );
+		
+	}
+	
+	
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// DELETE MEMBER(S)
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_delete_do($id)
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Sort out thingie
+		//-----------------------------------------
+		
+		if ( is_array( $id ) )
+		{
+			$mids = ' IN ('.implode(",",$id).')';
+		}
+		else
+		{
+			$mids = ' = '.$id;
+		}
+		
+		//-----------------------------------------
+		// Get avatars / photo
+		//-----------------------------------------
+		
+		$delete_files = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'member_extra', 'where' => 'id'.$mids ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			if ( $r['photo_type'] == 'upload' and $r['photo_location'] )
+			{
+				$delete_files[] = $r['photo_location'];
+			}
+			
+			if ( $r['avatar_type'] == 'upload' and $r['avatar_location'] )
+			{
+				$delete_files[] = $r['avatar_location'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Convert their posts and topics
+		// into guest postings..
+		//-----------------------------------------
+		
+		$DB->do_update( 'posts' , array( 'author_id'  => 0 ), "author_id".$mids );
+		$DB->do_update( 'topics', array( 'starter_id' => 0 ), "starter_id".$mids );
+		
+		//-----------------------------------------
+		// Delete member...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'pfields_content' , 'where' => "member_id".$mids ) );
+		$DB->simple_exec_query( array( 'delete' => 'member_extra'    , 'where' => "id".$mids ) );
+		$DB->simple_exec_query( array( 'delete' => 'members_converge', 'where' => "converge_id".$mids ) );
+		
+		//-----------------------------------------
+		// Delete member messages...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'message_topics', 'where' => "mt_owner_id".$mids ) );
+		$DB->simple_exec_query( array( 'delete' => 'contacts'      , 'where' => "member_id".$mids." or contact_id".$mids ) );
+		
+		//-----------------------------------------
+		// Delete member subscriptions.
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'tracker'      , 'where' => "member_id".$mids ) );
+		$DB->simple_exec_query( array( 'delete' => 'forum_tracker', 'where' => "member_id".$mids ) );
+		$DB->simple_exec_query( array( 'delete' => 'warn_logs'    , 'where' => "wlog_mid" .$mids ) );
+		
+		//-----------------------------------------
+		// Delete from validating..
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'validating', 'where' => "member_id".$mids ) );
+		$DB->simple_exec_query( array( 'delete' => 'members'   , 'where' => "id".$mids ) );
+		
+		//-----------------------------------------
+		// Delete avatars / photos
+		//-----------------------------------------
+		
+		if ( count($delete_files) )
+		{
+			foreach( $delete_files as $file )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$file );
+			}
+		}
+		
+		//-----------------------------------------
+		// Get current stats...
+		//-----------------------------------------
+		
+		$stats = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='stats'" ) );
+		
+		$stats = unserialize(stripslashes($stats['cs_value']));
+		
+		//-----------------------------------------
+		// Rebuild stats
+		//-----------------------------------------
+	
+		$r = $DB->simple_exec_query( array( 'select' => 'count(*) as members', 'from' => 'members', 'where' => "mgroup <> ".$ibforums->vars['auth_group'] ) );
+		$stats['mem_count'] = intval( $r['members'] );
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'id, name',
+										    'from'   => 'members',
+										    'where'  => "mgroup <> ".$ibforums->vars['auth_group'],
+										    'order'  => 'id DESC',
+										    'limit'  => array( 0, 1 )
+								   )      );
+		
+		$stats['last_mem_name'] = $r['name'];
+		$stats['last_mem_id']   = $r['id'];
+		
+		if ( count($stats) > 0 )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key='stats'" ) );
+			$DB->do_insert( 'cache_store', array( 'cs_array' => 1, 'cs_key' => 'stats', 'cs_value' => addslashes(serialize($stats)) ) );
+		}
+			             
+		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+			$this->modules->on_delete($id);
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Delete Members
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function member_delete()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Check input
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['mid'] )
+		{
+			$ibforums->main_msg = "No member found";
+			$this->search_form();
+		}
+		
+		//-----------------------------------------
+		// Single or more?
+		//-----------------------------------------
+		
+		if ( strstr( $ibforums->input['mid'], ',' ) )
+		{
+			$ids = explode( ',', $ibforums->input['mid'] );
+		}
+		else
+		{
+			$ids = array( $ibforums->input['mid'] );
+		}
+		
+		//-----------------------------------------
+		// Get accounts
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => 'id IN ('.implode(",",$ids).')' ) );
+		$DB->simple_exec();
+		
+		$names = array();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$names[] = $r['name'];
+		}
+		
+		//-----------------------------------------
+		// Check
+		//-----------------------------------------
+		
+		if ( ! count( $names ) )
+		{
+			$ibforums->main_msg = "No member(s) found";
+			$this->search_form();
+		}
+		
+		//-----------------------------------------
+		// Delete
+		//-----------------------------------------
+		
+		$this->member_delete_do( $ids );
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_query = "";
+		
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_query .= '&'.$bit.'='.trim($ibforums->input[ $bit ]);
+		}
+		
+		$ibforums->admin->save_log("Deleted Member(s) ( ".implode(",",$names)." )");
+		
+		$ibforums->admin->done_screen("Member(s) Deleted", "Member Search", "act=mem".$page_query, "redirect" );
+		
+	}
+		
+	
+	//-----------------------------------------
+	//
+	// ADD MEMBER FORM
+	//
+	//-----------------------------------------
+	
+	function member_add_form()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Pre Register a member";
+		
+		$ibforums->admin->page_detail = "You may pre-register members using this form.";
+		
+		$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'order' => "g_title" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ($ibforums->vars['admin_group'] == $r['g_id'])
+			{
+				if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+				{
+					continue;
+				}
+			}
+			
+			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
+		}
+		
+		//-----------------------------------------
+		// Custom profile fields stuff
+		//-----------------------------------------
+		
+		$required_output = "";
+		$optional_output = "";
+		$custom_output = "";
+		
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	
+    	$fields->init_data();
+    	$fields->parse_to_register();
+    	
+    	if ( count( $fields->out_fields ) )
+    	{
+    		$ibforums->html .= $ibforums->adskin->add_td_basic( "Custom Profile Fields", "left", "pformstrip" );
+    		
+			foreach( $fields->out_fields as $id => $data )
+			{
+				if ( $fields->cache_data[ $id ]['pf_type'] == 'drop' )
+				{
+					$form_element =  "<select class='dropdown' name='field_{$id}'>{$data}</select>";
+				}
+				else if ( $fields->cache_data[ $id ]['pf_type'] == 'area' )
+				{
+					$form_element = $ibforums->adskin->form_textarea( 'field_'.$id, $data );
+				}
+				else
+				{
+					$form_element = $ibforums->adskin->form_input( 'field_'.$id, $data );
+				}
+				
+				$custom_out .= $ibforums->adskin->add_td_row( array( "<b>{$fields->field_names[ $id ]}</b><div class='graytext'>{$fields->field_desc[ $id ]}</div>" , $form_element ) );
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doadd' ),
+														    	  2 => array( 'act'   , 'mem'     ),
+									  				    )      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Registration" );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Member Name</b>" ,
+												  $ibforums->adskin->form_input( "name", $_POST['name'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Password</b>" ,
+												  $ibforums->adskin->form_input( "password", $_POST['password'], 'password' )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email Address</b>" ,
+												  $ibforums->adskin->form_input( "email", $_POST['email'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Member Group</b>" ,
+												  $ibforums->adskin->form_dropdown( "mgroup",
+																		$mem_group,
+												  						$_POST['mgroup'] ? $_POST['mgroup'] : $ibforums->vars['member_group']
+												  					  )
+									     )      );
+									     
+		if ($custom_out != "")
+		{
+			$ibforums->html .= $custom_out;
+		}
+									     						     
+		$ibforums->html .= $ibforums->adskin->end_form("Register Member");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// Add member
+	//
+	//-----------------------------------------
+	
+	function member_do_add()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check form
+		//-----------------------------------------
+		
+		foreach( array('name', 'password', 'email', 'mgroup') as $field )
+		{
+			if ($ibforums->input[ $field ] == "")
+			{
+				$ibforums->admin->error("You must complete the form fully!");
+			}
+		}
+		
+		//-----------------------------------------
+		// Do we already have such a member?
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'login_getmember', array( 'username' => strtolower($ibforums->input['name']) ) );
+		$DB->cache_exec_query();
+		
+		if ( $DB->get_num_rows() )
+		{
+			$ibforums->main_msg = "We already have a member by that name, please select another";
+			$this->member_add_form();
+		}
+		
+		//-----------------------------------------
+		// Is this email addy taken? CONVERGE THIS??
+		//-----------------------------------------
+		
+		$in_username = trim($ibforums->input['name']);
+		$in_password = trim($ibforums->input['password']);
+		$in_email    = trim(strtolower($ibforums->input['email']));
+		
+		$DB->simple_construct( array( 'select' => 'id', 'from' => 'members', 'where' => "email='".$in_email."'" ) );
+		$DB->simple_exec();
+		
+		$email_check = $DB->fetch_row();
+		
+		if ($email_check['id'])
+		{
+			$ibforums->main_msg = "We already have a member with that email address, please choose another email address";
+			$this->member_add_form();
+		}
+		
+		$member = array(
+						 'name'             => $in_username,
+						 'member_login_key' => $ibforums->converge->generate_auto_log_in_key(),
+						 'email'            => $in_email,
+						 'mgroup'           => $ibforums->input['mgroup'],
+						 'posts'            => 0,
+						 'joined'           => time(),
+						 'ip_address'       => $ibforums->input['IP_ADDRESS'],
+						 'time_offset'      => $ibforums->vars['time_offset'],
+						 'view_sigs'        => 1,
+						 'email_pm'         => 1,
+						 'view_img'         => 1,
+						 'view_avs'         => 1,
+						 'restrict_post'    => 0,
+						 'view_pop'         => 1,
+						 'msg_total'        => 0,
+						 'new_msg'          => 0,
+						 'coppa_user'       => 0,
+						 'language'         => $ibforums->vars['default_language'],
+					   );
+		
+		$salt     = $ibforums->converge->generate_password_salt(5);
+		$passhash = $ibforums->converge->generate_compiled_passhash( $salt, md5($in_password) );
+					   
+		$converge = array( 'converge_email'     => $in_email,
+						   'converge_joined'    => time(),
+						   'converge_pass_hash' => $passhash,
+						   'converge_pass_salt' => str_replace( '\\', "\\\\", $salt )
+						 );
+					   
+		//-----------------------------------------
+		// Insert: CONVERGE
+		//-----------------------------------------
+		
+		$DB->do_insert( 'members_converge', $converge );
+		
+		//-----------------------------------------
+		// Get converges auto_increment user_id
+		//-----------------------------------------
+		
+		$member_id    = $DB->get_insert_id();
+		$member['id'] = $member_id;
+		
+		//-----------------------------------------
+		// Insert: MEMBERS
+		//-----------------------------------------
+		
+		$DB->do_insert( 'members', $member );
+		
+		//-----------------------------------------
+		// Insert: MEMBER EXTRA
+		//-----------------------------------------
+		
+		$DB->do_insert( 'member_extra', array( 'id' => $member_id, 'vdirs' => 'in:Inbox|sent:Sent Items' ) );
+		
+		//-----------------------------------------
+		// Insert into the custom profile fields DB
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->member_id   = $ibforums->member['id'];
+
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_save(1);
+		
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+		
+		$fields->out_fields['member_id'] = $member['id'];
+		
+		$DB->simple_exec_query( array( 'delete' => 'pfields_content', 'where' => 'member_id='.$member['id'] ) );
+		
+		$DB->do_insert( 'pfields_content', $fields->out_fields );
+		
+		//-----------------------------------------
+		// stats
+		//-----------------------------------------
+		
+		$stats = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='stats'" ) );
+		
+		$stats = unserialize(stripslashes($stats['cs_value']));
+		
+		$stats['last_mem_name'] = $in_username;
+		$stats['last_mem_id']   = $member['id'];
+		
+		if ( count($stats) > 0 )
+		{
+			$ibforums->cache['stats'] = $stats;
+			$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 1 ) );
+		}
+		
+		//-----------------------------------------
+		// Log and bog?
+		//-----------------------------------------
+		             
+		$ibforums->admin->save_log("Created new member account for '{$ibforums->input['name']}'");
+		
+		$ibforums->input['searchtype'] = 'normal';
+		$ibforums->input['gotcount']   = 1;
+		
+		$this->search_results();
+		
+		//$ibforums->admin->done_screen("Member Account Created", "Member Control", "act=mem&code=edit", 'redirect' );												 
+		
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// SEARCH FORM, SEARCH FOR MEMBER
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function search_form()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Saved results?
+		//-----------------------------------------
+		
+		if ( ( $ibforums->input['gotcount'] > 1 and $ibforums->input['fromdel'] ) or ( $ibforums->input['gotcount'] and ! $ibforums->input['fromdel'] ) )
+		{
+			$ibforums->input['searchtype'] = 'normal';
+			$this->search_results();
+		}
+		
+		$ibforums->admin->page_title = "Edit a member";
+		
+		$ibforums->admin->page_detail = "Search for a member.";
+		
+		$mem_group = array( 0 => array( 'all', 'Any Group') );
+		
+		$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'order' => "g_title" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
+		}
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'searchresults' ),
+															     2 => array( 'act'   , 'mem'     ),
+									                    )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		// Printy poos 
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Search" );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Member's Name</b><div class='graytext'>This can be left blank if you're using more options below</div>",
+												  				 $ibforums->adskin->form_dropdown( 'namewhere', array( 0 => array( 'begin'   , 'Begins with' ),
+												  				 													   1 => array( 'is'      , 'Is'          ),
+												  				 													   2 => array( 'contains', 'Contains'    ),
+												  				 													   3 => array( 'ends'    , 'Ends with'   )
+												  				 													 ), $_POST['namewhere']
+												  				 								 )
+												  				 .'&nbsp;'. $ibforums->adskin->form_input( "name", $_POST['name'] )
+									     				)      );
+									     				
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b><u>OR</u> Member's ID is...</b>" ,
+												                 $ibforums->adskin->form_input( "memberid", $_POST['mid'] )
+									                    )      );
+									     				
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Type of Search</b>" ,
+												                 $ibforums->adskin->form_dropdown( "searchtype", array( 0 => array( 'normal', 'Find Members to Edit or Delete' ),
+												                 													    1 => array( 'prune' , 'Find Members to Prune (Mass Delete)' )
+												                 													  ), $_POST['searchtype'] )
+									                    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "Optional Search Parameters", "left", "pformstrip" );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email Address contains...</b>" ,
+												                 $ibforums->adskin->form_input( "email", $_POST['email'] )
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Member Suspended</b>" ,
+												                 $ibforums->adskin->form_dropdown( "suspended", array( 0=>array('0','Either'),1=>array('yes', 'Yes'),2=>array('no', 'No') ), $_POST['suspended'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>IP Address contains...</b>" ,
+												                 $ibforums->adskin->form_input( "ip_address", $_POST['ip_address'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>AIM name contains...</b>" ,
+												                 $ibforums->adskin->form_input( "aim_name", $_POST['aim_name'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>ICQ Number contains...</b>" ,
+												                 $ibforums->adskin->form_input( "icq_number", $_POST['icq_number'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Yahoo! Identity contains...</b>" ,
+												                 $ibforums->adskin->form_input( "yahoo", $_POST['yahoo'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Signature contains...</b>" ,
+												                 $ibforums->adskin->form_input( "signature", $_POST['signature'] )
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Less than <em>n</em> posts</b>" ,
+												                 $ibforums->adskin->form_input( "posts", $_POST['posts'] )
+									                    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Registered Between (MM-DD-YYYY)</b><div class='graytext'>Leave the first box blank to range from the earliest record and leave the last box blank to range to the current time now</div>",
+												                 $ibforums->adskin->form_simple_input( "registered_first", $_POST['registered_first'], 10 ). ' to ' .$ibforums->adskin->form_simple_input( "registered_last", $_POST['registered_last'], 10 )
+									                    )      );
+									                    						     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Last Post Between (MM-DD-YYYY)</b><div class='graytext'>Leave the first box blank to range from the earliest record and leave the last box blank to range to the current time now</div>" ,
+												                 $ibforums->adskin->form_simple_input( "last_post_first", $_POST['last_post_first'], 10 ). ' to ' . $ibforums->adskin->form_simple_input( "last_post_last", $_POST['last_post_last'], 10 )
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Last Active Between (MM-DD-YYYY)</b><div class='graytext'>Leave the first box blank to range from the earliest record and leave the last box blank to range to the current time now</div>" ,
+												                 $ibforums->adskin->form_simple_input( "last_activity_first", $_POST['last_activity_first'], 10 ). ' to ' . $ibforums->adskin->form_simple_input( "last_activity_last", $_POST['last_activity_last'], 10 )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Is in group...</b>" ,
+												                 $ibforums->adskin->form_dropdown( "mgroup", $mem_group, $_POST['mgroup'] )
+									                    )      );
+									                    
+		//-----------------------------------------
+    	// Get custom profile information
+    	//-----------------------------------------
+		
+    	require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->member_id   = $ibforums->member['id'];
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_edit();
+    	
+    	if ( count( $fields->out_fields ) )
+    	{
+    		$ibforums->html .= $ibforums->adskin->add_td_basic( "Custom Profile Fields", "left", "pformstrip" );
+    		
+			foreach( $fields->out_fields as $id => $data )
+			{
+				if ( $fields->cache_data[ $id ]['pf_type'] == 'drop' )
+				{
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$fields->field_names[ $id ]."</b>" ,
+												                			 "<select class='dropdown' name='cm_field_{$id}'><option value=''>Any...</option>{$data}</select>"
+									                    			)      );
+				}
+				else
+				{
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$fields->field_names[ $id ]."</b>" ,
+												                 			 $ibforums->adskin->form_simple_input('cm_field_'.$id, $_POST['field_'.$id], 10 )
+												                 	)      );
+				}
+			}
+		}
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Find Member");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// SEARCH RESULTS
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function search_results()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$page_query = "";
+		$un_all     = "";
+		
+		$query = array();
+		
+		//-----------------------------------------
+		// Member extra?
+		//-----------------------------------------
+		
+		$member_extra = array( 'aim_name', 'icq_number', 'yahoo', 'signature' );
+		$date_keys    = array( 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last' );
+		
+		//-----------------------------------------
+		// Loopy loo
+		//-----------------------------------------
+		
+		foreach( array('name', 'memberid', 'email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup') as $bit )
+		{
+			$ibforums->input[ $bit ] = urldecode(trim($ibforums->input[ $bit ]));
+			
+			$page_query .= '&'.$bit.'='.urlencode($ibforums->input[ $bit ]);
+			
+			//-----------------------------------------
+			// Table?
+			//-----------------------------------------
+			
+			$table_prefix = in_array( $bit, $member_extra ) ? 'me.' : 'm.';
+			
+			if ( $ibforums->input[ $bit ] )
+			{	
+				//-----------------------------------------
+				// Time / Date
+				//-----------------------------------------
+				
+				if ( in_array( $bit, $date_keys ) )
+				{
+					list( $month, $day, $year ) = explode( '-', $ibforums->input[ $bit ] );
+					
+					if ( ! checkdate( $month, $day, $year ) )
+					{
+						$ibforums->main_msg = "Date out of range (Month: $month, Day: $day, Year: $year). Dates should be in MM-DD-YYYY";
+						$this->search_form();
+					}
+					
+					$time_int = mktime( 0, 0 ,0,$month, $day, $year );
+					$tmp_bit  = str_replace( '_first'    , '', $bit );
+					$tmp_bit  = str_replace( '_last'     , '', $tmp_bit );
+					$tmp_bit  = str_replace( 'registered', 'joined', $tmp_bit );
+					
+					if ( strstr( $bit, '_first' ) )
+					{
+						$query[] = $table_prefix.$tmp_bit.' > '.$time_int;
+					}
+					else
+					{
+						$query[] = $table_prefix.$tmp_bit.' < '.$time_int;
+					}
+				}
+				else if ($bit == 'mgroup')
+				{
+					if ($ibforums->input['mgroup'] != 'all')
+					{
+						$query[] = $table_prefix."mgroup=".$ibforums->input['mgroup'];
+					}
+				}
+				else if ($bit == 'posts')
+				{
+					$query[] = $table_prefix."posts <".$ibforums->input[$bit];
+				}
+				else if ($bit == 'suspended')
+				{
+					if ( $ibforums->input[$bit] == 'yes' )
+					{
+						$query[] = $table_prefix."temp_ban > 0";
+					}
+					else if ( $ibforums->input[$bit] == 'no' )
+					{
+						$query[] = $table_prefix."temp_ban < 1 or temp_ban='' or temp_ban is null";
+					}
+				}
+				else if ($bit == 'name')
+				{
+					$start_bit = '%';
+					$end_bit   = '%';
+					
+					if ( $ibforums->input['namewhere'] == 'begin' )
+					{
+						$start_bit = '';
+					}
+					else if ( $ibforums->input['namewhere'] == 'ends' )
+					{
+						$end_bit   = '';
+					}
+					else if ( $ibforums->input['namewhere'] == 'is' )
+					{
+						$end_bit   = '';
+						$start_bit = '';
+					}
+					
+					$query[] = $table_prefix.$bit." LIKE '".$start_bit.$ibforums->input[$bit].$end_bit."'";
+				}
+				else if ($bit == 'memberid')
+				{
+					$query[] = $table_prefix."id=".intval($ibforums->input[$bit]);
+				}
+				else
+				{
+					$query[] = $table_prefix.$bit." LIKE '%".$ibforums->input[$bit]."%'";
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Custom fields...
+		//-----------------------------------------
+		
+		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^cm_field_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ( $ibforums->input[ $match[0] ] )
+ 				{
+ 					$query[]     = 'p.field_'.$match[1]." LIKE '%".$ibforums->input[ $match[0] ]."%'";
+ 					$page_query .= '&cm_field_'.$match[1].'='.urlencode($ibforums->input[ $match[0] ]);
+ 				}
+ 			}
+ 		}
+		
+		//-----------------------------------------
+		// get 'owt?
+		//-----------------------------------------
+		
+		if ( count($query) )
+		{
+			$rq = ' WHERE '.implode( " AND ", $query );
+		}
+		
+		//-----------------------------------------
+		// On with the show
+		//-----------------------------------------
+		
+		$st = intval($ibforums->input['st']);
+		
+		$DB->cache_add_query( 'member_search_form_one', array( 'rq' => $rq, 'st' => $st ) );
+		$query = $DB->cur_query;
+		$DB->flush_query();
+		
+		$DB->cache_add_query( 'member_search_form_two', array( 'rq' => $rq ) );
+		$pquery = $DB->cur_query;
+		$DB->flush_query();
+		
+		//-----------------------------------------
+		// Get the number of results
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'member_search_form_count', array( 'rq' => $rq ) );
+		$DB->cache_exec_query();
+		
+		$count = $DB->fetch_row();
+		
+		if ($count['count'] < 1)
+		{
+			$ibforums->main_msg = "Your search query did not return any matches from the member database.";
+			$this->search_form();
+		}
+		
+		//-----------------------------------------
+		// Prune you fookers?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['searchtype'] != 'normal' )
+		{
+			$ids = array();
+			
+			$DB->query($pquery);
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$ids[ $r['id'] ] = array( $r['id'], $r['name'] );
+			}
+			
+			$this->member_prune_confirm($ids, $pquery );
+			exit();
+		}
+		
+		$page_query .= '&searchtype=normal&namewhere='.$ibforums->input['namewhere'].'&gotcount='.$count['count'];
+		
+		$ibforums->admin->page_title = "Your Member Search Results";
+		
+		$ibforums->admin->page_detail = "Your search results.";
+		
+		//-----------------------------------------
+		
+		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['count'],
+											   'PER_PAGE'    => 25,
+											   'CUR_ST_VAL'  => $ibforums->input['st'],
+											   'L_SINGLE'    => $un_all."Single Page",
+											   'L_MULTI'     => $un_all."Multi Page",
+											   'BASE_URL'    => $ibforums->adskin->base_url."&act=mem&showsusp={$ibforums->input['showsusp']}&code={$ibforums->input['code']}".$page_query,
+											 )
+									  );
+		
+		//-----------------------------------------
+		// Run the query
+		//-----------------------------------------
+		
+		$ibforums->html .= "
+							<div class='tableborder'>
+							 <div class='maintitle'>Member Search Results: {$count['count']} result(s) found</div>
+							 <table cellpadding='4' cellspacing='0' border='0' width='100%'>
+						   ";
+						   
+		$per_row  = 3;
+		$td_width = 100 / $per_row;
+		$count    = 0;
+		$people   = "<tr align='center'>\n";
+						   
+		$DB->query($query);
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$count++;
+			
+			$r['id'] = $r['memid'];
+			
+			if ( ! $r['temp_ban'] )
+			{
+				$class = 'tdrow1';
+				
+				$suspend_html = "<tr>
+								 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_suspend.gif' border='0' /><td>
+								 <td width='99%'><a style='text-decoration:none' href='{$ibforums->adskin->base_url}&act=mem&code=banmember&mid={$r['id']}{$page_query}' title='Suspend Member'>Suspend Member</a></td>
+								</tr>";
+								
+			}
+			else
+			{
+				$s_ban = $std->hdl_ban_line( $r['temp_ban'] );
+				
+				$class = 'tdrow2';
+				
+				$suspend_html = "<tr>
+								 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_suspend.gif' border='0' /><td>
+								 <td width='99%'><strong><a style='text-decoration:none' href='{$ibforums->adskin->base_url}&act=mem&code=unsuspend&mid={$r['id']}{$page_query}'>Unsuspend</a></strong>
+								 				 <span style='font-size:10px' class='graytext'>(".$ibforums->admin->get_date( $s_ban['date_end'], 'LONG') .$sus_link.")</span>
+								 </td>
+								</tr>";
+			}
+			
+			//-----------------------------------------
+			// Avatar?
+			//-----------------------------------------
+			
+			if ( $r['avatar_location'] and $r['avatar_type'] )
+			{
+				$avatar = $std->get_avatar( $r['avatar_location'], 1, '25x25', $r['avatar_type'] );
+				
+				if ( ! strstr( $avatar, 'width=' ) )
+				{
+					$avatar = str_replace( '<img', "<img width='25' height='25'", $avatar );
+				}
+			}
+			else
+			{
+				$avatar = "<img src='{$ibforums->adskin->img_url}/memsearch_head.gif' border='0' />";
+			}
+			
+			$joined = $std->get_date( $r['joined'], 'JOINED' );
+			
+			$people .= "<td width='{$td_width}%' align='left' class='$class'>
+						  <fieldset>
+						  	<legend><strong>{$r['name']}</strong></legend>
+						  	<div style='border:1px solid #BBB;background-color:#FFF;margin:2px;padding:1px'>
+						  	<table cellpadding='2' cellspacing='0' border='0' width='100%'>
+						  	<tr>
+						  	 <td width='1%' align='center'>{$avatar}<td>
+						  	 <td width='99%'>
+						  	  <a style='font-size:12px;font-weight:bold' title='View this members profile' href='index.{$ibforums->vars['php_ext']}?showuser={$r['id']}' target='blank'>{$r['name']}</a>
+						  	  &nbsp;<span style='font-size:10px' class='graytext'>({$r['ip_address']})</span>
+						  	 </td>
+						  	</tr>
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_email.gif' border='0' /><td>
+						  	 <td width='99%'><strong>{$r['email']}</strong></td>
+						  	</tr>
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_group.gif' border='0' /><td>
+						  	 <td width='99%'><strong>{$ibforums->cache['group_cache'][$r['mgroup']]['g_title']}</strong> <span style='font-size:10px' class='graytext'>({$r['posts']} Posts)</span></td>
+						  	</tr>
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_posts.gif' border='0' /><td>
+						  	 <td width='99%'><strong>Joined: {$joined}</strong></td>
+						  	</tr>
+						  	</table>
+						  	</div>
+						  	<div style='border:1px solid #BBB;background-color:#EEE;margin:2px;padding:1px'>
+						  	<table cellpadding='4' cellspacing='0' border='0' width='100%'>
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_changename.gif' border='0' /><td>
+						  	 <td width='99%'><strong><a style='text-decoration:none' href='{$ibforums->adskin->base_url}&act=mem&code=doform&mid={$r['id']}{$page_query}' title='Edit this members account'>Edit Member's Profile</a></strong></td>
+						  	</tr>
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_changename.gif' border='0' /><td>
+						  	 <td width='99%'><a style='text-decoration:none' href='{$ibforums->adskin->base_url}&act=mem&code=changename&mid={$r['id']}{$page_query}' title='Change this members name'>Change Member's Name</a></td>
+						  	</tr>
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_changename.gif' border='0' /><td>
+						  	 <td width='99%'><a style='text-decoration:none' href='{$ibforums->base_url}&act=mem&code=changepassword&id={$r['id']}{$page_query}'>Change/Reset Password</a></td>
+						  	</tr>
+						  	
+						  	{$suspend_html}
+						  	
+						  	<tr>
+						  	 <td width='1%' align='center'><img src='{$ibforums->adskin->img_url}/memsearch_delete.gif' border='0' /><td>
+						  	 <td width='99%'><a style='text-decoration:none' href='#' onclick='maincheckdelete(\"{$ibforums->adskin->base_url}&act=mem&code=member_delete&fromdel=1&mid={$r['id']}{$page_query}\"); return false;' title='Delete Member'>Delete Member</a></td>
+						  	</tr>
+						   </table>
+						   </div>
+						  </fieldset>
+						 </td>";
+			
+			if ($count == $per_row )
+			{
+				$people .= "</tr>\n\n<tr align='center'>";
+				$count   = 0;
+			}
+		}
+		
+		if ( $count > 0 and $count != $per_row )
+		{
+			for ($i = $count ; $i < $per_row ; ++$i)
+			{
+				$people .= "<td class='tdrow2'>&nbsp;</td>\n";
+			}
+			
+			$people .= "</tr>";
+		}
+		
+		
+		$ibforums->html .= $people;
+		
+		$ibforums->html .= "</table>
+							<div class='pformstrip' align='right'>{$pages}</div></div>";
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// DO EDIT FORM
+	//
+	//-----------------------------------------
+	
+	function member_do_edit_form()
+	{
+		global $ibforums, $DB,  $std, $ibforums;
+		
+		require_once( ROOT_PATH."sources/lib/post_parser.php" );
+		
+		$parser = new post_parser();
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("Could not resolve member id");
+		}
+		
+		//-----------------------------------------
+		// get member info
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'member_search_do_edit_form', array( 'mid' => $ibforums->input['mid'] ) );
+		$DB->cache_exec_query();
+		
+		$mem = $DB->fetch_row();
+		
+		$mem['id'] = $mem['memid'];
+		
+		//-----------------------------------------
+		// check 
+		//-----------------------------------------
+		
+		if ( ! $mem['id'] )
+		{	
+			$ibforums->admin->error("Could not resolve member id");
+		}
+		
+		$mem_group = array();
+		$show_fixed = FALSE;
+		
+		$units = array( 0 => array( 'h', 'Hours' ), 1 => array( 'd', 'Days' ) );
+		
+		//-----------------------------------------
+		// Get groups (USE CACHE FOR CRAPS SAKE)
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'order' => "g_title" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			//-----------------------------------------
+			// Ensure only root admins can promote to root admin grou...
+			// oh screw it, I can't be bothered explaining stuff tonight
+			//-----------------------------------------
+			
+			if ($ibforums->vars['admin_group'] == $r['g_id'])
+			{
+				if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+				{
+					continue;
+				}
+			}
+			
+			$mem_group[] = array( $r['g_id'] , $r['g_title'] );
+		}
+		
+		//-----------------------------------------
+		// is this a non root editing a root?
+		//-----------------------------------------
+		
+		if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+		{
+			if ($mem['mgroup'] == $ibforums->vars['admin_group'])
+			{
+				$show_fixed = TRUE;
+			}
+		}
+		
+		//-----------------------------------------
+		// Get langs (USE CACHE DICKHEAD)
+		//-----------------------------------------
+		
+		$lang_array = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'languages' ) );
+		$DB->simple_exec();
+		
+		while ( $l = $DB->fetch_row() )
+		{
+			$lang_array[] = array( $l['ldir'], $l['lname'] );
+		}
+ 		
+ 		//-----------------------------------------
+ 		// Get Skins (CACHE)
+ 		//-----------------------------------------
+ 		
+ 		require_once( ROOT_PATH.'sources/classes/class_display.php' );
+ 		$print = new display();
+ 		
+ 		$tmp = $ibforums->skin['_setid'];
+ 		
+ 		$ibforums->skin['_setid'] = $mem['skin'];
+ 		
+ 		$skin_list = $print->_build_skin_list();
+ 		
+ 		$ibforums->skin['_setid'] = $tmp;
+ 		
+ 		//-----------------------------------------
+		// Fix up langs	
+		//-----------------------------------------
+		
+		if ($ibforums->vars['default_language'] == "")
+		{
+			$ibforums->vars['default_language'] = 'en';
+		}
+		
+		//-----------------------------------------
+    	// Get custom profile information
+    	//-----------------------------------------
+		
+		$custom_out = "";
+		
+    	require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->member_id   = $ibforums->member['id'];
+    	$fields->member_data = $mem;
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_edit();
+    	
+    	if ( count( $fields->out_fields ) )
+    	{
+    		//$ibforums->html .= $ibforums->adskin->add_td_basic( "Custom Profile Fields", "left", "pformstrip" );
+    		
+			foreach( $fields->out_fields as $id => $data )
+			{
+				if ( $fields->cache_data[ $id ]['pf_type'] == 'drop' )
+				{
+					$form_element =  "<select class='dropdown' name='field_{$id}'>{$data}</select>";
+				}
+				else if ( $fields->cache_data[ $id ]['pf_type'] == 'area' )
+				{
+					$form_element = $ibforums->adskin->form_textarea( 'field_'.$id, $data );
+				}
+				else
+				{
+					$form_element = $ibforums->adskin->form_input( 'field_'.$id, $data );
+				}
+				
+				$custom_out .= $ibforums->adskin->add_td_row( array( "<b>{$fields->field_names[ $id ]}</b><div class='graytext'>{$fields->field_desc[ $id ]}</div>" , $form_element ) );
+			}
+		}
+		
+		//-----------------------------------------
+		// Perms masks section
+		//-----------------------------------------
+		
+		$perm_masks = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$perm_masks[] = array( $r['perm_id'], $r['perm_name'] );
+		}
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title = "Edit member: ".$mem['name']." (ID: ".$mem['id'].")";
+		
+		$ibforums->admin->page_detail = "You may alter the members settings from here.";
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_array = array( 1 => array( 'code'    , 'doedit'        ),
+							 2 => array( 'act'     , 'mem'           ),
+							 3 => array( 'mid'     , $mem['id']      ),
+							 4 => array( 'curemail', $mem['email'] )
+						   );
+									     				
+		foreach( array('name','email','ip_address','aim_name','icq_number','yahoo','signature','posts','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_array[] = array( $bit, trim($ibforums->input[ $bit ]) );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( $page_array );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		// SECURITY
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Security Settings" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>IP address when registered</b>", "<a href='{$ibforums->base_url}&act=mtools&code=learnip&ip={$mem['ip_address']}' title='Find more out about this IP address...'>{$mem['ip_address']}</a>"
+															    ." [ <a href='{$ibforums->base_url}&act=mtools&code=showallips&member_id={$mem['id']}'>Show all IP addresses</a> ]"
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Remove member's photo</b>" ,
+												                 $ibforums->adskin->form_checkbox("remove_photo", 0)
+									     		        )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Warn Level</b>" ,
+													      		  $ibforums->adskin->form_input("warn_level", $mem['warn_level'])
+									    		  	    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Member Title</b>" ,
+												  			     $ibforums->adskin->form_input("title", $mem['title'])
+									     			    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Group opts
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Member Group Options" );
+									     
+		if ($show_fixed != TRUE)
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Primary Member Group</b><br /><div style='color:gray'>Member will appear to be a member of this group to others</div>" ,
+																   $ibforums->adskin->form_dropdown( "mgroup", $mem_group, $mem['mgroup'] )
+														  )      );
+			
+			$arr = explode( ",", $mem['mgroup_others'] );
+														  
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Secondary Member Groups</b><br />You can select more than one other group.<div style='color:gray'>Member will inherit 'better' permissions of all secondary groups and will inherit permission masks of all secondary groups in positive favor.</div>" ,
+																   $ibforums->adskin->form_multiselect( "mgroup_others[]", $mem_group, $arr, 5 )
+														  )      );
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Primary Member Group</b>" ,
+													  $ibforums->adskin->form_hidden( array( 1 => array( 'mgroup' , $mem['mgroup'] ) ) )."<b>Root Admin</b> (Can't Change)",
+											 )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Posting
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Posting and Access Restrictions" );
+		
+		//-----------------------------------------
+		// Sort out perm id stuff
+		//-----------------------------------------
+		
+		$ibforums->html .=
+		"<script type='text/javascript'>
+			
+			var show   = '';
+		";
+		
+		foreach ($perm_masks as $id => $d)
+		{
+			$ibforums->html .= " 		perms_$d[0] = '$d[1]';\n";
+		}
+		
+		$ibforums->html .=
+		"
+			
+		 	function saveit(f)
+		 	{
+		 		show = '';
+		 		for (var i = 0 ; i < f.options.length; i++)
+				{
+					if (f.options[i].selected)
+					{
+						tid  = f.options[i].value;
+						show += '\\n' + eval('perms_'+tid);
+					}
+				}
+				
+				if ( show != '' )
+				{
+					document.forms[0].override.checked = true;
+				}
+				else
+				{
+					document.forms[0].override.checked = false;
+				}
+			}
+			
+			function show_me()
+			{
+				if (show == '')
+				{
+					show = 'No change detected\\nClick on the multi-select box to activate';
+				}
+				
+				alert('Selected Permission Masks\\n---------------------------------\\n' + show);
+			}
+			
+		</script>";
+		
+		$arr = explode( ",",$mem['org_perm_id'] );
+		
+		$ch_ch = ( $mem['org_perm_id'] ) ? 'checked' : '';
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Override group forum permission mask with...</b><br />You may choose more than one.<div style='color:gray'>This will override all permission settings for the primary group and any secondary groups.</div>" ,
+																 "<input type='checkbox' name='override' value='1' $ch_ch> <b>Override Group Permission Mask with...</b><br>".
+																 $ibforums->adskin->form_multiselect( "permid[]",
+																					   $perm_masks,
+																					   $arr, 5, 'onfocus="saveit(this)" onchange="saveit(this)"'
+																					 )."<br><input style='margin-top:5px' id='editbutton' type='button' onclick='show_me();' value='Show me selected masks'>"
+														) , "subforum"   );
+	
+		//-----------------------------------------
+		// Mod posts bit
+		//-----------------------------------------
+		
+		$mod_tick = 0;
+		$mod_arr  = array();
+		
+		if ( $mem['mod_posts'] == 1 )
+		{
+			$mod_tick = 'checked';
+		}
+		elseif ($mem['mod_posts'] > 0)
+		{
+			$mod_arr = $std->hdl_ban_line( $mem['mod_posts'] );
+			
+			$hours  = ceil( ( $mod_arr['date_end'] - time() ) / 3600 );
+				
+			if ( $hours > 24 and ( ($hours / 24) == ceil($hours / 24) ) )
+			{
+				$mod_arr['units']    = 'd';
+				$mod_arr['timespan'] = $hours / 24;
+			}
+			else
+			{
+				$mod_arr['units']    = 'h';
+				$mod_arr['timespan'] = $hours;
+			}
+			
+			$mod_extra = "<br /><span style='color:red'>Restriction in progress - remaining time has been recalculated</span>";
+		}
+						     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Require moderator preview of all posts by this member?</b><br>If yes, all posts by this member will be put into the moderation queue. Untick box and clear number box to remove." ,
+																 "<input type='checkbox' name='mod_indef' value='1' $mod_tick> Moderator Preview indefinitely
+																 <br /><b>or for</b> ".$ibforums->adskin->form_input('mod_timespan', $mod_arr['timespan'], "text", "", '5' ) . '&nbsp;' . $ibforums->adskin->form_dropdown('mod_units', $units, $mod_arr['units'] ).$mod_extra
+														)      );
+									     
+		
+		$post_tick = 0;
+		$post_arr  = array();
+		
+		if ( $mem['restrict_post'] == 1 )
+		{
+			$post_tick = 'checked';
+		}
+		else if( $mem['restrict_post'] > 0 )
+		{
+			$post_arr = $std->hdl_ban_line( $mem['restrict_post'] );
+			
+			$hours  = ceil( ( $post_arr['date_end'] - time() ) / 3600 );
+				
+			if ( $hours > 24 and ( ($hours / 24) == ceil($hours / 24) ) )
+			{
+				$post_arr['units']    = 'd';
+				$post_arr['timespan'] = $hours / 24;
+			}
+			else
+			{
+				$post_arr['units']    = 'h';
+				$post_arr['timespan'] = $hours;
+			}
+			
+			$post_extra = "<br /><span style='color:red'>Restriction in progress - remaining time has been recalculated</span>";
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Restrict {$mem['name']} from posting?</b><br>Untick box and clear number box to remove restriction." ,
+																 "<input type='checkbox' name='post_indef' value='1' $post_tick> Restrict posting indefinitely
+																 <br /><b>or for</b> ".$ibforums->adskin->form_input('post_timespan', $post_arr['timespan'], "text", "", '5' ) . '&nbsp;' . $ibforums->adskin->form_dropdown('post_units', $units, $post_arr['units'] ).$post_extra
+														) , "subforum"     );
+									     
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		// Settings
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Board Settings" );							     
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Language Choice</b>" ,
+												  $ibforums->adskin->form_dropdown( "language",
+																		$lang_array,
+												  						$mem['language'] != "" ? $mem['language'] : $ibforums->vars['default_language']
+												  					  )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Skin Choice</b>" , "<select name='skin' class='dropdown'><option value='0'>--None / Use Board Default--</option>$skin_list</select>"
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Hide this members email address?</b>" ,
+												  $ibforums->adskin->form_yes_no("hide_email", $mem['hide_email'] )
+									     )      );
+									     						     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email a PM reminder?</b>" ,
+												  $ibforums->adskin->form_yes_no("email_pm", $mem['email_pm'] )
+									     )      );		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// CONTACT INFO
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Contact Information" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Email Address</b>" ,
+												  $ibforums->adskin->form_input("email", $mem['email'])
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>AIM Identity</b>" ,
+												  $ibforums->adskin->form_input("aim_name", $mem['aim_name'])
+									     )      );							     						     
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>ICQ Number</b>" ,
+												  $ibforums->adskin->form_input("icq_number", $mem['icq_number'])
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Yahoo Identity</b>" ,
+												  $ibforums->adskin->form_input("yahoo", $mem['yahoo'])
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>MSN Identity</b>" ,
+												  $ibforums->adskin->form_input("msnname", $mem['msnname'])
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Website Address</b>" ,
+												  $ibforums->adskin->form_input("website", $mem['website'])
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Other
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Other Information" );
+		
+		$mem['signature'] = $parser->unconvert( $mem['signature'] );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Avatar</b>" ,
+												                 $ibforums->adskin->form_input("avatar", $mem['avatar_location'])
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Avatar Type</b>" , 
+												                 $ibforums->adskin->form_dropdown("avatar_type", array( 0 => array( 'local'  , 'Avatar Gallery'  ),
+												                 													    1 => array( 'url'    , 'URL Avatar'      ),
+												                 													    2 => array( 'upload' , 'Uploaded Avatar' ),
+												                 													   ), $mem['avatar_type'])
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Avatar Size</b>" ,
+												                 $ibforums->adskin->form_input("avatar_size", $mem['avatar_size'])
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Post Count</b>" ,
+												  $ibforums->adskin->form_input("posts", $mem['posts'])
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Location</b>" ,
+												  $ibforums->adskin->form_input("location", $mem['location'])
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Interests</b>" ,
+												  $ibforums->adskin->form_textarea("interests", str_replace( '<br />', "\n",$mem['interests']))
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Signature</b>" ,
+												  $ibforums->adskin->form_textarea("signature", $mem['signature'])
+									     )      );
+		
+		
+									     							     							     							     
+		//-----------------------------------------
+		// Custom profiles (HATE THIS TOO)
+		//-----------------------------------------
+		
+		if ($custom_out != "")
+		{
+			$ibforums->html .= $ibforums->adskin->end_table();
+			
+			$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Custom Profile Fields" );
+			
+			$ibforums->html .= $custom_out;
+											 
+		}
+								     							     							     
+		//-----------------------------------------
+		// Slip n' ship
+		//-----------------------------------------
+									     							     							     							     
+		$ibforums->html .= $ibforums->adskin->end_form("Edit this member");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+			
+			
+	}
+
+
+	//-----------------------------------------
+	//
+	// Complete Edit
+	//-----------------------------------------
+	
+	function member_do_edit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['mid'] = intval($ibforums->input['mid']);
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "id=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		$memb = $DB->fetch_row();
+		
+		require_once( ROOT_PATH."sources/lib/post_parser.php" );
+		
+		$parser = new post_parser();
+		
+		$ibforums->input['signature'] = $parser->convert( array ('TEXT'      => $ibforums->input['signature'],
+																 'SMILIES'   => 0,
+																 'CODE'      => $ibforums->vars['sig_allow_ibc'],
+																 'SIGNATURE' => 1
+														)       );
+		
+		//-----------------------------------------
+		// Perms
+		//-----------------------------------------
+								   
+		if ( $ibforums->input['override'] == 1 )
+		{
+			$permid = implode( ",", $_POST['permid'] );
+		}
+		else
+		{
+			$permid = "";
+		}
+		
+		$restrict_post = 0;
+		$mod_queue     = 0;
+		
+		//-----------------------------------------
+		// Q
+		//-----------------------------------------
+		
+		if ( $ibforums->input['mod_indef'] == 1 )
+		{
+			$mod_queue = 1;
+		}
+		elseif ( $ibforums->input['mod_timespan'] > 0 )
+		{
+			$mod_queue = $std->hdl_ban_line( array( 'timespan' => intval($ibforums->input['mod_timespan']), 'unit' => $ibforums->input['mod_units']  ) );
+		}
+		
+		//-----------------------------------------
+		// Post ban
+		//-----------------------------------------
+		
+		if ( $ibforums->input['post_indef'] == 1 )
+		{
+			$restrict_post = 1;
+		}
+		elseif ( $ibforums->input['post_timespan'] > 0 )
+		{
+			$restrict_post = $std->hdl_ban_line( array( 'timespan' => intval($ibforums->input['post_timespan']), 'unit' => $ibforums->input['post_units']  ) );
+		}
+		
+		$avatar_type = $ibforums->input['avatar_type'];
+		
+		if ( strstr( $ibforums->input['avatar'], 'http://' ) )
+		{
+			$avatar_type = 'url';
+		}
+		
+		//-----------------------------------------
+		// Throw to the DB
+		//-----------------------------------------
+		
+		$DB->do_update( 'members', array (
+										  'restrict_post'   => $restrict_post,
+										  'mgroup'       => $ibforums->input['mgroup'],
+										  'title'        => $ibforums->input['title'],
+										  'language'     => $ibforums->input['language'],
+										  'skin'         => $ibforums->input['skin'],
+										  'hide_email'   => $ibforums->input['hide_email'],
+										  'email_pm'     => $ibforums->input['email_pm'],
+										  'email'        => $ibforums->input['email'],
+										  'posts'        => $ibforums->input['posts'],
+										  'mod_posts'    => $mod_queue,
+										  'org_perm_id'  => $permid,
+										  'warn_level'   => $ibforums->input['warn_level'],
+										  'mgroup_others' => $_POST['mgroup_others'] ? implode( ",", $_POST['mgroup_others'] ) : '',
+								) , 'id='.$ibforums->input['mid']      );
+												  
+		$DB->do_update( 'member_extra', array (
+											   'aim_name'        => $ibforums->input['aim_name'],
+											   'icq_number'      => $ibforums->input['icq_number'],
+											   'yahoo'           => $ibforums->input['yahoo'],
+											   'msnname'         => $ibforums->input['msnname'],
+											   'website'         => $ibforums->input['website'],
+											   'avatar_location' => $ibforums->input['avatar'],
+											   'avatar_size'     => $ibforums->input['avatar_size'],
+											   'avatar_type'     => $avatar_type,
+											   'location'        => $ibforums->input['location'],
+											   'interests'       => $ibforums->input['interests'],
+											   'signature'       => $ibforums->input['signature'],
+											), 'id='.$ibforums->input['mid'] );
+		
+		//-----------------------------------------
+		// Diff email?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['email'] != $ibforums->input['curemail'] )
+		{
+			//-----------------------------------------
+			// Is this email addy taken? CONVERGE THIS??
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "email='".$ibforums->input['email']."' and id <> {$ibforums->input['mid']}" ) );
+			$DB->simple_exec();
+		
+			$email_check = $DB->fetch_row();
+			
+			if ($email_check['id'])
+			{
+				$ibforums->main_msg = "Cannot use this email address, another account is already using it";
+				$this->member_do_edit_form();
+			}
+									
+			$DB->do_update( 'members_converge', array( 'converge_email' => $ibforums->input['email'] ), 'converge_id='.$ibforums->input['mid'] );
+		}
+		
+		//-----------------------------------------
+		// Remove photo?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['remove_photo'] )
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'member_extra', 'where' => "id=".intval($ibforums->input['mid']) ) );
+			$DB->simple_exec();
+		
+			if ( $DB->get_num_rows() )
+			{
+				$DB->do_update( 'member_extra', array( 'photo_location'   => '',
+													   'photo_type'       => '',
+													   'photo_dimensions' => '',
+													 ), 'id='.$ibforums->input['mid'] );
+			}
+			else
+			{
+				$DB->do_insert( 'member_extra', array( 'photo_location'   => '',
+													   'photo_type'       => '',
+													   'photo_dimensions' => '',
+													   'id'               => $ibforums->input['mid']
+													 )  );
+			}
+			
+			foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
+			{
+				if ( @file_exists( $ibforums->vars['upload_dir']."/photo-".$ibforums->input['mid'].".".$ext ) )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/photo-".$ibforums->input['mid'].".".$ext );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->member_id   = $ibforums->member['id'];
+
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_save();
+		
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+		
+		if ( count( $fields->out_fields ) )
+		{
+			//-----------------------------------------
+			// Do we already have an entry in
+			// the content table?
+			//-----------------------------------------
+			
+			$test = $DB->simple_exec_query( array( 'select' => 'member_id', 'from' => 'pfields_content', 'where' => 'member_id='.$ibforums->input['mid'] ) );
+			
+			if ( $test['member_id'] )
+			{
+				//-----------------------------------------
+				// We have it, so simply update
+				//-----------------------------------------
+				
+				$DB->do_update( 'pfields_content', $fields->out_fields, 'member_id='.$ibforums->input['mid'] );
+			}
+			else
+			{
+				$fields->out_fields['member_id'] = $ibforums->input['mid'];
+				
+				$DB->do_insert( 'pfields_content', $fields->out_fields );
+			}
+		}
+		
+		//-----------------------------------------
+		// SYNC modules
+		//-----------------------------------------
+		
+		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+			
+			if ( $memb['mgroup'] != $ibforums->input['mgroup'] )
+			{
+				$this->modules->on_group_change($ibforums->input['mid'], $ibforums->input['mgroup']);
+			}
+			
+			if ( $memb['email'] != $ibforums->input['email'] )
+			{
+				$this->modules->on_email_change($ibforums->input['mid'], $ibforums->input['email']);
+			}
+			
+			if ( $memb['signature'] != $ibforums->input['signature'] )
+			{
+				$this->modules->on_signature_update($memb, $ibforums->input['signature']);
+			}
+			
+			$mem_array = array(
+							    'title'        => $ibforums->input['title'],
+								'aim_name'     => $ibforums->input['aim_name'],
+								'icq_number'   => $ibforums->input['icq_number'],
+								'yahoo'        => $ibforums->input['yahoo'],
+								'msnname'      => $ibforums->input['msnname'],
+								'website'      => $ibforums->input['website'],
+								'location'     => $ibforums->input['location'],
+								'interests'    => $ibforums->input['interests'],
+								'id'		   => $ibforums->input['mid']
+							  );
+			
+			$this->modules->on_profile_update($mem_array, $custom_fields);
+		}
+		
+		//-----------------------------------------
+		// Redirect
+		//-----------------------------------------
+		
+		$page_query = "";
+		
+		foreach( array('name','suspended', 'registered_first', 'registered_last','last_post_first', 'last_post_last', 'last_activity_first', 'last_activity_last','mgroup','namewhere','gotcount', 'fromdel') as $bit )
+		{
+			$page_query .= '&'.$bit.'='.trim($ibforums->input[ $bit ]);
+		}
+		
+		$ibforums->admin->save_log("Edited Member '{$memb['name']}' account");
+		
+		$ibforums->admin->done_screen("Member Edited", "Member Search", "act=mem".$page_query, 'redirect' );
+		
+	}
+	
+	//-----------------------------------------
+	// Do banline (internal
+	//-----------------------------------------
+	
+	function _do_banline($raw)
+	{
+		global $std;
+		
+		$ban = trim($std->txt_stripslashes($raw));
+		
+		$ban = str_replace('|', "&#124;", $ban);
+		
+		$ban = preg_replace( "/\n/", '|', str_replace( "\n\n", "\n", str_replace( "\r", "\n", $ban ) ) );
+		
+		$ban = preg_replace( "/\|{1,}\s{1,}?/s", "|", $ban );
+		
+		$ban = preg_replace( "/^\|/", "", $ban );
+		
+		$ban = preg_replace( "/\|$/", "", $ban );
+		
+		$ban = str_replace( "'", '&#39;', $ban );
+		
+		return $ban;
+	}
+
+
+	
+	
+		
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_member_tools.php b/upload/sources/admin/ad_member_tools.php
new file mode 100644
index 00000000..5affce85
--- /dev/null
+++ b/upload/sources/admin/ad_member_tools.php
@@ -0,0 +1,526 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Member Tool functions
+|   > Module written by Matt Mecham
+|   > Date started: 17th September 2003
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+$root_path = "";
+
+class ad_member_tools
+{
+
+	var $base_url;
+	var $modules = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std, $ibforums;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=mtools', 'Member Tools Home' );
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title  = "Member Tool Box";
+		$ibforums->admin->page_detail = 'You can use the tools below to search for IP address.';
+
+		switch($ibforums->input['code'])
+		{
+			
+			case 'showallips':
+				$this->show_ips();
+				break;
+				
+			case 'learnip':
+				$this->learn_ip();
+				break;
+			
+			//-----------------------------------------
+			default:
+				$this->show_index();
+				break;
+		}
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// LEARN ABOUT THE IP. It's very good.
+	//
+	//-----------------------------------------
+	
+	
+	function learn_ip()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		if ( $ibforums->input['ip'] == "" )
+		{
+			$this->show_index("You did not enter an IP address to search by");
+		}
+		
+		$ip = trim($ibforums->input['ip']);
+		
+		$resolved = 'N/A - Partial IP Address';
+		$exact    = 0;
+		
+		if ( substr_count( $ip, '.' ) == 3 )
+		{
+			$exact = 1;
+		}
+		
+		if ( strstr( $ip, '*' ) )
+		{
+			$exact = 0;
+			$ip    = str_replace( "*", "", $ip );
+		}
+			
+		if ( $exact != 0 )
+		{
+			$resolved = gethostbyaddr($ip);
+			$query    = "='".$ip."'";
+		}
+		else
+		{
+			$query    = " LIKE '".$ip."%'";
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Host Address for {$ibforums->input['ip']}" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>IP address resolves to</b>" ,
+																 $resolved
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Find registered members
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Name"       , "30%" );
+		$ibforums->adskin->td_header[] = array( "Email"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "Posts"      , "10%" );
+		$ibforums->adskin->td_header[] = array( "IP"         , "20%" );
+		$ibforums->adskin->td_header[] = array( "Registered" , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Members using that IP when REGISTERING" );
+		
+		$DB->simple_construct( array( 'select' => 'id, name, email, posts, ip_address, joined',
+									  'from'   => 'members',
+									  'where'  => "ip_address{$query}",
+									  'order'  => 'joined DESC',
+									  'limit'  => array( 0,250) ) );
+		$DB->simple_exec();
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No Matches Found", "center");
+		}
+		else
+		{
+			while ( $m = $DB->fetch_row() )
+			{
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( $m['name'] ,
+																		 $m['email'],
+																		 $m['posts'],
+																		 $m['ip_address'],
+																		 $std->get_date( $m['joined'], 'SHORT' )
+																)      );
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Find Names posted under
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Name"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "Email"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP"         , "15%" );
+		$ibforums->adskin->td_header[] = array( "First Used"  , "20%" );
+		$ibforums->adskin->td_header[] = array( "View Post"  , "15%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Members using that IP when POSTING" );
+		
+		$DB->cache_add_query( 'member_tools_learn_ip_one', array( 'query' => $query) );
+		$DB->cache_exec_query();
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No Matches Found", "center");
+		}
+		else
+		{
+			while ( $m = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( $m['name'] ,
+																		 $m['email'],
+																		 $m['ip_address'],
+																		 $std->get_date( $m['post_date'], 'SHORT' ),
+																		 "<center><a href='index.php?showtopic={$m['topic_id']}&view=findpost&p={$m['pid']}' target='_blank'>View Post</a></center>",
+																)      );
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Find Names VOTED under
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Name"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "Email"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP"         , "15%" );
+		$ibforums->adskin->td_header[] = array( "First Used" , "20%" );
+		$ibforums->adskin->td_header[] = array( "View Poll" , "15%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Members using that IP when VOTING" );
+		
+		$DB->cache_add_query( 'member_tools_learn_ip_two', array( 'query' => $query) );
+		$DB->cache_exec_query();
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No Matches Found", "center");
+		}
+		else
+		{
+			while ( $m = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( $m['name'] ,
+																		 $m['email'],
+																		 $m['ip_address'],
+																		 $std->get_date( $m['vote_date'], 'SHORT' ),
+																		 "<center><a href='index.php?showtopic={$m['tid']}' target='_blank'>View Poll</a></center>",
+																)      );
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Find Names EMAILING under
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Name"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "Email"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP"         , "15%" );
+		$ibforums->adskin->td_header[] = array( "First Used"    , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Members using that IP when EMAILING other members" );
+		
+		$DB->cache_add_query( 'member_tools_learn_ip_three', array( 'query' => $query) );
+		$DB->cache_exec_query();
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No Matches Found", "center");
+		}
+		else
+		{
+			while ( $m = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( $m['name'] ,
+																		 $m['email'],
+																		 $m['from_ip_address'],
+																		 $std->get_date( $m['email_date'], 'SHORT' ),
+																)      );
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		// Find Names VALIDATING under
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Name"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "Email"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP"         , "15%" );
+		$ibforums->adskin->td_header[] = array( "First Used" , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Members using that IP while VALIDATING their accounts" );
+		
+		$DB->cache_add_query( 'member_tools_learn_ip_four', array( 'query' => $query) );
+		$DB->cache_exec_query();
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No Matches Found", "center");
+		}
+		else
+		{
+			while ( $m = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( $m['name'] ,
+														  $m['email'],
+														  $m['ip_address'],
+														  $std->get_date( $m['entry_date'], 'SHORT' ),
+												 )      );
+			}
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	//
+	// SHOW ALL IPs
+	//
+	//-----------------------------------------
+	
+	
+	function show_ips()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ( $ibforums->input['name'] == "" and $ibforums->input['member_id'] == "" )
+		{
+			$this->show_index("You did not enter a name to search by");
+		}
+		
+		if ( $ibforums->input['member_id'] )
+		{
+			$id = intval($ibforums->input['member_id']);
+			
+			$DB->simple_construct( array( 'select' => 'id, name, email, ip_address', 'from' => 'members', 'where' => "id=$id" ) );
+			$DB->simple_exec();
+		
+			if ( ! $member = $DB->fetch_row() )
+			{
+				$this->show_index("Could not locate a member with the id of '$id'");
+			}
+		}
+		else
+		{
+			$name = addslashes($ibforums->input['name']);
+			
+			$DB->simple_construct( array( 'select' => 'id, name, email, ip_address', 'from' => 'members', 'where' => "name='$name'" ) );
+			$DB->simple_exec();
+			
+			if ( ! $member = $DB->fetch_row() )
+			{
+				$this->show_index( "We could not find an exact match for that member name, some choices will be shown below", $name );
+			}
+		}
+		
+		$DB->simple_construct( array( 'select' => 'count(distinct(ip_address)) as cnt', 'from' => 'posts', 'where' => "author_id={$ibforums->member['id']}" ) );
+		$DB->simple_exec();
+			
+		$count = $DB->fetch_row();
+		
+		$st  = intval($ibforums->input['st']);
+		$end = 50;
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['cnt'],
+											   'PER_PAGE'    => $end,
+											   'CUR_ST_VAL'  => $st,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Multiple Pages",
+											   'BASE_URL'    => $ibforums->adskin->base_url."&act=mtools&code=showallips&member_id={$member['id']}",
+									  )      );
+		
+		$master = array();
+		$ips    = array();
+		
+		$DB->cache_add_query( 'member_tools_show_ips', array( 'mid' => $member['id'], 'st' => $st, 'end' => $end ) );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$master[] = $r;
+			$ips[]    = "'".$r['ip_address']."'";
+		}
+		
+		$reg = array();
+		
+		if ( count($ips) > 0 )
+		{
+			$DB->simple_construct( array( 'select' => 'id, name, ip_address', 'from' => 'members', 'where' => "ip_address IN (".implode(",",$ips).") AND id != {$member['id']}" ) );
+			$DB->simple_exec();
+		
+			while ( $i = $DB->fetch_row() )
+			{
+				$reg[ $i['ip_address'] ][] = $i;
+			}
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "IP Address"          , "20%" );
+		$ibforums->adskin->td_header[] = array( "Times Used"          , "10%" );
+		$ibforums->adskin->td_header[] = array( "Date Used"           , "25%" );
+		$ibforums->adskin->td_header[] = array( "Used for other Reg." , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP Tool"             , "25%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "{$member['name']}'s IP addresses ({$count['cnt']}) matches" );
+		
+		foreach( $master as $idx => $r )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( $r['ip_address'] ,
+																	 $r['ip'] ,
+																	 $std->get_date( $r['post_date'], 'SHORT' ),
+																	 "<center>". intval( count($reg[ $r['ip_address'] ]) ). "</center>",
+																	 "<center><a href='{$ibforums->base_url}&act=mtools&code=learnip&ip={$r['ip_address']}'>Learn about this IP</a></center>"
+															)      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "$links", "center", "catrow2");
+									     							     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	//
+	// Default Screen
+	//
+	//-----------------------------------------
+	
+	
+	function show_index($msg="", $membername="")
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		
+		if ($msg != "")
+		{
+			$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Message" );
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( $msg ) );
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'showallips'  ),
+																 2 => array( 'act'   , 'mtools'     ),
+														)      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Show all IP Addresses a member has posted with" );
+		
+		if ( $membername == "" )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Enter the member's name</b>" ,
+													  $ibforums->adskin->form_input( "name", $std->txt_stripslashes($HTTP_POST_VARS['name']) )
+											 )      );
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => "lower(name) LIKE '{$membername}%'" ) );
+			$DB->simple_exec();
+		
+			if ( ! $DB->get_num_rows() )
+			{
+				$this->show_index("There are no members with names that start with '$membername'");
+			}
+			
+			$mem_array = array();
+			
+			while ( $m = $DB->fetch_row() )
+			{
+				$mem_array[] = array( $m['id'], $m['name'] );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Choose the member from the selection</b>" ,
+													  $ibforums->adskin->form_dropdown( "member_id", $mem_array )
+											 )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Get IP Addresses");
+									     							     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'learnip'  ),
+												  2 => array( 'act'   , 'mtools'     ),
+									     )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "IP Multi-Tool" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Show me everything you know about this IP...</b>" ,
+												   $ibforums->adskin->form_input( "ip", $std->txt_stripslashes($HTTP_POST_VARS['ip']) )
+										  )      );
+										  
+		$ibforums->html .= $ibforums->adskin->end_form("Show me!");
+									     							     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	
+	
+	
+	
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_moderator.php b/upload/sources/admin/ad_moderator.php
new file mode 100644
index 00000000..aca3f357
--- /dev/null
+++ b/upload/sources/admin/ad_moderator.php
@@ -0,0 +1,861 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Category functions
+|   > Module written by Matt Mecham
+|   > Date started: 1st march 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_moderator {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		$forums->forums_init();
+		
+		require ROOT_PATH.'sources/admin/admin_forum_functions.php';
+		
+		$this->forumfunc = new admin_forum_functions();
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'add':
+				$this->add_one();
+				break;
+			case 'add_two':
+				$this->add_two();
+				break;
+			case 'add_final':
+				$this->mod_form('add');
+				break;
+			case 'doadd':
+				$this->add_mod();
+				break;
+				
+			case 'edit':
+				$this->mod_form('edit');
+				break;
+				
+			case 'doedit':
+				$this->do_edit();
+				break;
+				
+			case 'remove':
+				$this->do_delete();
+				break;
+				
+			default:
+				$this->show_list();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// DELETE MODERATOR
+	//
+	//-----------------------------------------
+	
+	function do_delete()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You did not choose a valid moderator ID");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'moderators', 'where' => "mid=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		$mod = $DB->fetch_row();
+		
+		if ( $mod['is_group'] )
+		{
+			$name = 'Group: '.$mod['group_name'];
+		}
+		else
+		{
+			$name = $mod['member_name'];
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'moderators', 'where' => "mid=".intval($ibforums->input['mid']) ) );
+		
+		$this->rebuild_moderator_cache();
+		
+		$ibforums->admin->save_log("Removed Moderator '{$name}'");
+		
+		$ibforums->admin->done_screen("Moderator Removed", "Moderator Control", "act=mod", 'redirect' );
+		
+	}	
+	
+	
+	//-----------------------------------------
+	//
+	// EDIT MODERATOR
+	//
+	//-----------------------------------------
+	
+	function do_edit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You did not choose a valid moderator ID");
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'moderators', 'where' => "mid=".intval($ibforums->input['mid']) ) );
+		$DB->simple_exec();
+		
+		$mod = $DB->fetch_row();
+		
+		//-----------------------------------------
+		// Build Mr Hash
+		//-----------------------------------------
+		
+		$DB->do_update( 'moderators', array( 
+											'forum_id'     => $ibforums->input['forum_id'],
+											'edit_post'    => $ibforums->input['edit_post'],
+											'edit_topic'   => $ibforums->input['edit_topic'],
+											'delete_post'  => $ibforums->input['delete_post'],
+											'delete_topic' => $ibforums->input['delete_topic'],
+											'view_ip'      => $ibforums->input['view_ip'],
+											'open_topic'   => $ibforums->input['open_topic'],
+											'close_topic'  => $ibforums->input['close_topic'],
+											'mass_move'    => $ibforums->input['mass_move'],
+											'mass_prune'   => $ibforums->input['mass_prune'],
+											'move_topic'   => $ibforums->input['move_topic'],
+											'pin_topic'    => $ibforums->input['pin_topic'],
+											'unpin_topic'  => $ibforums->input['unpin_topic'],
+											'post_q'       => $ibforums->input['post_q'],
+											'topic_q'      => $ibforums->input['topic_q'],
+											'allow_warn'   => $ibforums->input['allow_warn'],
+											'split_merge'  => $ibforums->input['split_merge'],
+											'edit_user'    => $ibforums->input['edit_user'],
+											'can_mm'	   => $ibforums->input['can_mm'],
+										) , 'mid='.intval($ibforums->input['mid']) );
+		
+		$this->rebuild_moderator_cache();
+		
+		$ibforums->admin->save_log("Edited Moderator '{$mod['member_name']}'");
+		
+		$ibforums->admin->done_screen("Moderator Edited", "Moderator Control", "act=mod", 'redirect' );
+		
+	}	
+	
+	//-----------------------------------------
+	//
+	// ADD MODERATOR
+	//
+	//-----------------------------------------
+	
+	function add_mod()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['fid'] == "")
+		{
+			$ibforums->admin->error("You did not choose any forums to add this member to");
+		}
+		
+		//-----------------------------------------
+		// Build Mr Hash
+		//-----------------------------------------
+		
+		$mr_hash = array( 
+							'edit_post'    => $ibforums->input['edit_post'],
+							'edit_topic'   => $ibforums->input['edit_topic'],
+							'delete_post'  => $ibforums->input['delete_post'],
+							'delete_topic' => $ibforums->input['delete_topic'],
+							'view_ip'      => $ibforums->input['view_ip'],
+							'open_topic'   => $ibforums->input['open_topic'],
+							'close_topic'  => $ibforums->input['close_topic'],
+							'mass_move'    => $ibforums->input['mass_move'],
+							'mass_prune'   => $ibforums->input['mass_prune'],
+							'move_topic'   => $ibforums->input['move_topic'],
+							'pin_topic'    => $ibforums->input['pin_topic'],
+							'unpin_topic'  => $ibforums->input['unpin_topic'],
+							'post_q'       => $ibforums->input['post_q'],
+							'topic_q'      => $ibforums->input['topic_q'],
+							'allow_warn'   => $ibforums->input['allow_warn'],
+							'split_merge'  => $ibforums->input['split_merge'],
+							'edit_user'    => $ibforums->input['edit_user'],
+							'can_mm'	   => $ibforums->input['can_mm'],
+						);
+						
+		$forum_ids = array();
+		
+		$DB->simple_construct( array( 'select' => 'id', 'from' => 'forums', 'where' => "id IN(".$ibforums->input['fid'].")" ) );
+		$DB->simple_exec();
+		
+		while( $i = $DB->fetch_row() )
+		{
+			$forum_ids[ $i['id'] ] = $i['id'];
+		}
+		
+		//-----------------------------------------
+						
+		if ($ibforums->input['mod_type'] == 'group')
+		{
+		
+			if ($ibforums->input['gid'] == "")
+			{
+				$ibforums->admin->error("We could not match that group ID");
+			}
+			
+			$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'where' => "g_id='".$ibforums->input['gid']."'" ) );
+			$DB->simple_exec();
+		
+			if ( ! $group = $DB->fetch_row() )
+			{
+				$ibforums->admin->error("We could not match that group ID");
+			}
+			
+			//-----------------------------------------
+			// Already using this group on this forum?
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'moderators', 'where' => "forum_id IN(".$ibforums->input['fid'].") and group_id={$ibforums->input['gid']}" ) );
+			$DB->simple_exec();
+			
+			while( $f = $DB->fetch_row() )
+			{
+				unset($forum_ids[ $f['forum_id'] ]);
+			}
+			
+			$mr_hash['member_name'] = '-1';
+			$mr_hash['member_id']   = '-1';
+			$mr_hash['group_id']    = $group['g_id'];
+			$mr_hash['group_name']  = $group['g_title'];
+			$mr_hash['is_group']    = 1;
+			
+			$ad_log = "Added Group '{$group['g_title']}' as a moderator";
+			
+		}
+		else
+		{
+		
+			if ($ibforums->input['mem'] == "")
+			{
+				$ibforums->admin->error("You did not choose a member to add as a moderator");
+			}
+			
+			$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => "id=".intval($ibforums->input['mem']) ) );
+			$DB->simple_exec();
+		
+			if ( ! $mem = $DB->fetch_row() )
+			{
+				$ibforums->admin->error("Could not match that member name so there.");
+			}
+			
+			//-----------------------------------------
+			// Already using this member on this forum?
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'moderators', 'where' => "forum_id IN(".$ibforums->input['fid'].") and member_id={$ibforums->input['mem']}" ) );
+			$DB->simple_exec();
+			
+			while( $f = $DB->fetch_row() )
+			{
+				unset($forum_ids[ $f['forum_id'] ]);
+			}
+			
+			$mr_hash['member_name'] = $mem['name'];
+			$mr_hash['member_id']   = $mem['id'];
+			$mr_hash['is_group']    = 0;
+			
+			$ad_log = "Added Member '{$mem['name']}' as a moderator";
+		
+		}
+		
+		//-----------------------------------------
+		// Check for legal forums
+		//-----------------------------------------
+		
+		if ( count($forum_ids) == 0)
+		{
+			$ibforums->admin->error("You did not select any forums that do not have this group or member already moderating.");
+		}
+		
+		//-----------------------------------------
+		// Loopy loopy
+		//-----------------------------------------
+		
+		foreach ($forum_ids as $cartman)
+		{
+			$mr_hash['forum_id'] = $cartman;
+			
+			$DB->do_insert( 'moderators', $mr_hash );
+		}
+		
+		$ibforums->admin->save_log($ad_log);
+		
+		$this->rebuild_moderator_cache();
+		
+		$ibforums->admin->done_screen("Moderator Added", "Moderator Control", "act=mod", 'redirect' );
+		
+	}	
+	
+	//-----------------------------------------
+	//
+	// Rebuild moderator cache
+	//
+	//-----------------------------------------
+	
+	function rebuild_moderator_cache()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->cache['moderators'] = array();
+			
+		$DB->simple_construct( array( 'select' => "*",
+									  'from'   => 'moderators'
+							 )      );
+		
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$ibforums->cache['moderators'][ $i['mid'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'moderators', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	//
+	// ADD FINAL, display the add / edit form
+	//
+	//-----------------------------------------
+	
+	function mod_form( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		$group = array();
+		
+		if ($type == 'add')
+		{
+			if ($ibforums->input['fid'] == "")
+			{
+				$ibforums->admin->error("You did not choose any forums to add this member to");
+			}	
+				
+			$mod   = array();
+			$names = array();
+			
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => 'name', 'from' => 'forums', 'where' => "id IN(".$ibforums->input['fid'].")" ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$names[] = $r['name'];
+			}
+			
+			$thenames = implode( ", ", $names );
+			
+			//-----------------------------------------
+			
+			$button = "Add this moderator";
+			
+			$form_code = 'doadd';
+			
+			if ($ibforums->input['mod_type'] == 'group')
+			{
+				$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'where' => "g_id='".$ibforums->input['mod_group']."'" ) );
+				$DB->simple_exec();
+				
+				if (! $group = $DB->fetch_row() )
+				{
+					$ibforums->admin->error("Could not find that group to add as a moderator");
+				}
+				
+				$ibforums->admin->page_detail = "Adding <b>group: {$group['g_title']}</b> as a moderator to: $thenames";
+				$ibforums->admin->page_title = "Add a moderator group";
+			}
+			else
+			{
+			
+				if ($ibforums->input['MEMBER_ID'] == "")
+				{
+					$ibforums->admin->error("Could not resolve the member id bucko");
+				}
+				else
+				{
+					$DB->simple_construct( array( 'select' => 'name, id', 'from' => 'members', 'where' => "id=".intval($ibforums->input['MEMBER_ID']) ) );
+					$DB->simple_exec();
+		
+					if ( ! $mem = $DB->fetch_row() )
+					{
+						$ibforums->admin->error("That member ID does not resolve");
+					}
+					
+					$member_id   = $mem['id'];
+					$member_name = $mem['name'];
+				}
+				
+				$ibforums->admin->page_detail = "Adding a $member_name as a moderator to: $thenames";
+				$ibforums->admin->page_title = "Add a moderator";
+			
+			}
+			
+		}
+		else
+		{
+			if ($ibforums->input['mid'] == "")
+			{
+				$ibforums->admin->error("You must choose a valid moderator to edit.");
+			}
+			
+			$button    = "Edit this moderator";
+			
+			$form_code = "doedit";
+			
+			$ibforums->admin->page_title  = "Editing a moderator";
+			$ibforums->admin->page_detail = "Please check the information carefully before submitting the form";
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'moderators', 'where' => "mid=".intval($ibforums->input['mid']) ) );
+			$DB->simple_exec();
+		
+			if ( ! $mod = $DB->fetch_row() )
+			{
+				$ibforums->admin->error("Could not retrieve that moderators record");
+			}
+			
+			$member_id   = $mod['member_id'];
+			$member_name = $mod['member_name'];
+		}
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'     , $form_code ),
+																 2 => array( 'act'      , 'mod'      ),
+																 3 => array( 'mid'      , $mod['mid']),
+																 4 => array( 'fid'      , $ibforums->input['fid'] ),
+																 5 => array( 'mem'      , $member_id ),
+																 6 => array( 'mod_type' , $ibforums->input['mod_type'] ),
+																 7 => array( 'gid'      , $group['g_id'] ),
+																 8 => array( 'gname'    , $group['g_name'] ),
+														)      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "General Settings" );
+		
+		//-----------------------------------------
+		
+		if ($type == 'edit')
+		{
+			$forums = array();
+			
+			$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'forums', 'order' => "position" ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$forums[] = array( $r['id'], $r['name'] );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Moderates forum...</b>" ,
+												  $ibforums->adskin->form_dropdown( "forum_id", $forums, $mod['forum_id'] )
+									     )      );
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can edit others posts/polls?</b>" ,
+												  $ibforums->adskin->form_yes_no("edit_post", $mod['edit_post'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can edit others topic titles?</b>" ,
+												  $ibforums->adskin->form_yes_no("edit_topic", $mod['edit_topic'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can delete others posts?</b>" ,
+												  $ibforums->adskin->form_yes_no("delete_post", $mod['delete_post'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can delete others topics/polls?</b>" ,
+												  $ibforums->adskin->form_yes_no("delete_topic", $mod['delete_topic'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can view posters IP addresses?</b>" ,
+												  $ibforums->adskin->form_yes_no("view_ip", $mod['view_ip'] )
+									     )      );		
+				
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can open locked topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("open_topic", $mod['open_topic'] )
+									     )      );		
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can close open topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("close_topic", $mod['close_topic'] )
+									     )      );	
+									     	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can move topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("move_topic", $mod['move_topic'] )
+									     )      );							     
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can pin topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("pin_topic", $mod['pin_topic'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can unpin topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("unpin_topic", $mod['unpin_topic'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can split / merge topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("split_merge", $mod['split_merge'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Moderator Control Panel Settings" );
+		
+		//-----------------------------------------
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can mass move topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("mass_move", $mod['mass_move'] )
+									     )      );	
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can mass prune topics?</b>" ,
+												  $ibforums->adskin->form_yes_no("mass_prune", $mod['mass_prune'] )
+									     )      );
+									     						     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can set topics as visible and invisible?</b>" ,
+												  $ibforums->adskin->form_yes_no("topic_q", $mod['topic_q'] )
+									     )      );							     
+									     	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can set posts as visible and invisible?</b>" ,
+												  $ibforums->adskin->form_yes_no("post_q", $mod['post_q'] )
+									     )      );							     
+									     
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Advanced Settings" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can warn other users?</b>" ,
+												  $ibforums->adskin->form_yes_no("allow_warn", $mod['allow_warn'] )
+									     )      );							     
+									     	
+		//$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can edit user avatars and signatures?</b>" ,
+		//										  $ibforums->adskin->form_yes_no("edit_user", $mod['edit_user'] )
+		//							     )      );
+									   
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Can use topic multi-moderation?</b><br>".$ibforums->adskin->js_help_link('mod_mmod', 'Important Information' ) ,
+												  $ibforums->adskin->form_yes_no("can_mm", $mod['can_mm'] )
+									     )      );						     
+									     
+		//-----------------------------------------
+									     
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();							     						     
+									     
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// ADD step one: Look up a member
+	//
+	//-----------------------------------------
+	
+	function add_one()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Grab and serialize the input
+		//-----------------------------------------
+		
+		$fid      = "";
+		$fidarray = array();
+		
+		foreach ($ibforums->input as $k => $v)
+		{
+			if ( preg_match( "/^add_(\d+)$/", $k, $match ) )
+			{
+				if ($ibforums->input[ $match[0] ])
+				{
+					$fidarray[] = $match[1];
+				}
+			}
+		}
+		
+		if ( count($fidarray) < 1 )
+		{
+			$ibforums->admin->error("You must select a forum, or forums to add a moderator to. You can do this by checking the checkboxes to the left of the forum name");
+		}
+		
+		$fid = implode( "," ,$fidarray );
+		
+		$ibforums->admin->page_title = "Add a moderator";
+		
+		$ibforums->admin->page_detail = "Please find a member or group to moderate the forums you previously selected.";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'add_two' ),
+												  2 => array( 'act'   , 'mod'     ),
+												  3 => array( 'fid'   , $fid      ),
+												  4 => array( 'mod_type' , $ibforums->input['mod_type'] ),
+									     )      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['mod_type'] == 'member')
+		{
+		
+			$ibforums->html .= $ibforums->adskin->start_table( "Search for a member" );
+			
+											 
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Enter part or all of the usersname</b>" ,
+													  $ibforums->adskin->form_input( "USER_NAME" )
+											 )      );
+											 
+			$ibforums->html .= $ibforums->adskin->end_form("Find Member");
+											 
+			$ibforums->html .= $ibforums->adskin->end_table();
+		
+		}
+		else
+		{
+			// Get the group ID's and names
+			
+			$mem_group = array();
+			
+			$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups', 'order' => "g_title" ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$mem_group[] = array( $r['g_id'] , $r['g_title'] );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Choose a group as a moderator" );
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Select a group</b>" ,
+													  $ibforums->adskin->form_dropdown( "mod_group", $mem_group )
+											 )      );
+											 
+			$ibforums->html .= $ibforums->adskin->end_form("Add this group");
+											 
+			$ibforums->html .= $ibforums->adskin->end_table();
+			
+		}
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// REFINE MEMBER SEARCH
+	//
+	//-----------------------------------------
+	
+	function add_two()
+	{
+		global $ibforums, $DB,  $std;
+		
+		// Are we adding a group as a mod? If so, bounce straight to the mod perms form
+		
+		if ($ibforums->input['mod_type'] == 'group')
+		{
+			$this->mod_form();
+			exit();
+		}
+		
+		// Else continue as normal.
+		
+		if ($ibforums->input['USER_NAME'] == "")
+		{
+			$ibforums->admin->error("You didn't choose a member name to look for!");
+		}
+		
+		$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => "name LIKE '".$ibforums->input['USER_NAME']."%'" ) );
+		$DB->simple_exec();
+		
+		if (! $DB->get_num_rows() )
+		{
+			$ibforums->admin->error("Sorry, we could not find any members that matched the search string you entered");
+		}
+		
+		$form_array = array();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$form_array[] = array( $r['id'] , $r['name'] );
+		}
+		
+		$ibforums->admin->page_title = "Add a moderator";
+		
+		$ibforums->admin->page_detail = "Please select the correct member name from the selection below to add as a moderator to the previously selected forums.";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'add_final' ),
+																 2 => array( 'act'   , 'mod'    ),
+																 3 => array( 'fid'   , $ibforums->input['fid']),
+														)      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search for a member" );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Choose from the matches...</b>" ,
+												  $ibforums->adskin->form_dropdown( "MEMBER_ID", $form_array )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Choose Member");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// SHOW LIST
+	// Renders a complete listing of all the forums and categories w/mods.
+	//
+	//-----------------------------------------
+	
+	function show_list()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Moderator Control Overview";
+		$ibforums->admin->page_detail  = "This section allows you to edit, remove and add new moderators to your forums";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'add' ),
+																 2 => array( 'act'   , 'mod'   ),
+														)      );
+		
+		//-----------------------------------------
+		// Grab the moderators
+		//-----------------------------------------
+		
+		$this->forumfunc->moderators = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'moderators' ) );
+		$DB->simple_exec();
+		
+		while ($r = $DB->fetch_row())
+		{
+			$this->forumfunc->moderators[] = $r;
+		}
+		
+		//-----------------------------------------
+		// Loop and print
+		//-----------------------------------------
+		
+		$this->forumfunc->type     = 'moderator';
+		$this->forumfunc->show_all = 1;
+		$this->forumfunc->forums_list_forums();
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table("Add Moderator");
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<b>Type of moderator to add:</b> &nbsp;" . $ibforums->adskin->form_dropdown( "mod_type",
+																				  array(
+																						 0 => array( 'member', 'Single Member' ),
+																						 1 => array( 'group', 'Member Group'   )
+																					   )
+																				  ) , "center" );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Add a moderator to the selected forums");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_modlogs.php b/upload/sources/admin/ad_modlogs.php
new file mode 100644
index 00000000..82a9034f
--- /dev/null
+++ b/upload/sources/admin/ad_modlogs.php
@@ -0,0 +1,357 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Import functions
+|   > Module written by Matt Mecham
+|   > Date started: 22nd April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_modlogs {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+		
+			case 'view':
+				$this->view();
+				break;
+				
+			case 'remove':
+				$this->remove();
+				break;
+				
+				
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function view()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$start = $ibforums->input['st'] ? $ibforums->input['st'] : 0;
+		
+		$ibforums->admin->page_detail = "Viewing all actions by a moderator";
+		$ibforums->admin->page_title  = "Moderator Logs Manager";
+	
+		if ($ibforums->input['search_string'] == "")
+		{
+			$DB->simple_construct( array( 'select' => 'COUNT(id) as count', 'from' => 'moderator_logs', 'where' => "member_id=".intval($ibforums->input['mid']) ) );
+			$DB->simple_exec();
+			
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=modlog&mid={$ibforums->input['mid']}&code=view";
+			
+			$DB->cache_add_query( 'modlogs_view_one', array( 'mid' => $ibforums->input['mid'], 'start' => $start ) );
+			$DB->cache_exec_query();
+		}
+		else
+		{
+			$ibforums->input['search_string'] = urldecode($ibforums->input['search_string']);
+			
+			if ( ($ibforums->input['search_type'] == 'topic_id') or ($ibforums->input['search_type'] == 'forum_id') )
+			{
+				$dbq = "m.".$ibforums->input['search_type']."='".$ibforums->input['search_string']."'";
+			}
+			else
+			{
+				$dbq = "m.".$ibforums->input['search_type']." LIKE '%".$ibforums->input['search_string']."%'";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'COUNT(m.id) as count', 'from' => 'moderator_logs m', 'where' => $dbq ) );
+			$DB->simple_exec();
+		
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=modlog&code=view&search_type={$ibforums->input['search_type']}&search_string=".urlencode($ibforums->input['search_string']);
+			
+			$DB->cache_add_query( 'modlogs_view_two', array( 'dbq' => $dbq, 'start' => $start ) );
+			$DB->cache_exec_query();
+		}
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
+											   'PER_PAGE'    => 20,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Pages: ",
+											   'BASE_URL'    => $ibforums->base_url.$query,
+											 )
+									  );
+									  
+		$ibforums->admin->page_detail = "You may view and remove actions performed by your moderators";
+		$ibforums->admin->page_title  = "Moderator Logs Manager";
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "15%" );
+		$ibforums->adskin->td_header[] = array( "Action Perfomed"        , "15%" );
+		$ibforums->adskin->td_header[] = array( "Forum"                  , "15%" );
+		$ibforums->adskin->td_header[] = array( "Topic Title"            , "25%" );
+		$ibforums->adskin->td_header[] = array( "Time of action"         , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP address"             , "10%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Moderator Logs" );
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'center', 'catrow');
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+				$row['ctime'] = $ibforums->admin->get_date( $row['ctime'], 'LONG' );
+				
+				if ( $row['topic_id'] )
+				{
+					$topicid = "<br />Topic ID: ".$row['topic_id'];
+				}
+				else
+				{
+					$topicid = "&nbsp;";
+				}
+				
+				$sess_id             = preg_replace( "/^.+?s=(\w{32}).+?$/" , "\\1", $row['http_referer'] );
+				$row['http_referer'] = preg_replace( "/s=(\w){32}/" , ""  , $row['http_referer'] );
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$row['member_name']}</b>",
+																		 "<span style='font-weight:bold;color:red'>{$row['action']}</span>",
+																		 "<b>{$row['name']}</b>",
+																		 "{$row['topic_title']}".$topicid,
+																		 "{$row['ctime']}",
+																		 "{$row['ip_address']}",
+																)      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'center', 'tdtop');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function remove()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You did not select a member ID to remove by!");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'moderator_logs', 'where' => "member_id=".intval($ibforums->input['mid']) ) );
+		
+		$ibforums->admin->save_log("Removed Moderator Logs");
+		
+		$std->boink_it($ibforums->base_url."&act=modlog");
+		exit();
+	
+	
+	}
+	
+	
+
+	
+	
+	//-----------------------------------------
+	// SHOW ALL LANGUAGE PACKS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$form_array = array();
+	
+		$ibforums->admin->page_detail = "You may view and remove actions performed by your moderators";
+		$ibforums->admin->page_title  = "Moderator Logs Manager";
+
+		
+		//-----------------------------------------
+		// VIEW LAST 5
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'modlogs_list_current_last_five', array() );
+		$DB->cache_exec_query();
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "15%" );
+		$ibforums->adskin->td_header[] = array( "Action Perfomed"        , "15%" );
+		$ibforums->adskin->td_header[] = array( "Forum"                  , "15%" );
+		$ibforums->adskin->td_header[] = array( "Topic Title"            , "25%" );
+		$ibforums->adskin->td_header[] = array( "Time of action"         , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP address"             , "10%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Last 5 Moderation Actions" );
+
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$row['ctime'] = $ibforums->admin->get_date( $row['ctime'], 'LONG' );
+				
+				$topicid = "";
+				
+				if ( $row['topic_id'] )
+				{
+					$topicid = "<br />Topic ID: ".$row['topic_id'];
+				}
+				
+				$sess_id             = preg_replace( "/^.+?s=(\w{32}).+?$/" , "\\1", $row['http_referer'] );
+				$row['http_referer'] = preg_replace( "/s=(\w){32}/" , ""  , $row['http_referer'] );
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$row['member_name']}</b>",
+																		 "<span style='font-weight:bold;color:red'>{$row['action']}</span>",
+																		 "<b>{$row['name']}</b>",
+																		 "{$row['topic_title']}".$topicid,
+																		 "{$row['ctime']}",
+																		 "{$row['ip_address']}",
+																)      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "30%" );
+		$ibforums->adskin->td_header[] = array( "Actions Perfomed"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "View all by member"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Remove all by member"   , "30%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Moderator Logs" );
+		
+		$DB->cache_add_query( 'modlogs_list_current_show_all', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$r['member_name']}</b>",
+																	 "<center>{$r['act_count']}</center>",
+																	 "<center><a href='".$ibforums->adskin->base_url."&act=modlog&code=view&mid={$r['member_id']}'>View</a></center>",
+																	 "<center><a href='".$ibforums->adskin->base_url."&act=modlog&code=remove&mid={$r['member_id']}'>Remove</a></center>",
+															)      );
+		}
+			
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'view'     ),
+																 2 => array( 'act'   , 'modlog'       ),
+														)      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Moderator Logs" );
+		
+		$form_array = array(
+							  0 => array( 'topic_title', 'Topic Title' ),
+							  1 => array( 'ip_address',  'IP Address'  ),
+							  2 => array( 'member_name', 'Member Name' ),
+							  3 => array( 'topic_id'   , 'Topic ID'    ),
+							  4 => array( 'forum_id'   , 'Forum ID'    )
+						   );
+			
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search for...</b>" ,
+										  		  $ibforums->adskin->form_input( "search_string")
+								 )      );
+								 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search in...</b>" ,
+										  		  $ibforums->adskin->form_dropdown( "search_type", $form_array)
+								 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_multi_moderate.php b/upload/sources/admin/ad_multi_moderate.php
new file mode 100644
index 00000000..b791deb4
--- /dev/null
+++ b/upload/sources/admin/ad_multi_moderate.php
@@ -0,0 +1,542 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Topic Multi-Moderation
+|   > Module written by Matt Mecham
+|   > Date started: 14th May 2003
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_multi_moderate
+{
+
+	var $base_url;
+	var $forumfunc = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		$forums->forums_init();
+		
+		require ROOT_PATH.'sources/admin/admin_forum_functions.php';
+		
+		$this->forumfunc = new admin_forum_functions();
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=multimod', 'Topic multi-moderation home' );
+		
+		switch($ibforums->input['code'])
+		{
+		
+			case 'list':
+				$this->list_current();
+				break;
+				
+			case 'new':
+				$this->do_form('new');
+				break;
+				
+			case 'edit':
+				$this->do_form('edit');
+				break;
+				
+			case 'donew':
+				$this->do_save('new');
+				break;
+				
+			case 'doedit':
+				$this->do_save('edit');
+				break;
+				
+			case 'delete':
+				$this->do_delete();
+				break;
+				
+			//-----------------------------------------
+			
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Rebuild Cache
+	//-----------------------------------------
+	
+	function rebuild_cache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['multimod'] = array();
+        	
+		$DB->simple_construct( array(
+								 'select' => '*',
+								 'from'   => 'topic_mmod',
+								 'order'  => 'mm_title'
+						 )      );
+							
+		$DB->simple_exec();
+					
+		while ($i = $DB->fetch_row())
+		{
+			$ibforums->cache['multimod'][ $i['mm_id'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'multimod', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	// DELETE!
+	//-----------------------------------------
+	
+	function do_delete()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the MMOD ID, please try again");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'topic_mmod', 'where' => "mm_id=".intval($ibforums->input['id']) ) );
+		
+		$this->rebuild_cache();
+		
+		$ibforums->admin->save_log("Topic Multi-Mod removed");
+		
+		$std->boink_it($ibforums->adskin->base_url."&act=multimod");
+		
+	}
+	
+	//-----------------------------------------
+	// SAVE!
+	//-----------------------------------------
+	
+	function do_save($type='new')
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		$forums = array();
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		if ( $type == 'edit' )
+		{
+			if ( $ibforums->input['id'] < 1 )
+			{
+				$ibforums->admin->error("You must use a valid id");
+			}
+		}
+		
+		if ( $ibforums->input['mm_title'] == "" )
+		{
+			$ibforums->admin->error("You must enter a valid title");
+		}
+		
+		//-----------------------------------------
+		// Check for forums...
+		//-----------------------------------------
+		
+		$forums = $this->get_activein_forums();
+		
+		if ( ! $forums )
+		{
+			$ibforums->admin->error("You must select some forums to activate with this multi-moderation suite");
+		}
+		
+		if ( $ibforums->input['topic_move'] == 'n' )
+		{
+			$ibforums->admin->error("Incorrect forum chosen in the 'move to' section of the topic multi-moderation. Please note that you cannot choose to move the topic to a category");
+		}
+			
+		$save = array(
+						'mm_title'              => $ibforums->input['mm_title'],
+						'mm_enabled'            => 1,
+						'topic_state'           => $ibforums->input['topic_state'],
+						'topic_pin'	            => $ibforums->input['topic_pin'],
+						'topic_move'            => $ibforums->input['topic_move'],
+						'topic_move_link'       => $ibforums->input['topic_move_link'],
+						'topic_title_st'        => $ibforums->admin->make_safe($HTTP_POST_VARS['topic_title_st']),
+						'topic_title_end'       => $ibforums->admin->make_safe($HTTP_POST_VARS['topic_title_end']),
+						'topic_reply'           => $ibforums->input['topic_reply'],
+						'topic_reply_content'   => $ibforums->admin->make_safe($HTTP_POST_VARS['topic_reply_content']),
+						'topic_reply_postcount' => $ibforums->input['topic_reply_postcount'],
+						'mm_forums'             => $forums,
+						'topic_approve'         => $ibforums->input['topic_approve'],
+					 );
+					 
+		if ( $type == 'edit' )
+		{
+			$mm_id = $ibforums->input['id'];
+			
+			$DB->do_update( 'topic_mmod', $save, 'mm_id='.$mm_id );
+		}
+		else
+		{
+			$DB->do_insert( 'topic_mmod', $save );
+			
+			$mm_id = $DB->get_insert_id();
+		}
+		
+		$ibforums->admin->save_log("Update topic multi-moderation entries ($type)");
+		
+		$this->rebuild_cache();
+		
+		$std->boink_it($ibforums->base_url."&act=multimod");
+		
+		
+	}
+	
+	//-----------------------------------------
+	// SHOW MM FORM
+	//-----------------------------------------
+	
+	function do_form($type='new')
+	{
+		global $ibforums, $DB,  $std, $forums;
+	
+		$ibforums->admin->page_detail = "Multi moderation allows you to combine moderation actions to create easy to use shortcuts to several moderation options.";
+		$ibforums->admin->page_title  = "Topic Multi-Moderation";
+		
+		$form_code   = 'donew';
+		$description = 'Add a new topic multi-moderation';
+		$button      = "Add New Multi-Moderation";
+		
+		if ( $type == 'edit' )
+		{
+			$id = intval($ibforums->input['id']);
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'topic_mmod', 'where' => "mm_id=$id" ) );
+			$DB->simple_exec();
+		
+			if ( ! $topic_mm = $DB->fetch_row() )
+			{
+				$ibforums->admin->error("Could not retrieve the information ($id)");
+			}
+			
+			$form_code   = 'doedit';
+			$description = 'Edit the topic multi-moderation';
+			$button      = "Edit Multi-Moderation";
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $form_code ),
+																 2 => array( 'act'   , 'multimod' ),
+																 3 => array( 'id'    , $id        ),
+														)      );
+		
+		//-----------------------------------------
+		
+		$state_dd = array(
+						  0 => array( 'leave', 'Leave' ),
+						  1 => array( 'close', 'Close' ),
+						  2 => array( 'open' , 'Open'  ),
+					   );
+					  
+		$pin_dd   = array(
+						  0 => array( 'leave', 'Leave' ),
+						  1 => array( 'pin'  , 'Pin'   ),
+						  2 => array( 'unpin', 'Unpin' ),
+					    );
+					    
+		$app_dd   = array(
+						  0 => array( '0', 'Leave' ),
+						  1 => array( '1', 'Approve (Set Visible)'   ),
+						  2 => array( '2', 'Unapprove (Set Invisibe)' ),
+					    );
+					  
+		//-----------------------------------------
+		
+		
+		
+		$forum_html = "<select name='forums[]' class='textinput' size='15' multiple='multiple'>\n";
+		
+		$forum_html .= $topic_mm['mm_forums'] == '*'
+				     ? "<option value='all' selected='selected'>-- ALL FORUMS --</option>\n"
+					 : "<option value='all'>-- ALL FORUMS --</option>\n";		    
+		
+		$forum_jump = $this->forumfunc->ad_forums_forum_data();
+			
+		foreach ( $forum_jump as $idx => $i )
+		{
+			if ( strstr( ",".$topic_mm['mm_forums'].",", ",".$i['id']."," ) and $topic_mm['mm_forums'] != '*' )
+			{
+				$selected = ' selected="selected"';
+			}
+			else
+			{
+				$selected = "";
+			}
+			
+			if ( $i['redirect_on'] == 1 )
+			{
+				continue;
+			}
+			
+			$fporum_jump[] = array( $i['id'], $i['depthed_name'] );
+			
+			$forum_html  .= "<option value=\"{$i['id']}\" $selected>{$i['depthed_name']}</option>\n";
+
+		}
+		
+		$forum_html  .= "</select>";
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+
+		$ibforums->html .= $ibforums->adskin->start_table( "Topic Multi-Moderation", $description );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Title for this Multi-Moderation Suite?</b>" ,
+												  $ibforums->adskin->form_input("mm_title", $topic_mm['mm_title'] )
+									     )      );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Active in Forums...</b><br>You may choose more than one" ,
+												  $forum_html
+									     )      );							     
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( 'Moderation Options', 'left', 'pformstrip' );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Add to <i>START</i> of topic title?</b>" ,
+												  $ibforums->adskin->form_input("topic_title_st", $topic_mm['topic_title_st'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Add to <i>END</i> of topic title?</b>" ,
+												  $ibforums->adskin->form_input("topic_title_end", $topic_mm['topic_title_end'] )
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Alter topic state?</b>" ,
+												  $ibforums->adskin->form_dropdown("topic_state", $state_dd, $topic_mm['topic_state'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Alter pinned state?</b>" ,
+												  $ibforums->adskin->form_dropdown("topic_pin", $pin_dd, $topic_mm['topic_pin'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Alter approved state?</b>" ,
+												  $ibforums->adskin->form_dropdown("topic_approve", $app_dd, $topic_mm['topic_approve'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Move topic?</b>" ,
+					    						  $ibforums->adskin->form_dropdown("topic_move", array_merge( array( 0 => array('-1', 'Don\'t Move' ) ), $fporum_jump ), $topic_mm['topic_move'] )
+					    						  ."<br />".$ibforums->adskin->form_checkbox('topic_move_link', $topic_mm['topic_move_link'] )."<strong>Leave a link to the source topic?</strong>"
+									     )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( 'Post Options', 'left', 'pformstrip' );
+	
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Add a reply to the topic?</b><br>HTML enabled" ,
+												  "Enable this reply? &nbsp;".$ibforums->adskin->form_yes_no('topic_reply', $topic_mm['topic_reply'] )
+												  ."<br />"
+												  . $ibforums->adskin->form_textarea("topic_reply_content", $topic_mm['topic_reply_content'] )
+												  ."<br />".$ibforums->adskin->form_checkbox('topic_reply_postcount', $topic_mm['topic_reply_postcount'] )."<strong>Increment poster's post count?</strong>"
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	//-----------------------------------------
+	// SHOW ALL AVAILABLE MM's
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "Multi moderation allows you to combine moderation actions to create easy to use shortcuts to several moderation options.";
+		$ibforums->admin->page_title  = "Topic Multi-Moderation";
+		
+		
+		$ibforums->adskin->td_header[] = array( "Title"  , "50%" );
+		$ibforums->adskin->td_header[] = array( "Edit"   , "25%" );
+		$ibforums->adskin->td_header[] = array( "Remove" , "25%" );
+
+		$ibforums->html .= $ibforums->adskin->start_table( "Current Topic Multi-Moderation" );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topic_mmod', 'order' => "mm_title" ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+																		 "<strong>{$row['mm_title']}</strong>",
+																		 "<center><a href='{$ibforums->base_url}&amp;act=multimod&amp;code=edit&amp;id={$row['mm_id']}'>Edit</a></center>",
+																		 "<center><a href='{$ibforums->base_url}&amp;act=multimod&amp;code=delete&amp;id={$row['mm_id']}'>Remove</a></center>",
+																)      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>None set up</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic("<a href='{$ibforums->base_url}&amp;act=multimod&amp;code=new' class='fauxbutton'>Add New</a>", 'center', 'pformstrip');
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	//-----------------------------------------
+    // Get the active in forums
+    //-----------------------------------------    
+        
+    function get_activein_forums()
+    {
+		global $ibforums, $DB, $std, $forums, $HTTP_POST_VARS;
+    	
+    	$forumids = array();
+    	
+    	//-----------------------------------------
+    	// Check for an array
+    	//-----------------------------------------
+    	
+    	if ( is_array( $HTTP_POST_VARS['forums'] )  )
+    	{
+    	
+    		if ( in_array( 'all', $HTTP_POST_VARS['forums'] ) )
+    		{
+    			//-----------------------------------------
+    			// Searching all forums..
+    			//-----------------------------------------
+    			
+    			return '*';
+    		}
+    		else
+    		{
+				//-----------------------------------------
+				// Go loopy loo
+				//-----------------------------------------
+				
+				foreach( $HTTP_POST_VARS['forums'] as $l )
+				{
+					if ( $forums->forum_by_id[ $l ] )
+					{
+						$forumids[] = intval($l);
+					}
+				}
+				
+				//-----------------------------------------
+				// Do we have cats? Give 'em to Charles!
+				//-----------------------------------------
+				
+				if ( count( $forumids  ) )
+				{
+					foreach( $forumids  as $f )
+					{
+						$children = $forums->forums_get_children( $f );
+						
+						if ( is_array($children) and count($children) )
+						{
+							$forumids  = array_merge( $forumids , $children );
+						}
+					}
+				}
+				else
+				{
+					//-----------------------------------------
+					// No forums selected / we have available
+					//-----------------------------------------
+					
+					return;
+				}
+    		}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Not an array...
+			//-----------------------------------------
+			
+			if ( $ibforums->input['forums'] == 'all' )
+			{
+				return '*';
+			}
+			else
+			{
+				if ( $ibforums->input['forums'] != "" )
+				{
+					$l = intval($ibforums->input['forums']);
+					
+					//-----------------------------------------
+					// Single forum
+					//-----------------------------------------
+					
+					if ( $forums->forum_by_id[ $l ] )
+					{
+						$forumids[] = intval($l);
+					}
+					
+					if ( $ibforums->input['searchsubs'] == 1 )
+					{
+						$children = $forums->forums_get_children( $f );
+						
+						if ( is_array($children) and count($children) )
+						{
+							$forumids  = array_merge( $forumids , $children );
+						}
+					}
+				}
+			}
+		}
+		
+		return implode( ",", $forumids );
+    }
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_mysql.php b/upload/sources/admin/ad_mysql.php
similarity index 59%
rename from upload/sources/Admin/ad_mysql.php
rename to upload/sources/admin/ad_mysql.php
index d149c173..5028ef88 100644
--- a/upload/sources/Admin/ad_mysql.php
+++ b/upload/sources/admin/ad_mysql.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -34,8 +33,6 @@ if ( ! defined( 'IN_ACP' ) )
 
 @set_time_limit(1200);
 
-$idx = new ad_mysql();
-
 
 class ad_mysql {
 
@@ -44,12 +41,20 @@ class ad_mysql {
 	var $true_version    = "";
 	var $str_gzip_header = "\x1f\x8b\x08\x00\x00\x00\x00\x00";
 
-	function ad_mysql() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS, $HTTP_GET_VARS;
+	function auto_run()
+	{
+		global $INFO, $ibforums, $DB,  $std, $HTTP_POST_VARS, $HTTP_GET_VARS;
 		
-		//---------------------------------------
+		if ( strtolower($INFO['sql_driver']) != 'mysql' )
+		{
+			require_once( ROOT_PATH.'sources/admin/ad_'.strtolower($INFO['sql_driver']).'.php' );
+			$dbdriver = new ad_sql();
+			$dbdriver->auto_run();
+		}
+		
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -58,19 +63,19 @@ class ad_mysql {
 			unset($$k);
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
 		// Make sure we're a root admin, or else!
 		
-		if ($MEMBER['mgroup'] != $INFO['admin_group'])
+		if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
 		{
-			$ADMIN->error("Sorry, these functions are for the root admin group only");
+			$ibforums->admin->error("Sorry, these functions are for the root admin group only");
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Get the mySQL version.
 		// Adapted from phpMyAdmin
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT VERSION() AS version");
 		
@@ -90,7 +95,7 @@ class ad_mysql {
 		
    		$this->mysql_version = (int)sprintf('%d%02d%02d', $one, $two, intval($three));
    		
-		switch($IN['code'])
+		switch($ibforums->input['code'])
 		{
 		
 			case 'dotool':
@@ -130,7 +135,7 @@ class ad_mysql {
 				$this->do_safe_backup(trim(urldecode(stripslashes($HTTP_GET_VARS['tbl']))));
 				break;
 			
-			//-------------------------
+			//-----------------------------------------
 			default:
 				$this->list_index();
 				break;
@@ -138,20 +143,20 @@ class ad_mysql {
 		
 	}
 	
-	//-----------------------------------------------
+	//-----------------------------------------
 	// Back up baby, back up
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function do_safe_backup($tbl_name="")
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		if ($tbl_name == "")
 		{
 			// Auto all tables
-			$skip        = intval($IN['skip']);
-			$create_tbl  = intval($IN['create_tbl']);
-			$enable_gzip = intval($IN['enable_gzip']);
+			$skip        = intval($ibforums->input['skip']);
+			$create_tbl  = intval($ibforums->input['create_tbl']);
+			$enable_gzip = intval($ibforums->input['enable_gzip']);
 			$filename    = 'ibf_dbbackup';
 		}
 		else
@@ -196,9 +201,9 @@ class ad_mysql {
 			header("Content-disposition: attachment; filename=$filename.sql");
 		}
 		
-		//-----------------------------
+		//-----------------------------------------
 		// Get tables to work on
-		//-----------------------------
+		//-----------------------------------------
 		
 		if ($tbl_name == "")
 		{
@@ -208,7 +213,7 @@ class ad_mysql {
 			{
 				// Ensure that we're only peeking at IBF tables
 				
-				if ( preg_match( "/^".$INFO['sql_tbl_prefix']."/", $tbl ) )
+				if ( preg_match( "/^".$ibforums->vars['sql_tbl_prefix']."/", $tbl ) )
 				{
 					// We've started our headers, so print as we go to stop
 					// poss memory problems
@@ -222,9 +227,9 @@ class ad_mysql {
 			$this->get_table_sql($tbl_name, $create_tbl, $skip);
 		}
 		
-		//-----------------------------
+		//-----------------------------------------
 		// GZIP?
-		//-----------------------------
+		//-----------------------------------------
 		
 		if($do_gzip)
 		{
@@ -242,25 +247,25 @@ class ad_mysql {
 		
 	}
 	
-	//-----------------------------------------------
+	//-----------------------------------------
 	// Internal handler to return content from table
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function get_table_sql($tbl, $create_tbl, $skip=0)
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		if ($create_tbl)
 		{
 			// Generate table structure
 			
-			if ( $IN['addticks'] )
+			if ( $ibforums->input['addticks'] )
 			{
-				$DB->query("SHOW CREATE TABLE `".$INFO['sql_database'].".".$tbl."`");
+				$DB->query("SHOW CREATE TABLE `".$ibforums->vars['sql_database'].".".$tbl."`");
 			}
 			else
 			{
-				$DB->query("SHOW CREATE TABLE ".$INFO['sql_database'].".".$tbl);
+				$DB->query("SHOW CREATE TABLE ".$ibforums->vars['sql_database'].".".$tbl);
 			}
 			
 			$ctable = $DB->fetch_row();
@@ -272,10 +277,10 @@ class ad_mysql {
 		
 		if ($skip == 1)
 		{
-			if ($tbl == $INFO['sql_tbl_prefix'].'admin_sessions'
-				OR $tbl == $INFO['sql_tbl_prefix'].'sessions'
-				OR $tbl == $INFO['sql_tbl_prefix'].'reg_anti_spam'
-				OR $tbl == $INFO['sql_tbl_prefix'].'search_results'
+			if ($tbl == $ibforums->vars['sql_tbl_prefix'].'admin_sessions'
+				OR $tbl == $ibforums->vars['sql_tbl_prefix'].'sessions'
+				OR $tbl == $ibforums->vars['sql_tbl_prefix'].'reg_anti_spam'
+				OR $tbl == $ibforums->vars['sql_tbl_prefix'].'search_results'
 			   )
 			{
 				return $ret;
@@ -296,9 +301,9 @@ class ad_mysql {
 			return TRUE;
 		}
 		
-		//---------------------------
+		//-----------------------------------------
 		// Get col names
-		//---------------------------
+		//-----------------------------------------
 		
 		$f_list = "";
 	
@@ -315,9 +320,9 @@ class ad_mysql {
 		
 		while ( $row = $DB->fetch_row() )
 		{
-			//---------------------------
+			//-----------------------------------------
 			// Get col data
-			//---------------------------
+			//-----------------------------------------
 			
 			$d_list = "";
 			
@@ -346,18 +351,18 @@ class ad_mysql {
 		
 	}
 	
-	//-----------------------------------------------
+	//-----------------------------------------
 	// sql_strip_ticks from field names
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function sql_strip_ticks($data)
 	{
 		return str_replace( "`", "", $data );
 	}
 	
-	//-----------------------------------------------
+	//-----------------------------------------
 	// Add slashes to single quotes to stop sql breaks
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function sql_add_slashes($data)
 	{
@@ -369,43 +374,43 @@ class ad_mysql {
         return $data;
 	}
 	
-	//-----------------------------------------------
+	//-----------------------------------------
 	// Almost there!
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function sbup_splash()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->page_detail = "This section allows you to backup your database.";
+		$ibforums->admin->page_detail = "This section allows you to backup your database.";
 
-		$ADMIN->page_title  = "mySQL ".$this->true_version." Back Up";
+		$ibforums->admin->page_title  = "mySQL ".$this->true_version." Back Up";
 		
 		// Check for mySQL version..
 		// Might change at some point..
 		
 		if ( $this->mysql_version < 32321 )
 		{
-			$ADMIN->error("Sorry, mySQL version of less than 3.23.21 are not support by this backup utility");
+			$ibforums->admin->error("Sorry, mySQL version of less than 3.23.21 are not support by this backup utility");
 		}
 		
-		$SKIN->td_header[] = array( "&nbsp;" , "100%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
 
-		$ADMIN->html .= $SKIN->start_table( "Simple Back Up" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Simple Back Up" );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
 													"<b>Back Up mySQL Database</b><br><br>Once you have clicked the link below, please wait
 													until your browser prompts you with a dialogue box. This may take some time depending on
 													the size of the database you are backing up.
 													<br><br>
-													<b><a href='{$ADMIN->base_url}&act=mysql&code=dosafebackup&create_tbl={$IN['create_tbl']}&addticks={$IN['addticks']}&skip={$IN['skip']}&enable_gzip={$IN['enable_gzip']}'>Click here to start the backup</a></b>"
+													<b><a href='{$ibforums->base_url}&act=mysql&code=dosafebackup&create_tbl={$ibforums->input['create_tbl']}&addticks={$ibforums->input['addticks']}&skip={$ibforums->input['skip']}&enable_gzip={$ibforums->input['enable_gzip']}'>Click here to start the backup</a></b>"
 									     )      );
 									     
 												 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 		
 	
 	}
@@ -413,9 +418,9 @@ class ad_mysql {
 	
 	function show_backup_form()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->page_detail = "This section allows you to backup your database.
+		$ibforums->admin->page_detail = "This section allows you to backup your database.
 							  <br><br><b>Simple Backup</b>
 							  <br>This function compiles a single back up file and prompts a browser dialogue box for you to save 
 							  the file. This is beneficial for PHP safe mode enabled hosts, but can only be used on small databases.
@@ -424,75 +429,75 @@ class ad_mysql {
 							  <br>This function allows you to split the backup into smaller sections and saves the backup to disk.
 							  <br>Note, this can only be used if you do not have PHP safe mode enabled.-->";
 
-		$ADMIN->page_title  = "mySQL ".$this->true_version." Back Up";
+		$ibforums->admin->page_title  = "mySQL ".$this->true_version." Back Up";
 		
 		// Check for mySQL version..
 		// Might change at some point..
 		
 		if ( $this->mysql_version < 32321 )
 		{
-			$ADMIN->error("Sorry, mySQL version of less than 3.23.21 are not support by this backup utility");
+			$ibforums->admin->error("Sorry, mySQL version of less than 3.23.21 are not support by this backup utility");
 		}
 		
-		$SKIN->td_header[] = array( "&nbsp;" , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;" , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
 			
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'act'  , 'mysql' ),
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'mysql' ),
 											  	  2 => array( 'code' , 'safebackup'),
 									 	 )      );
 		
-		$ADMIN->html .= $SKIN->start_table( "Simple Back Up" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Simple Back Up" );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
 													"<b>Add 'CREATE TABLE' statements?</b><br>Add backticks around the table name?<br>(if you get a mySQL error, enable this) <input type='checkbox' name='addticks' value=1>",
-													$SKIN->form_yes_no( 'create_tbl', 1),
+													$ibforums->adskin->form_yes_no( 'create_tbl', 1),
 									     )      );
 									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
 													"<b>Skip non essential data?</b><br>Will not produce insert rows for ibf_sessions, ibf_admin_sessions, ibf_search_results, ibf_reg_anti_spam.",
-													$SKIN->form_yes_no( 'skip', 1),
+													$ibforums->adskin->form_yes_no( 'skip', 1),
 									     )      );
 									     
-		$ADMIN->html .= $SKIN->add_td_row( array( 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
 													"<b>GZIP Content?</b><br>Will produce a smaller file if GZIP is enabled.",
-													$SKIN->form_yes_no( 'enable_gzip', 1),
+													$ibforums->adskin->form_yes_no( 'enable_gzip', 1),
 									     )      );
 												 
-		$ADMIN->html .= $SKIN->end_form("Start Back Up");
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_form("Start Back Up");
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 		
 	
 	}
 	
 	
 	
-	//-------------------------
+	//-----------------------------------------
 	// Run mySQL queries
-	//-------------------------
+	//-----------------------------------------
 	
 	
 	function view_sql($sql)
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		$limit = 50;
-		$start = intval($IN['st']) == "" ? 0 : intval($IN['st']);
+		$start = intval($ibforums->input['st']) == "" ? 0 : intval($ibforums->input['st']);
 		$pages = "";
 		
-		$ADMIN->page_detail = "This section allows you to administrate your mySQL database.$extra";
-		$ADMIN->page_title  = "mySQL ".$this->true_version." Tool Box";
+		$ibforums->admin->page_detail = "This section allows you to administrate your mySQL database.$extra";
+		$ibforums->admin->page_title  = "mySQL ".$this->true_version." Tool Box";
 		
 		$map = array( 'processes' => "SQL Processes",
 					  'runtime'   => "SQL Runtime Information",
 					  'system'    => "SQL System Variables",
 					);
 					
-		if ($map[ $IN['code'] ] != "")
+		if ($map[ $ibforums->input['code'] ] != "")
 		{
-			$tbl_title = $map[ $IN['code'] ];
+			$tbl_title = $map[ $ibforums->input['code'] ];
 			$man_query = 0;
 		}
 		else
@@ -501,33 +506,33 @@ class ad_mysql {
 			$man_query = 1;
 		}
 		
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		if ($man_query == 1)
 		{
-			$SKIN->td_header[] = array( "&nbsp;" , "100%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
 			
-			$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'act'  , 'mysql' ),
+			$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'mysql' ),
 											      2 => array( 'code' , 'runsql'),
 										 )      );
 			
-			$ADMIN->html .= $SKIN->start_table( "Run Query" );
+			$ibforums->html .= $ibforums->adskin->start_table( "Run Query" );
 			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<center>".$SKIN->form_textarea("query", $sql )."</center>" ) );
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<center>".$ibforums->adskin->form_textarea("query", $sql )."</center>" ) );
 													 
-			$ADMIN->html .= $SKIN->end_form("Run a New Query");
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_form("Run a New Query");
+			$ibforums->html .= $ibforums->adskin->end_table();
 			
 			
 			// Check for drop, create and flush
 			
 			if ( preg_match( "/^DROP|CREATE|FLUSH/i", trim($sql) ) )
 			{
-				$ADMIN->error = "Sorry, those queries are not allowed for your safety";
+				$ibforums->admin->error = "Sorry, those queries are not allowed for your safety";
 			}
 		}
 		
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		$DB->return_die = 1;
 		
@@ -537,15 +542,15 @@ class ad_mysql {
 		
 		if ( $DB->error != "")
 		{
-			$SKIN->td_header[] = array( "&nbsp;" , "100%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
 			
-			$ADMIN->html .= $SKIN->start_table( "SQL Error" );
+			$ibforums->html .= $ibforums->adskin->start_table( "SQL Error" );
 			
-			$ADMIN->html .= $SKIN->add_td_row( array($DB->error) );
+			$ibforums->html .= $ibforums->adskin->add_td_row( array($DB->error) );
 		
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_table();
 			
-			$ADMIN->output(); // End output and script
+			$ibforums->admin->output(); // End output and script
 			
 		}
 		
@@ -554,15 +559,15 @@ class ad_mysql {
 			// We can't show any info, and if we're here, there isn't
 			// an error, so we're good to go.
 			
-			$SKIN->td_header[] = array( "&nbsp;" , "100%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
 			
-			$ADMIN->html .= $SKIN->start_table( "SQL Query Completed" );
+			$ibforums->html .= $ibforums->adskin->start_table( "SQL Query Completed" );
 			
-			$ADMIN->html .= $SKIN->add_td_row( array("Query: $sql<br>Executed Successfully") );
+			$ibforums->html .= $ibforums->adskin->add_td_row( array("Query: $sql<br>Executed Successfully") );
 		
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_table();
 			
-			$ADMIN->output(); // End output and script
+			$ibforums->admin->output(); // End output and script
 			
 		}
 		else if ( preg_match( "/^SELECT/i", $sql ) )
@@ -578,7 +583,7 @@ class ad_mysql {
 				{
 					// Get tbl name
 			
-					//$tbl_name = preg_replace( "/(".$INFO['sql_tbl_prefix']."\S+?)([\s\.,]|$)/i", "\\1", $sql );
+					//$tbl_name = preg_replace( "/(".$ibforums->vars['sql_tbl_prefix']."\S+?)([\s\.,]|$)/i", "\\1", $sql );
 			
 					// Set up pages.
 					
@@ -587,7 +592,7 @@ class ad_mysql {
 														   'CUR_ST_VAL'  => $start,
 														   'L_SINGLE'    => "Single Page",
 														   'L_MULTI'     => "Pages: ",
-														   'BASE_URL'    => $ADMIN->base_url."&act=mysql&code=runsql&query=".urlencode($sql),
+														   'BASE_URL'    => $ibforums->base_url."&act=mysql&code=runsql&query=".urlencode($sql),
 														 )
 												  );
 												  
@@ -609,16 +614,16 @@ class ad_mysql {
 		
 		for( $i = 0; $i < $cnt; $i++ )
 		{
-			$SKIN->td_header[] = array( $fields[$i]->name , "*" );
+			$ibforums->adskin->td_header[] = array( $fields[$i]->name , "*" );
 		}
 		
-		$ADMIN->html .= $SKIN->start_table( "Result: ".$tbl_title );
+		$ibforums->html .= $ibforums->adskin->start_table( "Result: ".$tbl_title );
 		
 		if ($links != "")
 		{
-			$pages = $SKIN->add_td_basic( $links, 'left', 'tdrow2' );
+			$pages = $ibforums->adskin->add_td_basic( $links, 'left', 'tdrow2' );
 		
-			$ADMIN->html .= $pages;
+			$ibforums->html .= $pages;
 		}
 		
 		while( $r = $DB->fetch_row() )
@@ -642,41 +647,41 @@ class ad_mysql {
 				$rows[] = wordwrap( htmlspecialchars(nl2br($r[ $fields[$i]->name ])) , 50, "<br>", 1 );
 			}
 			
-			$ADMIN->html .= $SKIN->add_td_row( $rows );
+			$ibforums->html .= $ibforums->adskin->add_td_row( $rows );
 		
 		}
 		
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 		
 		
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// I'm A TOOL!
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function run_tool()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->page_detail = "This section allows you to administrate your mySQL database.$extra";
-		$ADMIN->page_title  = "mySQL ".$this->true_version." Tool Box";
+		$ibforums->admin->page_detail = "This section allows you to administrate your mySQL database.$extra";
+		$ibforums->admin->page_title  = "mySQL ".$this->true_version." Tool Box";
 		
-		//-------------------------------------------------------------
+		//-----------------------------------------
 		// have we got some there tables me laddo?
-		//-------------------------------------------------------------
+		//-----------------------------------------
 		
 		$tables = array();
  		
- 		foreach ($IN as $key => $value)
+ 		foreach ($ibforums->input as $key => $value)
  		{
  			if ( preg_match( "/^tbl_(\S+)$/", $key, $match ) )
  			{
- 				if ($IN[$match[0]])
+ 				if ($ibforums->input[$match[0]])
  				{
  					$tables[] = $match[1];
  				}
@@ -685,22 +690,22 @@ class ad_mysql {
  		
  		if ( count($tables) < 1 )
  		{
- 			$ADMIN->error("You must choose some tables to run this tool on or it's just plain outright silly");
+ 			$ibforums->admin->error("You must choose some tables to run this tool on or it's just plain outright silly");
  		}
  		
- 		//-------------------------------------------------------------
+ 		//-----------------------------------------
 		// What tool is one running?
 		// optimize analyze check repair
-		//-------------------------------------------------------------
+		//-----------------------------------------
 		
-		if (strtoupper($IN['tool']) == 'DROP' || strtoupper($IN['tool']) == 'CREATE' || strtoupper($IN['tool']) == 'FLUSH')
+		if (strtoupper($ibforums->input['tool']) == 'DROP' || strtoupper($ibforums->input['tool']) == 'CREATE' || strtoupper($ibforums->input['tool']) == 'FLUSH')
 		{
-			$ADMIN->error("You can't do that, sorry");
+			$ibforums->admin->error("You can't do that, sorry");
 		}
 		
 		foreach($tables as $table)
 		{
-			$DB->query(strtoupper($IN['tool'])." TABLE $table");
+			$DB->query(strtoupper($ibforums->input['tool'])." TABLE $table");
 			
 			$fields = $DB->get_result_fields();
 			
@@ -712,10 +717,10 @@ class ad_mysql {
 			
 			for( $i = 0; $i < $cnt; $i++ )
 			{
-				$SKIN->td_header[] = array( $fields[$i]->name , "*" );
+				$ibforums->adskin->td_header[] = array( $fields[$i]->name , "*" );
 			}
 			
-			$ADMIN->html .= $SKIN->start_table( "Result: ".$IN['tool']." ".$table );
+			$ibforums->html .= $ibforums->adskin->start_table( "Result: ".$ibforums->input['tool']." ".$table );
 			
 			// Grab the rows - we don't what or how many so...
 			
@@ -726,29 +731,29 @@ class ad_mysql {
 				$rows[] = $data[ $fields[$i]->name ];
 			}
 			
-			$ADMIN->html .= $SKIN->add_td_row( $rows );
+			$ibforums->html .= $ibforums->adskin->add_td_row( $rows );
 			
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_table();
 		}
 		
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 		
 		
 	}
 	
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// SHOW ALL TABLES AND STUFF!
 	// 5 hours ago this seemed like a damned good idea.
 	// Now it's late and I want to replace all of this code with
 	// header("Location: http://yoursite/phpmyadmin");
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function list_index()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		$form_array = array();
 		
@@ -757,18 +762,18 @@ class ad_mysql {
 			$extra = "<br><b>Note: your version of mySQL has a limited feature set and some tools have been removed</b>";
 		}
 	
-		$ADMIN->page_detail = "This section allows you to administrate your mySQL database.$extra";
-		$ADMIN->page_title  = "mySQL ".$this->true_version." Tool Box";
+		$ibforums->admin->page_detail = "This section allows you to administrate your mySQL database.$extra";
+		$ibforums->admin->page_title  = "mySQL ".$this->true_version." Tool Box";
 		
-		//+-------------------------------
+		//-----------------------------------------
 		// Show advanced stuff for mySQL > 3.23.03
-		//+-------------------------------
+		//-----------------------------------------
 		
 		$idx_size = 0;
 		$tbl_size = 0;
 		
 		
-		$ADMIN->html .= "
+		$ibforums->html .= "
 				     <script language='Javascript'>
                      <!--
                      function CheckAll(cb) {
@@ -800,29 +805,29 @@ class ad_mysql {
                      </script>
                      ";
 						  
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'act'  , 'mysql' ),
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'mysql' ),
 											      2 => array( 'code' , 'dotool'),
 										 ) , "theForm"     );
 		
 		if ( $this->mysql_version >= 32303 )
 		{
 		
-			$SKIN->td_header[] = array( "Table"      , "20%" );
-			$SKIN->td_header[] = array( "Rows"       , "10%" );
-			$SKIN->td_header[] = array( "TBL Size"   , "20%" );
-			$SKIN->td_header[] = array( "Index Size" , "20%" );
-			$SKIN->td_header[] = array( "Export"     , "10%" );
-			$SKIN->td_header[] = array( '<input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();">'     , "10%" );
+			$ibforums->adskin->td_header[] = array( "Table"      , "20%" );
+			$ibforums->adskin->td_header[] = array( "Rows"       , "10%" );
+			$ibforums->adskin->td_header[] = array( "TBL Size"   , "20%" );
+			$ibforums->adskin->td_header[] = array( "Index Size" , "20%" );
+			$ibforums->adskin->td_header[] = array( "Export"     , "10%" );
+			$ibforums->adskin->td_header[] = array( '<input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();">'     , "10%" );
 			
-			$ADMIN->html .= $SKIN->start_table( "Invision Power Board Tables" );
+			$ibforums->html .= $ibforums->adskin->start_table( "Invision Power Board Tables" );
 			
-			$DB->query("SHOW TABLE STATUS FROM `".$INFO['sql_database']."`");
+			$DB->query("SHOW TABLE STATUS FROM `".$ibforums->vars['sql_database']."`");
 			
 			while ( $r = $DB->fetch_row() )
 			{
 				// Check to ensure it's a table for this install...
 				
-				if ( ! preg_match( "/^".$INFO['sql_tbl_prefix']."/", $r['Name'] ) )
+				if ( ! preg_match( "/^".$ibforums->vars['sql_tbl_prefix']."/", $r['Name'] ) )
 				{
 					continue;
 				}
@@ -836,11 +841,11 @@ class ad_mysql {
 				$idx = $this->gen_size( $r['Index_length'], 3, $iBit );
 				$tbl = $this->gen_size( $r['Data_length'] , 3, $tBit );
 				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b><span style='font-size:12px'><a href='{$SKIN->base_url}&act=mysql&code=runsql&query=".urlencode("SELECT * FROM {$r['Name']}")."'>{$r['Name']}</a></span></b>",
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b><span style='font-size:12px'><a href='{$ibforums->adskin->base_url}&act=mysql&code=runsql&query=".urlencode("SELECT * FROM {$r['Name']}")."'>{$r['Name']}</a></span></b>",
 														  "<center>{$r['Rows']}</center>",
 														  "<div align='right'><span style='color:blue;font-size:12px'>{$tbl[0]} {$tbl[1]}</span></div>",
 														  "<div align='right'>{$idx[0]} {$idx[1]}</div>",
-														  "<center><a href='{$SKIN->base_url}&act=mysql&code=export_tbl&tbl={$r['Name']}'>Export</a></center></b>",
+														  "<center><a href='{$ibforums->adskin->base_url}&act=mysql&code=export_tbl&tbl={$r['Name']}'>Export</a></center></b>",
 														  "<center><input name=\"tbl_{$r['Name']}\" value=1 type='checkbox' onClick=\"CheckCheckAll();\"></center>",
 												 )      );
 			}
@@ -855,7 +860,7 @@ class ad_mysql {
 			$tbl = $this->gen_size( $tbl_size , 3, $tBit );
 			$tot = $this->gen_size( $total    , 3, $oBit );
 			
-			$ADMIN->html .= $SKIN->add_td_row( array ("&nbsp;",
+			$ibforums->html .= $ibforums->adskin->add_td_row( array ("&nbsp;",
 													  "&nbsp;",
 													  "<div align='right'><b>{$tbl[0]} {$tbl[1]}</b></div>",
 													  "<div align='right'><b>{$idx[0]} {$idx[1]}</b></div>",
@@ -868,11 +873,11 @@ class ad_mysql {
 		{
 			// display a basic information table
 			
-			$SKIN->td_header[] = array( "Table"      , "60%" );
-			$SKIN->td_header[] = array( "Rows"       , "30%" );
-			$SKIN->td_header[] = array( '<input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();">'     , "10%" );
+			$ibforums->adskin->td_header[] = array( "Table"      , "60%" );
+			$ibforums->adskin->td_header[] = array( "Rows"       , "30%" );
+			$ibforums->adskin->td_header[] = array( '<input name="allbox" type="checkbox" value="Check All" onClick="CheckAll();">'     , "10%" );
 			
-			$ADMIN->html .= $SKIN->start_table( "Invision Power Board Tables" );
+			$ibforums->html .= $ibforums->adskin->start_table( "Invision Power Board Tables" );
 			
 			$tables = $DB->get_table_names();
 			
@@ -880,7 +885,7 @@ class ad_mysql {
 			{
 				// Ensure that we're only peeking at IBF tables
 				
-				if ( ! preg_match( "/^".$INFO['sql_tbl_prefix']."/", $tbl ) )
+				if ( ! preg_match( "/^".$ibforums->vars['sql_tbl_prefix']."/", $tbl ) )
 				{
 					continue;
 				}
@@ -889,7 +894,7 @@ class ad_mysql {
 				
 				$cnt = $DB->fetch_row();
 				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b><span style='font-size:12px'>$tbl</span></b>",
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b><span style='font-size:12px'>$tbl</span></b>",
 														  "<center>{$cnt['Rows']}</center>",
 														  "<center><input name='tbl_$tbl' type='checkbox' onClick=\"CheckCheckAll(this);\"></center>",
 												 )      );
@@ -898,13 +903,13 @@ class ad_mysql {
 			
 		}
 		
-		//----------------------------
+		//-----------------------------------------
 		// Add in the bottom stuff
-		//----------------------------
+		//-----------------------------------------
 											 
 		if ( $this->mysql_version < 32322 )
 		{
-			$ADMIN->html .= $SKIN->add_td_basic( "<select id='button' name='tool'>
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "<select id='button' name='tool'>
 													<option value='optimize'>Optimize Selected Tables</option>
 												  </select>
 												 <input type='submit' value='Go!' id='button'></form>", "center", "tdrow2" );
@@ -912,7 +917,7 @@ class ad_mysql {
 		else
 		{
 										 
-			$ADMIN->html .= $SKIN->add_td_basic( "<select id='button' name='tool'>
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "<select id='button' name='tool'>
 													<option value='optimize'>Optimize Selected Tables</option>
 													<option value='repair'>Repair Selected Tables</option>
 													<option value='check'>Check Selected Tables</option>
@@ -921,35 +926,35 @@ class ad_mysql {
 												 <input type='submit' value='Go!' id='button'></form>", "center", "tdrow2" );
 		}
 			
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
 		
-		//----------------------------
+		//-----------------------------------------
 		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'act'  , 'mysql' ),
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'mysql' ),
 											      2 => array( 'code' , 'runsql'),
 										 )      );
 		
-		$SKIN->td_header[] = array( "Table"      , "30%" );
-		$SKIN->td_header[] = array( "Rows"       , "70%" );
+		$ibforums->adskin->td_header[] = array( "{none}"      , "30%" );
+		$ibforums->adskin->td_header[] = array( "{none}"      , "70%" );
 		
-		$ADMIN->html .= $SKIN->start_table( "Run a Query" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Run a Query" );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Manual Query</b><br>Advanced Users Only",
-												  $SKIN->form_textarea("query", "" ),
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Manual Query</b><br>Advanced Users Only",
+												  $ibforums->adskin->form_textarea("query", "" ),
 												 )      );
 												 
-		$ADMIN->html .= $SKIN->end_form("Run Query");
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_form("Run Query");
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
 		
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 	
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// Convert chars into byte sizes
 	// (Based on a similar function in phpmyadmin)
 	// "Based on?" my ass!
@@ -958,7 +963,7 @@ class ad_mysql {
 	// I did make it pretty though - does that count?
 	// Oh CMON! A zillion lines of new code and you can't get over
 	// a few lines "borrowed" from another script?
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function gen_size($val, $li, $sepa )
 	{
diff --git a/upload/sources/admin/ad_plugins.php b/upload/sources/admin/ad_plugins.php
new file mode 100644
index 00000000..aae51140
--- /dev/null
+++ b/upload/sources/admin/ad_plugins.php
@@ -0,0 +1,1249 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Framework for IPS Services
+|   > Module written by Matt Mecham
+|   > Date started: 17 February 2003
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_plugins {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		
+		// Make sure we're a root admin, or else!
+		
+		if ($ibforums->member['mgroup'] != $ibforums->vars['admin_group'])
+		{
+			$ibforums->admin->error("Sorry, these functions are for the root admin group only");
+		}
+
+		switch($ibforums->input['code'])
+		{
+			case 'ipchat':
+				$this->chat_splash();
+				break;
+			case 'ipchat04':
+				$this->chat04_splash();
+				break;
+			case 'dochat04':
+				$this->chat_config_save();
+				break;
+			case 'chatframe':
+				$this->chat_frame();
+				break;
+			case 'chatsave':
+				$this->chat_save();
+				break;
+			case 'dochat':
+				$this->chat_config_save();
+				break;
+			case 'dorefreshchat':
+				$this->chat_refresh_online();
+				break;
+				
+			//-----------------------------------------
+			
+			case 'reg':
+				$this->reg_splash();
+				break;	
+			case 'regframe':
+				$this->reg_frame();
+				break;
+			case 'regsave':
+				$this->reg_save();
+				break;
+			case 'doreg':
+				$this->reg_config_save();
+				break;
+			
+			//-----------------------------------------
+			
+			case 'copy':
+				$this->copy_splash();
+				break;	
+			case 'copyframe':
+				$this->copy_frame();
+				break;
+			case 'copysave':
+				$this->copy_save();
+				break;
+			case 'docopy':
+				$this->copy_config_save();
+				break;
+				
+			default:
+				exit();
+				break;
+		}
+		
+	}
+	
+	
+	//-----------------------------------------
+	// Copyright removal Splash
+	//-----------------------------------------
+	
+	function copy_splash()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Do we have an order number
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['ipb_copy_number'] )
+		{
+			$this->copy_config();
+		}
+		else
+		{
+			$frames = "<html>
+		   			 <head><title>Invision Power Board: Registration Set up</title></head>
+					   <frameset rows='*,100' frameborder='yes' border='1' framespacing='0'>
+					   	<frame name='chat_top'   scrolling='auto' src='http://customer.invisionpower.com/ipb/copy/redirect_acp.php'>
+					   	<frame name='chat_bottom'  scrolling='auto' src='{$ibforums->adskin->base_url}&act=pin&code=copyframe'>
+					   </frameset>
+				   </html>";
+				   
+			print $frames;
+			exit();
+		}
+		
+	}
+	
+	//-----------------------------------------
+	
+	function copy_frame()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$html = "<html>
+				  <head>
+				   <title>Invision Power Board Order Box</title>
+				    <link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$ibforums->skin_url}/acp_css.css\" />
+				  </head>
+				  <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#4C77B6' style='margin:0px;border:0px;border:6px outset #4C77B6'>
+				   <br /><br />
+				  <table cellpadding=4 cellspacing=0 border=0 align='center'>
+				  <form action='{$ibforums->adskin->base_url}&act=pin&code=copysave' method='POST' target='body'>
+				  <tr>
+				   <td valign='middle' align='left'><b style='color:white'>Already paid for copyright removal?</b></td>
+				   <td valign='middle' align='left'><input type='text' size=50 name='ipb_copy_number' value='enter your IPB copyright removal key here...' onClick=\"this.value='';\"></td>
+				   <td valign='middle' align='left'><input type='submit' class='realdarkbutton' value='Continue...'></td>
+				  </tr>
+				  </table>
+				  </form>
+				  <br /><br />
+				  </body>
+				 </html>";
+				 
+		echo $html;
+		
+		exit();
+		
+	}
+	
+	//-----------------------------------------
+	
+	function copy_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		$settings = new ad_settings();
+		
+		$acc_number = trim($ibforums->input['ipb_copy_number']);
+		
+		if ( stristr( $acc_number, ',pass=' ) )
+		{
+			list( $acc_number, $pass ) = explode( ',pass=', $acc_number );
+			
+			if ( md5(strtolower($pass)) == 'b1c4780a00e7d010b0eca0b695398c02' )
+			{
+				$DB->do_update( 'conf_settings', array( 'conf_value' => $acc_number ), 'conf_key="ipb_copy_number"' );
+				$DB->do_update( 'conf_settings', array( 'conf_value' => 1           ), 'conf_key="ips_cp_purchase"' );
+				$settings->setting_rebuildcache();
+				
+				$this->copy_config('new');
+				
+				exit();
+			}
+			else
+			{
+				$ibforums->admin->error("The override password was incorrect. Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.");
+			}
+		}
+		
+		if ( $acc_number == "" )
+		{
+			$ibforums->admin->error("Sorry, that is not a valid IPB Copyright key, please hit 'back' in your browser and try again.");
+		}
+		
+		$response = trim( @implode ('', @file( "http://customer.invisionpower.com/ipb/copy/?k=".urlencode($acc_number) ) ) );
+		
+		if ( $response == "" )
+		{
+			$ibforums->admin->error("There was no response back from the Invision Power Services registration server, this might be because of the following:
+			               <ul>
+			               <li>Your PHP version does not allow remote connections</li>
+			               <li>The Invision Power Services registration server is offline</li>
+			               <li>You are running this IPB on a server without an internet connection</li>
+			               </ul>
+			               <br />
+			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
+			             ");
+		}
+		else if ( $response == '0' )
+		{
+			$ibforums->admin->error("The registration key you entered is not valid, this might be because of the following:
+			               <ul>
+			               <li>You incorrectly entered the registration key</li>
+			               <li>You mistakenly used your customer center password instead of the registration key</li>
+			               <li>Your registration licence is no longer valid</li>
+			               </ul>
+			               <br />
+			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
+			             ");
+		}
+		else if ( $response == '1' )
+		{
+			$DB->do_update( 'conf_settings', array( 'conf_value' => $acc_number ), 'conf_key="ipb_copy_number"' );
+			$DB->do_update( 'conf_settings', array( 'conf_value' => 1           ), 'conf_key="ips_cp_purchase"' );
+			
+			$settings->setting_rebuildcache();
+		}
+		
+		$this->copy_config('new');
+	}
+	
+	//-----------------------------------------
+	
+	function copy_config($type="")
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "&nbsp;";
+		$ibforums->admin->page_title  = "IPB Copyright Confirmation";
+		
+		if ( $type == "new" )
+		{
+			$ibforums->admin->page_detail .= "<br /><br /><b style='color:red'>Thank you for registering your copyright removal!</b>";
+		}
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "100%" );
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Configuration" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "The copyright should now be removed from the bottom of the IPB pages.<br /><br />If this is not the case, please contact our after sales staff immediately."
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+
+	}
+	
+	//-----------------------------------------
+	
+	function copy_config_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$new = array(  
+						'ipb_reg_show' => $ibforums->input['ipb_reg_show'],
+						'ipb_reg_name' => $ibforums->input['ipb_reg_name'],
+					);
+					
+		
+		$ibforums->admin->rebuild_config( $new );
+		
+		$ibforums->admin->done_screen("IPB Registration Configuration Updated", "IPB Registration Configuration Updated", "act=pin&code=reg" );
+	}
+	
+	
+	
+	
+	//-----------------------------------------
+	// Registration Splash
+	//-----------------------------------------
+	
+	function reg_splash()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Do we have an order number
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['ipb_reg_number'] )
+		{
+			$this->reg_config();
+		}
+		else
+		{
+			$frames = "<html>
+		   			 <head><title>Invision Power Board: Registration Set up</title></head>
+					   <frameset rows='*,95' frameborder='yes' border='1' framespacing='0'>
+					   	<frame name='chat_top'   scrolling='auto' src='http://www.invisionboard.com/?whyregister'>
+					   	<frame name='chat_bottom'  scrolling='auto' src='{$ibforums->adskin->base_url}&act=pin&code=regframe'>
+					   </frameset>
+				   </html>";
+				   
+			print $frames;
+			exit();
+		}
+		
+	}
+	
+	//-----------------------------------------
+	
+	function reg_frame()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$html = "<html>
+				  <head>
+				   <title>Invision Power Board Order Box</title>
+				   <link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$ibforums->skin_url}/acp_css.css\" />
+				  </head>
+				  <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#4C77B6' style='margin:0px;border:0px;border:6px outset #4C77B6'>
+				  <br /><br />
+				  <table cellpadding='4' cellspacing='0' border='0' align='center'>
+				  <form action='{$ibforums->adskin->base_url}&act=pin&code=regsave' method='POST' target='body'>
+				  <tr>
+				   <td valign='middle' align='left'><b style='color:white'>Already Registered?</b></td>
+				   <td valign='middle' align='left'><input type='text' size='50' name='ipb_reg_number' value='enter your IPB registration key here...' onClick=\"this.value='';\"></td>
+				   <td valign='middle' align='left'><input type='submit' class='realdarkbutton' value='Continue...'></td>
+				  </tr>
+				  </table>
+				  </form>
+				  <br /><br />
+				  </body>
+				 </html>";
+				 
+		echo $html;
+		
+		exit();
+		
+	}
+	
+	//-----------------------------------------
+	
+	function reg_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		$settings = new ad_settings();
+			
+		$acc_number = trim($ibforums->input['ipb_reg_number']);
+		
+		if ( stristr( $acc_number, ',pass=' ) )
+		{
+			list( $acc_number, $pass ) = explode( ',pass=', $acc_number );
+			
+			if ( md5(strtolower($pass)) == 'b1c4780a00e7d010b0eca0b695398c02' )
+			{
+				$DB->do_update( 'conf_settings', array( 'conf_value' => $acc_number ), 'conf_key="ipb_reg_number"' );
+				$settings->setting_rebuildcache();
+				
+				$this->reg_config('new');
+				
+				exit();
+			}
+			else
+			{
+				$ibforums->admin->error("The override password was incorrect. Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.");
+			}
+		}
+		
+		if ( $acc_number == "" )
+		{
+			$ibforums->admin->error("Sorry, that is not a valid IPB registration key, please hit 'back' in your browser and try again.");
+		}
+		
+		$response = trim( implode ('', file( "http://customer.invisionpower.com/ipb/reg/?k=".urlencode($acc_number) ) ) );
+		
+		if ( $response == "" )
+		{
+			$ibforums->admin->error("There was no response back from the Invision Power Services registration server, this might be because of the following:
+			               <ul>
+			               <li>Your PHP version does not allow remote connections</li>
+			               <li>The Invision Power Services registration server is offline</li>
+			               <li>You are running this IPB on a server without an internet connection</li>
+			               </ul>
+			               <br />
+			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
+			             ");
+		}
+		else if ( $response == '0' )
+		{
+			$ibforums->admin->error("The registration key you entered is not valid, this might be because of the following:
+			               <ul>
+			               <li>You incorrectly entered the registration key</li>
+			               <li>You mistakenly used your customer center password instead of the registration key</li>
+			               <li>Your registration licence is no longer valid</li>
+			               </ul>
+			               <br />
+			               Please <a href='http://www.invisionpower.com/?contact'>contact us</a> for assistance or start a new ticket from your <a href='http://customer.invisionpower.com'>IPS customer account</a>.
+			             ");
+		}
+		else if ( $response == '1' )
+		{
+			$DB->do_update( 'conf_settings', array( 'conf_value' => $acc_number ), 'conf_key="ipb_reg_number"' );
+			$settings->setting_rebuildcache();
+		}
+		
+		$this->reg_config('new');
+	}
+	
+	//-----------------------------------------
+	
+	function reg_config($type="")
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You may edit the configuration below to suit";
+		$ibforums->admin->page_title  = "IPB Registration Configuration";
+		
+		if ( $type == "new" )
+		{
+			$ibforums->admin->page_detail .= "<br /><br /><b style='color:red'>Thank you for registering!</b>";
+		}
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+		
+		//-----------------------------------------
+		// START THE FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doreg' ),
+											                     2 => array( 'act'   , 'pin'    ),
+									                    )      );
+									     
+		//-----------------------------------------
+		// get group ID
+		//-----------------------------------------
+		
+		$conf_group = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings_titles', 'where' => "conf_title_keyword='ipbreg'" ) );
+		
+		$DB->query("SELECT * FROM ibf_conf_settings WHERE conf_group='{$conf_group['conf_title_id']}' ORDER BY conf_position, conf_title");
+			
+		while ( $r = $DB->fetch_row() )
+		{
+			$conf_entry[ $r['conf_id'] ] = $r;
+			
+			if ( $r['conf_end_group'] )
+			{
+				$in_g = 0;
+			}
+			
+			if ( $in_g )
+			{
+				$adsettings->in_group[] = $r['conf_id'];
+			}
+			
+			if ( $r['conf_start_group'] )
+			{
+				$in_g = 1;
+			}
+		}
+			
+		$title = "Settings for group: IPB Registration";
+		
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->html .=  "<div class='tableborder'>
+							   <div class='maintitle'>
+							   <table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							   <tr>
+								<td align='left' width='70%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;'>$title</td>
+								<td align='right' nowrap='nowrap' width='30%'>";
+								
+		$ibforums->html .= "&nbsp;&nbsp;</td>
+						   </tr>
+						   </table>
+						   </div>
+						   ";
+		
+		//-----------------------------------------
+		// Loopy loo
+		//-----------------------------------------
+		
+		foreach( $conf_entry as $id => $r )
+		{
+			$ibforums->html .= $adsettings->_setting_process_entry( $r );
+		}
+		
+		$ibforums->html .= "<input type='hidden' name='settings_save' value='".implode(",",$adsettings->key_array)."' />";
+		
+		$ibforums->html .= "<div class='pformstrip' align='center'><input type='submit' value='Update Settings' class='realdarkbutton' /></div></div></form>";
+		
+		$ibforums->admin->output();
+
+	}
+	
+	//-----------------------------------------
+	
+	function reg_config_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['id'] = 'ipbreg';
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+ 		
+ 		$adsettings->setting_update( 1 );
+		
+		$ibforums->admin->done_screen("IPB Registration Configuration Updated", "IPB Registration Configuration Updated", "act=pin&code=reg", 'redirect' );
+	}
+	
+	//-----------------------------------------
+	// FORCE REFRESH ONLINE LIST
+	//-----------------------------------------
+	
+	function chat_refresh_online()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$time = time();
+		$member_ids = array();
+		$final = "";
+		
+		$server_url = 'http://'.str_replace( 'http://', '', $ibforums->vars['chat_server_addr'] ).'/ipc_who.pl?id='.$ibforums->vars['chat_account_no'].'&pw='.$ibforums->vars['chat_pass_md5'];
+			
+		if ( $data = @file( $server_url ) )
+		{
+			if ( count($data) > 0 )
+			{
+				$hits_left = array_shift($data);
+			}
+			
+			foreach( $data as $t )
+			{
+				$t = strtolower(trim($t));
+				$t = str_replace( '_', ' ', $t );
+				$t = str_replace( '"', '&quot;', $t );
+				
+				$new[] = $t;
+			}
+			
+			$name_string = implode( '","', $new );
+			
+			if ( count($new) > 0 )
+			{ 
+				$DB->query("SELECT m.id, m.name, m.mgroup FROM ibf_members m
+							WHERE lower(name) IN (\"".$name_string."\") ORDER BY m.name");
+				
+				while ( $m = $DB->fetch_row() )
+				{
+					$g = $ibforums->cache['group_cache'][ $m['mgroup'] ];
+					$member_ids[] = "<a href=\"{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?showuser={$m['id']}\">{$g['prefix']}{$m['name']}{$g['suffix']}</a>";
+				}
+				
+				if ( count( $member_ids ) )
+				{
+					$final = implode( ",\n", $member_ids );
+					
+					$final = preg_replace( "/,\n?$/s", "", $final );
+				}
+			}
+			
+			$final .= '|&|'.intval(count($member_ids));
+			
+			$DB->query("UPDATE ibf_cache_store SET cs_value='".addslashes($final)."', cs_extra='{$hits_left}&{$time}' WHERE cs_key='chatstat'");
+		}
+		
+		$this->chat_config();
+		
+	}
+	
+	//-----------------------------------------
+	// CHAT SPLASH
+	//-----------------------------------------
+	
+	function chat_splash()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Do we have an order number
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat_account_no'] )
+		{
+			$this->chat_config();
+		}
+		else if ( $ibforums->vars['chat04_account_no'] )
+		{
+			$this->chat04_config();
+		}
+		else
+		{
+			$frames = "<html>
+		   			 <head><title>Invision Power Board: Chat Set up</title></head>
+					   <frameset rows='*,100' frameborder='yes' border='1' framespacing='0'>
+					   	<frame name='chat_top'   scrolling='auto' src='http://chat.invisionsitetools.com'>
+					   	<frame name='chat_bottom'  scrolling='auto' src='{$ibforums->adskin->base_url}&act=pin&code=chatframe'>
+					   </frameset>
+				   </html>";
+				   
+			print $frames;
+			exit();
+		}
+		
+	}
+	
+	//-----------------------------------------
+	
+	function chat_frame()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$html = "<html>
+				  <head>
+				   <title>Invision Power Board Order Box</title>
+				   <link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$ibforums->skin_url}/acp_css.css\" />
+				  </head>
+				   <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#4C77B6' style='margin:0px;border:0px;border:6px outset #4C77B6'>
+				   <br /><br />
+				  <table cellpadding=4 cellspacing=0 border=0 align='center'>
+				  <form action='{$ibforums->adskin->base_url}&act=pin&code=chatsave' method='POST' target='body'>
+				  <tr>
+				   <td valign='middle' align='left'><b style='color:white'>Ordered IP Chat?</b></td>
+				   <td valign='middle' align='left'><input type='text' size=35 name='account_no' value='enter your account number here...' onClick=\"this.value='';\"></td>
+				   <td valign='middle' align='left'><input type='submit' class='realdarkbutton' value='Continue...'></td>
+				  </tr>
+				  </table>
+				  </form>
+				  <br /><br />
+				  </body>
+				 </html>";
+				 
+		echo $html;
+		
+		exit();
+		
+	}
+	
+	//-----------------------------------------
+	
+	function chat_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+		
+		$acc_number = $ibforums->input['account_no'];
+		
+		if ( $acc_number == "" )
+		{
+			$ibforums->admin->error("Sorry, that is not a valid IP Chat account number");
+		}
+		
+		if ( ! preg_match( "#[a-z]#", strtolower($acc_number) ) )
+		{
+			// is numerical  - legacy chat
+			$DB->do_update( 'conf_settings', array( 'conf_value' => $acc_number ), "conf_key='chat_account_no'" );
+			$DB->do_update( 'conf_settings', array( 'conf_value' => '' )         , "conf_key='chat04_account_no'" );
+			$adsettings->setting_rebuildcache();
+			$this->chat_config();
+			
+		}
+		else
+		{
+			// is alpha - new chat
+			$DB->do_update( 'conf_settings', array( 'conf_value' => $acc_number ), "conf_key='chat04_account_no'" );
+			$DB->do_update( 'conf_settings', array( 'conf_value' => '' )         , "conf_key='chat_account_no'" );
+			$adsettings->setting_rebuildcache();
+			$this->chat04_config();
+		}
+	}
+	
+	
+	//-----------------------------------------
+	// LEGACY CHAT (SAVE)
+	//-----------------------------------------
+	
+	function chat_config_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$acc_number = intval($ibforums->input['chat_account_no']);
+		
+		$ibforums->input['id'] = 'chat';
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+ 		
+ 		$adsettings->setting_update( 1 );
+ 		
+ 		if ( $ibforums->input['chat_pass_md5_new'] != "" )
+ 		{
+ 			$new['chat_pass_md5'] = md5(trim($ibforums->input['chat_pass_md5_new']));
+ 			
+ 			$DB->do_update( 'conf_settings', array( 'conf_value' => $new['chat_pass_md5']  ), "conf_key='chat_pass_md5'" );
+ 			$DB->do_update( 'conf_settings', array( 'conf_value' => '' ), "conf_key='chat_pass_md5_new'" );
+ 			$adsettings->setting_rebuildcache();
+ 			
+ 		}
+ 		else
+ 		{
+ 			if ( $ibforums->input['chat_pass_md5'] != "" )
+			{
+				$new['chat_pass_md5'] = md5(trim($ibforums->input['chat_pass_md5_new']));
+				$DB->do_update( 'conf_settings', array( 'conf_value' => $new['chat_pass_md5'] ), "conf_key='chat_pass_md5'" );
+				$DB->do_update( 'conf_settings', array( 'conf_value' => '' ), "conf_key='chat_pass_md5_new'" );
+				$adsettings->setting_rebuildcache();
+			}
+ 		}
+		
+		$ibforums->admin->done_screen("IP Chat Configurations Updated", "IP Chat Configuration", "act=pin&code=ipchat", 'redirect' );
+	}
+	
+	
+	//-----------------------------------------
+	// LEGACY CHAT
+	//-----------------------------------------
+	
+	function chat_config()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You may edit the configuration below to suit";
+		$ibforums->admin->page_title  = "Invision Power Chat Configuration";
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+		
+		//-----------------------------------------
+		// START THE FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dochat' ),
+											                     2 => array( 'act'   , 'pin'    ),
+									                    )      );
+									     
+		//-----------------------------------------
+		// get group ID
+		//-----------------------------------------
+		
+		$conf_group = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings_titles', 'where' => "conf_title_keyword='chat'" ) );
+		
+		$DB->query("SELECT * FROM ibf_conf_settings WHERE conf_group='{$conf_group['conf_title_id']}' ORDER BY conf_position, conf_title");
+			
+		while ( $r = $DB->fetch_row() )
+		{
+			$conf_entry[ $r['conf_id'] ] = $r;
+			
+			if ( $r['conf_end_group'] )
+			{
+				$in_g = 0;
+			}
+			
+			if ( $in_g )
+			{
+				$adsettings->in_group[] = $r['conf_id'];
+			}
+			
+			if ( $r['conf_start_group'] )
+			{
+				$in_g = 1;
+			}
+		}
+			
+		$title = "Settings for group: Invision Chat (Legacy)";
+		
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->html .=  "<div class='tableborder'>
+							   <div class='maintitle'>
+							   <table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							   <tr>
+								<td align='left' width='70%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;'>$title</td>
+								<td align='right' nowrap='nowrap' width='30%'>";
+								
+		$ibforums->html .= "&nbsp;&nbsp;</td>
+						   </tr>
+						   </table>
+						   </div>
+						   ";
+		
+		//-----------------------------------------
+		// Check DB
+		//-----------------------------------------
+		
+		$row = array( 'cs_extra' => '0&0' );
+		
+		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$DB->do_insert( 'cache_store', array( 'cs_extra' => '0&0', 'cs_key' => 'chatstat' ) );
+		}
+		
+		list( $hits, $time ) = explode( '&', $row['cs_extra'] );
+		
+		if ( $time > 0 )
+		{
+			if ( $hits < 1 )
+			{
+				$hits = 0;
+			}
+		}
+		
+		$expire = "";
+		
+		//-----------------------------------------
+		// Hits will expire...
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat_who_save'] > 0 )
+		{
+			$expire = ($hits * $ibforums->vars['chat_who_save']) * 60;
+			
+			$expire = $ibforums->admin->get_date( time() + $expire, 'SHORT' );
+		}
+		
+		//-----------------------------------------
+		// Check server...
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat_account_no'] )
+		{
+			$lookup = "http://client.invisionchat.com/ipc_srv_lookup.pl?id=".$ibforums->vars['chat_account_no'];
+			
+			if ( ! $data = trim( implode( '', @file( $lookup ) ) ) )
+			{
+				$server_name = "<span style='color:red;font-weight:bold'>Auto-lookup failed.</span> <a href='http://www.invisionboard.com/acp/chatcheck.php?id={$ibforums->vars['chat_account_no']}'>Click here to manually check</a><br />";
+			}
+			
+			if ( ! strstr( $data, "invisionchat.com" ) )
+			{
+				$server_name = "<span style='color:red;font-weight:bold'>Auto-lookup failed.</span> <a href='http://www.invisionboard.com/acp/chatcheck.php?id={$ibforums->vars['chat_account_no']}'>Click here to manually check</a><br />";
+				$data        = '';
+			}
+			
+			$ibforums->vars['chat_server_addr'] = $data;
+			
+			if ( ! $ibforums->vars['chat_server_addr'] )
+			{
+				$ibforums->vars['chat_server_addr'] = 'client1.invisionchat.com';
+			}
+			
+			$server_name .= "Checked: ". $ibforums->admin->get_date( time(), 'SHORT' );
+		}
+		
+		//-----------------------------------------
+		// Loopy loo
+		//-----------------------------------------
+		
+		$require_pass = 1;
+		
+		foreach( $conf_entry as $id => $r )
+		{
+			//-----------------------------------------
+			// Server..
+			//-----------------------------------------
+			
+			if ( $r['conf_key'] == 'chat_server_addr' )
+			{
+				$r['conf_value'] = $data;
+				$r['conf_description'] = str_replace( '<!--SERVER-->', $server_name, $r['conf_description'] );
+			}
+			
+			//-----------------------------------------
+			// Passy
+			//-----------------------------------------
+			
+			if ( $r['conf_key'] == 'chat_pass_md5' )
+			{
+				if ( $r['conf_value'] != '' )
+				{
+					$r['conf_value'] = '';
+					$require_pass = 0;
+				}
+				else
+				{
+					continue;
+				}
+				
+			}
+			
+			if ( $r['conf_key'] == 'chat_pass_md5_new' and ! $require_pass )
+			{
+				continue;
+			}
+			
+			$ibforums->html .= $adsettings->_setting_process_entry( $r );
+		}
+		
+		$ibforums->html .= "<input type='hidden' name='settings_save' value='".implode(",",$adsettings->key_array)."' />";
+		
+		$ibforums->html .= "<div class='pformstrip' align='center'><input type='submit' value='Update Settings' class='realdarkbutton' /></div></div></form>";
+		
+		//-----------------------------------------
+		// Whos Chatting
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat_who_on'] and $ibforums->vars["chat_pass_md5"] )
+		{
+			$ibforums->adskin->td_header[] = array( "{none}" , "100%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Who's Chatting?" );
+			
+			$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
+		
+			$chat_row = $DB->fetch_row();
+			
+			if ( strstr( $chat_row['cs_value'], $ibforums->vars['board_url'] ) )
+			{
+				list ($names, $count) = explode( '|&|', $chat_row['cs_value'] );
+		
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( stripslashes($names) ) );
+			}
+			else
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "No users currently chatting" ) );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$ibforums->base_url}&act=pin&code=dorefreshchat'>Force Refresh Now</a>", 'right', 'catrow2' );
+		
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	//-----------------------------------------
+	// NEW CHAT (SAVE)
+	//-----------------------------------------
+	
+	function chat04_config_save()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$acc_number = intval($ibforums->input['chat04_account_no']);
+		
+		$ibforums->input['id'] = 'chat';
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+ 		
+ 		$adsettings->setting_update( 1 );
+ 		
+		$ibforums->admin->done_screen("IP Chat Configurations Updated", "IP Chat Configuration", "act=pin&code=ipchat04", 'redirect' );
+	}
+	
+	
+	//-----------------------------------------
+	// NEW CHAT
+	//-----------------------------------------
+	
+	function chat04_config()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "You may edit the configuration below to suit";
+		$ibforums->admin->page_title  = "Invision Power Chat Configuration";
+		
+		//-----------------------------------------
+		// Load libby-do-dah
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/ad_settings.php' );
+		
+		$adsettings = new ad_settings();
+		
+		//-----------------------------------------
+		// START THE FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dochat04' ),
+											                     2 => array( 'act'   , 'pin'    ),
+									                    )      );
+									     
+		//-----------------------------------------
+		// get group ID
+		//-----------------------------------------
+		
+		$conf_group = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings_titles', 'where' => "conf_title_keyword='chat04'" ) );
+		
+		$DB->query("SELECT * FROM ibf_conf_settings WHERE conf_group='{$conf_group['conf_title_id']}' ORDER BY conf_position, conf_title");
+			
+		while ( $r = $DB->fetch_row() )
+		{
+			$conf_entry[ $r['conf_id'] ] = $r;
+			
+			if ( $r['conf_end_group'] )
+			{
+				$in_g = 0;
+			}
+			
+			if ( $in_g )
+			{
+				$adsettings->in_group[] = $r['conf_id'];
+			}
+			
+			if ( $r['conf_start_group'] )
+			{
+				$in_g = 1;
+			}
+		}
+			
+		$title = "Settings for group: Invision Chat";
+		
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->html .=  "<div class='tableborder'>
+							   <div class='maintitle'>
+							   <table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							   <tr>
+								<td align='left' width='70%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;'>$title</td>
+								<td align='right' nowrap='nowrap' width='30%'>";
+								
+		$ibforums->html .= "&nbsp;&nbsp;</td>
+						   </tr>
+						   </table>
+						   </div>
+						   ";
+		
+		//-----------------------------------------
+		// Check DB
+		//-----------------------------------------
+		
+		$row = array( 'cs_extra' => '0&0' );
+		
+		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$DB->do_insert( 'cache_store', array( 'cs_extra' => '0&0', 'cs_key' => 'chatstat' ) );
+		}
+		
+		list( $hits, $time ) = explode( '&', $row['cs_extra'] );
+		
+		if ( $time > 0 )
+		{
+			if ( $hits < 1 )
+			{
+				$hits = 0;
+			}
+		}
+		
+		$expire = "";
+		
+		//-----------------------------------------
+		// Hits will expire...
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat04_who_save'] > 0 )
+		{
+			$expire = ($hits * $ibforums->vars['chat04_who_save']) * 60;
+			
+			$expire = $ibforums->admin->get_date( time() + $expire, 'SHORT' );
+		}
+		
+		//-----------------------------------------
+		// Loopy loo
+		//-----------------------------------------
+		
+		$require_pass = 1;
+		
+		foreach( $conf_entry as $id => $r )
+		{
+			$ibforums->html .= $adsettings->_setting_process_entry( $r );
+		}
+		
+		$ibforums->html .= "<input type='hidden' name='settings_save' value='".implode(",",$adsettings->key_array)."' />";
+		
+		$ibforums->html .= "<div class='pformstrip' align='center'><input type='submit' value='Update Settings' class='realdarkbutton' /></div></div></form>";
+		
+		//-----------------------------------------
+		// Whos Chatting
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat04_who_on'] and $ibforums->vars["chat04_pass_md5"] )
+		{
+			$ibforums->adskin->td_header[] = array( "{none}" , "100%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Who's Chatting?" );
+			
+			$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
+		
+			$chat_row = $DB->fetch_row();
+			
+			if ( strstr( $chat_row['cs_value'], $ibforums->vars['board_url'] ) )
+			{
+				list ($names, $count) = explode( '|&|', $chat_row['cs_value'] );
+		
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( stripslashes($names) ) );
+			}
+			else
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "No users currently chatting" ) );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$ibforums->base_url}&act=pin&code=dorefreshchat04'>Force Refresh Now</a>", 'right', 'catrow2' );
+		
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	
+	//-----------------------------------------
+	//
+	// Save config. Does the hard work, so you don't have to.
+	//
+	//-----------------------------------------
+	
+	function save_config( $new )
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// Common header: Saves writing the same stuff out over and over
+	//
+	//-----------------------------------------
+	
+	function common_header( $formcode = "", $section = "", $extra = "" )
+	{
+		global $ibforums, $DB,  $std;
+		
+		$extra = $extra ? $extra."<br>" : $extra;
+		
+		$ibforums->admin->page_detail = $extra . "Please check the data you are entering before submitting the changes";
+		$ibforums->admin->page_title  = "Plug In Configuration [ $section ]";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $formcode ),
+												  2 => array( 'act'   , 'pin'     ),
+									     )      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Settings" );
+		
+	}
+
+	//-----------------------------------------
+	//
+	// Common footer: Saves writing the same stuff out over and over
+	//
+	//-----------------------------------------
+	
+	function common_footer( $button="Submit Changes" )
+	{
+		global $ibforums, $DB,  $std;
+
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}				
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_postoffice.php b/upload/sources/admin/ad_postoffice.php
new file mode 100644
index 00000000..92ad89a1
--- /dev/null
+++ b/upload/sources/admin/ad_postoffice.php
@@ -0,0 +1,997 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > POST OFFICE Stuff
+|   > Module written by Matt Mecham
+|   > Date started: 1st April 2004 (April Fools!)
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_postoffice
+{
+	var $base_url;
+	var $colours = array();
+	var $root_path = './';
+	
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->nav[] = array( 'act=postoffice', 'IPB Post Office' );
+		
+		$ibforums->admin->page_detail = "You may manage previous bulk emails and create new bulk emails in this section.";
+		$ibforums->admin->page_title  = "IPB Post Office";
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		switch($ibforums->input['code'])
+		{
+			case 'mail_new':
+				$this->mail_form('add');
+				break;
+			case 'mail_edit':
+				$this->mail_form('edit');
+				break;
+			case 'mail_save':
+				$this->mail_save();
+				break;
+			case 'mail_preview':
+				$this->mail_preview_start();
+				break;
+			case 'mail_preview_do':
+				$this->mail_preview_complete();
+				break;
+			case 'mail_send_start':
+				$this->mail_send_start();
+				break;
+			case 'mail_send_complete':
+				$this->mail_send_complete();
+				break;
+			case 'mail_send_cancel':
+				$this->mail_send_cancel();
+				break;
+			case 'mail_delete':
+				$this->mail_delete();
+				break;
+			//-----------------------------------------
+			// Default
+			//-----------------------------------------
+			
+			default:
+				$this->mail_start();
+				break;
+		}
+	}
+	
+	//-----------------------------------------
+	// DELETE MAIL - WOT IS SAYZ ON TEH TIN
+	//-----------------------------------------
+	
+	function mail_delete()
+	{
+		global $ibforums, $DB, $std;
+		
+		$id = intval( $ibforums->input['id'] );
+		
+		$DB->do_update( 'bulk_mail', array(  'mail_active'  => 0,
+											 'mail_updated' => time(),
+										  ), "mail_active=1" );
+											
+		$DB->do_update( 'task_manager', array( 'task_enabled' => 0 ), "task_key='bulkmail'" );
+		
+		$DB->simple_exec_query( array( 'delete' => 'bulk_mail', 'where' => 'mail_id='.$id ) );
+											
+		$ibforums->main_msg = "Bulk email deleted";
+		$this->mail_start();
+	}
+	
+	//-----------------------------------------
+	// SEND MAIL: Cancel sending in progress
+	//-----------------------------------------
+	
+	function mail_send_cancel()
+	{
+		global $ibforums, $DB, $std;
+		
+		$DB->do_update( 'bulk_mail', array(  'mail_active'  => 0,
+											 'mail_updated' => time(),
+										  ), "mail_active=1" );
+											
+		$DB->do_update( 'task_manager', array( 'task_enabled' => 0 ), "task_key='bulkmail'" );
+		
+		$ibforums->main_msg = "Bulk email cancelled";
+		$this->mail_start();
+	}
+	
+	//-----------------------------------------
+	// SEND MAIL: Send the mail mah-boy
+	//-----------------------------------------
+	
+	function mail_send_process( $root_path="" )
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		if ( $root_path )
+		{
+			$this->root_path = $root_path;
+		}
+		else if ( ROOT_PATH )
+		{
+			$this->root_path = ROOT_PATH;
+		}
+		
+		require_once( $this->root_path."sources/classes/class_email.php");
+		
+		$this->email = new emailer( $this->root_path );
+		
+		$done = 0;
+		$sent = 0;
+		
+		//-----------------------------------------
+		// Get it from the db
+		//-----------------------------------------
+		
+		$mail = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_active=1' ) );
+		
+		if ( ! $mail['mail_subject'] and ! $mail['mail_content'] )
+		{
+			$done = 1;
+		}
+		
+		//-----------------------------------------
+		// Per go...
+		//-----------------------------------------
+		
+		$pergo = intval($mail['mail_pergo']);
+		
+		if ( ! $pergo or $pergo > 1000 )
+		{
+			$pergo = 50;
+		}
+		
+		//-----------------------------------------
+		// So far...
+		//-----------------------------------------
+		
+		$sofar = intval($mail['mail_sentto']);
+		
+		$mail['mail_content'] = $std->txt_stripslashes( $mail['mail_content'] );
+		$mail['mail_subject'] = $std->txt_stripslashes( $mail['mail_subject'] );
+		
+		//-----------------------------------------
+		// Unconvert options
+		//-----------------------------------------
+		
+		$opts = unserialize(stripslashes( $mail['mail_opts'] ) );
+		
+		foreach( $opts as $k => $v )
+		{
+			$mail[ $k ] = $v;
+		}
+		
+		//-----------------------------------------
+ 		// Format the query
+ 		//-----------------------------------------
+ 		
+ 		$query = $this->_build_members_query( $mail );
+											
+		//-----------------------------------------
+		// Get members....
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'members',
+									  'where'  => $query,
+									  'order'  => 'id',
+									  'limit'  => array( $sofar, $pergo ) ) );
+		
+		$o = $DB->simple_exec();
+		
+		if ( $mail['mail_html_on'] )
+		{
+			$this->email->html_email = 1;
+		}
+									  
+		while ( $r = $DB->fetch_row( $o ) )
+		{
+			$sent++;
+			
+			$contents = $this->_convert_quick_tags( $mail['mail_content'], $r );
+			
+			$this->email->from    = $ibforums->vars['email_in'];
+			$this->email->to      = $r['email'];
+			$this->email->message = str_replace( "\r\n", "\n", $contents);
+			$this->email->subject = $mail['mail_subject'];
+			
+			$this->email->send_mail();
+		}
+		
+		//-----------------------------------------
+		// Did we send any?
+		//-----------------------------------------
+		
+		if ( ! $sent )
+		{
+			$done = 1;
+		}
+		
+		//-----------------------------------------
+		// Save out..
+		//-----------------------------------------
+		
+		if ( $done )
+		{
+			$DB->do_update( 'bulk_mail', array( 'mail_active'  => 0,
+												'mail_updated' => time(),
+												'mail_sentto'  => $sofar + $sent ), 'mail_id='.$mail['mail_id'] );
+												
+			$DB->do_update( 'task_manager', array( 'task_enabled' => 0 ), "task_key='bulkmail'" );
+		}
+		else
+		{
+			$DB->do_update( 'bulk_mail', array( 'mail_updated' => time(),
+												'mail_sentto'  => $sofar + $sent ), 'mail_id='.$mail['mail_id'] );
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// SEND MAIL: Complete
+	//-----------------------------------------
+	
+	function mail_send_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		$pergo = intval($ibforums->input['pergo']);
+		$id    = intval($ibforums->input['id']);
+		
+		if ( ! $id )
+		{
+			$ibforums->main_msg = "There was no ID passed to this function";
+			$this->mail_start();
+		}
+		
+		//-----------------------------------------
+		// Get it from the db
+		//-----------------------------------------
+		
+		$mail = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_id='.$id ) );
+		
+		if ( ! $mail['mail_subject'] and ! $mail['mail_content'] )
+		{
+			$ibforums->main_msg = "Cannot send - the email doesn't have a subject and content";
+			$this->mail_start();
+		}
+		
+		//-----------------------------------------
+		// Update mail
+		//-----------------------------------------
+		
+		if ( ! $pergo or $pergo > 1000 )
+		{
+			$pergo = 50;
+		}
+		
+		$DB->do_update( 'bulk_mail', array( 'mail_active' => 1, 'mail_pergo' => $pergo, 'mail_sentto' => 0, 'mail_start' => time() ), 'mail_id='.$id );
+		$DB->do_update( 'bulk_mail', array( 'mail_active' => 0 ) , 'mail_id != '.$id );
+		
+		//-----------------------------------------
+		// Wake up task manager
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/lib/task_functions.php' );
+		$task = new task_functions();
+		
+		$DB->do_update( 'task_manager', array( 'task_enabled' => 1 ), "task_key='bulkmail'" );
+		
+		$this_task = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'task_manager', 'where' => "task_key='bulkmail'" ) );
+		$newdate = $task->generate_next_run($this_task);
+		
+		$DB->do_update( 'task_manager', array( 'task_next_run' => $newdate ), "task_id=".$this_task['task_id'] );
+			
+		$task->save_next_run_stamp();
+		
+		//-----------------------------------------
+		// Sit back and watch the show
+		//-----------------------------------------
+		
+		$ibforums->main_msg = "Bulk Mail Initiated";
+		
+		$this->mail_start();
+	}
+	
+	//-----------------------------------------
+	// SEND MAIL: Start
+	//-----------------------------------------
+	
+	function mail_send_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		$id = intval($ibforums->input['id']);
+		
+		if ( ! $id )
+		{
+			$ibforums->main_msg = "There was no ID passed to this function";
+			$this->mail_start();
+		}
+		
+		//-----------------------------------------
+		// Get it from the db
+		//-----------------------------------------
+		
+		$mail = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_id='.$id ) );
+		
+		if ( ! $mail['mail_subject'] and ! $mail['mail_content'] )
+		{
+			$ibforums->main_msg = "Cannot send - the email doesn't have a subject and content";
+			$this->mail_start();
+		}
+		
+		//-----------------------------------------
+		// Unconvert options
+		//-----------------------------------------
+		
+		$opts = unserialize(stripslashes( $mail['mail_opts'] ) );
+		
+		foreach( $opts as $k => $v )
+		{
+			$mail[ $k ] = $v;
+		}
+		
+		//-----------------------------------------
+ 		// Format the query
+ 		//-----------------------------------------
+ 		
+ 		$query = $this->_build_members_query( $mail );
+											
+		//-----------------------------------------
+		// Count how many matches
+		//-----------------------------------------
+		
+		$count = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'members', 'where' => $query ) );
+		
+		$the_count = intval( $count['cnt'] );
+		
+		//-----------------------------------------
+		// Print 'continue' screen
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'mail_send_complete'  ),
+												                 2 => array( 'act'   , 'postoffice' ),
+												                 4 => array( 'id'    , $ibforums->input['id'] ),
+									                     )      );
+		
+		$ibforums->html .= "<div class='tableborder'><div class='maintitle'>Sending the bulk mail to {$the_count} members</div>";
+		$ibforums->html .= "<div class='tdrow2' style='padding:4px'>
+							<fieldset>
+							 <legend><strong>Email Details</strong></legend>
+							 <strong>Subject: {$mail['mail_subject']}</strong>
+							 <br />
+							 <br />
+							 <div style='height:200px;overflow:auto;white-space:pre'>{$mail['mail_content']}</div>
+							 <br />
+							 <div align='center'><span class='fauxbutton'><a href='{$ibforums->base_url}&act=postoffice&code=mail_edit&id={$id}'>Edit This Email</a></span></div>
+							 <br />
+							 Sending to <b>{$the_count}</b> &nbsp;members.
+							</fieldset>
+							<br />
+							<fieldset>
+							 <legend><strong>Sending the Email</strong></legend>
+							 Clicking the 'Start Sending The Emails' button below will activate the task manager's send bulk email function which will send the email in batches until the all the mail
+							 has been sent. You can watch the progress from the main Post Office screen and cancel the email from being sent.
+							 <br />
+							 We strongly recommend that you opt to send 50 emails per cycle as a maximum. Any more per cycle could severly affect performance of your server while the mail is being sent out.
+							 <br />
+							 <br />
+							 As the mail is sent out in cycles of <em><b>n</b></em> &nbsp;per minute, it can take a while to process all the mail.
+							 <br />
+							 <br />
+							 <div align='center'><b>Emails sent per cycle</b> <input type='text' class='realbutton' size='5' name='pergo' value='50' /> &nbsp; <input type='submit' value='Start Sending The Emails' class='realbutton' /></form></div>
+							</fieldset>
+						   </div>
+						   </div>";
+		
+		$ibforums->admin->output();	
+	}
+		
+	//-----------------------------------------
+	// PREVIEW MAIL: Show it - yo!
+	//-----------------------------------------
+	
+	function mail_preview_complete()
+	{
+		global $ibforums, $DB, $std;
+	
+		$content = nl2br($this->_convert_quick_tags( $std->txt_stripslashes($_POST['text']), $ibforums->member ));
+		
+		print "<html>
+			   <body>
+			   <div style='padding:6px;text-align:left;font-family:courier, monospace;font-size:12px'>
+			   {$content}
+			   </body></html>
+		";
+		
+		exit();
+	}
+	
+	//-----------------------------------------
+	// PREVIEW MAIL: JS BOUNCE
+	//-----------------------------------------
+	
+	function mail_preview_start()
+	{
+		global $ibforums, $DB, $std;
+	
+		print "<html><body onload='doitdude()'><script type='text/javascript'>
+			   posty = opener.thisval;
+			   function doitdude()
+			   {
+				document.peekaboo.method = 'post';
+				document.peekaboo.action = '{$ibforums->base_url}&act=postoffice&code=mail_preview_do';
+				document.peekaboo.text.value = posty;
+				document.peekaboo.submit();
+			   }
+			   </script>
+			   <form name='peekaboo' >
+			   <input type='hidden' name='text' />
+			   </form>
+			   </body></html>
+		";
+	}
+	
+	//-----------------------------------------
+	// SAVE MAIL
+	//-----------------------------------------
+	
+	function mail_save()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$ids = array();
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		//-----------------------------------------
+		// Start
+		//-----------------------------------------
+		
+		$type = $ibforums->input['type'];
+		
+		if ( ! $ibforums->input['mail_subject'] or ! $ibforums->input['mail_content'] )
+		{
+			$ibforums->main_msg = "You must enter an email subject and email content before submitting.";
+			$this->mail_form( $type );
+		}
+		
+		//-----------------------------------------
+		// Groups...
+		//-----------------------------------------
+		
+		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^sg_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[ $match[0] ])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		if ( ! count( $ids ) )
+ 		{
+ 			$ibforums->main_msg = "You must select at least one group to send this email message to.";
+ 			$this->mail_form( $type );
+ 		}
+ 		
+ 		$ibforums->input['mail_groups'] = implode( ",", $ids );
+ 		
+ 		//-----------------------------------------
+ 		// Format the query
+ 		//-----------------------------------------
+ 		
+ 		$query = $this->_build_members_query( array( 'mail_post_ltmt'     => $_POST['mail_post_ltmt'],
+													 'mail_filter_post'   => $_POST['mail_filter_post'],
+													 'mail_visit_ltmt'    => $_POST['mail_visit_ltmt'],
+													 'mail_filter_visit'  => $_POST['mail_filter_visit'],
+													 'mail_joined_ltmt'   => $_POST['mail_joined_ltmt'],
+													 'mail_filter_joined' => $_POST['mail_filter_joined'],
+													 'mail_honor'         => $_POST['mail_honor'],
+													 'group_id_string'    => implode( ",", $ids )
+											)      );
+											
+		//-----------------------------------------
+		// Count how many matches
+		//-----------------------------------------
+		
+		$count = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'members', 'where' => $query ) );
+		
+		if ( ! $count['cnt'] )
+		{
+			$ibforums->main_msg = "Your criteria didn't match any members - please adjust your current criteria";
+			$this->mail_form( $type );
+		}
+		
+		//-----------------------------------------
+		// Save
+		//-----------------------------------------
+		
+		$save_array = array(
+							 'mail_subject' => str_replace( "&#039;", "'", $std->txt_stripslashes( $_POST['mail_subject'] ) ),
+							 'mail_content' => $std->txt_stripslashes( $_POST['mail_content'] ),
+							 'mail_groups'  => implode( ",", $ids ),
+							 'mail_honor'   => $ibforums->input['mail_honor'],
+							 'mail_start'   => time(),
+							 'mail_updated' => time(),
+							 'mail_sentto'  => 0,
+							 'mail_opts'    => serialize( array( 'mail_post_ltmt'     => $_POST['mail_post_ltmt'],
+																 'mail_filter_post'   => $_POST['mail_filter_post'],
+																 'mail_visit_ltmt'    => $_POST['mail_visit_ltmt'],
+																 'mail_filter_visit'  => $_POST['mail_filter_visit'],
+																 'mail_joined_ltmt'   => $_POST['mail_joined_ltmt'],
+																 'mail_filter_joined' => $_POST['mail_filter_joined'],
+																 'mail_html_on'       => $_POST['mail_html_on'],
+													    )      )
+						 );
+						 
+		if ( $type == 'add' )
+		{
+			//-----------------------------------------
+			// Save to DB
+			//-----------------------------------------
+			
+			$DB->do_insert( 'bulk_mail', $save_array );
+			
+			$ibforums->input['id'] = $DB->get_insert_id();
+			
+			$ibforums->admin->save_log("Bulk mail ({$ibforums->input['mail_subject']}) added");
+			$this->mail_send_start();
+		}
+		else
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = "Cannot save, no ID returned";
+				$this->mail_form($type);
+			}
+			
+			$DB->do_update( 'bulk_mail', $save_array, 'mail_id='.$ibforums->input['id'] );
+			
+			$ibforums->admin->save_log("Bulk mail ({$ibforums->input['mail_subject']}) edited");
+			
+			$ibforums->main_msg = "Bulk mail edited";
+			$this->mail_start();
+		}
+	}
+	
+	//-----------------------------------------
+	// SHOW MAIN MAIL SCREENIE-POOS
+	//-----------------------------------------
+	
+	function mail_form($type='add')
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		$dd_ltmt = array(
+						  0 => array( 'lt' , "less than" ),
+						  1 => array( 'mt' , "more than" )
+						);
+		
+		if ( $type == 'add' )
+		{
+			$mail   = array();
+			$title  = "Step 1: Start New Bulk Email";
+			$button =  "Proceed...";
+			$honour_checked = 'checked="checked"';
+			$html_checked   = '';
+		}
+		else
+		{
+			$mail   = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'bulk_mail', 'where' => 'mail_id='.$ibforums->input['id'] ) );
+			$title  = "Editing Stored Mail";
+			$button = "Edit Mail";
+			
+			//-----------------------------------------
+			// Unpack more..
+			//-----------------------------------------
+			
+			$tmp = unserialize( stripslashes( $mail['mail_opts'] ) );
+			
+			if ( is_array( $tmp ) and count ( $tmp ) )
+			{
+				foreach( $tmp as $k => $v )
+				{
+					if ( ! $mail[ $k ] )
+					{
+						$mail[ $k ] = $v;
+					}
+				}
+			}
+			
+			$honour_checked = $mail['mail_honor']   == 1 ? 'checked="checked"' : '';
+			$html_checked   = $mail['mail_html_on'] == 1 ? 'checked="checked"' : '';
+			
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'mail_save'  ),
+												                 2 => array( 'act'   , 'postoffice' ),
+												                 3 => array( 'type'  , $type        ),
+												                 4 => array( 'id'    , $ibforums->input['id'] ),
+									                     )      );
+									                     
+		$mail_subject = $_POST['mail_subject'] ? $std->txt_stripslashes($_POST['mail_subject']) : $mail['mail_subject'];
+		$mail_content = $_POST['mail_content'] ? $std->txt_stripslashes($_POST['mail_content']) : $mail['mail_content'];
+		$mail_subject = str_replace( "'", "&#039;", $mail_subject );
+		
+		$mail_content = preg_replace( "[^\r]\n", "\r\n", $mail_content );
+		
+		if ( ! $mail_content and $type == 'add' )
+		{
+			$mail_content = $this->_get_default_mail_contents();
+		}
+		
+		if ( $ibforums->input['mail_groups'] )
+		{
+			$mail['mail_groups'] = $ibforums->input['mail_groups'];
+		}
+									                     
+		$ibforums->html .= "<script type='text/javascript'>
+						    function runpreview()
+						    {
+						    	thisval = document.theAdminForm.mail_content.value
+								myWin   = window.open('{$ibforums->base_url}&act=postoffice&code=mail_preview','newWin','width=500,height=500,resizable=yes,scrollbars=yes');
+						    }
+						    </script>
+						    ";
+		
+		$ibforums->html .= "<div class='tableborder'><div class='maintitle'>{$title}</div>";
+		$ibforums->html .= "<div class='tdrow2' style='padding:4px'>
+							<fieldset>
+							 <legend><strong>Email Subject</strong></legend>
+							 <input type='text' size='60' maxsize='250' class='textinput' style='width:100%' name='mail_subject' value='{$mail_subject}' />
+							</fieldset>
+							<br />
+							<fieldset>
+							 <legend><strong>Email Content</strong></legend>
+							 <textarea cols='60' rows='20' class='textinput' style='width:100%' name='mail_content'>{$mail_content}</textarea>
+							 <br />
+							 <fieldset>
+							  <legend><strong>Mail Sending Options</strong></legend>
+							   <input type='checkbox' name='mail_honor'   value='1' {$honour_checked} />&nbsp; Honor 'Allow admin to email me' member setting to only email those who have opted in?
+							   <br/ >
+							   <input type='checkbox' name='mail_html_on' value='1' {$html_checked} />&nbsp; Send email in HTML format (full HTML formatting & tags allowed)
+							 </fieldset>
+							</fieldset>";
+		
+		$ibforums->html .= "</div></div><br />";
+		
+		$ibforums->html .= "<div class='tableborder'><div class='maintitle'>Filters</div>";
+		$ibforums->html .= "<div class='tdrow2' style='padding:4px'>
+							<table width='100%' cellpadding='2' cellspacing='0' border='0'>
+							<tr>
+							 <td width='30%'>
+							  <fieldset>
+							  <legend><strong>Send to Groups:</strong></legend>";
+							  
+		foreach( $ibforums->cache['group_cache'] as $bleh => $g )
+		{
+			if ( $g['g_id'] == $ibforums->vars['guest_group'] )
+			{
+				continue;
+			}
+			
+			$checked = "";
+			
+			if ( $mail['mail_groups'] )
+			{
+				if ( strstr( ','.$mail['mail_groups'].',', ','.$g['g_id'].',' ) )
+				{
+					$checked = 'checked="checked"';
+				}
+			}
+			
+			$ibforums->html .= "<input type='checkbox' name='sg_{$g['g_id']}' value='1' $checked />&nbsp;&nbsp;<b>{$g['g_title']}</b><br />";
+		}
+							  
+		$ibforums->html .= "  </fieldset> 
+							 </td>
+							 <td width='70%' valign='top'>
+							  <fieldset>
+							  <legend><strong>Additional Filters</strong></legend>
+							  <table width='100%' cellpadding='4' cellspacing='0' border='0'>
+							  <tr>
+							   <td width='60%'>Send to members with <em><b>n</b></em> posts<div class='graytext'>Leave blank to not filter</div></td>
+							   <td width='40%'>". $ibforums->adskin->form_dropdown('mail_post_ltmt', $dd_ltmt, $_POST['mail_post_ltml'] ? $_POST['mail_post_ltml'] : $mail['mail_post_ltmt'] ).' '.
+							   					  $ibforums->adskin->form_simple_input( "mail_filter_post", $_POST['mail_filter_post'] ? $_POST['mail_filter_post'] : $mail['mail_filter_post'], 7 )."</td>
+							  </tr>
+							  <tr>
+							   <td width='60%'>Send to members who's last visit was <em><b>n</b></em> days ago<div class='graytext'>Leave blank to not filter</div></td>
+							   <td width='40%'>". $ibforums->adskin->form_dropdown('mail_visit_ltmt', $dd_ltmt, $_POST['mail_visit_ltml'] ? $_POST['mail_visit_ltml'] : $mail['mail_visit_ltmt'] ).' '.
+							   					  $ibforums->adskin->form_simple_input( "mail_filter_visit", $_POST['mail_filter_visit'] ? $_POST['mail_filter_visit'] : $mail['mail_filter_visit'], 7 )."</td>
+							  </tr>
+							  <tr>
+							   <td width='60%'>Send to members who joined <em><b>n</b></em> days ago<div class='graytext'>Leave blank to not filter</div></td>
+							   <td width='40%'>". $ibforums->adskin->form_dropdown('mail_joined_ltmt', $dd_ltmt, $_POST['mail_joined_ltml'] ? $_POST['mail_joined_ltml'] : $mail['mail_joined_ltmt'] ).' '.
+							   					  $ibforums->adskin->form_simple_input( "mail_filter_joined", $_POST['mail_filter_joined'] ? $_POST['mail_filter_joined'] : $mail['mail_filter_joined'], 7 )."</td>
+							  </tr>
+							  </table>
+							  </fieldset>
+							 </td>
+							</tr>
+							</table>
+							</div>
+							<div align='center' class='pformstrip'><input class='realbutton' onclick='runpreview()' type='button' value='Preview' /> &nbsp; &nbsp; <input class='realdarkbutton' type='submit' value='$button' /></form></div>
+							</div>";
+		
+		$ibforums->html .= "<br />
+							<div class='tableborder'>
+							<div class='pformstrip'>Quick Tags</div>
+							<div class='tdrow1' style='padding:4px'>You may use the following 'quick tags' in your email and they will be converted when the email is sent.</div>
+							<table cellpadding='2' class='tdrow1' width='100%' cellspacing='0' border='0'>
+							<tr>
+							 <td><strong>{board_name}</strong></td>
+							 <td><em>The name of your board</em></td>
+							 <td><strong>{board_url}</strong></td>
+							 <td><em>The URL to your board</em></td>
+							</tr>
+							<tr>
+							 <td><strong>{reg_total}</strong></td>
+							 <td><em>The total number of registered members</em></td>
+							 <td><strong>{total_posts}</strong></td>
+							 <td><em>The total number of posts</em></td>
+							</tr>
+							<tr>
+							 <td><strong>{busy_count}</strong></td>
+							 <td><em>The most number of users online</em></td>
+							 <td><strong>{busy_time}</strong></td>
+							 <td><em>The time that the most number of members were online</em></td>
+							</tr>
+							<tr>
+							 <td><strong>{member_id}</strong></td>
+							 <td><em>The member ID of the email recipient</em></td>
+							 <td><strong>{member_name}</strong></td>
+							 <td><em>The member name of the email recipient</em></td>
+							</tr>
+							<tr>
+							 <td><strong>{member_joined}</strong></td>
+							 <td><em>The member join date of the email recipient</em></td>
+							 <td><strong>{member_posts}</strong></td>
+							 <td><em>The number of posts for the email recipient</em></td>
+							</tr>
+							</table>
+							</div>";
+							
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	// SHOW MAIN MAIL SCREENIE-POOS
+	//-----------------------------------------
+	
+	function mail_start()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"      , "1%" );
+		$ibforums->adskin->td_header[] = array( "Subject"     , "30%" );
+		$ibforums->adskin->td_header[] = array( "Sent On"     , "15%" );
+		$ibforums->adskin->td_header[] = array( "Sent To"     , "15%" );
+		$ibforums->adskin->td_header[] = array( "Time Taken"  , "15%" );
+		$ibforums->adskin->td_header[] = array( "Options"     , "25%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Your stored bulk email" );
+		
+		//-----------------------------------------
+		// Get mail from DB
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'bulk_mail', 'order' => 'mail_start DESC' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			
+			$inprogress = "";
+			
+			if ( $r['mail_updated'] == $r['mail_start'] )
+			{
+				$time_taken = 'Not yet sent';
+			}
+			else
+			{
+				$time_taken = intval($r['mail_updated'] - $r['mail_start']);
+				
+				if ( $time_taken < 0 )
+				{
+					$time_taken = 0;
+				}
+				
+				if ( $time_taken )
+				{
+					$time_taken = ceil( $time_taken / 60 );
+				}
+				
+				$time_taken .= ' minutes';
+			}
+			
+			if ( $r['mail_active'] )
+			{
+				$inprogress = " <em>( Sending in progress - <a href='#' onclick=\"maincheckdelete('{$ibforums->base_url}&act=postoffice&code=mail_send_cancel', 'OK to cancel bulk mail?'); return false;\">Cancel</a> )</em>";
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+																	 "<img src='{$ibforums->adskin->img_url}/skin_icon_email.gif' border='0' />",
+										  							 "<b>{$r['mail_subject']}</b> $inprogress",
+										  							 $std->get_date( $r['mail_start'], 'SHORT' ),
+										  							 $std->do_number_format( $r['mail_sentto'] ).' members',
+										  							 $time_taken,
+										  							 "<div align='center'><span class='fauxbutton'><a href='{$ibforums->base_url}&act=postoffice&code=mail_send_start&id={$r['mail_id']}'>Re-send</a></span>
+										  							  <span class='fauxbutton'><a href='{$ibforums->base_url}&act=postoffice&code=mail_edit&id={$r['mail_id']}'>Edit</a></span>
+										  							  <span class='fauxbutton'><a href='#' onclick=\"maincheckdelete('{$ibforums->base_url}&act=postoffice&code=mail_delete&id={$r['mail_id']}');return false;\">Delete</a></span>
+										  							  </center>"
+													    	)      );
+		}						 
+		
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// INTERNAL: build members query
+	//-----------------------------------------
+	
+	function _build_members_query( $args = array() )
+	{
+		global $ibforums, $DB, $std;
+		
+		$DB->load_cache_file( $this->root_path.'sources/sql/'.SQL_DRIVER.'_extra_queries.php', 'sql_extra_queries' );
+		
+		$query = array();
+		
+		if ( $args['mail_filter_post'] )
+		{
+			$ltmt    = $args['mail_post_ltmt'] == 'lt' ? '<' : '>';
+			$query[] = "posts ".$ltmt." ".$args['mail_filter_post'];
+		}
+		
+		if ( $args['mail_filter_visit'] )
+		{
+			$ltmt    = $args['mail_visit_ltmt'] == 'lt' ? '<' : '>';
+			$time    = time() - ( $args['mail_filter_visit'] * 86400 );
+			$query[] = "last_visit ".$ltmt." ". $time;
+		}
+		
+		if ( $args['mail_filter_visit'] )
+		{
+			$ltmt    = $args['mail_joined_ltmt'] == 'lt' ? '<' : '>';
+			$time    = time() - ( $args['mail_filter_joined'] * 86400 );
+			$query[] = "joined ".$ltmt." ". $time;
+		}
+		
+		if ( $args['mail_honor'] )
+		{
+			$query[] = "allow_admin_mails=1";
+		}
+		
+		if ( $args['mail_groups'] )
+		{
+			$tmp_q = 'mgroup IN ('. $args['mail_groups'] .')';
+			
+			$temp  = explode( ',', $args['mail_groups'] );
+			
+			if ( is_array( $temp ) and count( $temp ) )
+			{
+				$tmp = array();
+				
+				foreach( $temp as $id )
+				{
+					$DB->cache_add_query( 'acp_postoffice_concat_bit', array( 'gid' => $id ), 'sql_extra_queries' );
+					$tmp[] = $DB->cur_query;
+					$DB->cur_query = "";
+				}
+				
+				$tmp_q .= " OR ( ".implode( ' OR ', $tmp ). " )";
+			}
+			
+			$query[] = $tmp_q;
+		}
+	
+		return implode( ' AND ', $query );
+	}
+	
+	//-----------------------------------------
+	// INTERNAL: convert quick tags
+	//-----------------------------------------
+	
+	function _convert_quick_tags( $contents="", $member=array() )
+	{
+		global $ibforums, $DB, $std;
+		
+		$contents = str_replace( "{board_name}"   , str_replace( "&#39;", "'", $ibforums->vars['board_name'] ) , $contents );
+		$contents = str_replace( "{board_url}"    , $ibforums->vars['board_url']."/index.".$ibforums->vars['php_ext'] , $contents );
+		$contents = str_replace( "{reg_total}"    , $ibforums->cache['stats']['mem_count'] , $contents );
+		$contents = str_replace( "{total_posts}"  , $ibforums->cache['stats']['total_topics'] + $ibforums->cache['stats']['total_replies'] , $contents );
+		$contents = str_replace( "{busy_count}"   , $ibforums->cache['stats']['most_count'] , $contents );
+		$contents = str_replace( "{busy_time}"    , $std->get_date( $ibforums->cache['stats']['most_date'], 'SHORT' ), $contents );
+		$contents = str_replace( "{member_id}"    , $member['id'], $contents );
+		$contents = str_replace( "{member_name}"  , $member['name'], $contents );
+		$contents = str_replace( "{member_joined}", date( 'j-F y', $member['joined'] ), $contents );
+		$contents = str_replace( "{member_posts}" , $member['posts'], $contents );
+		
+		return $contents;
+	}
+	
+	//-----------------------------------------
+	// INTERNAL: get default mail
+	//-----------------------------------------
+	
+	function _get_default_mail_contents()
+	{
+		global $ibforums, $DB, $std;
+		
+		$mail = "{member_name},\n\n\n\n-------------------------------------\n{board_name} Statistics:\n"
+			  ."-------------------------------------\nRegistered Users: {reg_total}\nTotal Posts: {total_posts}\n"
+			  ."Busiest Time: {busy_count} users were online on {busy_time}\n\n"
+			  ."-------------------------------------\nHandy Links\n"
+			  ."-------------------------------------\nBoard Address: {board_url}\nLog In: {board_url}?act=Login&CODE=00\n"
+			  ."Lost Password Recovery: {board_url}?act=Reg&CODE=10\n\n"
+			  ."-------------------------------------\nHow to unsubscribe\n"
+			  ."-------------------------------------\nVisit your email preferences ({board_url}?act=UserCP&CODE=02) and ensure "
+			  ."that the box for 'Send me any updates sent by the board administrator' is unchecked and submit the form";
+			  
+		return $mail;
+	
+	}
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_prefs.php b/upload/sources/admin/ad_prefs.php
similarity index 79%
rename from upload/sources/Admin/ad_prefs.php
rename to upload/sources/admin/ad_prefs.php
index 70321ad4..763b6d03 100644
--- a/upload/sources/Admin/ad_prefs.php
+++ b/upload/sources/admin/ad_prefs.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -30,19 +29,17 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
-$idx = new ad_prefs();
-
-
 class ad_prefs {
 
 	var $base_url;
 
-	function ad_prefs() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -51,15 +48,15 @@ class ad_prefs {
 			unset($$k);
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Show the wee form
-		//---------------------------------------
+		//-----------------------------------------
 		
-		if ( $IN['set'] == 1 )
+		if ( $ibforums->input['set'] == 1 )
 		{
 			$this->msg = 'Savings set';
 			
-			if ( $IN['tx'] == "" or $IN['ty'] == "" )
+			if ( $ibforums->input['tx'] == "" or $ibforums->input['ty'] == "" )
 			{
 				$this->msg = 'Please complete the form';
 				
@@ -67,14 +64,14 @@ class ad_prefs {
 			}
 			else
 			{
-				$std->my_setcookie( 'acpprefs', $IN['menu'] .','. $IN['tx'] .','. $IN['ty'] .','. $IN['preview']);
+				$std->my_setcookie( 'acpprefs', $ibforums->input['menu'] .','. $ibforums->input['tx'] .','. $ibforums->input['ty'] .','. $ibforums->input['preview']);
 				
 				$this->msg = 'Settings saved';
 				
-				$this->tx = $IN['tx'];
-				$this->ty = $IN['ty'];
+				$this->tx = $ibforums->input['tx'];
+				$this->ty = $ibforums->input['ty'];
 				
-				if ( $IN['menu'] )
+				if ( $ibforums->input['menu'] )
 				{
 					$this->s_yes = 'selected';
 					$this->s_no  = '';
@@ -85,7 +82,7 @@ class ad_prefs {
 					$this->s_no  = 'selected';
 				}
 				
-				if ( $IN['preview'] )
+				if ( $ibforums->input['preview'] )
 				{
 					$this->p_yes = 'selected';
 					$this->p_no  = '';
@@ -183,7 +180,7 @@ $hit_muhl = <<<EOF
   </script>
   </head>
   <body>
-  <form action="{$SKIN->base_url}&act=prefs&set=1" method="post">
+  <form action="{$ibforums->adskin->base_url}&act=prefs&set=1" method="post">
   <fieldset style='padding:10px'>
    <legend>Your ACP Prefs</legend>
    <strong>Save ACP Menu State</strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<select class='textinput' name='menu'><option value='1' {$this->s_yes}>Yes</option><option value='0' {$this->s_no}>No</option></select>
diff --git a/upload/sources/admin/ad_profilefields.php b/upload/sources/admin/ad_profilefields.php
new file mode 100644
index 00000000..9fbf289d
--- /dev/null
+++ b/upload/sources/admin/ad_profilefields.php
@@ -0,0 +1,559 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Custom profile field functions
+|   > Module written by Matt Mecham
+|   > Date started: 24th June 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_profilefields {
+
+	var $base_url;
+	var $func;
+	
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		// get class
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+		$this->func = new custom_fields( $DB );
+		
+		//-----------------------------------------
+		// switch-a-magoo
+		//-----------------------------------------
+		
+		switch($ibforums->input['code'])
+		{
+			case 'add':
+				$this->main_form('add');
+				break;
+				
+			case 'doadd':
+				$this->main_save('add');
+				break;
+				
+			case 'edit':
+				$this->main_form('edit');
+				break;
+				
+			case 'doedit':
+				$this->main_save('edit');
+				break;
+				
+			case 'delete':
+				$this->delete_form();
+				break;
+				
+			case 'dodelete':
+				$this->do_delete();
+				break;
+						
+			default:
+				$this->main_screen();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// Rebuild cache
+	//
+	//-----------------------------------------
+	
+	function rebuild_cache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['profilefields'] = array();
+				
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'order' => 'pf_position' ) );
+						 
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['profilefields'][ $r['pf_id'] ] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'profilefields', 'array' => 1, 'deletefirst' => 1 ) );	
+	}
+	
+	//-----------------------------------------
+	//
+	// Delete a group
+	//
+	//-----------------------------------------
+	
+	function delete_form()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the group ID, please try again");
+		}
+		
+		$ibforums->admin->page_title = "Deleting a Custom Profile Field";
+		
+		$ibforums->admin->page_detail = "Please check to ensure that you are attempting to remove the correct custom profile field as <b>all data will be lost!</b>.";
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'where' => "pf_id=".intval($ibforums->input['id']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $field = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not fetch the row from the database");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dodelete'  ),
+																 2 => array( 'act'   , 'field'     ),
+																 3 => array( 'id'    , $ibforums->input['id']   ),
+														)      );
+									     
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Removal Confirmation" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Custom Profile field to remove</b>" ,
+												                 "<b>".$field['pf_title']."</b>",
+									                   )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form("Delete this custom field");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	
+	
+	function do_delete()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the field ID, please try again");
+		}
+		
+		//-----------------------------------------
+		// Check to make sure that the relevant groups exist.
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'where' => "pf_id=".intval($ibforums->input['id']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the ID's passed to deletion");
+		}
+		
+		$DB->sql_drop_field( 'pfields_content', "field_{$row['pf_id']}" );
+		
+		$DB->simple_exec_query( array( 'delete' => 'pfields_data', 'where' => "pf_id=".intval($ibforums->input['id']) ) );
+		
+		$this->rebuild_cache();
+		
+		$ibforums->admin->done_screen("Profile Field Removed", "Custom Profile Field Control", "act=field", 'redirect' );
+		
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Save changes to DB
+	//
+	//-----------------------------------------
+	
+	function main_save($type='edit')
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		if ($ibforums->input['pf_title'] == "")
+		{
+			$ibforums->admin->error("You must enter a field title.");
+		}
+		
+		//-----------------------------------------
+		// check-da-motcha
+		//-----------------------------------------
+		
+		if ($type == 'edit')
+		{
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("Could not resolve the field id");
+			}
+			
+		}
+		
+		$content = "";
+		
+		if ( $_POST['pf_content'] != "")
+		{
+			$content = $this->func->method_format_content_for_save( $_POST['pf_content'] );
+		}
+		
+		$db_string = array( 'pf_title'        => $ibforums->input['pf_title'],
+						    'pf_desc'         => $ibforums->input['pf_desc'],
+						    'pf_content'      => $std->txt_stripslashes($content),
+						    'pf_type'         => $ibforums->input['pf_type'],
+						    'pf_not_null'     => $ibforums->input['pf_not_null'],
+						    'pf_member_hide'  => $ibforums->input['pf_member_hide'],
+						    'pf_max_input'    => $ibforums->input['pf_max_input'],
+						    'pf_member_edit'  => $ibforums->input['pf_member_edit'],
+						    'pf_position'     => $ibforums->input['pf_position'],
+						    'pf_show_on_reg'  => $ibforums->input['pf_show_on_reg'],
+						    'pf_input_format' => $ibforums->input['pf_input_format'],
+						    'pf_admin_only'   => $ibforums->input['pf_admin_only'],
+						    'pf_topic_format' => $std->txt_stripslashes( $_POST['pf_topic_format']),
+						  );
+		
+						  
+		if ($type == 'edit')
+		{
+			$DB->do_update( 'pfields_data', $db_string, 'pf_id='.$ibforums->input['id'] );
+			
+			$this->rebuild_cache();
+			
+			$ibforums->main_msg = "Profile Field Edited";
+			$this->main_screen();
+			
+		}
+		else
+		{
+			$DB->do_insert( 'pfields_data', $db_string );
+			
+			$new_id = $DB->get_insert_id();
+			
+			$DB->sql_add_field( 'pfields_content', "field_$new_id", 'text' );
+			
+			$DB->sql_optimize_table( 'pfields_content' );
+			
+			$this->rebuild_cache();
+			
+			$ibforums->main_msg = "Profile Field Added";
+			$this->main_screen();
+		}
+	}
+	
+	
+	//-----------------------------------------
+	//
+	// Add / edit group
+	//
+	//-----------------------------------------
+	
+	function main_form($type='edit')
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		if ($type == 'edit')
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->admin->error("No group id to select from the database, please try again.");
+			}
+			
+			$form_code = 'doedit';
+			$button    = 'Complete Edit';
+				
+		}
+		else
+		{
+			$form_code = 'doadd';
+			$button    = 'Add Field';
+		}
+		
+		//-----------------------------------------
+		// get field from db
+		//-----------------------------------------
+		
+		if ( $ibforums->input['id'] )
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'where' => "pf_id=".intval($ibforums->input['id']) ) );
+			$DB->simple_exec();
+		
+			$fields = $DB->fetch_row();
+		}
+		else
+		{
+			$fields = array( 'pf_topic_format' => '{title}: {content}<br />' );
+		}
+		
+		//-----------------------------------------
+		// Top 'o 'the mornin'
+		//-----------------------------------------
+		
+		if ($type == 'edit')
+		{
+			$ibforums->admin->page_title = "Editing Profile Field ".$fields['ftitle'];
+		}
+		else
+		{
+			$ibforums->admin->page_title = 'Adding a new profile field';
+			$fields['pf_title'] = '';
+		}
+		
+		//-----------------------------------------
+		// Wise words
+		//-----------------------------------------
+		
+		$ibforums->admin->page_detail = "Please double check the information before submitting the form.";
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $form_code  ),
+												                 2 => array( 'act'   , 'field'     ),
+												                 3 => array( 'id'    , $ibforums->input['id']   ),
+									                    )     );
+		
+		//-----------------------------------------
+		// Format...
+		//-----------------------------------------
+									     
+		$fields['pf_content'] = $this->func->method_format_content_for_edit($fields['pf_content'] );
+		
+		//-----------------------------------------
+		// Tbl (no ae?)
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Field Settings" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Field Title</b><div class='graytext'>Max characters: 200</div>" ,
+												                 $ibforums->adskin->form_input("pf_title", $fields['pf_title'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Description</b><div class='graytext'>Max Characters: 250<br />Can be used to note hidden/required status</div>" ,
+												                 $ibforums->adskin->form_input("pf_desc", $fields['pf_desc'] )
+									                    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Field Type</b>" ,
+																 $ibforums->adskin->form_dropdown("pf_type",
+																					  array(
+																							   0 => array( 'text' , 'Text Input' ),
+																							   1 => array( 'drop' , 'Drop Down Box' ),
+																							   2 => array( 'area' , 'Text Area' ),
+																						   ),
+																					  $fields['pf_type'] )
+														)      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Maximum Input</b><div class='graytext'>For text input and text areas (in characters)</div>" ,
+												                 $ibforums->adskin->form_input("pf_max_input", $fields['pf_max_input'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Display order</b><div class='graytext'>When editing and displaying (numeric 1 lowest)</div>" ,
+												                 $ibforums->adskin->form_input("pf_position", $fields['pf_position'] )
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Expected Input Format</b><div class='graytext'>Use: <b>a</b> for alpha characters<br />Use: <b>n</b> for numerics.<br />Example, for credit card numbers: nnnn-nnnn-nnnn-nnnn<br />Example, Date of Birth: nn-nn-nnnn<br />Leave blank to accept any input</div>" ,
+												                 $ibforums->adskin->form_input("pf_input_format", $fields['pf_input_format'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Option Content (for drop downs)</b><div class='graytext'>In sets, one set per line<br>Example for 'Gender' field:<br>m=Male<br>f=Female<br>u=Not Telling<br>Will produce:<br><select name='pants'><option value='m'>Male</option><option value='f'>Female</option><option value='u'>Not Telling</option></select><br>m,f or u stored in database. When showing field in profile, will use value from pair (f=Female, shows 'Female')</div>" ,
+												                 $ibforums->adskin->form_textarea("pf_content", $fields['pf_content'] )
+									                    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Include on registration page?</b><div class='graytext'>If 'yes', the field will be shown upon registration.</div>" ,
+												                 $ibforums->adskin->form_yes_no("pf_show_on_reg", $fields["pf_show_on_reg"] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Field MUST be completed and not left empty?</b><div class='graytext'>If 'yes', an error will be shown if this field is not completed.</div>" ,
+												                 $ibforums->adskin->form_yes_no("pf_not_null", $fields['pf_not_null'] )
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Field can be edited by the member?</b><div class='graytext'>If 'no', the member cannot edit the field but Super Moderators and Admins will be able to.</div>" ,
+												                 $ibforums->adskin->form_yes_no("pf_member_edit", $fields['pf_member_edit'] )
+									                    )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Make this a private profile field?</b><div class='graytext'>If yes, field only visible to profile owner, super moderators and admins. If 'no', members can search within this field.</div>" ,
+												                 $ibforums->adskin->form_yes_no("pf_member_hide", $fields['pf_member_hide'] )
+									                    )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Make Admin and Super Moderator Editable/Viewable Only?</b><div class='graytext'>If yes, will override the above options so only admins and super moderators can see and edit this field.</div>" ,
+												                 $ibforums->adskin->form_yes_no("pf_admin_only", $fields['pf_admin_only'] )
+									                    )      );
+									                    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Topic View Format?</b><div class='graytext'>Leave blank if you do not wish to add this field in the author details when viewing a topic.<br />{title} is the title of the custom field, {content} is the user added content. {key} is the form select value of the selected item in a dropdown box.<br />Example: {title}:{content}&lt;br /&gt;<br />Example: {title}:&lt;img src='imgs/{key}'&gt;</div>" ,
+												                 $ibforums->adskin->form_textarea("pf_topic_format", $fields['pf_topic_format'] )
+									                    )      );					     							     
+		
+		$ibforums->html .= $ibforums->adskin->end_form($button);
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+			
+			
+	}
+
+	//-----------------------------------------
+	//
+	// Show "Management Screen
+	//
+	//-----------------------------------------
+	
+	function main_screen()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title   = "Custom Profile Fields";
+		
+		$ibforums->admin->page_detail  = "Custom Profile fields can be used to add optional or required fields to be completed when registering or editing a profile. This is useful if you wish to record data from your members that is not already present in the base board.";
+		
+		$ibforums->adskin->td_header[] = array( "Field Title"    , "20%" );
+		$ibforums->adskin->td_header[] = array( "Type"           , "10%" );
+		$ibforums->adskin->td_header[] = array( "REQUIRED"       , "10%" );
+		$ibforums->adskin->td_header[] = array( "NOT PUBLIC"     , "10%" );
+		$ibforums->adskin->td_header[] = array( "SHOW REG"       , "10%" );
+		$ibforums->adskin->td_header[] = array( "ADMIN ONLY"     , "10%" );
+		$ibforums->adskin->td_header[] = array( "Edit"           , "10%" );
+		$ibforums->adskin->td_header[] = array( "Delete"         , "10%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Custom Profile Field Management" );
+		
+		$real_types = array( 'drop' => 'Drop Down Box',
+							 'area' => 'Text Area',
+							 'text' => 'Text Input',
+						   );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'order' => 'pf_position' ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $r = $DB->fetch_row() )
+			{
+			
+				$hide   = '&nbsp;';
+				$req    = '&nbsp;';
+				$regi   = '&nbsp;';
+				$admin  = '&nbsp;';
+				
+				//-----------------------------------------
+				// Hidden?
+				//-----------------------------------------
+				
+				if ($r['pf_member_hide'] == 1)
+				{
+					$hide = '<center><span style="color:red">Y</span></center>';
+				}
+				
+				//-----------------------------------------
+				// Required?
+				//-----------------------------------------
+				
+				if ($r['pf_not_null'] == 1)
+				{
+					$req = '<center><span style="color:red">Y</span></center>';
+				}
+				
+				//-----------------------------------------
+				// Show on reg?
+				//-----------------------------------------
+				
+				if ($r['pf_show_on_reg'] == 1)
+				{
+					$regi = '<center><span style="color:red">Y</span></center>';
+				}
+				
+				//-----------------------------------------
+				// Admin only...
+				//-----------------------------------------
+				
+				if ($r['pf_admin_only'] == 1)
+				{
+					$admin = '<center><span style="color:red">Y</span></center>';
+				}
+				
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$r['pf_title']}</b><div class='graytext'>{$r['pf_desc']}</div>" ,
+																		 "<center>{$real_types[$r['pf_type']]}</center>",
+																		 $req,
+																		 $hide,
+																		 $regi,
+																		 $admin,
+																		 "<center><a href='{$ibforums->base_url}&act=field&code=edit&id=".$r['pf_id']."'>Edit</a></center>",
+																		 "<center><a href='{$ibforums->base_url}&act=field&code=delete&id=".$r['pf_id']."'>Delete</a></center>",
+															)      );
+											 
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("None found", "center", "tdrow1");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( $ibforums->adskin->js_make_button( 'ADD NEW FIELD', "{$ibforums->base_url}&act=field&code=add" ), "center", "pformstrip");
+
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		$ibforums->admin->output();
+		
+		
+	}
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_quickhelp.php b/upload/sources/admin/ad_quickhelp.php
similarity index 89%
rename from upload/sources/Admin/ad_quickhelp.php
rename to upload/sources/admin/ad_quickhelp.php
index cc307404..204463f5 100644
--- a/upload/sources/Admin/ad_quickhelp.php
+++ b/upload/sources/admin/ad_quickhelp.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,6 +19,7 @@
 |   > Date started: 1st march 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
 +--------------------------------------------------------------------------
 */
 
@@ -30,19 +30,17 @@ if ( ! defined( 'IN_ACP' ) )
 }
 
 
-$idx = new quick_help();
-
-
-class quick_help {
+class ad_quickhelp {
 
 	var $help_text = array();
 	
 	function init_help_array()
 	{
 	
-		return array(	'mg_dohtml' => array( 'title' => "[doHTML] Tag Usage",
-											  'body'  => "The [doHTML] tag will allow all members of the group to post pure HTML in forums that have the ability to parse the [doHTML] tag. You can turn this on and off
-											  			  for each forum via the edit forum settings function.<br />
+		return array(	'mg_dohtml' => array( 'title' => "Posting HTML",
+											  'body'  => "This will allow all members of the group to post pure HTML in forums that have the ability to accept raw HTML. You can turn this on and off
+											  			  for each forum via the edit forum settings function. Note: When HTML in posts in quoted by a member who does not have the permission to post HTML, the
+											  			  post will be shown in unparsed HTML format with most of the formatting removed.<br />
 											  			  <br /><b>Warning!</b><br />
 											  			  Allowing a member to post HTML is a very dangerous thing, you should not enable this functionality on any group that will use it maliciously. Although IPB tries
 											  			  to filter some of the more harmful content, it is NOT foolproof and this tag CAN be used to steal session cookies, redirect members and destroy the topic view layout.
@@ -123,16 +121,17 @@ class quick_help {
 	
 	}
 
-	function quick_help() {
-		global $DB, $IN, $INFO, $ADMIN, $SKIN, $std;
+	function auto_run()
+	{
+		global $DB, $ibforums, $std;
 		
-		$id = $IN['id'];
+		$id = $ibforums->input['id'];
 		
 		$this->help_text = $this->init_help_array();
 		
 		if ($this->help_text[$id]['title'] == "")
 		{
-			$ADMIN->error("No help information is available for this function at present");
+			$ibforums->admin->error("No help information is available for this function at present");
 		}
 		
 		print "<html>
diff --git a/upload/sources/admin/ad_rebuild.php b/upload/sources/admin/ad_rebuild.php
new file mode 100644
index 00000000..8f5d5aa9
--- /dev/null
+++ b/upload/sources/admin/ad_rebuild.php
@@ -0,0 +1,1780 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Rebuild Counter Functions
+|   > Module written by Matt Mecham
+|   > Date started: 9th March 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_rebuild {
+
+	var $base_url;
+
+	function auto_run() 
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		switch($ibforums->input['code'])
+		{
+			case 'docount':
+				$this->docount();
+				break;
+			case 'doresyncforums':
+				$this->resync_forums();
+				break;
+			case 'doresynctopics':
+				$this->resync_topics();
+				break;
+			case 'doposts':
+				$this->rebuild_posts();
+				break;
+			case 'dopostnames':
+				$this->rebuild_post_names();
+				break;
+			case 'dopostcounts':
+				$this->rebuild_post_counts();
+				break;
+			case 'dothumbnails':
+				$this->rebuild_thumbnails();
+				break;
+			case 'doattachdata':
+				$this->rebuild_attachdata();
+				break;
+			case 'cleanattachments':
+				$this->clean_attachments();
+				break;
+			case 'cleanavatars':
+				$this->clean_avatars();
+				break;
+			case 'cleanphotos':
+				$this->clean_photos();
+				break;
+			//-----------------------------------------
+			// Tools 
+			//-----------------------------------------
+			
+			case 'tool_settings':
+				$this->tools_dupe_settings();
+				break;
+				
+			case 'tool_converge':
+				$this->tools_converge();
+				break;
+			
+			case 'tool_bansettings':
+				$this->tool_bansettings();
+				break;
+				
+			case 'tools':
+				$this->tools_splash();
+				break;
+			
+			default:
+				$this->rebuild_start();
+				break;
+		}
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOOLS BAN SETTINGS
+	/*-------------------------------------------------------------------------*/
+	
+	function tool_bansettings()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$bomb        = array();
+		$ban         = array();
+		$ip_count    =  0;
+		$email_count = 0;
+		$name_count  = 0;
+		
+		//-----------------------------------------
+		// Get current entries
+		//-----------------------------------------
+		
+		
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'banfilters', 'order' => 'ban_date desc' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ban[ $r['ban_type'] ][ $r['ban_content'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Get $INFO (again) ip email name
+		//-----------------------------------------
+		
+		require( ROOT_PATH."conf_global.php" );
+		
+		//-----------------------------------------
+		// IP
+		//-----------------------------------------
+		
+		if ( $INFO['ban_ip'] )
+		{
+			$bomb = explode( '|', $INFO['ban_ip'] );
+			
+			if ( is_array( $bomb ) and count( $bomb ) )
+			{
+				foreach( $bomb as $bang )
+				{
+					if ( ! is_array($ban['ip'][ $bang ]) )
+					{
+						$DB->do_insert( 'banfilters', array( 'ban_type' => 'ip', 'ban_content' => $bang, 'ban_date' => time() ) );
+						
+						$ip_count++;
+					}
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// EMAIL
+		//-----------------------------------------
+		
+		if ( $INFO['ban_email'] )
+		{
+			$bomb = explode( '|', $INFO['ban_email'] );
+			
+			if ( is_array( $bomb ) and count( $bomb ) )
+			{
+				foreach( $bomb as $bang )
+				{
+					if ( ! is_array($ban['email'][ $bang ]) )
+					{
+						$DB->do_insert( 'banfilters', array( 'ban_type' => 'email', 'ban_content' => $bang, 'ban_date' => time() ) );
+						
+						$email_count++;
+					}
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// EMAIL
+		//-----------------------------------------
+		
+		if ( $INFO['ban_names'] )
+		{
+			$bomb = explode( '|', $INFO['ban_names'] );
+			
+			if ( is_array( $bomb ) and count( $bomb ) )
+			{
+				foreach( $bomb as $bang )
+				{
+					if ( ! is_array($ban['name'][ $bang ]) )
+					{
+						$DB->do_insert( 'banfilters', array( 'ban_type' => 'name', 'ban_content' => $bang, 'ban_date' => time() ) );
+						
+						$name_count++;
+					}
+				}
+			}
+		}
+		
+		$ibforums->main_msg = "$ip_count IP addresses imported, $email_count email address imported, $name_count names imported.";
+		
+		require_once( ROOT_PATH."sources/admin/ad_administration.php");
+		$thing = new ad_administration();
+		$thing->ban_rebuildcache();
+		
+		$this->tools_splash();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOOLS (UN)CONVERGE
+	/*-------------------------------------------------------------------------*/
+	
+	function tools_converge()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get all validating members...
+		//-----------------------------------------
+		
+		$to_unconverge    = array();
+		$unconverge_count = 0;
+		
+		$DB->simple_construct( array( 'select' => 'id, email, mgroup', 'from' => 'members', 'where' => 'mgroup=1' ) );
+		$DB->simple_exec();
+		
+		while( $m = $DB->fetch_row() )
+		{
+			if ( preg_match( "#^{$m['id']}\-#", $m['email'] ) )
+			{
+				$to_unconverge[] = $m['id'];
+			}
+		}
+		
+		$unconverge_count = intval( count($to_unconverge) );
+		
+		if ( $unconverge_count )
+		{
+			foreach( $to_unconverge as $mid )
+			{
+				$DB->do_update( 'members'     , array( 'mgroup' => $ibforums->vars['member_group'] ), 'id='.$mid );
+				$DB->do_update( 'member_extra', array( 'bio'   => 'dupemail'                       ), 'id='.$mid );
+			}
+		}
+		
+		//-----------------------------------------
+		// Time to move on dude
+		//-----------------------------------------
+		
+		$ibforums->main_msg = "$unconverge_count members found and restored";
+		$this->tools_splash();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOOLS DUPLICATE SETTINGS
+	/*-------------------------------------------------------------------------*/
+	
+	function tools_dupe_settings()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Remove dupe categories
+		//-----------------------------------------
+		
+		$title_id_to_keep    = array();
+		$title_id_to_delete  = array();
+		$title_deleted_count = 0;
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings_titles', 'order' => 'conf_title_id' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $title_id_to_keep[ $r['conf_title_title'] ] )
+			{
+				$title_id_to_delete[ $r['conf_title_id'] ] = $r['conf_title_id'];
+			}
+			else
+			{
+				$title_id_to_keep[ $r['conf_title_title'] ] = $r['conf_title_id'];
+			}
+		}
+		
+		if ( count( $title_id_to_delete ) )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'conf_settings_titles', 'where' => 'conf_title_id IN ('.implode( ',', $title_id_to_delete ).')' ) );
+		}
+		
+		$title_deleted_count = intval( count($title_id_to_delete) );
+		
+		//-----------------------------------------
+		// Remove dupe settings
+		//-----------------------------------------
+		
+		$setting_id_to_keep       = array();
+		$setting_id_to_delete     = array();
+		$setting_id_deleted_count = 0;
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'order' => 'conf_id' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $setting_id_to_keep[ $r['conf_title'].','.$r['conf_key'] ] )
+			{
+				$setting_id_to_delete[ $r['conf_id'] ] = $r['conf_id'];
+			}
+			else
+			{
+				$setting_id_to_keep[ $r['conf_title'].','.$r['conf_key'] ] = $r['conf_id'];
+			}
+		}
+	
+		if ( count( $setting_id_to_delete ) )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'conf_settings', 'where' => 'conf_id IN ('.implode( ',', $setting_id_to_delete ).')' ) );
+		}
+		
+		$setting_deleted_count = intval( count($setting_id_to_delete) );
+		
+		//-----------------------------------------
+		// Time to move on dude
+		//-----------------------------------------
+		
+		$ibforums->main_msg = "$title_deleted_count duplicate setting titles deleted and $setting_deleted_count duplicate settings deleted";
+		$this->tools_splash();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOOLS SPLASH
+	/*-------------------------------------------------------------------------*/
+	
+	function tools_splash()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_detail = "Please choose which clean-up tool you wish to use.";
+		$ibforums->admin->page_title  = "Maintenance Tools";
+		
+		//-----------------------------------------
+		// STATISTICS
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'tool_settings' ),
+												                 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "{none}"    , "100%" );
+	
+		$ibforums->html .= $ibforums->adskin->start_table( "Remove Duplicate System Settings" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "After an upgrade from a previous version or import from another board software, you may find that due to running an upgrade tool
+																  twice or a time-out you'll end up with some duplicate tools in the System Settings.
+																  <br />This tool finds the duplicates which have a greater ID than the original."
+														)      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('RUN TOOL');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// STATISTICS (also vali mem)
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'tool_converge' ),
+												                 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "{none}"    , "100%" );
+	
+		$ibforums->html .= $ibforums->adskin->start_table( "Find & Restore 'Converged' Members" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "After an upgrade from a previous version or import from another board software, you may find that because several of your members have used duplicate
+																  email addresses, their account has been moved into the validating group.
+																  <br />This tool finds these members and restores them into the default member group and asks them to change their email address."
+														)      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('RUN TOOL');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Import old bandana settings
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'tool_bansettings' ),
+												                 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "{none}"    , "100%" );
+	
+		$ibforums->html .= $ibforums->adskin->start_table( "Find & Restore old IPB Ban Settings" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "After an upgrade from a previous version, you may find that your ban settings are no longer
+																  stored.<br />Running this tool attempts to import your old ban settings. Old entries will not overwrite new entries."
+														)      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('RUN TOOL');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Print
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Clean out photos
+	/*-------------------------------------------------------------------------*/
+	
+	function clean_photos()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( KERNEL_PATH.'class_upload.php' );
+		
+		$upload = new class_upload();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Pop open the directory and
+		// peek inside...
+		//-----------------------------------------
+		
+		$i = 0;
+		
+		$dh = opendir( ROOT_PATH.'uploads' );
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if ( strstr( $file, 'photo-' ) )
+ 			{
+ 				$fullfile = ROOT_PATH.'uploads/'.$file;
+ 			
+ 				$i++;
+ 				
+ 				//-----------------------------------------
+ 				// Already started?
+ 				//-----------------------------------------
+ 				
+ 				if ( $start > $i )
+ 				{
+ 					continue;
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Done for this iteration?
+ 				//-----------------------------------------
+ 				
+ 				if ( $i > $end )
+ 				{
+ 					break;
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Try and get attach row
+ 				//-----------------------------------------
+ 				
+ 				$found = $DB->simple_exec_query( array( 'select' => 'id', 'from' => 'member_extra', 'where' => "photo_location='$file'" ) );
+ 				
+ 				if ( ! $found['id'] )
+ 				{
+ 					@unlink( $fullfile );
+ 					$output[] = "<span style='color:red'>Removed orphan: $file</span>";
+ 				}
+ 				else
+ 				{
+ 					$output[] = "<span style='color:gray'>Attached File OK: $file</span>";
+ 				}
+			}
+ 		}
+ 		
+ 		closedir( $dh );
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( $i < $end)
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Clean out avatars
+	/*-------------------------------------------------------------------------*/
+	
+	function clean_avatars()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( KERNEL_PATH.'class_upload.php' );
+		
+		$upload = new class_upload();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Pop open the directory and
+		// peek inside...
+		//-----------------------------------------
+		
+		$i = 0;
+		
+		$dh = opendir( ROOT_PATH.'uploads' );
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if ( strstr( $file, 'av-' ) )
+ 			{
+ 				$fullfile = ROOT_PATH.'uploads/'.$file;
+ 			
+ 				$i++;
+ 				
+ 				//-----------------------------------------
+ 				// Already started?
+ 				//-----------------------------------------
+ 				
+ 				if ( $start > $i )
+ 				{
+ 					continue;
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Done for this iteration?
+ 				//-----------------------------------------
+ 				
+ 				if ( $i > $end )
+ 				{
+ 					break;
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Try and get attach row
+ 				//-----------------------------------------
+ 				
+ 				$found = $DB->simple_exec_query( array( 'select' => 'id', 'from' => 'member_extra', 'where' => "avatar_location='$file' or avatar_location='upload:$file'" ) );
+ 				
+ 				if ( ! $found['id'] )
+ 				{
+ 					@unlink( $fullfile );
+ 					$output[] = "<span style='color:red'>Removed orphan: $file</span>";
+ 				}
+ 				else
+ 				{
+ 					$output[] = "<span style='color:gray'>Attached File OK: $file</span>";
+ 				}
+			}
+ 		}
+ 		
+ 		closedir( $dh );
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( $i < $end)
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Clean out attachments
+	/*-------------------------------------------------------------------------*/
+	
+	function clean_attachments()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( KERNEL_PATH.'class_upload.php' );
+		
+		$upload = new class_upload();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Pop open the directory and
+		// peek inside...
+		//-----------------------------------------
+		
+		$i = 0;
+		
+		$dh = opendir( ROOT_PATH.'uploads' );
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if ( strstr( $file, 'post-' ) )
+ 			{
+ 				$fullfile = ROOT_PATH.'uploads/'.$file;
+ 			
+ 				$i++;
+ 				
+ 				//-----------------------------------------
+ 				// Already started?
+ 				//-----------------------------------------
+ 				
+ 				if ( $start > $i )
+ 				{
+ 					continue;
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Done for this iteration?
+ 				//-----------------------------------------
+ 				
+ 				if ( $i > $end )
+ 				{
+ 					break;
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Try and get attach row
+ 				//-----------------------------------------
+ 				
+ 				$found = $DB->simple_exec_query( array( 'select' => 'attach_id', 'from' => 'attachments', 'where' => "attach_location='$file' OR attach_thumb_location='$file'" ) );
+ 				
+ 				if ( ! $found['attach_id'] )
+ 				{
+ 					@unlink( $fullfile );
+ 					$output[] = "<span style='color:red'>Removed orphan: $file</span>";
+ 				}
+ 				else
+ 				{
+ 					$output[] = "<span style='color:gray'>Attached File OK: $file</span>";
+ 				}
+			}
+ 		}
+ 		
+ 		closedir( $dh );
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( $i < $end)
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD ATTACH DATA
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_attachdata()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( KERNEL_PATH.'class_upload.php' );
+		
+		$upload = new class_upload();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'attach_id', 'from' => 'attachments', 'where' => "attach_id > $end" ) );
+		$max = intval( $tmp['attach_id'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_id >= $start and attach_id < $end", 'order' => 'attach_id ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			//-----------------------------------------
+			// Get ext
+			//-----------------------------------------
+			
+			$update = array();
+			
+			$update['attach_ext'] = $upload->_get_file_extension( $r['attach_file'] );
+			
+			if ( $r['attach_location'] )
+			{
+				if ( file_exists( $ibforums->vars['upload_dir'].'/'.$r['attach_location'] ) )
+				{
+					$update['attach_filesize'] = @filesize( $ibforums->vars['upload_dir'].'/'.$r['attach_location'] );
+				}
+			}
+			
+			if ( count( $update ) )
+			{
+				$DB->do_update( 'attachments', $update, 'attach_id='.$r['attach_id'] );
+			}
+			
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD THUMBNAILS
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_thumbnails()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( KERNEL_PATH.'class_image.php' );
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'attach_id', 'from' => 'attachments', 'where' => "attach_id > $end" ) );
+		$max = intval( $tmp['attach_id'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_id >= $start and attach_id < $end", 'order' => 'attach_id ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			if ( $r['attach_is_image'] )
+			{
+				if ( $r['attach_thumb_location'] and ( $r['attach_thumb_location'] != $r['attach_location'] ) )
+				{
+					if ( file_exists( $ibforums->vars['upload_dir'].'/'.$r['attach_thumb_location'] ) )
+					{
+						if ( ! @unlink( $ibforums->vars['upload_dir'].'/'.$r['attach_thumb_location'] ) )
+						{
+							$output[] = "Could not remove: ".$r['attach_thumb_location'];
+							continue;
+						}
+					}
+				}
+				
+				$attach_data           = array();
+				$thumb_data            = array();
+				
+				$image = new class_image();
+				
+				$image->in_type        = 'file';
+				$image->out_type       = 'file';
+				$image->in_file_dir    = $ibforums->vars['upload_dir'];
+				$image->in_file_name   = $r['attach_location'];
+				$image->desired_width  = $ibforums->vars['siu_width'];
+				$image->desired_height = $ibforums->vars['siu_height'];
+				$image->gd_version     = $ibforums->vars['gd_version'];
+		
+				$thumb_data = $image->generate_thumbnail();
+				
+				$attach_data['attach_thumb_width']    = $thumb_data['thumb_width'];
+				$attach_data['attach_thumb_height']   = $thumb_data['thumb_height'];
+				$attach_data['attach_thumb_location'] = $thumb_data['thumb_location'];
+				
+				if ( count( $attach_data ) )
+				{
+					$DB->do_update( 'attachments', $attach_data, 'attach_id='.$r['attach_id'] );
+					
+					$output[] = "Resized: ".$r['attach_location'];
+				}
+				
+				unset($image);
+			}
+			
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD POST COUNTS
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_post_counts()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		//-----------------------------------------
+		// Forums not to count?
+		//-----------------------------------------
+		
+		$forums = array();
+		
+		foreach( $ibforums->cache['forum_cache'] as $id => $data )
+		{
+			if ( ! $data['inc_postcount'] )
+			{
+				$forums[] = $data['id'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'id', 'from' => 'members', 'where' => "id > $end" ) );
+		$max = intval( $tmp['id'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => "id >= $start and id < $end", 'order' => 'id ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			if ( ! count( $forums ) )
+			{
+				$count = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'posts', 'where' => 'queued != 1 AND author_id='.$r['id'] ) );
+			}
+			else
+			{
+				$DB->query( "SELECT count(p.pid) as count
+							 FROM ".SQL_PREFIX."posts p, ".SQL_PREFIX."topics t
+							 WHERE p.queued != 1 AND p.author_id={$r['id']}
+							 AND t.tid=p.topic_id AND t.forum_id NOT IN (".implode(",",$forums).")" );
+							 
+				$count = $DB->fetch_row();
+			}
+			
+			$new_post_count = intval( $count['count'] );
+			
+			$DB->do_update( 'members', array( 'posts' => $new_post_count ), 'id='.$r['id'] );
+			
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD POSTS
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_post_names()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'id', 'from' => 'members', 'where' => "id > $end" ) );
+		$max = intval( $tmp['id'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => "id >= $start and id < $end", 'order' => 'id ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			$DB->do_update( 'contacts'      , array( 'contact_name'     => $r['name'] ), "contact_id="    .$r['id'] );
+			$DB->do_update( 'moderator_logs', array( 'member_name'      => $r['name'] ), "member_id="     .$r['id'] );
+			$DB->do_update( 'moderators'    , array( 'member_name'      => $r['name'] ), "member_id="     .$r['id'] );
+			$DB->do_update( 'posts'         , array( 'author_name'      => $r['name'] ), "author_id="     .$r['id'] );
+			$DB->do_update( 'topics'        , array( 'starter_name'     => $r['name'] ), "starter_id="    .$r['id'] );
+		
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD POSTS
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_posts()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( ROOT_PATH.'sources/lib/post_parser.php' );
+		$parser = new post_parser();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'pid', 'from' => 'posts', 'where' => "pid > $end" ) );
+		$max = intval( $tmp['pid'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'p.*, t.forum_id', 'from' => 'posts p, ibf_topics t', 'where' => "pid >= $start and pid < $end and p.topic_id=t.tid", 'order' => 'pid ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			$parser->quote_open   = 0;
+			$parser->quote_closed = 0;
+			$parser->quote_error  = 0;
+			$parser->error        = '';
+			$parser->image_count  = 0;
+			
+			$rawpost = $parser->unconvert( $r['post'] );
+			
+			$newpost = $parser->convert( array( 'TEXT'      => $rawpost,
+												'SMILIES'   => $r['use_emo'],
+												'CODE'      => $ibforums->cache['forum_cache'][ $r['forum_id'] ]['use_ibc'],
+									  )       );
+			
+			//-----------------------------------------
+			// Convert old dohtml?
+			//-----------------------------------------
+			
+			$htmlstate = 0;
+			
+			if ( strstr( strtolower($newpost), '[dohtml]' ) )
+			{
+				//-----------------------------------------
+				// Can we use HTML?
+				//-----------------------------------------
+				
+				if ( $ibforums->cache['forum_cache'][ $r['forum_id'] ]['use_html'] )
+				{
+					$htmlstate = 2;
+				}
+				
+				$newpost = preg_replace( "#\[dohtml\]#i" , "", $newpost );
+				$newpost = preg_replace( "#\[/dohtml\]#i", "", $newpost );
+			}
+			else
+			{
+				$htmlstate = intval( $r['post_htmlstate'] );
+			}
+			
+			if ( $newpost )
+			{
+				$DB->do_update( 'posts', array( 'post' => $newpost, 'post_htmlstate' => $htmlstate ), 'pid='.$r['pid'] );
+			}
+			
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>Up to $end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// RESYNCHRONIZE TOPICS
+	/*-------------------------------------------------------------------------*/
+	
+	function resync_topics()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( ROOT_PATH.'sources/lib/modfunctions.php' );
+		$modfunc = new modfunctions();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'topics', 'where' => "tid > $end" ) );
+		$max = intval( $tmp['count'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "tid >= $start and tid < $end", 'order' => 'tid ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			$modfunc->rebuild_topic($r['tid'], 0);
+			
+			if ( $ibforums->input['pergo'] <= 200 )
+			{
+				$output[] = "Processed topic ".$r['title'];
+			}
+			
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>$end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// RESYNCHRONIZE FORUMS
+	/*-------------------------------------------------------------------------*/
+	
+	function resync_forums()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		require_once( ROOT_PATH.'sources/lib/modfunctions.php' );
+		$modfunc = new modfunctions();
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$done   = 0;
+		$start  = intval( $ibforums->input['st'] );
+		$end    = intval( $ibforums->input['pergo'] ) ? intval( $ibforums->input['pergo'] ) : 100;
+		$end   += $start;
+		$output = array();
+		
+		//-----------------------------------------
+		// Got any more?
+		//-----------------------------------------
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'forums', 'where' => "id > $end" ) );
+		$max = intval( $tmp['count'] );
+		
+		//-----------------------------------------
+		// Avoid limit...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forums', 'where' => "id >= $start and id < $end", 'order' => 'id ASC' ) );
+		$outer = $DB->simple_exec();
+		
+		//-----------------------------------------
+		// Process...
+		//-----------------------------------------
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			$modfunc->forum_recount( $r['id'] );
+			$output[] = "Processed forum ".$r['name'];
+			$done++;
+		}
+		
+		//-----------------------------------------
+		// Finish - or more?...
+		//-----------------------------------------
+		
+		if ( ! $done and ! $max )
+		{
+		 	//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$text = "<b>Rebuild completed</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild";
+			$time = 2;
+		}
+		else
+		{
+			//-----------------------------------------
+			// More..
+			//-----------------------------------------
+			
+			$text = "<b>$end processed so far, continuing...</b><br />".implode( "<br />", $output );
+			$url  = "act=rebuild&code=".$ibforums->input['code'].'&pergo='.$ibforums->input['pergo'].'&st='.$end;
+			$time = 0;
+		}
+		
+		//-----------------------------------------
+		// Bye....
+		//-----------------------------------------
+		
+		$ibforums->admin->redirect( $url, $text, 0, $time );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// DO COUNT - Count the stats
+	/*-------------------------------------------------------------------------*/
+	
+	function docount()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ( (! $ibforums->input['posts']) and (! $ibforums->input['members'] ) and (! $ibforums->input['lastreg'] ) )
+		{
+			$ibforums->admin->error("Nothing to recount!");
+		}
+		
+		$stats = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='stats'" ) );
+		
+		$stats = unserialize(stripslashes($stats['cs_value']));
+		
+		if ($ibforums->input['posts'])
+		{
+			$DB->simple_construct( array( 'select' => 'count(pid) as posts', 'from' => 'posts', 'where' => "queued <> 1" ) );
+			$DB->simple_exec();
+		
+			$r = $DB->fetch_row();
+			$stats['total_replies'] = intval($r['posts']);
+			
+			$DB->simple_construct( array( 'select' => 'count(tid) as topics', 'from' => 'topics', 'where' => "approved = 1" ) );
+			$DB->simple_exec();
+			
+			$r = $DB->fetch_row();
+			$stats['total_topics']   = intval($r['topics']);
+			$stats['total_replies'] -= $stats['total_topics'];
+		}
+		
+		if ($ibforums->input['members'])
+		{
+			$DB->simple_construct( array( 'select' => 'count(id) as members', 'from' => 'members', 'where' => "mgroup <> '".$ibforums->vars['auth_group']."'" ) );
+			$DB->simple_exec();
+			
+			$r = $DB->fetch_row();
+			$stats['mem_count'] = intval($r['members']);
+		}
+		
+		if ($ibforums->input['lastreg'])
+		{
+			$DB->simple_construct( array( 'select' => 'id, name',
+										  'from'   => 'members',
+										  'where'  => "mgroup <> '".$ibforums->vars['auth_group']."'",
+										  'order'  => "id DESC",
+										  'limit'  => array(0,1) ) );
+			$DB->simple_exec();
+			
+			$r = $DB->fetch_row();
+			$stats['last_mem_name'] = $r['name'];
+			$stats['last_mem_id']   = $r['id'];
+		}
+		
+		if ($ibforums->input['online'])
+		{
+			$stats['most_date'] = time();
+			$stats['most_count'] = 1;
+		}
+		
+		if ( count($stats) > 0 )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key='stats'" ) );
+			$DB->do_insert( 'cache_store', array( 'cs_array' => 1, 'cs_key' => 'stats', 'cs_value' => addslashes(serialize($stats)) ) );
+		}
+		else
+		{
+			$ibforums->admin->error("Nothing to recount!");
+		}
+		
+		$ibforums->main_msg = 'Statistics Recounted';
+		
+		$ibforums->admin->done_screen("Statistics Recounted", "Recount statistics section", "act=rebuild", 'redirect' );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MAIN PAGE
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_start()
+	{
+		global $ibforums, $DB,  $std;
+	
+		$ibforums->admin->page_detail = "Please choose which statistics to recount.";
+		$ibforums->admin->page_title  = "Recount & Rebuild Manager";
+		
+		//-----------------------------------------
+		// STATISTICS
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'docount' ),
+												                 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "Statistic"    , "70%" );
+		$ibforums->adskin->td_header[] = array( "Option"       , "30%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Recount Statistics" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Recount total topics and posts",
+																 $ibforums->adskin->form_dropdown( 'posts', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
+														)      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Recount Members",
+												  $ibforums->adskin->form_dropdown( 'members', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Reset last registered member",
+												  $ibforums->adskin->form_dropdown( 'lastreg', array( 0 => array( 1, 'Yes'  ), 1 => array( 0, 'No' ) ) )
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "Reset 'Most online' statistic?",
+												  $ibforums->adskin->form_dropdown( 'online', array( 0 => array( 0, 'No'  ), 1 => array( 1, 'Yes' ) ) )
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Reset these statistics');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Resynchronise Forums
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doresyncforums' ),
+																 2 => array( 'act'   , 'rebuild' ),
+														)      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Resynchronize Forums" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Resynchronize Forums</b><div style='color:gray'>This will recount topics, posts and the forum last poster for all your forums</div>",
+												  		       $ibforums->adskin->form_simple_input( 'pergo', '50', 5 ). "&nbsp;Per Cycle"
+										 			  )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Resynchronize Forums');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Resynchronise Forums
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doresynctopics' ),
+																 2 => array( 'act'   , 'rebuild' ),
+														)      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Resynchronize Topics" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Resynchronize Topics</b><div style='color:gray'>This will recount replies, attachment count and the topic starter and last poster for all your topics.</div>",
+												  		       $ibforums->adskin->form_simple_input( 'pergo', '500', 5 ). "&nbsp;Per Cycle"
+										 			  )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Resynchronize Topics');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Resynchronise Posts
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doposts' ),
+												                 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild Post Content" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild Post Content</b><div style='color:gray'>This will rebuild the post content including BBCode and emoticons. Useful if you've changed a lot of emoticons or the emoticon paths.</div>",
+												  		       $ibforums->adskin->form_simple_input( 'pergo', '500', 5 ). "&nbsp;Per Cycle"
+										 			  )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Rebuild Post Content');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Resynchronise User Names
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dopostnames' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild User Names" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild User Names</b><div style='color:gray'>This will reset the saved usernames in posts, topics, logs, etc. Useful if you've recently converted or manually changed member's names.</div>",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '500', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Rebuild User Names');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Resynchronise User Post Counts
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dopostcounts' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild User Post Counts" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild User Post Counts</b><div style='color:gray'>This will recount members posts based on CURRENT posts from the database. This will almost certainly REDUCE the post counts for your members as deleted and pruned posts will no longer be counted. This should not be used if you wish to retain your member's current post counts.</div>THERE IS NO UNDO!",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '500', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Rebuild User Post Counts');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Rebuild thumbnails
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'dothumbnails' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild Attachment Thumbnails" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild Attachment Thumbnails</b><div style='color:gray'>This will rebuild all your attachment image thumbnails to the current size. This is useful if you've recently changed the thumbnail size and wish to update all current attachments</div>This is moderately resource intensive.",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '20', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Rebuild Attachment Thumbnails');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Rebuild attachment data
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doattachdata' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild Attachment Data" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild Attachment Data</b><div style='color:gray'>This will rebuild all your attachment data such as filesize, location and file extension</div>This is moderately resource intensive.",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '50', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Rebuild Attachment Data');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Clean up attachments
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'cleanattachments' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Remove orphaned attachments" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Remove orphaned attachments</b><div style='color:gray'>This will check and remove all orphaned 'post-' attachments not assigned to a post.</div>This is moderately resource intensive.",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '50', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Remove orphaned attachments');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Clean up uploaded avatars
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'cleanavatars' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Remove orphaned uploaded avatars" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Remove orphaned avatars</b><div style='color:gray'>This will check and remove all orphaned 'av-' avatars not assigned to a member.</div>This is moderately resource intensive.",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '50', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Remove orphaned avatars');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Clean up uploaded photos
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'cleanphotos' ),
+												             	 2 => array( 'act'   , 'rebuild' ),
+									                    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Remove orphaned uploaded photos" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Remove orphaned photos</b><div style='color:gray'>This will check and remove all orphaned 'photo-' photographs not assigned to a member.</div>This is moderately resource intensive.",
+												  		         $ibforums->adskin->form_simple_input( 'pergo', '50', 5 ). "&nbsp;Per Cycle"
+										 		   	    )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_form('Remove orphaned photos');
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-------------------------------//
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_remote_template.php b/upload/sources/admin/ad_remote_template.php
similarity index 50%
rename from upload/sources/Admin/ad_remote_template.php
rename to upload/sources/admin/ad_remote_template.php
index d7ad0694..fdcb2339 100644
--- a/upload/sources/Admin/ad_remote_template.php
+++ b/upload/sources/admin/ad_remote_template.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -30,19 +29,17 @@ if ( ! defined( 'IN_ACP' ) )
 }
 
 
-$idx = new ad_settings();
-
-
-class ad_settings {
+class ad_remote_template {
 
 	var $base_url;
 
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -51,9 +48,9 @@ class ad_settings {
 			unset($$k);
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 
-		switch($IN['code'])
+		switch($ibforums->input['code'])
 		{
 			case 'preview':
 				$this->do_preview();
@@ -83,7 +80,7 @@ class ad_settings {
 				$this->print_compare_new();
 				break;
 			
-			//-----------------------------
+			//-----------------------------------------
 			
 			case 'search':
 				$this->search_frames();
@@ -97,7 +94,7 @@ class ad_settings {
 				$this->print_searchlinks();
 				break;
 			
-			//-----------------------------
+			//-----------------------------------------
 			
 			case 'css_search':
 				$this->css_search_frames();
@@ -111,7 +108,7 @@ class ad_settings {
 				$this->do_message("Preview Window");
 				break;
 				
-			//-------------------------
+			//-----------------------------------------
 			
 			case 'css_preview':
 				$this->css_preview();
@@ -124,47 +121,39 @@ class ad_settings {
 		
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function css_search_frames()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
+		global $ibforums, $DB,  $std, $HTTP_GET_VARS;
 		
 		print "<html>
 				 <head><title>Search</title></head>
 				   <frameset cols='200, *' frameborder='no' border='1' framespacing='0'>
-					<frame name='links' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=csssearchlinks&id={$IN['id']}&element={$HTTP_GET_VARS['element']}'>
-					<frame name='preview' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=previewstate'>
+					<frame name='links' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=csssearchlinks&id={$ibforums->input['id']}&element={$HTTP_GET_VARS['element']}'>
+					<frame name='preview' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=previewstate'>
 				   </frameset>
 			   </html>";
 			   
 		exit();
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function css_preview()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
+		global $ibforums, $DB,  $std, $HTTP_GET_VARS;
 		
-		//+---------------------------------------
+		//-----------------------------------------
 		// GET THE TEMPLATES THAT THIS CSS USES
-		//+---------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("SELECT css_text, css_name FROM ibf_css WHERE cssid='".$IN['id']."'");
-		
-		if ( ! $set = $DB->fetch_row() )
-		{
-			$ADMIN->error("Cannot query the database using that information");
-		}
-		
-		$DB->query("SELECT img_dir FROM ibf_skins WHERE css_id='".$IN['id']."'");
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.intval( $ibforums->input['id']) ) ); 
 		
 		$skin = $DB->fetch_row();
 		
 		$element = trim(stripslashes($HTTP_GET_VARS['element']));
 		
-		
 		list($type, $name) = explode( "|", $element );
 		
 		$like = "class='{$name}'";
@@ -176,11 +165,7 @@ class ad_settings {
 			$first = '#';
 		}
 		
-		preg_match( "/($first"."$name)\s{0,}\{(.+?)\}/s", $set['css_text'], $match );
-		
-		//$definition = nl2br( str_replace( "\n\n", "\n", str_replace( "\r\n", "\n", $match[2]) ) );
-		
-		//preg_match_all( "/(\S+?):(.+?);?/s", trim($match[2]), $defs );
+		preg_match( "/($first"."$name)\s{0,}\{(.+?)\}/s", $this_set['set_cache_css'], $match );
 		
 		$defs = explode( ";", str_replace( "\n\n", "\n", str_replace( "\r\n", "\n", trim($match[2]) ) ) );
 		
@@ -207,7 +192,7 @@ class ad_settings {
 			}
 		}
 	
-		$css = "\n<style>\n<!--\n".str_replace( "<#IMG_DIR#>", $skin['img_dir'], $set['css_text'] )."\n//-->\n</style>";
+		$css = "\n<style>\n<!--\n".preg_replace( "#url\(([\"'])?#i", "url(\\1style_images/", $this_set['set_cache_css'] )."\n//-->\n</style>";
 		
     	$html = "<html>
     	           <head>
@@ -217,7 +202,7 @@ class ad_settings {
     	           <body topmargin='0' leftmargin='0' rightmargin='0' marginwidth='0' marginheight='0' alink='#000000' vlink='#000000'>
     	           <table border='1' width='95%' cellspacing='0' cellpadding='4' align='center'>
     	           <tr>
-    	            <td bgcolor='#EEEEEE' style='font-size:14px'><b>Preview CSS Element '$name'<br>From style sheet '{$set['css_name']}'</b></td>
+    	            <td bgcolor='#EEEEEE' style='font-size:14px'><b>Preview CSS Element '$name'<br>From style sheet '{$this_set['set_name']}'</b></td>
     	           </tr>
     	           </table>
     	           <br>
@@ -246,27 +231,19 @@ class ad_settings {
     	        
     }
     	        
-   	//+---------------------------------------
-   	//+---------------------------------------
+   	//-----------------------------------------
+   	//---------------------------------------
 	
 	function print_css_searchlinks()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
+		global $ibforums, $DB,  $std, $HTTP_GET_VARS;
 		
-		//+---------------------------------------
+		//-----------------------------------------
 		// GET THE TEMPLATES THAT THIS CSS USES
-		//+---------------------------------------
-		
-		$DB->query("SELECT set_id FROM ibf_skins WHERE css_id='".$IN['id']."'");
-		
-		if ( ! $set = $DB->fetch_row() )
-		{
-			$ADMIN->error("Cannot query the database using that information");
-		}
+		//-----------------------------------------
 		
 		$element = trim(stripslashes($HTTP_GET_VARS['element']));
 		
-		
 		list($type, $name) = explode( "|", $element );
 		
 		$like = "class=_{$name}";
@@ -276,11 +253,11 @@ class ad_settings {
 			$like = "id=_{$name}";
 		}
 		
-		require './sources/Admin/skin_info.php';
+		require './sources/admin/skin_info.php';
 		
 		//die("SELECT suid, set_id, group_name, func_name FROM ibf_skin_templates WHERE set_id='".$set['tmpl_id']."' AND section_content LIKE '%".$like."%' ORDER BY group_name");
 		
-		$DB->query("SELECT suid, set_id, group_name, func_name FROM ibf_skin_templates WHERE set_id='".$set['set_id']."' AND section_content LIKE '%".$like."%' ORDER BY group_name");
+		$DB->query("SELECT suid, set_id, group_name, func_name FROM ibf_skin_templates WHERE set_id='".$ibforums->input['id']."' AND section_content LIKE '%".$like."%' ORDER BY group_name");
 		
 		if (! $DB->get_num_rows() )
 		{
@@ -300,9 +277,9 @@ class ad_settings {
 			
 		}
 		
-		$ADMIN->html .= $SKIN->start_table();
+		$ibforums->html .= $ibforums->adskin->start_table();
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search Results</b>" )  , 'title' );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search Results</b>" )  , 'title' );
 		
 		foreach( $result as $group_name => $sub_array )
 		{
@@ -311,38 +288,47 @@ class ad_settings {
 				$group_name = $skin_names[ $group_name ][0];
 			}
 			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>$group_name</b>" )  , 'catrow' );
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>$group_name</b>" )  , 'catrow' );
 			
 			if (is_array($sub_array) and count($sub_array) > 0 )
 			{
 				foreach( $sub_array as $idx => $data )
 				{
-					$ADMIN->html .= $SKIN->add_td_row( array( "+ <a href='{$SKIN->base_url}&act=rtempl&code=preview&suid={$data['suid']}&type=text&hl=".urlencode($name)."' target='preview'>{$data['func_name']}</a>" )  );
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "+ <a href='{$ibforums->adskin->base_url}&act=rtempl&code=preview&suid={$data['suid']}&type=text&hl=".urlencode($name)."' target='preview'>{$data['func_name']}</a>" )  );
 				}
 			}
 		}
 										 
 		
 										 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 		
 	}
 	
-	//+---------------------------------------
-	//+---------------------------------------
+	/*-------------------------------------------------------------------------*/
+	// PRINT THE SEARCH RESULT LINKS
+	/*-------------------------------------------------------------------------*/
 	
 	function print_searchlinks()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
+		global $ibforums, $DB,  $std;
 		
-		if ($IN['bypass'] == 1)
+		//-----------------------------------------
+		// Printing no results?
+		//-----------------------------------------
+		
+		if ($ibforums->input['bypass'] == 1)
 		{
 			$this->do_message("No Search Results");
 		}
 		
-		$search_text = trim($this->unconvert_tags(stripslashes($HTTP_POST_VARS['search'])));
+		//-----------------------------------------
+		// Clean up search post
+		//-----------------------------------------
+		
+		$search_text = trim($this->unconvert_tags(stripslashes($_POST['search'])));
 		
 		$search_text = str_replace( "\$", "\\$", $search_text);
 		$search_text = str_replace( "'" , "\\'", $search_text);
@@ -352,21 +338,25 @@ class ad_settings {
 			$this->do_message("Please enter a string to search");
 		}
 		
-		require './sources/Admin/skin_info.php';
+		require './sources/admin/skin_info.php';
 		
-		$DB->query("SELECT set_id FROM ibf_skin_templates WHERE suid='".$IN['suid']."'");
+		//-----------------------------------------
+		// Get template bits
+		//-----------------------------------------
 		
-		$set = $DB->fetch_row();
+		$DB->query("SELECT suid, set_id, group_name, func_name FROM ibf_skin_templates WHERE set_id=".$ibforums->input['set_id']." AND section_content LIKE '%$search_text%' ORDER BY group_name");
 		
-		$DB->query("SELECT suid, set_id, group_name, func_name FROM ibf_skin_templates WHERE set_id='".$set['set_id']."' AND section_content LIKE '%$search_text%' ORDER BY group_name");
-		
-		if (! $DB->get_num_rows() )
+		if ( ! $DB->get_num_rows() )
 		{
 			$this->do_message("No matches for that string");
 		}
 		
 		$results = array();
 		
+		//-----------------------------------------
+		// Loop..
+		//-----------------------------------------
+		
 		while ( $r = $DB->fetch_row() )
 		{
 			if ( ! isset($result[ $r['group_name'] ]) )
@@ -378,9 +368,13 @@ class ad_settings {
 			
 		}
 		
-		$ADMIN->html .= $SKIN->start_table();
+		//-----------------------------------------
+		// Print..
+		//-----------------------------------------
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Search Results</b>" )  , 'title' );
+		$ibforums->html .= $ibforums->adskin->start_table();
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search Results</b>" )  , 'title' );
 		
 		foreach( $result as $group_name => $sub_array )
 		{
@@ -389,92 +383,98 @@ class ad_settings {
 				$group_name = $skin_names[ $group_name ][0];
 			}
 			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>$group_name</b>" )  , 'catrow' );
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>$group_name</b>" )  , 'catrow' );
 			
 			if (is_array($sub_array) and count($sub_array) > 0 )
 			{
 				foreach( $sub_array as $idx => $data )
 				{
-					$ADMIN->html .= $SKIN->add_td_row( array( "+ <a href='{$SKIN->base_url}&act=rtempl&code=preview&suid={$data['suid']}&type=text&hl=".urlencode(stripslashes($HTTP_POST_VARS['search']))."' target='preview'>{$data['func_name']}</a>" )  );
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "+ <a href='{$ibforums->adskin->base_url}&act=rtempl&code=preview&suid={$data['suid']}&set_id={$ibforums->input['set_id']}&type=text&hl=".urlencode(stripslashes($_POST['search']))."' target='preview'>{$data['func_name']}</a>" )  );
 				}
 			}
 		}
 										 
-		
+		//-----------------------------------------
+		// Done..
+		//-----------------------------------------
 										 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 		
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function do_message($message="")
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->html = "<tr><td id='tdrow1' height='100%' align='center' valign='middle'><br><br><b>$message</b><br><br>&nbsp;</td></tr>";
+		$ibforums->html = "<tr><td id='tdrow1' height='100%' align='center' valign='middle'><br><br><b>$message</b><br><br>&nbsp;</td></tr>";
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 		
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function print_search_box()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'searchlinks'   ),
-												  2 => array( 'act'   , 'rtempl'        ),
-												  3 => array( 'suid'  , $IN['suid']   )
-									     )  ,'theform', 'target="links"'    );
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'searchlinks'   ),
+												                 2 => array( 'act'   , 'rtempl'        ),
+												                 3 => array( 'set_id', $ibforums->input['set_id']   )
+									                    )  ,'theform', 'target="links"'    );
 									     
-		//+-------------------------------
+		//-----------------------------------------
 		
 		
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$ADMIN->html .= $SKIN->start_table(  );
+		$ibforums->html .= $ibforums->adskin->start_table(  );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enter text to search for</b><br>".
-										          $SKIN->form_input( 'search' )
-										 )      );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Enter text to search for</b><br>".
+										                         $ibforums->adskin->form_input( 'search' )
+										                )      );
 										 
-		$ADMIN->html .= $SKIN->end_form("Search!");
+		$ibforums->html .= $ibforums->adskin->end_form("Search!");
 										 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 		
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function search_frames()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
+		$std->boink_it( $ibforums->base_url.'&act=skintools&code=searchsplash' );
+		
+		
+		exit();
 		print "<html>
 				 <head><title>Search</title></head>
 				   <frameset cols='200, *' frameborder='no' border='1' framespacing='0'>
 					 <frameset rows='*, 100' frameborder='no' border='1' framespacing='0'>
-					   <frame name='links' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=searchlinks&suid={$IN['suid']}&bypass=1'>
-					   <frame name='searchbox' scrolling='no' src='{$SKIN->base_url}&act=rtempl&code=searchbox&suid={$IN['suid']}'>
+					   <frame name='links' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=searchlinks&set_id={$ibforums->input['set_id']}&bypass=1'>
+					   <frame name='searchbox' scrolling='no' src='{$ibforums->adskin->base_url}&act=rtempl&code=searchbox&set_id={$ibforums->input['set_id']}'>
 					 </frameset>
-					<frame name='preview' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=previewstate'>
+					<frame name='preview' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=previewstate'>
 				   </frameset>
 			   </html>";
 			   
 		exit();
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function compare_frames()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		print "<html>
 				 <head>
@@ -482,12 +482,12 @@ class ad_settings {
 				 </head>
 				   <frameset cols='50%, 50%' frameborder='yes' border='1' framespacing='0'>
 				     <frameset rows='30, *' frameborder='yes' border='1' framespacing='0'>
-				       <frame name='origtop' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=dotop&content=orig'>
-				       <frame name='origbot' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=preview&suid={$IN['suid']}&type=css'>
+				       <frame name='origtop' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=dotop&content=orig'>
+				       <frame name='origbot' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=preview&suid={$ibforums->input['suid']}&type=css'>
 				     </frameset>
 					<frameset rows='30, *' frameborder='yes' border='1' framespacing='0'>
-				       <frame name='newtop' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=dotop&content=new'>
-				       <frame name='newbot' scrolling='auto' src='{$SKIN->base_url}&act=rtempl&code=donew&suid={$IN['suid']}'>
+				       <frame name='newtop' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=dotop&content=new'>
+				       <frame name='newbot' scrolling='auto' src='{$ibforums->adskin->base_url}&act=rtempl&code=donew&suid={$ibforums->input['suid']}'>
 				     </frameset>
 				   </frameset>
 			   </html>";
@@ -495,13 +495,13 @@ class ad_settings {
 		exit();
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function print_compare_top()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$content = $IN['content'] == 'orig' ? 'Original Template' : 'Current Template';
+		$content = $ibforums->input['content'] == 'orig' ? 'Original Template' : 'Current Template';
 		
 		print "<html>
 			   <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#000055'>
@@ -511,27 +511,24 @@ class ad_settings {
 		exit();
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
 	function print_compare_new()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$DB->query("SELECT * FROM ibf_skin_templates WHERE suid='".$IN['suid']."'");
+		$template = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "suid=".intval($ibforums->input['suid']) ) );
 		
-		if ( ! $template = $DB->fetch_row() )
+		if ( ! $template['suid'] )
 		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
+			$ibforums->admin->error("You must specify an existing template set ID, go back and try again");
 		}
 		
-		$DB->query("SELECT css_id, img_dir FROM ibf_skins WHERE set_id='".$template['set_id']."'");
-		$r = $DB->fetch_row();
+		$skin = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$template['set_id'] ) );
 		
-		$DB->query("SELECT css_text FROM ibf_css WHERE cssid='".$r['css_id']."'");
+		$css = $skin['set_cache_css'];
 		
-		$css = $DB->fetch_row();
-		
-		$css_text = "\n<style>\n<!--\n".str_replace( "<#IMG_DIR#>", "style_images/".$r['img_dir'], $css['css_text'] )."\n//-->\n</style>";
+		$css_text = "\n<style>\n<!--\n".str_replace( "<#IMG_DIR#>", "style_images/".$r['set_image_dir'], $css )."\n//-->\n</style>";
 		
 		print "<html><head>
 				$css_text
@@ -540,7 +537,7 @@ class ad_settings {
 				<body>
 				<script language='Javascript'>
 				
-					templatedata = window.parent.opener.document.theform.template.value;
+					templatedata = window.parent.opener.document.theform.txt{$ibforums->input['suid']}.value;
 					
 					document.write( templatedata);
 					document.close();
@@ -554,64 +551,66 @@ class ad_settings {
 		
 	}
 	
-	//+---------------------------------------
+	//-----------------------------------------
 	
-	function macro_one()
+	function macro_one($msg="")
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , 'macro_two'   ),
-												  2 => array( 'act'   , 'rtempl'       ),
-												  3 => array( 'suid'  , $IN['suid']   )
-									     )      );
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'macro_two'   ),
+																 2 => array( 'act'   , 'rtempl'       ),
+																 3 => array( 'suid'  , $ibforums->input['suid']   )
+														)      );
 									     
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$SKIN->td_header[] = array( "&nbsp;"   , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
 
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$ADMIN->html .= $SKIN->start_table( "Macro Look-up" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Macro Look-up" );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enter the Macro to look up</b><br>(EG: {ibf.skin.tbl_width})",
-										          $SKIN->form_input( 'lookup' )
-										 )      );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Enter the Macro to look up</b><br>(EG: {ibf.skin.set_image_dir})",
+																 $ibforums->adskin->form_input( 'lookup', $ibforums->input['lookup'] )
+														)      );
 										 
-		$ADMIN->html .= $SKIN->end_form("Look-up");
+		$ibforums->html .= $ibforums->adskin->end_form("Look-up");
 										 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 		
 	}
 	
-	//+-------------------------------
+	//-----------------------------------------
 	
 	function macro_two()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		if ($IN['lookup'] == "")
+		if ($ibforums->input['lookup'] == "")
 		{
-			$ADMIN->error("You must enter a macro to look up", 1);
+			$ibforums->admin->error("You must enter a macro to look up", 1);
 		}
 		
 		$is_valid = 0;
 		$macro    = "";
 		$extra    = "";
 		
-		if ( preg_match( "/&lt;\{(\S+)\}&gt;/", $IN['lookup'], $match ) )
+		if ( preg_match( "/&lt;\{(\S+)\}&gt;/", $ibforums->input['lookup'], $match ) )
 		{
 			$is_valid = 1;
 			$macro    = $match[1];
 		}
 		
-		else if ( preg_match( "/{ibf\.(skin|lang|vars|member)\.(\w+)}$/", $IN['lookup'], $match ) )
+		else if ( preg_match( "/{?(?:ibf|ipb)\.(skin|lang|vars|member)(.+?)}?$/", $ibforums->input['lookup'], $match ) )
 		{
 			$is_valid = 1;
 			$macro    = $match[2];
 			$extra    = $match[1];
+			$macro    = str_replace( "&#39;", "'", $macro );
+			$macro    = preg_replace( "#[\[\]\"'\.]#", "", $macro );
 		}
 		else
 		{
@@ -620,45 +619,34 @@ class ad_settings {
 		
 		if ($is_valid != 1)
 		{
-			$ADMIN->error("The entered macro was in the wrong format, please try again", 1);
+			$this->macro_one("Wrong format");
 		}
 		
 		if ($extra != "")
 		{
 			if ($extra == 'member')
 			{
-				if (isset($MEMBER[$macro]))
+				if (isset($ibforums->member[$macro]))
 				{
-					if ($MEMBER[$macro] == "")
+					if ($ibforums->member[$macro] == "")
 					{
 						$answer = "";
 					}
 					else
 					{
-						$answer = $MEMBER[$macro];
+						$answer = $ibforums->member[$macro];
 					}
 				}
-				else if (isset($GROUP[$macro]))
-				{
-					if ($GROUP[$macro] == "")
-					{
-						$answer = "";
-					}
-					else
-					{
-						$answer = $GROUP[$macro]." (This is member group information)";
-					}
-				}
-					
 				$result = "Loaded Member Information";
 			}
 			else if ($extra == 'vars')
 			{
-			
+				//-----------------------------------------
 				// Filter out sensitive stuff
+				//-----------------------------------------
 				
-				$safe_INFO['board_name'] = $INFO['board_name'];
-				$safe_INFO['board_url']  = $INFO['board_url'];
+				$safe_INFO['board_name'] = $ibforums->vars['board_name'];
+				$safe_INFO['board_url']  = $ibforums->vars['board_url'];
 				
 				$answer = $safe_INFO[$macro];
 				
@@ -668,7 +656,8 @@ class ad_settings {
 			{
 				$result = "Language Text";
 				
-				$DB->query("SELECT group_name FROM ibf_skin_templates WHERE suid='{$IN['suid']}'");
+				$DB->simple_construct( array( 'select' => 'group_name', 'from' => 'skin_templates', 'where' => "suid='{$ibforums->input['suid']}'" ) );
+				$DB->simple_exec();
 				
 				if ( $r = $DB->fetch_row() )
 				{
@@ -685,21 +674,24 @@ class ad_settings {
 		}
 		else
 		{
+			//-----------------------------------------
 			// Is macro
+			//-----------------------------------------
 			
-			$DB->query("SELECT set_id FROM ibf_skin_templates WHERE suid='{$IN['suid']}'");
-			
+			$DB->simple_construct( array( 'select' => 'set_id', 'from' => 'skin_templates', 'where' => "suid='{$ibforums->input['suid']}'" ) );
+			$DB->simple_exec();
+				
 			$template = $DB->fetch_row();
 			
-			$DB->query("SELECT macro_id FROM ibf_skins WHERE set_id='".$template['set_id']."'");
-			
-			$macrod = $DB->fetch_row();
-			
-			$DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set='".$macrod['macro_id']."' AND macro_value='$macro'");
+			$DB->simple_construct( array( 'select' => 'macro_value, macro_replace',
+										  'from'   => 'skin_macro',
+										  'where'  => "macro_set IN( 1,{$template['set_id']}) AND macro_value='$macro'",
+										  'order'  => "macro_set DESC" ) );
+			$DB->simple_exec();
 			
 			if ($val = $DB->fetch_row())
 			{
-				$answer = $val['macro_replace'];
+				$answer = htmlentities($val['macro_replace']);
 				$result = "From Macro Set";
 			}
 			else
@@ -708,57 +700,71 @@ class ad_settings {
 			}
 		}
 		
-		$SKIN->td_header[] = array( "&nbsp;"   , "40%" );
-		$SKIN->td_header[] = array( "&nbsp;"    , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"    , "60%" );
 		
-		//+-------------------------------
+		//-----------------------------------------
 		
-		$ADMIN->html .= $SKIN->start_table( "Macro Look-up Result <a href='{$SKIN->base_url}&act=rtempl&code=macro_one&suid={$IN['suid']}'>Go Again</a>" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Macro Look-up Result <a href='{$ibforums->adskin->base_url}&act=rtempl&code=macro_one&suid={$ibforums->input['suid']}'>Go Again</a>" );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Entered Macro</b>", $IN['lookup'] ) );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Entered Macro</b>", $ibforums->input['lookup'] ) );
 										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Macro Type</b>", $result )      );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Macro Type</b>", $result )      );
 										 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Result</b><br>May be blank if no info", $answer )      );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Result</b><br>May be blank if no info", $answer )      );
 										 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 		
 		
 		
 	}
 	
-	//+-------------------------------
-	//+-------------------------------
+	/*-------------------------------------------------------------------------*/
+	// SHOW PREVIEW
+	/*-------------------------------------------------------------------------*/
 	
 	function do_preview()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_GET_VARS;
+		global $ibforums, $DB,  $std;
 		
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
 		
-		if ($IN['suid'] == "")
+		if ($ibforums->input['suid'] == "")
 		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
+			$ibforums->admin->error("You must specify an existing template set ID, go back and try again");
 		}
 		
-		$DB->query("SELECT * FROM ibf_skin_templates WHERE suid='".$IN['suid']."'");
+		//-----------------------------------------
+		// Get from DB
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "suid='".$ibforums->input['suid']."'" ) );
+		$DB->simple_exec();
 		
 		if ( ! $template = $DB->fetch_row() )
 		{
-			$ADMIN->error("You must specify an existing template set ID, go back and try again");
+			$ibforums->admin->error("You must specify an existing template set ID, go back and try again");
 		}
 		
-		$DB->query("SELECT macro_id FROM ibf_skins WHERE set_id='".$template['set_id']."'");
+		//-----------------------------------------
+		// Get skin set details
+		//-----------------------------------------
 		
-		$macrod = $DB->fetch_row();
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$template['set_id'] ) ); 
 		
-		$DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set='".$macrod['macro_id']."'");
+		$macros = unserialize(stripslashes($this_set['set_cache_macro']));
 		
-		while ( $mc = $DB->fetch_row() )
+		if ( is_array($macros) and count($macros) )
 		{
-			$macro_orig[] = "<{".$mc['macro_value']."}>";
-			$macro_repl[] = $mc['macro_replace'];
+			foreach( $macros as $id => $data )
+			{
+				$macro_orig[] = "<{".$mc['macro_value']."}>";
+				$macro_repl[] = $mc['macro_replace'];
+			}
 		}
 		
 		$table = "<table width='100%' bgcolor='black' cellpadding='4' style='font-family:verdana, arial;font-size:11px;color:white'>
@@ -766,13 +772,13 @@ class ad_settings {
 				   <td align='center' style='font-family:verdana, arial;font-size:11px;color:white'>Template Group: {$template['group_name']} : Template bit: {$template['func_name']}</td>
 				  </tr>
 				  <tr>
-				   <td align='center' style='font-family:verdana, arial;font-size:11px;color:white'>View as [ <a href='{$ADMIN->base_url}&act=rtempl&code=preview&suid={$IN['suid']}&type=text' style='font-family:verdana, arial;font-size:11px;color:white'>Text</a> | <a href='{$ADMIN->base_url}&act=rtempl&code=preview&suid={$IN['suid']}&type=html' style='font-family:verdana, arial;font-size:11px;color:white'>HTML</a> | <a href='{$ADMIN->base_url}&act=rtempl&code=preview&suid={$IN['suid']}&type=css' style='font-family:verdana, arial;font-size:11px;color:white'>HTML with CSS</a> ]</td>
+				   <td align='center' style='font-family:verdana, arial;font-size:11px;color:white'>View as [ <a href='{$ibforums->base_url}&act=rtempl&code=preview&suid={$ibforums->input['suid']}&type=text' style='font-family:verdana, arial;font-size:11px;color:white'>Text</a> | <a href='{$ibforums->base_url}&act=rtempl&code=preview&suid={$ibforums->input['suid']}&type=html' style='font-family:verdana, arial;font-size:11px;color:white'>HTML</a> | <a href='{$ibforums->base_url}&act=rtempl&code=preview&suid={$ibforums->input['suid']}&type=css' style='font-family:verdana, arial;font-size:11px;color:white'>HTML with CSS</a> ]</td>
 				  </tr>
 				  </table>
 				  <br><br>
 				  ";
 		
-		if ($IN['type'] == 'text')
+		if ($ibforums->input['type'] == 'text')
 		{
 			@header("Content-type: text/html");
 			print $table;
@@ -782,9 +788,9 @@ class ad_settings {
 			$html = str_replace( ">" , "&gt;"  , $html);
 			$html = str_replace( "\"", "&quot;", $html);
 			
-			if ($HTTP_GET_VARS['hl'] != "")
+			if ($_GET['hl'] != "")
 			{
-				$hl = urldecode(stripslashes($HTTP_GET_VARS['hl']));
+				$hl = str_replace( '{-22-}', '"', urldecode(stripslashes($_GET['hl'])) );
 				
 				$hl = str_replace( "<" , "&lt;"  , $hl);
 				$hl = str_replace( ">" , "&gt;"  , $hl);
@@ -805,7 +811,7 @@ class ad_settings {
 			exit();
 			
 		}
-		else if ($IN['type'] == 'html')
+		else if ($ibforums->input['type'] == 'html')
 		{
 			@header("Content-type: text/html");
 			print $table;
@@ -813,16 +819,11 @@ class ad_settings {
 			
 			exit();
 		}
-		else if($IN['type'] == 'css')
+		else if($ibforums->input['type'] == 'css')
 		{
-			$DB->query("SELECT css_id, img_dir FROM ibf_skins WHERE set_id='".$template['set_id']."'");
-			$r = $DB->fetch_row();
+			$css = $this_set['set_cache_css'];
 			
-			$DB->query("SELECT css_text FROM ibf_css WHERE cssid='".$r['css_id']."'");
-			
-			$css = $DB->fetch_row();
-			
-			$css_text = "\n<style>\n<!--\n".str_replace( "<#IMG_DIR#>", "style_images/".$r['img_dir'], $css['css_text'] )."\n//-->\n</style>";
+			$css_text = "\n<style>\n<!--\n".str_replace( "<#IMG_DIR#>", "style_images/".$r['img_dir'], $css)."\n//-->\n</style>";
 			
 			@header("Content-type: text/html");
 			print "<html><head><title>Preview</title>$css_text</head><body>$table \n";
@@ -837,7 +838,7 @@ class ad_settings {
 	}
 	
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	
 	
diff --git a/upload/sources/admin/ad_settings.php b/upload/sources/admin/ad_settings.php
new file mode 100644
index 00000000..cdb2fc95
--- /dev/null
+++ b/upload/sources/admin/ad_settings.php
@@ -0,0 +1,1887 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Setting functions
+|   > Module written by Matt Mecham
+|   > Date started: 20th March 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_settings {
+
+	var $base_url;
+	var $in_group = array();
+
+	function auto_run() 
+	{
+		global $ibforums, $DB,  $std, $forums, $HTTP_POST_VARS;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		
+		$DB->sql_get_version();
+		
+		$this->true_version  = $DB->true_version;
+		$this->mysql_version = $DB->mysql_version;
+
+		switch($ibforums->input['code'])
+		{
+			case 'settinggroup_resync':
+				$this->settinggroup_resync();
+				break;
+				
+			case 'settinggroup_delete':
+				$this->settinggroup_delete();
+				break;
+				
+			case 'settinggroup_new':
+				$this->settinggroup_form('add');
+				break;
+				
+			case 'settinggroup_showedit':
+				$this->settinggroup_form('edit');
+				break;
+				
+			case 'settinggroup_add':
+				$this->settinggroup_save('add');
+				break;
+				
+			case 'settinggroup_edit':
+				$this->settinggroup_save('edit');
+				break;
+				
+			case 'settingnew':
+				$this->setting_form('add');
+				break;
+				
+			case 'setting_showedit':
+				$this->setting_form('edit');
+				break;
+				
+			case 'setting_add':
+				$this->setting_save('add');
+				break;
+				
+			case 'setting_edit':
+				$this->setting_save('edit');
+				break;
+				
+			case 'setting_view':
+				$this->setting_view();
+				break;
+				
+			case 'setting_delete':
+				$this->setting_delete();
+				break;
+			
+			case 'setting_revert':
+				$this->setting_revert();
+				break;
+				
+			case 'setting_update':
+				$this->setting_update();
+				break;
+			
+			case 'setting_allexport':
+				$this->setting_allexport();
+				break;
+				
+			case 'findsetting':
+				$this->setting_findgroup();
+				break;
+				
+			case 'setting_someexport_start':
+				$this->setting_someexport_start();
+				break;
+				
+			case 'setting_someexport_complete':
+				$this->setting_someexport_complete();
+				break;
+			
+			case 'settings_do_import':
+				$this->settings_do_import();
+				break;
+				
+			//-----------------------------------------
+			// Full text
+			//-----------------------------------------
+				
+			case 'dofulltext':
+				$this->do_fulltext();
+				break;
+				
+			case 'phpinfo':
+				phpinfo();
+				exit;
+			//-----------------------------------------
+			default:
+				$this->setting_start();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	//
+	// IMPORT PARTIAL SETTINGS
+	//
+	//-----------------------------------------
+	
+	function settings_do_import()
+	{
+		global $ibforums, $DB, $std;
+		
+		$updated     = 0;
+		$inserted    = 0;
+		$need_update = array();
+		
+		if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+		{
+			//-----------------------------------------
+			// check and load from server
+			//-----------------------------------------
+			
+			if ( ! $ibforums->input['file_location'] )
+			{
+				$ibforums->main_msg = "No upload file was found and no filename was specified.";
+				$this->import();
+			}
+			
+			if ( ! file_exists( ROOT_PATH . $ibforums->input['file_location'] ) )
+			{
+				$ibforums->main_msg = "Could not find the file to open at: " . ROOT_PATH . $ibforums->input['file_location'];
+				$this->import();
+			}
+			
+			if ( preg_match( "#\.gz$#", $ibforums->input['file_location'] ) )
+			{
+				if ( $FH = @gzopen( ROOT_PATH.$ibforums->input['file_location'], 'rb' ) )
+				{
+					while ( ! @gzeof( $FH ) )
+					{
+						$content .= @gzread( $FH, 1024 );
+					}
+					
+					@gzclose( $FH );
+				}
+			}
+			else
+			{
+				if ( $FH = @fopen( ROOT_PATH.$ibforums->input['file_location'], 'rb' ) )
+				{
+					$content = @fread( $FH, filesize(ROOT_PATH.$ibforums->input['lang_location']) );
+					@fclose( $FH );
+				}
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get uploaded schtuff
+			//-----------------------------------------
+			
+			$tmp_name = $_FILES['FILE_UPLOAD']['name'];
+			$tmp_name = preg_replace( "#\.gz$#", "", $tmp_name );
+			
+			$content  = $ibforums->admin->import_xml( $tmp_name );
+		}
+		
+		//-----------------------------------------
+		// Get current settings.
+		//-----------------------------------------
+		
+		$cur_settings = array();
+		
+		$DB->simple_construct( array( 'select' => 'conf_id, conf_key',
+									  'from'   => 'conf_settings',
+									  'order'  => 'conf_id' ) );
+		
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$cur_settings[ $r['conf_key'] ] = $r['conf_id'];
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		//-----------------------------------------
+		// pArse
+		//-----------------------------------------
+		
+		$fields = array( 'conf_title'   , 'conf_description', 'conf_group'    , 'conf_type'    , 'conf_key'        , 'conf_default',
+						 'conf_extra'   , 'conf_evalphp'    , 'conf_protected', 'conf_position', 'conf_start_group', 'conf_end_group',
+						 'conf_help_key', 'conf_add_cache' );
+		
+		foreach( $xml->xml_array['settingexport']['settinggroup']['setting'] as $id => $entry )
+		{
+			$newrow = array();
+			
+			//-----------------------------------------
+			// Make PHP slashes safe
+			//-----------------------------------------
+			
+			$entry['conf_evalphp']['VALUE'] = str_replace( '\\', '\\\\', $entry['conf_evalphp']['VALUE'] );
+			
+			foreach( $fields as $f )
+			{
+				$newrow[$f] = $entry[ $f ]['VALUE'];
+			}
+			
+			if ( $cur_settings[ $entry['conf_key']['VALUE'] ] )
+			{
+				//-----------------------------------------
+				// Update
+				//-----------------------------------------
+				
+				$DB->do_update( 'conf_settings', $newrow, 'conf_id='.$cur_settings[ $entry['conf_key']['VALUE'] ] );
+				$updated++;
+			}
+			else
+			{
+				//-----------------------------------------
+				// INSERT
+				//-----------------------------------------
+				
+				$DB->do_insert( 'conf_settings', $newrow );
+				$inserted++;
+			}
+			
+			$need_update[ $entry['conf_group']['VALUE'] ] = $entry['conf_group']['VALUE'];
+		}
+		
+		//-----------------------------------------
+		// Update group counts...
+		//-----------------------------------------
+		
+		if ( count( $need_update ) )
+		{
+			foreach( $need_update as $id )
+			{
+				$conf = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'conf_settings', 'where' => 'conf_group='.$id ) );
+			
+				$count = intval($conf['count']);
+				
+				$DB->do_update( 'conf_settings_titles', array( 'conf_title_count' => $count ), 'conf_title_id='.$id );
+			}
+		}
+		
+		//-----------------------------------------
+		// Resync
+		//-----------------------------------------
+		
+		$this->setting_rebuildcache();
+		
+		$ibforums->main_msg = "$updated settings updated $inserted settings inserted";
+		
+		$this->setting_start();
+	}
+	
+	//-----------------------------------------
+	//
+	// EXPORT Some Settings. DO IT NOW YES
+	//
+	//-----------------------------------------
+	
+	function setting_someexport_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ids = array();
+		
+		//-----------------------------------------
+		// get ids...
+		//-----------------------------------------
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^id_(\d+)$/", $key, $match ) )
+			{
+				if ($ibforums->input[$match[0]])
+				{
+					$ids[] = $match[1];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Got any?
+		//-----------------------------------------
+		
+		if ( ! count( $ids ) )
+		{
+			$ibforums->main_msg = "You must select SOME settings to export!";
+			$this->setting_someexport_start();
+		}
+		
+		//-----------------------------------------
+		// Get XML class
+		//-----------------------------------------
+		
+		require_once( KERNEL_PATH.'class_xml.php' );
+		
+		$xml = new class_xml();
+		
+		$xml->xml_set_root( 'settingexport', array( 'exported' => time() ) );
+		
+		//-----------------------------------------
+		// Get groups
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'settinggroup' );
+		
+		$this->setting_get_groups();
+		
+		$entry = array();
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'conf_settings',
+									  'where'  => "conf_id IN (".implode(",",$ids).")",
+									  'order'  => 'conf_position, conf_title' ) );
+		
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$content = array();
+			
+			$r['conf_value'] = '';
+			
+			foreach( $r as $k => $v )
+			{
+				$content[] = $xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[] = $xml->xml_build_entry( 'setting', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'settinggroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		$doc = $xml->xml_document;
+		
+		//-----------------------------------------
+		// Print to browser
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $doc, 'ipb_settings_partial.xml', '', 0 );
+	}
+	
+	//-----------------------------------------
+	//
+	// EXPORT Some Settings. Co-co-ca-choo
+	//
+	//-----------------------------------------
+	
+	function setting_someexport_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_title  = "Export Selected System Settings";
+		$ibforums->admin->page_detail = "Check the box of the setting you wish to export.";
+		
+		//-----------------------------------------
+		// start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'setting_someexport_complete' ),
+															     2 => array( 'act'   , 'op'      ),
+													    )      );
+													    
+		$ibforums->html .= "<div class='tableborder'>
+							 <div class='maintitle'>System Settings</div>
+							 <table width='100%' cellspacing='1' cellpadding='4' border='0'>";
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'order' => 'conf_id' ) );
+		$DB->simple_exec();
+		
+		$per_row  = 3;
+		$td_width = 100 / $per_row;
+		$count    = 0;
+		$output   = "<tr align='center'>\n";
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$count++;
+			
+			$class = $count == 2 ? 'tdrow2' : 'tdrow1';
+			
+			$output .= "<td width='{$td_width}%' align='left' class='$class'>
+						 <input type='checkbox' style='checkbox' value='1' name='id_{$r['conf_id']}' /> <strong>{$r['conf_key']}</strong> - {$r['conf_id']}
+						</td>";
+			
+			if ($count == $per_row )
+			{
+				$output .= "</tr>\n\n<tr align='center'>";
+				$count   = 0;
+			}
+		}
+		
+		if ( $count > 0 and $count != $per_row )
+		{
+			for ($i = $count ; $i < $per_row ; ++$i)
+			{
+				$output .= "<td class='tdrow2'>&nbsp;</td>\n";
+			}
+			
+			$output .= "</tr>";
+		}
+		
+		
+		$ibforums->html .= $output;
+		
+		$ibforums->html .= "</table>
+						    <div class='pformstrip' align='center'><input type='submit' class='realbutton' value='EXPORT SELECTED' /></form></div></div>";
+		
+		$ibforums->admin->output();
+		
+	}
+		
+	//-----------------------------------------
+	//
+	// Find setting group (don't rely on IDs)
+	//
+	//-----------------------------------------
+	
+	function setting_findgroup()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['key'] )
+		{
+			$this->setting_start();
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings_titles' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( strtolower( str_replace( " ", "", trim($r['conf_title_title']) ) ) == urldecode(trim($ibforums->input['key'])) )
+			{
+				$std->boink_it( $ibforums->base_url.'&act=op&code=setting_view&conf_group='.$r['conf_title_id'] );
+				break;
+			}
+		}
+		
+		$this->setting_start();
+	}
+	
+	//-----------------------------------------
+	//
+	// Export all to to XML (DEV ONLY)
+	//
+	//-----------------------------------------
+	
+	function setting_allexport()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! IN_DEV )
+		{
+			$this->setting_start();
+		}
+		
+		//-----------------------------------------
+		// Get XML class
+		//-----------------------------------------
+		
+		require_once( KERNEL_PATH.'class_xml.php' );
+		
+		$xml = new class_xml();
+		
+		$xml->xml_set_root( 'settingexport', array( 'exported' => time() ) );
+		
+		//-----------------------------------------
+		// Get groups
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'settinggroup' );
+		
+		$this->setting_get_groups();
+		
+		$entry = array();
+		
+		foreach( $this->setting_groups as $i => $r )
+		{
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'conf_settings',
+										  'where'  => "conf_group='{$r['conf_title_id']}'",
+										  'order'  => 'conf_position, conf_title' ) );
+			
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$content = array();
+				
+				$r['conf_value'] = '';
+				
+				foreach( $r as $k => $v )
+				{
+					$content[] = $xml->xml_build_simple_tag( $k, $v );
+				}
+				
+				$entry[] = $xml->xml_build_entry( 'setting', $content );
+			}
+		}
+		
+		$xml->xml_add_entry_to_group( 'settinggroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		$doc = $xml->xml_document;
+		
+		//-----------------------------------------
+		// Print to browser
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $doc, 'ipb_settings.xml', '', 0 );
+	}
+	
+	//-----------------------------------------
+	//
+	// Delete setting group
+	//
+	//-----------------------------------------
+	
+	function settinggroup_delete()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $ibforums->input['id'] )
+		{
+			$conf = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'conf_settings', 'where' => 'conf_group='.$ibforums->input['id'] ) );
+		
+			$count = intval($conf['count']);
+			
+			if ( $count > 0 )
+			{
+				$ibforums->main_msg = "Cannot remove this setting group as it still contains active settings";
+			}
+			else
+			{
+				$DB->simple_exec_query( array( 'delete' => 'conf_settings_titles', 'where' => 'conf_title_id='.$ibforums->input['id'] ) );
+				
+				$ibforums->main_msg = "Setting Group Removed";
+			}
+				
+		}
+		
+		$this->setting_start();
+	}
+	
+	//-----------------------------------------
+	//
+	// Recount settings
+	//
+	//-----------------------------------------
+	
+	function settinggroup_resync()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $ibforums->input['id'] )
+		{
+			$conf = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'conf_settings', 'where' => 'conf_group='.$ibforums->input['id'] ) );
+		
+			$count = intval($conf['count']);
+			
+			$DB->do_update( 'conf_settings_titles', array( 'conf_title_count' => $count ), 'conf_title_id='.$ibforums->input['id'] );
+		}
+		
+		$this->setting_start();
+	}
+	
+	//-----------------------------------------
+	//
+	// New setting group form
+	//
+	//-----------------------------------------
+	
+	function settinggroup_form( $type='add' )
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_title  = "System Configuration Settings";
+		$ibforums->admin->page_detail = "This section contains all the configuration options for your IPB.";
+		
+		if ( $type == 'add' )
+		{
+			$formcode = 'settinggroup_add';
+			$title    = "Create New Board Setting Group";
+			$button   = "Create New Setting Group";
+		}
+		else
+		{
+			$conf = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings_titles', 'where' => 'conf_title_id='.$ibforums->input['id'] ) );
+			
+			if ( ! $conf['conf_title_id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again.";
+				$this->setting_start();	
+			}
+			
+			$formcode = 'settinggroup_edit';
+			$title    = "Edit Setting ".$conf['conf_title'];
+			$button   = "Save Changes";
+		}
+		
+		$ibforums->admin->page_detail = '&nbsp;';
+		$ibforums->admin->page_title  = $title;
+		
+		//-----------------------------------------
+		// start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $formcode ),
+															     2 => array( 'act'   , 'op'      ),
+															     3 => array( 'id'    , $ibforums->input['id'] ),
+													    )      );
+													  
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		//-----------------------------------------
+		// um..
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $title );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Group title?</b>" ,
+												  			     $ibforums->adskin->form_input( 'conf_title_title', $_POST['conf_title_title'] ? $_POST['conf_title_title'] : $conf['conf_title_title'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Group Description?</b>" ,
+												  			     $ibforums->adskin->form_textarea( 'conf_title_desc', $_POST['conf_title_desc'] ? $_POST['conf_title_desc'] : $conf['conf_title_desc'] )
+										 		    	)      );
+		
+		//-----------------------------------------
+		// er....
+		//-----------------------------------------
+		
+		if ( IN_DEV )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Group Keyword?</b><div class='graytext'>Used to pull this from the DB without relying on an ID</div>" ,
+												  			         $ibforums->adskin->form_input( 'conf_title_keyword', $_POST['conf_title_keyword'] ? $_POST['conf_title_keyword'] : $conf['conf_title_keyword'] )
+										 		    	    )      );
+										 		    	    
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Hide from main settings list?</b>" ,
+												  			         $ibforums->adskin->form_yes_no( 'conf_title_noshow', $_POST['conf_title_noshow'] ? $_POST['conf_title_noshow'] : $conf['conf_title_noshow'] )
+										 		    	    )      );
+		}
+										 		    	
+		
+		$ibforums->html .= $ibforums->adskin->end_form( $button );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// Settings Group Save Form
+	//-----------------------------------------
+	
+	function settinggroup_save($type='add')
+	{
+		global $ibforums, $DB, $std;
+	
+		if ( $type == 'edit' )
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again";
+				$this->setting_form();
+			}
+		}
+		
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		$array = array( 'conf_title_title'   => $ibforums->input['conf_title_title'],
+						'conf_title_desc'    => $std->txt_safeslashes( $_POST['conf_title_desc'] ),
+						'conf_title_keyword' => $std->txt_safeslashes( $_POST['conf_title_keyword'] ),
+						'conf_title_noshow'  => $ibforums->input['conf_title_noshow'],
+					 );
+						
+						
+		if ( $type == 'add' )
+		{
+			$DB->do_insert( 'conf_settings_titles', $array );
+			$ibforums->main_msg = 'New Setting Group Added';
+		}
+		else
+		{
+			$DB->do_update( 'conf_settings_titles', $array, 'conf_title_id='.$ibforums->input['id'] );
+			$ibforums->main_msg = 'Setting Group Edited';
+		}
+		
+		$this->setting_rebuildcache();
+		
+		$this->setting_start();
+	
+	}
+	
+	//-----------------------------------------
+	//
+	// New setting form
+	//
+	//-----------------------------------------
+	
+	function setting_form( $type='add' )
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_title  = "System Configuration Settings";
+		$ibforums->admin->page_detail = "This section contains all the configuration options for your IPB.";
+		
+		if ( $type == 'add' )
+		{
+			$formcode = 'setting_add';
+			$title    = "Create New Board Setting";
+			$button   = "Create New Setting";
+			$conf     = array( 'conf_group' => $ibforums->input['conf_group'], 'conf_add_cache' => 1 );
+			
+			if ( IN_DEV )
+			{
+				$conf['conf_protected'] = 1;
+			}
+			
+			if ( $ibforums->input['conf_group'] )
+			{
+				$max = $DB->simple_exec_query( array( 'select' => 'max(conf_position) as max', 'from' => 'conf_settings', 'where' => 'conf_group='.$ibforums->input['conf_group'] ) );
+			}
+			else
+			{
+				$max = $DB->simple_exec_query( array( 'select' => 'max(conf_position) as max', 'from' => 'conf_settings' ) );
+			}
+			
+			$conf['conf_position'] = $max['max'] + 1;
+		}
+		else
+		{
+			$conf = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_id='.$ibforums->input['id'] ) );
+			
+			if ( ! $conf['conf_id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again.";
+				$this->setting_start();	
+			}
+			
+			$formcode = 'setting_edit';
+			$title    = "Edit Setting ".$conf['conf_title'];
+			$button   = "Save Changes";
+		}
+		
+		$ibforums->admin->page_detail = '&nbsp;';
+		$ibforums->admin->page_title  = $title;
+		
+		//-----------------------------------------
+		// Get groups
+		//-----------------------------------------
+		
+		$this->setting_get_groups();
+		
+		$groups = array();
+		
+		foreach( $this->setting_groups as $i => $r )
+		{
+			$groups[] = array( $r['conf_title_id'], $r['conf_title_title'] );
+		}
+		
+		//-----------------------------------------
+		// Type
+		//-----------------------------------------
+		
+		$types = array( 0 => array( 'input'   , 'Text Input' ),
+						1 => array( 'dropdown', 'Drop Down'  ),
+						2 => array( 'yes_no'  , 'Yes/No Radio Buttons'),
+						3 => array( 'textarea', 'Textarea'   ),
+						4 => array( 'multi'   , 'Multi Select' ),
+					 );
+		
+		//-----------------------------------------
+		// start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $formcode ),
+																 2 => array( 'act'   , 'op'      ),
+																 3 => array( 'id' , $ibforums->input['id'] ),
+														)      );
+													  
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "{none}"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "60%" );
+		
+		//-----------------------------------------
+		// um..
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $title );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting title?</b>" ,
+												  			   $ibforums->adskin->form_input( 'conf_title', $_POST['conf_title'] ? $_POST['conf_title'] : $conf['conf_title'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Position?</b>" ,
+												  			   $ibforums->adskin->form_input( 'conf_position', $_POST['conf_position'] ? $_POST['conf_position'] : $conf['conf_position'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Description?</b>" ,
+												  			   $ibforums->adskin->form_textarea( 'conf_description', $_POST['conf_description'] ? $_POST['conf_description'] : $conf['conf_description'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Group?</b>" ,
+												  			   $ibforums->adskin->form_dropdown( 'conf_group', $groups, $_POST['conf_group'] ? $_POST['conf_group'] : $conf['conf_group'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Type?</b>" ,
+												  			   $ibforums->adskin->form_dropdown( 'conf_type', $types, $_POST['conf_type'] ? $_POST['conf_type'] : $conf['conf_type'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Key?</b>" ,
+												  			   $ibforums->adskin->form_input( 'conf_key', $_POST['conf_key'] ? $_POST['conf_key'] : $conf['conf_key'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Current Value?</b>" ,
+												  			   $ibforums->adskin->form_textarea( 'conf_value', $_POST['conf_value'] ? $_POST['conf_value'] : $conf['conf_value'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Default Value?</b>" ,
+												  			   $ibforums->adskin->form_textarea( 'conf_default', $_POST['conf_default'] ? $_POST['conf_default'] : $conf['conf_default'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Setting Extra?</b><div style='color:gray'>Use for creating form element extras.<br />Drop down box use: Key=Value; one per line.</div>" ,
+												  			   $ibforums->adskin->form_textarea( 'conf_extra', $_POST['conf_extra'] ? $_POST['conf_extra'] : $conf['conf_extra'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Raw PHP code to eval before showing and saving?</b><div style='color:gray'>\$show = 1; is set when showing setting.<br />\$save = 1; is set when saving the setting.<br />Use \$key and \$value when writing PHP code.</div>" ,
+												  			   $ibforums->adskin->form_textarea( 'conf_evalphp', $_POST['conf_evalphp'] ? $_POST['conf_evalphp'] : $conf['conf_evalphp'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Start setting group?</b><div style='color:gray'>Enter title here or leave blank to not start a setting group</div>" ,
+												  			   $ibforums->adskin->form_input( 'conf_start_group', $_POST['conf_start_group'] ? $_POST['conf_start_group'] : $conf['conf_start_group'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>End setting group?</b><div style='color:gray'>End an opened setting group</div>" ,
+												  			   $ibforums->adskin->form_yes_no( 'conf_end_group', $_POST['conf_end_group'] ? $_POST['conf_end_group'] : $conf['conf_end_group'] )
+										 		    	)      );
+										 		    	
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Optional Help Key</b><div style='color:gray'>'Key' which links to the ACP help system</div>" ,
+												  			   $ibforums->adskin->form_input( 'conf_help_key', $_POST['conf_help_key'] ? $_POST['conf_help_key'] : $conf['conf_help_key'] )
+										 		    	)      );
+										 		    	
+		if ( IN_DEV )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Make a default settings (cannot be removed by user)?</b>" ,
+												  			       $ibforums->adskin->form_yes_no( 'conf_protected', $_POST['conf_protected'] ? $_POST['conf_protected'] : $conf['conf_protected'] )
+										 		    	  )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Add this option into the settings cache?</b>" ,
+																  $ibforums->adskin->form_yes_no( 'conf_add_cache', $_POST['conf_add_cache'] ? $_POST['conf_add_cache'] : $conf['conf_add_cache'] )
+														 )      );
+	   
+		$ibforums->html .= $ibforums->adskin->end_form( $button );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// Settings View
+	//-----------------------------------------
+	
+	function setting_view()
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		$ibforums->admin->page_title  = "System Configuration Settings";
+		$ibforums->admin->page_detail = "This section contains all the configuration options for your IPB.<br />If you wish to leave an entry blank, please use the keyword: <b>{blank}</b> or enter a zero: <b>0</b>.";
+		
+		$ibforums->admin->nav[] = array( 'act=op', "View General Settings</a>" );
+		
+		$ibforums->input['search'] = trim(urldecode($ibforums->input['search']));
+		
+		if ( ! $ibforums->input['conf_group'] and ! $ibforums->input['search'] )
+		{
+			$ibforums->main_msg = "No group was passed, please try again.";
+			$this->setting_start();
+		}
+		
+		$this->setting_get_groups();
+		
+		//-----------------------------------------
+		// start form
+		//-----------------------------------------
+	
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'       , 'setting_update'               ),
+																 2 => array( 'act'        , 'op'                           ),
+																 3 => array( 'id'         , $ibforums->input['conf_group'] ),
+																 4 => array( 'search'     , $ibforums->input['search']     ),
+														)      );
+		
+		//-----------------------------------------
+		// Get settings in group
+		//-----------------------------------------
+		
+		$start = intval( $ibforums->input['st'] );
+		$end   = 50;
+		
+		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $this->setting_groups[$ibforums->input['conf_group']]['conf_title_count'],
+											   'PER_PAGE'    => $end,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "",
+											   'L_MULTI'     => $un_all."Multi Page",
+											   'BASE_URL'    => $ibforums->adskin->base_url."&act=op&code=setting_view&search={$ibforums->input['search']}",
+											   'search'      => $ibforums->input['search'],
+											 )
+									  );
+		
+		$conf_titles  = array();
+		$in_group     = array();
+		$last_conf_id = -1;
+		
+		//-----------------------------------------
+		// Did we search?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['search'] )
+		{
+			$keywords = strtolower($ibforums->input['search']);
+			
+			$DB->cache_add_query( 'settings_search', array( 'keywords' => $keywords, 'limit_a' => $start, 'limit_b' => $end ) );
+    		$DB->cache_exec_query();
+    	
+			while ( $r = $DB->fetch_row() )
+			{
+				$r['conf_start_group']       = "";
+				$r['conf_end_group']         = "";
+				$conf_entry[ $r['conf_id'] ] = $r;
+			}
+			
+			if ( ! count( $conf_entry ) )
+			{
+				$ibforums->main_msg = "Your search for '$keywords' produced no matches.";
+				$this->setting_start();
+			}
+			
+			$title = "Searched for: ".$keywords;
+		}
+		
+		//-----------------------------------------
+		// Or not...
+		//-----------------------------------------
+		
+		else
+		{
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'conf_settings',
+										  'where'  => "conf_group='{$ibforums->input['conf_group']}'",
+										  'order'  => 'conf_position, conf_title',
+										  'limit'  => array( $start,$end ) ) );
+			
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$conf_entry[ $r['conf_id'] ] = $r;
+				
+				if ( $r['conf_end_group'] )
+				{
+					$in_g = 0;
+				}
+				
+				if ( $in_g )
+				{
+					$this->in_group[] = $r['conf_id'];
+				}
+				
+				if ( $r['conf_start_group'] )
+				{
+					$in_g = 1;
+				}
+			}
+			
+			$title = "Settings for group: {$this->setting_groups[$ibforums->input['conf_group']]['conf_title_title']}";
+		}
+		
+		$key_array = array();
+		
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->html .=  "<div class='tableborder'>
+							   <div class='maintitle'>
+							   <table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							   <tr>
+								<td align='left' width='70%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;'>$title</td>
+								<td align='right' nowrap='nowrap' width='30%'>";
+								
+		if ( ! $ibforums->input['search'] )
+		{
+			$ibforums->html .=  $ibforums->adskin->js_make_button("Add New Setting"  , $ibforums->base_url."&act=op&code=settingnew&conf_group=".$ibforums->input['conf_group']).'&nbsp;';
+			$ibforums->html .=  "<input type='submit' name='reorder' value='Reorder' class='realdarkbutton' />";
+		}
+		
+		$ibforums->html .= "&nbsp;&nbsp;</td>
+						   </tr>
+						   </table>
+						   </div>
+						   ";
+		
+		if ( is_array( $conf_entry ) and count( $conf_entry ) )
+		{
+			foreach( $conf_entry as $id => $r )
+			{
+				$ibforums->html .= $this->_setting_process_entry( $r );
+			}
+		}
+		
+		$ibforums->html .= "<input type='hidden' name='settings_save' value='".implode(",",$this->key_array)."' />";
+		
+		$ibforums->html .= "<div class='pformstrip' align='center'><input type='submit' value='Update Settings' class='realdarkbutton' /></div></div></form>";
+		
+		$ibforums->html .= "<br /><br /><div align='right'><b><em>Settings Quick Jump</em></b>".$this->setting_make_dropdown()."</div>";
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// Settings show - core routine...
+	//-----------------------------------------
+	
+	function _setting_process_entry($r)
+	{
+		global $ibforums, $DB, $std, $forums;
+		
+		$form_element  = "";
+		$dropdown      = array();
+		$start         = "";
+		$end           = "";
+		$revert_button = "";
+		$tdrow1        = "tdrow1";
+		$tdrow2        = "tdrow2";
+			
+		$key   = $r['conf_key'];
+		$value = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+		
+		$show  = 1;
+		
+		//-----------------------------------------
+		// Default?
+		//-----------------------------------------
+		
+		$css = "";
+		
+		if ( $r['conf_value'] != "" and ( $r['conf_value'] != $r['conf_default'] ) )
+		{
+			$tdrow1        = "tdrow1shaded";
+			$tdrow2        = "tdrow2shaded";
+			$revert_button = "<div style='width:auto;float:right;padding-top:2px;'><a href='{$ibforums->base_url}&act=op&code=setting_revert&id={$r['conf_id']}&conf_group={$r['conf_group']}&search={$ibforums->input['search']}' title='Revert to default value'><img src='{$ibforums->skin_url}/te_revert.gif' alt='X' border='0' /></a></div>";
+		}
+		
+		//-----------------------------------------
+		// Evil eval
+		//-----------------------------------------
+		
+		if ( $r['conf_evalphp'] )
+		{
+			$show = 1;
+			eval( $r['conf_evalphp'] );
+		}
+		
+		switch( $r['conf_type'] )
+		{
+			case 'input':
+				$form_element = $ibforums->adskin->form_input( $key, str_replace( "'", "&#39;", $value ), 30 );
+				break;
+			
+			case 'textarea':
+				$form_element = $ibforums->adskin->form_textarea( $key, $value, 45, 5 );
+				break;
+				
+			case 'yes_no':
+				$form_element = $ibforums->adskin->form_yes_no( $key, $value );
+				break;
+				
+			default:
+			
+				if ( $r['conf_extra'] )
+				{
+					if ( $r['conf_extra'] == '#show_forums#' )
+					{
+						//-----------------------------------------
+						// Require the library
+						// (Not a building with books)
+						//-----------------------------------------
+						
+						$forums->forums_init();
+						
+						require_once( ROOT_PATH.'sources/admin/admin_forum_functions.php' );
+						
+						$aff = new admin_forum_functions();
+						
+						$dropdown = $aff->ad_forums_forum_list(1);
+					}
+					else if ( $r['conf_extra'] == '#show_groups#' )
+					{
+						$DB->simple_construct( array( 'select' => 'g_id, g_title', 'from' => 'groups' ) );
+						$DB->simple_exec();
+						
+						while( $row = $DB->fetch_row() )
+						{
+							$dropdown[] = array( $row['g_id'], $row['g_title'] );
+						}
+					}
+					else if ( $r['conf_extra'] == '#show_skins#' )
+					{
+						$dropdown = $ibforums->admin->skin_get_skin_dropdown();
+					}
+					else
+					{
+						foreach( explode( "\n", $r['conf_extra'] ) as $l )
+						{
+							list ($k, $v) = explode( "=", $l );
+							if ( $k != "" and $v != "" )
+							{
+								$dropdown[] = array( trim($k), trim($v) );
+							}
+						}
+					}
+				}
+				
+				if ( $r['conf_type'] == 'dropdown' )
+				{
+					$form_element = $ibforums->adskin->form_dropdown( $key, $dropdown, $value );
+				}
+				else
+				{
+					$form_element = $ibforums->adskin->form_multiselect( $key, $dropdown, explode( ",", $value ), 5 );
+				}
+			
+				break;
+		}
+		
+		$delete  = "&#0124; <a href='{$ibforums->base_url}&act=op&code=setting_delete&id={$r['conf_id']}' title='key: {$r['conf_key']}'>Delete</a>";
+		$edit    = "<a href='{$ibforums->base_url}&act=op&code=setting_showedit&id={$r['conf_id']}' title='id: {$r['conf_id']}'>Edit</a>";
+		$reorder = 1;
+		
+		if ( $r['conf_protected'] and ! IN_DEV )
+		{
+			$delete  = "";
+			$edit    = "";
+			$reorder = 0;
+		}
+		
+		if ( $r['conf_start_group'] )
+		{
+			$start  = "<div style='background-color:#EEF2F7;padding:5px'>
+						<div class='tableborder'>
+						<div class='pformstrip'>{$r['conf_start_group']}</div>";
+		}
+		else
+		{
+			if ( ! in_array( $r['conf_id'], $this->in_group ) and ! $r['conf_end_group'] )
+			{
+				$start  = "<div style='background-color:#EEF2F7;padding:5px'>
+							<div style='border:1px solid #8394B2'>
+							";
+			}
+		}
+		
+		if ( $r['conf_end_group'] )
+		{
+			$end = "</div></div>";
+		}
+		else
+		{
+			if ( ! in_array( $r['conf_id'], $this->in_group ) and ! $r['conf_start_group'] )
+			{
+				$end  = "</div></div>";
+			}
+		}
+		
+		//-----------------------------------------
+		// Search hi-lite
+		//-----------------------------------------
+		
+		if ( $ibforums->input['search'] )
+		{
+			$r['conf_title']       = preg_replace( "/(".$ibforums->input['search'].")/i", "<span style='background:#FCFDD7'>\\1</span>", $r['conf_title'] );
+			$r['conf_description'] = preg_replace( "/(".$ibforums->input['search'].")/i", "<span style='background:#FCFDD7'>\\1</span>", $r['conf_description'] );
+		}
+		
+		$html .= "$start
+							<table cellpadding='5' cellspacing='0' border='0' width='100%'>
+							 <tr>
+							 <td width='40%' class='$tdrow1'><b>{$r['conf_title']}</b><div style='color:gray'>{$r['conf_description']}</div></td>
+							 <td width='45%' class='$tdrow2'>{$revert_button}<div align='left' style='width:auto;'>{$form_element}</div></td>
+							 ";
+		
+		if ( $edit or $delete )
+		{
+			$html .= "<td width='10%' class='$tdrow1' align='center'>
+								   {$edit}
+								   {$delete}
+								</td>";
+		}
+		
+		if ( ! $ibforums->input['search'] and $reorder )
+		{
+			$html .= "<td width='5%' class='$tdrow2' align='center'><input type='text' size='2' name='cp_{$r['conf_id']}' value='{$r['conf_position']}' class='realdarkbutton' /></td>";
+		}
+		
+		$html .= "</tr>
+				  </table>
+				  $end
+				 ";
+				 
+		$this->key_array[] = preg_replace( "/\[\]$/", "", $key );
+				 
+		return $html;
+	}
+	
+	//-----------------------------------------
+	// Settings Start
+	//-----------------------------------------
+	
+	function setting_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_title  = "System Configuration Settings";
+		$ibforums->admin->page_detail = "This section contains all the configuration options for your IPB.";
+		
+		//-----------------------------------------
+		// start table
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "{none}"  , "2%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "88%" );
+		$ibforums->adskin->td_header[] = array( "{none}"  , "10%" );
+		
+		$basic_title = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+						<tr>
+						 <td align='left' width='40%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;'>System Settings</td>
+						 <td align='right' width='60%'><form method='post' action='{$ibforums->base_url}&act=op&code=setting_view'><input type='text' size='25' onclick='this.value=\"\"' value='Search Settings...' name='search' class='realbutton' />&nbsp;<input type='submit' class='realdarkbutton' value='Go' /></form>"
+						 ."&nbsp;&nbsp;</td>
+						</tr>
+						</table>";
+							
+		$ibforums->html .= $ibforums->adskin->start_table($basic_title);
+		
+		//-----------------------------------------
+		// Get groups
+		//-----------------------------------------
+		
+		$this->setting_get_groups();
+		
+		foreach( $this->setting_groups as $i => $r )
+		{
+			if ( $r['conf_title_noshow'] )
+			{
+				$hidden = ' (Hidden)';
+			}
+			else
+			{
+				$hidden = '';
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<div align='center'><img src='{$ibforums->adskin->img_url}/settings_folder.gif' border='0' alt='Folder' /></div>",
+																   "<a href='{$ibforums->base_url}&act=op&code=setting_view&conf_group={$r['conf_title_id']}'><b>{$r['conf_title_title']}</b></a>$hidden <span style='color:gray'>(".intval($r['conf_title_count'])." settings)</span><div style='color:gray'>{$r['conf_title_desc']}</div>" ,
+												  				   array("<div align='center' style='white-space:nowrap'>
+												  				          <a href='{$ibforums->base_url}&act=op&code=settinggroup_showedit&id={$r['conf_title_id']}' title='Edit this setting groups details'><img src='{$ibforums->adskin->img_url}/acp_edit.gif' border='0' alt='Edit'  /></a>
+																          <a href='{$ibforums->base_url}&act=op&code=settinggroup_delete&id={$r['conf_title_id']}' title='Delete this setting group'><img src='{$ibforums->adskin->img_url}/acp_delete.gif' border='0' alt='Delete'  /></a>
+																          <a href='{$ibforums->base_url}&act=op&code=settinggroup_resync&id={$r['conf_title_id']}' title='Recount this setting groups options'><img src='{$ibforums->adskin->img_url}/acp_resync.gif' border='0' alt='Recount'  /></a>
+																          </div>", 1, 'tdrow3' )
+										 					  )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( array("<div align='center' style='white-space:nowrap'>".
+																	  $ibforums->adskin->js_make_button("Add Setting Group", $ibforums->base_url."&act=op&code=settinggroup_new")."</div>", 3, 'pformstrip' )
+										 					  )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		// Import partial settings?
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'          , 'settings_do_import'    ),
+																 2 => array( 'act'           , 'op'        ),
+																 3 => array( 'MAX_FILE_SIZE' , '10000000000' ),
+													 ) , "uploadform", " enctype='multipart/form-data'"      );
+									     
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "50%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "50%" );
+
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Import an XML settings file" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Upload XML settings file from your computer</b><div style='color:gray'>Duplicate entries will not be overwritten but the default setting and other options will be updated. The file must begin with 'ipb_' and end with either '.xml' or '.xml.gz'</div>" ,
+										  				         $ibforums->adskin->form_upload(  )
+								                        )      );
+								                        
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b><u>OR</u> enter the filename of the XML settings file</b><div style='color:gray'>The file must be uploaded into the forum's root folder</div>" ,
+										  				         $ibforums->adskin->form_input( 'file_location', 'ipb_settings_partial.xml'  )
+								                        )      );
+								                        
+		$ibforums->html .= $ibforums->adskin->end_form("Import XML settings Set");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Other & Dev options
+		//-----------------------------------------
+		
+		$ibforums->html .= "<br /><br/ ><div align='center'><a href='{$ibforums->base_url}&act=op&code=setting_someexport_start'>Export Selected Settings</a></div>";
+		
+		if ( IN_DEV )
+		{
+			$ibforums->html .= "<br /><div align='center'>Developer Options: <a href='{$ibforums->base_url}&act=op&code=setting_allexport'>Export all to XML</a></div>";
+		}
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// Settings Update
+	//-----------------------------------------
+	
+	function setting_update( $donothing="" )
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['id'] and ! $ibforums->input['search'] )
+		{
+			$ibforums->main_msg = "No ID was passed, please try again";
+			$this->setting_start();
+		}
+		
+		//-----------------------------------------
+		// Reorder?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['reorder'] )
+		{
+			foreach ($ibforums->input as $key => $value)
+			{
+				if ( preg_match( "/^cp_(\d+)$/", $key, $match ) )
+				{
+					if ( isset( $ibforums->input[$match[0]]) )
+					{
+						$DB->do_update( 'conf_settings', array( 'conf_position' => $ibforums->input[$match[0]] ), 'conf_id='.$match[1] ); 
+					}
+				}
+			}
+			
+			$ibforums->main_msg = "Settings reordered";
+			
+			$ibforums->input['conf_group'] = $ibforums->input['id'];
+			
+			$this->setting_view();
+		}
+		
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		$fields = explode(",", trim($ibforums->input['settings_save']) );
+		
+		if ( ! count($fields ) )
+		{
+			$ibforums->main_msg = "No fields were passed to be saved";
+			$ibforums->settings_view();
+		}
+		
+		//-----------------------------------------
+		// Get info from DB
+		//-----------------------------------------
+		
+		$db_fields = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => "conf_key IN ('".implode( "','", $fields )."')" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$db_fields[ $r['conf_key']  ] = $r;
+		}
+		
+		foreach( $db_fields as $key => $data )
+		{
+			if ( $data['conf_evalphp'] )
+			{
+				$save = 1;
+				eval( $data['conf_evalphp'] );
+			}
+				
+			if ( ($_POST[ $key ] != $data['conf_default']) )
+			{
+				$value = str_replace( "&#39;", "'", $std->txt_safeslashes($_POST[ $key ]) );
+				
+				$DB->do_update( 'conf_settings', array( 'conf_value' => $value ), 'conf_id='.$data['conf_id'] );
+			}
+			else if ( $ibforums->input[ $key ] != "" and ( $ibforums->input[ $key ] == $data['conf_default'] ) and $data['conf_value'] != '' )
+			{	
+				$DB->do_update( 'conf_settings', array( 'conf_value' => '' ), 'conf_id='.$data['conf_id'] );
+			}
+		}
+		
+		$ibforums->input['conf_group'] = $ibforums->input['id'];
+		
+		$ibforums->main_msg = "Settings updated";
+		
+		$this->setting_rebuildcache();
+		
+		if ( ! $donothing )
+		{
+			$this->setting_view();
+		}
+	}
+	
+	//-----------------------------------------
+	// Settings Save Form
+	//-----------------------------------------
+	
+	function setting_save($type='add')
+	{
+		global $ibforums, $DB, $std;
+	
+		if ( $type == 'edit' )
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = "No ID was passed, please try again";
+				$this->setting_form();
+			}
+		}
+		
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		$conf_group = $ibforums->input['conf_newgroup'] ? $ibforums->input['conf_newgroup'] : $ibforums->input['conf_group'];
+		
+		$array = array( 'conf_title'       => $ibforums->input['conf_title'],
+						'conf_description' => $std->txt_safeslashes( $_POST['conf_description'] ),
+						'conf_group'       => $ibforums->input['conf_group'],
+						'conf_type'        => $ibforums->input['conf_type'],
+						'conf_key'         => $ibforums->input['conf_key'],
+						'conf_value'       => $std->txt_safeslashes( $_POST['conf_value'] ),
+						'conf_default'     => $std->txt_safeslashes( $_POST['conf_default'] ),
+						'conf_extra'       => $std->txt_safeslashes( $_POST['conf_extra'] ),
+						'conf_evalphp'     => $std->txt_safeslashes( $_POST['conf_evalphp'] ),
+						'conf_protected'   => intval( $ibforums->input['conf_protected'] ),
+						'conf_position'    => intval( $ibforums->input['conf_position'] ),
+						'conf_start_group' => $ibforums->input['conf_start_group'],
+						'conf_end_group'   => $ibforums->input['conf_end_group'],
+						'conf_help_key'    => $ibforums->input['conf_help_key'],
+						'conf_add_cache'   => intval( $ibforums->input['conf_add_cache'] ),
+					 );
+						
+						
+		if ( $type == 'add' )
+		{
+			$DB->do_insert( 'conf_settings', $array );
+			$ibforums->main_msg = 'New Setting Added';
+			
+			$DB->simple_exec_query( array( 'update' => 'conf_settings_titles', 'set' => 'conf_title_count=conf_title_count+1', 'where' => 'conf_title_id='.$ibforums->input['conf_group'] ) );
+			
+		}
+		else
+		{
+			$DB->do_update( 'conf_settings', $array, 'conf_id='.$ibforums->input['id'] );
+			$ibforums->main_msg = 'Setting Edited';
+		}
+		
+		$this->setting_rebuildcache();
+		
+		$this->setting_view();
+	
+	}
+	
+	//-----------------------------------------
+	// Settings Revert
+	//-----------------------------------------
+	
+	function setting_revert()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->input['id'] = intval($ibforums->input['id']);
+		
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = "No ID was passed, please try again";
+			$this->setting_form();
+		}
+		
+		$conf = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_id='.$ibforums->input['id'] ) );
+		
+		//-----------------------------------------
+		// Revert...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'update' => 'conf_settings', 'set' => "conf_value=''", 'where' => 'conf_id='.$ibforums->input['id'] ) );
+		
+		$ibforums->main_msg = "Configuration setting reverted back to default.";
+		
+		$this->setting_rebuildcache();
+		
+		$this->setting_view();
+	
+	}
+	
+	//-----------------------------------------
+	// Settings Delete
+	//-----------------------------------------
+	
+	function setting_delete()
+	{
+		global $ibforums, $DB, $std;
+	
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = "No ID was passed, please try again";
+			$this->setting_form();
+		}
+		
+		$conf = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_id='.$ibforums->input['id'] ) );
+		
+		//-----------------------------------------
+		// Delete...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'conf_settings', 'where' => 'conf_id='.$ibforums->input['id'] ) );
+		
+		$DB->simple_exec_query( array( 'update' => 'conf_settings_titles', 'set' => 'conf_title_count=conf_title_count-1', 'where' => 'conf_title_id='.$conf['conf_group'] ) );
+		
+		$ibforums->main_msg = "Configuration Setting Deleted";
+		
+		$this->setting_rebuildcache();
+		
+		$ibforums->input['conf_group'] = $conf['conf_group'];
+		$this->setting_view();
+	
+	}
+	
+	
+	//-----------------------------------------
+	// BBCODE Rebuild Cache
+	//-----------------------------------------
+	
+	function setting_rebuildcache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['settings'] = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+		$info = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($info) )
+		{	
+			$value = $r['conf_value'] != "" ?  $r['conf_value'] : $r['conf_default'];
+			
+			if ( $value == '{blank}' )
+			{
+				$value = '';
+			}
+			
+			$ibforums->cache['settings'][ $r['conf_key'] ] = $value;
+		}
+		
+		$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	//-----------------------------------------
+	// Setting get cache
+	//-----------------------------------------
+	
+	function setting_get_groups()
+	{
+		global $ibforums, $DB, $std;
+		
+		$this->setting_groups = array();
+		
+		if ( IN_DEV )
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings_titles', 'order' => 'conf_title_title' ) );
+			$DB->simple_exec();
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings_titles', 'where' => 'conf_title_noshow=0', 'order' => 'conf_title_title' ) );
+			$DB->simple_exec();
+		}
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$this->setting_groups[ $r['conf_title_id'] ] = $r;
+		}
+	}
+	
+	//-----------------------------------------
+	// Make drop down of available titles
+	//-----------------------------------------
+	
+	function setting_make_dropdown()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! is_array( $this->setting_groups ) )
+		{
+			$this->setting_get_groups();
+		}
+		
+		$ret = "<form method='post' action='{$ibforums->base_url}&act=op&code=setting_view'>
+		        <select name='conf_group' class='dropdown'>";
+		
+		foreach( $this->setting_groups as $id => $data )
+		{
+			$ret .= ( $id == $ibforums->input['conf_group'] )
+				  ? "<option value='{$id}' selected='selected'>{$data['conf_title_title']}</option>"
+				  : "<option value='{$id}'>{$data['conf_title_title']}</option>";
+		}
+		
+		return $ret."\n</select><input type='submit' id='button' value='Go' /></form>";
+	}
+	
+	//-----------------------------------------
+	// Save full text options
+	//-----------------------------------------
+	
+	function do_fulltext()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		$ibforums->admin-> get_mysql_version();
+		
+		if ( $DB->sql_can_fulltext() )
+		{
+			// How many posts do we have?
+			
+			$DB->simple_construct( array( 'select' => 'COUNT(*) as cnt', 'from' => 'posts' ) );
+			$DB->simple_exec();
+			
+			$result = $DB->fetch_row();
+			
+			// If over 15,000 posts...
+			
+			if ( $result['cnt'] > 15000 )
+			{
+				// Explain how, why and what to do..
+				
+				$ibforums->admin->page_detail = "";
+				$ibforums->admin->page_title  = "Unable to continue";
+	
+				$ibforums->html .= $ibforums->adskin->add_td_basic( $this->return_sql_no_no_cant_do_it_sorry_text(), 'left', 'faker' );
+				
+				$ibforums->admin->output();
+			}
+			else
+			{
+				// Index away!
+				
+				$DB->sql_add_fulltext_index( 'topics', 'title' );
+				$DB->sql_add_fulltext_index( 'posts' , 'post' );
+			}
+		}
+		else
+		{
+			$ibforums->admin->error("Sorry, the version of MySQL that you are using is unable to use FULLTEXT searches");
+		}
+		
+		$ibforums->admin->save_log("Full Text Options Updated");
+		
+		$ibforums->admin->done_screen("Full Text Indexes Rebuilt", "Full Text Settings", "act=op&code=setting_view&conf_group=19", "redirect" );
+	}
+	
+	
+	
+	
+	//-----------------------------------------
+	//
+	// Save config. Does the hard work, so you don't have to.
+	//
+	//-----------------------------------------
+	
+	function save_config( $new )
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		$master = array();
+		
+		if ( is_array($new) )
+		{
+			if ( count($new) > 0 )
+			{
+				foreach( $new as $field )
+				{
+				
+					// Handle special..
+					
+					if ($field == 'img_ext' or $field == 'avatar_ext' or $field == 'photo_ext')
+					{
+						$HTTP_POST_VARS[ $field ] = preg_replace( "/[\.\s]/", "" , $HTTP_POST_VARS[ $field ] );
+						$HTTP_POST_VARS[ $field ] = str_replace('|', "&#124;", $HTTP_POST_VARS[ $field ]);
+						$HTTP_POST_VARS[ $field ] = preg_replace( "/,/"     , '|', $HTTP_POST_VARS[ $field ] );
+					}
+					else if ($field == 'coppa_address')
+					{
+						$HTTP_POST_VARS[ $field ] = nl2br( $HTTP_POST_VARS[ $field ] );
+					}
+					
+					if ( $field == 'gd_font' OR $field == 'html_dir' OR $field == 'upload_dir')
+					{
+						$HTTP_POST_VARS[ $field ] = preg_replace( "/'/", "&#39;", $HTTP_POST_VARS[ $field ] );
+					}
+					else
+					{
+						$HTTP_POST_VARS[ $field ] = preg_replace( "/'/", "&#39;", stripslashes($HTTP_POST_VARS[ $field ]) );
+					}
+					
+					$master[ $field ] = stripslashes($HTTP_POST_VARS[ $field ]);
+				}
+				
+				$ibforums->admin->rebuild_config($master);
+			}
+		}
+		
+		$ibforums->admin->save_log("Board Settings Updated, Back Up Written");
+		
+		$ibforums->admin->done_screen("Forum Configurations updated", "Administration CP Home", "act=index" );
+	}
+	
+	
+	
+	function return_sql_no_no_cant_do_it_sorry_text()
+	{
+return "
+<div style='line-height:150%'>
+<span id='large'>Unable to automatically create the FULLTEXT indexes</span>
+<br /><br />
+You have too many posts for an automatic FULLTEXT index creation. It is more than likely that PHP will
+time out before the indexes are complete which could cause some index corruption.
+<br />
+Creating FULLTEXT indexes is a relatively slow process but it's one that's worth doing as it will save you
+a lot of time and CPU power when your members search.
+<br />
+On average, a normal webserver is capable of indexing about 80,000 posts an hour but it is a relatively intense process. If you
+are using MySQL 4.0.12+ then this time is reduced substaintially.
+<br />
+<br />
+<strong style='color:red;font-size:14px'>How to manually create the indexes</strong>
+<br />
+If you have shell (SSH / Telnet) access to mysql, the process is very straightforward. If you do not have access to shell, then you will
+have to contact your webhost and ask them to do this for you.
+<br /><br />
+<strong>Step 1: Initiate mysql</strong>
+<br />
+In shell type:
+<br />
+<pre>mysql -u{your_sql_user_name} -p{your_sql_password}</pre>
+<br />
+Your MySQL username and password can be found in your conf_global.php file
+<br />
+<br />
+<strong>Step 2: Select your database</strong>
+<br />
+In mysql type:
+<br />
+<pre>use {your_database_name_here};</pre>
+<br />
+Make sure you use a trailing semi-colon. Your MySQL database name can be found in conf_global.php
+<br /><br />
+<strong>Step 3: Indexing the topics table</strong>
+<br />
+In mysql type:
+<br />
+<pre>\g alter table ibf_topics add fulltext(title);</pre>
+<br />
+If you are not using 'ibf_' as your table extension, adjust that query to suit. This query can take a while
+depending on the number of topics you have.
+<br />
+<br />
+<strong>Step 4: Indexing the posts table</strong>
+<br />
+In mysql type:
+<br />
+<pre>\g alter table ibf_posts add fulltext(post);</pre>
+<br />
+If you are not using 'ibf_' as your table extension, adjust that query to suit. This query can take a while
+depending on the number of posts you have. On average MySQL can index 80,000 posts an hour. If you are using MySQL 4, the time is greatly reduced.
+</div>
+";
+	}
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_skin_import.php b/upload/sources/admin/ad_skin_import.php
new file mode 100644
index 00000000..2a2c2ddc
--- /dev/null
+++ b/upload/sources/admin/ad_skin_import.php
@@ -0,0 +1,1266 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Import functions
+|   > Module written by Matt Mecham
+|   > Date started: 22nd April 2002
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_skin_import {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'export':
+				$this->do_export();
+				break;
+				
+			case 'exportimages':
+				$this->do_export_images();
+				break;
+				
+			case 'importtemplates':
+				$this->import_xml_templates();
+				break;
+			
+			case 'importimages':
+				$this->import_xml_images();
+				break;
+				
+			//-----------------------------------------
+			default:
+				$this->show_export_page();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// PERFORM IMPORT IMAGES
+	//-----------------------------------------
+	
+	function import_xml_images()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+		{
+			//-----------------------------------------
+			// check and load from server
+			//-----------------------------------------
+			
+			if ( ! $ibforums->input['skin_location'] )
+			{
+				$ibforums->main_msg = "No upload file was found and no filename was specified.";
+				$this->show_export_page();
+			}
+			
+			if ( ! file_exists( ROOT_PATH . $ibforums->input['skin_location'] ) )
+			{
+				$ibforums->main_msg = "Could not find the file to open at: " . ROOT_PATH . $ibforums->input['skin_location'];
+				$this->show_export_page();
+			}
+			
+			if ( preg_match( "#\.gz$#", $ibforums->input['skin_location'] ) )
+			{
+				if ( $FH = @gzopen( ROOT_PATH.$ibforums->input['skin_location'], 'rb' ) )
+				{
+					while ( ! @gzeof( $FH ) )
+					{
+						$content .= @gzread( $FH, 1024 );
+					}
+					
+					@gzclose( $FH );
+				}
+			}
+			else
+			{
+				if ( $FH = @fopen( ROOT_PATH.$ibforums->input['skin_location'], 'rb' ) )
+				{
+					$content = @fread( $FH, filesize(ROOT_PATH.$ibforums->input['skin_location']) );
+					@fclose( $FH );
+				}
+			}
+			
+			$tmp_name = str_replace( ".gz", '', $ibforums->input['skin_location'] );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get uploaded schtuff
+			//-----------------------------------------
+			
+			$tmp_name = $_FILES['FILE_UPLOAD']['name'];
+			$tmp_name = preg_replace( "#\.gz$#", "", $tmp_name );
+			
+			$content = $ibforums->admin->import_xml( $tmp_name );
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		require( KERNEL_PATH.'class_xmlarchive.php' );
+
+		$xmlarchive = new class_xmlarchive();
+		
+		$xmlarchive->xml_read_archive_data( $content );
+		
+		//-----------------------------------------
+		// Set up.. 
+		//-----------------------------------------
+		
+		$safename = $ibforums->input['skin_name'] ? $ibforums->input['skin_name'] : preg_replace( "#ipb_images-(.+?)\.xml#i", "\\1", $tmp_name );
+		$safename = substr( str_replace( " ", "", strtolower( preg_replace( "[^a-zA-Z0-9]", "", $safename ) ) ), 0, 10 );
+		$images   = array();
+		
+		foreach( $xmlarchive->file_array as $f )
+		{
+			if ( $f['content'] and $f['filename'] )
+			{
+				$images[ $f['filename'] ] = array( 'content' => $f['content'],
+												   'path'    => $f['path']
+												 );
+			}
+		}
+		
+		//-----------------------------------------
+		// Got owt?
+		//-----------------------------------------
+		
+		if ( ! count($images) )
+		{
+			$ibforums->main_msg = "There were no images to import from that XMLarchive.";
+			$this->show_export_page();
+		}
+		
+		//-----------------------------------------
+		// Reet- test to see if we
+		// can create dirs
+		//-----------------------------------------
+		
+		if ( ! is_writable( CACHE_PATH.'style_images' ) )
+		{
+			$ibforums->main_msg = 'We cannot create a new folder in the "style_images" folder - please check the CHMOD value of that folder and change to 0777 is required.';
+			$this->show_export_page();
+		}
+		
+		//-----------------------------------------
+		// Check to make sure we're not
+		// creating a DUPE!
+		//-----------------------------------------
+		
+		if ( file_exists( CACHE_PATH.'style_images/'.$safename ) )
+		{
+			$safename .= time();
+		}
+		
+		//-----------------------------------------
+		// Create
+		//-----------------------------------------
+		
+		if ( ! @mkdir( CACHE_PATH.'style_images/'.$safename, 0777 ) )
+		{
+			$ibforums->main_msg = "We are unable to create a directory in the 'style_images' folder.";
+			$this->show_export_page();
+		}
+		else
+		{
+			@chmod( CACHE_PATH.'style_images/'.$safename, 0777 );
+		}
+		
+		foreach( $images as $filename => $data )
+		{
+			//-----------------------------------------
+			// Do we have a duuuur?
+			//-----------------------------------------
+			
+			if ( $data['path'] )
+			{
+				if ( ! file_exists( CACHE_PATH.'style_images/'.$safename.'/'.$data['path'] ) )
+				{
+					@mkdir( CACHE_PATH.'style_images/'.$safename.'/'.$data['path'], 0777 );
+					@chmod( CACHE_PATH.'style_images/'.$safename.'/'.$data['path'], 0777 );
+				}
+				
+				$filename = $data['path'] . '/'. $filename;
+			}
+			
+			$content = $data['content'];
+			
+			if ( $content )
+			{
+				if ( $FH = @fopen( CACHE_PATH.'style_images/'.$safename.'/'.$filename, 'wb' ) )
+				{
+					if ( @fwrite( $FH, $content ) )
+					{
+						@fclose( $FH );
+					}
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// all done?
+		//-----------------------------------------
+		
+		$ibforums->main_msg = "Image set imported!";
+		$this->show_export_page();
+	}
+	
+	//-----------------------------------------
+	// PERFORM IMPORT TEMPLATES
+	//-----------------------------------------
+	
+	function import_xml_templates()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get default skin
+		//-----------------------------------------
+		
+		$default = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_default=1' ) );
+		
+		if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+		{
+			//-----------------------------------------
+			// check and load from server
+			//-----------------------------------------
+			
+			if ( ! $ibforums->input['skin_location'] )
+			{
+				$ibforums->main_msg = "No upload file was found and no filename was specified.";
+				$this->show_export_page();
+			}
+			
+			if ( ! file_exists( ROOT_PATH . $ibforums->input['skin_location'] ) )
+			{
+				$ibforums->main_msg = "Could not find the file to open at: " . ROOT_PATH . $ibforums->input['skin_location'];
+				$this->show_export_page();
+			}
+			
+			if ( preg_match( "#\.gz$#", $ibforums->input['skin_location'] ) )
+			{
+				if ( $FH = @gzopen( ROOT_PATH.$ibforums->input['skin_location'], 'rb' ) )
+				{
+					while ( ! @gzeof( $FH ) )
+					{
+						$content .= @gzread( $FH, 1024 );
+					}
+					
+					@gzclose( $FH );
+				}
+			}
+			else
+			{
+				if ( $FH = @fopen( ROOT_PATH.$ibforums->input['skin_location'], 'rb' ) )
+				{
+					$content = @fread( $FH, filesize(ROOT_PATH.$ibforums->input['skin_location']) );
+					@fclose( $FH );
+				}
+			}
+			
+			$tmp_name = str_replace( ".gz", '', $ibforums->input['skin_location'] );
+			
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get uploaded schtuff
+			//-----------------------------------------
+			
+			$tmp_name = $_FILES['FILE_UPLOAD']['name'];
+			$tmp_name = preg_replace( "#\.gz$#", "", $tmp_name );
+			
+			$content = $ibforums->admin->import_xml( $tmp_name );
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		require( KERNEL_PATH.'class_xmlarchive.php' );
+
+		$xmlarchive = new class_xmlarchive();
+		
+		$xmlarchive->xml_read_archive_data( $content );
+		
+		//-----------------------------------------
+		// Get the XML documents
+		//-----------------------------------------
+		
+		$import_xml = array();
+		
+		foreach( $xmlarchive->file_array as $f )
+		{
+			$import_xml[ $f['filename'] ] = $f['content'];
+		}
+		
+		//-----------------------------------------
+		// Import INFO
+		//-----------------------------------------
+		
+		if ( $import_xml[ 'ipb_info.xml' ] != '' )
+		{
+			$info_xml = $this->_extract_xml_info( $import_xml[ 'ipb_info.xml' ], $xml, $xmlarchive );
+		}
+		
+		if ( ! is_array( $info_xml ) and ! count( $info_xml ) )
+		{
+			$ibforums->main_msg = "The XMLarchive import doesn't appear to be valid - please check the file and try again.";
+			$this->show_export_page();
+		}
+		
+		//-----------------------------------------
+		// Import Templates
+		//-----------------------------------------
+		
+		if ( $import_xml[ 'ipb_templates.xml' ] != '' )
+		{
+			$templates_xml = $this->_extract_xml_templates( $import_xml[ 'ipb_templates.xml' ], $xml, $xmlarchive );
+		}
+		
+		//-----------------------------------------
+		// Import CSS
+		//-----------------------------------------
+		
+		if ( $import_xml[ 'ipb_css.xml' ] != '' )
+		{
+			$css_xml = $this->_extract_xml_css( $import_xml[ 'ipb_css.xml' ], $xml, $xmlarchive );
+		}
+
+		//-----------------------------------------
+		// Import Macro
+		//-----------------------------------------
+		
+		if ( $import_xml[ 'ipb_macro.xml' ] != '' )
+		{
+			$macro_xml = $this->_extract_xml_macros( $import_xml[ 'ipb_macro.xml' ], $xml, $xmlarchive );
+		}
+		
+		//-----------------------------------------
+		// Import WRAPPER
+		//-----------------------------------------
+		
+		if ( $import_xml[ 'ipb_wrapper.xml' ] != '' )
+		{
+			$wrapper_xml = $this->_extract_xml_wrapper( $import_xml[ 'ipb_wrapper.xml' ], $xml, $xmlarchive );
+		}
+		
+		//-----------------------------------------
+		// Add new skin!
+		//-----------------------------------------
+		
+		$DB->do_insert( 'skin_sets', array( 'set_name'            => $ibforums->input['skin_name'] ? $ibforums->input['skin_name'] : $info_xml['set_name'].' (Import)',
+											'set_hidden'          => 0,
+											'set_default'         => 0,
+											'set_css_method'      => $default['set_css_method'],
+											'set_skin_set_parent' => -1,
+											'set_author_email'    => $info_xml['set_author_email'],
+											'set_author_name'     => $info_xml['set_author_name'],
+											'set_author_url'      => $info_xml['set_author_url'],
+											'set_css'             => $css_xml,
+											'set_wrapper'         => $wrapper_xml,
+											'set_css_updated'     => time(),
+											'set_emoticon_folder' => $default['set_emoticon_folder'],
+											'set_image_dir'       => $default['set_image_dir']
+					 )                   );
+					 
+		$new_skin_id = $DB->get_insert_id();
+		
+		//-----------------------------------------
+		// Insert templates...
+		//-----------------------------------------
+		
+		if ( is_array( $templates_xml ) and count( $templates_xml ) )
+		{
+			foreach( $templates_xml as $t )
+			{
+				$DB->do_insert( 'skin_templates', array( 'set_id'          => $new_skin_id,
+													     'group_name'      => $t['group_name'],
+													     'section_content' => $t['section_content'],
+													     'func_name'       => $t['func_name'],
+													     'func_data'       => $t['func_data'],
+													     'updated'         => time(),
+													     'can_remove'      => 1,
+							  )                         );
+			}
+		}
+		
+		//-----------------------------------------
+		// Insert Macros
+		//-----------------------------------------
+		
+		if ( is_array( $macro_xml ) and count( $macro_xml ) )
+		{
+			foreach( $macro_xml as $t )
+			{
+				if ( ! $t['macro_value'] and ! $t['macro_replace'] )
+				{
+					continue;
+				}
+				
+				$DB->do_insert( 'skin_macro', array( 'macro_set'        => $new_skin_id,
+													 'macro_value'      => $t['macro_value'],
+													 'macro_replace'    => $t['macro_replace'],
+													 'macro_can_remove' => 1,
+							  )                    );
+			}
+		}
+		
+		//-----------------------------------------
+		// Rebuild caches
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_rebuild_all_caches( array($new_skin_id) );
+		
+		//-----------------------------------------
+		// DONE!
+		//-----------------------------------------
+		
+		$ibforums->main_msg = 'Skin Set Imported! (id: '.$new_skin_id.')';
+			
+		$ibforums->main_msg .= "<br />".implode( "<br />", $ibforums->cache_func->messages );
+		
+		$this->show_export_page();
+	}
+	
+	
+	//-----------------------------------------
+	// PERFORM EXPORT IMAGES THING YES!
+	//-----------------------------------------
+	
+	function do_export_images()
+	{
+		global $ibforums, $DB, $std;
+		
+		$skin_dir = $ibforums->input['skin_dirs'];
+		
+		if ( ! @file_exists( CACHE_PATH.'style_images/'.$skin_dir ) )
+		{
+			$ibforums->main_msg = "We cannot locate the selected image directory - please try another";
+			$this->show_export_page();
+		}
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		require( KERNEL_PATH.'class_xmlarchive.php' );
+
+		$xmlarchive = new class_xmlarchive();
+		
+		$xmlarchive->strip_path = CACHE_PATH.'style_images/'.$skin_dir;
+		
+		$xmlarchive->xml_add_directory( CACHE_PATH.'style_images/'.$skin_dir );
+		
+		$xmlarchive->xml_create_archive();
+
+		$contents = $xmlarchive->xml_get_contents();
+		
+		$ibforums->admin->show_download( $contents, 'ipb_images-'.$skin_dir.'.xml' );
+	}
+	
+	//-----------------------------------------
+	// PERFORM EXPORT!
+	//-----------------------------------------
+	
+	function do_export()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get current skin
+		//-----------------------------------------
+		
+		$skin = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.intval($ibforums->input['skin_id']) ) );
+		
+		$current  = $skin['set_skin_set_id'];
+		$parent   = $skin['set_skin_set_parent'];
+		
+		$safename = substr( str_replace( " ", "", strtolower( preg_replace( "[^a-zA-Z0-9]", "", $skin['set_name'] ) ) ), 0, 10 );
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		require( KERNEL_PATH.'class_xmlarchive.php' );
+
+		$xmlarchive = new class_xmlarchive();
+		
+		//-----------------------------------------
+		// Get data
+		//-----------------------------------------
+		
+		$templates_xml = $this->_export_get_templates( $skin, $xml, $parent );
+		$css_xml       = $this->_export_get_css(       $skin, $xml, $parent );
+		$macro_xml     = $this->_export_get_macro(     $skin, $xml, $parent );
+		$wrapper_xml   = $this->_export_get_wrapper(   $skin, $xml, $parent );
+		$info_xml      = $this->_export_get_info(      $skin, $xml, $parent );
+		
+		//header("Content-Type: text/plain");
+		//print $templates_xml."\n\n".$css_xml."\n\n".$macro_xml."\n\n".$wrapper_xml."\n\n".$info_xml;
+		//exit();
+		
+		//-----------------------------------------
+		// Format XMLarchive
+		//-----------------------------------------
+		
+		$xmlarchive->xml_add_file_contents( $info_xml     , 'ipb_info.xml');
+		$xmlarchive->xml_add_file_contents( $templates_xml, 'ipb_templates.xml');
+		$xmlarchive->xml_add_file_contents( $css_xml      , 'ipb_css.xml'      );
+		$xmlarchive->xml_add_file_contents( $macro_xml    , 'ipb_macro.xml'    );
+		$xmlarchive->xml_add_file_contents( $wrapper_xml  , 'ipb_wrapper.xml'  );
+		
+		$xmlarchive->xml_create_archive();
+		
+		$skin_xmlfile = $xmlarchive->xml_get_contents();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $skin_xmlfile, 'ipb_skin-'.$safename.'.xml' );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXTRACT MACROS
+	/*-------------------------------------------------------------------------*/
+	
+	function _extract_xml_macros( $content, $xml, $xmlarchive )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = array();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		if ( ! is_array( $xml->xml_array['macroexport']['macrogroup']['macro'][0] ) )
+		{
+			//-----------------------------------------
+			// Ensure [0] is populated
+			//-----------------------------------------
+			
+			$tmp = $xml->xml_array['macroexport']['macrogroup']['macro'];
+			
+			unset($xml->xml_array['macroexport']['macrogroup']['macro']);
+			
+			$xml->xml_array['macroexport']['macrogroup']['macro'][0] = $tmp;
+		}
+		
+		if ( is_array( $xml->xml_array['macroexport']['macrogroup']['macro'] ) and count( $xml->xml_array['macroexport']['macrogroup']['macro']  ) )
+		{
+			foreach( $xml->xml_array['macroexport']['macrogroup']['macro'] as $idx => $entry )
+			{
+				$return[] = array( 'macro_value'   => $entry['macro_value']['VALUE'],
+								   'macro_replace' => $entry['macro_replace']['VALUE'],
+								 );
+			}
+		}
+		
+		return $return;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXTRACT WRAPPER
+	/*-------------------------------------------------------------------------*/
+	
+	function _extract_xml_wrapper( $content, $xml, $xmlarchive )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = array();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		if ( ! is_array( $xml->xml_array['wrapperexport']['wrappergroup']['wrapper'][0]  ) )
+		{
+			//-----------------------------------------
+			// Ensure [0] is populated
+			//-----------------------------------------
+			
+			$tmp = $xml->xml_array['wrapperexport']['wrappergroup']['wrapper'];
+			
+			unset($xml->xml_array['wrapperexport']['wrappergroup']['wrapper']);
+			
+			$xml->xml_array['wrapperexport']['wrappergroup']['wrapper'][0] = $tmp;
+		}
+		
+		if ( is_array( $xml->xml_array['wrapperexport']['wrappergroup']['wrapper'] ) )
+		{
+			foreach( $xml->xml_array['wrapperexport']['wrappergroup']['wrapper'] as $idx => $entry )
+			{
+				$return = $entry['wrappercontent']['VALUE'];
+			}
+		}
+		
+		return $return;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXTRACT CSS
+	/*-------------------------------------------------------------------------*/
+	
+	function _extract_xml_css( $content, $xml, $xmlarchive )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = array();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		if ( ! is_array( $xml->xml_array['cssexport']['cssgroup']['css'][0]  ) )
+		{
+			//-----------------------------------------
+			// Ensure [0] is populated
+			//-----------------------------------------
+			
+			$tmp = $xml->xml_array['cssexport']['cssgroup']['css'];
+			
+			unset($xml->xml_array['cssexport']['cssgroup']['css']);
+			
+			$xml->xml_array['cssexport']['cssgroup']['css'][0] = $tmp;
+		}
+		
+		if ( is_array( $xml->xml_array['cssexport']['cssgroup']['css'] )  )
+		{
+			foreach( $xml->xml_array['cssexport']['cssgroup']['css'] as $idx => $entry )
+			{
+				$return = $entry['csscontent']['VALUE'];
+			}
+		}
+		
+		return $return;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXTRACT TEMPLATES
+	/*-------------------------------------------------------------------------*/
+	
+	function _extract_xml_templates( $content, $xml, $xmlarchive )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = array();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $content );
+	
+		if ( ! is_array( $xml->xml_array['templateexport']['templategroup']['template'][0] ) )
+		{
+			//-----------------------------------------
+			// Ensure [0] is populated
+			//-----------------------------------------
+			
+			$tmp = $xml->xml_array['templateexport']['templategroup']['template'];
+			
+			unset($xml->xml_array['templateexport']['templategroup']['template']);
+			
+			$xml->xml_array['templateexport']['templategroup']['template'][0] = $tmp;
+		}
+		
+		if ( is_array( $xml->xml_array['templateexport']['templategroup']['template'] ) )
+		{
+			foreach( $xml->xml_array['templateexport']['templategroup']['template'] as $idx => $entry )
+			{
+				if ( ! $entry[ 'func_name' ]['VALUE'] )
+				{
+					continue;
+				}
+				
+				$return[] = array( 'group_name'      => $entry[ 'group_name' ]['VALUE'],
+								   'section_content' => $entry[ 'section_content' ]['VALUE'],
+								   'func_name'       => $entry[ 'func_name' ]['VALUE'],
+								   'func_data'       => $entry[ 'func_data' ]['VALUE']
+								 );
+			}
+		}
+		
+		return $return;
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXTRACT INFO
+	/*-------------------------------------------------------------------------*/
+	
+	function _extract_xml_info( $content, $xml, $xmlarchive )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = array();
+		
+		//-----------------------------------------
+		// Unpack the datafile
+		//-----------------------------------------
+
+		$xml->xml_parse_document( $content );
+		
+		if ( ! is_array( $xml->xml_array['infoexport']['infogroup']['info'][0]  ) )
+		{
+			//-----------------------------------------
+			// Ensure [0] is populated
+			//-----------------------------------------
+			
+			$tmp = $xml->xml_array['infoexport']['infogroup']['info'];
+			
+			unset($xml->xml_array['infoexport']['infogroup']['info']);
+			
+			$xml->xml_array['infoexport']['infogroup']['info'][0] = $tmp;
+		}
+		
+		if ( is_array( $xml->xml_array['infoexport']['infogroup']['info'] )  )
+		{
+			foreach( $xml->xml_array['infoexport']['infogroup']['info'] as $idx => $entry )
+			{
+				$return[ 'set_name' ]         = $entry['set_name']['VALUE'];
+				$return[ 'set_author_email' ] = $entry['set_author_email']['VALUE'];
+				$return[ 'set_author_name' ]  = $entry['set_author_name']['VALUE'];
+				$return[ 'set_author_url' ]   = $entry['set_author_url']['VALUE'];
+			}
+		}
+		
+		return $return;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXPORT INFO (internal)
+	/*-------------------------------------------------------------------------*/
+	
+	function _export_get_info( $skin, $xml, $parent )
+	{
+		global $ibforums, $std, $DB;
+		
+		$xml->xml_set_root(  'infoexport', array( 'exported' => time() ) );
+		$xml->xml_add_group( 'infogroup' );
+		
+		$content[] = $xml->xml_build_simple_tag( 'set_name'        , $skin['set_name'] );
+		$content[] = $xml->xml_build_simple_tag( 'set_author_email', $skin['set_author_email'] );
+		$content[] = $xml->xml_build_simple_tag( 'set_author_name' , $skin['set_author_name'] );
+		$content[] = $xml->xml_build_simple_tag( 'set_author_url'  , $skin['set_author_url'] );
+		
+		$entry[]   = $xml->xml_build_entry( 'info', $content );
+		
+		$xml->xml_add_entry_to_group( 'infogroup', $entry );
+		
+		$xml->xml_format_document();
+
+		$info_xml = $xml->xml_document;
+		
+		return $info_xml;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXPORT WRAPPER (internal)
+	/*-------------------------------------------------------------------------*/
+	
+	function _export_get_wrapper( $skin, $xml, $parent )
+	{
+		global $ibforums, $std, $DB;
+		
+		$raw_wrapper = "";
+		
+		if ( $skin['set_wrapper'] )
+		{
+			$raw_wrapper = $skin['set_wrapper'];
+		}
+			
+		if ( $ibforums->input['skin_options'] != 'noparent' )
+		{
+			if ( $parent > 1 )
+			{
+				$wrapper_parent = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$parent ) );
+			}
+			
+			if ( $wrapper_parent['set_wrapper'] )
+			{
+				$raw_wrapper = $wrapper_parent['set_wrapper'];
+			}
+			
+		}
+		
+		$xml->xml_set_root(  'wrapperexport', array( 'exported' => time() ) );
+		$xml->xml_add_group( 'wrappergroup' );
+		
+		$content[] = $xml->xml_build_simple_tag( 'wrappercontent', $raw_wrapper );
+		
+		$entry[]   = $xml->xml_build_entry( 'wrapper', $content );
+		
+		$xml->xml_add_entry_to_group( 'wrappergroup', $entry );
+		
+		$xml->xml_format_document();
+
+		$wrapper_xml = $xml->xml_document;
+		
+		return $wrapper_xml;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXPORT MACRO (internal)
+	/*-------------------------------------------------------------------------*/
+	
+	function _export_get_macro( $skin, $xml, $parent )
+	{
+		global $ibforums, $std, $DB;
+		
+		$macro_xml = "";
+		$macros    = array();
+		
+		if ( $ibforums->input['skin_options'] != 'noparent' )
+		{
+			//-----------------------------------------
+			// Get parent macros
+			//-----------------------------------------
+			
+			if ( $parent > 1 )
+			{
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_macro', 'where' => 'macro_set='.$parent ) );
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					$macros[ strtolower( $r['macro_value'] ) ] = $r;
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Get this set macro
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_macro', 'where' => 'macro_set='.$skin['set_skin_set_id'] ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$macros[ strtolower( $r['macro_value'] ) ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Format macros into XML
+		//-----------------------------------------
+		
+		if ( count( $macros ) )
+		{
+			$xml->xml_set_root(  'macroexport', array( 'exported' => time() ) );
+			$xml->xml_add_group( 'macrogroup' );
+			
+			foreach( $macros as $key => $data )
+			{
+				$content = array();
+				
+				$content[] = $xml->xml_build_simple_tag( 'macro_value'  , $data['macro_value'] );
+				$content[] = $xml->xml_build_simple_tag( 'macro_replace', $data['macro_replace'] );
+				
+				$entry[] = $xml->xml_build_entry( 'macro', $content );
+			}
+			
+			$xml->xml_add_entry_to_group( 'macrogroup', $entry );
+			
+			$xml->xml_format_document();
+	
+			$macro_xml = $xml->xml_document;
+		}
+		
+		return $macro_xml;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXPORT CSS (internal)
+	/*-------------------------------------------------------------------------*/
+	
+	function _export_get_css( $skin, $xml, $parent )
+	{
+		global $ibforums, $std, $DB;
+		
+		$raw_css = "";
+		
+		if ( $ibforums->input['skin_options'] != 'noparent' )
+		{
+			if ( $parent > 1 )
+			{
+				$css_parent = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$parent ) );
+			}
+			
+			if ( $css_parent['set_css'] )
+			{
+				$raw_css = $css_parent['set_css'];
+			}
+		}
+		
+		if ( $skin['set_css'] )
+		{
+			$raw_css = $skin['set_css'];
+		}
+			
+		$xml->xml_set_root(  'cssexport', array( 'exported' => time() ) );
+		$xml->xml_add_group( 'cssgroup' );
+		
+		$content[] = $xml->xml_build_simple_tag( 'csscontent', $raw_css );
+		
+		$entry[]   = $xml->xml_build_entry( 'css', $content );
+		
+		$xml->xml_add_entry_to_group( 'cssgroup', $entry );
+		
+		$xml->xml_format_document();
+
+		$css_xml = $xml->xml_document;
+		
+		return $css_xml;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// _EXPORT TEMPLATES (internal)
+	/*-------------------------------------------------------------------------*/
+	
+	function _export_get_templates( $skin, $xml, $parent )
+	{
+		global $ibforums, $std, $DB;
+		
+		$xml->xml_set_root( 'templateexport', array( 'exported' => time(), 'versionid' => '20000', 'type' => 'export' ) );
+		
+		$xml->xml_add_group( 'templategroup' );
+		
+		if ( $ibforums->input['skin_options'] == 'noparent' )
+		{
+			$DB->simple_construct( array( 'select' => 'group_name, section_content, func_name, func_data', 'from' => 'skin_templates', 'where' => 'set_id='.$ibforums->input['skin_id'] ) );
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$content = array();
+				
+				foreach ( $r as $k => $v )
+				{
+					$content[] = $xml->xml_build_simple_tag( $k, $v );
+				}
+				
+				$entry[] = $xml->xml_build_entry( 'template', $content );
+			}
+			
+			$xml->xml_add_entry_to_group( 'templategroup', $entry );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get template parents
+			//-----------------------------------------
+			
+			$all_templates = array();
+			
+			if ( $parent > 1 )
+			{
+				$DB->simple_construct( array( 'select' => 'group_name, section_content, func_name, func_data', 'from' => 'skin_templates', 'where' => 'set_id='.$parent ) );
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					$all_templates[ strtolower( $r['group_name'] ) .','. strtolower( $r['func_name'] ) ] = $r;
+				}
+			}
+			
+			$DB->simple_construct( array( 'select' => 'group_name, section_content, func_name, func_data', 'from' => 'skin_templates', 'where' => 'set_id='.$ibforums->input['skin_id'] ) );
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$all_templates[ strtolower( $r['group_name'] )  .','. strtolower( $r['func_name'] ) ] = $r;
+			}
+			
+			if ( count( $all_templates ) )
+			{
+				foreach( $all_templates as $name => $r )
+				{
+					$content = array();
+					
+					foreach ( $r as $k => $v )
+					{
+						$content[] = $xml->xml_build_simple_tag( $k, $v );
+					}
+					
+					$entry[] = $xml->xml_build_entry( 'template', $content );
+				}
+				
+				$xml->xml_add_entry_to_group( 'templategroup', $entry );
+			}
+		}
+		
+		$xml->xml_format_document();
+		
+		$templates_xml = $xml->xml_document;
+		
+		return $templates_xml;
+	}
+	
+	
+	//-----------------------------------------
+	// SHOW EXPORT PAGE
+	//-----------------------------------------
+	
+	function show_export_page()
+	{
+		global $ibforums, $DB, $std;
+		
+		$form_array   = array();
+		$set_to_image = array();
+		
+		$ibforums->admin->page_detail = "You can download skin sets by configuring the form below. The skin XML templates (HTML, Macros, CSS & Wrapper) are independent of the image set.<br />To download a 'full' skin set, you will need to download both the skin XML and the image set.";
+		$ibforums->admin->page_title  = "Export Skin Sets";
+		
+		//-----------------------------------------
+		// Get skin list...
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/classes/class_display.php' );
+		$display   = new display();
+		
+		$skin_list = $display->_build_skin_list();
+		
+		//-----------------------------------------
+		// Do we have an incoming ID?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['id'] )
+		{
+			$skin_list = str_replace( "value='{$ibforums->input['id']}'", "value='{$ibforums->input['id']}' selected='selected'", $skin_list );
+		}
+		
+		//-----------------------------------------
+		// Get skins...
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'order' => 'set_skin_set_id DESC' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$set_to_image[ $r['set_image_dir'] ] = $r['set_name'];
+		}
+		
+		//-----------------------------------------
+		// Image dir
+		//-----------------------------------------
+		
+		$dirs = array();
+		
+		$dh = opendir( CACHE_PATH.'style_images' );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if (($file != ".") && ($file != ".."))
+ 			{
+				if ( is_dir('./style_images/'.$file) )
+				{
+					$dirs[] = array( $file, 'Image Set: "'.$file.'" (used in skin: '.$set_to_image[ $file ].')' );
+				}
+ 			}
+ 		}
+ 		
+ 		closedir( $dh );
+ 		
+ 		//-----------------------------------------
+ 		// start output
+ 		//-----------------------------------------
+ 		
+		$start_form_a = $ibforums->adskin->start_form( array( 1 => array( 'act' , 'import' ),
+															  2 => array( 'code', 'export' ),
+ 												     )      );
+ 												     
+ 		$start_form_b = $ibforums->adskin->start_form( array( 1 => array( 'act' , 'import' ),
+														      2 => array( 'code', 'exportimages' ),
+ 												     )      );
+ 												     
+ 		$start_form_c = $ibforums->adskin->start_form( array( 1 => array( 'act' , 'import' ),
+															  2 => array( 'code', 'importtemplates' ),
+															  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+													 ) , "uploadform", " enctype='multipart/form-data'"     );
+													 
+		$start_form_d = $ibforums->adskin->start_form( array( 1 => array( 'act' , 'import' ),
+															  2 => array( 'code', 'importimages' ),
+															  3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+													 ) , "uploadform", " enctype='multipart/form-data'"     );
+		
+		$ibforums->html .= "<div class='tableborder'>
+							 <div class='maintitle'>Exporting...</div>
+							 <div class='tablepad'>
+							 <br />
+							 <fieldset>
+							  <legend><strong>Export Skin Templates</strong>
+							  $start_form_a
+							  <div style='border:1px solid #D1DCEB'>
+							  <table cellpadding='4' cellspacing='0' width='100%'>
+							  <tr>
+							   <td class='tdrow1' width='40%'><b>Export Which Skin Template Set?</b><div class='graytext'>Please select which skin set (HTML templates, CSS, Macros & wrapper) you wish to export.</div></td>
+							   <td class='tdrow2' width='60%'><select name='skin_id' class='dropdown'>{$skin_list}</select></td>
+							 </tr>
+							 <tr>
+							   <td class='tdrow1' width='40%'><b>Export Options</b><div class='graytext'>Please choose how deep this export should look for customizations.</div></td>
+							   <td class='tdrow2' width='60%'>".$ibforums->adskin->form_dropdown("skin_options",
+																								   array( 0 => array( 'noparent'  , 'Export customizations in this skin only' ),
+																										  1 => array( 'yesparent' , 'Export customizations in this skin and any parent skins' )
+																										)
+																								 ) ."</td>
+							 </tr>
+							 </table>
+							 <div align='center' class='pformstrip'><input type='submit' class='realbutton' value='EXPORT SKIN XML' /></div>
+							 </div>
+							 </form>
+							 </fieldset>
+							 <br />
+							 <fieldset>
+							  <legend><strong>Export Skin Images</strong>
+							  $start_form_b
+							  <div style='border:1px solid #D1DCEB'>
+							  <table cellpadding='4' cellspacing='0' width='100%'>
+							  <tr>
+							   <td class='tdrow1' width='40%'><b>Export Which Image Set?</b><div class='graytext'>Image sets are exported into the XMLarchive format. This is not suitable for safemode users and in such a case we recommend you manually download via FTP and ZIP the images.</div></td>
+							   <td class='tdrow2' width='60%'>". $ibforums->adskin->form_dropdown( 'skin_dirs', $dirs )."</td>
+							 </tr>
+							 </table>
+							 <div align='center' class='pformstrip'><input type='submit' class='realbutton' value='EXPORT SKIN IMAGES' /></div>
+							 </div>
+							 </form>
+							 </fieldset>
+							</div>
+							</div>
+							
+							<br />
+							 
+							<div class='tableborder'>
+							 <div class='maintitle'>Importing...</div>
+							 <div class='tablepad'>
+							 <br />
+							 <fieldset>
+							  <legend><strong>Import Skin Templates</strong>
+							  $start_form_c
+							  <div style='border:1px solid #D1DCEB'>
+							  <table cellpadding='4' cellspacing='0' width='100%'>
+							  <tr>
+							   <td class='tdrow1' width='40%'><b>Upload XML Template set</b><div style='color:gray'>The file must begin with 'ipb_skin-' and end with either '.xml' or '.xml.gz'</div></td>
+							   <td class='tdrow2' width='60%'>". $ibforums->adskin->form_upload(  ) ."</td>
+							 </tr>
+							 <tr>
+							   <td class='tdrow1' width='40%'><b><u>OR</u> enter the filename of the XML Template Set</b><div style='color:gray'>The file must be uploaded into the forum's root folder</div></td>
+							   <td class='tdrow2' width='60%'>".$ibforums->adskin->form_input( 'skin_location'  )."</td>
+							 </tr>
+							 <tr>
+							   <td class='tdrow1' width='40%'><b>New Skin Set Name?</b><div style='color:gray'>Leave blank to use the skin name from the XMLarchive</div></td>
+							   <td class='tdrow2' width='60%'>".$ibforums->adskin->form_input( 'skin_name'  )."</td>
+							 </tr>
+							 </table>
+							 <div align='center' class='pformstrip'><input type='submit' class='realbutton' value='IMPORT SKIN XML' /></div>
+							 </div>
+							 </form>
+							 </fieldset>
+							 
+							 <br />
+							 <fieldset>
+							  <legend><strong>Import Skin Images</strong>
+							  $start_form_d
+							  <div style='border:1px solid #D1DCEB'>
+							  <table cellpadding='4' cellspacing='0' width='100%'>
+							  <tr>
+							   <td class='tdrow1' width='40%'><b>Upload XMLarchive Image set</b><div style='color:gray'>The file must begin with 'ipb_images-' and end with either '.xml' or '.xml.gz'</div></td>
+							   <td class='tdrow2' width='60%'>". $ibforums->adskin->form_upload(  ) ."</td>
+							 </tr>
+							 <tr>
+							   <td class='tdrow1' width='40%'><b><u>OR</u> enter the filename of the XMLarchive Image Set</b><div style='color:gray'>The file must be uploaded into the forum's root folder</div></td>
+							   <td class='tdrow2' width='60%'>".$ibforums->adskin->form_input( 'skin_location'  )."</td>
+							 </tr>
+							 <tr>
+							   <td class='tdrow1' width='40%'><b>New Image Set Directory Name?</b><div style='color:gray'>Leave blank to use the set name from the XMLarchive</div></td>
+							   <td class='tdrow2' width='60%'>".$ibforums->adskin->form_input( 'skin_name'  )."</td>
+							 </tr>
+							 </table>
+							 <div align='center' class='pformstrip'><input type='submit' class='realbutton' value='IMPORT SKIN IMAGES' /></div>
+							 </div>
+							 </form>
+							 </fieldset>
+							 
+							 </div>
+							</div>";
+																				
+							   
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_skinfix.php b/upload/sources/admin/ad_skinfix.php
similarity index 60%
rename from upload/sources/Admin/ad_skinfix.php
rename to upload/sources/admin/ad_skinfix.php
index 755957fb..02a87b30 100644
--- a/upload/sources/Admin/ad_skinfix.php
+++ b/upload/sources/admin/ad_skinfix.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -29,9 +28,6 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
-$idx = new ad_skinfix();
-
-
 class ad_skinfix {
 
 	var $base_url;
@@ -41,17 +37,17 @@ class ad_skinfix {
 	var $ff_fixes      = array();
 	var $log           = array();
 
-	function ad_skinfix()
+	function auto_run()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->page_detail = "This will allow you to update any old skins with the very latest skin files from the latest IPB release to ensure compatibility.<br /><br>
+		$ibforums->admin->page_detail = "This will allow you to update any old skins with the very latest skin files from the latest IPB release to ensure compatibility.<br /><br>
 							   Simply download the latest skin lists from our master server to your install and then run these lists to compare and update any skins you have installed.";
-		$ADMIN->page_title  = "Skin Version Control";
+		$ibforums->admin->page_title  = "Skin Version Control";
 
-		//---------------------------------------
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -60,9 +56,9 @@ class ad_skinfix {
 			unset($$k);
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 
-		switch($IN['code'])
+		switch($ibforums->input['code'])
 		{
 			
 			case 'importurl':
@@ -77,7 +73,7 @@ class ad_skinfix {
 				$this->delete_list();
 				break;
 			
-			//-------------------------
+			//-----------------------------------------
 			default:
 				$this->list_current();
 				break;
@@ -85,20 +81,20 @@ class ad_skinfix {
 		
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// Delete local list-y-poooos
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function delete_list()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		if ( ! $IN['id'] )
+		if ( ! $ibforums->input['id'] )
 		{
 			$this->list_current("No ID passed, no deletion completed");
 		}
 		
-		if ( @unlink( ROOT_PATH . 'cache/'. $IN['id'] ) )
+		if ( @unlink( ROOT_PATH . 'cache/'. $ibforums->input['id'] ) )
 		{
 			$this->list_current("Cache file removed");
 		}
@@ -110,17 +106,17 @@ class ad_skinfix {
 	
 	
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// RUN THE TOOL:UPDATE MINOR: Update all bug fixes, etc
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function tool_update_updates()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		//------------------------------
+		//-----------------------------------------
 		// Find missing template bits
-		//------------------------------
+		//-----------------------------------------
 		
 		$affected = array();
 		
@@ -130,15 +126,15 @@ class ad_skinfix {
 			{
 				if ( $desc['isnew'] == 1 )
 				{
-					//------------------------------
+					//-----------------------------------------
 					// Check to see if it's still missing...
-					//------------------------------
+					//-----------------------------------------
 					
 					if ( $this->db_html_files[ $skin_file ][ $section ] )
 					{
-						//------------------------------
+						//-----------------------------------------
 						// It's not, so fu.. continue
-						//------------------------------
+						//-----------------------------------------
 						
 						continue;
 					}
@@ -168,17 +164,17 @@ class ad_skinfix {
 		$this->write_log("Results of updating all bug fixed sections");
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// RUN THE TOOL:UPDATE MAJOR: Update all missing templates
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function tool_updatemajor()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		//------------------------------
+		//-----------------------------------------
 		// Find missing template bits
-		//------------------------------
+		//-----------------------------------------
 		
 		$affected = array();
 		
@@ -211,26 +207,26 @@ class ad_skinfix {
 	}
 	
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// RUN THE TOOL:VIEW CODE, View the code changes
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function tool_view_code()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$code = $this->ff_html_files[ $IN['skinfile'] ][ $IN['func'] ]['section_content'];
+		$code = $this->ff_html_files[ $ibforums->input['skinfile'] ][ $ibforums->input['func'] ]['section_content'];
 		
 		if ( $code == "" )
 		{
-			$ADMIN->error("No code to show, please check the skin file, function name and skin ID");
+			$ibforums->admin->error("No code to show, please check the skin file, function name and skin ID");
 		}
 		
 		$code = str_replace( "\n\n", "\n", str_replace( "\r", "\n", $code ) );
 		
-		if ( $IN['type'] == 'php' )
+		if ( $ibforums->input['type'] == 'php' )
 		{
-			$code = 'function '.$IN['func'].'('.$this->ff_html_files[ $IN['skinfile'] ][ $IN['func'] ]['func_data'].') {'."\rglobal \$ibforums;\r".'return <<<EOF'."\r".
+			$code = 'function '.$ibforums->input['func'].'('.$this->ff_html_files[ $ibforums->input['skinfile'] ][ $ibforums->input['func'] ]['func_data'].') {'."\rglobal \$ibforums;\r".'return <<<EOF'."\r".
 					$code .
 					"\r".'EOF;'."\r}";
 		}
@@ -252,38 +248,38 @@ class ad_skinfix {
 		}
 		
 		
-		$SKIN->td_header[] = array( "&nbsp;", "100%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;", "100%" );
 		
-		$ADMIN->html .= $SKIN->start_table( "{$IN['skinfile']} -&gt; {$IN['func']}" );
+		$ibforums->html .= $ibforums->adskin->start_table( "{$ibforums->input['skinfile']} -&gt; {$ibforums->input['func']}" );
 		
-		$ADMIN->html .= $SKIN->add_td_basic( "<div style='font-family:monaco, courier;font-size:12px'><pre>".$buffer."</pre></div>", "left");
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<div style='font-family:monaco, courier;font-size:12px'><pre>".$buffer."</pre></div>", "left");
 		
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->print_popup();
+		$ibforums->admin->print_popup();
 	
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// RUN THE TOOL:COMPARE, Show changes - do nothing
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function tool_compare()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$ADMIN->page_detail .= "<br /><br /><b>Please note: Updating template bits WILL overwrite your current template bits completely. If you have a heavily modified skin you may wish to use manually
-							   update the template bit to ensure that the changes integrate with your skin. If you have a heavily customized skin, <a href='{$ADMIN->base_url}&act=templ&code=export&id={$this->skin_id}'>export</a> a copy first for safety.";
+		$ibforums->admin->page_detail .= "<br /><br /><b>Please note: Updating template bits WILL overwrite your current template bits completely. If you have a heavily modified skin you may wish to use manually
+							   update the template bit to ensure that the changes integrate with your skin. If you have a heavily customized skin, <a href='{$ibforums->base_url}&act=templ&code=export&id={$this->skin_id}'>export</a> a copy first for safety.";
 		
-		$ADMIN->page_detail .= "<br /><br /><span style='color:darkorange'><b>Database HTML Templates: {$this->db_skin['skname']}<br />Invision Power Board Skin List: {$IN['list']}</b></span>";
+		$ibforums->admin->page_detail .= "<br /><br /><span style='color:darkorange'><b>Database HTML Templates: {$this->db_skin['skname']}<br />Invision Power Board Skin List: {$ibforums->input['list']}</b></span>";
 		
-		$ADMIN->html .= $SKIN->js_pop_win();
+		$ibforums->html .= $ibforums->adskin->js_pop_win();
 		
 		$changes = array();
 		
-		//------------------------------
+		//-----------------------------------------
 		// Find missing template bits
-		//------------------------------
+		//-----------------------------------------
 		
 		$cnt = 0;
 		
@@ -305,15 +301,15 @@ class ad_skinfix {
 		
 		if ( $cnt > 100 )
 		{
-			$ADMIN->page_detail .= "<br /><br /><span style='color:red;font-weight:bold'>There are $cnt missing sections, this could mean a very out of date template set and updating it may not be successful.</span>";
+			$ibforums->admin->page_detail .= "<br /><br /><span style='color:red;font-weight:bold'>There are $cnt missing sections, this could mean a very out of date template set and updating it may not be successful.</span>";
 		}
 		
-		$SKIN->td_header[] = array( "Skin Name"    , "25%" );
-		$SKIN->td_header[] = array( "Function"     , "30%" );
-		$SKIN->td_header[] = array( "Reason"       , "20%" );
-		$SKIN->td_header[] = array( "View Code"    , "25%" );
+		$ibforums->adskin->td_header[] = array( "Skin Name"    , "25%" );
+		$ibforums->adskin->td_header[] = array( "Function"     , "30%" );
+		$ibforums->adskin->td_header[] = array( "Reason"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "View Code"    , "25%" );
 		
-		$ADMIN->html .= $SKIN->start_table( "Missing sections in {$this->db_skin['skname']}" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Missing sections in {$this->db_skin['skname']}" );
 		
 		if ( count($changes) > 0 )
 		{
@@ -321,23 +317,23 @@ class ad_skinfix {
 			{
 				foreach( $changes[ $skin_file ] as $fun )
 				{
-					$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$skin_file}</b>",
+					$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$skin_file}</b>",
 															  $fun,
 															  "<i>Missing in local template</i>",
-															  "<center>View <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$IN['list']}&skin={$IN['skin']}&skinfile={$skin_file}&func=$fun&type=php&m=db\", \"ViewCode\", \"700\",\"400\");'>PHP</a>
-															  &middot; <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$IN['list']}&skin={$IN['skin']}&skinfile={$skin_file}&func=$fun&type=html&m=db\", \"ViewCode\", \"700\",\"400\");'>HTML</a></center>"
+															  "<center>View <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$ibforums->input['list']}&skin={$ibforums->input['skin']}&skinfile={$skin_file}&func=$fun&type=php&m=db\", \"ViewCode\", \"700\",\"400\");'>PHP</a>
+															  &middot; <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$ibforums->input['list']}&skin={$ibforums->input['skin']}&skinfile={$skin_file}&func=$fun&type=html&m=db\", \"ViewCode\", \"700\",\"400\");'>HTML</a></center>"
 													 )      );
 				}
 			}
 			
-			$ADMIN->html .= $SKIN->add_td_basic( "<a href='{$SKIN->base_url}&act=skinfix&code=runtool&tool=updatemajor&skin={$IN['skin']}&list={$IN['list']}' class='fauxbutton'>Update Missing Sections</a>", "center");
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$ibforums->adskin->base_url}&act=skinfix&code=runtool&tool=updatemajor&skin={$ibforums->input['skin']}&list={$ibforums->input['list']}' class='fauxbutton'>Update Missing Sections</a>", "center");
 		}
 		else
 		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No missing sections detected", "center");
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No missing sections detected", "center");
 		}
 		
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
 		//-----------------------------------------
 		// Show bug fixes
@@ -347,12 +343,12 @@ class ad_skinfix {
 		$look_up_group = array();
 		$look_up_final = array();
 		
-		$SKIN->td_header[] = array( "Skin Name"    , "40%" );
-		$SKIN->td_header[] = array( "Function"     , "20%" );
-		$SKIN->td_header[] = array( "Reason"       , "20%" );
-		$SKIN->td_header[] = array( "View Code"    , "20%" );
+		$ibforums->adskin->td_header[] = array( "Skin Name"    , "40%" );
+		$ibforums->adskin->td_header[] = array( "Function"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Reason"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "View Code"    , "20%" );
 		
-		$ADMIN->html .= $SKIN->start_table( "Updates specified in upgrade document for {$IN['list']}" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Updates specified in upgrade document for {$ibforums->input['list']}" );
 		
 		foreach( $this->ff_fixes as $skin_file => $data )
 		{
@@ -371,18 +367,18 @@ class ad_skinfix {
 				$look_up_func[]  = $section;
 				$look_up_group[] = $skin_file;
 				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$skin_file}</b><!--X:$skin_file,$section--><!--Y:$skin_file,$section-->",
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$skin_file}</b><!--X:$skin_file,$section--><!--Y:$skin_file,$section-->",
 														  $section,
 														  $desc['desc'],
-														  "<center>View <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$IN['list']}&skin={$IN['skin']}&skinfile={$skin_file}&func=$section&type=php&m=ff\", \"ViewCode\", \"700\",\"400\");'>PHP</a>
-														  &middot; <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$IN['list']}&skin={$IN['skin']}&skinfile={$skin_file}&func=$section&type=html&m=ff\", \"ViewCode\", \"700\",\"400\");'>HTML</a></center>"
+														  "<center>View <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$ibforums->input['list']}&skin={$ibforums->input['skin']}&skinfile={$skin_file}&func=$section&type=php&m=ff\", \"ViewCode\", \"700\",\"400\");'>PHP</a>
+														  &middot; <a href='javascript:pop_win(\"&act=skinfix&code=runtool&tool=viewcode&list={$ibforums->input['list']}&skin={$ibforums->input['skin']}&skinfile={$skin_file}&func=$section&type=html&m=ff\", \"ViewCode\", \"700\",\"400\");'>HTML</a></center>"
 												 )      );
 			}
 		}
 		
-		$ADMIN->html .= $SKIN->add_td_basic( "<a href='{$SKIN->base_url}&act=skinfix&code=runtool&tool=updateupdates&skin={$IN['skin']}&list={$IN['list']}' class='fauxbutton'>Update New Release Changes</a>", "center");
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$ibforums->adskin->base_url}&act=skinfix&code=runtool&tool=updateupdates&skin={$ibforums->input['skin']}&list={$ibforums->input['list']}' class='fauxbutton'>Update New Release Changes</a>", "center");
 		
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
 		//-----------------------------------------
 		// PARSE IN UPDATE TIME
@@ -395,30 +391,30 @@ class ad_skinfix {
 					    
 			while ( $r = $DB->fetch_row() )
 			{
-				$ADMIN->html = str_replace( "<!--Y:{$r['group_name']},{$r['func_name']}-->", "<br /><span style='font-size:9px;color:#666'>Local version matches remote version?: ".$this->_is_it_or_isnt_it($r['section_content'], $this->ff_html_files[$r['group_name']][$r['func_name']]['section_content'])."</span>", $ADMIN->html );
-				$ADMIN->html = str_replace( "<!--X:{$r['group_name']},{$r['func_name']}-->", "<br /><span style='font-size:9px;color:#666'>Local version last updated: ".$std->get_date( $r['updated'], 'SHORT' )."</span>", $ADMIN->html );
+				$ibforums->html = str_replace( "<!--Y:{$r['group_name']},{$r['func_name']}-->", "<br /><span style='font-size:9px;color:#666'>Local version matches remote version?: ".$this->_is_it_or_isnt_it($r['section_content'], $this->ff_html_files[$r['group_name']][$r['func_name']]['section_content'])."</span>", $ibforums->html );
+				$ibforums->html = str_replace( "<!--X:{$r['group_name']},{$r['func_name']}-->", "<br /><span style='font-size:9px;color:#666'>Local version last updated: ".$std->get_date( $r['updated'], 'SHORT' )."</span>", $ibforums->html );
 			}
 		}
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 		
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// RUN THE TOOL
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function run_tool()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$tool = trim($IN['tool']);
-		$skin = intval(trim($IN['skin']));
-		$list = trim($IN['list']);
+		$tool = trim($ibforums->input['tool']);
+		$skin = intval(trim($ibforums->input['skin']));
+		$list = trim($ibforums->input['list']);
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// GET DB STUFF
-		//-----------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT * FROM ibf_skin_templates WHERE set_id=$skin");
 		
@@ -434,24 +430,24 @@ class ad_skinfix {
 		
 		$this->db_skin = $DB->fetch_row();
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// LOAD CACHE FILE
-		//-----------------------------------
+		//-----------------------------------------
 		
 		$file = ROOT_PATH . 'cache/'.$list;
 		
 		if ( ! file_exists( $file ) )
 		{
-			$ADMIN->error("Cannot find $list in the directory, 'cache'");
+			$ibforums->admin->error("Cannot find $list in the directory, 'cache'");
 		}
 		
 		$fh = fopen( $file, 'r' );
 		$raw = @fread( $fh, filesize( $file ) );
 		@fclose($fh);
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// GET FIRST LINE CONF
-		//-----------------------------------
+		//-----------------------------------------
 		
 		preg_match( "#<!--ST\@CONF-->(.+?)<!--END\@CONF-->#is", $raw, $match );
 		
@@ -466,9 +462,9 @@ class ad_skinfix {
 			$this->ff_fixes[ str_replace( '.php', '', $skin_file ) ][ $section ] = array( 'desc' => $desc, 'isnew' => $isnew );
 		}
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// PARSE FLAT FILE
-		//-----------------------------------
+		//-----------------------------------------
 		
 		preg_match_all( "/<!--IBF_GROUP_START:(\S+?)-->(.+?)<!--IBF_GROUP_END:\S+?-->/s", $raw, $match );
 		
@@ -478,18 +474,18 @@ class ad_skinfix {
 			
 			$raw         = trim($match[2][$i]);
 			
-			//--------------------------------
+			//-----------------------------------------
 			// Remove everything up until the
 			// first <!--START tag...
-			//--------------------------------
+			//-----------------------------------------
 			
 			$raw = preg_replace( "/^.*?(<!--IBF_START_FUNC)/s", "\\1", trim($raw));
 			
 			$raw = str_replace( "\r\n", "\n", $raw);
 			
-			//+-------------------------------
+			//-----------------------------------------
 			// Convert the tags back to php native
-			//+-------------------------------
+			//-----------------------------------------
 			
 			$raw = $this->unconvert_tags($raw);
 			
@@ -548,9 +544,9 @@ class ad_skinfix {
 		
 		$this->skin_id = $skin;
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// Do summink
-		//-----------------------------------
+		//-----------------------------------------
 		
 		switch( $tool )
 		{
@@ -573,15 +569,15 @@ class ad_skinfix {
 	}
 	
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// IMPORT IPB PLIST FILE
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function import_ipb_file()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 	
-		$file = preg_replace( "/[^a-zA-Z0-9\-\_\.]/", "" , str_replace( "..", "", $IN['id'] ) );
+		$file = preg_replace( "/[^a-zA-Z0-9\-\_\.]/", "" , str_replace( "..", "", $ibforums->input['id'] ) );
 		
 		if ( ! preg_match( "/\.plist$/", $file ) )
 		{
@@ -590,12 +586,12 @@ class ad_skinfix {
 		
 		if ( $file == "" )
 		{
-			$ADMIN->error("No file passed or the file contained illegal characters, unable to proceed.");
+			$ibforums->admin->error("No file passed or the file contained illegal characters, unable to proceed.");
 		}
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Grab it you pervert!
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$grab_meh_bits = "http://www.invisionboard.com/download/skinlist.php?dl=".$file;
 		
@@ -604,23 +600,23 @@ class ad_skinfix {
 		
 		if ( ! $data = @file( $grab_meh_bits ) )
 		{
-			$ADMIN->error("There seems to be an error fetching the list from the Invision Power Board master server. This is either because the server is
+			$ibforums->admin->error("There seems to be an error fetching the list from the Invision Power Board master server. This is either because the server is
 			     unavailable or because your installation of PHP prohibits remote file reading.
 			     <br />Try going to <a href='http://www.invisionboard.com/download/skingetlist.php'>our manual listing</a> to download the files directly.");
 		}
 		
 		if ( count($data) < 1 )
 		{
-			$ADMIN->error("There seems to be an error fetching the list from the Invision Power Board master server. This is either because the server is
+			$ibforums->admin->error("There seems to be an error fetching the list from the Invision Power Board master server. This is either because the server is
 			     unavailable or because your installation of PHP prohibits remote file reading.
 			     <br />Try going to <a href='http://www.invisionboard.com/download/skingetlist.php'>our manual listing</a> to download the files directly.");
 		}
 		
 		$contents = implode( '', $data );
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Write it to the local directory
-		//--------------------------------------
+		//-----------------------------------------
 		
 		if ( $FH = fopen( ROOT_PATH . 'cache/' . $file, 'w' ) )
 		{
@@ -630,29 +626,29 @@ class ad_skinfix {
 		
 		@chmod( ROOT_PATH . 'cache/' . $file, 0777 );
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Pass back with thanks :D
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$this->list_current( "<li>$file imported successfully");
 	
 	}
 	
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// SHOW MAIN SCREEN
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function list_current($msg="")
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		$form_array = array();
 	
 				
-		//--------------------------------------
+		//-----------------------------------------
 		// Get PLIST from invisionboard.com server
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$file = 'http://www.invisionboard.com/download/skinlist.php';
 		$emsg = "<li>There seems to be an error fetching the list from the Invision Power Board master server. This is either because the server is
@@ -673,9 +669,9 @@ class ad_skinfix {
 			{
 				$list = implode( '' , $data );
 				
-				//-------------------------------------------------
+				//-----------------------------------------
 				// Divide the file up into different sections
-				//-------------------------------------------------
+				//-----------------------------------------
 				
 				preg_match_all( "#<entry>(.+?)</entry>#is", $list, $match );
 				
@@ -716,9 +712,9 @@ class ad_skinfix {
 			$err = 1;
 		}
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Cache directory present and writeable?
-		//--------------------------------------
+		//-----------------------------------------
 		
 		if ( $err )
 		{
@@ -738,18 +734,18 @@ class ad_skinfix {
 		
 		if ( $msg )
 		{
-			$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
 			
-			$ADMIN->html .= $SKIN->start_table( "Message" );
+			$ibforums->html .= $ibforums->adskin->start_table( "Message" );
 			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<ul>".$msg."</ul>" ) );
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<ul>".$msg."</ul>" ) );
 			
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_table();
 		}
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Cache exists, read from it
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$local = array();
 		
@@ -771,41 +767,41 @@ class ad_skinfix {
  			closedir( $dh );
 		}
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// if no error....
-		//--------------------------------------
+		//-----------------------------------------
 		
 		if ( $err != 1 )
 		{
-			$SKIN->td_header[] = array( "Name"         , "40%" );
-			$SKIN->td_header[] = array( "Updated"      , "30%" );
-			$SKIN->td_header[] = array( "Download"     , "30%" );
+			$ibforums->adskin->td_header[] = array( "Name"         , "40%" );
+			$ibforums->adskin->td_header[] = array( "Updated"      , "30%" );
+			$ibforums->adskin->td_header[] = array( "Download"     , "30%" );
 			
-			$ADMIN->html .= $SKIN->start_table( "REMOTE Package Lists from 'invisionboard.com'" );
+			$ibforums->html .= $ibforums->adskin->start_table( "REMOTE Package Lists from 'invisionboard.com'" );
 			
 			foreach( $master as $name => $data )
 			{
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$data['name']}</b>",
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$data['name']}</b>",
 														  "<center>{$data['time']}</center>",
-														  "<center><a href='".$SKIN->base_url."&act=skinfix&code=importurl&id={$data['updatefile']}'>Download</a></center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=skinfix&code=importurl&id={$data['updatefile']}'>Download</a></center>",
 												 )      );
 			}
 			
-			$ADMIN->html .= $SKIN->end_table();
+			$ibforums->html .= $ibforums->adskin->end_table();
 		}
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Show local cache files...
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$tool_cache = array();
 		
-		$SKIN->td_header[] = array( "Release"      , "30%" );
-		$SKIN->td_header[] = array( "File name"    , "20%" );
-		$SKIN->td_header[] = array( "Updated"      , "30%" );
-		$SKIN->td_header[] = array( "Delete"       , "20%" );
+		$ibforums->adskin->td_header[] = array( "Release"      , "30%" );
+		$ibforums->adskin->td_header[] = array( "File name"    , "20%" );
+		$ibforums->adskin->td_header[] = array( "Updated"      , "30%" );
+		$ibforums->adskin->td_header[] = array( "Delete"       , "20%" );
 			
-		$ADMIN->html .= $SKIN->start_table( "LOCAL Package Lists from 'cache'" );
+		$ibforums->html .= $ibforums->adskin->start_table( "LOCAL Package Lists from 'cache'" );
 		
 		if ( count($local) > 0 )
 		{
@@ -820,24 +816,24 @@ class ad_skinfix {
 				
 				$mtime = gmdate( "jS M Y - H:i T",  $stat[9] );
 			
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$master[ $name ]['name']}</b>",
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$master[ $name ]['name']}</b>",
 														  "$name",
 														  "<center>$mtime</center>",
-														  "<center><a href='".$SKIN->base_url."&act=skinfix&code=delete&id=$name'>Delete</a></center>",
+														  "<center><a href='".$ibforums->adskin->base_url."&act=skinfix&code=delete&id=$name'>Delete</a></center>",
 												 )      );
 			}
 			
 		}
 		else
 		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No skin file lists found in the 'cache' directory", "center");
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No skin file lists found in the 'cache' directory", "center");
 		}
 		
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Show tool box
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$tools   = array();
 		$skins   = array();
@@ -852,42 +848,42 @@ class ad_skinfix {
 			$skins[] = array( $r['skid'], $r['skname'] );
 		}
 		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'act'  , 'skinfix'  ),
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skinfix'  ),
 												  2 => array( 'code' , 'runtool'  ),
 												  3 => array( 'tool' , 'compare'  ),
 									     )      );
 									     
-		$SKIN->td_header[] = array( "&nbsp;"  , "60%" );
-		$SKIN->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
 		
-		$ADMIN->html .= $SKIN->start_table( "Skin Version Control" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Skin Version Control" );
 		
 		if ( count($local) > 0 )
 		{
 			
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>Use Package List...</b>",
-													  $SKIN->form_dropdown( 'list', $tool_cache )
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Use Package List...</b>",
+													  $ibforums->adskin->form_dropdown( 'list', $tool_cache )
 											 )      );
 											 
-			$ADMIN->html .= $SKIN->add_td_row( array( "<b>To compare changes against HTML template set...</b>",
-													  $SKIN->form_dropdown( 'skin', $skins )
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>To compare changes against HTML template set...</b>",
+													  $ibforums->adskin->form_dropdown( 'skin', $skins )
 											 )      );
 			
 			
 		}
 		else
 		{
-			$ADMIN->html .= $SKIN->add_td_basic( "No skin file lists found in the 'cache' directory, this section will not activate until you have downloaded some files", "center");
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No skin file lists found in the 'cache' directory, this section will not activate until you have downloaded some files", "center");
 		}
 		
-		$ADMIN->html .= $SKIN->end_form("Show me the comparison");
+		$ibforums->html .= $ibforums->adskin->end_form("Show me the comparison");
 		
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		//+-------------------------------
-		//+-------------------------------
+		//-----------------------------------------
+		//-------------------------------
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 	
 	}
 	
@@ -941,31 +937,31 @@ class ad_skinfix {
 	}
 	
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// WRITE OUT RESULTS
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function write_log($title="Results")
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		$SKIN->td_header[] = array( "&nbsp;"  , "100%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
 			
-		$ADMIN->html .= $SKIN->start_table( $title );
+		$ibforums->html .= $ibforums->adskin->start_table( $title );
 		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<ul><li>".implode( '<li>', $this->log )."</ul>" ) );
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<ul><li>".implode( '<li>', $this->log )."</ul>" ) );
 		
-		$ADMIN->html .= $SKIN->add_td_basic( "<a href='{$SKIN->base_url}&act=skinfix' class='fauxbutton'>Skin Version Control Home</a>", "center");
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$ibforums->adskin->base_url}&act=skinfix' class='fauxbutton'>Skin Version Control Home</a>", "center");
 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 	
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// @ UPDATE DB WITH TEMPLATE CHANGES
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function _update_section($skin_file, $func_name, $func_data, $func_content)
 	{
@@ -979,16 +975,16 @@ class ad_skinfix {
 			return;
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Can we write? YES WE CAN!
 		// Can we get car credit? YES WE CAN!
 		// Can we copy the 'Kings of Leon' CD to our computers? NO WE CAN'T
 		// Shall we boycott the 'Kings of Leon' CD? YES WE WILL!
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$file = ROOT_PATH . 'Skin/s'. $this->skin_id.'/'.$skin_file.'.php';
 		
-		If ( $INFO['safe_mode_skins'] != 1 )
+		If ( $ibforums->vars['safe_mode_skins'] != 1 )
 		{
 			if ( ! is_writeable( $file ) )
 			{
@@ -1000,17 +996,17 @@ class ad_skinfix {
 			}
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Delete old template from DB
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$DB->query("DELETE FROM ibf_skin_templates WHERE set_id={$this->skin_id} AND group_name='$skin_file' AND func_name='$func_name'");
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Insert meh new record
 		// I SAY BO! You Say SELECTA!
 		// Can I get a reeeeeeewind?!?!
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$dbs = $DB->compile_db_insert_string( array(
 													 'set_id'          => $this->skin_id,
@@ -1027,24 +1023,24 @@ class ad_skinfix {
 		return;
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// @ UPDATE A PHP FILE
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function _update_php_file($group)
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
 		$group = str_replace( ".php", "", $group );
 		
 		$skin_dir  = ROOT_PATH."Skin/s".$this->skin_id;
 		
-		//-------------------------------------------
+		//-----------------------------------------
 		// If we are not using safe mode skins, lets
 		// run away!
-		//-------------------------------------------
+		//-----------------------------------------
 		
-		if ( $INFO['safe_mode_skins'] == 1 OR SAFE_MODE_ON == 1 )
+		if ( $ibforums->vars['safe_mode_skins'] == 1 OR SAFE_MODE_ON == 1 )
 		{
 			$this->log[] = "Safe mode skins enabled, update on {$skin_file}.php not required, returning...";
 			return;
@@ -1087,9 +1083,9 @@ class ad_skinfix {
 		return TRUE;
 	}
 	
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	// @ DETERMINE CHANGES
-	//-------------------------------------------------------------
+	//-----------------------------------------
 	
 	function _is_it_or_isnt_it($remote, $local)
 	{
diff --git a/upload/sources/admin/ad_skintools.php b/upload/sources/admin/ad_skintools.php
new file mode 100644
index 00000000..7937ddb5
--- /dev/null
+++ b/upload/sources/admin/ad_skintools.php
@@ -0,0 +1,1466 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Skin Tools
+|   > Module written by Matt Mecham
+|   > Date started: 22nd January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_skintools {
+
+	var $base_url;
+	var $db_html_files = "";
+	var $ff_html_files = "";
+	var $skin_id       = "";
+	var $ff_fixes      = array();
+	var $log           = array();
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_detail = "Please read the instructions for each tool carefully.";
+		$ibforums->admin->page_title  = "Skin Set Tools";
+
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'rebuildcaches':
+				$this->rebuildcaches();
+				break;
+				
+			case 'rebuildmaster':
+				$this->rebuildmaster();
+				break;
+				
+			case 'rebuildmasterhtml':
+				$this->rebuildmaster_html();
+				break;
+				
+			case 'changemember':
+				$this->change_member();
+				break;
+				
+			//-----------------------------------------
+			// Search stuff
+			//-----------------------------------------
+			
+			case 'searchsplash':
+				$this->searchreplace_start();
+				break;
+				
+			case 'simplesearch':
+				$this->simple_search();
+				break;
+				
+			case 'searchandreplace':
+				$this->search_and_replace();
+				break;
+				
+			//-----------------------------------------
+			// Search stuff
+			//-----------------------------------------
+			
+			case 'easylogo':
+				$this->easy_logo_start();
+				break;
+			case 'easylogo_complete':
+				$this->easy_logo_complete();
+				break;
+			default:
+				$this->show_intro();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// EASY LOGO CHANGER (COMPLETE)
+	//-----------------------------------------
+	
+	function easy_logo_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$master = array();
+		
+		//-----------------------------------------
+		// Check id
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['set_skin_set_id'] )
+		{
+			$ibforums->main_msg = "No skin set ID was passed. Please ensure you actually chose a skin set to edit";
+			$this->easy_logo_start();
+		}
+		
+		//-----------------------------------------
+		// Grab the default template bit
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "group_name='skin_global' AND func_name='global_board_header'" ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$master[ $r['set_id'] ] = $r;
+		}
+		
+		if ( ! is_array($master[ $ibforums->input['set_skin_set_id'] ]) )
+		{
+			$final_html = $master[1]['section_content'];
+		}
+		else
+		{
+			$final_html = $master[ $ibforums->input['set_skin_set_id'] ]['section_content'];
+		}
+		
+		if ( ! strstr( $final_html, '<!--ipb.logo.end-->' ) )
+		{
+			$ibforums->main_msg = "Cannot locate the logo image tags for this skin set - please make sure your templates are up to date.";
+			$this->easy_logo_start();
+		}
+		
+		//-----------------------------------------
+		// Check for content
+		//-----------------------------------------
+		
+		if ( ! $_POST['headerhtml'] )
+		{
+			//$ibforums->main_msg = "The basic content section was left empty!";
+			//$this->easy_logo_start();
+		}
+		
+		if ( ! $_POST['javascripthtml'] )
+		{
+			//$ibforums->main_msg = "The javascript content section was left empty!";
+			//$this->easy_logo_start();
+		}
+		
+		if ( ! $_POST['leftlinkshtml'] )
+		{
+			//$ibforums->main_msg = "The left links content section was left empty!";
+			//$this->easy_logo_start();
+		}
+		
+		if ( ! $_POST['rightlinkshtml'] )
+		{
+			//$ibforums->main_msg = "The right links content section was left empty!";
+			//$this->easy_logo_start();
+		}
+		
+		//-----------------------------------------
+		// Check for tags
+		//-----------------------------------------
+		
+		foreach( array( 'JAVASCRIPT', 'BOARD_LOGO', 'LEFT_HAND_SIDE_LINKS', 'RIGHT_HAND_SIDE_LINKS' ) as $hehe )
+		{
+			if ( ! strstr( $_POST['headerhtml'], '<{'.$hehe.'}>' ) )
+			{
+				//$ibforums->main_msg = "The &lt;{".$hehe."}&gt; tag is missing!";
+				//$this->easy_logo_start();
+			}
+		}
+		
+		//-----------------------------------------
+		// Upload or new logo?
+		//-----------------------------------------
+		
+		if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+		{
+			if ( ! $_POST['logo_url'] )
+			{
+				$ibforums->main_msg = "You must either upload a new logo or enter a URL";
+				$this->easy_logo_start();
+			}
+			
+			$newlogo = $_POST['logo_url'];
+		}
+		else
+		{
+			if ( ! is_writable( CACHE_PATH.'style_images' ) )
+			{
+				$ibforums->main_msg = "You must ensure that 'style_images' has the correct CHMOD value to allow PHP to write into it. Try 0777 if all else fails.";
+				$this->easy_logo_start();
+			}
+			
+			//-----------------------------------------
+			// Upload
+			//-----------------------------------------
+			
+			$FILE_NAME = $_FILES['FILE_UPLOAD']['name'];
+			$FILE_SIZE = $_FILES['FILE_UPLOAD']['size'];
+			$FILE_TYPE = $_FILES['FILE_UPLOAD']['type'];
+			
+			//-----------------------------------------
+			// Naughty Opera adds the filename on the end of the
+			// mime type - we don't want this.
+			//-----------------------------------------
+			
+			$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
+			
+			//-----------------------------------------
+			// Correct file type?
+			//-----------------------------------------
+			
+			if ( ! preg_match( "#\.(?:gif|jpg|jpeg|png)$#is", $FILE_NAME ) )
+			{
+				$ibforums->main_msg = "The file you uploaded is not in the correct format. It has to be either a GIF, JPEG or PNG image.";
+				$this->easy_logo_start();
+			}
+			
+			if ( move_uploaded_file( $_FILES[ 'FILE_UPLOAD' ]['tmp_name'], CACHE_PATH."style_images/".$FILE_NAME) )
+			{
+				@chmod( CACHE_PATH."style_images/".$FILE_NAME, 0777 );
+			}
+			else
+			{
+				$ibforums->main_msg = "The upload failed. Please check permissions on the 'style_images' directory and make sure the uploaded file is less that 2mb in size.";
+				$this->easy_logo_start();
+			}
+			
+			$newlogo = "style_images/".urlencode($FILE_NAME);
+		}
+		
+		//-----------------------------------------
+		// Convert back stuff
+		//-----------------------------------------
+		
+		foreach( array( 'headerhtml', 'javascripthtml', 'leftlinkshtml', 'rightlinkshtml' ) as $mail )
+		{
+			//$_POST[ $mail ] = $ibforums->admin->form_to_text( $_POST[ $mail ] );
+			//$_POST[ $mail ] = str_replace( "\r\n", "\n", $_POST[ $mail ] );
+		}
+		
+		//-----------------------------------------
+		// Okay! Form the template
+		//-----------------------------------------
+		
+		//$final_html = $_POST['headerhtml'];
+		//$final_html = str_replace( "<{BOARD_LOGO}>", "<!--ipb.logo.start--><img src='$newlogo' alt='IPB' style='vertical-align:top' border='0' /><!--ipb.logo.end-->"      , $final_html );
+		//$final_html = str_replace( "<{JAVASCRIPT}>", "<!--ipb.javascript.start-->\n{$_POST['javascripthtml']}\n<!--ipb.javascript.end-->"       , $final_html );
+		//$final_html = str_replace( "<{LEFT_HAND_SIDE_LINKS}>", "<!--ipb.leftlinks.start-->{$_POST['leftlinkshtml']}<!--ipb.leftlinks.end-->"    , $final_html );
+		//$final_html = str_replace( "<{RIGHT_HAND_SIDE_LINKS}>", "<!--ipb.rightlinks.start-->{$_POST['rightlinkshtml']}<!--ipb.rightlinks.end-->", $final_html );
+		
+		$final_html = preg_replace( "#<!--ipb.logo.start-->.+?<!--ipb.logo.end-->#si", "<!--ipb.logo.start--><img src='$newlogo' alt='IPB' style='vertical-align:top' border='0' /><!--ipb.logo.end-->"      , $final_html );
+		
+		//-----------------------------------------
+		// Update the DeeBee
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_templates', 'where' => "set_id={$ibforums->input['set_skin_set_id']} AND group_name='skin_global' AND func_name='global_board_header'" ) );
+		
+		$DB->do_insert( 'skin_templates', array( 'section_content' => $final_html,
+												 'set_id'          => $ibforums->input['set_skin_set_id'],
+												 'group_name'      => 'skin_global',
+												 'func_name'       => 'global_board_header'
+					 )                         );
+		
+		$ibforums->cache_func->_rebuild_all_caches(array($ibforums->input['set_skin_set_id']));
+		
+		$ibforums->main_msg = 'Logo Changed and Skin Set Caches Rebuilt (id: '.$ibforums->input['set_skin_set_id'].')';
+			
+		$ibforums->main_msg .= "<br />".implode("<br />", $ibforums->cache_func->messages);
+		
+		$this->easy_logo_start();
+	}
+	
+	//-----------------------------------------
+	// EASY LOGO CHANGER (START)
+	//-----------------------------------------
+	
+	function easy_logo_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Init
+		//-----------------------------------------
+		
+		$master    = array();
+		$skin_list = "";
+		$html      = array();
+		
+		//-----------------------------------------
+		// Grab the default template bit
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "group_name='skin_global' AND func_name='global_board_header'" ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$master[ $r['set_id'] ] = $r;
+		}
+		
+		if ( ! $master[1]['section_content'] )
+		{
+			$ibforums->main_msg = "Cannot locate the master template bit 'global_board_header'";
+			$this->show_intro();
+		}
+		
+		if ( ! strstr( $master[1]['section_content'], '<!--ipb.logo.end-->' ) )
+		{
+			$ibforums->main_msg = "Cannot locate the logo image tags - please make sure your templates are up to date.";
+			$this->show_intro();
+		}
+		
+		//-----------------------------------------
+		// Get Skin Names
+		//-----------------------------------------
+		
+		$skin_list = $this->_get_skinlist();
+		
+		//-----------------------------------------
+		// get URL
+		//-----------------------------------------
+		
+		preg_match( "#<!--ipb.logo.start--><img src=[\"'](.+?)[\"'].+?<!--ipb.logo.end-->#si", $master[1]['section_content'], $match );
+		
+		$current_img_url = $match[1];
+		
+		//-----------------------------------------
+		// get current HTML
+		//-----------------------------------------
+		
+		$current_html = $master[1]['section_content'];
+		
+		$current_html = preg_replace( "#<!--ipb.javascript.start-->.+?<!--ipb.javascript.end-->#is"               , "<{JAVASCRIPT}>"                   , $current_html );
+		$current_html = preg_replace( "#<!--ipb.logo.start--><img src=[\"'](.+?)[\"'].+?<!--ipb.logo.end-->#si"   , "<{BOARD_LOGO}>"                   , $current_html );
+		$current_html = preg_replace( "#<!--ipb.leftlinks.start-->.+?<!--ipb.leftlinks.end-->#si"                 , "<{LEFT_HAND_SIDE_LINKS}>"         , $current_html );
+		$current_html = preg_replace( "#<!--ipb.rightlinks.start-->.+?<!--ipb.rightlinks.end-->#si"               , "<{RIGHT_HAND_SIDE_LINKS}>"        , $current_html );
+		
+		//-----------------------------------------
+		// Regex out me bits
+		//-----------------------------------------
+		
+		preg_match( "#<!--ipb.javascript.start-->(.+?)<!--ipb.javascript.end-->#si", $master[1]['section_content'], $match );
+		$html['javascript'] = $ibforums->admin->text_to_form($match[1]);
+		
+		preg_match( "#<!--ipb.leftlinks.start-->(.+?)<!--ipb.leftlinks.end-->#si"  , $master[1]['section_content'], $match );
+		$html['leftlinks']  = $ibforums->admin->text_to_form($match[1]);
+		
+		preg_match( "#<!--ipb.rightlinks.start-->(.+?)<!--ipb.rightlinks.end-->#si"  , $master[1]['section_content'], $match );
+		$html['rightlinks']  = $ibforums->admin->text_to_form($match[1]);
+		
+		$current_html        = $ibforums->admin->text_to_form($current_html);
+		
+		//-----------------------------------------
+		// Can we upload into style_images?
+		//-----------------------------------------
+		
+		if ( ! is_writable( CACHE_PATH.'style_images' ) )
+		{
+			$warning = "<div class='redbox' style='padding:4px'><strong>WARNING: Unable to upload into 'style_images'. If you wish to upload a file, please CHMOD that directory now!</strong></div>";
+		}
+		
+		//-----------------------------------------
+		// Start the form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'          ),
+															     2 => array( 'code' , 'easylogo_complete'  ),
+															     3 => array( 'MAX_FILE_SIZE', '10000000000' ),
+													 ) , "uploadform", " enctype='multipart/form-data'"     );
+													 
+									     
+		$ibforums->html .= "<div class='tableborder'>
+							<div class='maintitle'>Easy Logo Changer</div>
+							<div class='tablepad'>
+							$warning
+							<fieldset class='tdfset'>
+							 <legend><strong>Configuration</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Apply to which skin set?<div class='graytext'>If you've already modified the board header via the template editing section, this will overwrite your modifications</div></td>
+							   <td width='60%' class='tdrow1'>$skin_list</td>
+							 </tr>
+							 <tr>
+							   <td width='40%' class='tdrow1'>URL to new logo<div class='graytext'>You can use a relative URL or a full URL starting with http://</div></td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_simple_input('logo_url', $_POST['logo_url'] ? $_POST['logo_url'] : $current_img_url, '60' )."</td>
+							 </tr>
+							 <tr>
+							   <td width='40%' class='tdrow1'><b><u>OR</u></b> upload a new logo<div class='graytext'>Browse your computer for a logo to upload. FIlename must end in .gif, .jpg, .jpeg or .png</div></td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_upload()."</td>
+							 </tr>
+							</table>
+							</fieldset>
+							<!--<fieldset class='tdfset'>
+							 <legend><strong>Global Board Header HTML</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='100%' align='center' class='tdrow1'><div align='left'><b>Basic Layout</b></div><br />".$ibforums->adskin->form_textarea( 'headerhtml', $_POST['headerhtml'] ? $_POST['headerhtml'] : $current_html, 80, 10, 'soft', '', 'width:100%')."</td>
+							 </tr>
+							 <tr>
+							   <td width='100%' align='center' class='tdrow1'><div align='left'><b>&lt;{JAVASCRIPT}&gt;</b></div><br />".$ibforums->adskin->form_textarea( 'javascripthtml', $_POST['javascripthtml'] ? $_POST['javascripthtml'] : $html['javascript'], 80, 5, 'soft', '', 'width:100%')."</td>
+							 </tr>
+							 <tr>
+							   <td width='100%' align='center' class='tdrow1'><div align='left'><b>&lt;{LEFT_HAND_SIDE_LINKS}&gt;</b></div><br />".$ibforums->adskin->form_textarea( 'leftlinkshtml', $_POST['leftlinkshtml'] ? $_POST['leftlinkshtml'] : $html['leftlinks'], 80, 5, 'soft', '', 'width:100%')."</td>
+							 </tr>
+							 <tr>
+							   <td width='100%' align='center' class='tdrow1'><div align='left'><b>&lt;{RIGHT_HAND_SIDE_LINKS}&gt;</b></div><br />".$ibforums->adskin->form_textarea( 'rightlinkshtml', $_POST['rightlinkshtml'] ? $_POST['rightlinkshtml'] : $html['rightlinks'], 80, 5, 'soft', '', 'width:100%')."</td>
+							 </tr>
+							</table>
+							</fieldset>-->
+							</div>
+							</div>";
+							
+		//-----------------------------------------
+												 
+		$ibforums->html .= $ibforums->adskin->end_form_standalone("Complete Edit");
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	// REBUILD MASTER HTML
+	//-----------------------------------------
+	
+	function rebuildmaster_html()
+	{
+		global $ibforums, $DB, $std;
+		
+		$master  = array();
+		$inserts = 0;
+		$updates = 0;
+		
+		//-----------------------------------------
+		// Template here?
+		//-----------------------------------------
+		
+		if ( ! file_exists( ROOT_PATH.'ipb_templates.xml' ) )
+		{
+			$ibforums->main_msg = "ipb_templates.xml cannot be found in the forums root directory. Please check, upload or try again";
+			$this->show_intro();
+		}
+		
+		//-----------------------------------------
+		// First, get all the default bits
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'suid,group_name,func_name', 'from' => 'skin_templates', 'where' => 'set_id=1' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$master[ strtolower( $r['group_name'] ) ][ strtolower( $r['func_name'] ) ] = $r['suid'];
+		}
+		
+		//-----------------------------------------
+		// Get XML
+		//-----------------------------------------
+		
+		require_once( KERNEL_PATH.'class_xml.php' );
+		
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Get XML file (TEMPLATES)
+		//-----------------------------------------
+		
+		$xmlfile = ROOT_PATH.'ipb_templates.xml';
+		
+		$setting_content = implode( "", file($xmlfile) );
+		
+		//-----------------------------------------
+		// Unpack the datafile (TEMPLATES)
+		//-----------------------------------------
+		
+		$xml->xml_parse_document( $setting_content );
+		
+		//-----------------------------------------
+		// (TEMPLATES)
+		//-----------------------------------------
+		
+		if ( ! is_array( $xml->xml_array['templateexport']['templategroup']['template'] ) )
+		{
+			show_error("Error with ipb_templates.xml - could not process XML properly");
+		}
+	
+		foreach( $xml->xml_array['templateexport']['templategroup']['template'] as $id => $entry )
+		{
+			$newrow = array();
+			
+			$newrow['group_name']      = $entry[ 'group_name' ]['VALUE'];
+			$newrow['section_content'] = $entry[ 'section_content' ]['VALUE'];
+			$newrow['func_name']       = $entry[ 'func_name' ]['VALUE'];
+			$newrow['func_data']       = $entry[ 'func_data' ]['VALUE'];
+			$newrow['set_id']          = 1;
+			$newrow['updated']         = time();
+			
+			if ( $master[ strtolower( $newrow['group_name'] ) ][ strtolower( $newrow['func_name'] ) ] )
+			{
+				//-----------------------------------------
+				// Update
+				//-----------------------------------------
+				
+				$updates++;
+				
+				$DB->do_update( 'skin_templates', $newrow, 'suid='.$master[ strtolower( $newrow['group_name'] ) ][ strtolower( $newrow['func_name'] ) ] );
+			}
+			else
+			{
+				//-----------------------------------------
+				// Insert
+				//-----------------------------------------
+				
+				$inserts++;
+				
+				$DB->do_insert( 'skin_templates', $newrow );
+			}
+		}
+		
+		$ibforums->main_msg = "Master template set rebuilt!<br />$updates updated template bits, $inserts new template bits";
+		
+		$this->show_intro();
+	}
+	
+	//-----------------------------------------
+	// COMPLEX SEARCH
+	//-----------------------------------------
+	
+	function search_and_replace()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get $skin_names stuff
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/skin_info.php' );
+		
+		$SEARCH_set  = intval( $ibforums->input['set_skin_set_id'] );
+		
+		//-----------------------------------------
+		// Get set stuff
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$SEARCH_set ) ); 
+		
+		//-----------------------------------------
+		// Clean up before / after
+		//-----------------------------------------
+		
+		$before = $std->txt_stripslashes($_POST['searchfor']);
+		$after  = $std->txt_stripslashes($_POST['replacewith']);
+		$before = str_replace( '"', '\"', $before );
+		$after  = str_replace( '"', '\"', $after  );
+		
+		if ( ! $before )
+		{
+			$ibforums->main_msg = "You must enter a 'search for' string before continuing.";
+			$this->searchreplace_start();
+		}
+		
+		//-----------------------------------------
+		// Clean up regex
+		//-----------------------------------------
+		
+		if ( $ibforums->input['regexmode'] )
+		{
+			$before = str_replace( '#', '\#', $before );
+			
+			//-----------------------------------------
+			// Test to ensure they are legal
+			// - catch warnings, etc
+			//-----------------------------------------
+			
+			ob_start();
+			eval( "preg_replace( \"#{$before}#i\", \"{$after}\", '' );");
+			$return = ob_get_contents();
+			ob_end_clean();
+			
+			if ( $return )
+			{
+				$ibforums->main_msg = "There was an error processing the 'search for' and 'replace with' variables - please ensure that they are legal regular expressions before continuing.";
+				$this->searchreplace_start();
+			}
+		}
+		
+		//-----------------------------------------
+		// we're here, so it's good
+		//-----------------------------------------
+		
+		$templates = array();
+		$matches   = 0;
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => 'set_id='.$SEARCH_set ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $ibforums->input['regexmode'] )
+			{
+				if ( preg_match( "#{$before}#i", $r['section_content'] ) )
+				{
+					$templates[ $r['group_name'] ][ strtolower($r['func_name']) ] = $r;
+					$matches++;
+				}
+			}
+			else if ( strstr( $r['section_content'], $before ) )
+			{
+				$templates[ $r['group_name'] ][ strtolower($r['func_name']) ] = $r;
+				$matches++;
+			}
+		}
+		
+		//-----------------------------------------
+		// No matches...
+		//-----------------------------------------
+		
+		if ( ! count($templates) )
+		{
+			$ibforums->html .= "<div class='tableborder'>
+								 <div class='maintitle'>Search & Replace Results</div>
+								 <div class='tablepad'>
+								  <b>You searched for: ".htmlentities($before)."</b>
+								  <br />
+								  <br />
+								  Unfortunately your search didn't return any matches. Please try again and broaden your search terms.
+								 </div>
+								</div>";
+			
+			$ibforums->admin->output();
+		}
+		
+		//-----------------------------------------
+		// Swapping or showing?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['testonly'] )
+		{
+			$ibforums->html .= "<div class='tableborder'>
+								 <div class='maintitle'>Search & Replace Results</div>
+								 <div class='tablepad' style='padding:5px'><b style='font-size:12px'>{$matches} matches for '".htmlentities($before)."' to be replaced with '".htmlentities($after)."'</b><br /><br />";
+								 
+			//-----------------------------------------
+			// Go fru dem all and print..
+			//-----------------------------------------
+			
+			foreach( $templates as $group => $d )
+			{
+				foreach( $templates[ $group ] as $tmp_name => $tmp_data )
+				{
+					if ( isset($skin_names[ $group ]) )
+					{
+						$group_name = $skin_names[ $group ][0];
+					}
+					else
+					{
+						$group_name = $group;
+					}
+					
+					$html = $tmp_data['section_content'];
+					
+					//-----------------------------------------
+					// Decode...
+					//-----------------------------------------
+					
+					$hl    = $before;
+					$after = str_replace( '\\\\', '\\\\\\', $after );
+					
+					if ( ! $after )
+					{
+						$hl   = preg_replace( "#\((.+?)\)#s", "(?:\\1)", $hl );
+						$html = preg_replace( "#({$hl})#si" , '{#-^--opentag--^-#}'."\\1".'{#-^--closetag--^-#}', $html );
+					}
+					else
+					{
+						//-----------------------------------------
+						// Wrap tags (so we don't use
+						// < >, etc )
+						//-----------------------------------------
+						
+						$html = preg_replace( "#{$hl}#si", '{#-^--opentag--^-#}'.$after.'{#-^--closetag--^-#}', $html );
+					}
+					
+					
+					
+					
+					//-----------------------------------------
+					// Clean up..
+					//-----------------------------------------
+					
+					$html = str_replace( "{#-^--opentag--^-#}\\", '{#-^--opentag--^-#}', $html );
+					
+					//-----------------------------------------
+					// convert to printable html
+					//-----------------------------------------
+					
+					$html = str_replace( "<" , "&lt;"  , $html);
+					$html = str_replace( ">" , "&gt;"  , $html);
+					$html = str_replace( "\"", "&quot;", $html);
+					
+					$html = preg_replace( "!&lt;\!--(.+?)(//)?--&gt;!s"              , "&#60;&#33;<span style='color:red'>--\\1--\\2</span>&#62;", $html );
+					$html = preg_replace( "#&lt;([^&<>]+)&gt;#s"                     , "<span style='color:blue'>&lt;\\1&gt;</span>"             , $html );   //Matches <tag>
+					$html = preg_replace( "#&lt;([^&<>]+)=#s"                        , "<span style='color:blue'>&lt;\\1</span>="                , $html );   //Matches <tag
+					$html = preg_replace( "#&lt;/([^&]+)&gt;#s"                      , "<span style='color:blue'>&lt;/\\1&gt;</span>"            , $html );   //Matches </tag>
+					$html = preg_replace( "!=(&quot;|')([^<>])(&quot;|')(\s|&gt;)!s" , "=\\1<span style='color:purple'>\\2</span>\\3\\4"         , $html );   //Matches ='this'
+					
+					//-----------------------------------------
+					// convert back wrap tags
+					//-----------------------------------------
+					
+					$html = str_replace( '{#-^--opentag--^-#}' , "<span style='color:red;font-weight:bold;background-color:yellow'>", $html );
+					$html = str_replace( '{#-^--closetag--^-#}', "</span>", $html );
+			
+					$ibforums->html .= "<div class='tableborder'>
+										 <div class='maintitle'>{$group_name} &middot; {$tmp_data['func_name']}</div>
+										 <div class='tdrow2' style='height:100px;overflow:auto'><pre>{$html}</pre></div>
+										</div>
+										<br />";
+				}
+			}
+			
+			$ibforums->html .= "</div></div>";
+			
+			$ibforums->admin->nav[] = array( "", "Search results from set ".$this_set['set_name'] );
+			
+			$ibforums->admin->output();
+		}
+		else
+		{
+			//-----------------------------------------
+			// Jus' do iiit
+			//-----------------------------------------
+			
+			$after  = str_replace( '\\\\', '\\\\\\', $after );
+			$report = array();
+			
+			foreach( $templates as $group => $d )
+			{
+				foreach( $templates[ $group ] as $tmp_name => $tmp_data )
+				{
+					if ( $ibforums->input['regexmode'] )
+					{
+						$tmp_data['section_content'] = preg_replace( "#{$before}#si", $after, $tmp_data['section_content'] );
+						
+					}
+					else
+					{
+						$tmp_data['section_content'] = str_replace( $before, $after, $tmp_data['section_content'] );
+					}
+					
+					//-----------------------------------------
+					// Update DB
+					//-----------------------------------------
+					
+					$DB->do_update( 'skin_templates', array( 'section_content' => $tmp_data['section_content'] ), 'suid='.$tmp_data['suid'] );
+					
+					$report[] = $tmp_data['func_name'].' updated...';
+				}
+			}
+			
+			//-----------------------------------------
+			// Recache skin template..
+			//-----------------------------------------
+			
+			$ibforums->cache_func->_recache_templates( $SEARCH_set, $this_set['set_skin_set_parent'] );
+			$report[] = "Templates recached for set {$this_set['set_name']}";
+			
+			$ibforums->main_msg = implode( "<br />", $report );
+			$this->searchreplace_start();
+		}
+	}
+	
+	//-----------------------------------------
+	// SIMPLE SEARCH
+	//-----------------------------------------
+	
+	function simple_search()
+	{
+		global $ibforums, $DB, $std;
+		
+		$templates = array();
+		$final     = array();
+		$matches   = array();
+		
+		//-----------------------------------------
+		// Get $skin_names stuff
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/skin_info.php' );
+		
+		//-----------------------------------------
+		// Get stuff
+		//-----------------------------------------
+		
+		$rawword = $_GET['searchkeywords'] ? urldecode( $_GET['searchkeywords'] ) : $_POST['searchkeywords'];
+		
+		$SEARCH_word = trim( $std->txt_safeslashes( $rawword ) );
+		$SEARCH_safe = urlencode( $SEARCH_word );
+		$SEARCH_all  = intval( $ibforums->input['searchall'] );
+		$SEARCH_set  = intval( $ibforums->input['set_skin_set_id'] );
+		
+		$this->unaltered    = "<img src='{$ibforums->skin_url}/skin_item_unaltered.gif' border='0' alt='-' title='Unaltered from parent skin set' />&nbsp;";
+		$this->altered      = "<img src='{$ibforums->skin_url}/skin_item_altered.gif' border='0' alt='+' title='Altered from parent skin set' />&nbsp;";
+		$this->inherited    = "<img src='{$ibforums->skin_url}/skin_item_inherited.gif' border='0' alt='|' title='Inherited from parent skin set' />&nbsp;";
+		
+		//-----------------------------------------
+		// check (please?)
+		//-----------------------------------------
+		
+		if ( ! $SEARCH_word )
+		{
+			$ibforums->main_msg = "You must enter a search word";
+			$this->searchreplace_start();
+		}
+		
+		//-----------------------------------------
+		// Get set stuff
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$SEARCH_set ) ); 
+		
+		if ( ! $this_set['set_skin_set_id'] )
+		{
+			$ibforums->main_msg = "No such set was found in the DB";
+			$this->searchreplace_start();
+		}
+		
+		//-----------------------------------------
+		// Get templates from DB
+		//-----------------------------------------
+		
+		if ( $SEARCH_all )
+		{
+			$templates = $ibforums->cache_func->_get_templates( $this_set['set_skin_set_id'], $this_set['set_skin_set_parent'], 'all' );
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => 'set_id='.$SEARCH_set ) );
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$templates[ $r['group_name'] ][ strtolower($r['func_name']) ] = $r;
+			}
+		}
+		
+		if ( ! count( $templates ) )
+		{
+			$ibforums->main_msg = "Couldn't locate any templates to search in!";
+			$this->searchreplace_start();
+		}
+		
+		//-----------------------------------------
+		// Go fru dem all and search
+		//-----------------------------------------
+		
+		foreach( $templates as $group => $d )
+		{
+			foreach( $templates[ $group ] as $tmp_name => $tmp_data )
+			{
+				if ( strstr( strtolower( $tmp_data['section_content'] ), strtolower( $SEARCH_word ) ) )
+				{
+					$final[ $group ][] = $tmp_data;
+					$matches[ $group ]++;
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Print..
+		//-----------------------------------------
+		
+		if ( ! count($final) )
+		{
+			$ibforums->html .= "<div class='tableborder'>
+								 <div class='maintitle'>Search Results</div>
+								 <div class='tablepad'>
+								  <b>You searched for: {$SEARCH_word}</b>
+								  <br />
+								  <br />
+								  Unfortunately your search didn't return any matches. Please try again and broaden your search terms.
+								 </div>
+								</div>";
+								
+			$ibforums->admin->output();
+		}
+		
+		//-----------------------------------------
+		// Get all possible groups...
+		//-----------------------------------------
+		
+		$group_titles = $ibforums->cache_func->_get_templates( $this_set['set_skin_set_id'], $this_set['set_skin_set_parent'], 'groups' );
+		
+		foreach( $group_titles as $title => $g )
+		{
+			//-----------------------------------------
+			// Fix up names
+			//-----------------------------------------
+			
+			$g['easy_name'] = "<b>".$g['group_name']."</b>";
+			
+			//-----------------------------------------
+			// If available, change group name to easy name
+			//-----------------------------------------
+			
+			if ( isset($skin_names[ $g['group_name'] ]) )
+			{
+				$g['easy_name'] = "<b>".$skin_names[ $g['group_name'] ][0]."</b>";
+				$g['easy_desc'] = str_replace( '"', '&quot;', $skin_names[ $g['group_name'] ][1] );
+			}
+			else
+			{
+				$g['easy_name'] = "<b>".$g['group_name']."</b> (Non-Default Group)";
+			}
+			
+			if ( $skin_names[ $g['group_name'] ][2] )
+			{
+				$g['easy_preview'] = "<a title='New window: Show relevant IPB page' href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?{$skin_names[ $g['group_name'] ][2]}' target='_blank'><img src='{$ibforums->skin_url}/te_previewon.gif' alt='Preview' border='0' /></a>";
+			}
+			else
+			{
+				$g['easy_preview'] = "<img src='{$ibforums->skin_url}/te_previewoff.gif' alt='No preview available' border='0' title='No preview available' />";
+			}
+			
+			$groups[] = $g;
+		}
+		
+		//-----------------------------------------
+		// Sort by easy_name
+		//-----------------------------------------
+			
+		usort($groups, array( 'ad_skintools', 'perly_alpha_sort' ) );
+		
+		//-----------------------------------------
+		// Start the output
+		//-----------------------------------------
+		
+		$ibforums->html .= "<div class='tableborder'>
+							 <div class='maintitle'>Search results for: '".htmlentities($SEARCH_word)."'</div>";
+							 
+		foreach( $groups as $group )
+		{
+			$eid          = $group['suid'];
+			$exp_content  = "";
+			$search_match = intval( $matches[ $group['group_name'] ] );
+			
+			if ( count( $final[ $group['group_name'] ] ) )
+			{
+				//-----------------------------------------
+				// Get master template names..
+				//-----------------------------------------
+				
+				$ibforums->html .= $ibforums->adskin->js_checkdelete();
+				
+				$exp_content = "<a name='{$group['group_name']}'></a>
+								<div style='padding:4px;border-bottom:1px solid #999;background:#EEE'>
+								<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+								<tr>
+								 <td align='center' width='1%'><img src='{$ibforums->skin_url}/folder_with_page.gif' alt='Template Group' style='vertical-align:middle' /></td>
+								 <td align='left' width='60%'>
+								  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style='font-size:11px' href='#' onclick=\"toggleview('popbox_{$group['group_name']}'); return false;\">{$group['easy_name']}</a> ({$search_match} matches)
+								  </td>
+								 <td align='right' width='40%'>{$group['easy_preview']}</td>
+								</tr>
+								</table>
+								</div>
+								<div style='margin-left:25px;background:#EEE;border:1px solid #555;display:none;' id='popbox_{$group['group_name']}'>
+								   <div style='background-color:#CCC' class='skineditortopstrip'><b>{$group['easy_name']}</b></div>
+								   <form name='mutliact_{$group['group_name']}' action='{$ibforums->adskin->base_url}&act=templ&code=edit_bit&expand={$group['group_name']}&id={$SEARCH_set}&parent={$this_set['set_skin_set_parent']}' method='post'>
+								   <table cellspacing='0' width='100%' cellpadding='2'>
+								   <!--CONTENT-->
+								   </table>
+								   <div style='background:#CCC'>
+									 <div align='left' style='padding:5px;margin-left:25px'>
+									 <div style='float:right'>$add_button</div>
+									 <div><input type='submit' class='realbutton' value='Edit Selected' /></div>
+								   </div>
+								 </div>
+								 </form>
+								 </div>
+								";
+				$temp = "";
+				$sec_arry = array();
+				
+				//-----------------------------------------
+				// Stuff array to sort on name
+				//-----------------------------------------
+				
+				foreach( $final[ $group['group_name'] ] as $eye => $i )
+				{
+					$sec_arry[ $i['suid'] ] = $i;
+					$sec_arry[ $i['suid'] ]['easy_name'] = $i['func_name'];
+				}
+				
+				//-----------------------------------------
+				// Sort by easy_name
+				//-----------------------------------------
+				
+				usort($sec_arry, array( 'ad_skintools', 'perly_alpha_sort' ) );
+				
+				//-----------------------------------------
+				// Loop and print main display
+				//-----------------------------------------
+				
+				foreach( $sec_arry as $id => $sec )
+				{
+					$custom_bit    = "";
+					
+					//-----------------------------------------
+					// Altered?
+					//-----------------------------------------
+					
+					if ( $sec['set_id'] == $SEARCH_set )
+					{
+						$altered_image = $this->altered;
+						$css_info      = '#FCE8E8';  
+					}
+					else if ( $sec['set_id'] == 1 )
+					{
+						$altered_image = $this->unaltered;
+						$css_info      = '#EEE';
+					}
+					else
+					{
+						$altered_image = $this->inherited;
+						$css_info      = '#FFF2D3';
+					}
+					
+					$remove_button = "<img src='{$ibforums->skin_url}/blank.gif' alt='' border='0' width='44' height='16' />&nbsp;";
+					
+					if ( $sec['set_id'] == $SEARCH_set )
+					{
+						$remove_button = "<a title='Revert Customization' href=\"javascript:checkdelete('act=templ&code=remove_bit&suid={$sec['suid']}&id={$SEARCH_set}&parent={$this_set['set_skin_set_parent']}&expand={$group['group_name']}')\"><img src='{$ibforums->skin_url}/te_revert.gif' alt='X' border='0' /></a>&nbsp;";
+					}
+					
+					$temp .= "
+								<tr>
+								 <td width='2%' style='background-color:$css_info' align='center'><img src='{$ibforums->skin_url}/file.gif' title='Template Set:{$sec['set_id']}' alt='Template' style='vertical-align:middle' /></td>
+								 <td width='88%' style='background-color:$css_info'><input type='checkbox' style='background-color:$css_info' name='cb_{$sec['suid']}' value='1' />&nbsp;{$altered_image}<a href='{$ibforums->adskin->base_url}&act=templ&code=edit_bit&suid={$sec['suid']}&id={$SEARCH_set}&parent={$this_set['set_skin_set_parent']}&expand={$group['group_name']}&type=single' title='template bit name: {$sec['func_name']}'>{$sec['easy_name']}</a>{$custom_bit}</td>
+								 <td width='10%' style='background-color:$css_info' align='right' nowrap='nowrap'>
+								   $remove_button
+								   <a style='text-decoration:none' title='Preview template bit as text' href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=text&hl=".str_replace('%22', '{-22-}', $SEARCH_safe)."\",\"Preview{$sec['suid']}\", 500,400)'><img src='{$ibforums->skin_url}/te_text.gif' border='0' alt='Text Preview'></a>
+								   <a style='text-decoration:none' title='Preview template bit as HTML' href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=css\",\"Preview{$sec['suid']}\", 500,400)'><img src='{$ibforums->skin_url}/te_html.gif' border='0' alt='HTML Preview'>&nbsp;</a>
+								 </td>
+								</tr>
+							";
+				}
+			
+				
+				$ibforums->html .= str_replace( "<!--CONTENT-->", $temp, $exp_content );
+			}
+		}
+		
+		$ibforums->html .= "</div></div>";
+		
+		$ibforums->html .= "<br />
+							<div><strong>Template HTML Bits:</strong><br />
+							{$this->altered} This item has been customized for this skin set.
+							<br />{$this->unaltered} This item has not been customized from the master skin set.
+							<br />{$this->inherited} This item has inherited customizations from the parent skin set.
+							</div>
+							<br />";
+							
+		$ibforums->admin->nav[] = array( "", "Search results from set ".$this_set['set_name'] );
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// SEARCH & REPLACE SPLASH
+	//-----------------------------------------
+	
+	function searchreplace_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		$skin_list = $this->_get_skinlist();
+		
+		$ibforums->admin->page_detail = "These tools will allow you to search for keywords and bulk replace HTML.";
+		$ibforums->admin->page_title  = "Skin Search & Replace";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'     ),
+															     2 => array( 'code' , 'simplesearch'  ),
+													    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Simple Search" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search for...</b><br /><span style='color:gray'>Enter a simple keyword or block of HTML to search for</span>",
+															       $ibforums->adskin->form_simple_input( 'searchkeywords', '', 30 )
+													    )      );
+													  
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search in set...</b>",
+															     $skin_list
+															     ."<br /><input type='checkbox' name='searchall' value='1'> Search in selected set and all parents including the master set."
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Search and replace
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'     ),
+															     2 => array( 'code' , 'searchandreplace'  ),
+													    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search and Replace" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search for...</b><br /><span style='color:gray'>Enter a keyword or a block of HTML to search for.<br />If enabling 'regex mode' you may enter a regular expression here.</span>",
+															      $ibforums->adskin->form_textarea( 'searchfor', $_POST['searchfor'] )
+													    )      );
+													  
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Replace with...</b><br /><span style='color:gray'>Enter the replacement block of HTML<br />If enabling 'regex mode' you may enter a regular expression here.</span>",
+															     $ibforums->adskin->form_textarea( 'replacewith', $_POST['replacewith'] )
+													    )      );
+													    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search in set...</b><br /><span style='color:gray'>NOTE: The search and replace will only work on the specified skin set. The parent and master skin sets will NOT be searched or any replacements made on them.</span>",
+															     $skin_list
+													    )      );
+													    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Test Search and Replace Only?</b><br /><span style='color:gray'>If yes, no replacements will be made and you will be able to preview the changes.</span>",
+															      $ibforums->adskin->form_yes_no( 'testonly', 1 )
+													    )      );
+													    
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Enable 'regex' mode?</b><br /><span style='color:gray'>If yes, you may use 'regex' in your search and replacements.
+																 <br />Example:- Replace all &lt;br&gt; or &lt;br /&gt; with &lt;br clear='all' /&gt;
+																 <br />Search for: <b>&lt;(br)&#92;s?/?&gt;</b>
+																 <br />Replace with: <b>&lt;&#92;&#92;1 clear='all' /&gt;</b></span>",
+															      $ibforums->adskin->form_yes_no( 'regexmode', 0 )
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	// Swap members...
+	//-----------------------------------------
+	
+	function change_member()
+	{
+		global $ibforums, $DB, $std;
+		
+		$old_id = intval($ibforums->input['set_skin_set_id']);
+		$new_id = intval($ibforums->input['set_skin_set_id2']);
+		
+		if ($new_id == 'n')
+		{
+			$DB->do_update( 'members', array( 'skin' => '' ), 'skin='.$old_id );
+		}
+		else
+		{
+			$DB->do_update( 'members', array( 'skin' => $new_id ), 'skin='.$old_id );
+		}
+		
+		$ibforums->main_msg = "Members updated";
+		
+		$this->show_intro();
+	}
+	
+	//-----------------------------------------
+	// REBUILD MASTER
+	//-----------------------------------------
+	
+	function rebuildmaster()
+	{
+		global $ibforums, $DB, $std;
+		
+		$pid = intval($ibforums->input['phplocation']);
+		$cid = intval($ibforums->input['csslocation']);
+		
+		if ( $ibforums->input['phpyes'] )
+		{
+			if ( ! file_exists( CACHE_PATH.'skin_cache/cacheid_'.$pid ) )
+			{
+				$ibforums->main_msg = 'IPB cannot rebuild the master templates as the folder "cacheid_$pid" does not exist';
+			}
+			
+			$ibforums->cache_func->_rebuild_templates_from_php($pid);
+			
+			$ibforums->main_msg = 'Attempting to rebuild master set from PHP cache files...';
+				
+			$ibforums->main_msg .= "<br />".implode("<br />", $ibforums->cache_func->messages);
+		}
+		
+		if ( $ibforums->input['cssyes'] )
+		{
+			if ( ! file_exists( CACHE_PATH.'style_images/css_'.$cid.'.css' ) )
+			{
+				$ibforums->main_msg = 'IPB cannot rebuild the master CSS as the CSS "css_$cid" does not exist';
+			}
+			
+			$css = @file_get_contents( CACHE_PATH.'style_images/css_'.$cid.'.css' );
+			
+			if ( ! $css )
+			{
+				$ibforums->main_msg = 'IPB cannot rebuild the master CSS as the CSS "css_$cid" appears to be empty.';
+			}
+			
+			$css = preg_replace( "#^.*\*~START CSS~\*/#s", "", $css );
+			
+			//-----------------------------------------
+			// Attempt to rearrange style_images dir stuff
+			//-----------------------------------------
+			
+			$ibforums->main_msg = 'Attempting to rebuild master CSS from CSS cache files...';
+			
+			$css = preg_replace( "#url\((.+?)/(.+?)\)#is", "url(style_images/1/\\2)", $css );
+			
+			$DB->do_update( 'skin_sets', array( 'set_css' => $css, 'set_css_updated' => time() ), 'set_skin_set_id=1' );
+			
+			$ibforums->cache_func->_write_css_to_cache(1);
+			
+			$ibforums->main_msg .= "<br />".implode("<br />", $ibforums->cache_func->messages);
+		}
+		
+		$this->show_intro();
+	}
+	
+	//-----------------------------------------
+	// REBUILD CACHES
+	//-----------------------------------------
+	
+	function rebuildcaches()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache_func->_rebuild_all_caches(array($ibforums->input['set_skin_set_id']));
+		
+		$ibforums->main_msg = 'Skin Set Caches Rebuilt (id: '.$ibforums->input['set_skin_set_id'].')';
+			
+		$ibforums->main_msg .= "<br />".implode("<br />", $ibforums->cache_func->messages);
+		
+		$this->show_intro();
+	}
+	
+	//-----------------------------------------
+	// SHOW MAIN SCREEN
+	//-----------------------------------------
+	
+	function show_intro()
+	{
+		global $ibforums, $DB, $std;
+		
+		$skin_list = $this->_get_skinlist();
+		
+		//-----------------------------------------
+		// REBUILD MASTER TEMPLATES
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'      ),
+															     2 => array( 'code' , 'rebuildmasterhtml'  ),
+													    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "{none}"  , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild Master Templates" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Running this tool will rebuild your master HTML templates that all your skins inherit from.</b>
+																  <br />After running, you may wish to rebuild your skin set caches to update them with the changes.
+																  <br />Make sure you've got 'ipb_templates.xml' uploaded into your forum root.",
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Run tool...");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// REBUILD CACHES
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'      ),
+															     2 => array( 'code' , 'rebuildcaches'  ),
+													    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Rebuild Skin Set Cache" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild skin set cache on set...</b><br /><span style='color:gray'>This option will rebuild the template HTML, wrapper, macro and css caches of this set and any children.</span><br />[ <a href='{$ibforums->base_url}&act=sets&code=rebuildalltemplates'>Rebuild All</a> ]",
+															     $skin_list
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Run tool...");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// CHANGE MEMBERS 
+		//-----------------------------------------
+		
+		$dd_two = str_replace( "select name='set_skin_set_id'", "select name='set_skin_set_id2'", $skin_list );
+		$dd_two = str_replace( "<!--DD.OPTIONS-->", "<option value='n'>None - use the admin defaults</option>", $dd_two );
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'      ),
+															     2 => array( 'code' , 'changemember'  ),
+													    )      );
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Update Members Skin Choice" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Where the member currently uses...</b>",
+															     $skin_list
+													    )      );
+													  
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Make them use...</b>",
+															     $dd_two
+													    )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Run tool...");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// REBUILD MASTER
+		//-----------------------------------------
+		
+		if ( IN_DEV )
+		{
+			$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'skintools'      ),
+														             2 => array( 'code' , 'rebuildmaster'  ),
+														    )      );
+											 
+			$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+			$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+			
+			$ibforums->html .= $ibforums->adskin->start_table( "Rebuild Master Skin Set" );
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Rebuild 'IPB Master Skin Set' FROM CSS AND PHP files.</b><br /><span style='color:gray'>This option will rebuild the template HTML for the master skin set. USE VERY CAREFULLY!</span>",
+																   "<input type='checkbox' name='phpyes' value='1' /> PHP cache dir.: skin_cache/cacheid_ ".$ibforums->adskin->form_simple_input( 'phplocation', '1', 3 )."<br />".
+																   "<input type='checkbox' name='cssyes' value='1' /> CSS cache file: style_images/css_ ".$ibforums->adskin->form_simple_input( 'csslocation', '1',3 )
+														  )      );
+			
+			$ibforums->html .= $ibforums->adskin->end_form("Run tool...");
+			
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// Get dropdown of skin
+	//-----------------------------------------
+	
+	function _get_skinlist()
+	{
+		global $ibforums, $DB, $std;
+		
+		$skin_sets = array();
+		$skin_list = "<select name='set_skin_set_id' class='dropdown'><!--DD.OPTIONS-->";
+		
+		//-----------------------------------------
+		// Get formatted list of skin sets
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'order' => 'set_skin_set_parent, set_skin_set_id' ) );
+		$DB->simple_exec();
+		
+		while ( $s = $DB->fetch_row() )
+		{
+			$skin_sets[ $s['set_skin_set_id'] ] = $s;
+			$skin_sets[ $s['set_skin_set_parent'] ]['_children'][] = $s['set_skin_set_id'];
+		}
+		
+		//-----------------------------------------
+		// Roots
+		//-----------------------------------------
+		
+		foreach( $skin_sets as $id => $data )
+		{
+			if ( $data['set_skin_set_parent'] < 1 and $id > 1 )
+			{
+				$skin_list .= "\n<option value='$id'>{$data['set_name']}</option><!--CHILDREN:{$id}-->";
+			}
+		}
+		
+		//-----------------------------------------
+		// Kids...
+		//-----------------------------------------
+		
+		foreach( $skin_sets as $id => $data )
+		{	
+			if ( is_array( $data['_children'] ) and count( $data['_children'] ) > 0 )
+			{
+				$html = "";
+				
+				foreach( $data['_children'] as $cid )
+				{
+					$html .= "\n<option value='$cid'>---- {$skin_sets[ $cid ]['set_name']}</option>";
+				}
+				
+				$skin_list = str_replace( "<!--CHILDREN:{$id}-->", $html, $skin_list );
+			}
+		}
+		
+		$skin_list .= "</select>";
+		
+		return $skin_list;
+	}
+	
+	//-----------------------------------------
+	// Sort by group name
+	//-----------------------------------------
+	
+	function perly_alpha_sort($a, $b)
+	{
+		return strcmp($a['easy_name'], $b['easy_name']);
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_spiderlogs.php b/upload/sources/admin/ad_spiderlogs.php
new file mode 100644
index 00000000..13375979
--- /dev/null
+++ b/upload/sources/admin/ad_spiderlogs.php
@@ -0,0 +1,305 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Spider (MAN) Logs
+|   > Module written by Matt Mecham
+|   > Date started: 28th May 2003
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_spiderlogs {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=spiderlog', 'Search Engine Spider Logs' );
+		
+		//-----------------------------------------
+		// Get bot names
+		//-----------------------------------------
+		
+		foreach( explode( "\n", $ibforums->vars['search_engine_bots'] ) as $bot )
+		{
+			list($ua, $n) = explode( "=", $bot );
+			
+			$this->bot_map[ strtolower($ua) ] = $n;
+		}
+		
+		switch($ibforums->input['code'])
+		{
+			case 'view':
+				$this->view();
+				break;
+				
+			case 'remove':
+				$this->remove();
+				break;
+				
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function view()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$start = $ibforums->input['st'] ? $ibforums->input['st'] : 0;
+		
+		$ibforums->admin->page_detail = "Viewing all actions by a search engine spider";
+		$ibforums->admin->page_title  = "Search Engine Logs Manager";
+		
+		$botty = urldecode($ibforums->input['bid']);
+	
+		if ($ibforums->input['search_string'] == "")
+		{
+			$DB->simple_construct( array( 'select' => 'COUNT(sid) as count', 'from' => 'spider_logs', 'where' => "bot='$botty'" ) );
+			$DB->simple_exec();
+		
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=spiderlog&bid={$ibforums->input['bid']}&code=view";
+			
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'spider_logs',
+										  'where'  => "bot='$botty'",
+										  'order'  => 'entry_date DESC',
+										  'limit'  => array( $start, 20 ) ) );
+			$DB->simple_exec();
+		}
+		else
+		{
+			$ibforums->input['search_string'] = urldecode($ibforums->input['search_string']);
+			
+			$DB->simple_construct( array( 'select' => 'COUNT(sid) as count', 'from' => 'spider_logs', 'where' => "query_string LIKE '%{$ibforums->input['search_string']}%'" ) );
+			$DB->simple_exec();
+			
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=spiderlog&code=view&search_string=".urlencode($ibforums->input['search_string']);
+			
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'spider_logs',
+										  'where'  => "query_string LIKE '%{$ibforums->input['search_string']}%'",
+										  'order'  => 'entry_date DESC',
+										  'limit'  => array( $start, 20 ) ) );
+			$DB->simple_exec();
+		}
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
+											   'PER_PAGE'    => 20,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Pages: ",
+											   'BASE_URL'    => $ibforums->base_url.$query,
+											 )
+									  );
+									  
+		$ibforums->admin->page_detail = "You may view and remove actions performed by a search engine bot";
+		$ibforums->admin->page_title  = "Search Engine Logs Manager";
+		
+        //-----------------------------------------
+		// Show form!
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Bot Name"            , "15%" );
+		$ibforums->adskin->td_header[] = array( "Query String"        , "15%" );
+		$ibforums->adskin->td_header[] = array( "Time of action"      , "20%" );
+		$ibforums->adskin->td_header[] = array( "IP address"          , "10%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Search Engine Logs" );
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'right', 'pformstrip');
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+				$extra = "";
+				
+				if ( preg_match( '#lo-fi#i', $row['query_string'] ) )
+				{
+					$extra = '(Lo-Fi)';
+					$row['query_string'] = 'showtopic='.preg_replace( "#Lo-Fi\: t(.+?)\.html#", "\\1", $row['query_string'] );
+				}
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>".$this->bot_map[ strtolower($row['bot']) ]."</b>",
+																		 "<a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?{$row['query_string']}' target='_blank'>$extra {$row['query_string']}</a>",
+																		 $ibforums->admin->get_date( $row['entry_date'], 'LONG' ),
+																		 "{$row['ip_address']}",
+																)      );
+			
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'right', 'pformstrip');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function remove()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ($ibforums->input['bid'] == "")
+		{
+			$ibforums->admin->error("You did not select a bot to remove by!");
+		}
+		
+		$botty = urldecode($ibforums->input['bid']);
+		
+		$DB->simple_exec_query( array( 'delete' => 'spider_logs', 'where' => "bot='$botty'" ) );
+		
+		$ibforums->admin->save_log("Removed Search Engine Logs");
+		
+		$std->boink_it($ibforums->base_url."&act=spiderlog");
+		exit();
+	
+	
+	}
+	
+	
+
+	
+	
+	//-----------------------------------------
+	// SHOW ALL LANGUAGE PACKS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$form_array = array();
+	
+		$ibforums->admin->page_detail = "You may view and remove entries in your spider engine logs";
+		$ibforums->admin->page_title  = "Search Engine Logs Manager";
+
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Bot Name"            , "20%" );
+		$ibforums->adskin->td_header[] = array( "Hits"                , "20%" );
+		$ibforums->adskin->td_header[] = array( "Started"             , "20%" );
+		$ibforums->adskin->td_header[] = array( "View all by bot"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Remove all by bot"   , "20%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Search Engine Spider Logs" );
+		
+									  
+		$DB->cache_add_query( 'spiderlogs_list_current', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+		
+			$url_butt = urlencode($r['bot']);
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( $this->bot_map[ strtolower($r['bot']) ],
+																	 "<center>{$r['cnt']}</center>",
+																	  $ibforums->admin->get_date( $r['entry_date'], 'SHORT' ),
+																	 "<center><a href='".$ibforums->adskin->base_url."&act=spiderlog&code=view&bid={$url_butt}'>View</a></center>",
+																	 "<center><a href='".$ibforums->adskin->base_url."&act=spiderlog&code=remove&bid={$url_butt}'>Remove</a></center>",
+															)      );
+		}
+			
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'view'     ),
+																 2 => array( 'act'   , 'spiderlog'       ),
+														)      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Search Engine Logs" );
+			
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search for...</b>" ,
+										  		  $ibforums->adskin->form_input( "search_string").'... in the query string'
+								 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_statistics.php b/upload/sources/admin/ad_statistics.php
new file mode 100644
index 00000000..f4ff85b3
--- /dev/null
+++ b/upload/sources/admin/ad_statistics.php
@@ -0,0 +1,557 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Statistical functions
+|   > Module written by Matt Mecham
+|   > Date started: 4th July 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_statistics {
+
+	var $base_url;
+	var $month_names = array();
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		
+		$this->month_names = array( 1 => 'January', 'February', 'March'     , 'April'  , 'May'     , 'June',
+										 'July'   , 'August'  , 'September' , 'October', 'November', 'December'
+								  );
+
+		switch($ibforums->input['code'])
+		{
+			case 'show_reg':
+				$this->result_screen('reg');
+				break;
+				
+			case 'show_topic':
+				$this->result_screen('topic');
+				break;
+					
+			case 'topic':
+				$this->main_screen('topic');
+				break;
+			
+			//-----------------------------------------
+			
+			case 'show_post':
+				$this->result_screen('post');
+				break;
+					
+			case 'post':
+				$this->main_screen('post');
+				break;
+			
+			//-----------------------------------------
+			
+			case 'show_msg':
+				$this->result_screen('msg');
+				break;
+					
+			case 'msg':
+				$this->main_screen('msg');
+				break;
+				
+				//-----------------------------------------
+			
+			case 'show_views':
+				$this->show_views();
+				break;
+					
+			case 'views':
+				$this->main_screen('views');
+				break;
+			
+			//-----------------------------------------
+			
+			default:
+				$this->main_screen('reg');
+				break;
+		}
+		
+	}
+	
+	//select forum_id, SUM(views)from ibf_topics group by forum_id order by forum_id
+	
+	//-----------------------------------------
+	//| Results screen
+	//-----------------------------------------
+	
+	function show_views()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Statistic Center Results";
+		
+		$ibforums->admin->page_detail = "Showing topic view statistics";
+		
+		//-----------------------------------------
+		
+		if ( ! checkdate($ibforums->input['to_month']   ,$ibforums->input['to_day']   ,$ibforums->input['to_year']) )
+		{
+			$ibforums->admin->error("The 'Date To:' time is incorrect, please check the input and try again");
+		}
+		
+		if ( ! checkdate($ibforums->input['from_month'] ,$ibforums->input['from_day'] ,$ibforums->input['from_year']) )
+		{
+			$ibforums->admin->error("The 'Date From:' time is incorrect, please check the input and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$to_time   = mktime(12 ,0 ,0 ,$ibforums->input['to_month']   ,$ibforums->input['to_day']   ,$ibforums->input['to_year']  );
+		$from_time = mktime(12 ,0 ,0 ,$ibforums->input['from_month'] ,$ibforums->input['from_day'] ,$ibforums->input['from_year']);
+		
+		
+		$human_to_date   = getdate($to_time);
+		$human_from_date = getdate($from_time);
+		
+		$DB->cache_add_query( 'statistics_show_views', array( 'from_time' => $from_time, 'to_time' => $to_time, 'sortby' => $ibforums->input['sortby'] ) );
+		$DB->cache_exec_query();
+		
+		$running_total = 0;
+		$max_result    = 0;
+		
+		$results       = array();
+		
+		$ibforums->adskin->td_header[] = array( "Forum"   , "40%" );
+		$ibforums->adskin->td_header[] = array( "Result"  , "50%" );
+		$ibforums->adskin->td_header[] = array( "Views"   , "10%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Topic Views"
+										    ." ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} to"
+										    ." {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})"
+										  );
+		
+		if ( $DB->get_num_rows() )
+		{
+		
+			while ($row = $DB->fetch_row() )
+			{
+			
+				if ( $row['result_count'] >  $max_result )
+				{
+					$max_result = $row['result_count'];
+				}
+				
+				$running_total += $row['result_count'];
+			
+				$results[] = array(
+									 'result_name'     => $row['result_name'],
+									 'result_count'    => $row['result_count'],
+								  );
+								  
+			}
+			
+			foreach( $results as $pOOp => $data )
+			{
+			
+    			$img_width = intval( ($data['result_count'] / $max_result) * 100 - 8);
+    			
+    			if ($img_width < 1)
+    			{
+    				$img_width = 1;
+    			}
+    			
+    			$img_width .= '%';
+    			
+    			$ibforums->html .= $ibforums->adskin->add_td_row( array( $data['result_name'],
+    													  "<img src='{$ibforums->adskin->img_url}/bar_left.gif' border='0' width='4' height='11' align='middle' alt=''><img src='{$ibforums->adskin->img_url}/bar.gif' border='0' width='$img_width' height='11' align='middle' alt=''><img src='{$ibforums->adskin->img_url}/bar_right.gif' border='0' width='4' height='11' align='middle' alt=''>",
+												  		  "<center>".$data['result_count']."</center>",
+									             )      );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( '&nbsp;',
+													 "<div align='right'><b>Total</b></div>",
+													 "<center><b>".$running_total."</b></center>",
+											)      );
+		
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No results found", "center" );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	//| Results screen
+	//-----------------------------------------
+	
+	function result_screen($mode='reg')
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Statistic Center Results";
+		
+		$ibforums->admin->page_detail = "&nbsp;";
+		
+		//-----------------------------------------
+		
+		if ( ! checkdate($ibforums->input['to_month']   ,$ibforums->input['to_day']   ,$ibforums->input['to_year']) )
+		{
+			$ibforums->admin->error("The 'Date To:' time is incorrect, please check the input and try again");
+		}
+		
+		if ( ! checkdate($ibforums->input['from_month'] ,$ibforums->input['from_day'] ,$ibforums->input['from_year']) )
+		{
+			$ibforums->admin->error("The 'Date From:' time is incorrect, please check the input and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$to_time   = mktime(12 ,0 ,0 ,$ibforums->input['to_month']   ,$ibforums->input['to_day']   ,$ibforums->input['to_year']  );
+		$from_time = mktime(12 ,0 ,0 ,$ibforums->input['from_month'] ,$ibforums->input['from_day'] ,$ibforums->input['from_year']);
+		
+		
+		$human_to_date   = getdate($to_time);
+		$human_from_date = getdate($from_time);
+		
+		//-----------------------------------------
+		
+		if ($mode == 'reg')
+		{
+			$table     = 'Registration Statistics';
+			
+			$sql_table = 'members';
+			$sql_field = 'joined';
+			
+			$ibforums->admin->page_detail = "Showing the number of users registered. (Note: All times based on GMT)";
+		}
+		else if ($mode == 'topic')
+		{
+			$table     = 'New Topic Statistics';
+			
+			$sql_table = 'topics';
+			$sql_field = 'start_date';
+			
+			$ibforums->admin->page_detail = "Showing the number of topics started. (Note: All times based on GMT)";
+		}
+		else if ($mode == 'post')
+		{
+			$table     = 'Post Statistics';
+			
+			$sql_table = 'posts';
+			$sql_field = 'post_date';
+			
+			$ibforums->admin->page_detail = "Showing the number of posts. (Note: All times based on GMT)";
+		}
+		else if ($mode == 'msg')
+		{
+			$table     = 'PM Sent Statistics';
+			
+			$sql_table = 'message_topics';
+			$sql_field = 'mt_date';
+			
+			$ibforums->admin->page_detail = "Showing the number of sent messages. (Note: All times based on GMT)";
+		}
+		
+	  
+	  	switch ($ibforums->input['timescale'])
+	  	{
+	  		case 'daily':
+	  			$sql_date = "%w %U %m %Y";
+		  		$php_date = "F jS - Y";
+		  		break;
+		  		
+		  	case 'monthly':
+		  		$sql_date = "%m %Y";
+		  	    $php_date = "F Y";
+		  	    break;
+		  	    
+		  	default:
+		  		// weekly
+		  		$sql_date = "%U %Y";
+		  		$php_date = " [F Y]";
+		  		break;
+		}
+		
+		$DB->cache_add_query( 'statistics_result_screen', array( 'from_time' => $from_time,
+																 'to_time'   => $to_time,
+																 'sortby'    => $ibforums->input['sortby'],
+																 'sql_field' => $sql_field,
+																 'sql_table' => $sql_table,
+																 'sql_date'  => $sql_date ) );
+		$DB->cache_exec_query();
+		
+		$running_total = 0;
+		$max_result    = 0;
+		
+		$results       = array();
+		
+		$ibforums->adskin->td_header[] = array( "Date"    , "20%" );
+		$ibforums->adskin->td_header[] = array( "Result"  , "70%" );
+		$ibforums->adskin->td_header[] = array( "Count"   , "10%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( ucfirst($ibforums->input['timescale'])
+										    ." ".$table
+										    ." ({$human_from_date['mday']} {$this->month_names[$human_from_date['mon']]} {$human_from_date['year']} to"
+										    ." {$human_to_date['mday']} {$this->month_names[$human_to_date['mon']]} {$human_to_date['year']})"
+										  );
+		
+		if ( $DB->get_num_rows() )
+		{
+		
+			while ($row = $DB->fetch_row() )
+			{
+			
+				if ( $row['result_count'] >  $max_result )
+				{
+					$max_result = $row['result_count'];
+				}
+				
+				$running_total += $row['result_count'];
+			
+				$results[] = array(
+									 'result_maxdate'  => $row['result_maxdate'],
+									 'result_count'    => $row['result_count'],
+									 'result_time'     => $row['result_time'],
+								  );
+								  
+			}
+			
+			foreach( $results as $pOOp => $data )
+			{
+			
+    			$img_width = intval( ($data['result_count'] / $max_result) * 100 - 8);
+    			
+    			if ($img_width < 1)
+    			{
+    				$img_width = 1;
+    			}
+    			
+    			$img_width .= '%';
+    			
+    			if ($ibforums->input['timescale'] == 'weekly')
+    			{
+    				$date = "Week #".strftime("%W", $data['result_maxdate']) . date( $php_date, $data['result_maxdate'] );
+    			}
+    			else
+    			{
+    				$date = date( $php_date, $data['result_maxdate'] );
+    			}
+    			
+    			$ibforums->html .= $ibforums->adskin->add_td_row( array( $date,
+    													  "<img src='{$ibforums->adskin->img_url}/bar_left.gif' border='0' width='4' height='11' align='middle' alt=''><img src='{$ibforums->adskin->img_url}/bar.gif' border='0' width='$img_width' height='11' align='middle' alt=''><img src='{$ibforums->adskin->img_url}/bar_right.gif' border='0' width='4' height='11' align='middle' alt=''>",
+												  		  "<center>".$data['result_count']."</center>",
+									             )      );
+			}
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( '&nbsp;',
+													 "<div align='right'><b>Total</b></div>",
+													 "<center><b>".$running_total."</b></center>",
+											)      );
+		
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic( "No results found", "center" );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	//| Date selection screen
+	//-----------------------------------------
+	
+	function main_screen($mode='reg')
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_title = "Statistic Center";
+		
+		$ibforums->admin->page_detail = "Please define the date ranges and other options below.<br>Note: The statistics generated are based on the information currently held in the database, they do not take into account pruned forums or delete posts, etc.";
+		
+		if ($mode == 'reg')
+		{
+			$form_code = 'show_reg';
+			
+			$table     = 'Registration Statistics';
+		}
+		else if ($mode == 'topic')
+		{
+			$form_code = 'show_topic';
+			
+			$table     = 'New Topic Statistics';
+		}
+		else if ($mode == 'post')
+		{
+			$form_code = 'show_post';
+			
+			$table     = 'Post Statistics';
+		}
+		else if ($mode == 'msg')
+		{
+			$form_code = 'show_msg';
+			
+			$table     = 'PM Statistics';
+		}
+		else if ($mode == 'views')
+		{
+			$form_code = 'show_views';
+			
+			$table     = 'Topic View Statistics';
+		}
+		
+		
+		$old_date = getdate(time() - (3600 * 24 * 90));
+		$new_date = getdate(time() + (3600 * 24));
+		
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $form_code  ),
+												  2 => array( 'act'   , 'stats'     ),
+									     )      );
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $table );
+		
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Date From</b>" ,
+												  $ibforums->adskin->form_dropdown( "from_month" , $this->make_month(), $old_date['mon']  ).'&nbsp;&nbsp;'.
+												  $ibforums->adskin->form_dropdown( "from_day"   , $this->make_day()  , $old_date['mday'] ).'&nbsp;&nbsp;'.
+												  $ibforums->adskin->form_dropdown( "from_year"  , $this->make_year() , $old_date['year'] )
+									     )      );
+									     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Date To</b>" ,
+												  $ibforums->adskin->form_dropdown( "to_month" , $this->make_month(), $new_date['mon']  ).'&nbsp;&nbsp;'.
+												  $ibforums->adskin->form_dropdown( "to_day"   , $this->make_day()  , $new_date['mday'] ).'&nbsp;&nbsp;'.
+												  $ibforums->adskin->form_dropdown( "to_year"  , $this->make_year() , $new_date['year'] )
+									     )      );
+		
+		if ($mode != 'views')
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Time scale</b>" ,
+													  $ibforums->adskin->form_dropdown( "timescale" , array( 0 => array( 'daily', 'Daily'), 1 => array( 'weekly', 'Weekly' ), 2 => array( 'monthly', 'Monthly' ) ) )
+											 )      );
+		}
+						     
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Result Sorting</b>" ,
+												  $ibforums->adskin->form_dropdown( "sortby" , array( 0 => array( 'asc', 'Ascending - Oldest dates first'), 1 => array( 'desc', 'Descending - Newest dates first' ) ), 'desc' )
+									     )      );
+									     									     
+		$ibforums->html .= $ibforums->adskin->end_form("Show");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	
+	function make_year()
+	{
+		$time_now = getdate();
+		
+		$return = array();
+		
+		$start_year = 2002;
+		
+		$latest_year = intval($time_now['year']);
+		
+		if ($latest_year == $start_year)
+		{
+			$start_year -= 1;
+		}
+		
+		for ( $y = $start_year; $y <= $latest_year; $y++ )
+		{
+			$return[] = array( $y, $y);
+		}
+		
+		return $return;
+	}
+	
+	//-----------------------------------------
+	
+	function make_month()
+	{
+		$return = array();
+		
+		for ( $m = 1 ; $m <= 12; $m++ )
+		{
+			$return[] = array( $m, $this->month_names[$m] );
+		}
+		
+		return $return;
+	}
+	
+	//-----------------------------------------
+	
+	function make_day()
+	{
+		$return = array();
+		
+		for ( $d = 1 ; $d <= 31; $d++ )
+		{
+			$return[] = array( $d, $d );
+		}
+		
+		return $return;
+	}
+	
+	
+		
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_stylesets.php b/upload/sources/admin/ad_stylesets.php
new file mode 100644
index 00000000..0dc9386f
--- /dev/null
+++ b/upload/sources/admin/ad_stylesets.php
@@ -0,0 +1,1847 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Help Control functions
+|   > Module written by Matt Mecham
+|   > Date started: 2nd April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_stylesets
+{
+	var $base_url;
+	var $master_set = 1;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'wrapper':
+				$this->list_wrappers();
+				break;
+				
+			case 'addset':
+				$this->add_set();
+				break;
+				
+			case 'edit':
+				$this->do_form('edit');
+				break;
+			
+			case 'doedit':
+				$this->save_skin('edit');
+				break;
+				
+			case 'remove':
+				$this->remove_splash();
+				break;
+				
+			case 'doremove':
+				$this->do_remove();
+				break;
+			
+			//-----------------------------------------
+			
+			case 'export':
+				$this->export();
+				break;
+			
+			case 'revertallform':
+				$this->revert_all_form();
+				break;
+				
+			case 'dorevert':
+				$this->do_revert_all();
+				break;
+				
+			case 'toggledefault':
+				$this->set_toggle_default();
+				break;
+				
+			case 'togglevisible':
+				$this->set_toggle_visible();
+				break;
+				
+			//-----------------------------------------
+			// Export master
+			//-----------------------------------------
+			
+			case 'exportmaster':
+				$this->export_master();
+				break;
+				
+			case 'exportmacro':
+				$this->export_macro();
+				break;
+				
+			//-----------------------------------------
+			// Rebuild all
+			//-----------------------------------------
+			
+			case 'rebuildalltemplates':
+				$this->rebuild_all_templates();
+				break;
+				
+			//-----------------------------------------
+			// Export bits
+			//-----------------------------------------
+			
+			case 'exportbitschoose':
+				$this->export_bits_choose();
+				break;
+			
+			case 'exportbitscomplete':
+				$this->export_bits_complete();
+				break;
+				
+			default:
+				$this->list_sets();
+				break;
+		}
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// EXPORT SOME TEMPLATE BITS TO SQL FILE (COMPLETE)
+	/*-------------------------------------------------------------------------*/
+	
+	function export_bits_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ids = array();
+		
+		//-----------------------------------------
+		// get ids...
+		//-----------------------------------------
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^id_(\d+)$/", $key, $match ) )
+			{
+				if ($ibforums->input[$match[0]])
+				{
+					$ids[] = $match[1];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Got any?
+		//-----------------------------------------
+		
+		if ( ! count( $ids ) )
+		{
+			$ibforums->main_msg = "You must select SOME template bits to export!";
+			$this->export_bits_choose();
+		}
+		
+		$final_sql = "";
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => 'suid IN ('.implode(",",$ids).')' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$content = preg_replace( "/'/", "\\'", $std->txt_safeslashes( $r['section_content'] ) );
+			$datavar = preg_replace( "/'/", "\\'", $std->txt_safeslashes( $r['func_data']       ) );
+			
+			$content = str_replace( "\n", '\n', $content );
+			
+			$final_sql .= "REPLACE INTO ibf_skin_templates SET set_id=1, group_name='{$r['group_name']}', func_name='{$r['func_name']}', section_content='$content', func_data='$datavar';\n";
+		}
+		
+		//@header("Content-type: text/plain");
+		//print $final_sql;
+		//exit();
+		
+		//-----------------------------------------
+		// Print to browser
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $final_sql, 'templates_update.sql', '', 0 );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// EXPORT SOME TEMPLATE BITS TO SQL FILE
+	/*-------------------------------------------------------------------------*/
+	
+	function export_bits_choose()
+	{
+		global $ibforums, $DB, $std;
+		
+		$all_templates = array();
+		
+		$DB->simple_construct( array( 'select' => 'group_name,set_id,suid,func_name', 'from' => 'skin_templates', 'where' => 'set_id=1' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$all_templates[ $r['group_name'] ][] = $r;
+		}
+		
+		ksort( $all_templates );
+		
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+		
+		$ibforums->admin->page_title  = "Export Selected Template bits";
+		$ibforums->admin->page_detail = "Check the box of the bit you wish to export.";
+		
+		//-----------------------------------------
+		// start form
+		//-----------------------------------------
+		
+		$per_row  = 3;
+		$td_width = 100 / $per_row;
+		$count    = 0;
+		$output   = "<tr align='center'>\n";
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'exportbitscomplete' ),
+															     2 => array( 'act'   , 'sets'      ),
+													    )      );
+													    
+		$ibforums->html .= "<div class='tableborder'>
+							 <div class='maintitle'>Template Bits</div>
+							 ";
+							 
+		foreach( $all_templates as $group_name => $data )
+		{
+			//-----------------------------------------
+			// Start secondary table
+			//-----------------------------------------
+			
+			$count = 0;
+			
+			$output .= "<div class='tableborder'>
+						 <div class='titlemedium'>$group_name</div>
+						 <table width='100%' cellspacing='1' cellpadding='4' border='0'>
+						 <tr>";
+			
+			foreach( $all_templates[ $group_name ] as $r )
+			{
+				$count++;
+			
+				$class = $count == 2 ? 'tdrow2' : 'tdrow1';
+				
+				$output .= "<td width='{$td_width}%' align='left' class='$class'>
+							 <input type='checkbox' style='checkbox' value='1' name='id_{$r['suid']}' /> <strong>{$r['func_name']}</strong>
+							</td>";
+							
+				if ($count == $per_row )
+				{
+					$output .= "</tr>\n\n<tr align='center'>";
+					$count   = 0;
+				}
+			}
+			
+			if ( $count > 0 and $count != $per_row )
+			{
+				for ($i = $count ; $i < $per_row ; ++$i)
+				{
+					$output .= "<td class='tdrow2'>&nbsp;</td>\n";
+				}
+				
+				$output .= "</tr>";
+			}
+			
+			$output .= "</tr>\n</table></div>";
+		}
+		
+		$ibforums->html .= $output;
+		
+		$ibforums->html .= "<div class='pformstrip' align='center'><input type='submit' class='realbutton' value='EXPORT SELECTED' /></form></div></div>";
+		
+		$ibforums->admin->output();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD TEMPLATES
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_all_templates()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $ibforums->input['removewarning'] == 1 )
+		{
+			$DB->simple_exec_query( array( "delete" => "cache_store", "where" => "cs_key='skinpanic'" ) );
+		}
+		
+		$justdone = intval($ibforums->input['justdone']);
+		$justdone = $justdone ? $justdone : 1;
+		
+		//-----------------------------------------
+		// Get skins
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'skin_sets',
+									  'where'  => 'set_skin_set_id > '.$justdone,
+									  'order'  => 'set_skin_set_id',
+									  'limit'  => array( 0, 1 )
+						     )      );
+						     
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		// Got a biggun?
+		//-----------------------------------------
+		
+		$r = $DB->fetch_row();
+		
+		if ( $r['set_skin_set_id'] )
+		{
+			$ibforums->cache_func->_rebuild_all_caches( array($r['set_skin_set_id']) );
+			
+			$ibforums->admin->redirect( "act=sets&code=rebuildalltemplates&justdone={$r['set_skin_set_id']}", "Rebuilt cache for skin set {$r['set_name']}<br />Proceeding to the next skin..." );
+		}
+		else
+		{
+			$ibforums->main_msg = "All skin templates recached!";
+			$this->list_sets();
+		}
+	}
+	
+	//-----------------------------------------
+	// Export master skin set.
+	//-----------------------------------------
+	
+	function export_master()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Start...
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'templateexport', array( 'exported' => time(), 'versionid' => '20000', 'type' => 'master' ) );
+		
+		//-----------------------------------------
+		// Get emo group
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'templategroup' );
+		
+		$DB->simple_construct( array( 'select' => 'group_name, section_content, func_name, func_data', 'from' => 'skin_templates', 'where' => 'set_id=1' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$content = array();
+			
+			foreach ( $r as $k => $v )
+			{
+				$content[] = $xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[] = $xml->xml_build_entry( 'template', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'templategroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $xml->xml_document, 'ipb_templates.xml', '', 0 );
+	}
+	
+	//-----------------------------------------
+	// Export master macros
+	//-----------------------------------------
+	
+	function export_macro()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get xml mah-do-dah
+		//-----------------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-----------------------------------------
+		// Start...
+		//-----------------------------------------
+		
+		$xml->xml_set_root( 'macroexport', array( 'exported' => time() ) );
+		
+		//-----------------------------------------
+		// Get emo group
+		//-----------------------------------------
+		
+		$xml->xml_add_group( 'macrogroup' );
+		
+		$DB->simple_construct( array( 'select' => 'macro_value,macro_replace', 'from' => 'skin_macro', 'where' => 'macro_set=1' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$content = array();
+			
+			foreach ( $r as $k => $v )
+			{
+				$content[] = $xml->xml_build_simple_tag( $k, $v );
+			}
+			
+			$entry[] = $xml->xml_build_entry( 'macro', $content );
+		}
+		
+		$xml->xml_add_entry_to_group( 'macrogroup', $entry );
+		
+		$xml->xml_format_document();
+		
+		//-----------------------------------------
+		// Send to browser.
+		//-----------------------------------------
+		
+		$ibforums->admin->show_download( $xml->xml_document, 'ipb_macro.xml', '', 0 );
+		
+	}
+	
+	//-----------------------------------------
+	// ADD SET
+	//-----------------------------------------
+	
+	function add_set()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+	
+		$new     = array();
+		$message = array();
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		if ( $ibforums->input['id'] == 1 )
+		{
+			$ibforums->main_msg = "You cannot alter the master skin set";
+			$this->list_sets();
+		}
+		
+		if ( ! $ibforums->input['set_name'] )
+		{
+			$ibforums->main_msg = "You must enter a skin set name.";
+			$this->list_sets();
+		}
+		
+		if ( $ibforums->input['id'] == -1 )
+		{
+			//-----------------------------------------
+			// No parent...
+			//-----------------------------------------
+			
+			$new['set_skin_set_parent'] = -1;
+			$get_from_db = 1;
+		}
+		else
+		{
+			$new['set_skin_set_parent'] = $ibforums->input['id'];
+			$get_from_db = $ibforums->input['id'];
+		}
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$get_from_db ) );
+		
+		$new['set_name']          = $ibforums->input['set_name'];
+		$new['set_image_dir']     = $this_set['set_image_dir'];
+		$new['set_hidden']        = $ibforums->input['hidden'];
+		$new['set_default']       = 0;
+		$new['set_css_method']    = $this_set['set_css_method'];
+		$new['set_cache_css']     = $this_set['set_cache_css'];
+		$new['set_cache_macro']   = $this_set['set_cache_macro'];
+		$new['set_cache_wrapper'] = $this_set['set_cache_wrapper'];
+		
+		$DB->do_insert( 'skin_sets', $new );
+		
+		$newid = $DB->get_insert_id();
+			
+		//-----------------------------------------
+		// Rebuild caches
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_rebuild_all_caches( array( $newid ) );
+			
+		$ibforums->main_msg = '<b>Skin Set Added</b>';
+		
+		$ibforums->main_msg .= "<br />".implode("<br />", array_merge( $message, $ibforums->cache_func->messages) );
+		$this->list_sets();
+	}
+	
+	//-----------------------------------------
+	// Revert customizations > DO
+	//-----------------------------------------
+	
+	function do_revert_all()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+		
+		$message = array();
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		if ( $ibforums->input['id'] == 1 )
+		{
+			$ibforums->main_msg = "You cannot alter the master skin set";
+			$this->list_sets();
+		}
+		
+		$id = intval($ibforums->input['id']);
+		
+		//-----------------------------------------
+		// Delete Templates?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['html'] )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'skin_templates', 'where' => 'set_id='.$id ) );
+			$message[] = 'Removed all custom HTML template bits...';
+		}
+		
+		//-----------------------------------------
+		// Delete Macros?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['macro'] )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'skin_macro', 'where' => 'macro_set='.$id ) );
+			$message[] = 'Removed all custom replacement macros...';
+		}
+		
+		//-----------------------------------------
+		// Delete Wrapper
+		//-----------------------------------------
+		
+		if ( $ibforums->input['wrapper'] )
+		{
+			$DB->simple_exec_query( array( 'update' => 'skin_sets', 'set' => "set_wrapper=''", 'where' => 'set_skin_set_id='.$id ) );
+			$message[] = 'Removed custom wrapper...';
+		}
+		
+		//-----------------------------------------
+		// Delete Wrapper
+		//-----------------------------------------
+		
+		if ( $ibforums->input['css'] )
+		{
+			$DB->simple_exec_query( array( 'update' => 'skin_sets', 'set' => "set_css=''", 'where' => 'set_skin_set_id='.$id ) );
+			$message[] = 'Removed custom CSS...';
+		}
+		
+		//-----------------------------------------
+		// Rebuild caches
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_rebuild_all_caches( array( $id ) );
+			
+		$ibforums->main_msg = 'Skin set customizations removed';
+		
+		$ibforums->main_msg .= "<br />".implode("<br />", array_merge( $message, $ibforums->cache_func->messages) );
+		$this->list_sets();
+	}
+	
+	//-----------------------------------------
+	// Revert customizations form
+	//-----------------------------------------
+	
+	function revert_all_form()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$templates = 0;
+		$macros    = 0;
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		if ( $ibforums->input['id'] == 1 )
+		{
+			$ibforums->main_msg = "You cannot alter the master skin set";
+			$this->list_sets();
+		}
+		
+		$ibforums->admin->page_detail = "<strong>Please note that this change cannot be undone!</strong>";
+		$ibforums->admin->page_title  = "Revert Skin Set Customizations";
+		
+		//-----------------------------------------
+		// Get macro / template info
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'count(*) as aerosmith', 'from' => 'skin_templates', 'where' => "set_id={$ibforums->input['id']}" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$templates = intval($r['aerosmith']);
+		
+		$DB->simple_construct( array( 'select' => 'count(*) as aerosmith', 'from' => 'skin_macro', 'where' => "macro_set={$ibforums->input['id']}" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$macros = intval($r['aerosmith']);
+		
+		//-----------------------------------------
+		// Get the thingies
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_skin_set_id=".$ibforums->input['id'] ) );
+		
+		//-----------------------------------------
+		// Start the form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code', 'dorevert'                  ),
+																 2 => array( 'act' , 'sets'                      ),
+																 3 => array( 'id'  , $ibforums->input['id']      ),
+														), "theAdminForm"    );
+		
+		$none = "<em>No customizations to remove</em>";
+													  
+		$html    = $templates               ? $ibforums->adskin->form_yes_no('html'   , 0) : $none;
+		$macro   = $macros                  ? $ibforums->adskin->form_yes_no('macro'  , 0) : $none;
+		$wrapper = $this_set['set_wrapper'] ? $ibforums->adskin->form_yes_no('wrapper', 0) : $none;
+		$css     = $this_set['set_css']     ? $ibforums->adskin->form_yes_no('css'    , 0) : $none;
+		
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= "<div class='tableborder'>
+							<div class='maintitle'>Reverting Customizations in set {$this_set['set_name']}</div>
+							<div class='tablepad'>
+							<fieldset class='tdfset'>
+							 <legend><strong>Template HTML Customizations</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Revert all template bit HTML customizations?<br /><span style='color:gray'>You have {$templates} template customizations</span></td>
+							   <td width='60%' class='tdrow1'>{$html}</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							<br />
+							<fieldset class='tdfset'>
+							 <legend><strong>Macro Replacement Customizations</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Revert all macro customizations?<br /><span style='color:gray'>You have {$macros} macro customizations</span></td>
+							   <td width='60%' class='tdrow1'>{$macro}</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							<br />
+							<fieldset class='tdfset'>
+							 <legend><strong>Board Header and Footer Wrapper Customizations</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Revert Board Header and Footer Wrapper?</td>
+							   <td width='60%' class='tdrow1'>{$wrapper}</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							<br />
+							<fieldset class='tdfset'>
+							 <legend><strong>Stylesheet (CSS) Customizations</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Revert CSS?</td>
+							   <td width='60%' class='tdrow1'>{$css}</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							<div style='color:red;text-align:center;font-size:11px;padding:6px'>Please note that all customizations will be lost if set to 'yes'<br /><b>This cannot be undone and there are no more confirmation screens</b></div>
+							</div>
+							</div>";
+												 
+		$ibforums->html .= $ibforums->adskin->end_form_standalone("Process");
+		
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( '' ,'Reverting all customizations in set '.$this_set['set_name'] );
+	
+		$ibforums->admin->output();
+	}
+	
+	
+	//-----------------------------------------
+	// REMOVE SKIN SET FORM
+	//-----------------------------------------
+	
+	function remove_splash()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->admin->page_detail = "Please read this page carefully.";
+		$ibforums->admin->page_title  = "Removing Skin Set";
+		
+		//-----------------------------------------
+		// Get this skin set...
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$ibforums->input['id'] ) );
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code', 'doremove'                  ),
+																 2 => array( 'act' , 'sets'                      ),
+																 3 => array( 'id'  , $ibforums->input['id']      ),
+														)      );
+													  
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Remove Skin Set {$this_set['set_name']}" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+																"<div style='color:red;font-weight:bold;font-size:11px'>
+																PLEASE NOTE: This action cannot be undone</div><br />
+																Continuing will permanently remove any customizations to this skin set, including template HTML, CSS, Wrappers and custom macros.
+																<br /><br />
+																Any children of this skin set will be set as 'root' skins without a parent.
+																",
+													  )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Permanently Remove Set {$this_set['set_name']}");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	// TOGGLE DEFAULT SKIN
+	//-----------------------------------------
+	
+	function set_toggle_default()
+	{
+		global $ibforums, $DB, $std;
+		
+		$affected_ids = array();
+		$children     = array();
+		$message      = array();
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		if ( $ibforums->input['id'] == 1 )
+		{
+			$ibforums->main_msg = 'You cannot alter the master skin set';
+			$this->list_sets();
+		}
+		
+		//-----------------------------------------
+		// Set as default
+		//-----------------------------------------
+		
+		$DB->do_update( 'skin_sets', array( 'set_default' => 0 ), "" );
+		$DB->do_update( 'skin_sets', array( 'set_default' => 1, 'set_hidden' => 0 ), "set_skin_set_id =".$ibforums->input['id'] );
+		
+		//-----------------------------------------
+		// Rebuild caches and relationships?
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_rebuild_all_caches( array( $ibforums->input['id'] ) );
+		
+		$ibforums->main_msg = 'Skin set to default';
+		$this->list_sets();
+	}
+	
+	//-----------------------------------------
+	// TOGGLE VISIBILITY
+	//-----------------------------------------
+	
+	function set_toggle_visible()
+	{
+		global $ibforums, $DB, $std;
+		
+		$affected_ids = array();
+		$children     = array();
+		$message      = array();
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		if ( $ibforums->input['id'] == 1 )
+		{
+			$ibforums->main_msg = 'You cannot alter the master skin set';
+			$this->list_sets();
+		}
+		
+		//-----------------------------------------
+		// Get current skin
+		//-----------------------------------------
+		
+		$skin = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$ibforums->input['id'] ) );
+		
+		$hidden = 1;
+		
+		if ( $skin['set_hidden'] )
+		{
+			$hidden = 0;
+		}
+		
+		$DB->do_update( 'skin_sets', array( 'set_hidden' => $hidden ), 'set_skin_set_id='.$ibforums->input['id'] );
+		
+		//-----------------------------------------
+		// Rebuild caches and relationships?
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_rebuild_all_caches( array( $ibforums->input['id'] ) );
+		
+		$ibforums->main_msg = 'Skin set visibility changed';
+		$this->list_sets();
+	}
+	
+	//-----------------------------------------
+	// DO REMOVE SKIN SET
+	//-----------------------------------------
+	
+	function do_remove()
+	{
+		global $ibforums, $DB, $std;
+		
+		$affected_ids = array();
+		$children     = array();
+		$message      = array();
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		if ( $ibforums->input['id'] == 1 )
+		{
+			$ibforums->main_msg = 'You cannot alter the master skin set';
+			$this->list_sets();
+		}
+		
+		//-----------------------------------------
+		// Get this skin set...
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$ibforums->input['id'] ) );
+		
+		//-----------------------------------------
+		// Can we remove?
+		//-----------------------------------------
+		
+		if ( $this_set['set_default'] == 1 )
+		{
+			$ibforums->main_msg = 'IPB cannot remove this skin as it is set as the default skin, please set another skin set to default and try again.';
+			$this->list_sets();
+		}
+		
+		$this_count = $DB->simple_exec_query( array( 'select' => 'count(*) as jazzyjeff', 'from' => 'skin_sets' ) );
+		
+		if ( $this_count['jazzyjeff'] == 2 )
+		{
+			$ibforums->main_msg = 'IPB cannot remove this skin as it is the last editable skin set you currently have.';
+			$this->list_sets();
+		}
+		
+		//-----------------------------------------
+		// Get any children
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'set_skin_set_id, set_skin_set_parent', 'from' => 'skin_sets', 'where' => "set_skin_set_parent=".$ibforums->input['id']) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$affected_ids[] = $r['set_skin_set_id'];
+			$children[]     = $r['set_skin_set_id'];
+		}
+		
+		//-----------------------------------------
+		// Update children to root
+		//-----------------------------------------
+		
+		if ( count($children) )
+		{
+			$DB->do_update( 'skin_sets', array( 'set_skin_set_parent' => '-1' ), 'set_skin_set_id IN ('.implode(',',$children).')' );
+		}
+		
+		//-----------------------------------------
+		// Members using this skin?
+		//-----------------------------------------
+		
+		$DB->do_update( 'members', array( 'skin' => '' ), 'skin='.$ibforums->input['id'] );
+		
+		//-----------------------------------------
+		// Delete the skin...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_sets', 'where' => 'set_skin_set_id='.$ibforums->input['id']) );
+		
+		//-----------------------------------------
+		// Remove macros...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_macro', 'where' => 'macro_set='.$ibforums->input['id']) );
+		
+		//-----------------------------------------
+		// Remove templates...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_templates', 'where' => 'set_id='.$ibforums->input['id']) );
+		
+		//-----------------------------------------
+		// Remove template cache...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_templates_cache', 'where' => 'template_set_id='.$ibforums->input['id']) );
+		
+		//-----------------------------------------
+		// Remove CSS file...
+		//-----------------------------------------
+		
+		@unlink( CACHE_PATH.'style_images/css_'.$ibforums->input['id'].'.css' );
+		$message[] = 'Clean up: removing CSS cache file...';
+		
+		//-----------------------------------------
+		// Remove CACHE folder
+		//-----------------------------------------
+		
+		$ibforums->admin->rm_dir( CACHE_PATH.'skin_cache/cacheid_'.$ibforums->input['id'] );
+		$message[] = 'Clean up: removing HTML templates cache folder...';
+		
+		//-----------------------------------------
+		// Rebuild caches and relationships?
+		//-----------------------------------------
+		
+		if ( count($affected_ids) )
+		{
+			$ibforums->cache_func->_rebuild_all_caches($affected_ids);
+		}
+		
+		$ibforums->cache_func->_rebuild_skin_id_cache();
+		
+		$ibforums->main_msg = 'Skin set removed';
+		
+		$ibforums->main_msg .= "<br />".implode("<br />", array_merge( $message, $ibforums->cache_func->messages) );
+		$this->list_sets();
+		
+	}
+	
+	
+	
+	//-----------------------------------------
+	// ADD / EDIT SKIN SETS
+	//-----------------------------------------
+	
+	function save_skin( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Fix up incoming
+		//-----------------------------------------
+		
+		//img / prt
+		
+		if ($type == 'edit')
+		{
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+			}
+		}
+		
+		if ($ibforums->input['set_name'] == "")
+		{
+			$ibforums->admin->error("You must specify a name for this skin pack ID");
+		}
+	
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id = '.$ibforums->input['id'] ) );
+		
+		//-----------------------------------------
+		// Init var
+		//-----------------------------------------
+		
+		$barney = array( 'set_name'            => $std->txt_stripslashes($_POST['set_name']),
+						 'set_css_method'      => $ibforums->input['set_css_method'],
+						 'set_hidden'          => $ibforums->input['set_hidden'],
+						 'set_image_dir'       => $ibforums->input['set_image_dir'],
+						 'set_author_email'    => $ibforums->input['set_author_email'],
+						 'set_author_url'      => $ibforums->input['set_author_url'],
+						 'set_author_name'     => $ibforums->input['set_author_name'],
+						 'set_skin_set_parent' => $ibforums->input['set_skin_set_parent'],
+						 'set_emoticon_folder' => $ibforums->input['set_emoticon_folder'],
+					   );
+					   
+		if ($type == 'add')
+		{
+			
+			
+		}
+		else
+		{
+			//-----------------------------------------
+			// Did we set it to default?
+			//-----------------------------------------
+			
+			if ( $ibforums->input['set_default'] )
+			{
+				$DB->do_update( 'skin_sets', array( 'set_default' => 0 ), 'set_skin_set_id <> '.$ibforums->input['id'] );
+				$barney['set_default'] = 1;
+			}
+			
+			//-----------------------------------------
+			// Did the parent change?
+			//-----------------------------------------
+			
+			$affected_ids = array();
+			
+			if ( $ibforums->input['prt'] != $ibforums->input['set_skin_set_parent'] )
+			{
+				$affected_ids[ $this_set['set_skin_set_id'] ] = $this_set['set_skin_set_id'];
+				
+				//-----------------------------------------
+				// Any kids?
+				//-----------------------------------------
+				
+				$children = array();
+				$child_id = array();
+				
+				$DB->simple_construct( array( 'select' => 'set_skin_set_id', 'from' => 'skin_sets', 'where' => 'set_skin_set_parent='.$this_set['set_skin_set_id'] ) );
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					$children[]      = $r;
+					$child_id[]      = $r['set_skin_set_id'];
+					$affected_ids[ $r['set_skin_set_id'] ]  = $r['set_skin_set_id'];
+				}
+				
+				if ( count($children) )
+				{
+					//-----------------------------------------
+					// Move children to direct root children
+					//-----------------------------------------
+					
+					$DB->simple_exec_query( array( 'update' => 'skin_sets', 'set' => 'set_skin_set_parent = -1', 'where' => 'set_skin_set_id IN ('.implode(",",$child_id).')' ) );
+				}
+			}
+			
+			if ( $ibforums->input['css'] != $ibforums->input['set_css_method'] )
+			{
+				if ( $ibforums->input['set_css_method'] )
+				{
+					//-----------------------------------------
+					// Caching switched on...
+					//-----------------------------------------
+					
+					$affected_ids[ $this_set['set_skin_set_id'] ] = $this_set['set_skin_set_id'];
+				}
+			}
+			
+			//-----------------------------------------
+			// Img dir changed? recache css
+			//-----------------------------------------
+			
+			if ( $ibforums->input['img'] != $ibforums->input['set_image_dir'] )
+			{
+				$affected_ids[ $this_set['set_skin_set_id'] ] = $this_set['set_skin_set_id'];
+			}
+			
+			$DB->do_update( 'skin_sets', $barney, "set_skin_set_id=".$ibforums->input['id'] );
+			
+			//-----------------------------------------
+			// Rebuild caches and relationships?
+			//-----------------------------------------
+			
+			$ibforums->cache_func->_rebuild_all_caches($affected_ids);
+			
+			$ibforums->main_msg = 'Skin Settings Updated';
+			
+			$ibforums->main_msg .= "<br />".implode("<br />", $ibforums->cache_func->messages);
+			
+			$ibforums->admin->done_screen("Skin Set Updated", "Manage Skin Sets", "act=sets", 'redirect' );
+		}
+		
+		
+	}
+	
+	//-----------------------------------------
+	// ADD / EDIT SETS
+	//-----------------------------------------
+	
+	function do_form( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check for input
+		//-----------------------------------------
+		
+		$sets     = array();
+		$parents  = array( 0=> array( '-1', 'No parent' ) );
+		$row      = array();
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$sets[ $r['set_skin_set_id'] ] = $r;
+			
+			if ( ($r['set_skin_set_parent'] < 0 and $r['set_skin_set_id'] != 1 ) and ( $ibforums->input['id'] != $r['set_skin_set_id'] ) )
+			{
+				$parents[] = array( $r['set_skin_set_id'], $r['set_name'] );
+			}
+			
+			if ( $ibforums->input['id'] == $r['set_skin_set_id'] )
+			{
+				$row = $r;
+			}
+		}
+		
+		
+		//-----------------------------------------
+		
+		if ($type == 'add')
+		{
+			$code = 'doadd';
+			$button = 'Create New Skin Set';
+			$row['set_name']    = $row['set_name'];
+			$row['set_default'] = 0;
+		}
+		else
+		{
+			$code = 'doedit';
+			$button = 'Edit Skin Settings';
+		}
+		
+		//-----------------------------------------
+		// Image dir
+		//-----------------------------------------
+		
+		$dirs = array();
+		
+		$dh = opendir( CACHE_PATH.'style_images' );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if (($file != ".") && ($file != ".."))
+ 			{
+				if ( is_dir(CACHE_PATH.'style_images/'.$file) )
+				{
+					$dirs[] = array( $file, $file );
+				}
+ 			}
+ 		}
+ 		closedir( $dh );
+ 		
+ 		//-----------------------------------------
+		// Emoticons dir
+		//-----------------------------------------
+		
+		$emodirs = array();
+		
+		$dh = opendir( CACHE_PATH.'style_emoticons' );
+		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if (($file != ".") && ($file != ".."))
+ 			{
+				if ( is_dir(CACHE_PATH.'style_emoticons/'.$file) )
+				{
+					$emodirs[] = array( $file, $file );
+				}
+ 			}
+ 		}
+ 		closedir( $dh );
+ 		
+ 		
+		if ( is_writeable( CACHE_PATH."style_images" ) )
+		{
+			$cssextra = $ibforums->adskin->form_yes_no('set_css_method', $row['set_css_method']);
+		}
+		else
+		{
+			$cssextra = "<em>Unavailable, IPB cannot write into your 'style_images' folder</em>";
+		}
+		
+		
+		//-----------------------------------------
+	
+		$ibforums->admin->page_detail = "Please configure the settings below.";
+		$ibforums->admin->page_title  = "Manage Skin Sets";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code', $code                       ),
+																 2 => array( 'act' , 'sets'                      ),
+																 3 => array( 'id'  , $ibforums->input['id']      ),
+																 4 => array( 'img' , $row['set_image_dir']       ),
+																 5 => array( 'prt' , $row['set_skin_set_parent'] ),
+																 6 => array( 'css' , $row['set_css_method']      ),
+														), "theAdminForm"    );
+									     
+		//-----------------------------------------
+		// Start output
+		//-----------------------------------------
+		
+		$ibforums->html .= "<div class='tableborder'>
+							<div class='maintitle'>$button</div>
+							<div class='tablepad'>
+							<fieldset class='tdfset'>
+							 <legend><strong>Basics</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Set Title</td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_input('set_name', $row['set_name'])."</td>
+							 </tr>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Hide from members?</td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_yes_no('set_hidden', $row['set_hidden'])."</td>
+							 </tr>";
+							 
+		if ( $row['set_default'] )
+		{
+			$ibforums->html .= "<tr>
+							    <td width='40%' class='tdrow1'>Set as default skin?</td>
+							    <td width='60%' class='tdrow1'><i>Skin set as default already.</i></td>";
+		}
+		else
+		{
+			$ibforums->html .= "<tr>
+							    <td width='40%' class='tdrow1'>Set as default skin?</td>
+							    <td width='60%' class='tdrow1'>".$ibforums->adskin->form_checkbox('set_default', $row['set_default'])."</td>";
+		}
+		
+		$ibforums->html .= "</tr>
+							  <tr>
+							   <td width='40%' class='tdrow1'>Skin Set Parent?</td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_dropdown('set_skin_set_parent', $parents, $row['set_skin_set_parent'])."</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							<br />
+							<fieldset class='tdfset'>
+							 <legend><strong>CSS Options</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Cache CSS to text files?<br /><span style='color:gray'>This will reduce the size of the HTML as the CSS will be in a browser cachable file.</span>
+							   								 </td>
+							   <td width='60%' class='tdrow1'>".$cssextra."<br /><span style='color:red'>Warning: Changing this value will re-cache any cached stylesheet information. Please make sure that you have synchronized any cache files with the database.</span></td>
+							 </tr>
+							 </table>
+							</fieldset>
+							<br />
+							<fieldset class='tdfset'>
+							 <legend><strong>Image Options</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Use image directory?<br /><span style='color:gray'>The image directory will be used in place of <#IMG_DIR#> in CSS and macro replacements.</span></td>
+							   <td width='60%' class='tdrow1'>style_images/ ".$ibforums->adskin->form_dropdown('set_image_dir', $dirs, $row['set_image_dir'])."</td>
+							 </tr>
+							  <tr>
+							   <td width='40%' class='tdrow1'>Use emoticons set?<br /><span style='color:gray'>Choose which set of emoticons to assign to this skin.</span></td>
+							   <td width='60%' class='tdrow1'>style_emoticons/ ".$ibforums->adskin->form_dropdown('set_emoticon_folder', $emodirs, $row['set_emoticon_folder'])."</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							
+							<br />
+							<fieldset class='tdfset'>
+							 <legend><strong>Set Author</strong></legend>
+							 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Set Author Name<br /><span style='color:gray'>*Optional</span></td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_input('set_author_name', $row['set_author_name'])."</td>
+							 </tr>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Set Author Email Address<br /><span style='color:gray'>*Optional</span></td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_input('set_author_email', $row['set_author_email'])."</td>
+							 </tr>
+							 <tr>
+							   <td width='40%' class='tdrow1'>Set Author Website Address<br /><span style='color:gray'>*Optional</span></td>
+							   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_input('set_author_url', $row['set_author_url'])."</td>
+							 </tr>
+							 </table>
+							</fieldset>
+							</div>
+							</div>";
+		
+		
+
+		//-----------------------------------------
+												 
+		$ibforums->html .= $ibforums->adskin->end_form_standalone($button);
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// SHOW ALL SKIN SETS
+	//-----------------------------------------
+	
+	function list_sets()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$form_array     = array();
+		$this_set       = "";
+		$forums         = array();
+		$forum_skins    = array();
+		$macro_array    = array();
+		$template_array = array();
+	
+		$ibforums->admin->page_detail = "Simply click on the title of the skin set you wish to edit and select from one of the options from the pop-up menu.";
+		$ibforums->admin->page_title  = "Manage Skin Sets";
+		
+		//-----------------------------------------
+		// Get forum names
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, name, skin_id', 'from' => 'forums' ) );
+		$DB->simple_exec();
+		
+		while ( $f = $DB->fetch_row() )
+		{
+			$forums[ $f['id'] ] = $f['name'];
+			
+			if ( $f['skin_id'] != "")
+			{
+				$forum_skins[ $f['skin_id'] ][] = $f['name'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Get macro / template info
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'stylesets_list_sets_templates', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$template_array[ $r['set_id'] ] = 1;
+		}
+		
+		$DB->cache_add_query( 'stylesets_list_sets_macros', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$macro_array[ $r['macro_set'] ] = 1;
+		}
+		
+		
+		//-----------------------------------------
+		// Start of HTML Output
+		//-----------------------------------------
+		
+		$ibforums->html .= "<script type='text/javascript'>
+							function addnewpop(parentid, menuid)
+							{
+								if ( menuid )
+								{
+									togglediv( menuid, 0 );
+								}
+								
+								document.jsform.id.value = parentid;
+								scroll(0,0);
+								togglediv( 'popbox', 1 );
+								return false;
+							}
+							</script>
+							<div class='tableborder'>
+							<div class='maintitle'>
+							<div align='center' style='position:absolute;width:99%;display:none;text-align:center' id='popbox'>
+							 <form name='jsform' action='{$ibforums->adskin->base_url}' method='post'>
+							 <input type='hidden' name='act' value='sets' />
+							 <input type='hidden' name='code' value='addset' />
+							 <input type='hidden' name='id' value='' />
+							 <table cellspacing='0' width='500' align='center' cellpadding='6' style='background:#EEE;border:2px outset #555;'>
+							 <tr>
+							  <td align='center' valign='top'>
+							   <b>New Skin Set Name</b><br><input class='textinput' name='set_name' type='text' size='30' />
+							   <br />
+							   <input type='checkbox' name='hidden' value='1' /> Make new skin set hidden on creation?
+							   <br /><br />
+							   <input type='submit' class='realbutton' value='Add New Skin Set' name='submitbutton' /> <input type='button' class='realdarkbutton' value='Close' onclick=\"togglediv('popbox');\" />
+							  </td>
+							 </tr>
+							 </table>
+							 </form>
+							</div>
+							<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							<tr>
+							<td align='left' width='100%' style='font-weight:bold;color:white;font-size:12px'>
+							Skin Sets
+							</td>
+							<td align='right' nowrap='nowrap'><input type='button' name='addnew' class='realdarkbutton' value='Add New Skin Set'  onclick=\"addnewpop('-1')\" />&nbsp;</td>
+							</tr>
+							</table>
+							</div></div>
+						   ";
+			
+		$ibforums->html .= "<div class='tableborder'>\n<div class='tablepad'>\n";
+		
+		//-----------------------------------------
+		// GET SKINS
+		//-----------------------------------------
+		
+		$skin_sets  = array();
+		$last_id    = 0;
+		$default_skin = "";
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'order' => 'set_skin_set_parent, set_skin_set_id ASC' ) );
+		$DB->simple_exec();
+		
+		$no_sets = 0;
+		$i_sets  = 0;
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			$skins[ $row['set_skin_set_id'] ] = $row;
+			
+			if ( $row['set_skin_set_parent'] == -1 )
+			{
+				$no_sets++;
+			}
+		}
+		
+		//-----------------------------------------
+		// Loop-de-loop
+		//-----------------------------------------
+		
+		foreach( $skins as $r )
+		{
+			$i_sets++;
+			
+			$skin_sets[ $r['set_skin_set_id'] ] = $r;
+			
+			$skin_sets[ $r['set_skin_set_parent'] ]['_lastid']     = $r['set_skin_set_id'];
+			$skin_sets[ $r['set_skin_set_parent'] ]['_children'][] = $r['set_skin_set_id'];
+			
+			$extra  = "";
+			$forums = "<img src='{$ibforums->skin_url}/skin_notforums.gif' border='0' alt='Not used in forums' title='Not used in forums' />";
+			
+			//-----------------------------------------
+			// Used in forums?
+			//-----------------------------------------
+			
+			if ( is_array($forum_skins[ $r['set_skin_set_id'] ]) )
+			{
+				if ( count($forum_skins[ $r['set_skin_set_id'] ]) > 0 )
+				{
+					$extra  = "Used in forums:".implode( ",", $forum_skins[ $r['set_skin_set_id'] ] );
+					
+					$forums = "<img src='{$ibforums->skin_url}/skin_forums.gif' border='0' alt='' title='$extra' />";
+				}
+			}
+			
+			$this->unaltered    = "<img src='{$ibforums->skin_url}/skin_item_unaltered.gif' border='0' alt='-' title='Unaltered from parent skin set' />&nbsp;";
+			$this->altered      = "<img src='{$ibforums->skin_url}/skin_item_altered.gif' border='0' alt='+' title='Altered from parent skin set' />&nbsp;";
+			$this->inherited    = "<img src='{$ibforums->skin_url}/skin_item_inherited.gif' border='0' alt='|' title='Inherited from parent skin set' />&nbsp;";
+			
+			//-----------------------------------------
+			// Default / Hidden?
+			//-----------------------------------------
+			
+			$div_start    = "<div style='padding-top:1px;padding-bottom:1px;border-bottom:1px solid #DDD;'><img src='{$ibforums->skin_url}/skin_item.gif' alt='' style='vertical-align:middle' />&nbsp;";
+			$default      = "<a href='{$ibforums->adskin->base_url}&act=sets&code=toggledefault&id={$r['set_skin_set_id']}' title='Make this skin the default'><img src='{$ibforums->skin_url}/skin_notdefault.gif' border='0' alt='Not Default' /></a>";
+			$hidden       = "<a href='{$ibforums->adskin->base_url}&act=sets&code=togglevisible&id={$r['set_skin_set_id']}' title='Toggle visibility'><img src='{$ibforums->skin_url}/skin_visible.gif' border='0' alt='visible' title='Skin not hidden from members' /></a>";
+			$folder_icon  = 'skin_folder.gif';
+			$menu_text    = "Root Skin";
+			$remove_set   = "<a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=sets&code=remove&id={$r['set_skin_set_id']}'>Remove Skin Set...</a>";
+			$restore_all  = "";
+			$margin_left  = '40';
+			$css_extra    = "";
+			$newskin      = "";
+			
+			//-----------------------------------------
+			// Child of master, middle skin
+			// or last skin?
+			//-----------------------------------------
+			
+			if ( $i_sets >= $no_sets )
+			{
+				$line_image = "<img src='{$ibforums->skin_url}/skin_line_l.gif' border='0' />&nbsp;";
+			}
+			else
+			{
+				$line_image = "<img src='{$ibforums->skin_url}/skin_line_t.gif' border='0' />&nbsp;";
+			}
+			
+			//-----------------------------------------
+			// Hidden?
+			//-----------------------------------------
+			
+			if ($r['set_hidden'] == 1)
+			{ 
+				$hidden      = "<a href='{$ibforums->adskin->base_url}&act=sets&code=togglevisible&id={$r['set_skin_set_id']}' title='Toggle visibility'><img src='{$ibforums->skin_url}/skin_invisible.gif' border='0' alt='Invisible' title='Skin hidden from members' /></a>";
+				$folder_icon = 'skin_folder_hidden.gif';
+				$css_extra   = 'color:#7F7FAA';
+			}
+			
+			//-----------------------------------------
+			// Default?
+			//-----------------------------------------
+			
+			if ($r['set_default'] == 1)
+			{
+				$default      = "<img src='{$ibforums->skin_url}/skin_default.gif' border='0' alt='Not Default' title='Default skin' />";
+				$default_skin = $r['set_name'];
+			}
+			
+			//-----------------------------------------
+			// IPB Master?
+			//-----------------------------------------
+			
+			if ( $r['set_skin_set_id'] == 1 )
+			{
+				$remove_set   = "";
+				$folder_icon  = 'skin_folder_master.gif';
+				$menu_text    = "Master";
+				$margin_left  = '20';
+				$line_image   = "";
+				$css_extra    = "color:gray";
+				$hidden       = "";
+				$default      = "";
+				$forums       = "";
+				$export_button = "";
+			}
+			else
+			{
+				//-----------------------------------------
+				// Not..
+				//-----------------------------------------
+				
+				$export_button = $ibforums->adskin->js_make_button( 'Export', "{$ibforums->adskin->base_url}&act=import&code=showexportpage&id={$r['set_skin_set_id']}", "realdarkbutton", "Export skin set" );
+				
+				$restore_all   = "<div style='padding-top:1px;padding-bottom:1px;border-bottom:1px solid #DDD;'><img src='{$ibforums->skin_url}/skin_pkg.gif' alt='' style='vertical-align:middle' />&nbsp;<a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=sets&code=revertallform&id={$r['set_skin_set_id']}'>Revert All Skin Customizations...</a></div>";
+				
+				if ( $r['set_skin_set_parent'] >= 0 )
+				{
+					//-----------------------------------------
+					// Child though...
+					//-----------------------------------------
+					
+					if ( $folder_icon != 'skin_folder_hidden.gif' )
+					{
+						$folder_icon = 'skin_folder_children.gif';
+					}
+					
+					$menu_text   = "Child's";
+					$margin_left = '70';
+					$line_image  = "<img src='{$ibforums->skin_url}/skin_line_single.gif' border='0' />";
+				}
+				else
+				{
+					$newskin     = "<div style='padding-top:1px;padding-bottom:1px;border-bottom:1px solid #DDD;'><img src='{$ibforums->skin_url}/skin_pkg.gif' alt='' style='vertical-align:middle' />&nbsp;<a style='text-decoration:none;font-weight:bold' href='#' onclick=\"addnewpop('{$r['set_skin_set_id']}','menu_{$r['set_skin_set_id']}')\">Add New Child Skin Set...</a></div>";
+				}
+			}
+			
+			//-----------------------------------------
+			// Skin opts
+			//-----------------------------------------
+			
+			$menulist = "<div id='menu_{$r['set_skin_set_id']}' style='margin-left:{$margin_left}px;display:none;background:#EEE;border:1px solid #555;position:absolute;width:auto;padding:3px 5px 3px 3px;'>";
+			
+			if ( $r['set_skin_set_id'] == 1 AND ! IN_DEV )
+			{
+				$menulist .= "This is the master skin and cannot be edited or removed.<br />If you wish to customize the default skin, please click
+							 <br />on the skin set '<!DEFAULT>' and choose from the options.";
+			}
+			else
+			{
+				
+				$menulist .= "$div_start<!--ALTERED.wrappper--><a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=wrap&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit $menu_text Board Header & Footer Wrapper</a></div>
+							  $div_start<!--ALTERED.templates--><a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=templ&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit $menu_text Template HTML</a></div>
+							  $div_start<!--ALTERED.css--><a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=style&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit $menu_text Stylesheet (CSS Advanced Mode)</a></div>
+							  $div_start<!--ALTERED.css--><a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=style&code=colouredit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit $menu_text Colours (CSS Easy Mode)</a></div>
+							  $div_start<!--ALTERED.macro--><a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=image&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit $menu_text Replacement Macros</a></div>
+							  <div style='padding-top:1px;padding-bottom:1px;border-bottom:1px solid #DDD;'><img src='{$ibforums->skin_url}/skin_pkg.gif' alt='' style='vertical-align:middle' />&nbsp;<a style='text-decoration:none;font-weight:bold' href='{$ibforums->adskin->base_url}&act=sets&code=edit&id={$r['set_skin_set_id']}'>Edit Settings...</a></div>
+							  {$restore_all}
+							  {$newskin}
+							  <div style='padding-top:1px;'><img src='{$ibforums->skin_url}/skin_pkg.gif' alt='' style='vertical-align:middle' />&nbsp;{$remove_set}</div>";
+							
+			}
+			
+			$menulist .= "</div>";
+			
+			//-----------------------------------------
+			// Add skin row
+			//-----------------------------------------
+			
+			$skin_sets[ $r['set_skin_set_id'] ]['_html'] = "<div style='padding:4px;border-bottom:1px solid #DDD;'>
+															<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+															<tr>
+															 <td align='left' width='60%'><!--$i_sets,$no_sets-->{$line_image}<!--ID:{$r['set_skin_set_id']}--><img src='{$ibforums->skin_url}/{$folder_icon}' title='Skin Set ID {$r['set_skin_set_id']}' style='vertical-align:middle' />&nbsp;&nbsp;<b><a onclick=\"toggleview('menu_{$r['set_skin_set_id']}'); return false;\" title='Click for skin options' href='#' style='font-size:11px;{$css_extra}'>".$std->txt_stripslashes($r['set_name'])."</a></b>$menulist</td>
+															 <td align='right' width='40%'>
+															 $forums
+															 $hidden
+															 $default
+															  ". $export_button ."
+															</td>
+															</tr>
+															</table>
+															</div>";
+			
+			$form_array[] = array( $r['set_skin_set_id'], $r['set_name'] );
+			
+		}
+		
+		//header("content-type: text/plain"); print_r($skin_sets); exit();
+		
+		//-----------------------------------------
+		// Show root forums
+		//-----------------------------------------
+		
+		foreach( $skin_sets as $id => $data )
+		{
+			if ( $data['set_skin_set_parent'] == -1 )
+			{
+				$wrapper_icon   = $this->_get_status_of_parent( $data['set_wrapper'] );
+				$css_icon       = $this->_get_status_of_parent( $data['set_css'] );
+				$templates_icon = $this->_get_status_of_parent( $template_array[ $data['set_skin_set_id'] ] );
+				$macro_icon     = $this->_get_status_of_parent( $macro_array[ $data['set_skin_set_id'] ] );
+				
+				//-----------------------------------------
+				// Fix n' stitch
+				//-----------------------------------------
+				
+				$data['_html'] = str_replace( '<!--ALTERED.wrappper-->' , $wrapper_icon  , $data['_html'] );
+				$data['_html'] = str_replace( '<!--ALTERED.templates-->', $templates_icon, $data['_html'] );
+				$data['_html'] = str_replace( '<!--ALTERED.css-->'      , $css_icon      , $data['_html']);
+				$data['_html'] = str_replace( '<!--ALTERED.macro-->'    , $macro_icon    , $data['_html'] );
+				
+				$ibforums->html .= $data['_html']."\n<!--CHILDREN:{$id}-->";
+			}
+		}		
+		
+		//-----------------------------------------
+		// Show any children
+		//-----------------------------------------
+		
+		foreach( $skin_sets as $id => $data )
+		{	
+			if ( is_array( $data['_children'] ) and count( $data['_children'] ) > 0 )
+			{
+				$html = "";
+				
+				foreach( $data['_children'] as $cid )
+				{
+					$image = "";
+					
+					if ( $cid == $data['_lastid'] )
+					{
+						//-----------------------------------------
+						// Last skin, show L
+						//-----------------------------------------
+						
+						$image = 'skin_line_l.gif';
+					}
+					else
+					{
+						//-----------------------------------------
+						// First skin, show T
+						//-----------------------------------------
+						
+						$image = 'skin_line_t.gif';
+					}
+					
+					$skin_sets[ $cid ]['_html'] = str_replace( "<!--ID:{$cid}-->", "<img src='{$ibforums->skin_url}/{$image}' border='0' />&nbsp;", $skin_sets[ $cid ]['_html'] );
+					
+					//-----------------------------------------
+					// (un)altered icons: 
+					//-----------------------------------------
+					
+					$wrapper_icon   = $this->_get_status_of_child($skin_sets[ $cid ]['set_wrapper'] , $skin_sets[ $id ]['set_wrapper'] );
+					$css_icon       = $this->_get_status_of_child($skin_sets[ $cid ]['set_css']     , $skin_sets[ $id ]['set_css'] );
+					$templates_icon = $this->_get_status_of_child($template_array[ $cid ]           , $template_array[ $id ]);
+					$macro_icon     = $this->_get_status_of_child($macro_array[ $cid ]              , $macro_array[ $id ]   );
+					
+					//-----------------------------------------
+					// Fix n' stitch
+					//-----------------------------------------
+					
+					$skin_sets[ $cid ]['_html'] = str_replace( '<!--ALTERED.wrappper-->' , $wrapper_icon  , $skin_sets[ $cid ]['_html'] );
+					$skin_sets[ $cid ]['_html'] = str_replace( '<!--ALTERED.templates-->', $templates_icon, $skin_sets[ $cid ]['_html'] );
+					$skin_sets[ $cid ]['_html'] = str_replace( '<!--ALTERED.css-->'      , $css_icon      , $skin_sets[ $cid ]['_html'] );
+					$skin_sets[ $cid ]['_html'] = str_replace( '<!--ALTERED.macro-->'    , $macro_icon    , $skin_sets[ $cid ]['_html'] );
+					
+					$html .= $skin_sets[ $cid ]['_html'];
+				}
+				
+				$ibforums->html = str_replace( "<!--CHILDREN:{$id}-->", $html, $ibforums->html );
+			}
+		}
+		
+		
+		$ibforums->html .= "</div>";
+		
+		//-----------------------------------------
+		// Add in default skin name
+		//-----------------------------------------
+		
+		$ibforums->html = str_replace( '<!DEFAULT>', $default_skin, $ibforums->html );
+		
+		$ibforums->html .= "<div class='pformstrip' style='padding:4px' align='center'>&nbsp;</div></div>";
+		
+		$ibforums->html .= "</div>";
+		
+		//-----------------------------------------
+		// Show altered / unaltered
+		// legend
+		//-----------------------------------------
+		
+		$ibforums->html .= "<br /><div'><strong>Child skin set pop-up menu legend:</strong><br />
+							{$this->altered} This item has been customized for this skin set.
+							<br />{$this->unaltered} This item has not been customized from the master skin set.
+							<br />{$this->inherited} This item has inherited customizations from the parent skin set.
+							</div>";
+							
+							
+		if ( IN_DEV )
+		{
+			$ibforums->html .= "<br /><div align='center'>
+								DEV: <a href='{$ibforums->base_url}&act=sets&code=exportmaster'>Export Master HTML</a>
+								&middot; <a href='{$ibforums->base_url}&act=sets&code=exportbitschoose'>Export Template Bits</a>
+								&middot; <a href='{$ibforums->base_url}&act=sets&code=exportmacro'>Export Master Macros</a></div>";
+		}
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// Get status of a child
+	//-----------------------------------------
+	
+	function _get_status_of_child($this_item, $parent_item)
+	{
+		if ( $this_item )
+		{
+			return $this->altered;
+		}
+		else if ( $parent_item )
+		{
+			return $this->inherited;
+		}
+		else
+		{
+			return $this->unaltered;
+		}
+	}
+	
+	//-----------------------------------------
+	// Get status of a parent
+	//-----------------------------------------
+	
+	function _get_status_of_parent($this_item)
+	{
+		if ( ! $this_item )
+		{
+			return $this->unaltered;
+		}
+		else
+		{
+			return $this->altered;
+		}
+	}
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_stylesheets.php b/upload/sources/admin/ad_stylesheets.php
new file mode 100644
index 00000000..41c1949d
--- /dev/null
+++ b/upload/sources/admin/ad_stylesheets.php
@@ -0,0 +1,1050 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > CSS management functions
+|   > Module written by Matt Mecham
+|   > Date started: 4th April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_stylesheets
+{
+
+	var $base_url;
+	var $template = "";
+	var $functions = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		// Get the libraries
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/admin_template_functions.php' );
+		
+		$this->functions = new admin_template_functions();
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'floateditor':
+				$this->functions->build_editor_area_floated(1);
+				break;
+				
+			
+			case 'edit2':
+				$this->do_form('edit');
+				break;
+				
+			case 'edit':
+				$this->do_form('edit');
+				break;
+				
+			case 'doedit':
+				$this->save_css('edit');
+				break;
+				
+			case 'optimize':
+				$this->optimize();
+				break;
+				
+			case 'easyedit':
+				$this->easy_edit();
+				break;
+				
+			case 'doresync':
+				$this->do_resynch();
+				break;
+			
+			case 'colouredit':
+				$this->colouredit();
+				break;
+				
+			case 'docolour':
+				$this->do_colouredit();
+				break;
+			
+			default:
+				print "No action taken"; exit();
+				break;
+				
+			//case 'wrapper':
+			//	$this->list_sheets();
+			//	break;
+			//case 'add':
+			//	$this->do_form('add');
+			//	break;
+			//case 'doadd':
+			//	$this->save_css('add');
+			//	break;
+			//case 'remove':
+			//	$this->remove();
+			//	break;
+			//case 'css_upload':
+			//	$this->css_upload('new');
+			//	break;
+			//case 'export':
+			//	$this->export();
+			//	break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// RESYNCH STYLE SHEETS
+	//-----------------------------------------
+	
+	function do_resynch()
+	{
+		global $ibforums, $DB,  $std, $HTTP_POST_VARS;
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing wrapper ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->query("SELECT cssid, css_text, css_name, css_comments FROM ibf_skin_css WHERE cssid='".$ibforums->input['id']."'");
+		
+		if ( ! $cssinfo = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the CSS details from the database");
+		}
+		
+		if ( $ibforums->input['favour'] == 'cache' )
+		{
+			$cache_file = ROOT_PATH."cache/css_".$ibforums->input['id'].".css";
+			
+			if ( file_exists( $cache_file ) )
+			{
+				$FH = fopen( $cache_file, 'r' );
+				$cache_data = fread( $FH, filesize($cache_file) );
+				fclose($FH);
+			}
+			else
+			{
+				$ibforums->admin->error("Could not locate cached CSS file @ $cache_file");
+			}
+			
+			$dbr = $DB->compile_db_update_string( array( 'css_text' => $cache_data ) );
+			
+			$DB->query("UPDATE ibf_skin_css SET $dbr WHERE cssid='".$ibforums->input['id']."'");
+		}
+		else
+		{
+			$cache_file = ROOT_PATH."cache/css_".$ibforums->input['id'].".css";
+			
+			$FH = fopen( $cache_file, 'w' );
+			fputs( $FH, $cssinfo['css_text'], strlen($cssinfo['css_text']) );
+			fclose($FH);
+		}
+		
+		if ( $ibforums->input['return'] != 'colouredit' )
+		{
+			$this->do_form('edit');
+		}
+		else
+		{
+			$this->colouredit();
+		}
+	}
+	
+	
+	
+	//-----------------------------------------
+	// RESYNCH SPLASH
+	//-----------------------------------------
+	
+	function resync_splash($db_length, $cache_length, $cache_mtime, $db_mtime, $id, $return="")
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+	
+		$ibforums->admin->page_detail = "A mismatch has been found between the cached style sheet and the style sheet stored in the database";
+		$ibforums->admin->page_title  = "Resynchronise Style Sheet";
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "50%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "50%" );
+
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doresync'  ),
+															   2 => array( 'act'   , 'style'     ),
+															   3 => array( 'id'    , $id         ),
+															   4 => array( 'return', $return     ),
+													  )    );
+									     
+		$favour = 'db';
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Resynch CSS before editing..." );
+		
+		if ( intval($cache_mtime) > intval($db_mtime) )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<b>CSS in database last updated:</b> ".$ibforums->admin->get_date($db_mtime, 'LONG'),
+														"<b>CSS in database, # characters:</b> $db_length",
+											 )      );
+											 
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<span style='color:red'><b>CSS in CACHE last updated:</b> ".$ibforums->admin->get_date($cache_mtime, 'LONG')."</span>",
+														"<span style='color:red'><b>CSS in CACHE, # characters:</b> $cache_length</span>",
+											 )      );
+			$favour = 'cache';
+											 
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<span style='color:red'><b>CSS in database last updated:</b> ".$ibforums->admin->get_date($db_mtime, 'LONG')."</span>",
+														"<span style='color:red'><b>CSS in database, # characters:</b> $db_length</span>",
+											 )      );
+											 
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<b>CSS in CACHE last updated:</b> ".$ibforums->admin->get_date($cache_mtime, 'LONG'),
+														"<b>CSS in CACHE, # characters:</b> $cache_length",
+											 )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+														"<b>Resynchronise using....</b>",
+														$ibforums->adskin->form_dropdown( 'favour', array(
+																							    0 => array( 'cache', 'Overwrite database version with cached version'),
+																							    1 => array( 'db'   , 'Update cached version from the database' ),
+																							 ), $favour ),
+											 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Resynchronise");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	
+	
+	
+	//-----------------------------------------
+	// OPTIMIZE STYLE SHEET
+	//-----------------------------------------
+	
+	function optimize()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing CSS ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		
+		$DB->query("SELECT * from ibf_skin_css WHERE cssid='".$ibforums->input['id']."'");
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not query the information from the database");
+		}
+		
+		//-----------------------------------------
+		
+		$orig_size = strlen($row['css_text']);
+		
+		$orig_text = str_replace( "\r\n", "\n", $row['css_text']);
+		$orig_text = str_replace( "\r"  , "\n", $orig_text);
+		$orig_text = str_replace( "\n\n", "\n", $orig_text);
+		
+		$parsed = array();
+		
+		//-----------------------------------------
+		// Remove comments
+		//-----------------------------------------
+		
+		$orig_text = preg_replace( "#/\*(.+?)\*/#s", "", $orig_text );
+		
+		//-----------------------------------------
+		// Grab all the definitions
+		//-----------------------------------------
+		
+		preg_match_all( "/(.+?)\{(.+?)\}/s", $orig_text, $match, PREG_PATTERN_ORDER );
+		
+		for ( $i = 0 ; $i < count($match[0]); $i++ )
+		{
+			$match[1][$i] = trim($match[1][$i]);
+			$parsed[ $match[1][$i] ] = trim($match[2][$i]);
+		}
+		
+		//-----------------------------------------
+		
+		if ( count($parsed) < 1)
+		{
+			$ibforums->admin->error("The stylesheet is in a format that Invision Power Board cannot understand, no optimization done.");
+		}
+		
+		//-----------------------------------------
+		// Clean them up
+		//-----------------------------------------
+		
+		$final = "";
+		
+		foreach( $parsed as $name => $p )
+		{
+			//-----------------------------------------
+			// Ignore comments
+			//-----------------------------------------
+			
+			if ( preg_match( "#^//#", $name) )
+			{
+				continue;
+			}
+			
+			//-----------------------------------------
+			// Split up the components
+			//-----------------------------------------
+			
+			$parts = explode( ";", $p);
+			$defs  = array();
+			
+			foreach( $parts as $part )
+			{
+				if ($part != "")
+				{
+					list($definition, $data) = explode( ":", $part );
+					$defs[]   = trim($definition).": ".trim($data);
+				}
+			}
+			
+			$final .= $name . " { ".implode("; ", $defs). " }\n";
+		}
+		
+		$final_size = strlen($final);
+		
+		if ($final_size < 1000)
+		{
+			$ibforums->admin->error("The stylesheet is in a format that Invision Power Board cannot understand, no optimization done.");
+		}
+		
+		//-----------------------------------------
+		// Update the DB
+		//-----------------------------------------
+		
+		$dbs = $DB->compile_db_update_string( array( 'css_text' => $final ) );
+		
+		$DB->query("UPDATE ibf_skin_css SET $dbs WHERE cssid='".$ibforums->input['id']."'");
+		
+		$saved    = $orig_size - $final_size;
+		$pc_saved = 0;
+		
+		if ($saved > 0)
+		{
+			$pc_saved = sprintf( "%.2f", ($saved / $orig_size) * 100);
+		}
+		
+		$ibforums->admin->done_screen("Stylesheet updated: Characters Saved: $saved ($pc_saved %)", "Manage Style Sheets", "act=style" );
+				    
+		
+		
+	}
+	
+	
+	//-----------------------------------------
+	// ADD / EDIT WRAPPERS
+	//-----------------------------------------
+	
+	function save_css( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check input
+		//-----------------------------------------
+		
+		if ($type == 'edit')
+		{
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("You must specify an existing CSS ID, go back and try again");
+			}
+			
+		}
+		
+		if ($ibforums->input['txtcss'] == "")
+		{
+			$ibforums->admin->error("You can't have an empty stylesheet, can you?");
+		}
+		
+		
+		$css = $std->txt_stripslashes($_POST['txtcss']);
+		$css = str_replace( '\\', '\\\\', $css );
+		
+		$DB->do_update( 'skin_sets', array( 'set_css' => $css, 'set_css_updated' => time() ), 'set_skin_set_id='.$ibforums->input['id'] );
+		
+		//-----------------------------------------
+		// Update cache?
+		//-----------------------------------------
+		
+		$extra = "<b>Stylesheet cache file updated</b>";
+		
+		$message = $ibforums->cache_func->_write_css_to_cache( $ibforums->input['id'] );
+		
+		//-----------------------------------------
+		// Back to it...
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['savereload'] )
+		{
+			$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+			$ibforums->main_msg = "Stylesheet updated : $extra";
+			$ibforums->admin->redirect( "act=sets", "Stylesheet updated, returning to the skin manager" );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Reload edit window
+			//-----------------------------------------
+			
+			$ibforums->main_msg = "Stylesheet updated : $extra";
+			$this->do_form('edit');
+		}
+	}
+	
+	
+	
+	
+	//-----------------------------------------
+	// Show Add/Edit form
+	//-----------------------------------------
+	
+	function do_form( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing wrapper ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		$found_id      = "";
+		$found_content = "";
+		$this_set      = "";
+		
+		if ( $ibforums->input['p'] > 0 )
+		{
+			$in = ','.$ibforums->input['p'];
+		}
+		
+		//-----------------------------------------
+		// Query
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'stylesheets_do_form_concat', array( 'id' => $ibforums->input['id'], 'parent' => $in ) );
+		$DB->cache_exec_query();
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		while( $row = $DB->fetch_row() )
+		{
+			if ( $row['set_css'] and ! $found_id )
+			{
+				$found_id      = $row['set_skin_set_id'];
+				$found_content = $row['set_css'];
+				$found_time    = $row['set_css_updated'];
+			}
+			
+			if ( $ibforums->input['id'] == $row['set_skin_set_id'] )
+			{
+				$this_set = $row;
+			}
+		}
+		
+		//-----------------------------------------
+		
+		$css    = $found_content;
+		
+		$code   = 'doedit';
+		$button = 'Save Stylesheet';
+		
+		//-----------------------------------------
+		// COLURS!ooO!
+		//-----------------------------------------
+		
+		//.class { definitions }
+		//#id { definitions }
+		
+		$css_elements = array();
+		
+		preg_match_all( "/(\.|\#)(\S+?)\s{0,}\{.+?\}/s", $css, $match );
+		
+		for ($i=0; $i < count($match[0]); $i++)
+		{
+			$type = trim($match[1][$i]);
+			
+			$name = trim($match[2][$i]);
+			
+			if ($type == '.')
+			{
+				$css_elements[] = array( 'class|'.$name, $type.$name );
+			}
+			else
+			{
+				$css_elements[] = array( 'id|'.$name, $type.$name );
+			}
+		}
+			
+		//-----------------------------------------
+	
+		$ibforums->admin->page_detail = "You may use CSS fully when adding or editing stylesheets.";
+		$ibforums->admin->page_title  = "Manage Style Sheets";
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= "<script language='javascript'>
+		                 <!--
+		                 function cssSearch(theID)
+		                 {
+		                 	cssChosen = document.cssForm.csschoice.options[document.cssForm.csschoice.selectedIndex].value;
+		                 	
+		                 	window.open('{$ibforums->adskin->base_url}&act=rtempl&code=css_search&id='+theID+'&element='+cssChosen,'CSSSEARCH','width=400,height=500,resizable=yes,scrollbars=yes');
+		                 }
+		                 
+		                 function cssPreview(theID)
+		                 {
+		                 	cssChosen = document.cssForm.csschoice.options[document.cssForm.csschoice.selectedIndex].value;
+		                 	
+		                 	window.open('{$ibforums->adskin->base_url}&act=rtempl&code=css_preview&id='+theID+'&element='+cssChosen,'CSSSEARCH','width=400,height=500,resizable=yes,scrollbars=yes');
+		                 }
+		                 
+		                 //-->
+		                 </script>";
+		
+		//-----------------------------------------
+		// Show the form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->js_no_specialchars();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $code      ),
+																 2 => array( 'act'   , 'style'      ),
+																 3 => array( 'id'    , $ibforums->input['id']   ),
+														), "theform"     );
+									     
+		//-----------------------------------------
+		// Editor section
+		//-----------------------------------------
+		
+		$ibforums->html .= $this->functions->build_generic_editor_area( array( 'act' => 'style', 'title' => '', 'textareaname' => 'css', 'textareainput' => $css ) );
+		
+		$formbuttons = "<div align='center' class='pformstrip'>
+						<input type='submit' name='submit' value='$button' class='realdarkbutton'>
+						<input type='submit' name='savereload' value='Save and Reload Stylesheet' class='realdarkbutton'>
+						</div></form>\n";
+		
+		$ibforums->html = str_replace( '<!--IPB.EDITORBOTTOM-->', $formbuttons, $ibforums->html );
+		
+		$ibforums->html .= "<br />";
+		
+		//-----------------------------------------
+		// CSS search form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'css_search' ),
+															     2 => array( 'act'   , 'style'      ),
+															     3 => array( 'id'    , $ibforums->input['id']    ),
+													    ), "cssForm"      );
+									     
+		
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "20%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "80%" );
+
+		$ibforums->html .= $ibforums->adskin->start_table( "Find CSS Usage" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( 
+																 "Show me where...",
+																 $ibforums->adskin->form_dropdown('csschoice', $css_elements).' ... is used within the templates &nbsp;'
+																.'<input type="button" value="Go!" onClick="cssSearch(\''.$ibforums->input['id'].'\');" id="editbutton">'
+																.'&nbsp;<input type="button" value="Preview CSS Style" onClick="cssPreview(\''.$ibforums->input['id'].'\');" id="editbutton">'
+													  )      );
+									     
+		$ibforums->html .= $ibforums->adskin->end_form();
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= $ibforums->adskin->skin_jump_menu_wrap();
+										 
+		//-----------------------------------------
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( '' ,'Editing Style Sheet in set '.$this_set['set_name'] );
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// EDIT COLOURS START
+	//-----------------------------------------
+	
+	function colouredit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing wrapper ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		$found_id      = "";
+		$found_content = "";
+		$this_set      = "";
+		
+		if ( $ibforums->input['p'] > 0 )
+		{
+			$in = ','.$ibforums->input['p'];
+		}
+		
+		//-----------------------------------------
+		// Query
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'stylesheets_do_form_concat', array( 'id' => $ibforums->input['id'], 'parent' => $in ) );
+		$DB->cache_exec_query();
+			        
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		while( $row = $DB->fetch_row() )
+		{
+			if ( $row['set_css'] and ! $found_id )
+			{
+				$found_id      = $row['set_skin_set_id'];
+				$found_content = $row['set_css'];
+				$found_time    = $row['set_css_updated'];
+			}
+			
+			if ( $ibforums->input['id'] == $row['set_skin_set_id'] )
+			{
+				$this_set = $row;
+			}
+		}
+		
+		//-----------------------------------------
+		
+		$css = $found_content;
+		$css = preg_replace( "#/\*.+?\*/#s", "", $css );
+		//print "<pre>"; print $css; exit();
+		//-----------------------------------------
+		// Start the CSS matcher thingy
+		//-----------------------------------------
+		
+		//.class { definitions }
+		//#id { definitions }
+		
+		$colours = array();
+		
+		//-----------------------------------------
+		// Make http:// safe..
+		//-----------------------------------------
+		
+		$css = str_replace( 'http://', 'http|//', $css );
+		
+		preg_match_all( "/([\:\.\#\w\s,]+)\{(.+?)\}/s", $css, $match );
+		
+		for ($i=0; $i < count($match[0]); $i++)
+		{
+			$name    = trim($match[1][$i]);
+			$content = trim($match[2][$i]);
+			
+			$defs    = explode( ';', $content );
+			
+			if ( count( $defs ) > 0 )
+			{
+				foreach( $defs as $a )
+				{
+					$a = trim($a);
+					
+					if ( $a != "" )
+					{
+						list( $property, $value ) = explode( ":", $a, 2 );
+						
+						$property = trim($property);
+						$value    = trim( str_replace( 'http|//', 'http://', $value) );
+						
+						if ( $property )
+						{
+							if ( $property == 'color' or $property == 'background-color' )
+							{
+								$colours[ $name ][$property] = $value;
+							}
+							else
+							{
+								$colours[ $name ]['_extra'] .= $property.':'.$value.';'."\n";
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		//print "<pre>"; print_r( $colours ); exit();
+		
+		if ( count($colours) < 1 )
+		{
+			$ibforums->admin->error("CSS all gone wonky! No colours to edit");
+		}
+		
+		//-----------------------------------------
+		
+		// Get $skin_names stuff
+		
+		require './sources/admin/skin_info.php';
+	
+		$ibforums->admin->page_detail = "You edit the existing colours below. <strong><a href='skin_acp/IPB2_Standard/colours.html' target='_blank'>Launch Colour Picker</a></center></strong>";
+		$ibforums->admin->page_title  = "Manage Style Sheets [ Colours ]";
+		
+		
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'docolour'   ),
+																 2 => array( 'act'   , 'style'      ),
+																 3 => array( 'id'    , $ibforums->input['id']    ),
+														)    );
+									     
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "{none}" , "100%" );
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= "<input type='hidden' name='initcol' value='' />
+							<input type='hidden' name='initformval' value='' />
+							<script type='text/javascript'>
+							function updatecolor( id )
+							{
+								itm = my_getbyid( id );
+								
+								if ( itm )
+								{
+									eval(\"newcol = document.theAdminForm.f\"+id+\".value\");
+									itm.style.backgroundColor = newcol;
+								}
+								
+							}
+							function poppicker( initcolor, formfield )
+							{
+								if ( initcolor )
+								{
+									document.theAdminForm.initcol.value = initcolor;
+								}
+								
+								document.theAdminForm.initformval.value = formfield;
+								
+								PopUp( 'skin_acp/IPB2_Standard/colours.html', 'PopPicker', 400, 500 );
+							}
+						    </script>";
+						    
+		$ibforums->html .= $ibforums->adskin->start_table( "CSS Colours" );
+		$ibforums->html .= "<td class='tdrow2'>";
+		
+		foreach ( $colours as $prop => $val )
+		{
+			$tbl_colour = "";
+			$tbl_bg     = "";
+			$tbl_html   = "";
+			
+			$desc = $css_names[ $prop ];
+			
+			if ( $desc == "" )
+			{
+				$desc = 'None available';
+			}
+			
+			$name = $prop;
+			
+			$md5 = md5($name);
+			
+			if ( strlen($name) > 80 )
+			{
+				$name = substr( $name, 0, 80 ) .'...';
+			}
+			
+			$font_box  = $ibforums->adskin->form_simple_input('f'.$md5.'color'           , $val['color'], "14");
+			$bgcol_box = $ibforums->adskin->form_simple_input('f'.$md5.'backgroundcolor' , $val['background-color'], "14");
+			
+			$ibforums->html .= "<div class='tdrow1'>
+								 <fieldset>
+								  <legend><strong style='font-size:14px'>{$name}</strong></legend>
+								  <table width='100%' border='0' cellpadding='4' cellspacing='0'>
+								  <tr>
+								   <td width='40%' valign='top'>
+								    <fieldset>
+								     <legend><strong>Font Color</strong></legend>
+										{$font_box}&nbsp;&nbsp;<input type='text' id='{$md5}color' onclick=\"updatecolor('{$md5}color')\" size='6' style='border:1px solid black;background-color:{$val['color']}' readonly='readonly'>&nbsp;<a href='#' title='launch color picker' onclick=\"poppicker('{$val['color']}', '{$md5}color'); return false;\"><img src='{$ibforums->skin_url}/colorselect.png' border='0' /></a>
+									</fieldset>
+									<br />
+									<fieldset>
+									 <legend><strong>Background Color</strong></legend>
+			 						    {$bgcol_box}&nbsp;&nbsp;<input type='text' id='{$md5}backgroundcolor'  onclick=\"updatecolor('{$md5}backgroundcolor')\" size='6' style='border:1px solid black;background-color:{$val['background-color']}' readonly='readonly'>&nbsp;<a href='#' title='launch color picker' onclick=\"poppicker('{$val['background-color']}', '{$md5}backgroundcolor'); return false;\"><img src='{$ibforums->skin_url}/colorselect.png' border='0' /></a>
+			 						</fieldset>
+			 					   </td>
+			 					   <td width='60%' valign='top'>
+			 					   <fieldset>
+									 <legend><strong>Other CSS Attributes</strong></legend>
+			 						    <textarea class='textinput' cols='40' rows='5' style='width:100%' name='f{$md5}extra'>{$val['_extra']}</textarea>
+			 						</fieldset>
+			 					   </td>
+			 					  </tr>
+			 					  </table>
+			 					 </fieldset>
+			 					 </div>";
+		}
+		
+		$ibforums->html .= "</td>";
+		$ibforums->html .= $ibforums->adskin->end_form("Edit");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// EDIT COLOURS START
+	//-----------------------------------------
+	
+	function do_colouredit()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing wrapper ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		$found_id      = "";
+		$found_content = "";
+		$this_set      = "";
+		
+		if ( $ibforums->input['p'] > 0 )
+		{
+			$in = ','.$ibforums->input['p'];
+		}
+		
+		//-----------------------------------------
+		// Query
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'stylesheets_do_form_concat', array( 'id' => $ibforums->input['id'], 'parent' => $in ) );
+		$DB->cache_exec_query();
+			        
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		while( $row = $DB->fetch_row() )
+		{
+			if ( $row['set_css'] and ! $found_id )
+			{
+				$found_id      = $row['set_skin_set_id'];
+				$found_content = $row['set_css'];
+				$found_time    = $row['set_css_updated'];
+			}
+			
+			if ( $ibforums->input['id'] == $row['set_skin_set_id'] )
+			{
+				$this_set = $row;
+			}
+		}
+		
+		//-----------------------------------------
+		
+		$css = $found_content;
+		$css = preg_replace( "#/\*.+?\*/#s", "", $css );
+		
+		//-----------------------------------------
+		// Start the CSS matcher thingy
+		//-----------------------------------------
+		
+		$css     = str_replace( 'http://', 'http|//', $css );
+		
+		$colours = array();
+		
+		preg_match_all( "/([\:\.\#\w\s,]+)\{(.+?)\}/s", $css, $match );
+		
+		for ($i=0; $i < count($match[0]); $i++)
+		{
+			$name    = trim($match[1][$i]);
+			$content = trim($match[2][$i]);
+			
+			$md5     = md5($name);
+			
+			$defs    = explode( ';', $content );
+			
+			if ( count( $defs ) > 0 )
+			{
+				foreach( $defs as $a )
+				{
+					$a = trim($a);
+					
+					if ( $a != "" )
+					{
+						list( $property, $value ) = explode( ":", $a, 2 );
+						
+						$property = trim($property);
+						$value    = trim( str_replace( 'http|//', 'http://', $value) );
+						
+						if ( $property )
+						{
+							$colours[ $name ][$property] = $value;
+						}
+					}
+				}
+			}
+			
+			foreach( array( 'color', 'backgroundcolor' ) as $prop )
+			{
+				if ( isset($_POST['f'.$md5.$prop]) )
+				{
+					$field = $prop == 'backgroundcolor' ? 'background-color' : $prop;
+					
+					$colours[ $name ][$field] = stripslashes($_POST['f'.$md5.$prop]);
+				}
+			}
+			
+			if ( isset( $_POST['f'.$md5.'extra'] ) )
+			{
+				$tmp = str_replace( "\n", "", $_POST['f'.$md5.'extra'] );
+				$tmp = str_replace( "\r", "", $tmp );
+				
+				$extra_attr = explode( ";", $tmp );
+				
+				if ( is_array( $extra_attr ) and count( $extra_attr ) )
+				{
+					foreach( $extra_attr as $l )
+					{
+						$l = str_replace( 'http://', 'http|//', $l );
+						
+						list( $p, $v ) = explode( ":", $l );
+						
+						$colours[ $name ][ trim($p) ] = trim( str_replace( 'http|//', 'http://', $v) );
+					}
+				}
+			}
+		}
+		
+		if ( count($colours) < 1 )
+		{
+			$ibforums->admin->error("CSS all gone wonky! No colours to edit");
+		}
+		
+		//-----------------------------------------
+		
+		unset($name);
+		unset($property);
+		
+		$final = "";
+		
+		foreach( $colours as $name => $property )
+		{
+			$final .= $name."\n{\n";
+			
+			if ( is_array($property) and count($property) > 0 )
+			{
+				foreach( $property as $key => $value )
+				{
+					if ( $key AND $value )
+					{
+						$final .= "\t".$key.": ".$value.";\n";
+					}
+				}
+			}
+			
+			$final .= "}\n\n";
+		
+		}
+		
+		//print "<pre>";
+		//print $final;
+		//exit();
+		
+		$ibforums->input['txtcss']     = $final;
+		$_POST['txtcss']               = $final;
+		$ibforums->input['savereload'] = 0;
+		$this->save_css('edit');
+		
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_subsmanager.php b/upload/sources/admin/ad_subsmanager.php
similarity index 68%
rename from upload/sources/Admin/ad_subsmanager.php
rename to upload/sources/admin/ad_subsmanager.php
index e1edade3..2b8debee 100644
--- a/upload/sources/Admin/ad_subsmanager.php
+++ b/upload/sources/admin/ad_subsmanager.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,6 +19,7 @@
 |   > Date started: 19th August 2003
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
 +--------------------------------------------------------------------------
 */
 
@@ -29,19 +29,17 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
-$idx = new ad_subscriptions();
-
-class ad_subscriptions {
+class ad_subsmanager {
 
 	var $base_url;
 
-	function ad_subscriptions()
+	function auto_run()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
+		global $ibforums, $DB,  $std;
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -50,16 +48,16 @@ class ad_subscriptions {
 			unset($$k);
 		}
 		
-		$ADMIN->page_title = "IPB Subscriptions Manager";
+		$ibforums->admin->page_title = "IPB Subscriptions Manager";
 		
-		$ADMIN->page_detail = "You can set up and manage your member's paid subscriptions in this section.";
+		$ibforums->admin->page_detail = "You can set up and manage your member's paid subscriptions in this section.";
 		
-		$ADMIN->nav[] = array( 'act=msubs'              , 'IPB Subscription Manager Home' );
-		$ADMIN->nav[] = array( 'act=msubs&code=dosearch', 'Show all subscribed members' );
+		$ibforums->admin->nav[] = array( 'act=msubs'              , 'IPB Subscription Manager Home' );
+		$ibforums->admin->nav[] = array( 'act=msubs&code=dosearch', 'Show all subscribed members' );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Do some set up
-		//---------------------------------------
+		//-----------------------------------------
 		
 		if ( ! @is_dir( ROOT_PATH.'/modules/subsmanager' ) )
 		{
@@ -74,9 +72,9 @@ class ad_subscriptions {
 			$PLUGIN = new ad_plugin_subsm();
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		switch($IN['code'])
+		switch($ibforums->input['code'])
 		{
 			case 'editpkginfo':
 				$PLUGIN->edit_pkg_gateway_info();
@@ -84,21 +82,21 @@ class ad_subscriptions {
 			case 'doeditpkg':
 				$PLUGIN->doedit_pkg_gateway_info();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'removepackage':
 				$PLUGIN->remove_package();
 				break;
 			case 'doremovepackage':
 				$PLUGIN->do_remove_package();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'removemembers':
 				$PLUGIN->remove_members();
 				break;
 			case 'doremovemembers':
 				$PLUGIN->do_remove_members();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'addpackage':
 				$PLUGIN->alter_package_form('add');
 				break;
@@ -106,7 +104,7 @@ class ad_subscriptions {
 			case 'doaddpackage':
 				$PLUGIN->do_add_package();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'editpackage':
 				$PLUGIN->alter_package_form('edit');
 				break;
@@ -114,7 +112,7 @@ class ad_subscriptions {
 			case 'doeditpackage':
 				$PLUGIN->do_edit_package();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'editmethod':
 				$PLUGIN->edit_method();
 				break;
@@ -122,7 +120,7 @@ class ad_subscriptions {
 			case 'doeditmethod':
 				$PLUGIN->do_edit_method();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'dosearch':
 				$PLUGIN->do_search();
 				break;
@@ -132,7 +130,7 @@ class ad_subscriptions {
 			case 'searchlogview':
 				$PLUGIN->do_search_log_view();
 				break;
-			//-------------------------
+			//-----------------------------------------
 			case 'domodifytrans':
 				$PLUGIN->do_modify_trans();
 				break;
@@ -141,7 +139,7 @@ class ad_subscriptions {
 				$PLUGIN->do_delete_trans();
 				break;
 			
-			//-------------------------
+			//-----------------------------------------
 			case 'edittransaction':
 				$PLUGIN->edit_transaction('edit');
 				break;
@@ -162,7 +160,7 @@ class ad_subscriptions {
 				$PLUGIN->do_overview();
 				break;
 				
-			//-------------------------
+			//-----------------------------------------
 			
 			case 'currency':
 				$PLUGIN->currency_index();
diff --git a/upload/sources/admin/ad_task_manager.php b/upload/sources/admin/ad_task_manager.php
new file mode 100644
index 00000000..24f8fa70
--- /dev/null
+++ b/upload/sources/admin/ad_task_manager.php
@@ -0,0 +1,843 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Task Manager
+|   > Module written by Matt Mecham
+|   > Date started: 27th January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_task_manager {
+
+	var $functions = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Require and RUN !! THERES A BOMB
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/lib/task_functions.php' );
+		
+		$this->functions = new task_functions();
+		
+		$ibforums->admin->page_detail = "The task manager contains all your scheduled tasks.<br />Please note that as these tasks are run when the board is accessed, the next run time is to be used as a guide only and depends on the traffic your board gets.";
+		$ibforums->admin->page_title  = "Task Manager";
+
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=task', 'Task Manager Home' );
+		
+		//-----------------------------------------
+		// What to do...
+		//-----------------------------------------
+		
+		switch($ibforums->input['code'])
+		{
+			
+			case 'edit':
+				$this->task_form('edit');
+				break;
+				
+			case 'doedittask':
+				$this->do_save('edit');
+				break;
+				
+			case 'addtask':
+				$this->task_form('add');
+				break;
+				
+			case 'doaddtask':
+				$this->do_save('add');
+				break;
+				
+			case 'delete':
+				$this->delete_task();
+				break;
+				
+			case 'run':
+				$this->run_task();
+				break;
+				
+			case 'log':
+				$this->task_log_setup();
+				break;
+				
+			case 'showlog':
+				$this->task_log_show();
+				break;
+				
+			case 'deletelog':
+				$this->task_log_delete();
+				break;
+			
+			default:
+				$this->show_tasks();
+				break;
+		}
+	}
+	
+	//-----------------------------------------
+	// TASK LOG DELETE
+	//-----------------------------------------
+	
+	function task_log_delete()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// SHOW 'EM
+		//-----------------------------------------
+		
+		$prune = $ibforums->input['task_prune'] ? $ibforums->input['task_prune'] : 30;
+		$prune = time() - ( $prune * 86400 );
+		
+		if ( $ibforums->input['task_id'] != -1 )
+		{
+			$where = "task_title='".$ibforums->input['task_id']."' AND log_date < $prune";
+		}
+		else
+		{
+			$where = "log_date < $prune";
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'task_logs', 'where' => $where ) );
+		
+		$ibforums->main_msg = 'Selected Task Logs Removed';
+		$this->task_log_setup();
+	
+	}
+	
+	//-----------------------------------------
+	// TASK LOG SHOW
+	//-----------------------------------------
+	
+	function task_log_show()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// SHOW 'EM
+		//-----------------------------------------
+		
+		$limit = $ibforums->input['task_count'] ? $ibforums->input['task_count'] : 30;
+		$limit = $limit > 150 ? 150 : $limit;
+		
+		if ( $ibforums->input['task_id'] != -1 )
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'task_logs', 'where' => "log_title='".$ibforums->input['task_id']."'", 'order' => 'log_date DESC', 'limit' => '0,'.$limit ) );
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'task_logs', 'order' => 'log_date DESC', 'limit' => '0,'.$limit ) );
+		}
+		
+		$DB->simple_exec();
+		
+		$ibforums->adskin->td_header[] = array( "Task Run" , "20%" );
+		$ibforums->adskin->td_header[] = array( "Date Run" , "35%" );
+		$ibforums->adskin->td_header[] = array( "Log Info" , "45%" );
+		
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Selected Task Logs" );
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$row['log_title']}</b>",
+																	   $ibforums->admin->get_date( $row['log_date'], 'SHORT' ),
+																	   "{$row['log_desc']}",
+															  )      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	//-----------------------------------------
+	// TASK LOG START
+	//-----------------------------------------
+	
+	function task_log_setup()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Some set up
+		//-----------------------------------------
+		
+		$tasks = array( 0 => array( -1, 'All tasks' ) );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'task_manager', 'order' => 'task_title' ) );
+		$DB->simple_exec();
+		
+		while ( $pee = $DB->fetch_row() )
+		{
+			$tasks[] = array( $pee['task_title'], $pee['task_title'] );
+		}
+		
+		//-----------------------------------------
+		// LAST FIVE ACTIONS
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'task_logs', 'order' => 'log_date DESC', 'limit' => array(0,5) ) );
+
+		$DB->simple_exec();
+		
+		$ibforums->adskin->td_header[] = array( "Task Run" , "20%" );
+		$ibforums->adskin->td_header[] = array( "Date Run" , "35%" );
+		$ibforums->adskin->td_header[] = array( "Log Info" , "45%" );
+		
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Last 5 Tasks Run" );
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$row['log_title']}</b>",
+																	   $ibforums->admin->get_date( $row['log_date'], 'SHORT' ),
+																	   "{$row['log_desc']}",
+															  )      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Show more...
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'task'    ),
+															   2 => array( 'code' , 'showlog' ),
+													  )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "View Task Logs" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>View logs for task:</b>",
+															  $ibforums->adskin->form_dropdown( 'task_id', $tasks )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Show how many log entries?</b>",
+															  $ibforums->adskin->form_input( 'task_count', '30' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->end_form('View Logs');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		// Delete...
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'task'    ),
+															   2 => array( 'code' , 'deletelog' ),
+													  )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "40%" );
+		
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "DELETE Task Logs" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Delete logs for task:</b>",
+															  $ibforums->adskin->form_dropdown( 'task_id', $tasks )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Delete logs older than (in days)?</b>",
+															  $ibforums->adskin->form_input( 'task_prune', '30' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->end_form('DELETE Logs');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	//-----------------------------------------
+	// RUN TASK
+	//-----------------------------------------
+	
+	function run_task()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = 'No ID was passed, cannot save';
+			$this->show_tasks();
+		}
+		
+		$this_task = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'task_manager', 'where' => 'task_id='.$ibforums->input['id'] ) );
+		
+		if ( ! $this_task['task_id'] )
+		{
+			$ibforums->main_msg = 'No task to run.';
+			$this->show_tasks();
+		}
+		
+		if ( ! $this_task['task_enabled'] )
+		{
+			$ibforums->main_msg = "This task has been disabled. Please enable the task before running it.";
+			$this->show_tasks();
+		}
+		
+		//-----------------------------------------
+		// Get new instance of functions
+		//-----------------------------------------
+		
+		$func    = new task_functions();
+		
+		$newdate = $func->generate_next_run($this_task);
+				
+		$DB->do_update( 'task_manager', array( 'task_next_run' => $newdate ), "task_id=".$this_task['task_id'] );
+		
+		$func->save_next_run_stamp();
+		
+		$func->root_path = ROOT_PATH;
+		
+		if ( file_exists( $func->root_path.'sources/tasks/'.$this_task['task_file'] ) )
+		{
+			require_once( $func->root_path.'sources/tasks/'.$this_task['task_file'] );
+			$myobj = new task_item();
+			$myobj->register_class( $func );
+			$myobj->pass_task( $this_task );
+			$myobj->run_task();
+			
+			$ibforums->main_msg = 'Task run successfully';
+			$this->show_tasks();
+		}
+		else
+		{
+			$ibforums->main_msg = 'Cannot locate: '.$func->root_path.'sources/tasks/'.$this_task['task_file'];
+			$this->show_tasks();
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// DELETE TASK
+	//-----------------------------------------
+	
+	function delete_task()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $ibforums->input['id'] )
+		{
+			$ibforums->main_msg = 'No ID was passed, cannot save';
+			$this->show_tasks();
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'task_manager', 'where' => 'task_id='.$ibforums->input['id'] ) );
+		
+		$this->functions->save_next_run_stamp();
+		
+		$ibforums->main_msg = 'Task deleted';
+		
+		$this->show_tasks();
+	}
+	
+	//-----------------------------------------
+	// DO SAVE
+	//-----------------------------------------
+	
+	function do_save($type='edit')
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $type == 'edit' )
+		{
+			if ( ! $ibforums->input['id'] )
+			{
+				$ibforums->main_msg = 'No ID was passed, cannot save';
+				$this->task_form();
+			}
+		}
+		
+		if ( ! $ibforums->input['task_title'] )
+		{
+			$ibforums->main_msg = 'You must enter a task title.';
+			$this->task_form();
+		}
+		
+		if ( ! $ibforums->input['task_file'] )
+		{
+			$ibforums->main_msg = 'You must enter a filename for this task to run';
+			$this->task_form();
+		}
+		
+		//-----------------------------------------
+		// Compile task
+		//-----------------------------------------
+		
+		$save = array( 'task_title'       => $ibforums->input['task_title'],
+					   'task_description' => $ibforums->input['task_description'],
+					   'task_file'        => $ibforums->input['task_file'],
+					   'task_week_day'    => $ibforums->input['task_week_day'],
+					   'task_month_day'   => $ibforums->input['task_month_day'],
+					   'task_hour'        => $ibforums->input['task_hour'],
+					   'task_minute'      => $ibforums->input['task_minute'],
+					   'task_log'		  => $ibforums->input['task_log'],
+					   'task_cronkey'     => $ibforums->input['task_cronkey'] ? $ibforums->input['task_cronkey'] : md5(microtime()),
+					   'task_enabled'     => $ibforums->input['task_enabled'],
+					   'task_key'         => $ibforums->input['task_key'],
+					   'task_safemode'    => $ibforums->input['task_safemode'],
+					 );
+					 
+		//-----------------------------------------
+		// Get next run date...
+		//-----------------------------------------
+		
+		$save['task_next_run'] = $this->functions->generate_next_run( $save );
+		
+		if ( $type == 'edit' )
+		{
+			$DB->do_update( 'task_manager', $save, 'task_id='.$ibforums->input['id'] );
+			$ibforums->main_msg = 'Task Edited Successfully';
+		}
+		else
+		{
+			$DB->do_insert( 'task_manager', $save );
+			$ibforums->main_msg = 'Task Saved Successfully';
+		}
+		
+		$this->functions->save_next_run_stamp();
+		
+		$this->show_tasks();
+	}
+	
+	
+	//-----------------------------------------
+	// EDIT TASK
+	//-----------------------------------------
+	
+	function task_form($type='edit')
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $type == 'edit' )
+		{
+			//-----------------------------------------
+			// Get task
+			//-----------------------------------------
+			
+			$id = intval($ibforums->input['id']);
+			
+			$this_task = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'task_manager', 'where' => 'task_id='.$id ) ); 
+			
+			$button    = 'Edit this task';
+			$code      = 'doedittask';
+			$title     = 'Editing task: '.$this_task['task_title'];
+		}
+		else
+		{
+			$this_task = array();
+			$button    = 'Add this task';
+			$code      = 'doaddtask';
+			$title     = 'Adding a new task';
+		}
+		
+		//-----------------------------------------
+		// Create drop downs
+		//-----------------------------------------
+		
+		$dd_minute = array( 0 => array( '-1', 'Every Minute'   ) );
+		$dd_hour   = array( 0 => array( '-1', 'Every Hour'     ), 1 => array( '0', '0 - Midnight' ) ); 
+		$dd_wday   = array( 0 => array( '-1', 'Every Week Day' ) );
+		$dd_mday   = array( 0 => array( '-1', 'Every Day of the Month' ) );
+		$dd_month  = array( 0 => array( '-1', 'Every Month'    ) );
+		
+		for( $i = 0 ; $i < 60; $i++ )
+		{
+			$dd_minute[] = array( $i, $i );
+		}
+		
+		for( $i = 1 ; $i < 24; $i++ )
+		{
+			if ( $i < 12 )
+			{
+				$ampm = $i.' am';
+			}
+			else if ( $i == 12 )
+			{
+				$ampm = 'Midday';
+			}
+			else
+			{
+				$ampm = $i - 12 . ' pm';
+			}
+			
+			$dd_hour[] = array( $i, $i. ' - ('.$ampm.')' );
+		}
+		
+		for( $i = 1 ; $i < 32; $i++ )
+		{
+			$dd_mday[] = array( $i, $i );
+		}
+		
+		$dd_wday[]  = array( '0', 'Sunday'     );
+		$dd_wday[]  = array( '1', 'Monday'     );
+		$dd_wday[]  = array( '2', 'Tuesday'    );
+		$dd_wday[]  = array( '3', 'Wednesday'  );
+		$dd_wday[]  = array( '4', 'Thursday'   );
+		$dd_wday[]  = array( '5', 'Friday'     );
+		$dd_wday[]  = array( '6', 'Saturday'   );
+		
+		//-----------------------------------------
+		// START FORM
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'task' ),
+															   2 => array( 'code' , $code  ),
+															   3 => array( 'id'   , $id    ),
+															   4 => array( 'task_cronkey', $this_task['task_cronkey'] ),
+													  )      );
+													  
+		$ibforums->html .= "<script type='text/javascript' language='javascript'>
+							function updatepreview()
+							{
+								var formobj  = document.theAdminForm;
+								var dd_wday  = new Array();
+								
+								dd_wday[0]   = 'Sunday';
+								dd_wday[1]   = 'Monday';
+								dd_wday[2]   = 'Tuesday';
+								dd_wday[3]   = 'Wednesday';
+								dd_wday[4]   = 'Thursday';
+								dd_wday[5]   = 'Friday';
+								dd_wday[6]   = 'Saturday';
+								
+								var output       = '';
+								
+								chosen_min   = formobj.task_minute.options[formobj.task_minute.selectedIndex].value;
+								chosen_hour  = formobj.task_hour.options[formobj.task_hour.selectedIndex].value;
+								chosen_wday  = formobj.task_week_day.options[formobj.task_week_day.selectedIndex].value;
+								chosen_mday  = formobj.task_month_day.options[formobj.task_month_day.selectedIndex].value;
+								
+								var output_min   = '';
+								var output_hour  = '';
+								var output_day   = '';
+								var timeset      = 0;
+								
+								if ( chosen_mday == -1 && chosen_wday == -1 )
+								{
+									output_day = '';
+								}
+								
+								if ( chosen_mday != -1 )
+								{
+									output_day = 'On day '+chosen_mday+'.';
+								}
+								
+								if ( chosen_mday == -1 && chosen_wday != -1 )
+								{
+									output_day = 'On ' + dd_wday[ chosen_wday ]+'.';
+								}
+								
+								if ( chosen_hour != -1 && chosen_min != -1 )
+								{
+									output_hour = 'At '+chosen_hour+':'+formatnumber(chosen_min)+'.';
+								}
+								else
+								{
+									if ( chosen_hour == -1 )
+									{
+										if ( chosen_min == 0 )
+										{
+											output_hour = 'On every hour';
+										}
+										else
+										{
+											if ( output_day == '' )
+											{
+												if ( chosen_min == -1 )
+												{
+													output_min = 'Every minute';
+												}
+												else
+												{
+													output_min = 'Every '+chosen_min+' minutes.';
+												}
+											}
+											else
+											{
+												output_min = 'At '+formatnumber(chosen_min)+' minutes past the first available hour';
+											}
+										}
+									}
+									else
+									{
+										if ( output_day != '' )
+										{
+											output_hour = 'At ' + chosen_hour + ':00';
+										}
+										else
+										{
+											output_hour = 'Every ' + chosen_hour + ' hours';
+										}
+									}
+								}
+								
+								output = output_day + ' ' + output_hour + ' ' + output_min;
+								
+								formobj.showtask.value = output;
+							}
+							
+							function formatnumber(num)
+							{
+								if ( num == -1 )
+								{
+									return '00';
+								}
+								if ( num < 10 )
+								{
+									return '0'+num;
+								}
+								else
+								{
+									return num;
+								}
+							}
+							</script>";
+							
+		$input = "<input type='text' name='showtask' class='realbutton' size='50' style='font-size:10px;width:auto;font-weight:normal'/>";
+									     
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "<table width='100%' border='0'><tr><td width='100%' style='color:white;font-size:11px'><b>$title</b></td><td width='1%' nowrap='nowrap'>$input</td></tr></table>" );
+		
+															   
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Title</strong>",
+															   $ibforums->adskin->form_input( 'task_title', $_POST['task_title'] ? $_POST['task_title'] : $this_task['task_title'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Short Description</strong>",
+															   $ibforums->adskin->form_input( 'task_description', $_POST['task_description'] ? $_POST['task_description'] : $this_task['task_description'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task PHP File To Run</strong><div style='color:gray'>This is the PHP file that is run when the task is run.</div>",
+															   "./sources/tasks/ ".$ibforums->adskin->form_simple_input( 'task_file', $_POST['task_file'] ? $_POST['task_file'] : $this_task['task_file'], '20' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Time: Minutes</strong><div style='color:gray'>Choose 'Every Minute' to run each minute or a number for a specific minute of an hour</div>",
+															   $ibforums->adskin->form_dropdown( 'task_minute', $dd_minute, $_POST['task_minute'] ? $_POST['task_minute'] : $this_task['task_minute'], 'onchange="updatepreview()"' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Time: Hours</strong><div style='color:gray'>Choose 'Every Hour' to run each hour or a number for a specific hour of a day</div>",
+															   $ibforums->adskin->form_dropdown( 'task_hour', $dd_hour, $_POST['task_hour'] ? $_POST['task_hour'] : $this_task['task_hour'], 'onchange="updatepreview()"' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Time: Week Day</strong><div style='color:gray'>Choose 'Every Day' to run each day or a week day for a specific week day of a month</div>",
+															   $ibforums->adskin->form_dropdown( 'task_week_day', $dd_wday, $_POST['task_week_day'] ? $_POST['task_week_day'] : $this_task['task_week_day'], 'onchange="updatepreview()"' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Time: Month Day</strong><div style='color:gray'>Choose 'Every Day' to run each day or a month day for a specific month day of a month</div>",
+															   $ibforums->adskin->form_dropdown( 'task_month_day', $dd_mday, $_POST['task_month_day'] ? $_POST['task_month_day'] : $this_task['task_month_day'], 'onchange="updatepreview()"' )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Enable Task Logging</strong><div style='color:gray'>Will write to the task log each time the task is run, not recommended for regular tasks run every few minutes.</div>",
+															   $ibforums->adskin->form_yes_no( 'task_log', $_POST['task_log'] ? $_POST['task_log'] : $this_task['task_log'] )
+													 )      );
+													 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Enable Task?</strong><div style='color:gray'>If you are using CRON, you might wish to disable this task from the internal manager.</div>",
+															   $ibforums->adskin->form_yes_no( 'task_enabled', $_POST['task_enabled'] ? $_POST['task_enabled'] : $this_task['task_enabled'] )
+													 )      );
+		
+		if ( IN_DEV )
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Key</strong><div style='color:gray'>This is used to call a task where the ID of the task might change</div>",
+															         $ibforums->adskin->form_input( 'task_key', $_POST['task_key'] ? $_POST['task_key'] : $this_task['task_key'] )
+													        )      );
+													        
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<strong>Task Safe Mode</strong><div style='color:gray'>If set to 'yes', this will not be editable by admins</div>",
+															         $ibforums->adskin->form_yes_no( 'task_safemode', $_POST['task_safemode'] ? $_POST['task_safemode'] : $this_task['task_safemode'] )
+													        )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->html .= "<div style='tableborder'><div align='center' class='pformstrip'><input type='submit' value='$button' class='realdarkbutton' /></div>
+						  </form>";
+		
+		//-----------------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	//-----------------------------------------
+	// SHOW TASKS
+	//-----------------------------------------
+	
+	function show_tasks()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// REBUILD CACHES
+		//-----------------------------------------
+
+		$ibforums->html .= $ibforums->adskin->js_checkdelete("Are you sure you wish to remove this task?");
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'act'  , 'task'     ),
+															   2 => array( 'code' , 'addtask'  ),
+													  )      );
+									     
+		$ibforums->adskin->td_header[] = array( "Title"    , "40%" );
+		$ibforums->adskin->td_header[] = array( "Next Run" , "25%" );
+		$ibforums->adskin->td_header[] = array( "Min"      , "5%" );
+		$ibforums->adskin->td_header[] = array( "Hour"     , "5%" );
+		$ibforums->adskin->td_header[] = array( "MDay"     , "5%" );
+		$ibforums->adskin->td_header[] = array( "WDay"     , "5%" );
+		$ibforums->adskin->td_header[] = array( "Options"  , "25%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Your scheduled tasks" );
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'task_manager', 'order' => 'task_safemode, task_next_run' ) );
+		$DB->simple_exec();
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			$row['task_minute']    = $row['task_minute']    != '-1' ? $row['task_minute']    : '-';
+			$row['task_hour']      = $row['task_hour']      != '-1' ? $row['task_hour']      : '-';
+			$row['task_month_day'] = $row['task_month_day'] != '-1' ? $row['task_month_day'] : '-';
+			$row['task_week_day']  = $row['task_week_day']  != '-1' ? $row['task_week_day']  : '-';
+			
+			if ( time() > $row['task_next_run'] )
+			{
+				$image = 'task_run_now.gif';
+			}
+			else
+			{
+				$image= 'task_run.gif';
+			}
+			
+			$class = "";
+			$title = "";
+			$next_run = gmdate( 'jS F Y - h:i A', $row['task_next_run'] );
+			
+			if ( $row['task_enabled'] != 1 )
+			{
+				$class = " style='color:gray'";
+				$title = " (Disabled)";
+				$next_run = "<span style='color:gray'><s>$next_run</s></span>";
+			}
+			
+			if ( $row['task_safemode'] and ! IN_DEV )
+			{
+				$deletebutton = '--';
+				$editbutton   = '--';
+			}
+			else
+			{
+				$deletebutton = "<input type='button' class='realdarkbutton' value='Delete' onclick='checkdelete(\"act=task&code=delete&id={$row['task_id']}\")' />";
+				$editbutton   = $ibforums->adskin->js_make_button( 'Edit'   , $ibforums->base_url.'&act=task&code=edit&id='.$row['task_id'], 'realbutton' );
+			}
+																   
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+																	<tr>
+																	 <td width='99%'>
+																	  <strong{$class}>{$row['task_title']}{$title}</strong><div style='color:gray'><em>{$row['task_description']}</em></div>
+																	  <div align='center' style='position:absolute;width:auto;display:none;text-align:center;background:#EEE;border:2px outset #555;padding:4px' id='pop{$row['task_id']}'>
+																	    curl -s -o /dev/null {$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?act=task&amp;ck={$row['task_cronkey']}
+																	  </div>
+																	 </td>
+																	 <td width='1%' nowrap='nowrap'>
+																	   <a href='#' onclick=\"toggleview('pop{$row['task_id']}')\" title='Show CURL to use in a cron'><img src='{$ibforums->skin_url}/task_cron.gif' border='0' alt='Cron' /></a>
+																	   <a href='{$ibforums->base_url}&act=task&code=run&id={$row['task_id']}' title='Run task now (id: {$row['task_id']})'><img src='{$ibforums->skin_url}/$image'  border='0' alt='Run' /></a>
+																	 </td>
+																	</tr>
+																	</table>",
+																   "<center>". $next_run ."</center>",
+																   "<center>".$row['task_minute']   ."</center>",
+																   "<center>".$row['task_hour']     ."</center>",
+																   "<center>".$row['task_month_day']."</center>",
+																   "<center>".$row['task_week_day'] ."</center>",
+																   "<center>{$editbutton} {$deletebutton}</center>"
+														 )      );
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Add a new task");
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$std->offset_set = 0;
+		
+		$ibforums->html .= "<div align='center'><em>All times GMT. GMT time now is: ".gmdate( 'jS F Y - h:i A' )."</em></div>";
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_templates.php b/upload/sources/admin/ad_templates.php
new file mode 100644
index 00000000..6d08ad09
--- /dev/null
+++ b/upload/sources/admin/ad_templates.php
@@ -0,0 +1,1377 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Skin -> Templates functions
+|   > Module written by Matt Mecham
+|   > Date started: 15th April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+
+class ad_templates
+{
+	var $base_url;
+	var $template = "";
+	var $functions = "";
+	
+	function auto_run()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+		// Get the libraries
+		//-----------------------------------------
+		
+		require_once( KERNEL_PATH.'class_template.php' );
+		
+		$this->template = new class_template();
+		
+		$this->template->root_path = ROOT_PATH;
+		
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/admin_template_functions.php' );
+		
+		$this->functions = new admin_template_functions();
+		
+		//-----------------------------------------
+		
+		$this->unaltered    = "<img src='{$ibforums->skin_url}/skin_item_unaltered.gif' border='0' alt='-' title='Unaltered from parent skin set' />&nbsp;";
+		$this->altered      = "<img src='{$ibforums->skin_url}/skin_item_altered.gif' border='0' alt='+' title='Altered from parent skin set' />&nbsp;";
+		$this->inherited    = "<img src='{$ibforums->skin_url}/skin_item_inherited.gif' border='0' alt='|' title='Inherited from parent skin set' />&nbsp;";
+		
+		//-----------------------------------------
+		
+		switch($ibforums->input['code'])
+		{
+			case 'find_pop':
+				$this->find_popular();
+				break;
+				
+			case 'edit':
+				$this->show_cats();
+				break;
+				
+			case 'doedit':
+				$this->do_edit();
+				break;
+				
+			case 'remove_bit':
+				$this->revert_bit();
+				break;
+				
+			case 'edit_bit':
+				$this->edit_bit();
+				break;
+				
+			case 'floateditor':
+				$this->functions->build_editor_area_floated();
+				break;
+				
+			case 'addbit':
+				$this->add_bit();
+				break;
+				
+			case 'doadd':
+				$this->do_add_bit();
+				break;
+				
+			default:
+				print "No action"; exit();
+				break;
+		}
+		
+	}
+	
+	
+	//-----------------------------------------
+	// Show template groups/categories
+	//-----------------------------------------
+	
+	function show_cats()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		$groups     = array();
+		$group_bits = array();
+		
+		//-----------------------------------------
+		// Get skin set
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_skin_set_id=".$ibforums->input['id'] ) );
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing template set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// Parent?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['p'] )
+		{
+			if ( $this_set['set_skin_set_parent'] )
+			{
+				$ibforums->input['p'] = $this_set['set_skin_set_parent'];
+			}
+		}
+		
+		if ( $ibforums->input['p'] > 0 )
+		{
+			$in = ','.$ibforums->input['p'];
+		}
+		
+		//-----------------------------------------
+		// Get $skin_names stuff
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/skin_info.php' );
+		
+		$ibforums->admin->page_detail = "Please choose which section you wish to edit below.$author $url";
+		$ibforums->admin->page_title  = "Edit Template sets";
+		
+		//-----------------------------------------
+		// Get the groups...
+		//-----------------------------------------
+		
+		$group_titles = $ibforums->cache_func->_get_templates($ibforums->input['id'], $ibforums->input['p'], 'groups');
+		
+		foreach( $group_titles as $title => $g )
+		{
+			//-----------------------------------------
+			// Fix up names
+			//-----------------------------------------
+			
+			$g['easy_name'] = "<b>".$g['group_name']."</b>";
+			$g['easy_desc'] = "";
+			
+			//-----------------------------------------
+			// If available, change group name to easy name
+			//-----------------------------------------
+			
+			if ( isset($skin_names[ $g['group_name'] ]) )
+			{
+				$g['easy_name'] = "<b>".$skin_names[ $g['group_name'] ][0]."</b>";
+				$g['easy_desc'] = str_replace( '"', '&quot;', $skin_names[ $g['group_name'] ][1] );
+			}
+			else
+			{
+				$g['easy_name'] = "<b>".$g['group_name']."</b> (Non-Default Group)";
+				$g['easy_desc'] = "<br>This group is not part of the standard Invision Power Board installation and no description is available";
+			}
+			
+			if ( $skin_names[ $g['group_name'] ][2] )
+			{
+				$g['easy_preview'] = "<a title='New window: Show relevant IPB page' href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?{$skin_names[ $g['group_name'] ][2]}' target='_blank'><img src='{$ibforums->skin_url}/te_previewon.gif' alt='Preview' border='0' /></a>";
+			}
+			else
+			{
+				$g['easy_preview'] = "<img src='{$ibforums->skin_url}/te_previewoff.gif' alt='No preview available' border='0' title='No preview available' />";
+			}
+			
+			$groups[] = $g;
+			
+		}
+		
+		//-----------------------------------------
+		// Sort by easy_name
+		//-----------------------------------------
+			
+		usort($groups, array( 'ad_templates', 'perly_alpha_sort' ) );
+		
+		//-----------------------------------------
+		// Get prefs cookie
+		//-----------------------------------------
+		
+		If ( $default = $std->my_getcookie('skineditoboxprefs') )
+		{
+			list( $default_x, $float ) = explode( ",", $default );
+			$float     = intval($float);
+			$default_x = intval($default_x) ? intval($default_x) : 150;
+		}
+		else
+		{
+			$default_x = 150;
+			$float     = 0;
+		}
+		
+		if ( $float )
+		{
+			$css_width = 'width:450px;position:absolute';
+		}
+		else
+		{
+			$css_width = '';
+		}
+		
+		$ibforums->html .= "<script language='javascript'>
+							function pop_win(theUrl)
+							{
+							   window.open('{$ibforums->adskin->base_url}&'+theUrl,'Preview','width=400,height=450,resizable=yes,scrollbars=yes');
+							}
+							
+							var toggleon  = 0;
+							var start_y   = $default_x;
+							var current_y = $default_x;
+							var boxpopped = 0;
+							var boxfloat  = $float;
+							
+							function toggleselectall()
+							{
+								if ( toggleon )
+								{
+									toggleon = 0;
+									dotoggleselectall(0);
+								}
+								else
+								{
+									toggleon = 1;
+									dotoggleselectall(1);
+								}
+							}
+							
+							function box_make_smaller()
+							{
+								divid = my_getbyid( 'popboxinner' );
+								
+								if ( current_y <= 100 )
+								{
+									return;
+								}
+								else
+								{
+									current_y -= 50;
+									divid.style.height = current_y;
+								}
+								
+								my_setcookie( 'skineditoboxprefs', current_y+','+boxfloat, 1 );
+							}
+							
+							
+							function box_make_larger()
+							{
+								divid = my_getbyid( 'popboxinner' );
+								
+								if ( current_y >= 1000 )
+								{
+									return;
+								}
+								else
+								{
+									current_y += 50;
+									divid.style.height = current_y;
+								}
+								
+								my_setcookie( 'skineditoboxprefs', current_y+','+boxfloat, 1 );
+							}
+							
+							function box_no_scroll()
+							{
+								divid = my_getbyid( 'popboxinner' );
+								
+								if ( ! boxpopped )
+								{
+									divid.style.height = '';
+									divid.style.overflow = '';
+									boxpopped = 1;
+								}
+								else
+								{
+									divid.style.height   =  current_y;
+									divid.style.overflow =  'auto';
+									boxpopped = 0;
+								}
+							}
+							
+							function box_float()
+							{
+								divid = my_getbyid( 'popbox' );
+								
+								if ( ! boxfloat )
+								{
+									divid.style.width    = '450px';
+									divid.style.position = 'absolute';
+									boxfloat = 1;
+								}
+								else
+								{
+									divid.style.width    =  '';
+									divid.style.position =  '';
+									boxfloat = 0;
+								}
+								
+								my_setcookie( 'skineditoboxprefs', current_y+','+boxfloat, 1 );
+							}
+							
+							function dotoggleselectall(selectall)
+							{	
+								var fmobj = document.mutliact;
+								for (var i=0;i<fmobj.elements.length;i++)
+								{
+									var e = fmobj.elements[i];
+									
+									if (e.type=='checkbox')
+									{
+										if ( selectall ) {
+										   e.checked = true;
+										} else {
+										   e.checked = false;
+										}
+									}
+								}
+							}
+							</script>";
+						 
+		$qc = $ibforums->adskin->form_dropdown( 'entry', array(
+													0 => array( 'boardheader', 'Edit Board Header'             ),
+													1 => array( 'catforum'   , 'Edit Category & Forum Table'   ),
+													2 => array( 'topiclist'  , 'Edit Topic List Entry & Table' ),
+													3 => array( 'postlist'   , 'Edit Post View & Table'        ),
+								  )			     );
+												  
+		$ibforums->html .= "
+							<div class='tableborder'>
+							<div class='maintitle'>
+							<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+							<tr>
+							<td align='left' width='100%'>
+							 <form action='{$ibforums->adskin->base_url}&act=skintools&code=simplesearch&set_skin_set_id={$ibforums->input['id']}&searchall=1' method='post'>
+							 <input type='text' size='20' class='realwhitebutton' name='searchkeywords' value='Search templates...' onfocus='this.value=\"\"' />&nbsp;<input type='submit' class='realbutton' value='Go' />
+							 </form>
+							</td>
+							<td align='right' nowrap='nowrap' style='padding-right:2px'>
+							 <form action='{$ibforums->adskin->base_url}&act=templ&code=find_pop&id={$ibforums->input['id']}' method='post'>
+							 {$qc}&nbsp;<input type='submit' class='realbutton' value='Go' />
+							 </form>
+							</td>
+							</tr>
+							</table>
+							</div></div>
+						   ";
+			
+		$ibforums->html .= "<div class='tableborder'>\n<div class='tablepad'>\n";
+		
+		//-----------------------------------------
+		// Loop and print
+		//-----------------------------------------
+		
+		foreach( $groups as $group )
+		{
+			$eid    = $group['suid'];
+			$exp_content = "";
+			
+			//-----------------------------------------
+			// Is this section expanded?
+			//-----------------------------------------
+			
+			if ($ibforums->input['expand'] == $group['group_name'])
+			{
+				//-----------------------------------------
+				// Get master template names..
+				//-----------------------------------------
+				
+				$ibforums->html .= $ibforums->adskin->js_checkdelete();
+				
+				$master_names = array();
+				
+				$DB->simple_construct( array( 'select' => 'func_name', 'from' => 'skin_templates', 'where' => "group_name='{$group['group_name']}' AND set_id=1" ) );
+				$DB->simple_exec();
+				
+				while ( $m = $DB->fetch_row() )
+				{
+					$master_names[ $m['func_name'] ] = $m['func_name'];
+				}
+				
+				$group_bits = $ibforums->cache_func->_get_templates($ibforums->input['id'], $ibforums->input['p'], 'groups', $ibforums->input['expand']);
+				
+				$add_button = $ibforums->adskin->js_make_button( 'Add Template Bit', "{$ibforums->adskin->base_url}&act=templ&code=addbit&id={$ibforums->input['id']}&p={$ibforums->input['p']}&expand={$group['group_name']}", "realbutton", "Add template bit" );
+				
+				$exp_content = "<a name='{$group['group_name']}'></a>
+								<div style='padding:4px;border-bottom:1px solid #999;background:#EEE'>
+								<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+								<tr>
+								 <td align='center' width='1%'><img src='{$ibforums->skin_url}/folder_with_page.gif' alt='Template Group' style='vertical-align:middle' /></td>
+								 <td align='left' width='60%'>
+								  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style='font-size:11px' href='{$ibforums->adskin->base_url}&act=templ&code=edit&id={$ibforums->input['id']}&p={$ibforums->input['p']}&expand={$group['group_name']}'  onclick=\"toggleview('popbox'); return false;\">{$group['easy_name']}</a>
+								  </td>
+								 <td align='right' width='40%'>{$group['easy_preview']}</td>
+								</tr>
+								</table>
+								</div>
+								 <div style='margin-left:25px;background:#EEE;border:1px solid #555;{$css_width}' id='popbox'>
+								    <div style='background-color:#CCC' class='skineditortopstrip'>
+								     <div style='float:right'>
+								     <a href='#' onclick=\"box_make_smaller(); return false;\" title='Smaller'><img src='{$ibforums->adskin->img_url}/skineditor_smaller.gif' border='0' alt='Make box smaller' /></a>
+								     <a href='#' onclick=\"box_no_scroll(); return false;\" title='Enlarge/Reduce'><img src='{$ibforums->adskin->img_url}/skineditor_enlarge.gif' border='0' alt='Reset' /></a>
+								     <a href='#' onclick=\"box_make_larger(); return false;\" title='Larger'><img src='{$ibforums->adskin->img_url}/skineditor_bigger.gif' border='0' alt='Make box bigger' /></a>
+								     </div>
+								     <div>
+								      <a href='#' onclick=\"togglediv('popbox'); return false;\" title='Close Window'><img src='{$ibforums->adskin->img_url}/skineditor_close.gif' border='0' alt='Close' /></a>&nbsp;
+								      <a href='#' onclick=\"toggleselectall(); return false;\" title='Check/Uncheck all'><img src='{$ibforums->adskin->img_url}/skineditor_tick.gif' border='0' alt='Check/Uncheck all' /></a>
+								      <a href='#' onclick=\"box_float(); return false;\" title='Float'><img src='{$ibforums->adskin->img_url}/skineditor_float.gif' border='0' alt='Float' /></a>
+								      &nbsp;<b>{$group['easy_name']}</b>
+								     </div>
+								    </div>
+									<div style='height:{$default_x}px;overflow:auto' id='popboxinner'>
+									  <form name='mutliact' action='{$ibforums->adskin->base_url}&act=templ&code=edit_bit&expand={$group['group_name']}&id={$ibforums->input['id']}&p={$ibforums->input['p']}' method='post'>
+									  <table cellspacing='0' width='100%' cellpadding='2'>
+									  <!--CONTENT-->
+									  </table>
+									</div>
+									<div style='background:#CCC'>
+									  <div align='left' style='padding:5px;margin-left:25px'>
+									  <div style='float:right'>$add_button</div>
+									  <div><input type='submit' class='realbutton' value='Edit Selected' /></div>
+									</div>
+								  </div>
+								  </form>
+								  </div>
+								";
+				$temp = "";
+				$sec_arry = array();
+				
+				//-----------------------------------------
+				// Stuff array to sort on name
+				//-----------------------------------------
+				
+				foreach( $group_bits as $eye => $i )
+				{
+					$sec_arry[ $i['suid'] ] = $i;
+					$sec_arry[ $i['suid'] ]['easy_name'] = $i['func_name'];
+					
+					//-----------------------------------------
+					// If easy name is available, use it
+					//-----------------------------------------
+					
+					if ($bit_names[ $group['group_name'] ][ $i['func_name'] ] != "")
+					{
+						//$sec_arry[ $i['suid'] ]['easy_name'] = $bit_names[ $group['group_name'] ][ $i['func_name'] ];
+					}
+					
+				}
+				
+				//-----------------------------------------
+				// Sort by easy_name
+				//-----------------------------------------
+				
+				usort($sec_arry, array( 'ad_templates', 'perly_alpha_sort' ) );
+				
+				//-----------------------------------------
+				// Loop and print main display
+				//-----------------------------------------
+				
+				foreach( $sec_arry as $id => $sec )
+				{
+					$sec['easy_name'] = preg_replace( "/^(\d+)\:\s+?/", "", $sec['easy_name'] );
+					
+					$custom_bit    = "";
+					
+					//-----------------------------------------
+					// Altered?
+					//-----------------------------------------
+					
+					if ( $sec['set_id'] == $ibforums->input['id'] )
+					{
+						$altered_image = $this->altered;
+						$css_info      = '#FCE8E8';  
+					}
+					else if ( $sec['set_id'] == 1 )
+					{
+						$altered_image = $this->unaltered;
+						$css_info      = '#EEE';
+					}
+					else
+					{
+						$altered_image = $this->inherited;
+						$css_info      = '#FFF2D3';
+					}
+					
+					$remove_button = "<img src='{$ibforums->skin_url}/blank.gif' alt='' border='0' width='44' height='16' />&nbsp;";
+					
+					if ( $sec['set_id'] == $ibforums->input['id'] )
+					{
+						if ( $master_names[ $sec['func_name'] ] )
+						{
+							$remove_button = "<a title='Revert Customization' href=\"javascript:checkdelete('act=templ&code=remove_bit&suid={$sec['suid']}&id={$ibforums->input['id']}&p={$ibforums->input['p']}&expand={$group['group_name']}')\"><img src='{$ibforums->skin_url}/te_revert.gif' alt='X' border='0' /></a>&nbsp;";
+						}
+						else
+						{
+							$css_info      = '#FFDCD8';
+							$custom_bit    = ' (custom bit)';
+							$remove_button = "<a title='Remove Custom Bit' href=\"javascript:checkdelete('act=templ&code=remove_bit&suid={$sec['suid']}&id={$ibforums->input['id']}&p={$ibforums->input['p']}&expand={$group['group_name']}')\"><img src='{$ibforums->skin_url}/te_remove.gif' alt='X' border='0' /></a>&nbsp;";
+						}
+					}
+					
+					$temp .= "
+								<tr>
+								 <td width='2%' style='background-color:$css_info' align='center'><img src='{$ibforums->skin_url}/file.gif' title='Template Set:{$sec['set_id']}' alt='Template' style='vertical-align:middle' /></td>
+								 <td width='88%' style='background-color:$css_info'><input type='checkbox' style='background-color:$css_info' name='cb_{$sec['suid']}' value='1' />&nbsp;{$altered_image}<a href='{$ibforums->adskin->base_url}&act=templ&code=edit_bit&suid={$sec['suid']}&p={$ibforums->input['p']}&id={$ibforums->input['id']}&expand={$group['group_name']}&type=single' title='template bit name: {$sec['func_name']}'>{$sec['easy_name']}</a>{$custom_bit}</td>
+								 <td width='10%' style='background-color:$css_info' align='right' nowrap='nowrap'>
+								   $remove_button
+								   <a style='text-decoration:none' title='Preview template bit as text' href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=text\")'><img src='{$ibforums->skin_url}/te_text.gif' border='0' alt='Text Preview'></a>
+								   <a style='text-decoration:none' title='Preview template bit as HTML' href='javascript:pop_win(\"act=rtempl&code=preview&suid={$sec['suid']}&type=css\")'><img src='{$ibforums->skin_url}/te_html.gif' border='0' alt='HTML Preview'>&nbsp;</a>
+								 </td>
+								</tr>
+							";
+				}
+			
+				
+				$ibforums->html .= str_replace( "<!--CONTENT-->", $temp, $exp_content );
+			}
+			else
+			{
+				$altered      = sprintf( '%02d', intval($ibforums->cache_func->template_count[$ibforums->input['id']][ $group['group_name'] ]['count']) );
+				$original     = sprintf( '%02d', intval($ibforums->cache_func->template_count[1][ $group['group_name'] ]['count']) );
+				$inherited    = sprintf( '%02d', intval($ibforums->cache_func->template_count[$ibforums->input['p']][ $group['group_name'] ]['count']) );
+				$count_string = "";
+				
+				if ( $ibforums->input['p'] > 0 )
+				{
+					$count_string = "$original {$this->unaltered} $inherited {$this->inherited} $altered {$this->altered}";
+				}
+				else
+				{
+					$count_string = "$original {$this->unaltered} $altered {$this->altered}";
+				}
+				
+				//-----------------------------------------
+				// Folder blob
+				//-----------------------------------------
+				
+				if ( $altered > 0 )
+				{
+					$folder_blob = $this->altered;
+				}
+				else if ( $ibforums->input['p'] > 0 and $inherited > 0 )
+				{
+					$folder_blob = $this->inherited;
+				}
+				else
+				{
+					$folder_blob = $this->unaltered;
+				}
+				
+				//-----------------------------------------
+				// Print normal rows
+				//-----------------------------------------
+				
+				$ibforums->html .= "<div style='padding:4px;border-bottom:1px solid #DDD;'>
+									<table width='100%' cellspacing='0' cellpadding='0' border='0'>
+									<tr>
+									 <td align='center' width='1%'><img src='{$ibforums->skin_url}/folder.gif' alt='Template Group' style='vertical-align:middle' /></td>
+									 <td align='left' width='60%'>&nbsp;{$folder_blob}&nbsp;<a style='font-size:11px' title='{$group['easy_desc']}' href='{$ibforums->adskin->base_url}&act=templ&code=edit&id={$ibforums->input['id']}&p={$ibforums->input['p']}&expand={$group['group_name']}#{$group['group_name']}'>{$group['easy_name']}</a></td>
+									 <td align='right' width='40%'>($count_string)&nbsp;{$group['easy_preview']}</td>
+									</tr>
+									</table>
+									</div>
+									";
+			}
+		}
+		
+		$ibforums->html .= "</div></div>";
+		
+		$ibforums->html .= "<br />
+							<div><strong>Template HTML Bits:</strong><br />
+							{$this->altered} This item has been customized for this skin set.
+							<br />{$this->unaltered} This item has not been customized from the master skin set.
+							<br />{$this->inherited} This item has inherited customizations from the parent skin set.
+							</div>
+							<br />";
+		
+		$ibforums->html .= $ibforums->adskin->skin_jump_menu_wrap();
+									     
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( '' ,'Managing Template Set "'.$this_set['set_name'].'"' );
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// Sneaky sorting.
+	// We use the format "1: name". without this hack
+	// 1: name, 2: other name, 11: other name
+	// will sort as 1: name, 11: other name, 2: other name
+	// There is natsort and such in PHP, but it causes some
+	// problems on older PHP installs, this is hackish but works
+	// by simply adding '0' to a number less than 2 characters long.
+	// of course, this won't work with three numerics in the hundreds
+	// but we don't have to worry about more that 99 bits in a template
+	// at this stage.
+	//-----------------------------------------
+	
+	function perly_word_sort($a, $b)
+	{
+		$nat_a = intval( $a['easy_name'] );
+		$nat_b = intval( $b['easy_name'] );
+		
+		if (strlen($nat_a) < 2)
+		{
+			$nat_a = '0'.$nat_a;
+		}
+		if (strlen($nat_b) < 2)
+		{
+			$nat_b = '0'.$nat_b;
+		}
+		
+		return strcmp($nat_a, $nat_b);
+	}
+	
+	//-----------------------------------------
+	// Sort by group name
+	//-----------------------------------------
+	
+	function perly_alpha_sort($a, $b)
+	{
+		return strcmp( strtolower($a['easy_name']), strtolower($b['easy_name']) );
+	}
+
+	//-----------------------------------------
+	// Find popular bits :D
+	//-----------------------------------------
+	
+	function find_popular()
+	{
+		global $ibforums, $DB,  $std, $HTTP_COOKIE_VARS;
+		
+		//-----------------------------------------
+		// Get skin set
+		//-----------------------------------------
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_skin_set_id=".$ibforums->input['id'] ) );
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing template set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// Parent?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['p'] )
+		{
+			if ( $this_set['set_skin_set_parent'] )
+			{
+				$ibforums->input['p'] = $this_set['set_skin_set_parent'];
+			}
+		}
+		
+		switch ( $ibforums->input['entry'] )
+		{
+			case 'boardheader':
+				$group_titles = $ibforums->cache_func->_get_templates($ibforums->input['id'], $ibforums->input['p'], 'groups', 'skin_global');
+				
+				foreach( $group_titles as $func_name => $r )
+				{
+					if ( in_array( $func_name, array( 'member_bar', 'global_board_header' ) ) )
+					{
+						$ibforums->input['cb_'.$r['suid']] = 1;
+					}
+				}
+				break;
+			case 'catforum':
+				$group_titles = $ibforums->cache_func->_get_templates($ibforums->input['id'], $ibforums->input['p'], 'groups', 'skin_boards');
+				
+				foreach( $group_titles as $func_name => $r )
+				{
+					if ( in_array( $func_name, array( "catheader_expanded", "pagetop",  "end_this_cat", "end_all_cats", "forumrow" ) ) )
+					{
+						$ibforums->input['cb_'.$r['suid']] = 1;
+					}
+				}
+				break;
+			case 'topiclist':
+				$group_titles = $ibforums->cache_func->_get_templates($ibforums->input['id'], $ibforums->input['p'], 'groups', 'skin_forum');
+				
+				foreach( $group_titles as $func_name => $r )
+				{
+					if ( in_array( $func_name, array( "pagetop", "tableend", "render_forum_row", "render_pinned_start", "render_pinned_end", "render_pinned_row" ) ) )
+					{
+						$ibforums->input['cb_'.$r['suid']] = 1;
+					}
+				}
+				break;
+			default:
+				$group_titles = $ibforums->cache_func->_get_templates($ibforums->input['id'], $ibforums->input['p'], 'groups', 'skin_topic');
+				
+				foreach( $group_titles as $func_name => $r )
+				{
+					if ( in_array( $func_name, array( "topic_page_top_new_mode","topic_page_top_classic", "tablefooter", "renderrow" ) ) )
+					{
+						$ibforums->input['cb_'.$r['suid']] = 1;
+					}
+				}
+				break;
+		}
+		
+		$this->edit_bit();
+	}
+	
+	//-----------------------------------------
+	// ADD TEMPLATE BIT
+	//-----------------------------------------
+	
+	function add_bit()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$ibforums->admin->page_detail = "You may add a template bit using this section.";
+		$ibforums->admin->page_title  = "Template Editing";
+		
+		$groupname = $ibforums->input['expand'];
+		
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_skin_set_id=".$ibforums->input['id'] ) );
+		
+		//-----------------------------------------
+		// Sort out group titles
+		//-----------------------------------------
+		
+		$group_titles = $ibforums->cache_func->_get_templates( $ibforums->input['id'], $ibforums->input['p'], 'groups' );
+		
+		$formatted_groups = array();
+		
+		foreach ( $group_titles as $name => $d )
+		{
+			$formatted_groups[] = array( $d['group_name'], $d['group_name'] );
+		}
+		
+		//-----------------------------------------
+		// Good form old nboy
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->js_template_tools();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doadd'    ),
+															   2 => array( 'act'   , 'templ'     ),
+															   3 => array( 'id'    , $ibforums->input['id']   ),
+															   4 => array( 'p'     , $ibforums->input['p']    ),
+															   5 => array( 'expand', $ibforums->input['expand'] ),
+													  )  , "theform"    );
+									     
+		//-----------------------------------------
+		// Editor prefs strip
+		//-----------------------------------------
+		
+		
+		
+		$options .= "<fieldset class='tdfset'>
+					 <legend><strong>New Template Bit Specifics</strong></legend>
+					 <table width='100%' cellpadding='5' cellspacing='0' border='0'>
+					 <tr>
+					   <td width='40%' class='tdrow1'>New Template Bit Name<br /><span style='color:gray'>Alphanumerics and underscores only, no spaces.</span></td>
+					   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_input('func_name', $std->txt_stripslashes($_POST['func_name']))."</td>
+					 </tr>
+					 <tr>
+					   <td width='40%' class='tdrow1'>New Template Bit Incoming Data Variables<br /><span style='color:gray'>Define the variables passed to this template bit.</span></td>
+					   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_input('func_data', str_replace( "'", '&#039;', $std->txt_stripslashes($_POST['func_data']) ) )."</td>
+					 </tr>
+					  <tr>
+					   <td width='40%' class='tdrow1'>New Template Bit Group...</td>
+					   <td width='60%' class='tdrow1'>".$ibforums->adskin->form_dropdown('group_name', $formatted_groups, $ibforums->input['group_name'] ? $ibforums->input['group_name'] : $ibforums->input['expand'] )."</td>
+					 </tr>
+					 <tr>
+					   <td width='40%' class='tdrow1'>Or Create New Group...<br /><span style='color:gray'>Leave empty to use above group. Alphanumerics and underscores only, no spaces</span></td>
+					   <td width='60%' class='tdrow1'>skin_".$ibforums->adskin->form_input('new_group_name', $std->txt_stripslashes($_POST['new_group_name']))."</td>
+					 </tr>
+					 </table>
+					</fieldset>
+					<br />";
+		
+		$ibforums->html .= $this->functions->build_generic_editor_area( array( 'act' => 'templ', 'title' => 'Add New Template Bit', 'textareaname' => 'newbit', 'textareainput' => $std->txt_stripslashes($_POST['txtnewbit']) ) );
+		
+		$ibforums->html = str_replace( '<!--BEFORETEXTAREA-->', $options, $ibforums->html );
+		
+		$formbuttons = "<div align='center' class='pformstrip'>
+						<input type='submit' name='submit' value='Save Template Bit' class='realdarkbutton'>
+						<input type='submit' name='savereload' value='Save and Reload Template Bit' class='realdarkbutton'>
+						</div>\n";
+		
+		$ibforums->html = str_replace( '<!--IPB.EDITORBOTTOM-->', $formbuttons, $ibforums->html );
+		
+		$ibforums->html .= "<div class='tableborder'><div class='catrow2' align='center' style='padding:4px;'><b>Show me the HTML code for:&nbsp;".
+							"<select name='htmlcode' onChange=\"document.theform.res.value='&'+document.theform.htmlcode.options[document.theform.htmlcode.selectedIndex].value+';'\" id='multitext'><option value='copy'>&copy;</option>
+							<option value='raquo'>&raquo;</option>
+							<option value='laquo'>&laquo;</option>
+							<option value='#149'>&#149;</option>
+							<option value='reg'>&reg;</option>
+							</select>&nbsp;&nbsp;<input type='text' name='res' size=20 id='multitext'>
+							&nbsp;&nbsp;<input type='button' value='select' id='editbutton' onClick='document.theform.res.focus();document.theform.res.select();'>
+							<input type='button' value='Search in Templates'  class='realbutton' title='Search the templates for a string' onClick='pop_win(\"act=rtempl&code=search&suid={$template['suid']}&type=html\", \"Search\", 500,400)'>
+							</div></div></form><br />";
+							 
+		$ibforums->html .= $ibforums->adskin->skin_jump_menu_wrap();
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( "act=templ&code=edit&id={$ibforums->input['id']}&expand={$groupname}&#{$groupname}", $this_set['set_name'] );
+		$ibforums->admin->nav[] = array( '', 'Adding new template bit for set '.$this_set['set_name'] );
+		
+		$ibforums->admin->output();
+	}
+	
+	//-----------------------------------------
+	// DO ADD NEW BIT
+	//-----------------------------------------
+	
+	function do_add_bit()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Check incoming
+		//-----------------------------------------
+		  
+		$this_set = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => "set_skin_set_id=".$ibforums->input['id'] ) );
+		
+		if ( $_POST['new_group_name'] )
+		{
+			if ( preg_match( "#[^\w_]#s", $_POST['new_group_name'] ) )
+			{
+				$ibforums->main_msg = 'The new template bit group name must only contain alphanumerics and underscores.';
+				$this->add_bit();
+			}
+		}
+		
+		if ( ! $_POST['func_name'] )
+		{
+			$ibforums->main_msg = 'The new template bit name cannot be empty.';
+			$this->add_bit();
+		}
+		else
+		{
+			if ( preg_match( "#[^\w_]#s", $_POST['func_name'] ) )
+			{
+				$ibforums->main_msg = 'The new template bit name must only contain alphanumerics and underscores.';
+				$this->add_bit();
+			}
+		}
+		
+		if ( ! trim($_POST['txtnewbit']) )
+		{
+			$ibforums->main_msg = 'The new template bit HTML cannot be empty.';
+			$this->add_bit();
+		}
+		
+		$new_group_name = strtolower(str_replace( 'skin_', '', trim($ibforums->input['new_group_name']) ));
+		$func_name      = strtolower(trim($ibforums->input['func_name']));
+		$group_name     = $new_group_name ? 'skin_'.$new_group_name : $ibforums->input['group_name'];
+		$func_data      = preg_replace( "#,$#", "", str_replace( '&#039', "'", trim($std->txt_stripslashes($_POST['func_data'])) ) );
+		$text           = $std->txt_stripslashes($_POST['txtnewbit']);
+		
+		//-----------------------------------------
+		// Make sure bit doesn't exist
+		//-----------------------------------------
+		
+		if ( $row = $DB->simple_exec_query( array( 'select' => 'suid', 'from' => 'skin_templates', 'where' => "set_id={$ibforums->input['id']} AND group_name='$group_name' AND func_name='$func_name'" ) ) )
+		{
+			$ibforums->main_msg = "The new template bit '$func_name' already exists in group '$group_name'.";
+			$this->add_bit();
+		}
+		
+		//-----------------------------------------
+		// INSERT NEW BIT
+		//-----------------------------------------
+		
+		$DB->do_insert( 'skin_templates', array (
+												  'set_id'		    => $ibforums->input['id'],
+												  'group_name'      => $group_name,
+												  'section_content' => $text,
+												  'func_name' 		=> $func_name,
+												  'func_data'		=> $func_data,
+												  'updated'         => time(),
+										)      );
+										
+		$new_id = $DB->get_insert_id();
+		
+		//-----------------------------------------
+		// Rebuild the PHP file
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_recache_templates( $ibforums->input['id'], $ibforums->input['p'], $real_name );
+		
+		//-----------------------------------------
+		// Back we go...
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['savereload'] )
+		{
+			$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+			$ibforums->admin->redirect( "act=templ&code=edit&id={$ibforums->input['id']}&expand={$group_name}&#{$group_name}", "Template bit(s) updated, returning to template selection screen" );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Reload edit window
+			//-----------------------------------------
+			
+			$ibforums->main_msg = "Template bit(s) updated";
+			
+			$ibforums->input[ 'cb_'.$new_id ] = 1;
+			
+			$this->edit_bit();
+		}
+	}
+	
+	
+	
+	
+	//-----------------------------------------
+	// EDIT TEMPLATES, STEP TWO
+	//-----------------------------------------
+	
+	function edit_bit()
+	{
+		global $ibforums, $DB,  $std, $HTTP_COOKIE_VARS;
+		
+		$ibforums->admin->page_detail = "You may edit the HTML of this template.";
+		$ibforums->admin->page_title  = "Template Editing";
+		
+		$template_bit_ids = array();
+		
+		//-----------------------------------------
+		// Get $skin_names stuff
+		//-----------------------------------------
+		
+		require './sources/admin/skin_info.php';
+		
+		//-----------------------------------------
+		// Check for valid input...
+		//-----------------------------------------
+		
+		$ids = array();
+		
+		if ( $ibforums->input['type'] == 'single' )
+		{
+			if ($ibforums->input['suid'] == "")
+			{
+				$ibforums->admin->error("You must specify an existing template set ID, go back and try again");
+			}
+			$ids[] = $ibforums->input['suid'];
+		}
+		else
+		{
+			foreach ($ibforums->input as $key => $value)
+			{
+				if ( preg_match( "/^cb_(\d+)$/", $key, $match ) )
+				{
+					if ($ibforums->input[$match[0]])
+					{
+						$ids[] = $match[1];
+					}
+				}
+			}
+ 		}
+ 		
+ 		if ( count($ids) < 1 )
+ 		{
+ 			$ibforums->admin->error("No ids selected, please go back and select some before submitting the form");
+ 		}
+		
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->js_template_tools();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'doedit'    ),
+																 2 => array( 'act'   , 'templ'     ),
+																 3 => array( 'suid'  , $ibforums->input['suid'] ),
+																 4 => array( 'type'  , $ibforums->input['type'] ),
+																 5 => array( 'id'    , $ibforums->input['id']   ),
+																 6 => array( 'p'     , $ibforums->input['p']    ),
+														)  , "theform"    );
+									     
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "suid IN (".implode(",",$ids).")" ) );
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$sec_arry[ $i['suid'] ] = $i;
+			$sec_arry[ $i['suid'] ]['easy_name'] = $i['func_name'];
+			
+			//-----------------------------------------
+			// If easy name is available, use it
+			//-----------------------------------------
+			
+			if ($bit_names[ $i['group_name'] ][ $i['func_name'] ] != "")
+			{
+				$sec_arry[ $i['suid'] ]['easy_name'] = $bit_names[ $i['group_name'] ][ $i['func_name'] ];
+			}
+		}
+		
+		//-----------------------------------------
+		// Sort by easy_name
+		//-----------------------------------------
+		
+		usort($sec_arry, array( 'ad_templates', 'perly_word_sort' ) );
+		
+		//-----------------------------------------
+		// Editor prefs strip
+		//-----------------------------------------
+		
+		$ibforums->html .= $this->functions->html_build_editor_top();
+		
+		//-----------------------------------------
+		// Loop and print
+		//-----------------------------------------
+		
+		foreach( $sec_arry as $id => $template )
+		{
+			$template['easy_name'] = preg_replace( "/^(\d+)\:\s+?/", "", $template['easy_name'] );
+
+			//-----------------------------------------
+			// Swop < and > into ascii entities
+			// to prevent textarea breaking html
+			//-----------------------------------------
+			
+			$setid     = $template['set_id'];
+			$groupname = $template['group_name'];
+			
+			if ( ! $ibforums->input['error_raw_'.$template['suid']] )
+			{
+				$templ = $template['section_content'];
+			}
+			else
+			{
+				$templ = $ibforums->input['error_raw_'.$template['suid']];
+			}
+			
+			$templ = preg_replace("/&/", "&#38;", $templ );
+			$templ = preg_replace("/</", "&#60;", $templ );
+			$templ = preg_replace("/>/", "&#62;", $templ );
+			$templ = str_replace( '\n', '&#092;n', $templ );
+			
+			//-----------------------------------------
+			// Altered?
+			//-----------------------------------------
+			
+			if ( $template['set_id'] == $ibforums->input['id'] )
+			{
+				$altered_image = $this->altered;
+			}
+			else if ( $template['set_id'] == 1 )
+			{
+				$altered_image = $this->unaltered;
+			}
+			else
+			{
+				$altered_image = $this->inherited;
+			}
+			
+			$ibforums->html .= $this->functions->build_editor_area($templ, $template, $altered_image);
+			
+			$template_bit_ids[] = "t{$template['suid']}";
+		}
+		
+		$ibforums->html .= $this->functions->html_build_editor_bottom();
+		
+		$formbuttons = "<div align='center' class='pformstrip'>
+						<input type='submit' name='submit' value='Save Template Bit(s)' class='realdarkbutton'>
+						<input type='submit' name='savereload' value='Save and Reload Template Bit(s)' class='realdarkbutton'>
+						</div>\n";
+		
+		$ibforums->html = str_replace( '<!--IPB.EDITORBOTTOM-->', $formbuttons, $ibforums->html );
+		
+		$ibforums->html .= "<div class='tableborder'><div class='catrow2' align='center' style='padding:4px;'><b>Show me the HTML code for:&nbsp;".
+							"<select name='htmlcode' onChange=\"document.theform.res.value='&'+document.theform.htmlcode.options[document.theform.htmlcode.selectedIndex].value+';'\" id='multitext'><option value='copy'>&copy;</option>
+							<option value='raquo'>&raquo;</option>
+							<option value='laquo'>&laquo;</option>
+							<option value='#149'>&#149;</option>
+							<option value='reg'>&reg;</option>
+							</select>&nbsp;&nbsp;<input type='text' name='res' size=20 id='multitext'>
+							&nbsp;&nbsp;<input type='button' value='select' id='editbutton' onClick='document.theform.res.focus();document.theform.res.select();'>
+							<input type='button' value='Search in Templates'  class='realbutton' title='Search the templates for a string' onClick='pop_win(\"act=rtempl&code=search&suid={$template['suid']}&type=html\", \"Search\", 500,400)'>
+							</div></div></form><br />";
+							 
+		//-----------------------------------------
+		// Let the JS know which IDs to
+		// look for (clever, no?)
+		//-----------------------------------------
+		
+		$ibforums->html = str_replace( "<!--IPB.TEMPLATE_BIT_IDS-->", implode(",",$template_bit_ids), $ibforums->html );
+		
+		$ibforums->html .= $ibforums->adskin->skin_jump_menu_wrap();
+		
+		//-----------------------------------------
+		// Find easy name for group
+		//-----------------------------------------
+		
+		$old_groupname = $groupname;
+		
+		if ( $skin_names[ $groupname ][0] != "" )
+		{
+			$groupname = $skin_names[ $groupname ][0];
+		}
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( "act=templ&code=edit&id={$ibforums->input['id']}&expand={$old_groupname}&#{$old_groupname}", $groupname );
+		
+		$ibforums->admin->output();
+		
+		
+	}
+	
+	//-----------------------------------------
+	// COMPLETE EDIT
+	//-----------------------------------------
+	
+	function do_edit()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Check incoming
+		//-----------------------------------------
+		  
+		$ids    = array();
+		$cb_ids = array();
+		
+		foreach ($ibforums->input as $key => $value)
+		{
+			if ( preg_match( "/^txt(\d+)$/", $key, $match ) )
+			{
+				if ($ibforums->input[$match[0]])
+				{
+					$ids[]    = $match[1];
+					$cb_ids[ $match[1] ] = 'cb_'.$match[1];
+				}
+			}
+		}
+ 		
+ 		if ( count($ids) < 1 )
+ 		{
+ 			$ibforums->admin->error("No ids selected, please go back and select some before submitting the form");
+ 		}
+ 		
+ 		//-----------------------------------------
+		// Get the group name, etc
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_templates', 'where' => "suid IN (".implode(",",$ids).")" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$template[ $r['suid'] ] = $r;
+			$real_name = $r['group_name'];
+		}
+		
+		$error_bits = array();
+		
+		//-----------------------------------------
+		// Process my bits :o
+		//-----------------------------------------
+		
+		foreach( $ids as $id )
+		{
+			$text = $std->txt_stripslashes($_POST['txt'.$id]);
+			
+			//-----------------------------------------
+			// Sw(o|a)p back < & >
+			//-----------------------------------------
+			
+			$text = preg_replace("/&#60;/", "<", $text);
+			$text = preg_replace("/&#62;/", ">", $text);
+			$text = preg_replace("/&#38;/", "&", $text);
+			$text = str_replace( '&#092;n', '\n',$text );
+			$text = str_replace( '\\n'    , '\\\\\\n', $text );
+			
+			//-----------------------------------------
+			// Convert \r to nowt
+			//-----------------------------------------
+			
+			$text = preg_replace("/\r/", "", $text);
+			
+			$func = preg_replace( "#,$#", "", str_replace( '&#039;', "'", trim($std->txt_stripslashes($_POST['funcdata_'.$id])) ) );
+			
+			//-----------------------------------------
+			// Test to ensure they are legal
+			// - catch warnings, etc
+			//-----------------------------------------
+			
+			ob_start();
+			eval( $this->template->convert_html_to_php( $template[ $id ]['func_name'], $func, $text ) );
+			$return = ob_get_contents();
+			ob_end_clean();
+			
+			if ( $return )
+			{
+				$error_bits[] = $id;
+				continue;
+			}
+			
+			//-----------------------------------------
+			// Is this in our template id group?
+			//-----------------------------------------
+			
+			if ( $template[ $id ]['set_id'] == $ibforums->input['id'] )
+			{
+				//-----------------------------------------
+				// Okay, update...
+				//-----------------------------------------
+				
+				$DB->do_update( 'skin_templates', array( 'section_content' => $text, 'updated' => time(), 'func_data' => $func ), 'suid='.$id );
+			}
+			else
+			{
+				//-----------------------------------------
+				// No? OK - best add it as a 'new' bit
+				//-----------------------------------------
+				
+				$DB->do_insert( 'skin_templates', array (
+														  'set_id'		    => $ibforums->input['id'],
+														  'group_name'      => $template[ $id ]['group_name'],
+														  'section_content' => $text,
+														  'func_name' 		=> $template[ $id ]['func_name'],
+														  'func_data'		=> $func,
+														  'updated'         => time(),
+										        )      );
+				
+				if ($ibforums->input['type'] == 'single' )
+				{
+					$ibforums->input['suid'] = $DB->get_insert_id();
+				}
+				else
+				{
+					$cb_ids[ $id ] = 'cb_'.$DB->get_insert_id();
+					unset($ibforums->input['cb_'.$id ]);
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Rebuild the PHP file
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_recache_templates( $ibforums->input['id'], $ibforums->input['p'], $real_name );
+		
+		//-----------------------------------------
+		// Back we go...
+		//-----------------------------------------
+		
+		if ( count( $error_bits ) )
+		{
+			foreach( $error_bits as $id )
+			{
+				$ibforums->input['cb_'.$id ] = 1;
+				$ibforums->input['error_raw_'.$id] = $std->txt_stripslashes($_POST['txt'.$id]);
+				$ibforums->main_msg = "These template bits could not be saved because they cause an error when parsed. Please check the data including any HTML logic used and any input data variables.";
+
+				$this->edit_bit();
+			}
+		}
+		else
+		{
+			if ( ! $ibforums->input['savereload'] )
+			{
+				$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+				$ibforums->admin->redirect( "act=templ&code=edit&id={$ibforums->input['id']}&expand={$real_name}&#{$real_name}", "Template bit(s) updated, returning to template selection screen" );
+			}
+			else
+			{
+				//-----------------------------------------
+				// Reload edit window
+				//-----------------------------------------
+				
+				$ibforums->main_msg = "Template bit(s) updated";
+				
+				foreach( $cb_ids as $i => $cb )
+				{
+					$ibforums->input[ $cb ] = 1;
+				}
+				
+				$this->edit_bit();
+			}
+		}
+	}
+	
+	//-----------------------------------------
+	// REMOVE CUSTOMIZATION
+	//-----------------------------------------
+	
+	function revert_bit()
+	{
+		global $ibforums, $DB, $std;
+		
+		$suid = $ibforums->input['suid'];
+		
+		if ( ! $suid )
+		{
+			$ibforums->admin->error("You must enter a corrent template bit ID");
+		}
+		
+		$row = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_templates', 'where' => 'suid='.$suid ) );
+		
+		if ( $row['set_id'] == 1 )
+		{
+			$ibforums->admin->error("You cannot remove a template bit from the master set.");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'skin_templates', 'where' => 'suid='.$suid ) );
+		
+		//-----------------------------------------
+		// Rebuild the PHP file
+		//-----------------------------------------
+		
+		$ibforums->cache_func->_recache_templates( $ibforums->input['id'], $ibforums->input['p'], $row['group_name'] );
+		
+		$ibforums->admin->redirect( "act=templ&code=edit&id={$row['set_id']}&p={$ibforums->input['p']}&expand={$row['group_name']}&#{$row['group_name']}", "Template bit(s) reverted, returning to template selection screen" );
+	}
+	
+	
+	//====================================================================================================================
+	// OLD - DEPRECIATED
+	//====================================================================================================================
+	
+	
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/ad_warn.php b/upload/sources/admin/ad_warn.php
similarity index 72%
rename from upload/sources/Admin/ad_warn.php
rename to upload/sources/admin/ad_warn.php
index a17c44c7..e73134c4 100644
--- a/upload/sources/Admin/ad_warn.php
+++ b/upload/sources/admin/ad_warn.php
@@ -2,7 +2,7 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
+|   Invision Power Board v2.0.0 
 |   ========================================
 |   by Matthew Mecham
 |   (c) 2001,2002 Invision Power Services
@@ -27,21 +27,18 @@ if ( ! defined( 'IN_ACP' ) )
 	exit();
 }
 
-$idx = new ad_warning();
 
-$root_path = "";
-
-class ad_warning {
+class ad_warn {
 
 	var $base_url;
 
-	function ad_warning()
+	function auto_run()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums;
+		global $ibforums, $DB,  $std, $ibforums;
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
 		
@@ -50,44 +47,43 @@ class ad_warning {
 			unset($$k);
 		}
 		
-		$ADMIN->nav[] = array( 'act=warn', 'Warning Set-up' );
+		$ibforums->admin->nav[] = array( 'act=warn', 'Warning Set-up' );
 		
-		$ADMIN->page_detail = "This section will allow you to modify your warning parameters";
-		$ADMIN->page_title  = "Member Warning Set-up";
+		$ibforums->admin->page_detail = "This section will allow you to modify your warning parameters";
+		$ibforums->admin->page_title  = "Member Warning Set-up";
 		
-		//---------------------------------------
+		//-----------------------------------------
 
-		switch($IN['code'])
+		switch($ibforums->input['code'])
 		{
 			
-			//---------------------
+			//-----------------------------------------
 			default:
 				$this->overview();
 				break;
 		}
-		
 	}
 	
 	
-	//---------------------------------------------------------------
+	//-----------------------------------------
 	//
 	// Overview: show um.. overview.
 	//
-	//---------------------------------------------------------------
+	//-----------------------------------------
 	
 	function overview()
 	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $ibforums;
+		global $ibforums, $DB,  $std, $ibforums;
 		
 		$unit_map = array(
 						   'd'  => 'Day(s)' ,
 						   'h'  => 'Hour(s)',
 						 );
 		
-		$SKIN->td_header[] = array( "Warn Level"   , "20%" );
-		$SKIN->td_header[] = array( "Details"      , "80%" );
+		$ibforums->adskin->td_header[] = array( "Warn Level"   , "20%" );
+		$ibforums->adskin->td_header[] = array( "Details"      , "80%" );
 		
-		$ADMIN->html .= $SKIN->start_table( "Currently active Auto tasks" );
+		$ibforums->html .= $ibforums->adskin->start_table( "Currently active Auto tasks" );
 		
 		$warns = array();
 		
@@ -185,20 +181,20 @@ class ad_warning {
 				$html .= "</table>";
 				
 				
-				$ADMIN->html .= $SKIN->add_td_row( array( "<b>{$warns['warn_level']}</b>",
+				$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$warns['warn_level']}</b>",
 														  $html
 										 )      );
 			}
 		}
 		
-		$ADMIN->html .= $SKIN->add_td_basic( 'Add new auto task', 'center', 'pformstrip' );
+		$ibforums->html .= $ibforums->adskin->add_td_basic( 'Add new auto task', 'center', 'pformstrip' );
 										 
-		$ADMIN->html .= $SKIN->end_table();
+		$ibforums->html .= $ibforums->adskin->end_table();
 		
-		//+-------------------------------
-		//+-------------------------------
+		//-----------------------------------------
+		//-------------------------------
 		
-		$ADMIN->output();
+		$ibforums->admin->output();
 	
 
 		
diff --git a/upload/sources/admin/ad_warnlogs.php b/upload/sources/admin/ad_warnlogs.php
new file mode 100644
index 00000000..360b2159
--- /dev/null
+++ b/upload/sources/admin/ad_warnlogs.php
@@ -0,0 +1,527 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Warn Log functions
+|   > Module written by Matt Mecham
+|   > Date started: 4th June 2003
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_warnlogs {
+
+	var $base_url;
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+		
+			case 'view':
+				$this->view();
+				break;
+				
+			case 'viewcontact':
+				$this->view_contact();
+				break;
+				
+			case 'viewnote':
+				$this->view_note();
+				break;
+				
+			case 'remove':
+				$this->remove();
+				break;
+				
+				
+			//-----------------------------------------
+			default:
+				$this->list_current();
+				break;
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// View NOTE in da pop up innit
+	//-----------------------------------------
+	
+	function view_note()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again");
+		}
+		
+		require( ROOT_PATH.'sources/lib/post_parser.php');
+        
+        $this->parser  = new post_parser(1);
+		
+		$id = intval($ibforums->input['id']);
+		
+		$DB->cache_add_query( 'warnlogs_view_note', array( 'id' => $id ) );
+		$DB->cache_exec_query();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again ($id)");
+		}
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
+		
+		$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_notes'], $cont );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Warn Notes" );
+	
+		$row['date']  = $ibforums->admin->get_date( $row['wlog_date'], 'LONG' );
+		
+		$text   = $this->parser->convert( array(
+													'TEXT'    => $cont[1],
+													'SMILIES' => 1,
+													'CODE'    => 1,
+													'HTML'    => 0
+										   )      );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													"<strong>From:</strong> {$row['p_name']}
+													<br /><strong>To:</strong> {$row['a_name']}
+													<br /><strong>Sent:</strong> {$row['date']}
+													<hr>
+													<br />$text
+												    "
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+	
+	
+	}
+	
+	
+	//-----------------------------------------
+	// View contact in da pop up innit
+	//-----------------------------------------
+	
+	function view_contact()
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again");
+		}
+		
+		$id = intval($ibforums->input['id']);
+		
+		$DB->cache_add_query( 'warnlogs_view_note', array( 'id' => $id ) );
+		$DB->cache_exec_query();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			$ibforums->admin->error("Could not resolve the email ID, please try again ($id)");
+		}
+		
+		$type = $row['wlog_contact'] == 'pm' ? "PM" : "EMAIL";
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;" , "100%" );
+		
+		$subject = preg_match( "#<subject>(.+?)</subject>#is", $row['wlog_contact_content'], $subj );
+		$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_contact_content'], $cont );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( $type.": ".$subj[1] );
+	
+		
+		
+		$row['date'] = $ibforums->admin->get_date( $row['wlog_date'], 'LONG' );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array(
+													"<strong>From:</strong> {$row['p_name']}
+													<br /><strong>To:</strong> {$row['a_name']}
+													<br /><strong>Sent:</strong> {$row['date']}
+													<br /><strong>Subject:</strong> $subj[1]
+													<hr>
+													<br />$cont[1]
+												    "
+										 )      );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		$ibforums->admin->print_popup();
+	
+	
+	}
+	
+	
+	
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function view()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$start = $ibforums->input['st'] ? $ibforums->input['st'] : 0;
+		
+		$ibforums->html .= $ibforums->adskin->js_pop_win();
+		
+		$ibforums->admin->page_detail = "Viewing all warn entries on a member";
+		$ibforums->admin->page_title  = "Warn Logs Manager";
+	
+		if ($ibforums->input['search_string'] == "" and $ibforums->input['mid'])
+		{
+			$DB->simple_construct( array( 'select' => 'COUNT(wlog_id) as count', 'from' => 'warn_logs', 'where' => "wlog_mid='".$ibforums->input['mid']."'" ) );
+			$DB->simple_exec();
+		
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=warnlog&mid={$ibforums->input['mid']}&code=view";
+			
+			$DB->cache_add_query( 'warnlogs_view', array( 'mid' => $ibforums->input['mid'], 'start' => $start ) );
+			$DB->cache_exec_query();
+		}
+		else
+		{
+			$ibforums->input['search_string'] = urldecode($ibforums->input['search_string']);
+			
+			if ( ($ibforums->input['search_type'] == 'notes') )
+			{
+				$dbq = "l.wlog_notes LIKE '%".$ibforums->input['search_string']."%'";
+			}
+			else
+			{
+				$dbq = "l.wlog_contact_content LIKE '%".$ibforums->input['search_string']."%'";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'COUNT(l.wlog_id) as count', 'from' => 'warn_logs l', 'where' => $dbq ) );
+			$DB->simple_exec();
+			
+			$row = $DB->fetch_row();
+			
+			$row_count = $row['count'];
+			
+			$query = "&act=warnlog&code=view&search_type={$ibforums->input['search_type']}&search_string=".urlencode($ibforums->input['search_string']);
+			
+			$DB->cache_add_query( 'warnlogs_view_two', array( 'dbq' => $dbq, 'start' => $start ) );
+			$DB->cache_exec_query();
+		}
+		
+		$links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $row_count,
+											   'PER_PAGE'    => 30,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "Single Page",
+											   'L_MULTI'     => "Pages: ",
+											   'BASE_URL'    => $ibforums->base_url.$query,
+											 )
+									  );
+									  
+		$ibforums->admin->page_detail = "You may view warn entries added by your moderators";
+		$ibforums->admin->page_title  = "Warn Logs Manager";
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Type"        , "5%" );
+		$ibforums->adskin->td_header[] = array( "Member Name" , "15%" );
+		$ibforums->adskin->td_header[] = array( "Contacted"   , "5%" );
+		$ibforums->adskin->td_header[] = array( "MOD Q"       , "10%" );
+		$ibforums->adskin->td_header[] = array( "SUSP"        , "10%" );
+		$ibforums->adskin->td_header[] = array( "NO POST"     , "10%" );
+		$ibforums->adskin->td_header[] = array( "Date"        , "15%" );
+		$ibforums->adskin->td_header[] = array( "Warned By"   , "15%" );
+		$ibforums->adskin->td_header[] = array( "View Note"   , "10%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Warn Logs" );
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'right', 'pformstrip');
+		
+		$days = array( 'd' => "Days", 'h' => "Hours" );
+		
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$row['wlog_date'] = $ibforums->admin->get_date( $row['wlog_date'], 'LONG' );
+				
+				$type = ( $row['wlog_type'] == 'pos' )      ? '<span style="color:green;font-weight:bold">-</span>' : '<span style="color:red;font-weight:bold">+</span>';
+				$cont = ( $row['wlog_contact'] !=  'none' ) ? "<center><a href='javascript:pop_win(\"&act=warnlog&code=viewcontact&id={$row['wlog_id']}\",400,400)'>View</a></center>" : '&nbsp;';
+				
+				$mod     = preg_match( "#<mod>(.+?)</mod>#is"        , $row['wlog_notes'], $mm );
+				$post    = preg_match( "#<post>(.+?)</post>#is"      , $row['wlog_notes'], $pm );
+				$susp    = preg_match( "#<susp>(.+?)</susp>#is"      , $row['wlog_notes'], $sm );
+				$content = preg_match( "#<content>(.+?)</content>#is", $row['wlog_notes'], $cm );
+				
+				$content = $cm[1];
+				
+				$mod  = trim($mm[1]);
+				$post = trim($pm[1]);
+				$susp = trim($sm[1]);
+				
+				list($v, $u, $i) = explode(',', $mod);
+				
+				if ( $i == 1 )
+				{
+					$mod = 'INDEF';
+				}
+				else if ( $v == "" )
+				{
+					$mod = 'None';
+				}
+				else
+				{
+					$mod = $v.' '.$days[$u];
+				}
+				
+				//-----------------------------------------
+				
+				list($v, $u, $i) = explode(',', $post);
+				
+				if ( $i == 1 )
+				{
+					$post = 'INDEF';
+				}
+				else if ( $v == "" )
+				{
+					$post = 'None';
+				}
+				else
+				{
+					$post = $v.' '.$days[$u];
+				}
+				
+				list($v, $u) = explode(',', $susp);
+				
+				if ( $v == "" )
+				{
+					$susp = 'None';
+				}
+				else
+				{
+					$susp = $v.' '.$days[$u];
+				}
+				
+				//-----------------------------------------
+		
+				$ibforums->html .= $ibforums->adskin->add_td_row( array(
+														  "<center>$type</center>",
+														  "<b>{$row['a_name']}</b>",
+														  $cont,
+														  $mod,
+														  $susp,
+														  $post,
+														  "{$row['wlog_date']}",
+														  "<b>{$row['p_name']}</b>",
+														  "<center><a href='javascript:pop_win(\"&act=warnlog&code=viewnote&id={$row['wlog_id']}\",400,400)'>View</a></center>"
+												 )      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic($links, 'right', 'pformstrip');
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+		
+	}
+	
+	//-----------------------------------------
+	// Remove archived files
+	//-----------------------------------------
+	
+	function remove()
+	{
+		global $ibforums, $DB,  $std;
+	
+		if ($ibforums->input['mid'] == "")
+		{
+			$ibforums->admin->error("You did not select a member ID to remove by!");
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'warn_logs', 'where' => "wlog_mid={$ibforums->input['mid']}" ) );
+		
+		$ibforums->admin->save_log("Removed Warn Logs");
+		
+		$std->boink_it($ibforums->base_url."&act=warnlog");	
+	}
+	
+	
+
+	
+	
+	//-----------------------------------------
+	// SHOW LOGS
+	//-----------------------------------------
+	
+	function list_current()
+	{
+		global $ibforums, $DB,  $std;
+		
+		$form_array = array();
+	
+		$ibforums->admin->page_detail = "You may view and remove warn actions performed by your staff.<br />Note: Removing the logs does not decrease the member's warn level";
+		$ibforums->admin->page_title  = "Warn Logs Manager";
+		
+		$ibforums->html .= $ibforums->adskin->js_pop_win();
+		
+		//-----------------------------------------
+		// VIEW LAST 5
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'warnlogs_list_current', array() );
+		$DB->cache_exec_query();
+		
+		$ibforums->adskin->td_header[] = array( "Type"            , "5%" );
+		$ibforums->adskin->td_header[] = array( "Warned Member"   , "25%" );
+		$ibforums->adskin->td_header[] = array( "Contacted?"      , "5%" );
+		$ibforums->adskin->td_header[] = array( "Date"            , "25%" );
+		$ibforums->adskin->td_header[] = array( "Warned By"       , "25%" );
+
+		$ibforums->html .= $ibforums->adskin->start_table( "Last 10 Warn Entries" );
+
+		if ( $DB->get_num_rows() )
+		{
+			while ( $row = $DB->fetch_row() )
+			{
+			
+				$row['wlog_date'] = $ibforums->admin->get_date( $row['wlog_date'], 'LONG' );
+				
+				$type = ( $row['wlog_type'] == 'pos' ) ? '<span style="color:green;font-weight:bold">-</span>' : '<span style="color:red;font-weight:bold">+</span>';
+				$cont = ( $row['wlog_contact'] !=  'none' ) ? "<center><a title='Show message' href='javascript:pop_win(\"&act=warnlog&code=viewcontact&id={$row['wlog_id']}\",400,400)'><img src='{$ibforums->adskin->img_url}/acp_check.gif' border='0' alt='X'></a></center>" : '&nbsp;';
+				
+				$ibforums->html .= $ibforums->adskin->add_td_row( array(
+														  "<center>$type</center>",
+														  "<b>{$row['a_name']}</b>",
+														  $cont,
+														  "{$row['wlog_date']}",
+														  "<b>{$row['p_name']}</b>",
+												 )      );
+			}
+		}
+		else
+		{
+			$ibforums->html .= $ibforums->adskin->add_td_basic("<center>No results</center>");
+		}
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		
+		$ibforums->adskin->td_header[] = array( "Member Name"            , "30%" );
+		$ibforums->adskin->td_header[] = array( "Times Warned"           , "20%" );
+		$ibforums->adskin->td_header[] = array( "View all by member"     , "20%" );
+		$ibforums->adskin->td_header[] = array( "Remove all by member"   , "30%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Saved Warn Logs" );
+		
+		$DB->cache_add_query( 'warnlogs_list_current_two', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			
+			$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>{$r['name']}</b>",
+													  "<center>{$r['act_count']}</center>",
+													  "<center><a href='".$ibforums->adskin->base_url."&act=warnlog&code=view&mid={$r['wlog_mid']}'>View</a></center>",
+													  "<center><a href='".$ibforums->adskin->base_url."&act=warnlog&code=remove&mid={$r['wlog_mid']}'>Remove</a></center>",
+											 )      );
+		}
+			
+		
+		
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , 'view'     ),
+												  2 => array( 'act'   , 'warnlog'       ),
+									     )      );
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "40%" );
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "60%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table( "Search Warn Logs" );
+		
+		$form_array = array(
+							  0 => array( 'notes'  , 'Entry Notes' ),
+							  1 => array( 'contact', 'Email/PM Sent'  ),
+						   );
+			
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search for...</b>" ,
+										  		  $ibforums->adskin->form_input( "search_string")
+								 )      );
+								 
+		$ibforums->html .= $ibforums->adskin->add_td_row( array( "<b>Search in...</b>" ,
+										  		  $ibforums->adskin->form_dropdown( "search_type", $form_array)
+								 )      );
+		
+		$ibforums->html .= $ibforums->adskin->end_form("Search");
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+		
+		//-----------------------------------------
+		//-------------------------------
+		
+		$ibforums->admin->output();
+	
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/ad_wrappers.php b/upload/sources/admin/ad_wrappers.php
new file mode 100644
index 00000000..c57aa353
--- /dev/null
+++ b/upload/sources/admin/ad_wrappers.php
@@ -0,0 +1,288 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Help Control functions
+|   > Module written by Matt Mecham
+|   > Date started: 2nd April 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_ACP' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded 'admin.php'.";
+	exit();
+}
+
+class ad_wrappers {
+
+	var $base_url;
+	var $template = "";
+	var $functions = "";
+
+	function auto_run()
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Get the libraries
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/admin/admin_template_functions.php' );
+		
+		$this->functions = new admin_template_functions();
+		
+		//-----------------------------------------
+		// Kill globals - globals bad, Homer good.
+		//-----------------------------------------
+		
+		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
+		
+		foreach ( $tmp_in as $k => $v )
+		{
+			unset($$k);
+		}
+		
+		//-----------------------------------------
+
+		switch($ibforums->input['code'])
+		{
+			case 'floateditor':
+				$this->functions->build_editor_area_floated(1);
+				break;
+			
+			case 'edit':
+				$this->do_form('edit');
+				break;
+				
+			case 'doedit':
+				$this->save_wrapper('edit');
+				break;
+				
+			case 'export':
+				$this->export();
+			
+			default:
+				print "No action chosen"; exit();
+				break;
+				
+			//case 'wrapper':
+			//	$this->list_wrappers();
+			//	break;
+			//case 'add':
+			//	$this->add_splash();
+			//	break;
+			//case 'doadd':
+			//	$this->save_wrapper('add');
+			//	break;
+			//case 'remove':
+			//	$this->remove();
+			//	break;
+		}
+		
+	}
+	
+	
+	//-----------------------------------------
+	// ADD / EDIT WRAPPERS
+	//-----------------------------------------
+	
+	function save_wrapper( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		if ($type == 'edit')
+		{
+			if ($ibforums->input['id'] == "")
+			{
+				$ibforums->admin->error("You must specify an existing wrapper ID, go back and try again");
+			}
+		}
+		
+		if ($ibforums->input['txtwrapper'] == "")
+		{
+			$ibforums->admin->error("You can't have an empty template, can you?");
+		}
+		
+		$tmpl = $ibforums->admin->form_to_text( $std->txt_stripslashes($_POST['txtwrapper']) );
+		
+		if ( ! preg_match( "/<% BOARD %>/", $tmpl ) )
+		{
+			$ibforums->admin->error("You cannot remove the &lt% BOARD %> tag silly!");
+		}
+		
+		if ( ! preg_match( "/<% COPYRIGHT %>/", $tmpl ) )
+		{
+			$ibforums->admin->error("You cannot remove the &lt% COPYRIGHT %> tag silly!");
+		}
+		
+		$DB->do_update( 'skin_sets', array( 'set_wrapper' => $tmpl ), 'set_skin_set_id='.$ibforums->input['id'] );
+		
+		$ibforums->cache_func->_recache_wrapper( $ibforums->input['id'] );
+		
+		//-----------------------------------------
+		// Done
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['savereload'] )
+		{
+			$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+			$ibforums->main_msg = "Board Header and Footer Wrapper Updated";
+			$ibforums->admin->done_screen("Board Header and Footer Wrapper Updated", "Skin Manager Home", "act=sets", "redirect" );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Reload edit window
+			//-----------------------------------------
+			
+			$ibforums->main_msg = "Board Header and Footer Wrapper updated";
+			$this->do_form('edit');
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// FORM
+	//-----------------------------------------
+	
+	function do_form( $type='add' )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Check input
+		//-----------------------------------------
+		
+		if ($ibforums->input['id'] == "")
+		{
+			$ibforums->admin->error("You must specify an existing skin set ID, go back and try again");
+		}
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		$found_id      = "";
+		$found_content = "";
+		$this_set      = "";
+		
+		if ( $ibforums->input['p'] > 0 )
+		{
+			$in = ','.$ibforums->input['p'];
+		}
+		
+		//-----------------------------------------
+		// Query
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'stylesheets_do_form_concat', array( 'id' => $ibforums->input['id'], 'parent' => $in ) );
+		$DB->cache_exec_query();
+		
+		//-----------------------------------------
+		// check tree...
+		//-----------------------------------------
+		
+		while( $row = $DB->fetch_row() )
+		{
+			if ( $row['set_wrapper'] and ! $found_id )
+			{
+				$found_id      = $row['set_skin_set_id'];
+				$found_content = $row['set_wrapper'];
+			}
+			
+			if ( $ibforums->input['id'] == $row['set_skin_set_id'] )
+			{
+				$this_set = $row;
+			}
+		}
+		
+		if ($type == 'add')
+		{
+			$code = 'doadd';
+			$button = 'Create Wrapper';
+		}
+		else
+		{
+			$code = 'doedit';
+			$button = 'Save Wrapper';
+		}
+		
+		//-----------------------------------------
+		// Header
+		//-----------------------------------------
+	
+		$ibforums->admin->page_detail = "You may use HTML fully when adding or editing wrappers.";
+		$ibforums->admin->page_title  = "Editing Board Header and Footer Wrapper";
+		
+		if ( $found_id == 1 )
+		{
+			$ibforums->admin->page_detail .= "<br /><strong>This is a copy of the master wrapper, editing it below will copy the changes to a new wrapper unique to this skin set and any children of this set
+											  will inherit this wrapper</strong>";
+		}
+		
+		//-----------------------------------------
+		// Start form
+		//-----------------------------------------
+		
+		$ibforums->html .= $ibforums->adskin->js_no_specialchars();
+		
+		$ibforums->html .= $ibforums->adskin->start_form( array( 1 => array( 'code'  , $code      ),
+																 2 => array( 'act'   , 'wrap'     ),
+																 3 => array( 'id'    , $ibforums->input['id']   ),
+																 4 => array( 'fid'   , $found_id  ),
+														), "theform"     );
+									     
+		//-----------------------------------------
+		// Stop /textarea murdering layout
+		//-----------------------------------------
+		
+		$found_content = $ibforums->admin->text_to_form( $found_content );
+		
+		//-----------------------------------------
+		// Editor section
+		//-----------------------------------------
+		
+		$ibforums->html .= $this->functions->build_generic_editor_area( array( 'act' => 'wrap', 'title' => '', 'textareaname' => 'wrapper', 'textareainput' => $found_content ) );
+		
+		$formbuttons = "<div align='center' class='pformstrip'>
+						<input type='submit' name='submit' value='$button' class='realdarkbutton'>
+						<input type='submit' name='savereload' value='Save and Reload Wrapper' class='realdarkbutton'>
+						</div></form>\n";
+		
+		$ibforums->html = str_replace( '<!--IPB.EDITORBOTTOM-->', $formbuttons, $ibforums->html );
+		
+		
+		$ibforums->html .= $ibforums->adskin->skin_jump_menu_wrap();
+		
+		//-----------------------------------------
+		// Output
+		//-----------------------------------------
+		
+		$ibforums->admin->nav[] = array( 'act=sets' ,'Skin Manager Home' );
+		$ibforums->admin->nav[] = array( '' ,'Editing Board Wrapper in set '.$this_set['set_name'] );
+		
+		$ibforums->admin->output();
+	}
+	
+	
+	
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/admin_cache_functions.php b/upload/sources/admin/admin_cache_functions.php
new file mode 100644
index 00000000..2709a5e5
--- /dev/null
+++ b/upload/sources/admin/admin_cache_functions.php
@@ -0,0 +1,939 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Cache functions library
+|   > Script written by Matt Mecham
+|   > Date started: 20th January 2004
+|
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+class admin_cache_functions
+{
+	var $master_set = 1;
+	var $messages   = array();
+	var $no_rebuild = 0;
+	var $template   = "";
+	
+	//-----------------------------------------
+	// Constructor
+	//-----------------------------------------
+	
+	function admin_cache_functions()
+	{
+		//-----------------------------------------
+		// Get the libraries
+		//-----------------------------------------
+		
+		require_once( KERNEL_PATH.'class_template.php' );
+		
+		$this->template = new class_template();
+		
+		$this->template->root_path = CACHE_PATH;
+	}
+	
+	//============================================================================================================
+	// WRAPPER FUNCTIONS
+	//============================================================================================================
+	
+	//-----------------------------------------
+	// WRAPPER: Update internal cache
+	//-----------------------------------------
+	
+	function _recache_wrapper($id, $parent="", $root='1')
+	{
+		global $ibforums, $std, $DB;
+		
+		//-----------------------------------------
+		// Get wrapper from tree
+		//-----------------------------------------
+		
+		$parent_in = $parent ? ','.$parent : '';
+		
+		$DB->cache_add_query( 'cache_wrapper', array( 'id' => $id, 'parent_in' => $parent_in, 'root' => $root ) );
+		$DB->cache_exec_query();
+		
+		$this_set = $DB->fetch_row();
+		
+		$wrapper = $this_set['set_wrapper'];
+		
+		//-----------------------------------------
+		// Get children details
+		//-----------------------------------------
+		
+		$ids = array( 0 => array( 'set_skin_set_id' => $id ) );
+		
+		if ( $id == 1 and IN_DEV )
+		{
+			$id = -1;
+		}
+		
+		$DB->cache_add_query( 'cache_empty_wrapper', array( 'parent_id' => $id ) );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ids[] = $r;
+		}
+		
+		if ( $id == -1 and IN_DEV )
+		{
+			$id = 1;
+		}
+		
+		//-----------------------------------------
+		// Update this and child db
+		// caches
+		//-----------------------------------------
+		
+		$theids = array();
+		
+		foreach( $ids as $i => $d )
+		{
+			$theids[] = $d['set_skin_set_id'];
+		}
+		
+		$DB->do_update( 'skin_sets', array( 'set_cache_wrapper' => $wrapper ), 'set_skin_set_id IN ('.implode(',',$theids).') AND set_skin_set_id != 1' );
+		
+		$this->messages[] = "Done wrapper rebuild... (id: ".implode(',',$theids).")";
+	}
+	
+	//============================================================================================================
+	// TEMPLATE FUNCTIONS
+	//============================================================================================================
+	
+	//-----------------------------------------
+	// TEMPLATE: Recache and splash
+	//-----------------------------------------
+	
+	function _recache_templates( $id, $parent="", $group_only="", $root=1 )
+	{
+		global $std, $DB, $ibforums;
+		
+		$ids = array( 0 => array( 'id' => $id, 'parent' => $parent ) );
+		
+		//-----------------------------------------
+		// Get any children
+		//-----------------------------------------
+		
+		if ( $id == 1 and IN_DEV )
+		{
+			$id = -1;
+		}
+		
+		$DB->simple_construct( array( 'select' => 'set_skin_set_id, set_skin_set_parent', 'from' => 'skin_sets', 'where' => "set_skin_set_parent=$id" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ids[] = array( 'id' => $r['set_skin_set_id'], 'parent' => $r['set_skin_set_parent'] );
+		}
+		
+		if ( $id == -1 and IN_DEV )
+		{
+			$id = 1;
+		}
+		
+		//-----------------------------------------
+		// SPIN TO WIN!
+		//-----------------------------------------
+		
+		foreach ( $ids as $i => $tid )
+		{
+			$id     = $tid['id'];
+			$parent = $tid['parent'];
+			
+			//-----------------------------------------
+			// Get template set titles
+			//-----------------------------------------
+			
+			$group_titles = $this->_get_templates( $id, $parent, 'groups' );
+			
+			foreach ( $group_titles as $name => $group )
+			{
+				//-----------------------------------------
+				// Skip if we're only updating
+				// one group..
+				//-----------------------------------------
+				
+				if ( $group_only != '' )
+				{
+					if ( $group_only != $group['group_name'] )
+					{
+						continue;
+					}
+				}
+				
+				$this_set_list = array();
+				
+				$out = "class {$group['group_name']} {\n\n";
+				
+				$templates = $this->_get_templates( $id, $parent, 'groups', $group['group_name'] );
+				
+				foreach ($templates as $func_name => $data )
+				{
+					$out .= $this->template->convert_html_to_php( $data['func_name'], $data['func_data'], $data['section_content'] ) ."\n";
+					
+					if ( $data['set_id'] == $id )
+					{
+						$this_set_list[] = $data['func_name'];
+					}
+				}
+				
+				$out .= "\n\n}";
+				
+				//-----------------------------------------
+				// Write to the DB...
+				//-----------------------------------------
+				
+				$DB->simple_exec_query( array( 'delete' => 'skin_templates_cache', 'where' => "template_group_name='{$group['group_name']}' and template_set_id={$id}" ) );
+				
+				$DB->do_insert( 'skin_templates_cache', array(
+																'template_id'            => md5(microtime()),
+																'template_group_name'    => $group['group_name'],
+																'template_group_content' => $out,
+																'template_set_id'        => $id,
+															 ) );
+															 
+				//-----------------------------------------
+				// Write to the flatfile
+				//-----------------------------------------
+				
+				$start  = '<'.'?'."php\n";
+				$start .= "/*--------------------------------------------------*/\n";
+				$start .= "/* FILE GENERATED BY INVISION POWER BOARD           */\n";
+				$start .= "/* CACHE FILE: Skin set id: {$id}                     */\n";
+				$start .= "/* CACHE FILE: Generated: ".gmdate( "D, d M Y H:i:s \G\M\T" )." */\n";
+				$start .= "/* DO NOT EDIT DIRECTLY - THE CHANGES WILL NOT BE   */\n";
+				$start .= "/* WRITTEN TO THE DATABASE AUTOMATICALLY            */\n";
+				$start .= "/*--------------------------------------------------*/\n\n";
+				
+				$end    = "\n\n/*--------------------------------------------------*/\n";
+				$end   .= "/*<changed bits>\n".implode(',',$this_set_list)."\n</changed bits>*/\n";
+				$end   .= "/* END OF FILE                                      */\n";
+				$end   .= "/*--------------------------------------------------*/\n";
+				$end   .= "\n?".">";
+				
+				$this->_write_template_to_file( $id, $group['group_name'], $start.$out.$end );
+			}
+			
+			$this->messages[] = "Done HTML templates rebuild... (id: $id)";
+		}
+	}
+	
+	//-----------------------------------------
+	// TEMPLATE: write flat-file
+	//-----------------------------------------
+	
+	function _write_template_to_file($id, $group_name, $content)
+	{
+		global $DB, $ibforums;
+		
+		//-----------------------------------------
+		// Check..
+		//-----------------------------------------
+		
+		if ( $id == 1 AND ! IN_DEV)
+		{
+			return 0;
+		}
+		
+		$return     = 0;
+		$good_to_go = 0;
+			
+		if ( ! SAFE_MODE_ON )
+		{
+			$good_to_go = 1;
+			
+			if ( is_writeable( CACHE_PATH.'skin_cache' ) )
+			{
+				$good_to_go = 1;
+				
+				if ( ! is_dir( CACHE_PATH.'skin_cache/cacheid_'.$id ) )
+				{
+					if ( ! @ mkdir( CACHE_PATH.'skin_cache/cacheid_'.$id, 0777 ) )
+					{
+						$good_to_go = 0;
+					}
+					else
+					{
+						@chmod( CACHE_PATH.'skin_cache/cacheid_'.$id, 0777 );
+						$good_to_go = 1;
+					}
+				}
+				else
+				{
+					if ( file_exists( CACHE_PATH.'skin_cache/cacheid_'.$id.'/'.$group_name.'.php' ) )
+					{
+						if ( ! is_writeable( CACHE_PATH.'skin_cache/cacheid_'.$id.'/'.$group_name.'.php' ) )
+						{
+							$this->messages[] = "::cache_id_{$id}/{$group_name}.php not writeable - cannot cache to PHP files";
+							$good_to_go = 0;
+						}
+						else
+						{
+							$good_to_go = 1;
+						}
+					}
+					else
+					{
+						$good_to_go = 1;
+					}
+				}
+			}
+			else
+			{
+				$this->messages[] = "::cache_id_{$id} not writeable - cannot cache to PHP files";
+			}
+		}
+		
+		//-----------------------------------------
+		// Write...
+		//-----------------------------------------
+		
+		if ( $good_to_go )
+		{
+			if ( $FH = @fopen( CACHE_PATH.'skin_cache/cacheid_'.$id.'/'.$group_name.'.php', 'w' ) )
+			{
+				fwrite( $FH, $content, strlen($content) );
+				fclose( $FH );
+				@chmod( CACHE_PATH.'skin_cache/cacheid_'.$id.'/'.$group_name.'.php', 0777 );
+				
+				$return = 1;
+				
+				$this->messages[] = "Wrote skin_cache/cacheid_{$id}/{$group_name}.php";
+			}
+		}
+		
+		return $return;
+	}
+	
+	
+	//-----------------------------------------
+	// TEMPLATE: Return templates from tree
+	//-----------------------------------------
+	
+	function _get_templates($id, $parent, $type='all', $group='', $root=1)
+	{
+		global $ibforums, $DB;
+		
+		$templates = array();
+		$parent_in = $parent > 0 ? ','.$parent : '';
+		$return    = 'all';
+		
+		if ( $type == 'groups' and $group == '' )
+		{
+			//-----------------------------------------
+			// Just return group titles
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'cache_templates_titles', array( 'id' => $id, 'parent_in' => $parent_in, 'root' => $root ) );
+			$newq = $DB->cache_exec_query();
+		
+			$return = 'titles';
+		}
+		else if ( $type == 'groups' and $group != '' )
+		{
+			//-----------------------------------------
+			// Return group template bits
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'cache_templates_bits', array( 'id' => $id, 'parent_in' => $parent_in, 'root' => $root, 'group' => $group ) );
+			$newq = $DB->cache_exec_query();
+			
+			$return = 'group';
+		}
+		else
+		{
+			//-----------------------------------------
+			// Return all...
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'cache_templates_all', array( 'id' => $id, 'parent_in' => $parent_in, 'root' => $root ) );
+			$newq = $DB->cache_exec_query();
+		}
+		
+		//-----------------------------------------
+		// Get all results
+		//-----------------------------------------
+		
+		while ( $r = $DB->fetch_row($newq) )
+		{
+			if ( $return == 'titles' )
+			{
+				$templates[ $r['group_name'] ] = $r;
+				$this->template_count[ $r['set_id'] ][ $r['group_name'] ]['count']++;
+			}
+			else if ( $return == 'group' )
+			{
+				$templates[ strtolower($r['func_name']) ] = $r;
+			}
+			else
+			{
+				$templates[ $r['group_name'] ][ strtolower($r['func_name']) ] = $r;
+			}
+		}
+		
+		ksort($templates);
+		
+		return $templates;
+	}
+	
+	//-----------------------------------------
+	// TEMPLATE: Rebuild templates from PHP files
+	//-----------------------------------------
+	
+	function _rebuild_templates_from_php($id)
+	{
+		global $ibforums, $DB, $std;
+		
+		$insert = 1;
+		
+		//-----------------------------------------
+		// Rebuilds the data editable files from the PHP source files
+		//-----------------------------------------
+		
+		$this->template->cache_id = $id;
+		
+		$skin_dir = CACHE_PATH."skin_cache/cacheid_".$id;
+		
+		$errors = array();
+		
+		$flag = 0;
+		
+		//-----------------------------------------
+		// Is this a safe mode only skinny poos?
+		//-----------------------------------------
+		
+		if ( ! file_exists( $skin_dir ) )
+		{
+			$this->messages[] = "This template set is a safe mode only skin and no PHP skin files exist, there is no need to run this tool on this template set.";
+			return 0;
+		}
+		
+		
+		if ( ! is_readable($skin_dir) )
+		{
+			$this->messages[] = "FAILD: Cannot write into '$skin_dir', please check the CHMOD value, and if needed, CHMOD to 0777 via FTP. IBF cannot do this for you.";
+			return 0;
+		}
+		
+		if ( is_dir($skin_dir) )
+		{
+			if ( $handle = opendir($skin_dir) )
+			{
+			
+				while (($filename = readdir($handle)) !== false)
+				{
+					if (($filename != ".") && ($filename != ".."))
+					{
+					
+						if ( preg_match( "/\.php$/", $filename ) )
+						{
+							
+							$name = preg_replace( "/^(\S+)\.(\S+)$/", "\\1", $filename );
+							
+							if ($FH = fopen($skin_dir."/".$filename, 'r') )
+							{
+								$fdata = fread( $FH, filesize($skin_dir."/".$filename) );
+								fclose($FH);
+							}
+							else
+							{
+								$this->messages[] = "Could not open $filename for reading, skipping file...";
+								continue;
+							}
+							
+							$fdata = str_replace( "\r", "\n", $fdata );
+							$fdata = str_replace( "\n\n", "\n", $fdata );
+							
+							if ( ! preg_match( "/\n/", $fdata ) )
+							{
+								$this->messages[] = "Could not find any line endings in $filename, skipping file...";
+								continue;
+							}
+							
+							$farray = explode( "\n", $fdata );
+							
+							//-----------------------------------------
+							
+							$functions = array();
+							
+							foreach($farray as $f)
+							{
+								
+								// Skip javascript functions...
+								
+								if ( preg_match( "/<script/i", $f ) )
+								{
+									$script_token = 1;
+								}
+								
+								if ( preg_match( "/<\/script>/i", $f ) )
+								{
+									$script_token = 0;
+								}
+								
+								//-----------------------------------------
+								// NOT IN JS
+								//-----------------------------------------
+								
+								if ($script_token == 0)
+								{
+									if ( preg_match( "/^function\s*([\w\_]+)\s*\((.*)\)/i", $f, $matches ) )
+									{
+										$functions[$matches[1]] = '';
+										$config[$matches[1]]    = $matches[2];
+										$flag = $matches[1];
+										continue;
+									}
+								}
+								//-----------------------------------------
+								// ARE IN JS
+								//-----------------------------------------
+								else
+								{
+									// Make JS safe (UBE - Ugly, but effective)
+									
+									$f = preg_replace( "#if\s+?\(#is"  , "i~f~(~"   , $f );
+									$f = preg_replace( "#else#is"      , "e~lse~"   , $f );
+									$f = preg_replace( "#else\s+?if#is", "e~lse~i~f", $f );
+								}
+									
+								if ($flag)
+								{
+									$functions[$flag] .= $f."\n";
+									continue;
+								}
+								 
+							}
+							
+							//-----------------------------------------
+							// Remove current templates for this set...
+							//-----------------------------------------
+							
+							$DB->simple_exec_query( array( 'delete' => 'skin_templates', 'where' => "set_id='".$id."' AND group_name='$name'" ) );
+							
+							$final = "";
+							$flag  = 0;
+							
+							foreach($functions as $fname => $ftext)
+							{
+								preg_match( "#//--starthtml--//(.+?)//--endhtml--//#s", $ftext, $matches );
+								
+								$content = str_replace( '\\n' , '\\\\\\n', $this->template->convert_php_to_html($matches[1]) );
+								
+								//-----------------------------------------
+								// Unconvert JS
+								//-----------------------------------------
+								
+								$content = str_replace( "i~f~(~"   , "if ("   , $content );
+								$content = str_replace( "e~lse~"   , "else"   , $content );
+								$content = str_replace( "e~lse~i~f", "else if", $content );
+								
+								$DB->do_insert( 'skin_templates', array (
+																		 'set_id'          => $id,
+																		 'group_name'      => $name,
+																		 'section_content' => $content,
+																		 'func_name'       => $fname,
+																		 'func_data'       => trim($config[$fname]),
+																		 'updated'         => time(),
+															   )       );
+							}
+							
+							$functions = array();
+							
+							//-----------------------------------------
+							
+						} // if *.php
+						
+					} // if not dir
+					
+				} // while loop
+				
+				closedir($handle);
+				
+			}
+			else
+			{
+				$this->messages[] = "Could not open directory $skin_dir for reading!.";
+				return 0;
+			}
+		}
+		else
+		{
+			$this->messages[] = "$skin_dir is not a directory, please check the \$root_path variable in admin.php.";
+			return 0;
+		}
+		
+		$this->messages[] = "Completed database rebuild from PHP cache files.";
+		return 1;
+	}
+	
+	
+	
+	
+	//============================================================================================================
+	// CSS FUNCTIONS
+	//============================================================================================================
+	
+	//-----------------------------------------
+	// CSS: Write file to cache
+	//-----------------------------------------
+	
+	function _write_css_to_cache($id, $parent="", $root='1')
+	{
+		global $ibforums, $std, $DB;
+		
+		//-----------------------------------------
+		// Get css from tree
+		//-----------------------------------------
+		
+		$parent_in = $parent ? ','.$parent : '';
+		
+		$DB->cache_add_query( 'cache_templates_css', array( 'id' => $id, 'parent_in' => $parent_in, 'root' => $root ) );
+		$DB->cache_exec_query();
+			
+		$this_set = $DB->fetch_row();
+		
+		$css = $this_set['set_css'];
+		
+		$DB->simple_construct( array( 'select' => 'set_image_dir', 'from' => 'skin_sets', 'where' => "set_skin_set_id=$id" ) );
+		$DB->simple_exec();
+		
+		$real_set = $DB->fetch_row();
+		
+		//-----------------------------------------
+		// Get children details
+		//-----------------------------------------
+		
+		$ids     = array( $id => array( 'set_skin_set_id' => $id, 'set_image_dir' => $this_set['set_image_dir'] ) );
+		$set_ids = array( 0 => $id );
+		
+		if ( $id == 1 and IN_DEV )
+		{
+			$id = -1;
+		}
+		
+		$DB->cache_add_query( 'cache_empty_css', array ( 'parent_id' => $id ) );
+		$DB->cache_exec_query();
+		
+		if ( $id == -1 and IN_DEV )
+		{
+			$id = 1;
+		}
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ids[ $r['set_skin_set_id'] ] = $r;
+			$set_ids[] = $r['set_skin_set_id'];
+		}
+		
+		//-----------------------------------------
+		// Update this and child db
+		// caches
+		//-----------------------------------------
+		
+		if ( count($set_ids) )
+		{
+			$DB->simple_construct( array( 'select' => 'set_image_dir, set_skin_set_id', 'from' => 'skin_sets', 'where' => 'set_skin_set_id IN('. implode(",",$set_ids) .')' ) );
+			$DB->simple_exec();
+			
+			while ( $newid = $DB->fetch_row() )
+			{
+				$ids[ $newid['set_skin_set_id'] ]['set_image_dir'] = $newid['set_image_dir'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Make sure inline sheets
+		// have the proper style_images folder
+		//-----------------------------------------
+		
+		$css = str_replace( "url({$real_set['set_image_dir']}/", "url(style_images/<#IMG_DIR#>/", $css );
+		$css = str_replace( "url(<#IMG_DIR#>/", "url(style_images/<#IMG_DIR#>/", $css );
+		$css = preg_replace( "#url\((style_images/)?\d+?/#i", "url(style_images/<#IMG_DIR#>/", $css );
+		
+		if ( $ibforums->vars['ipb_img_url'] )
+		{
+			$css = str_replace( "url(style_images/", "url({$ibforums->vars['ipb_img_url']}style_images/", $css );
+		}
+		
+		$DB->do_update( 'skin_sets', array( 'set_cache_css' => $css ), 'set_skin_set_id IN ('.implode(',',$set_ids).') AND set_skin_set_id != 1' );
+		
+		//-----------------------------------------
+		// Update flat-file caches
+		//-----------------------------------------
+		
+		$start  = "/*------------------------------------------------------------------*/\n";
+		$start .= "/* FILE GENERATED BY INVISION POWER BOARD                           */\n";
+		$start .= "/* DO NOT EDIT BY HAND WITHOUT RESYNCHRONISING BACK TO THE DATABASE */\n";
+		$start .= "/* OR CHANGES TO THIS FILE WILL BE LOST WHEN NEXT EDITED FROM THE   */\n";
+		$start .= "/* ADMIN CONTROL PANEL                                              */\n";
+		$start .= "/* STYLE DIRECTORY: <#IMG_DIR#>                                     */\n";
+		$start .= "/* CACHE FILE: Generated: ".gmdate( "D, d M Y H:i:s \G\M\T" )." */\n";
+		$start .= "/*------------------------------------------------------------------*/\n\n";
+		$start .= "/*~START CSS~*/\n\n";
+		
+		$css = $std->txt_windowstounix($start.$css);
+		
+		if ( file_exists( CACHE_PATH."style_images" ) )
+		{
+			if ( is_writeable( CACHE_PATH."style_images" ) )
+			{
+				foreach( $ids as $id )
+				{
+					@unlink( CACHE_PATH."style_images/css_".$id['set_skin_set_id'].".css" );
+					
+					//-----------------------------------------
+					// Fix up relative stuff
+					//-----------------------------------------
+					
+					$thiscss = str_replace( '<#IMG_DIR#>', $id['set_image_dir'], $css );
+					
+					if ( ! $ibforums->vars['ipb_img_url'] )
+					{
+						$thiscss = str_replace( 'style_images/', '', $thiscss );
+					}
+					
+					//-----------------------------------------
+					// Write..
+					//-----------------------------------------
+					
+					if ( $FH = @fopen( CACHE_PATH."style_images/css_".$id['set_skin_set_id'].".css", 'w' ) )
+					{
+						@fputs( $FH, $thiscss, strlen($thiscss) );
+						@fclose($FH);
+						@chmod( CACHE_PATH."style_images/css_".$id['set_skin_set_id'].".css", 0777 );
+						
+						$this->messages[] = "Rebuilding css file for css_{$id['set_skin_set_id']}...";
+					}
+					else
+					{
+						$this->messages[] = "<br /><b>Cache file css_{$id['set_skin_set_id']} not updated. Check CHMOD permissions on ./style_images and ./style_images/css_{$id['set_skin_set_id']}.css</b>";
+					}
+				}
+			}
+			else
+			{
+				$this->messages[] = "<b>Cache file(s) not updated. Check CHMOD permissions on ./style_images and ./style_images/css_{$id['set_skin_set_id']}.css</b>";
+			}
+		}
+		else
+		{
+			$this->messages[] = "<b>Cache file(s) not updated. style_images folder not present</b>";
+		}
+	}
+	
+	
+	//============================================================================================================
+	// MACRO FUNCTIONS
+	//============================================================================================================
+	
+	//-----------------------------------------
+	// MACRO: Recache macros
+	//-----------------------------------------
+	
+	function _recache_macros($id, $parent="", $root=1)
+	{
+		global $DB, $ibforums;
+		
+		$ids = array( 0 => array( 'id' => $id, 'parent' => $parent ) );
+		
+		//-----------------------------------------
+		// Get any children
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'set_skin_set_id, set_skin_set_parent', 'from' => 'skin_sets', 'where' => "set_skin_set_parent=$id" ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ids[] = array( 'id' => $r['set_skin_set_id'], 'parent' => $r['set_skin_set_parent'] );
+		}
+		
+		$DB->manual_addslashes = 1;
+		
+		foreach( $ids as $i )
+		{
+			$macros = $this->_get_macros($i['id'], $i['parent'], $root);
+			$this->messages[] = "Done.... (Macro ID: {$i['id']})...";
+			$DB->do_update( 'skin_sets', array( 'set_cache_macro' => $DB->add_slashes(serialize($macros)) ), 'set_skin_set_id='.$i['id'] );
+		}
+		
+		$DB->manual_addslashes = 0;
+	}
+	
+	
+	//-----------------------------------------
+	// MACRO: Return macros from tree
+	//-----------------------------------------
+	
+	function _get_macros($id, $parent, $root=1)
+	{
+		global $ibforums, $DB;
+		
+		$macros = array();
+		
+		$parent_in = $parent ? ','.$parent : '';
+		
+		//-----------------------------------------
+		// Get macros from db, we want to return macros in order
+		// so that skin specific macros are returned over root
+		// macros. We use instr( concat() ) to search the parent
+		// list for the macro set and return the position. The lower
+		// the pos, the higher up the tree. Use DESC on this 'theorder'
+		// to return specific macros last so that they overwrite root
+		// macros.... (thats the theory)
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'cache_templates_macros', array( 'id' => $id, 'parent_in' => $parent_in, 'root' => $root ) );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$macros[ strtolower( $r['macro_value'] ) ] = $r;
+		}
+		
+		ksort($macros);
+		
+		return $macros;
+	}
+	
+	//============================================================================================================
+	// MAIN FUNCTIONS
+	//============================================================================================================
+	
+	//-----------------------------------------
+	// MAIN: Rebuild all caches
+	//-----------------------------------------
+	
+	function _rebuild_all_caches( $affected )
+	{
+		global $ibforums, $DB;
+		
+		$this->no_rebuild = 1;
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'order' => 'set_skin_set_parent, set_skin_set_id ASC' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$skins[ $r['set_skin_set_id'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// check all affected ids
+		//-----------------------------------------
+		
+		foreach( $affected as $aid )
+		{
+			if ( $aid == 1 and ! IN_DEV )
+			{
+				continue;
+			}
+			
+			//-----------------------------------------
+			// Custom Macros
+			//-----------------------------------------
+			
+			$this->messages[] = "Rebuilding Macros for set {$skins[$aid]['set_name']}...";
+			
+			$this->_recache_macros($aid, $skins[ $aid ]['set_skin_set_parent']);
+			
+			//-----------------------------------------
+			// Custom CSS
+			//-----------------------------------------
+			
+			$this->messages[] = "Rebuilding CSS for set {$skins[$aid]['set_name']}...";
+			
+			$this->_write_css_to_cache( $aid, $skins[ $aid ]['set_skin_set_parent'] );
+			
+			//-----------------------------------------
+			// Custom HTML
+			//-----------------------------------------
+			
+			$this->messages[] = "Rebuilding HTML templates cache for set {$skins[$aid]['set_name']}...";
+			
+			$this->_recache_templates( $aid, $skins[ $aid ]['set_skin_set_parent'] );
+			
+			//-----------------------------------------
+			// Custom Wrappers
+			//-----------------------------------------
+			
+			$this->messages[] = "Rebuilding wrappers cache for set {$skins[$aid]['set_name']}...";
+			
+			$this->_recache_wrapper( $aid, $skins[ $aid ]['set_skin_set_parent'] );
+		}	
+		
+		$this->messages[] = "Rebuilding the skin set ID relationship cache...";
+		
+		$this->_rebuild_skin_id_cache($skins);
+		
+		return $message;
+	}
+	
+	//-----------------------------------------
+	// MAIN: Rebuild cache entry
+	//-----------------------------------------
+	
+	function _rebuild_skin_id_cache($skins=array())
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->cache['skin_id_cache'] = array();
+		
+		if ( ! count( $skins ) )
+		{
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets', 'order' => 'set_skin_set_parent, set_skin_set_id ASC' ) );
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$skins[ $r['set_skin_set_id'] ] = $r;
+			}
+		}
+		
+		foreach( $skins as $row )
+		{
+			if ( $row['set_skin_set_parent'] > 1 )
+			{
+				$parent = ','.$row['set_skin_set_parent'];
+			}
+			
+			$ibforums->cache['skin_id_cache'][ $row['set_skin_set_id'] ] = array( 'set_skin_set_id'  => $row['set_skin_set_id'],
+																				  'set_tree_list'    => $row['set_skin_set_id'].$parent.',1',
+																				  'set_hidden'       => $row['set_hidden'],
+																				  'set_default'      => $row['set_default'],
+																				  'set_parent'       => $row['set_skin_set_parent'],
+																				  'set_name'         => $row['set_name'],
+																				);
+		}
+		
+		$std->update_cache( array( 'name' => 'skin_id_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		return $ibforums->cache['skin_id_cache'];
+	}
+	
+}
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/admin_forum_functions.php b/upload/sources/admin/admin_forum_functions.php
new file mode 100644
index 00000000..57537824
--- /dev/null
+++ b/upload/sources/admin/admin_forum_functions.php
@@ -0,0 +1,659 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin forum functions library
+|   > Script written by Matt Mecham
+|   > Date started: 19th November 2003
+|
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+class admin_forum_functions
+{
+	var $type     = "";
+	var $printed  = 0;
+	var $show_all = 0;
+	var $skins    = array();
+	var $need_desc = array();
+	//-----------------------------------------
+	// Forum - Build Children (of the CORN!!!)
+	//-----------------------------------------
+	
+	function forum_build_children($root_id, $temp_html="", $depth_guide="")
+	{
+		global $ibforums, $forums;
+		
+		if ( is_array( $forums->forum_cache[ $root_id ] ) )
+		{
+			foreach( $forums->forum_cache[ $root_id ] as $id => $forum_data )
+			{
+				if ( $ibforums->vars['forum_cache_minimum'] )
+				{
+					$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
+					$this->need_desc[] = $forum_data['id'];
+				}
+					
+				$temp_html .= $this->render_forum($forum_data, $depth_guide);
+				
+				$temp_html = $this->forum_build_children( $forum_data['id'], $temp_html, $depth_guide . $forums->depth_guide );
+			}
+		}
+		
+		return $temp_html;
+	}
+	
+	//-----------------------------------------
+	// Forum - Render forum entry (NOT of the CORN!!!)
+	//-----------------------------------------
+	
+	function render_forum($r, $depth_guide="")
+	{
+		global $ibforums, $std, $forums;
+		
+ 		if ( $this->type == 'manage' )
+		{
+			if ( ! is_array($ibforums->adskin->td_header[0]) ) 
+			{
+				$ibforums->adskin->td_header[0] = array( "{none}", "35%" );
+				$ibforums->adskin->td_header[1] = array( "{none}", "25%" );
+				$ibforums->adskin->td_header[2] = array( "{none}", "15%" );
+				$ibforums->adskin->td_header[3] = array( "{none}", "25%" );
+			}
+			
+			$skin_stuff = "";
+			$trash_can  = "";
+			
+			if ( ($r['skin_id'] != "") and ($r['skin_id'] >= 0) )
+			{
+				$skin_stuff = "<br>[ "."Using Skin Set: ".$this->skins[$r['skin_id']]." ]";
+			}
+			
+			$redirect =  ($r['redirect_on'] == 1) ? ' (Redirect Forum)' : '';
+			
+			if ( $r['id'] == $ibforums->vars['forum_trash_can_id'] )
+			{
+				$trash_can = "&nbsp;<img src='{$ibforums->adskin->img_url}/acp_trashcan.gif' border='0' title='This is the trashcan forum' />&nbsp;";
+			}
+			
+			if ( ! $this->show_all )
+			{
+				$children = $forums->forums_get_children( $r['id'] );
+				
+				$sub       = array();
+				$subforums = "";
+				$count     = 0;
+				
+				if ( count($children) )
+				{
+					$r['name'] = "<a href='{$ibforums->base_url}&act=forum&f={$r['id']}'>".$r['name']."</a>";
+					
+					foreach ( $children as $cid )
+					{
+						$count++;
+						
+						$cfid = $cid;
+						
+						if ( $count == count($children) )
+						{
+							//-----------------------------------------
+							// Last subforum, link to parent
+							// forum...
+							//-----------------------------------------
+							
+							if ( ! $cfid = $children[ $count - 2 ] )
+							{
+								$cfid = $r['id'];
+							}
+						}
+						
+						$sub[] = "<a href='{$ibforums->base_url}&act=forum&f={$forums->forum_by_id[$cid]['parent_id']}'>".$forums->forum_by_id[$cid]['name']."</a>";
+					}
+				}
+				
+				if ( count( $sub ) )
+				{
+					$subforums = '<br /><br />Sub-forums: '.implode( ", ", $sub );
+				}
+				
+				$desc = "<div class='graytext'>{$r['description']}{$subforums}</div>";
+			}
+			else
+			{
+				$desc = "";
+			}
+			
+			return $ibforums->adskin->add_td_row( array(
+											 "<b>{$depth_guide}{$trash_can}{$r['name']}</b>$redirect $skin_stuff{$desc}",
+											 "<center><b><a href='{$ibforums->base_url}&act=forum&code=edit&f={$r['id']}'>Settings</a></b>".
+											 " | <a href='{$ibforums->base_url}&act=forum&code=pedit&f={$r['id']}'>Permissions</a></center>",
+											 
+											 array("<div align='center'><a href='{$ibforums->base_url}&act=forum&code=frules&f={$r['id']}'><img src='{$ibforums->adskin->img_url}/acp_rules.gif' border='0' title='Forum Rules'></a>&nbsp;&nbsp;".
+											 "<a href='{$ibforums->base_url}&act=forum&code=skinedit&f={$r['id']}'><img src='{$ibforums->adskin->img_url}/acp_edit.gif' border='0' title='Skin Options'></a>&nbsp;&nbsp;".
+											 "<a href='{$ibforums->base_url}&act=forum&code=recount&f={$r['id']}'><img src='{$ibforums->adskin->img_url}/acp_resync.gif' border='0' title='Resynchronise'></a></div>", 1, 'tdrow3' ),
+											 
+											 "<center><a href='{$ibforums->base_url}&act=forum&code=delete&f={$r['id']}'>Delete</a>".
+											 " | <b><a href='{$ibforums->base_url}&act=forum&code=empty&f={$r['id']}'>Empty Forum</a></b></center>",
+								   )      );
+		}
+		
+		//-----------------------------------------
+		// REORDER
+		//-----------------------------------------
+		
+		else if ( $this->type == 'reorder' )
+		{
+			if ( ! is_array($ibforums->adskin->td_header[0]) ) 
+			{
+				$ibforums->adskin->td_header[0] = array( "{none}", "10%" );
+				$ibforums->adskin->td_header[1] = array( "{none}", "90%" );
+			}
+			
+			$this->printed++;
+			
+			$no_root = count( $forums->forums_get_children($ibforums->input['f']) );
+			
+			$reorder = "<select id='realbutton' name='f_{$r['id']}'>";
+			
+			for( $i = 1 ; $i <= $no_root ; $i++ )
+			{
+				$sel = "";
+				
+				if ( $this->printed == $i )
+				{
+					$sel =  'selected="selected" ';
+				}
+				
+				$reorder .= "\n<option value='$i'{$sel}>$i</option>";
+			}
+			
+			$reorder .= "</select>\n";
+			
+			return $ibforums->adskin->add_td_row( array(
+											 $reorder,
+											 "<b>{$depth_guide}".$r['name']."</b>",
+								   )      );
+		
+		}
+		
+		//-----------------------------------------
+		// MODERATOR
+		//-----------------------------------------
+		
+		else if ( $this->type == 'moderator' )
+		{
+			if ( ! is_array($ibforums->adskin->td_header[0]) ) 
+			{
+				$ibforums->adskin->td_header[] = array( "Add"                , "5%" );
+				$ibforums->adskin->td_header[] = array( "Forum Name"         , "40%" );
+				$ibforums->adskin->td_header[] = array( "Current Moderators" , "55%" );
+			}
+			
+			$mod_string = "";
+					
+			foreach( $this->moderators as $phpid => $data )
+			{
+				if ($data['forum_id'] == $r['id'])
+				{
+					if ($data['is_group'] == 1)
+					{
+						$mod_string .= "<tr>
+										 <td width='60%'>Group: {$data['group_name']}</td>
+										 <td width='20%'><a href='{$ibforums->base_url}&act=mod&code=remove&mid={$data['mid']}'>Remove</a></td>
+										 <td width='20%'><a href='{$ibforums->base_url}&act=mod&code=edit&mid={$data['mid']}'>Edit</a></td>
+										</tr>";
+					}
+					else
+					{
+						$mod_string .= "<tr>
+										 <td width='60%'>{$data['member_name']}</td>
+										 <td width='20%'><a href='{$ibforums->base_url}&act=mod&code=remove&mid={$data['mid']}'>Remove</a></td>
+										 <td width='20%'><a href='{$ibforums->base_url}&act=mod&code=edit&mid={$data['mid']}'>Edit</a></td>
+										</tr>";
+					}
+				}
+			}
+			
+			if ($mod_string != "")
+			{
+				$these_mods = "<table cellpadding='3' cellspacing='0' width='100%' align='center'>".$mod_string."</table>";
+			}
+			else
+			{
+				$these_mods = "<center><i>Unmoderated</i></center>";
+			}
+			
+			//-----------------------------------------
+			// Subforums..
+			//-----------------------------------------
+			
+			if ( ! $this->show_all )
+			{
+				$children = $forums->forums_get_children( $r['id'] );
+				
+				$sub       = array();
+				$subforums = "";
+				$count     = 0;
+				
+				if ( count($children) )
+				{
+					$r['name'] = "<a href='{$ibforums->base_url}&act=forum&f={$r['id']}'>".$r['name']."</a>";
+					
+					foreach ( $children as $cid )
+					{
+						$count++;
+						
+						$cfid = $cid;
+						
+						if ( $count == count($children) )
+						{
+							//-----------------------------------------
+							// Last subforum, link to parent
+							// forum...
+							//-----------------------------------------
+							
+							if ( ! $cfid = $children[ $count - 2 ] )
+							{
+								$cfid = $r['id'];
+							}
+						}
+						
+						$sub[] = "<a href='{$ibforums->base_url}&act=forum&f={$forums->forum_by_id[$cid]['parent_id']}'>".$forums->forum_by_id[$cid]['name']."</a>";
+					}
+				}
+				
+				if ( count( $sub ) )
+				{
+					$subforums = '<br /><br />Sub-forums: '.implode( ", ", $sub );
+				}
+				
+				$desc = "<div class='graytext'>{$r['description']}{$subforums}</div>";
+			}
+			else
+			{
+				$desc = "";
+			}
+			
+			return  $ibforums->adskin->add_td_row( array(
+														 "<center><input type='checkbox' name='add_{$r['id']}' value='1' /></center>",
+														 "<b>{$depth_guide}".$r['name']."</b>{$desc}",
+														 $these_mods
+											   )     );
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Forum - SHOW CAT(MEOW) (MEOW _ WOOF :&)
+	//-----------------------------------------
+	
+	function forum_show_cat($r, $show_buttons=1, $show_reorder=0)
+	{
+		global $ibforums, $std, $forums;
+		
+		if ( $this->type == 'manage' )
+		{
+			$this->printed++;
+			
+			$no_root = count( $forums->forum_cache['root'] );
+			
+			$reorder = "<select id='editbutton' name='f_{$r['id']}'>";
+			
+			for( $i = 1 ; $i <= $no_root ; $i++ )
+			{
+				$sel = "";
+				
+				if ( $this->printed == $i )
+				{
+					$sel =  'selected="selected" ';
+				}
+				
+				$reorder .= "\n<option value='$i'{$sel}>$i</option>";
+			}
+			
+			$reorder .= "</select>\n";
+			
+			if ( $show_buttons )
+			{
+				$html = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+						 <tr>
+						  <td align='left' width='40%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;' title='ID: {$r['id']}'>{$r['name']}</td>
+						  <td align='right' width='60%'>".
+						  $ibforums->adskin->js_make_button("New Forum"  , $ibforums->base_url."&act=forum&code=new&p={$r['id']}", 'realdarkbutton')."&nbsp;".
+						  $ibforums->adskin->js_make_button("Permissions", $ibforums->base_url."&act=forum&code=pedit&f={$r['id']}", 'realdarkbutton')."&nbsp;".
+						  $ibforums->adskin->js_make_button("Edit"       , $ibforums->base_url."&act=forum&code=edit&f={$r['id']}")."&nbsp;".
+						  $ibforums->adskin->js_make_button("Skin"       , $ibforums->base_url."&act=forum&code=skinedit&f={$r['id']}")."&nbsp;".
+						  $ibforums->adskin->js_make_button("Delete"     , $ibforums->base_url."&act=forum&code=delete&f={$r['id']}")."&nbsp;".
+						   $reorder .
+						  "&nbsp;&nbsp;</td>
+						 </tr>
+						 </table>";
+			}
+			else if ( $show_reorder )
+			{
+				$html = "<table cellpadding='0' cellspacing='0' border='0' width='100%'>
+						 <tr>
+						  <td align='left' width='40%' style='font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF;' title='ID: {$r['id']}'>{$r['name']}</td>
+						  <td align='right' width='60%'>".
+						  $ibforums->adskin->js_make_button("Re-order Children", $ibforums->base_url."&act=forum&code=reorder&f={$r['id']}&sub=1", 'realdarkbutton')."&nbsp;".
+						  "&nbsp;&nbsp;</td>
+						 </tr>
+						 </table>";
+			}
+			else
+			{
+				$html = $r['name'];
+			}
+			
+			$ibforums->html .= $ibforums->adskin->start_table($html);
+		}
+		else if ( $this->type == 'reorder' )
+		{
+			$ibforums->html .= $ibforums->adskin->start_table($r['name']);
+		}
+		else if ( $this->type == 'moderator' )
+		{
+			$ibforums->html .= $ibforums->adskin->start_table($r['name']);
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Forum - END CAT(MEOW) (MEOW _ WOOF MOO :&)
+	//-----------------------------------------
+	
+	function forum_end_cat($r=array())
+	{
+		global $ibforums, $std, $forums;
+		
+		if ( $this->type == 'manage' )
+		{
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		else if ( $this->type == 'reorder' )
+		{
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+		else if ( $this->type == 'moderator' )
+		{
+			$ibforums->html .= $ibforums->adskin->end_table();
+		}
+	}
+	
+	//-----------------------------------------
+	// LSIT PIST FORUMZ!!!!@@@!1!!1!
+	//-----------------------------------------
+	
+	function forums_list_forums()
+	{
+		global $ibforums, $DB,  $std, $forums;
+		
+		if ( $this->type == 'manage' )
+		{
+			foreach( $ibforums->cache['skin_id_cache'] as $id => $data )
+			{
+				$this->skins[ $id ] = $data['set_name'];
+			}
+		}
+		
+		$temp_html = "";
+		
+		$fid = intval( $ibforums->input['f'] );
+		
+		if ( $this->show_all )
+		{
+			foreach( $forums->forum_cache['root'] as $id => $forum_data )
+			{
+				$cat_data = $forum_data;
+				
+				$depth_guide = "";
+				
+				if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+				{
+					foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+					{
+						if ( $ibforums->vars['forum_cache_minimum'] )
+						{
+							$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
+							$this->need_desc[] = $forum_data['id'];
+						}
+				
+						$temp_html .= $this->render_forum($forum_data, $depth_guide);
+						
+						$temp_html = $this->forum_build_children( $forum_data['id'], $temp_html, '<span style="color:gray">&#0124;</span>'.$depth_guide . $forums->depth_guide );
+					}
+				}
+				
+				
+				$this->forum_show_cat($cat_data);
+				$ibforums->html .= $temp_html;
+				$this->forum_end_cat($cat_data);
+				
+				unset($temp_html);
+			}
+		}
+		else if ( ! $fid )
+		{
+			foreach( $forums->forum_cache[ 'root' ] as $id => $forum_data )
+			{
+				$cat_data = $forum_data;
+				
+				$depth_guide = "";
+				
+				if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+				{
+					foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+					{
+						if ( $ibforums->vars['forum_cache_minimum'] )
+						{
+							$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
+							$this->need_desc[] = $forum_data['id'];
+						}
+				
+						$temp_html .= $this->render_forum($forum_data, $depth_guide);
+						
+						//$temp_html = $this->forum_build_children( $forum_data['id'], $temp_html, '<span style="color:gray">&#0124;</span>'.$depth_guide . $forums->depth_guide );
+					}
+				}
+				
+				$this->forum_show_cat($cat_data);
+				$ibforums->html .= $temp_html;
+				$this->forum_end_cat($cat_data);
+				
+				
+				unset($temp_html);
+			}
+		}
+		else
+		{
+			//foreach( $forums->forum_cache[ $fid ] as $id => $forum_data )
+			//{
+				$cat_data = $forum_data;
+				
+				$depth_guide = "";
+				
+				if ( is_array( $forums->forum_cache[ $fid ] ) )
+				{
+					$cat_data = $forums->forum_by_id[ $fid ];
+				
+					$depth_guide = "";
+					
+					foreach( $forums->forum_cache[ $fid ] as $id => $forum_data )
+					{
+						if ( $ibforums->vars['forum_cache_minimum'] )
+						{
+							$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
+							$this->need_desc[] = $forum_data['id'];
+						}
+				
+						$temp_html .= $this->render_forum($forum_data, $depth_guide);
+						
+						//$temp_html = $this->forum_build_children( $forum_data['id'], $temp_html, '<span style="color:gray">&#0124;</span>'.$depth_guide . $forums->depth_guide );
+					}
+				}
+				
+				
+				$this->forum_show_cat($forums->forum_by_id[ $fid ], 0, 1 );
+				$ibforums->html .= $temp_html;
+				$this->forum_end_cat($forums->forum_by_id[ $fid ]);
+				
+				
+				unset($temp_html);
+			//}
+		}
+		
+		//-----------------------------------------
+        // Get descriptions?
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['forum_cache_minimum'] and count($this->need_desc) )
+        {
+        	$DB->simple_construct( array( 'select' => 'id,description', 'from' => 'forums', 'where' => 'id IN('.implode( ',', $this->need_desc ) .')' ) );
+        	$DB->simple_exec();
+        	
+        	while( $r = $DB->fetch_row() )
+        	{
+        		$ibforums->html = str_replace( "<!--DESCRIPTION:{$r['id']}-->", $r['description'], $ibforums->html );
+        	}
+        }
+	}
+	
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// forum jumpee
+	// ------------------
+	// Builds the forum jumpee dunnit
+	/*-------------------------------------------------------------------------*/
+	
+	function ad_forums_forum_list($restrict=0)
+	{
+		global $ibforums, $forums;
+		
+		if ( $restrict != 1 )
+		{	
+			$jump_array[] = array( '-1', 'Make Root (Category)' );
+		}
+		else
+		{
+			$jump_array = array();
+		}
+		
+		foreach( $forums->forum_cache['root'] as $id => $forum_data )
+		{
+			$jump_array[] = array( $forum_data['id'], $forum_data['name'] );
+			
+			$depth_guide = $forums->depth_guide;
+			
+			if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+			{
+				foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+				{
+					$jump_array[] = array( $forum_data['id'], $depth_guide.$forum_data['name'] );
+					
+					$jump_array = $this->forums_forum_list_internal( $forum_data['id'], $jump_array, $depth_guide . $forums->depth_guide );
+				}
+			}
+		}
+		
+		return $jump_array;
+	}
+	
+	function forums_forum_list_internal($root_id, $jump_array=array(), $depth_guide="")
+	{
+		global $ibforums, $forums;
+		
+		if ( is_array( $forums->forum_cache[ $root_id ] ) )
+		{
+			foreach( $forums->forum_cache[ $root_id ] as $id => $forum_data )
+			{
+				$jump_array[] = array( $forum_data['id'], $depth_guide.$forum_data['name'] );
+				
+				$jump_array = $this->forums_forum_list_internal( $forum_data['id'], $jump_array, $depth_guide . $forums->depth_guide );
+			}
+		}
+		
+		
+		return $jump_array;
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// forum return data
+	// ------------------
+	// Returns forum data
+	/*-------------------------------------------------------------------------*/
+	
+	function ad_forums_forum_data()
+	{
+		global $ibforums, $forums;
+		
+		foreach( $forums->forum_cache['root'] as $id => $forum_data )
+		{
+			$forum_data['depthed_name'] = $forum_data['name'];
+			$forum_data['root_forum']   = 1;
+			
+			$jump_array[ $forum_data['id'] ] = $forum_data;
+			
+			$depth_guide = $forums->depth_guide;
+			
+			if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+			{
+				foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+				{
+					$forum_data['depthed_name'] = $depth_guide.$forum_data['name'];
+					
+					$jump_array[ $forum_data['id'] ] = $forum_data;
+					
+					$jump_array = $this->forums_forum_data_internal( $forum_data['id'], $jump_array, $depth_guide . $forums->depth_guide );
+				}
+			}
+		}
+		
+		return $jump_array;
+	}
+	
+	function forums_forum_data_internal($root_id, $jump_array=array(), $depth_guide="")
+	{
+		global $ibforums, $forums;
+		
+		if ( is_array( $forums->forum_cache[ $root_id ] ) )
+		{
+			foreach( $forums->forum_cache[ $root_id ] as $id => $forum_data )
+			{
+				$forum_data['depthed_name'] = $depth_guide.$forum_data['name'];
+					
+				$jump_array[ $forum_data['id'] ] = $forum_data;
+				
+				$jump_array = $this->forums_forum_data_internal( $forum_data['id'], $jump_array, $depth_guide . $forums->depth_guide );
+			}
+		}
+		
+		
+		return $jump_array;
+	}
+	
+
+	
+	
+}
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/admin_functions.php b/upload/sources/admin/admin_functions.php
new file mode 100644
index 00000000..fc0fcd11
--- /dev/null
+++ b/upload/sources/admin/admin_functions.php
@@ -0,0 +1,1176 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin functions library
+|   > Script written by Matt Mecham
+|   > Date started: 1st march 2002
+|
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+class admin_functions {
+
+	var $img_url;
+	var $page_title  = "Welcome to the Invision Power Board Administration CP";
+	var $page_detail = "You can set up and customize your board from within this control panel.<br><br>Clicking on one of the links in the left menu pane will show you the relevant options for that administration category. Each option will contain further information on configuration, etc.";
+	var $html;
+	var $errors = "";
+	var $nav    = array();
+	var $time_offset = 0;
+	var $jump_menu = "";
+	var $no_jump = 0;
+	var $master_skin = array();
+	var $depth_guide = '--';
+	var $menu_ids    = array();
+	function admin_functions()
+	{
+		global $ibforums;
+		
+		$this->base_url = $ibforums->base_url;
+		$this->img_url  = $ibforums->skin_url;
+	}
+	
+	//-----------------------------------------
+	// Get mysql version
+	//-----------------------------------------
+	
+	function get_mysql_version()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get the mySQL version.
+		// Adapted from phpMyAdmin
+		//-----------------------------------------
+		
+		$DB->sql_get_version();
+		
+		$ibforums->true_version  = $DB->true_version;
+		$ibforums->mysql_version = $DB->mysql_version;
+	}
+	
+	//-----------------------------------------
+	// Get mysql version
+	//-----------------------------------------
+	
+	function get_fulltextindex_status()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $DB->sql_is_currently_fulltext( 'posts' ) == TRUE )
+		{
+			return 1;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// make template / text data safe for forms
+	/*-------------------------------------------------------------------------*/
+	
+	function text_to_form($t="")
+	{
+		// Use forward look up to only convert & not &#123;
+		//$t = preg_replace("/&(?!#[0-9]+;)/s", '&#38;', $t );
+		
+		$t = str_replace("&", "&#38;"    , $t );
+		$t = str_replace( "<" , "&#60;"  , $t );
+		$t = str_replace( ">" , "&#62;"  , $t );
+		$t = str_replace( '"' , "&#34;"  , $t );
+		$t = str_replace( "'" , '&#039;' , $t );
+		$t = str_replace( "\\", "&#092;" , $t );
+		
+		return $t; // A nice cup of?
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Converts form data back into raw text
+	/*-------------------------------------------------------------------------*/
+	
+	function form_to_text($t="")
+	{
+		$t = str_replace( '\\'  , '\\\\', $t );
+		$t = str_replace( "&#38;"  , "&", $t );
+		$t = str_replace( "&#60;"  , "<", $t );
+		$t = str_replace( "&#62;"  , ">", $t );
+		$t = str_replace( "&#34;"  , '"', $t );
+		$t = str_replace( "&#039;" , "'", $t );
+		$t = str_replace( '&#092;' ,'\\', $t );
+		
+		return $t;
+	}
+	
+	//-----------------------------------------
+	// Generate skin list
+	//-----------------------------------------
+	
+	function skin_get_skin_dropdown()
+	{
+		global $ibforums;
+		
+		$skin_array  = array();
+		
+		foreach( $ibforums->cache['skin_id_cache'] as $id => $data )
+		{
+			if ( $data['set_parent'] < 1 and $id > 1 )
+			{
+				 $data['set_parent'] = 'root';
+			}
+			
+			$this->master_skin[ $data['set_parent'] ][ $id ] = $data;
+		}
+		
+		foreach( $this->master_skin['root'] as $id => $data )
+		{
+			$skin_array[] = array( $id, $data['set_name'] );
+			
+			if ( is_array( $this->master_skin[ $id ] ) )
+			{
+				foreach( $this->master_skin[ $id ] as $id => $data )
+				{
+					$skin_array[] = array( $id, $this->depth_guide.$data['set_name'] );
+					
+					$skin_array = $this->skin_get_skin_dropdown_recurse( $id, $skin_array, $this->depth_guide.$this->depth_guide );
+				}
+			}
+		}
+		
+		return $skin_array;
+	}
+	
+	function skin_get_skin_dropdown_recurse( $root_id, $skin_array=array(), $depth_guide='' )
+	{
+		global $ibforums;
+		
+		if ( is_array( $this->master_skin[ $root_id ] ) )
+		{
+			foreach( $this->master_skin[ $root_id ] as $id => $data )
+			{
+				$skin_array[] = array( $id, $this->depth_guide.$data['set_name'] );
+				
+				$skin_array = $this->skin_get_skin_dropdown_recurse( $id, $skin_array, $this->depth_guide.$this->depth_guide );
+			}
+		}
+		
+		return $skin_array;
+	}
+		
+		
+	//-----------------------------------------
+	// IMPORT FUNCTION
+	//-----------------------------------------
+	
+	function import_xml( $infilename )
+	{
+		global $ibforums, $DB,  $std;
+		
+		//-----------------------------------------
+		// Upload
+		//-----------------------------------------
+		
+		$FILE_NAME = $_FILES['FILE_UPLOAD']['name'];
+		$FILE_SIZE = $_FILES['FILE_UPLOAD']['size'];
+		$FILE_TYPE = $_FILES['FILE_UPLOAD']['type'];
+		
+		//-----------------------------------------
+		// Naughty Opera adds the filename on the end of the
+		// mime type - we don't want this.
+		//-----------------------------------------
+		
+		$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
+		
+		//-----------------------------------------					
+		// Naughty Mozilla likes to use "none" to indicate an empty upload field.
+		// I love universal languages that aren't universal.
+		//-----------------------------------------
+		
+		if ( $_FILES['FILE_UPLOAD']['name'] == "" or ! $_FILES['FILE_UPLOAD']['name'] or ($_FILES['FILE_UPLOAD']['name'] == "none") )
+		{
+			continue;
+		}
+		
+		$content = "";
+		
+		if ( strstr( $FILE_NAME, $infilename ) )
+		{
+			if ( move_uploaded_file( $_FILES[ 'FILE_UPLOAD' ]['tmp_name'], ROOT_PATH."uploads/".$FILE_NAME) )
+			{
+				if ( $FILE_NAME == $infilename.'.gz' )
+				{
+					if ( $FH = @gzopen( ROOT_PATH."uploads/".$FILE_NAME, 'rb' ) )
+					{
+					 	while ( ! @gzeof( $FH ) )
+					 	{
+					 		$content .= @gzread( $FH, 1024 );
+					 	}
+					 	
+						@gzclose( $FH );
+					}
+				}
+				else if ( $FILE_NAME == $infilename )
+				{
+					if ( $FH = @fopen( ROOT_PATH."uploads/".$FILE_NAME, 'rb' ) )
+					{
+						$content = @fread( $FH, filesize(ROOT_PATH."uploads/".$FILE_NAME) );
+						@fclose( $FH );
+					}
+				}
+				
+				@unlink( ROOT_PATH."uploads/".$FILE_NAME );
+			}
+		}
+		
+		return $content;
+	}
+	
+	//-----------------------------------------
+	// Shows dialogue download box
+	//-----------------------------------------
+	
+	function show_download( $data, $name, $type="unknown/unknown", $compress=1 )
+	{
+		//@flush();
+		
+		if ( $compress and @function_exists('gzencode') )
+		{
+			$name .= '.gz';
+			//$type = 'application/x-gzip';
+		}
+		else
+		{
+			$compress = 0;
+		}
+		
+		header('Content-Type: '.$type);
+		header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+		header('Content-Disposition: attachment; filename="' . $name . '"');
+		
+		if ( ! $compress )
+		{
+			@header('Content-Length: ' . strlen($data) );
+		}
+		
+		@header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		@header('Pragma: public');
+		
+		if ( $compress )
+		{
+			print gzencode($data);
+		}
+		else
+		{
+			print $data;
+		}
+		
+		exit();
+	}
+	
+	//-----------------------------------------
+	// Makes good raw form text
+	//-----------------------------------------
+	
+	function make_safe($t)
+	{
+		$t = stripslashes($t);
+		
+		$t = preg_replace( "/\\\/", "&#092;", $t );
+		
+		return $t;
+	}
+	
+	//-----------------------------------------
+	// Sets up time offset for ACP use
+	//-----------------------------------------
+	
+	
+	function get_date($date="", $method="")
+	{
+		global $ibforums, $DB, $std;
+		
+		$this->time_options = array( 'JOINED' => $ibforums->vars['clock_joined'],
+									 'SHORT'  => $ibforums->vars['clock_short'],
+									 'LONG'   => $ibforums->vars['clock_long']
+								   );
+								   
+		if (!$date)
+        {
+            return '--';
+        }
+        
+        if (empty($method))
+        {
+        	$method = 'LONG';
+        }
+        
+        $this->time_offset = (($ibforums->member['time_offset'] != "") ? $ibforums->member['time_offset'] : $ibforums->vars['time_offset']) * 3600;
+			
+		if ($ibforums->vars['time_adjust'] != "" and $ibforums->vars['time_adjust'] != 0)
+		{
+			$this->time_offset += ($ibforums->vars['time_adjust'] * 60);
+		}
+		
+		if ($ibforums->member['dst_in_use'])
+		{
+			$this->time_offset += 3600;
+		}
+        
+        return gmdate($this->time_options[$method], ($date + $this->time_offset) );
+		
+		
+		
+	}
+	
+	//**********************************************/
+	// save_log
+	//
+	// Add an entry into the admin logs, yeah.
+	//**********************************************/
+	
+	function save_log($action="")
+	{
+		global $ibforums, $DB;
+		
+		$DB->do_insert( 'admin_logs', array(
+											'act'        => $ibforums->input['act'],
+											'code'       => $ibforums->input['code'],
+											'member_id'  => $ibforums->member['id'],
+											'ctime'      => time(),
+											'note'       => $action,
+											'ip_address' => $ibforums->input['IP_ADDRESS'],
+								  )       );
+		
+		return true;  // to anyone that cares..
+		
+	}
+	
+	
+	//**********************************************/
+	// get_tar_names
+	//
+	// Simply returns a list of tarballs that start
+	// with the given filename
+	//**********************************************/
+	
+	function get_tar_names($start='lang-')
+	{
+		global $ibforums;
+		
+		// Remove trailing slashes..
+		
+		$files = array();
+		
+		$dir = $ibforums->vars['base_dir']."archive_in";
+			
+		if ( is_dir($dir) )
+		{
+			$handle = opendir($dir);
+			
+			while (($filename = readdir($handle)) !== false)
+			{
+				if (($filename != ".") && ($filename != ".."))
+				{
+					if (preg_match("/^$start.+?\.tar$/", $filename))
+					{
+						$files[] = $filename;
+					}
+				}
+			}
+			
+			closedir($handle);
+			
+		}
+		
+		return $files;
+			
+	}
+	
+	//**********************************************/
+	// copy_dir
+	//
+	// Copies to contents of a dir to a new dir, creating
+	// destination dir if needed.
+	//
+	//**********************************************/
+	
+	function copy_dir($from_path, $to_path, $mode = 0777)
+	{
+		global $ibforums;
+		
+		// Strip off trailing slashes...
+		
+		$from_path = preg_replace( "#/$#", "", $from_path);
+		$to_path   = preg_replace( "#/$#", "", $to_path);
+	
+		if ( ! is_dir($from_path) )
+		{
+			$this->errors = "Could not locate directory '$from_path'";
+			return FALSE;
+		}
+	
+		if ( ! is_dir($to_path) )
+		{
+			if ( ! @mkdir($to_path, $mode) )
+			{
+				$this->errors = "Could not create directory '$to_path' please check the CHMOD permissions and re-try";
+				return FALSE;
+			}
+			else
+			{
+				@chmod($to_path, $mode);
+			}
+		}
+		
+		//$this_path = getcwd();
+		
+		if (is_dir($from_path))
+		{
+			//chdir($from_path);
+			
+			$handle = opendir($from_path);
+			
+			while (($file = readdir($handle)) !== false)
+			{
+				if (($file != ".") && ($file != ".."))
+				{
+					if ( is_dir( $from_path."/".$file ) )
+					{
+						$this->copy_dir($from_path."/".$file, $to_path."/".$file);
+						//chdir($from_path);
+					}
+					
+					if ( is_file( $from_path."/".$file ) )
+					{
+						copy($from_path."/".$file, $to_path."/".$file);
+						@chmod($to_path."/".$file, 0777);
+					} 
+				}
+			}
+			closedir($handle); 
+		}
+		
+		if ($this->errors == "")
+		{
+			return TRUE;
+		}
+	}
+	
+	//**********************************************/
+	// rm_dir
+	//
+	// Removes directories, if non empty, removes
+	// content and directories
+	// (Code based on annotations from the php.net
+	// manual by pal@degerstrom.com)
+	//**********************************************/
+	
+	function rm_dir($file)
+	{
+		global $ibforums;
+		
+		$errors = 0;
+		
+		// Remove trailing slashes..
+		
+		$file = preg_replace( "#/$#", "", $file );
+		
+		if ( file_exists($file) )
+		{
+			// Attempt CHMOD
+			
+			@chmod($file, 0777);
+			
+			if ( is_dir($file) )
+			{
+				$handle = opendir($file);
+				
+				while (($filename = readdir($handle)) !== false)
+				{
+					if (($filename != ".") && ($filename != ".."))
+					{
+						$this->rm_dir($file."/".$filename);
+					}
+				}
+				
+				closedir($handle);
+				
+				if ( ! @rmdir($file) )
+				{
+					$errors++;
+				}
+			}
+			else
+			{
+				if ( ! @unlink($file) )
+				{
+					$errors++;
+				}
+			}
+		}
+		
+		if ($errors == 0)
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	//**********************************************/
+	// rebuild_config:
+	//
+	// Er, rebuilds the config file
+	//
+	//**********************************************/
+	
+	function rebuild_config( $new = "" )
+	{
+		global $ibforums, $std, $ADMIN, $root_path;
+		
+		//-----------------------------------------
+		// Check to make sure this is a valid array
+		//-----------------------------------------
+		
+		if (! is_array($new) )
+		{
+			$ibforums->admin->error("Error whilst attempting to rebuild the board config file, attempt aborted");
+		}
+		
+		//-----------------------------------------
+		// Do we have anything to save out?
+		//-----------------------------------------
+		
+		if ( count($new) < 1 )
+		{
+			return "";
+		}
+		
+		//-----------------------------------------
+		// Get an up to date copy of the config file
+		// (Imports $INFO)
+		//-----------------------------------------
+		
+		require ROOT_PATH.'conf_global.php';
+		
+		//-----------------------------------------
+		// Rebuild the $INFO hash
+		//-----------------------------------------
+		
+		foreach( $new as $k => $v )
+		{
+			// Update the old...
+			
+			$v = preg_replace( "/'/", "\\'" , $v );
+			$v = preg_replace( "/\r/", ""   , $v );
+			
+			$ibforums->vars[ $k ] = $v;
+		}	
+		
+		//-----------------------------------------
+		// Rename the old config file
+		//-----------------------------------------
+		
+		@rename( ROOT_PATH.'conf_global.php', ROOT_PATH.'conf_global-bak.php' );
+		@chmod( ROOT_PATH.'conf_global-bak.php', 0777);
+		
+		//-----------------------------------------
+		// Rebuild the old file
+		//-----------------------------------------
+		
+		ksort($ibforums->vars);
+		
+		$file_string = "<?php\n";
+		
+		foreach( $ibforums->vars as $k => $v )
+		{
+			if ($k == 'skin' or $k == 'languages')
+			{
+				// Protect serailized arrays..
+				$v = stripslashes($v);
+				$v = addslashes($v);
+			}
+			
+			$file_string .= '$INFO['."'".$k."'".']'."\t\t\t=\t'".$v."';\n";
+		}
+		
+		$file_string .= "\n".'?'.'>';   // Question mark + greater than together break syntax hi-lighting in BBEdit 6 :p
+		
+		if ( $fh = fopen( ROOT_PATH.'conf_global.php', 'w' ) )
+		{
+			fwrite($fh, $file_string, strlen($file_string) );
+			fclose($fh);
+		}
+		else
+		{
+			$ibforums->admin->error("Fatal Error: Could not open conf_global for writing - no changes applied. Try changing the CHMOD to 0777");
+		}
+		
+		// Pass back the new $INFO array to anyone who cares...
+		
+		return $ibforums->vars;
+		
+	}
+	
+	//**********************************************/
+	// compile_forum_perms:
+	//
+	// Returns the READ/REPLY/START DB strings
+	//
+	//**********************************************/
+	
+	
+	function compile_forum_perms()
+	{
+		global $DB, $ibforums;
+		
+		$r_array = array( 'READ' => '', 'REPLY' => '', 'START' => '', 'UPLOAD' => '' );
+		
+		if ($ibforums->input['READ_ALL'] == 1)
+		{
+			$r_array['READ'] = '*';
+		}
+		
+		if ($ibforums->input['REPLY_ALL'] == 1)
+		{
+			$r_array['REPLY'] = '*';
+		}
+		
+		if ($ibforums->input['START_ALL'] == 1)
+		{
+			$r_array['START'] = '*';
+		}
+		
+		if ($ibforums->input['UPLOAD_ALL'] == 1)
+		{
+			$r_array['UPLOAD'] = '*';
+		}
+		
+		if ($ibforums->input['SHOW_ALL'] == 1)
+		{
+			$r_array['SHOW'] = '*';
+		}
+		
+		$DB->simple_construct( array( 'select' => 'perm_id, perm_name', 'from' => 'forum_perms', 'order' => "perm_id" ) );
+		$DB->simple_exec();
+		
+		while ( $data = $DB->fetch_row() )
+		{
+			if ($r_array['SHOW'] != '*')
+			{
+				if ($ibforums->input[ 'SHOW_'.$data['perm_id'] ] == 1)
+				{
+					$r_array['SHOW'] .= $data['perm_id'].",";
+				}
+			}
+			//-----------------------------------------
+			if ($r_array['READ'] != '*')
+			{
+				if ($ibforums->input[ 'READ_'.$data['perm_id'] ] == 1)
+				{
+					$r_array['READ'] .= $data['perm_id'].",";
+				}
+			}
+			//-----------------------------------------
+			if ($r_array['REPLY'] != '*')
+			{
+				if ($ibforums->input[ 'REPLY_'.$data['perm_id'] ] == 1)
+				{
+					$r_array['REPLY'] .= $data['perm_id'].",";
+				}
+			}
+			//-----------------------------------------
+			if ($r_array['START'] != '*')
+			{
+				if ($ibforums->input[ 'START_'.$data['perm_id'] ] == 1)
+				{
+					$r_array['START'] .= $data['perm_id'].",";
+				}
+			}
+			//-----------------------------------------
+			if ($r_array['UPLOAD'] != '*')
+			{
+				if ($ibforums->input[ 'UPLOAD_'.$data['perm_id'] ] == 1)
+				{
+					$r_array['UPLOAD'] .= $data['perm_id'].",";
+				}
+			}
+		}
+		
+		$r_array['START']   = preg_replace( "/,$/", "", $r_array['START']   );
+		$r_array['REPLY']   = preg_replace( "/,$/", "", $r_array['REPLY']   );
+		$r_array['READ']    = preg_replace( "/,$/", "", $r_array['READ']    );
+		$r_array['UPLOAD']  = preg_replace( "/,$/", "", $r_array['UPLOAD']  );
+		$r_array['SHOW']    = preg_replace( "/,$/", "", $r_array['SHOW']    );
+		
+		return $r_array;
+		
+	}
+	
+	
+	//-----------------------------------------
+	//------------------------------------------------
+	// OUTPUT FUNCTIONS
+	//-----------------------------------------
+	//------------------------------------------------
+	
+	function print_popup()
+	{
+		global $ibforums, $DB, $std, $use_gzip;
+	
+		$html = "<html>
+		          <head><title>IPB</title>
+		          <meta HTTP-EQUIV=\"Pragma\"  CONTENT=\"no-cache\">
+				  <meta HTTP-EQUIV=\"Cache-Control\" CONTENT=\"no-cache\">
+				  <meta HTTP-EQUIV=\"Expires\" CONTENT=\"Mon, 06 May 1996 04:57:00 GMT\">
+		          <link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$ibforums->skin_url}/acp_css.css\" />
+		          <script type=\"text/javascript\">
+				  <!--
+				   var ipb_var_st       = \"{$ibforums->input['st']}\";
+				   var ipb_lang_tpl_q1  = \"{$ibforums->lang['tpl_q1']}\";
+				   var ipb_var_phpext   = \"{$ibforums->vars['php_ext']}\";
+				   var ipb_var_base_url = \"{$ibforums->base_url}\";
+				   var ipb_var_cookieid = \"{$ibforums->vars['cookie_id']}\";
+				   //-->
+				  </script>
+				  <script type=\"text/javascript\" src='jscripts/ipb_global.js'></script>
+				  <script type=\"text/javascript\" src='{$ibforums->skin_url}/acp_js.js'></script>
+				  </head>
+				  <body>
+				  ";
+						 
+		$html .= $ibforums->html;
+		
+		$html .= "</body></html>";
+		
+		print $html;
+		
+		exit();
+	}
+					   
+		
+	//-----------------------------------------
+	// OUTPUT
+	//-----------------------------------------
+	
+	function output()
+	{
+		global $ibforums, $DB, $std, $use_gzip;
+	
+		$html  = $ibforums->adskin->print_top($this->page_title, $this->page_detail);
+		$html .= $ibforums->html;
+		$html .= $ibforums->adskin->print_foot();
+		
+		$DB->close_db();
+		
+		$navigation = array( "<a href='{$this->base_url}&act=index' target='body'>ACP Home</a>" );
+		
+		if ( count($this->nav) > 0 )
+		{
+			foreach ( $this->nav as $idx => $links )
+			{
+				if ($links[0] != "")
+				{
+					$navigation[] = "<a href='{$this->base_url}&{$links[0]}' target='body'>{$links[1]}</a>";
+				}
+				else
+				{
+					$navigation[] = $links[1];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Navigation?
+		//-----------------------------------------
+		
+		if ( count($navigation) > 0 )
+		{
+			$html = str_replace( "<!--NAV-->", $ibforums->adskin->wrap_nav( implode( " / ", $navigation ) ), $html );
+		}
+		
+		//-----------------------------------------
+		// Quick Jump?
+		//-----------------------------------------
+		
+		if ( $this->no_jump != 1 )
+		{
+			$html = str_replace( "<!--JUMP-->", $this->build_jump_menu(), $html );
+		}
+		
+		//-----------------------------------------
+		// Message in a bottle?
+		//-----------------------------------------
+		
+		if ( $ibforums->main_msg )
+		{
+			$message = "<br />
+			            <div class='tableborder'>
+			             <div class='pformstrip'>IPB Message</div>
+			             <div class='tablepad' style='font-size:11px'>{$ibforums->main_msg}</div>
+			            </div>";
+			            
+			$html = str_replace( "<!--IPB.MESSAGE-->", $message, $html );
+		}
+		
+		//-----------------------------------------
+		// Error message?
+		//-----------------------------------------
+		
+		if ( $ibforums->main_error )
+		{
+			$error = "<br />
+					 <div class='tableborder'>
+					  <div class='pformstrip'>IPB ERROR</div>
+					  <div class='tablepad' style='font-size:11px'>{$ibforums->main_msg}</div>
+					 </div>";
+			$html = str_replace( "<!--IPB.ERROR-->", $error, $html );
+		}
+		
+		if ($use_gzip == 1)
+		{
+        	$buffer = ob_get_contents();
+        	ob_end_clean();
+        	@ob_start('ob_gzhandler');
+        	print $buffer;
+    	}
+    	
+    	//@header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		//@header("Cache-Control: no-cache, must-revalidate");
+		//@header("Pragma: no-cache");
+		
+		if ( IN_DEV and count( $DB->obj['cached_queries']) )
+		{
+			$queries = "";
+			
+			foreach( $DB->obj['cached_queries'] as $q )
+			{
+				if ( strlen($q) > 300 )
+				{
+					$q = substr( $q, 0, 300 ).'...';
+				}
+				
+				$queries .= htmlspecialchars($q).'<hr />';
+			}
+			
+			$html .= "<br /><div class='tableborder'><div class='pformstrip'>Queries</div>
+							<div class='tdrow1' style='padding:6px'>$queries</div></div>";
+		}
+		
+				
+    	print $html;
+    	
+    	exit();
+	
+	}
+	
+	//**********************************************/
+	// Redirect:
+	//
+	// Shows a redirect screen
+	//
+	//**********************************************/
+	
+	function redirect($url, $text, $is_popup=0, $time=2)
+	{
+		global $ibforums, $DB, $std;
+		
+		$extra = "";
+		
+		if ( $ibforums->main_msg )
+		{
+			$extra = '&messageinabottleacp='.urlencode( $ibforums->main_msg );
+		}
+		
+		$ibforums->main_msg = "";
+		
+		$this->page_title  = "Admin CP Redirection";
+		$this->page_detail = "<em>Redirecting...</em>";
+		
+		$ibforums->html .= "<meta http-equiv='refresh' content=\"{$time}; url={$ibforums->base_url}&{$url}{$extra}\">
+						    <div class='tableborder'>
+							<div class='maintitle'>Redirecting</div>
+							<div class='tdrow1' style='padding:8px'>
+							 <div style='font-size:12px'>$text
+							 <br />
+							 <br />
+							 <center><a href='{$ibforums->base_url}&{$url}'>Click here if not redirected...</a></center>
+							 </div>
+							</div>
+						   </div>";
+		
+		if ($is_popup == 0)
+		{
+			$this->output();
+		}
+		else
+		{
+			$this->print_popup();
+		}
+	}
+	
+	//**********************************************/
+	// Error:
+	//
+	// Displays an error
+	//
+	//**********************************************/
+	
+	function error($error="", $is_popup=0)
+	{
+		global $ibforums, $DB, $std;
+		
+		$this->page_title  = "Admin CP Message";
+		$this->page_detail = "&nbsp;";
+		
+		$ibforums->html .= "<div class='tableborder'>
+							<div class='maintitle'>Admin CP Message</div>
+							<div class='tdrow1' style='padding:8px'>
+							 <span style='font-size:12px'>$error</span>
+							</div>
+						   </div>";
+		
+		if ($is_popup == 0)
+		{
+			$this->output();
+		}
+		else
+		{
+			$this->print_popup();
+		}
+	}
+	
+	//**********************************************/
+	// Done Screen:
+	//
+	// Displays the "done" screen. Really? Yes.
+	//
+	//**********************************************/
+	
+	function done_screen($title, $link_text="", $link_url="", $redirect="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $redirect )
+		{
+			$this->redirect( $link_url, "<b>$title</b><br />Redirecting to: ".$link_text );
+		}
+		
+		$this->page_title  = $title;
+		$this->page_detail = "The action was executed successfully";
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table("Result");
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$this->base_url}&{$link_url}' target='body'>Go to: $link_text</a>", "center" );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$this->base_url}&act=index' target='body'>Go to: Administration Home</a>", "center" );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+			
+		$this->output();
+	
+	}
+	
+	function info_screen($text="", $title='Safe Mode Restriction Warning')
+	{
+		global $ibforums, $DB, $std;
+		
+		$this->page_title  = $title;
+		$this->page_detail = "Please note the following:";
+		
+		$ibforums->adskin->td_header[] = array( "&nbsp;"  , "100%" );
+		
+		$ibforums->html .= $ibforums->adskin->start_table("Result");
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( $text );
+		
+		$ibforums->html .= $ibforums->adskin->add_td_basic( "<a href='{$this->base_url}&act=index' target='body'>Go to: Administration Home</a>", "center" );
+										 
+		$ibforums->html .= $ibforums->adskin->end_table();
+			
+		$this->output();
+	
+	}
+	
+	
+	//**********************************************/
+	// MENU:
+	//
+	// Build the collapsable menu trees
+	//
+	//**********************************************/
+	
+	function menu()
+	{
+		global $ibforums, $std, $PAGES, $CATS;
+		
+		$links = $this->build_tree();
+		
+		$html = $ibforums->adskin->menu_top() . $links . $ibforums->adskin->menu_foot();
+		
+		$html = str_replace( '<!--{IDS}-->', implode( ',', $this->menu_ids ), $html );
+		
+		// Saving cookie?
+		
+		if ( $ibforums->vars['menu'] )
+		{
+			$std->my_setcookie( 'acpmenu', $ibforums->input['show'] );
+		}
+		
+		print $html;
+		exit();
+
+		
+	}
+	
+	//-----------------------------------------
+	
+	function build_tree()
+	{
+		global $ibforums, $std, $PAGES, $CATS, $DESC;
+		
+		$html  = "";
+		$links = "";
+		
+		$collapsed_ids = ",".$std->my_getcookie('acpcollapseprefs').",";
+		
+		foreach($CATS as $cid => $data)
+		{
+			$name  = $data[0];
+			$color = $data[1];
+			$extra = $data[2];
+			
+			$this->menu_ids[] = $cid;
+			
+			$show['div_fc'] = 'show';
+			$show['div_fo'] = 'none';
+		
+			$ibforums->admin->jump_menu .= "<optgroup label='$name'>\n";
+			
+			if ( strstr( $collapsed_ids, ','.$cid.',' ) )
+			{
+				$show['div_fc'] = 'none';
+				$show['div_fo'] = 'show';
+			}
+			
+			foreach($PAGES[ $cid ] as $pid => $pdata)
+			{
+				if ( $pdata[2] != "" )
+				{
+					if ( ! @is_dir( ROOT_PATH.$pdata[2] ) )
+					{
+						continue;
+					}
+				}
+				
+				$links .= $ibforums->adskin->menu_cat_link($pid, $cid, $pdata[1], $pdata[0], $pdata[3], $pdata[4]);
+			}
+			  
+			$html .= $ibforums->adskin->menu_cat_wrap( $show, $name, $links, $cid, $DESC[$cid], $color, $extra );
+			
+			unset($links);
+			
+			$ibforums->admin->jump_menu .= "</optgroup>\n";
+		}
+		
+		return $html;
+	}
+	
+	//-----------------------------------------
+	// BUILDS JUMP MENU, yay!
+	//-----------------------------------------
+	
+	function build_jump_menu()
+	{
+		global $ibforums, $std, $PAGES, $CATS, $DESC;
+		
+		$html = "<script type='text/javascript'>
+				 function dojump()
+				 {
+				 	if ( document.jumpmenu.val.options[document.jumpmenu.val.selectedIndex].value != '' )
+				 	{
+				 		window.location.href = '{$this->base_url}' + '&' + document.jumpmenu.val.options[document.jumpmenu.val.selectedIndex].value;
+				 	}
+				 }
+				 </script>
+				 ";
+		
+		$html .= "<form name='jumpmenu'>\n<select class='jmenu' name='val'>";
+		
+		foreach($CATS as $cid => $name)
+		{
+			$html .= "<optgroup label='$name[0]'>\n";
+			
+			foreach($PAGES[ $cid ] as $pid => $pdata)
+			{
+				$html .= "<option value='$pdata[1]'>$pdata[0]</option>\n";
+			}
+			
+			$html .= "</optgroup>\n";
+		}
+		
+		$html .= "</select>&nbsp;<input type='button' class='jmenubutton' value='Go!' onclick='dojump();' />\n</form>";
+		
+		return $html;
+		
+	}
+	
+	//-----------------------------------------
+	// BUILD SKIN JUMP MENU
+	//-----------------------------------------
+	
+	function skin_jump_menu($set_id="")
+	{
+		global $ibforums, $DB;
+		
+		if ( $set_id == "" )
+		{
+			$set_id = $ibforums->input['id'];
+		}
+		
+		$set_id = intval($set_id);
+		
+		$r = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$set_id ) );
+		
+		$html = "<form name='gobaakaachoo'>
+		         <select name='chooseacardanycard' class='realbutton' onchange=\"autojumpmenu(this)\">
+		         <option value=''>Set: {$r['set_name']} options</option>
+		         <option value=''>-------------------</option>
+		         <option value='{$ibforums->adskin->base_url}&act=wrap&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit Board Header & Footer Wrapper</option>
+				 <option value='{$ibforums->adskin->base_url}&act=templ&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit Template HTML</option>
+				 <option value='{$ibforums->adskin->base_url}&act=style&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit CSS (Advanced Mode)</option>
+				 <option value='{$ibforums->adskin->base_url}&act=style&code=colouredit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit CSS (Easy Mode)</option>
+				 <option value='{$ibforums->adskin->base_url}&act=image&code=edit&id={$r['set_skin_set_id']}&p={$r['set_skin_set_parent']}'>Edit Replacement Macros</option>
+				 </select>
+				 </form>";
+				 
+		return $html;
+	}
+	
+}
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/admin/admin_pages.php b/upload/sources/admin/admin_pages.php
new file mode 100644
index 00000000..f2ad0ec9
--- /dev/null
+++ b/upload/sources/admin/admin_pages.php
@@ -0,0 +1,213 @@
+<?php
+
+// Simple library that holds all the links for the admin cp
+
+// CAT_ID => array(  PAGE_ID  => (PAGE_NAME, URL ) )
+
+// $PAGES[ $cat_id ][$page_id][0] = Page name
+// $PAGES[ $cat_id ][$page_id][1] = Url
+// $PAGES[ $cat_id ][$page_id][2] = Look for folder before showing
+// $PAGES[ $cat_id ][$page_id][3] = URL type: 1 = Board URL 0 = ACP URL
+// $PAGES[ $cat_id ][$page_id][4] = Item icon: 1= redirect 0 = Normal
+
+$PAGES = array(
+				# SETTINGS
+				
+				100 => array (
+							
+							 1 => array( 'View All General Settings', 'act=op' ),
+							 2 => array( 'Add New General Setting'  , 'act=op&code=settingnew' ),
+							 7 => array( 'Turn Board On / Off'      , 'act=op&code=findsetting&key='.urlencode('boardoffline/online'), '', 0, 1 ),
+							 8 => array( 'Board Guidelines'         , 'act=op&code=findsetting&key='.urlencode('boardguidelines'), '', 0, 1 ),
+							 9 => array( 'General Configuration'    , 'act=op&code=findsetting&key='.urlencode('generalconfiguration'), '', 0, 1 ),
+							 10 => array( 'CPU Saving'              , 'act=op&code=findsetting&key='.urlencode('cpusaving&optimization'), '', 0, 1 ),
+							 11 => array( 'IP Chat'                 , 'act=pin&code=ipchat'  ),
+							 12 => array( 'IPB Registration'        , 'act=pin&code=reg'     ),
+							 14 => array( 'IPB Copyright Removal'   , 'act=pin&code=copy'    ),
+						   ),
+						   
+			    # MEMBER MANAGEMENT
+						   
+				200 => array (
+							 1 => array( 'New Forum'             , 'act=forum&code=new'       ),
+							 2 => array( 'Manage Forums'         , 'act=forum'                ),
+							 3 => array( 'Permission Masks'      , 'act=group&code=permsplash'),
+							 6 => array( 'Moderators'            , 'act=mod'                  ),
+							 7 => array( 'Topic Multi-Moderation', 'act=multimod'          ),
+							 8 => array( 'Trash Can Set-Up'      , 'act=op&code=findsetting&key=trashcanset-up', '', 0, 1 ),
+						   ),
+						   
+						   
+				300 => array (
+				            1  => array ( 'Manage Members'        , 'act=mem&code=search' ),
+							2  => array ( 'Add New Member'        , 'act=mem&code=add'  ),
+							6  => array ( 'Manage Ranks'          , 'act=mem&code=title'),
+							7  => array ( 'Manage User Groups'    , 'act=group'         ),
+							8  => array ( 'Manage Validating'     , 'act=mem&code=mod'  ),
+							9  => array ( 'Custom Profile Fields' , 'act=field'         ),
+							11 => array ( 'IP Member Tools'       , 'act=mtools'        ),
+							12 => array ( 'Member Settings'       , 'act=op&code=findsetting&key=userprofiles', '', 0, 1 ),
+						   ),
+				
+					   
+				400 => array(
+							 5 => array( 'Subscription Manager'      , 'act=msubs' ),
+							 6 => array( '&#0124;-- Logs'            , 'act=msubs&code=searchlog', 'modules/subsmanager' ),
+							 7 => array( '&#0124;-- Currency Set-up' , 'act=msubs&code=currency' , 'modules/subsmanager' ),
+							 8 => array( '&#039;-- Transactions'     , 'act=msubs&code=dosearch' , 'modules/subsmanager' ),
+							 9 => array( 'Subs-Manager Settings'     , 'act=op&code=findsetting&key='.urlencode('subscriptionsmanager'), '', 0, 1 ),
+						   ),
+				
+				# POST MANAGEMENT
+				
+				500 => array (
+							1 => array( 'Attachment Types'      , 'act=attach&code=types'  ),
+							2 => array( 'Attachment Stats'      , 'act=attach&code=stats'  ),
+							3 => array( 'Attachment Search'     , 'act=attach&code=search'  ),
+				  			),
+				  			
+				  			
+				600 => array(
+							1 => array( 'Custom BBCode Manager' , 'act=admin&code=bbcode'        ),
+							2 => array( 'Add New BBCode'        , 'act=admin&code=bbcode_add'    ),
+						   ),
+						   
+				700 => array(
+							1 => array( 'Emoticon Manager'      , 'act=admin&code=emo'               ),
+							2 => array( 'Import/Export Packs'   , 'act=admin&code=emo_packsplash'    ),
+						   ),		   
+						   
+				800 => array (
+							1 => array( 'Manage Badword Filters', 'act=admin&code=badword'     ),
+							6 => array( 'Manage Ban Filters'    , 'act=admin&code=ban'  ),
+							),		
+				
+				# SKINS & LANGS
+				
+				900 => array (
+							1 => array( 'Skin Manager'            , 'act=sets'        ),
+							2 => array( 'Skin Tools'              , 'act=skintools'   ),
+							3 => array( 'Skin Search & Replace'   , 'act=skintools&code=searchsplash'   ),
+							4 => array( 'Skin Import/Export'      , 'act=import'      ),
+							5 => array( 'Easy Logo Changer'       , 'act=skintools&code=easylogo'   ),
+						   ),
+						   			
+				1000 => array (
+							1 => array( 'Manage Languages'        , 'act=lang'             ),
+							2 => array( 'Import a Language'       , 'act=lang&code=import' ),
+						   ),
+				
+				
+				# ADMIN
+						   
+				1100 => array (
+							1 => array( 'Manage Help Files'     , 'act=help'                   ),
+							2 => array( 'Cache Control'         , 'act=admin&code=cache'       ),
+							3 => array( 'Recount & Rebuild'     , 'act=rebuild'                ),
+							4 => array( 'Clean-up Tools'        , 'act=rebuild&code=tools'     ),
+						   ),
+						   
+			    1200 => array(
+			    			1  => array( 'Manage Bulk Mail'      , 'act=postoffice'                    ),
+			    			2  => array( 'Create New Email'      , 'act=postoffice&code=mail_new'      ),
+			    			3  => array( 'View Email Logs'       , 'act=emaillog', '', 0, 1 ),
+			    			4  => array( 'View Email Error Logs' , 'act=emailerror', '', 0, 1 ),
+			    			5  => array( 'Email Settings'        , 'act=op&code=findsetting&key=emailset-up', '', 0, 1 ),
+			    		    ),
+			    
+			    1300 => array (
+							 1 => array( 'Task Manager'        , 'act=task'                ),
+							 2 => array( 'View Task Logs'      , 'act=task&code=log'       ),
+						   ),
+				
+				
+				1400 => array(
+							 1 => array( 'Invision Gallery'        , 'act=gallery' ),
+							 2 => array( '|-- Settings'            , 'act=op&code=findsetting&key='.urlencode('invisiongallerysettings'), '', 0, 0 ),
+							 3 => array( '|-- Album Manager'       , 'act=gallery&code=albums'  , 'modules/gallery' ),
+							 4 => array( '|-- Multimedia Manager'  , 'act=gallery&code=media'   , 'modules/gallery' ),
+							 5 => array( '|-- Groups'              , 'act=gallery&code=groups'  , 'modules/gallery' ),  
+							 6 => array( '|-- Stats'               , 'act=gallery&code=stats'   , 'modules/gallery' ),
+							 7 => array( '|-- Tools'               , 'act=gallery&code=tools'   , 'modules/gallery' ),
+							 8 => array( '&#039;-- Post Form'      , 'act=gallery&code=postform', 'modules/gallery' ),
+						   ),
+				
+				1500 => array (
+							1 => array( 'Registration Stats' , 'act=stats&code=reg'   ),
+							2 => array( 'New Topic Stats'    , 'act=stats&code=topic' ),
+							3 => array( 'Post Stats'         , 'act=stats&code=post'  ),
+							4 => array( 'Personal Message'   , 'act=stats&code=msg'   ),
+							5 => array( 'Topic Views'        , 'act=stats&code=views' ),
+						   ),
+						   
+				1600 => array (
+							1 => array( 'SQL Toolbox'     , 'act=mysql'           ),
+							2 => array( 'SQL Back Up'     , 'act=mysql&code=backup'    ),
+							3 => array( 'SQL Runtime Info', 'act=mysql&code=runtime'   ),
+							4 => array( 'SQL System Vars' , 'act=mysql&code=system'    ),
+							5 => array( 'SQL Processes'   , 'act=mysql&code=processes' ),
+						   ),
+				
+				1700 => array(
+							1 => array( 'View Moderator Logs'  , 'act=modlog'    ),
+							2 => array( 'View Admin Logs'      , 'act=adminlog'  ),
+							3 => array( 'View Email Logs'      , 'act=emaillog'  ),
+							4 => array( 'View Email Error Logs', 'act=emailerror' ),
+							5 => array( 'View Bot Logs'        , 'act=spiderlog' ),
+							6 => array( 'View Warn Logs'       , 'act=warnlog'   ),
+						   ),
+			   );
+			   
+			   
+$CATS = array (   
+				  100 => array( "System Settings"   , '#caf2d9;margin-bottom:12px;' ),
+				  
+				  200 => array( 'Forum Control'     , '#F9FFA2' ),
+				  300 => array( 'Users and Groups'  , '#F9FFA2' ),
+				  400 => array( "Subscriptions"     , '#F9FFA2;margin-bottom:12px;' ),
+				  
+				  500 => array( "Attachments"       , '#f5cdcd' ),
+				  600 => array( "Custom BBCode"     , '#f5cdcd' ),
+				  700 => array( "Emoticons"         , '#f5cdcd' ),
+				  800 => array( "Word & Ban Filters", '#f5cdcd;margin-bottom:12px;' ),
+				  
+				  900 => array( 'Skins & Templates' , '#DFE6EF' ),
+				  1000 => array( 'Languages'        , '#DFE6EF;margin-bottom:12px;' ),
+				  
+				  1100 => array( 'Maintenance'      , '#caf2d9' ),
+				  1200 => array( 'Post Office'      , '#caf2d9' ),
+				  1300 => array( 'Task Manager'     , '#caf2d9;margin-bottom:12px;' ),
+				  
+				  1400 => array( "Invision Gallery" , '#F9FFA2;margin-bottom:12px;' ),
+				  
+				  1500 => array( 'Statistic Center' , '#f5cdcd' ),
+				  1600 => array( 'SQL Management'   , '#f5cdcd' ),
+				  1700 => array( 'Board Logs'       , '#f5cdcd' ),
+			  );
+			  
+$DESC = array (
+				  100 => "Edit forum settings such as cookie paths, security features, posting abilities, etc",
+				  
+				  200 => "Create, edit, remove and re-order categories, forums and moderators",
+				  300 => "Manage members, groups and ranks",
+				  400 => "Manage your members' subscriptions and more",
+				  
+				  500 => "Manage your attachments",
+				  600 => "Manage your custom BBCode",
+				  700 => "Manage your emoticons and upload/download emoticon packs",
+				  800 => "Manage your badword and ban filters",
+				  
+				  900 => "Manage templates, skins, colours and images.",
+				  1000 => "Manage language sets",
+				  
+				  1100 => "Manage Help Files, Bad Word Filters and Emoticons",
+				  1200 => "Manage your email and bulk mail members",
+				  1300 => "Manage your scheduled tasks.",
+				  
+				  1400 => "Manage your gallery",
+				  
+				  1500 => "Get registration and posting statistics",
+				  1600 => "Manage your SQL database; repair, optimize and export data",
+				  1700 => "View admin, moderator and email logs (Root admin only)",
+			  );
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/admin_skin.php b/upload/sources/admin/admin_skin.php
similarity index 51%
rename from upload/sources/Admin/admin_skin.php
rename to upload/sources/admin/admin_skin.php
index 4ffc7adc..c712cba6 100644
--- a/upload/sources/Admin/admin_skin.php
+++ b/upload/sources/admin/admin_skin.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -19,6 +18,7 @@
 |   > Script written by Matt Mecham
 |   > Date started: 1st march 2002
 |
+|   > DBA Checked: Tue 25th May 2004
 +--------------------------------------------------------------------------
 */
 
@@ -32,19 +32,25 @@ class admin_skin {
 	var $td_header = array();
 	var $td_colspan;
 	
-	function admin_skin() {
-		global $INFO, $IN;
-		
-		$this->base_url = $INFO['board_url']."/admin.".$INFO['php_ext']."?adsess=".$IN['AD_SESS'];
-		$this->img_url  = $INFO['html_url'].'/sys-img';
+	function admin_skin()
+	{
+		global $ibforums;
 		
+		$this->base_url = $ibforums->base_url;
+		$this->img_url  = $ibforums->skin_url;
 	}
 	
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	//--------------------------------------------------------------------
 	// Javascript elements
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	//--------------------------------------------------------------------
+	
+	function js_make_button($text="", $url="", $css='realbutton', $title="")
+	{
+		return "<input type='button' class='{$css}' value='{$text}' onclick='self.location.href=\"{$url}\"' title='$title' />";
+	
+	}
 	
 	function js_pop_win()
 	{
@@ -75,18 +81,16 @@ class admin_skin {
 	
 	function js_template_tools()
 	{
-	
+		global $ibforums;
+		
 		return "
 				<script language='javascript'>
 				<!--
-					
-					var baseUrl = \"{$this->base_url}\";
-					
 					function restore(suid, expand)
 					{
 						 if (confirm(\"Are you sure you want to restore the template?\\nALL UNSAVED CHANGES WILL BE LOST!\"))
 						 {
-          					self.location.href= baseUrl + '&act=templ&code=edit_bit&suid=' + suid + '&expand=' + expand;
+          					window.location = '{$this->base_url}&act=templ&code=edit_bit&type=single&id={$ibforums->input['id']}&p={$ibforums->input['p']}&suid=' + suid + '&expand=' + expand;
        					 }
        					 else
        					 {
@@ -94,42 +98,7 @@ class admin_skin {
       					 }
       				}
       				
-      				function edit_box_size(cols, rows)
-      				{
-      					if (cols == '') { cols = 80; }
-      					if (rows == '') { rows = 40; }
-      					
-      					userCols = prompt(\"Enter the number of columns for the text area (width)\", cols);
-						if ( (userCols != null) && (userCols != \"\") )
-						{
-							userRows = prompt(\"Enter the number of rows for the text area (height)\", rows);
-							if ( (userRows != null) && (userRows != \"\") )
-							{
-								// Rows and cols set, save cookie, present alert.
-								
-								document.cookie = 'ad_tempform='+userRows+'-'+userCols+'; path=/; expires=Wed, 1 Jan 2020 00:00:00 GMT;';
-								alert('Edit box preferences updated.\\nThe changes will take effect next time the edit screen is loaded');
-							}
-							else
-							{
-								alert('You must enter a value for the number of rows');
-							}
-						}
-						else
-						{
-							alert('You must enter a value for the number of columns');
-						}
-					}
-					
-					function pop_win(theUrl, winName, theWidth, theHeight)
-					{
-						 	if (winName == '') { winName = 'Preview'; }
-						 	if (theHeight == '') { theHeight = 400; }
-						 	if (theWidth == '') { theWidth = 400; }
-						 	
-						 	window.open('{$this->base_url}&act=rtempl&'+theUrl,winName,'width='+theWidth+',height='+theHeight+',resizable=yes,scrollbars=yes');
-					}
-					
+      				var template_bit_ids = '<!--IPB.TEMPLATE_BIT_IDS-->';
 				//-->
 				</script>
 				";
@@ -137,7 +106,7 @@ class admin_skin {
 	}
 	
 	
-	function js_checkdelete()
+	function js_checkdelete($txt="Are you sure you wish to remove this?")
 	{
 	
 		return "
@@ -147,7 +116,7 @@ class admin_skin {
 				
 					final_url = \"{$this->base_url}&\" + theURL;
 					
-					if ( confirm('Are you sure you wish to remove this?\\nIt cannot be undone!') )
+					if ( confirm('{$txt}\\nIt cannot be undone!') )
 					{
 						document.location.href=final_url;
 					}
@@ -233,17 +202,17 @@ class admin_skin {
 	}
 	
 	
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	//--------------------------------------------------------------------
 	// FORM ELEMENTS
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	//--------------------------------------------------------------------
 	
 	function start_form($hiddens="", $name='theAdminForm', $js="") {
 		global $IN, $INFO;
 	
 		$form = "<form action='{$this->base_url}' method='post' name='$name' $js>
-				 <input type='hidden' name='adsess' value='{$IN['AD_SESS']}'>";
+				 ";
 		
 		if (is_array($hiddens))
 		{
@@ -256,7 +225,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function form_hidden($hiddens="") {
 	
@@ -271,9 +240,9 @@ class admin_skin {
 	}
 	
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
-	function end_form($text = "", $js = "")
+	function end_form($text = "", $js = "", $extra = "")
 	{
 		// If we have text, we print another row of TD elements with a submit button
 		
@@ -287,7 +256,7 @@ class admin_skin {
 				$colspan = " colspan='".$this->td_colspan."' ";
 			}
 			
-			$html .= "<tr><td align='center' class='pformstrip'".$colspan."><input type='submit' value='$text'".$js." id='button' accesskey='s'></td></tr>\n";
+			$html .= "<tr><td align='center' class='pformstrip'".$colspan."><input type='submit' value='$text'".$js." id='button' accesskey='s'>{$extra}</td></tr>\n";
 		}
 		
 		$html .= "</form>";
@@ -296,7 +265,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function end_form_standalone($text = "", $js = "")
 	{
@@ -315,7 +284,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function form_upload($name="FILE_UPLOAD", $js="") {
 	
@@ -328,7 +297,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function form_input($name, $value="", $type='text', $js="", $size="30") {
 	
@@ -347,24 +316,39 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
-	function form_textarea($name, $value="", $cols='60', $rows='5', $wrap='soft') {
+	function form_textarea($name, $value="", $cols='60', $rows='5', $wrap='soft', $id="", $style="") {
 	
-		return "<textarea name='$name' cols='$cols' rows='$rows' wrap='$wrap' class='multitext'>$value</textarea>";
+		if ( $id )
+		{
+			$id = "id='$id'";
+		}
+		
+		if ( $style )
+		{
+			$style = "style='$style'";
+		}
+		
+		return "<textarea name='$name' cols='$cols' rows='$rows' wrap='$wrap' $id $style class='multitext'>$value</textarea>";
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
-	function form_dropdown($name, $list=array(), $default_val="", $js="") {
+	function form_dropdown($name, $list=array(), $default_val="", $js="", $css="") {
 	
 		if ($js != "")
 		{
 			$js = ' '.$js.' ';
 		}
+		
+		if ($css != "")
+		{
+			$css = ' class="'.$css.'" ';
+		}
 	
-		$html = "<select name='$name'".$js." class='dropdown'>\n";
+		$html = "<select name='$name'".$js." $css class='dropdown'>\n";
 		
 		foreach ($list as $k => $v)
 		{
@@ -386,7 +370,7 @@ class admin_skin {
 	
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function form_multiselect($name, $list=array(), $default=array(), $size=5, $js="") {
 	
@@ -420,7 +404,7 @@ class admin_skin {
 	
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function form_yes_no( $name, $default_val="", $js=array() ) {
 	
@@ -457,7 +441,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function form_checkbox( $name, $checked=0, $val=1, $js=array() ) {
 		
@@ -473,9 +457,10 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
-	function build_group_perms( $read='*', $write='*', $reply='*', $upload='*' ) {
+	function build_group_perms( $show='*', $read='*', $write='*', $reply='*', $upload='*' )
+	{
 		global $DB;
 		
 		
@@ -492,7 +477,7 @@ class admin_skin {
 					{
 						var e = f.elements[i];
 						
-						if ( (e.name != 'UPLOAD_ALL') && (e.name != 'READ_ALL') && (e.name != 'REPLY_ALL') && (e.name != 'START_ALL') && (e.type == 'checkbox') && (! e.disabled) )
+						if ( (e.name != 'UPLOAD_ALL') && (e.name != 'READ_ALL') && (e.name != 'REPLY_ALL') && (e.name != 'START_ALL') && (e.name != 'SHOW_ALL') && (e.type == 'checkbox') && (! e.disabled) )
 						{
 							s = e.name;
 							a = s.substring(0, 4);
@@ -515,6 +500,7 @@ class admin_skin {
 					if (IDnumber == 2) { str_part = 'REPL' }
 					if (IDnumber == 3) { str_part = 'STAR' }
 					if (IDnumber == 4) { str_part = 'UPLO' }
+					if (IDnumber == 5) { str_part = 'SHOW' }
 					
 					totalboxes = 0;
 					total_on   = 0;
@@ -523,7 +509,7 @@ class admin_skin {
 					{
 						var e = f.elements[i];
 						
-						if ( (e.name != 'UPLOAD_ALL') && (e.name != 'READ_ALL') && (e.name != 'REPLY_ALL') && (e.name != 'START_ALL') && (e.type == 'checkbox') )
+						if ( (e.name != 'UPLOAD_ALL') && (e.name != 'READ_ALL') && (e.name != 'REPLY_ALL') && (e.name != 'START_ALL') && (e.name != 'SHOW_ALL') && (e.type == 'checkbox') )
 						{
 							s = e.name;
 							a = s.substring(0, 4);
@@ -546,6 +532,7 @@ class admin_skin {
 						if (IDnumber == 2) { f.REPLY_ALL.checked = true; }
 						if (IDnumber == 3) { f.START_ALL.checked = true; }
 						if (IDnumber == 4) { f.UPLOAD_ALL.checked = true; }
+						if (IDnumber == 5) { f.SHOW_ALL.checked  = true; }
 					}
 					else
 					{
@@ -553,6 +540,7 @@ class admin_skin {
 						if (IDnumber == 2) { f.REPLY_ALL.checked = false; }
 						if (IDnumber == 3) { f.START_ALL.checked = false; }
 						if (IDnumber == 4) { f.UPLOAD_ALL.checked = false; }
+						if (IDnumber == 5) { f.SHOW_ALL.checked  = false; }
 					}
 					
 				}
@@ -567,12 +555,13 @@ class admin_skin {
 					if (IDnumber == 2) { str_part = 'REPL' }
 					if (IDnumber == 3) { str_part = 'STAR' }
 					if (IDnumber == 4) { str_part = 'UPLO' }
+					if (IDnumber == 5) { str_part = 'SHOW' }
 					
 					for (var i = 0 ; i < f.elements.length; i++)
 					{
 						var e = f.elements[i];
 						
-						if ( (e.name != 'UPLOAD_ALL') && (e.name != 'READ_ALL') && (e.name != 'REPLY_ALL') && (e.name != 'START_ALL') && (e.type == 'checkbox') )
+						if ( (e.name != 'UPLOAD_ALL') && (e.name != 'READ_ALL') && (e.name != 'REPLY_ALL') && (e.name != 'START_ALL') && (e.name != 'SHOW_ALL') && (e.type == 'checkbox') )
 						{
 							s = e.name;
 							a = s.substring(0, 4);
@@ -586,6 +575,7 @@ class admin_skin {
 									if (IDnumber == 2) { f.REPLY_ALL.checked = true; }
 									if (IDnumber == 3) { f.START_ALL.checked = true; }
 									if (IDnumber == 4) { f.UPLOAD_ALL.checked = true; }
+									if (IDnumber == 5) { f.SHOW_ALL.checked   = true; }
 								}
 								else
 								{
@@ -594,6 +584,7 @@ class admin_skin {
 									if (IDnumber == 2) { f.REPLY_ALL.checked = false; }
 									if (IDnumber == 3) { f.START_ALL.checked = false; }
 									if (IDnumber == 4) { f.UPLOAD_ALL.checked = false; }
+									if (IDnumber == 5) { f.SHOW_ALL.checked   = false; }
 								}
 							}
 						}
@@ -619,11 +610,13 @@ class admin_skin {
 					eval( 'f.REPLY_'+IDnumber+'.checked='+mystat );
 					eval( 'f.START_'+IDnumber+'.checked='+mystat );
 					eval( 'f.UPLOAD_'+IDnumber+'.checked='+mystat );
+					eval( 'f.SHOW_'+IDnumber+'.checked='+mystat );
 					
 					obj_checked(1);
 					obj_checked(2);
 					obj_checked(3);
 					obj_checked(4);
+					obj_checked(5);
 				}
 				
 				//-->
@@ -633,8 +626,19 @@ class admin_skin {
 				";
 
 		$html .= $this->add_td_basic( "GLOBAL: All current and future permission masks", "left", "pformstrip" );		
-				
-		//+-------------------------------------------------------------------------
+		
+		//-----------------------------------------
+				 	
+		if ($show == '*')
+		{
+			$html_show = "<input type='checkbox' onClick='check_all(\"SHOW\")' name='SHOW_ALL' value='1' checked>\n";
+		}
+		else
+		{
+			$html_show = "<input type='checkbox' onClick='check_all(\"SHOW\")' name='SHOW_ALL' value='1'>\n";
+		}
+			
+		//-----------------------------------------
 				 	
 		if ($read == '*')
 		{
@@ -645,7 +649,7 @@ class admin_skin {
 			$html_read = "<input type='checkbox' onClick='check_all(\"READ\")' name='READ_ALL' value='1'>\n";
 		}
 		
-		//+-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		if ($reply == '*')
 		{
@@ -656,7 +660,7 @@ class admin_skin {
 			$html_reply = "<input type='checkbox' onClick='check_all(\"REPL\")' name='REPLY_ALL' value='1'>\n";
 		}
 		
-		//+-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		if ($write == '*')
 		{
@@ -676,25 +680,40 @@ class admin_skin {
 			$html_upload = "<input type='checkbox' onClick='check_all(\"UPLO\")' name='UPLOAD_ALL' value='1'>\n";
 		}
 		
-		//+-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		$html .= $this->add_td_row( array(   "<b>All current and future permission masks</b>",
+											 "<center id='mgyellow'>$html_show</center>",
 											 "<center id='mgblue'>$html_read</center>",
 											 "<center id='mggreen'>$html_reply</center>",
 											 "<center id='mgred'>$html_start</center>",
 											 "<center id='memgroup'>$html_upload</center>",
 								 )       );
 		
-		//+-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		$html .= $this->add_td_basic( "OR: Adjust permissions per mask below", "left", "pformstrip" );
 		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'forum_perms', 'order' => "perm_name ASC" ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT * FROM ibf_forum_perms ORDER BY perm_name ASC");
-				 
-				 
 		while ( $data = $DB->fetch_row() )
 		{
+			if ($show == '*')
+			{
+				$html_show = "<input type='checkbox' name='SHOW_{$data['perm_id']}' value='1' checked onclick=\"obj_checked(5)\">";
+			}
+			else if ( preg_match( "/(^|,)".$data['perm_id']."(,|$)/", $show ) )
+			{
+				$html_show = "<input type='checkbox' name='SHOW_{$data['perm_id']}' value='1' checked onclick=\"obj_checked(5)\">";
+			}
+			else
+			{
+				$html_show = "<input type='checkbox' name='SHOW_{$data['perm_id']}' value='1' onclick=\"obj_checked(5)\">";
+			}
+			
+			//-----------------------------------------
+			
 			if ($read == '*')
 			{
 				$html_read = "<input type='checkbox' name='READ_{$data['perm_id']}' value='1' checked onclick=\"obj_checked(1)\">";
@@ -708,7 +727,7 @@ class admin_skin {
 				$html_read = "<input type='checkbox' name='READ_{$data['perm_id']}' value='1' onclick=\"obj_checked(1)\">";
 			}
 			
-			//+----------------------------------------------------------------------------------------
+			//-----------------------------------------
 			
 			if ($reply == '*')
 			{
@@ -723,7 +742,7 @@ class admin_skin {
 				$html_reply = "<input type='checkbox' name='REPLY_{$data['perm_id']}' value='1' onclick=\"obj_checked(2)\">";
 			}
 			
-			//+----------------------------------------------------------------------------------------
+			//-----------------------------------------
 			
 			if ($write == '*')
 			{
@@ -738,7 +757,7 @@ class admin_skin {
 				$html_start = "<input type='checkbox' name='START_{$data['perm_id']}' value='1' onclick=\"obj_checked(3)\">";
 			}
 			
-			//+----------------------------------------------------------------------------------------
+			//-----------------------------------------
 			
 			if ($upload == '*')
 			{
@@ -754,6 +773,7 @@ class admin_skin {
 			}
 			
 			$html .= $this->add_td_row( array(   "<div align='right' style='font-weight:bold'>{$data['perm_name']} &nbsp; <input type='button' id='button' value='+' onclick='checkrow({$data['perm_id']},1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkrow({$data['perm_id']},0)' /></div>",
+												 "<center id='mgyellow'>$html_show</center>",
 												 "<center id='mgblue'>$html_read</center>",
 											 	 "<center id='mggreen'>$html_reply</center>",
 											  	 "<center id='mgred'>$html_start</center>",
@@ -762,10 +782,11 @@ class admin_skin {
 		}
 		
 		$html .= $this->add_td_row( array(   "&nbsp;",
-											 "<center>Select: <input type='button' id='button' value='+' onclick='checkcol(1,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(1,0)' /></center>",
-											 "<center>Select: <input type='button' id='button' value='+' onclick='checkcol(2,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(2,0)' /></center>",
-											 "<center>Select: <input type='button' id='button' value='+' onclick='checkcol(3,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(3,0)' /></center>",
-											 "<center>Select: <input type='button' id='button' value='+' onclick='checkcol(4,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(4,0)' /></center>",
+											 "<center><input type='button' id='button' value='+' onclick='checkcol(5,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(5,0)' /></center>",
+											 "<center><input type='button' id='button' value='+' onclick='checkcol(1,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(1,0)' /></center>",
+											 "<center><input type='button' id='button' value='+' onclick='checkcol(2,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(2,0)' /></center>",
+											 "<center><input type='button' id='button' value='+' onclick='checkcol(3,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(3,0)' /></center>",
+											 "<center><input type='button' id='button' value='+' onclick='checkcol(4,1)' />&nbsp;<input type='button' id='button' value='-' onclick='checkcol(4,0)' /></center>",
 								  )       );
 	
 		return $html;
@@ -773,11 +794,11 @@ class admin_skin {
 	}
 	
 	
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	//--------------------------------------------------------------------
 	// SCREEN ELEMENTS
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	//--------------------------------------------------------------------
 	
 	function add_subtitle($title="",$id="subtitle", $colspan="") {
 		
@@ -790,7 +811,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function start_table( $title="", $desc="") {
 	
@@ -849,7 +870,14 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
+	
+	function add_standalone_row($text = "", $align='center', $class='pformstrip')
+	{
+		return "<div class='tableborder'><div align='{$align}' class='{$class}'>{$text}</div></div>\n";
+	}
+	
+	//-----------------------------------------
 	
 	
 	function add_td_row( $array, $css="", $align='middle' ) {
@@ -876,8 +904,9 @@ class admin_skin {
 				{
 					$text    = $array[$i][0];
 					$colspan = $array[$i][1];
+					$td_col  = $array[$i][2] != "" ? $array[$i][2] : $td_col;
 					
-					$html .= "<td class='$td_col' colspan='$colspan' valign='$align' class='$css'>".$text."</td>\n";
+					$html .= "<td class='$td_col' colspan='$colspan' valign='$align'>".$text."</td>\n";
 				}
 				else
 				{
@@ -901,7 +930,7 @@ class admin_skin {
 		
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function add_td_basic($text="",$align="left",$id="tdrow1") {
 	
@@ -923,7 +952,7 @@ class admin_skin {
 	
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function add_td_spacer() {
 	
@@ -932,13 +961,13 @@ class admin_skin {
 			$colspan = " colspan='".$this->td_colspan."' ";
 		}
 	
-		return "<tr><td".$colspan."><img src='html/sys-img/blank.gif' height='7' width='1'></td></tr>";
+		return "<tr><td".$colspan."><br /></td></tr>";
 	
 	}
 	
 	
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function end_table() {
 	
@@ -958,245 +987,72 @@ class admin_skin {
 	}
 	
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	
-			
-	
-	
-	//+--------------------------------------------------------------------
-	//+--------------------------------------------------------------------
-	
-	function get_css()
+	function print_top($title="",$desc="")
 	{
-		return "<style type='text/css'>
-					BODY {
-							font-size: 10px;
-							font-family: Verdana, Arial, Sans-Serif;
-							color:#000;
-							padding:0px;
-							margin:0px 5px 0px 5px;
-						  }
-						  
-				    TABLE, TD, TR {
-							font-family: Verdana,Arial, Sans-Serif;
-							color:#000;
-							font-size: 10px;
-						  }
-						  
-					a:link, a:visited, a:active  { color:#000055 }
-					a:hover                      { color:#333377;text-decoration:underline }
-					
-					#maintop { font-size:18px;
-					           color:#FFF;
-					           font-weight:bold;
-					           letter-spacing:-1px;
-					           padding:9px 5px 9px 5px;
-					           border:1px solid #345487;
-					           background-image: url({$this->img_url}/tile_back.gif);
-					         }
-					
-					
-					#nav { font-size:11px;margin:8px 0px 8px 0px;color:#3A4F6C;font-weight:bold;}
-					#nav a:link, #nav  a:visited, #nav a:active { font-weight:bold;font-size:11px; }
-					
-					#submenu   { border:1px solid #BCD0ED;background-color: #DFE6EF;font-size:10px;margin:3px 0px 3px 0px;color:#3A4F6C;font-weight:bold;}
-					#submenu a:link, #submenu  a:visited, #submenu a:active { font-weight:bold;font-size:10px;text-decoration: none; color: #3A4F6C; }
-
-					
-					.tableborder { border:1px solid #345487;background-color:#FFF;width:100% }
-					
-					.offdiv { font-size:12px;font-weight:bold }
-					
-					form { display:inline }
-					input { vertical-align:middle }
-					
-					img  { vertical-align:middle }
-					
-					.titlemedium { border:1px solid #FFF; font-weight:bold; color:#3A4F6C; padding:7px 0px 7px 2px; background-image: url({$this->img_url}/tile_sub.gif) }
-					.titlemedium  a:link, .titlemedium  a:visited, .titlemedium  a:active  { text-decoration: underline; color: #3A4F6C }
-					
-					.maintitle { font-size:12px; vertical-align:middle;font-weight:bold; color:#FFF; padding:8px 0px 8px 5px; background-image: url({$this->img_url}/tile_back.gif) }
-					.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
-					.maintitle a:hover { text-decoration: underline }
-					
-					.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:5px;margin-top:1px }
-					
-					#normal      { font: 10px Verdana; color:#333333 }
-					
-					#detail { font-family: Arial; font-size:11px; color: #333333 }
-					
-					#subtitle { font-family: Arial,Verdana; font-size:16px; color:#FF9900; font-weight:bold }
-					#smalltitle { font-family: Arial,Verdana; font-size:11px; color:#FF9900; font-weight:bold }
-					
-					#table1 {  background-color:#FFFFFF; width:100%; align:center; border:1px solid black }
-					
-					.tdrow1 { background-color:#EEF2F7;
-					          border-bottom:1px solid #D1DCEB;
-					          border-right:1px solid #D1DCEB ;
-					          border-top:1px solid #FFF;
-					          border-left:1px solid #FFF;
-					        }
-					
-					.subforum { background-color:#DFE6EF }
-					
-					.tdrow2 { background-color:#F5F9FD;
-							  border-bottom:1px solid #D1DCEB;
-					          border-right:1px solid #D1DCEB;
-					          border-top:1px solid #FFF;
-					          border-left:1px solid #FFF;
-					        }
-					
-					.catrow { font-weight:bold; height:24px; line-height:150%; color:#4C77B6; background-image: url({$this->img_url}/tile_sub.gif); }
-					.catrow2 { font-size:11px; font-weight:bold; line-height:150%; color:#4C77B6; background-color:#D3DFEF; }
-					
-					.copy { color:#000; font-size:10px; border-top:1px solid #000; margin-bottom:10px; padding:6px;  margin-left:auto;margin-right:auto; text-align:center; }
-					
-					#nav { color:#000000; font-size:9px }
-					
-					#description { color:#000000; font-size:10px }
-					
-					#memgroup { border:1px solid #777777 }
-					
-					#mgred   { border:1px solid #777777; background-color: #f5cdcd }
-					#mggreen { border:1px solid #777777; background-color: #caf2d9 }
-					#mgblue  { border:1px solid #777777; background-color: #DFE6EF }
-					
-					#green    { background-color: #caf2d9 }
-					#red      { background-color: #f5cdcd }
-					
-					#button   { border:1px solid #4C77B6;background-color: #DFE6EF; font-family:Verdana, Arial; font-size:11px }
-					
-					#editbutton   { background-color: #DDDDDD; color: #000; font-family:Verdana, Arial; font-size:9px }
-					
-					.fauxbutton   { border:1px solid #4C77B6;
-								    background-color: #DFE6EF;
-								    font-family:Verdana, Arial;
-								    font-size:10px;
-								    font-weight:bold;
-								    padding:3px;
-								    margin:6px;
-								  }
-								  
-					.darksep { background-color: #B1BECE; color:#4C77B6; height:5px }
-					
-					.fauxbutton a:link, .fauxbutton  a:visited, .fauxbutton  a:active { font-size:10px;font-weight:bold; }
-					
-					.textinput { background-color: #FFF; color:Ê#000; font-size:10px; font-family: Verdana,Arial, Sans-Serif; padding:2px; border:2px inset #BCD0ED; }
-					
-					.dropdown { background-color: #FFF; color:Ê#000; font-size:10px; font-family: Verdana,Arial, Sans-Serif; padding:2px;  border:2px inset #BCD0ED; }
-					
-					.multitext { background-color: #FFF; color:Ê#000; font-size:10px;font-family: Verdana,Arial, Sans-Serif; padding:2px;  border:2px inset #BCD0ED; }
-					
-					.jmenu, .jmenubutton { vertical-align:middle;
-										  background-color: #FFF;
-										  border:1px solid #345487;
-										  font-size:11px;
-										 }
-										 
-					#jwrap { border:1px solid #BCD0ED;background-color: #DFE6EF;font-size:10px;margin:3px 0px 3px 0px;color:#3A4F6C;font-weight:bold;padding:8px }
-					
-				  </style>";
-	}
-	
-	
-	
-	function print_top($title="",$desc="") {
-		global $INFO, $IN;
-	
-		$css = $this->get_css();
+		global $ibforums;
 	
 		return "<html>
 		          <head><title>Menu</title>
 		          <meta HTTP-EQUIV=\"Pragma\"  CONTENT=\"no-cache\">
 				  <meta HTTP-EQUIV=\"Cache-Control\" CONTENT=\"no-cache\">
 				  <meta HTTP-EQUIV=\"Expires\" CONTENT=\"Mon, 06 May 1996 04:57:00 GMT\">
-		          $css
-		          <script type='text/javascript'>
-					function ShowHide(id1, id2) {
-					  if (id1 != '') expMenu(id1);
-					  if (id2 != '') expMenu(id2);
-					}
-					
-					function expMenu(id) {
-					  var itm = null;
-					  if (document.getElementById) {
-						itm = document.getElementById(id);
-					  } else if (document.all){
-						itm = document.all[id];
-					  } else if (document.layers){
-						itm = document.layers[id];
-					  }
-					
-					  if (!itm) {
-					   // do nothing
-					  }
-					  else if (itm.style) {
-						if (itm.style.display == \"none\") {
-						  itm.style.display = \"\";
-						}
-						else {
-						  itm.style.display = \"none\";
-						}
-					  }
-					  else {
-						itm.visibility = \"show\";
-					  }
-					}
-					function multi_page_jump( url_bit, total_posts, per_page )
-					{
-					  pages = 1; cur_st = parseInt(\"{$IN['st']}\"); cur_page  = 1;
-					  if ( total_posts % per_page == 0 ) { pages = total_posts / per_page; }
-					   else { pages = Math.ceil( total_posts / per_page ); }
-					  msg = \"Choose a page between 1 and\" + \" \" + pages;
-					  if ( cur_st > 0 ) { cur_page = cur_st / per_page; cur_page = cur_page -1; }
-					  show_page = 1;
-					  if ( cur_page < pages )  { show_page = cur_page + 1; }
-					  if ( cur_page >= pages ) { show_page = cur_page - 1; }
-					   else { show_page = cur_page + 1; }
-					  userPage = prompt( msg, show_page );
-					  if ( userPage > 0  ) {
-						  if ( userPage < 1 )     {    userPage = 1;  }
-						  if ( userPage > pages ) { userPage = pages; }
-						  if ( userPage == 1 )    {     start = 0;    }
-						  else { start = (userPage - 1) * per_page; }
-						  self.location.href = url_bit + \"&st=\" + start;
-					  }
-					}
-				   </script>
+		          <link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$ibforums->skin_url}/acp_css.css\" />
+		          <script type=\"text/javascript\">
+				  <!--
+				   var ipb_var_st       = \"{$ibforums->input['st']}\";
+				   var ipb_lang_tpl_q1  = \"{$ibforums->lang['tpl_q1']}\";
+				   var ipb_var_phpext   = \"{$ibforums->vars['php_ext']}\";
+				   var ipb_var_base_url = \"{$ibforums->base_url}\";
+				   var ipb_var_cookieid = \"{$ibforums->vars['cookie_id']}\";
+				   var ipb_var_cookie_domain = \"{$ibforums->vars['cookie_domain']}\";
+				   var ipb_var_cookie_path   = \"{$ibforums->vars['cookie_path']}\";
+				   //-->
+				  </script>
+				  <script type=\"text/javascript\" src='jscripts/ipb_global.js'></script>
+				  <script type=\"text/javascript\" src='{$ibforums->skin_url}/acp_js.js'></script>
 				  </head>
-				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF' {$this->top_extra}>
-				 <div id='maintop'>$title</div>
+				  
+				 <body {$this->top_extra}>
+				 
+				 <div id='logostrip'>
+				  <div id='logostripinner'><div style='font-weight:bold;font-size:12px;color:#FFF;padding-top:14px;padding-left:4px'>$title</div></div>
+				 </div>
+				 
 				 <table width='100%' cellspacing='6' id='submenu'>
 				 <tr>
 				  <td><a href='{$this->base_url}&act=menu&show=all' target='menu'>Expand Menu</a> &middot; <a href='{$this->base_url}&act=menu&show=none' target='menu'>Reduce Menu</a></td>
-				  <td align='right'><a href='{$this->base_url}&act=index' target='body'>ACP Home</a> &middot; <a href='{$INFO['board_url']}/index.{$INFO['php_ext']}' target='_blank'>Board Home</a></td>
+				  <td align='right'><a href='#' onclick='window.location=window.location'>Reload Window</a> &middot; <a href='{$this->base_url}&act=index' target='body'>ACP Home</a> &middot; <a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}' target='_blank'>Board Home</a></td>
 				 </tr>
 				 </table>
 				 <!--NAV-->
 				 <div id='description'>$desc</div>
+				 <!--IPB.ERROR-->
+				 <!--IPB.MESSAGE-->
 				 <br />";
 				  	   
 	}
 	
 	function wrap_nav($links)
 	{
-		return "\n<div id='nav'><img src='html/sys-img/nav.gif' border='0' title='ACP Navigation'>&nbsp;$links</div>\n";
+		return "\n<div class='navstrip'>$links</div>\n";
 	}
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function print_foot() {
 		
 		return "<br />
 				<div align='right' id='jwrap'><strong>Quick Jump</strong> <!--JUMP--></div>
-				<div class='copy' align='center'>Invision Power Board &copy 2003 <a href='http://www.invisionpower.com' target='_blank'>IPS, Inc.</a></div>
+				<div class='copy' align='center'>Invision Power Board &copy ".date("Y")." <a href='http://www.invisionpower.com' target='_blank'>IPS, Inc.</a></div>
 				 </body>
 				 </html>";
 	}
 	
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 	
 	
@@ -1204,71 +1060,36 @@ class admin_skin {
 	//{ background-color:#C2CFDF; font-weight:bold; font-size:12px; color:#000055 }
 	
 	
-	function menu_top() {
-		global $INFO;
-		
-		
-		$pop_win = $this->js_pop_win();
+	function menu_top()
+	{
+		global $ibforums;
 	
 		return "<html>
 		          <head><title>Menu</title>
-		          <style type='text/css'>
-		          	TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 9px; color:#000 }
-					BODY      {
-								 font: 9px Verdana;
-								 color:#000;
-								 background-color:#FFF;
-								 margin:0px 3px 0px 3px;
-								 padding:0px;
-							  }
-					a:link, a:visited, a:active  { color:#000 }
-					a:hover                      { text-decoration:underline }
-					
-					img { vertical-align:middle }
-					#title  { font-size:10px; font-weight:bold; line-height:150%; color:#FFFFFF; height: 24px; background-image: url({$this->img_url}/tile_back.gif); }
-					#title  a:link, #title  a:visited, #title  a:active { text-decoration: none; color : #555555 }
-					
-					.desc {
-							font-size:9px;
-							color: #000;
-							background-color:#DFE6EF;
-							padding:2px 0px 2px 5px;
-							line-height:1.2em;
-						   }
-					
-					.plain {
-							font-size:9px;
-							color: #000;
-							background-color:#EEF2F7;
-							padding:2px 0px 2px 5px;
-							line-height:1.7em;
-						   }
-					
-					.tableborder { border:1px solid #345487;background-color:#FFF; }
-					
-					.cattitle  {
-								font-size:10px;
-								font-weight:bold;
-								line-height:150%;
-								background-color:#C4DCF7;
-								color:#000;
-								padding:5px 4px 5px 5px;
-								background-image: url({$this->img_url}/tile_sub.gif);
-								border-bottom:1px solid #345487;
-							   }
-					.cattitle  a:link, .cattitle  a:visited, .cattitle  a:active { text-decoration: underline; color:#000; }
-					
-				  </style>
-				  $pop_win
+		          <link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"{$ibforums->skin_url}/acp_css.css\" />
+		          <script type=\"text/javascript\">
+				  <!--
+				   var ipb_var_st       = \"{$ibforums->input['st']}\";
+				   var ipb_lang_tpl_q1  = \"{$ibforums->lang['tpl_q1']}\";
+				   var ipb_var_phpext   = \"{$ibforums->vars['php_ext']}\";
+				   var ipb_var_base_url = \"{$ibforums->base_url}\";
+				   var ipb_var_cookieid = \"{$ibforums->vars['cookie_id']}\";
+				   var ipb_var_cookie_domain = \"{$ibforums->vars['cookie_domain']}\";
+				    var ipb_var_cookie_path   = \"{$ibforums->vars['cookie_path']}\";
+				   var menu_ids         = \"<!--{IDS}-->\";
+				   //-->
+				  </script>
+				  <script type=\"text/javascript\" src='jscripts/ipb_global.js'></script>
+				  <script type=\"text/javascript\" src='{$ibforums->skin_url}/acp_js.js'></script>
 				  </head>
-				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFF'>
-				 <div align='center'><img src='{$this->img_url}/ad-logo.jpg' border='0' style='width:100%'></div>
+				 <body>
+				 <div align='center' id='logostrip'><img src='{$this->img_url}/logo4.gif' border='0'></div>
 				 <div class='tableborder'>
-				  <div class='plain'>
-				   <img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$this->base_url}&act=menu&show=all' target='menu'>Expand</a> &middot; <a href='{$this->base_url}&act=menu&show=none' target='menu'>Reduce</a> Menu
-				   <br /><img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$this->base_url}&act=index' target='body'>ACP</a> &middot; <a href='{$INFO['board_url']}/index.{$INFO['php_ext']}' target='body'>Board</a> Home
-				   <br /><img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$this->base_url}&act=ips&code=docs' target='body' style='text-decoration:none'>IPB Documentation</a>
-				   <br /><img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href=\"javascript:pop_win('&act=prefs', 'prefs', 400, 200 )\"  style='text-decoration:none'>Your ACP prefs</a>
+				  <div class='menulinkwrap'>
+				   &nbsp;<img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='javascript:expandmenu();'>Expand</a> &middot; <a href='javascript:collapsemenu();'>Collapse</a> Menu
+				   <br />&nbsp;<img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$this->base_url}&act=index' target='body'>ACP</a> &middot; <a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}' target='body'>Board</a> Home
+				   <br />&nbsp;<img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$this->base_url}&act=ips&code=docs' target='body' style='text-decoration:none'>IPB Documentation</a>
+				   <br />&nbsp;<img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$this->base_url}&act=op&code=phpinfo' style='text-decoration:none' target='body'>PHP Info</a>
 				  </div>
 				 </div>
 				 <br />
@@ -1276,7 +1097,9 @@ class admin_skin {
 				  	   
 	}
 	
-	//+--------------------------------------------------------------------
+	function get_css() { }
+	
+	//-----------------------------------------
 	
 	function menu_foot() {
 		
@@ -1286,72 +1109,89 @@ class admin_skin {
 	}
 	
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
 
-	function menu_cat_expanded($name="", $links="", $id = "") {
+	function menu_cat_wrap($show, $name="", $links="", $id = "", $desc, $color='#FFF', $extra='') {
 		global $IN;
 	
-		return "<a name='cat$id'></a>
-				<div class='tableborder'>
-				  <div class='cattitle'>
-				    <a href='{$this->base_url}&act=menu&show={$IN['show']}&out=$id' target='menu'><img src='{$this->img_url}/minus.gif' border='0' alt='Collapse Category' title='Collapse Category'></a>
-				    <a href='{$this->base_url}&act=menu&show={$IN['show']}&out=$id' target='menu'>$name</a>
+		return "$extra
+				<div style='padding:4px;background-color:$color'>
+				<div class='tableborder' style='display:{$show['div_fo']}' id='fo_{$id}'>
+				  <div class='menumaintopon'>
+				    <a href='#' onclick=\"togglemenucategory({$id}, 0); return false;\"><img src='{$this->img_url}/minus.gif' border='0' alt='Collapse Category' title='Collapse Category'></a>
+				    <a href='#' title='$desc' onclick=\"togglemenucategory({$id}, 0); return false;\">$name</a>
 				  </div>
-				  <div class='plain'>$links</div>
+				  <div class='menulinkwrap'>$links</div>
 				</div>
-				<br />\n";
+				<div class='tableborder' style='display:{$show['div_fc']}' id='fc_{$id}'>
+				  <div class='menumaintopoff'>
+				    <a href='#' onclick=\"togglemenucategory({$id}, 1); return false;\"><img src='{$this->img_url}/plus.gif' border='0' alt='Collapse Category' title='Collapse Category'></a>
+				    <a href='#' title='$desc' onclick=\"togglemenucategory({$id}, 1); return false;\">$name</a>
+				  </div>
+				</div>
+				</div>\n";
 				
 	
 	}
 	
-	//+--------------------------------------------------------------------
 	
 	
-	function menu_cat_collapsed($name="", $id = "", $desc="") {
-		global $IN;
+	//-----------------------------------------
 	
-		return "<div class='tableborder'>
-				  <div class='cattitle'>
-				    <a href='{$this->base_url}&act=menu&show=,{$IN['show']},$id#cat$id' target='menu'><img src='{$this->img_url}/plus.gif' border='0' alt='Collapse Category' title='Collapse Category'></a>
-				    <a href='{$this->base_url}&act=menu&show=,{$IN['show']},$id#cat$id' target='menu'>$name</a>
-				  </div>
-				  <div class='desc'>$desc</div>
-				</div>
-				<br />\n";
-	
-	}
-	
-	//+--------------------------------------------------------------------
-	
-	function menu_cat_link($url="", $name="", $urltype=0)
+	function menu_cat_link($pid, $cid, $url="", $name="", $urltype=0, $isredirect=0)
 	{
 		global $INFO;
 		
 		if ( $urltype == 1 )
 		{
-			$theurl = $INFO['board_url'].'/index.'.$INFO['php_ext'].'?';
+			$theurl = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?';
 		}
 		else
 		{
 			$theurl = $this->base_url;
 		}
+		
+		if ( $isredirect )
+		{
+			$icon      = "<img src='{$this->img_url}/menu_shortcut.gif' border='0' alt='' valign='absmiddle'>";
+			$extra_css = ';font-style:italic';
+		}
+		else
+		{
+			$icon      = "<img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>";
+			$extra_css = "";
+		}
 			
-		return "<img src='{$this->img_url}/item.gif' border='0' alt='' valign='absmiddle'>&nbsp;<a href='{$theurl}&$url' target='body' style='text-decoration:none'>$name</a><br />";
+		return "<div class='menulinkoff' id='m_{$cid}_{$pid}' onmouseout=\"change_cell_color('m_{$cid}_{$pid}', 'menulinkoff');\" onmouseover=\"change_cell_color('m_{$cid}_{$pid}', 'menulinkon');\">&nbsp;{$icon}&nbsp;<a href='{$theurl}&$url' target='body' style='text-decoration:none{$extra_css}'>$name</a></div>\n";
 	
 	}
 	
 	
-	//+--------------------------------------------------------------------
+	//-----------------------------------------
 	
-	function frame_set() {
-		global $IN, $ibforums;
+	function frame_set()
+	{
+		global $ibforums, $std;
+		
+		$extra_query = 'act=index';
+		
+		if ( $ibforums->input['act'] != 'idx' )
+		{
+			$extra_query = str_replace( '&amp;', '&', $std->clean_value($_SERVER['QUERY_STRING']) );
+			$extra_query = str_replace( "{$ibforums->vars['board_url']}"           , "" , $extra_query );
+			$extra_query = preg_replace( "!/?admin\.{$ibforums->vars['php_ext']}!i", "" , $extra_query );
+			$extra_query = preg_replace( "!^\?!"                                   , "" , $extra_query );
+			$extra_query = str_replace( "printframes=1"                            , "" , $extra_query );
+			$extra_query = preg_replace( "!adsess=(\w){32}!"                       , "" , $extra_query );
+			$extra_query = preg_replace( "!s=(\w){32}!"                            , "" , $extra_query );
+		}
 		
 		$frames = "<html>
 		   			 <head><title>Invision Power Board Administration Center</title></head>
 					   <frameset cols='185, *' frameborder='no' border='0' framespacing='0'>
 					   	<frame name='menu' noresize scrolling='auto' src='{$this->base_url}&act=menu'>
-					   	<frame name='body' noresize scrolling='auto' src='{$this->base_url}&act=index'>
+					   	<frame name='body' noresize scrolling='auto' src='{$this->base_url}&{$extra_query}'>
 					   </frameset>
 				   </html>";
 				   
@@ -1359,6 +1199,15 @@ class admin_skin {
 					  
 	}
 
+	function skin_jump_menu_wrap()
+	{
+		global $ibforums, $DB;
+		
+		return "<br /><div align='center' style='width:250px;margin-left:auto;margin-right:auto;'>
+			   <div style='padding:3px 0px 3px 0px;border:1px solid #AAA;'>
+			   <div class='tablepad' align='center'>".$ibforums->admin->skin_jump_menu()."</div></div></div>";
+		
+	}
 
 }
 
diff --git a/upload/sources/admin/admin_template_functions.php b/upload/sources/admin/admin_template_functions.php
new file mode 100644
index 00000000..f9cf5805
--- /dev/null
+++ b/upload/sources/admin/admin_template_functions.php
@@ -0,0 +1,356 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Admin Template functions library
+|   > Script written by Matt Mecham
+|   > Date started: 19th November 2003
+|
+|   > DBA Checked: Tue 25th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+class admin_template_functions
+{
+
+	var $menu_fontchange  = "";
+	var $menu_sizechange  = "";
+	var $menu_backchange  = "";
+	var $menu_fontcolor   = "";
+	var $menu_widthchange = "";
+	var $menu_highchange  = "";
+	var $default_css      = "";
+	
+	//-----------------------------------------
+	// Constructor
+	//-----------------------------------------
+	
+	function admin_template_functions()
+	{
+		$this->default_css = "font-family:Verdana;font-size:11pt;color:black;background-color:white;border:3px outset #555";
+	}
+	
+	//-----------------------------------------
+	// Build generic editor
+	//-----------------------------------------
+	
+	function build_generic_editor_area( $data )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = "";
+		
+		$return .= $this->html_build_editor_top();
+		
+		$return .= "
+					<script language='javascript'>
+					<!--
+      				var template_bit_ids = 'txt{$data['textareaname']}';
+					//-->
+					</script>
+					<div class='tableborder'>
+		            <div class='titlemedium'>
+				    <table width='100%' cellpadding='0' cellspacing='0' border='0'>
+				    <tr>
+				     <td width='1%' align='left' valign='middle'>
+				         <input type='button' value='Float'  class='realdarkbutton' title='Open this template editor in a large window' onclick=\"pop_win('act={$data['act']}&code=floateditor&id={$data['textareaname']}', 'Float', 800, 400)\">&nbsp;
+				     </td>
+				     <td width='95%' align='left' valign='middle'>&nbsp;<b>{$data['title']}</b></td>
+				     <td width='5% align='right'  valign='middle' nowrap='nowrap' ><!--TOP.RIGHT--></td>
+				   </tr>
+				   <!--TR.ROW-->
+				   </table>
+				   </div>";
+				   			  
+		$return .= "<div align='center' style='padding:2px;'>".$ibforums->adskin->form_textarea("txt{$data['textareaname']}", $data['textareainput'], $ibforums->vars['tx'], $ibforums->vars['ty'], 'none', "txt{$data['textareaname']}", $this->default_css )."</div>\n";
+		
+		$return .= $this->html_build_editor_bottom();
+		
+		return $return;
+		
+	}
+	
+	//-----------------------------------------
+	// Build editor text area table
+	//-----------------------------------------
+	
+	function build_editor_area( $html, $template=array(), $img="" )
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = "";
+		
+		$template['func_data'] = str_replace( "'", '&#039;', $template['func_data'] );
+		
+		$spiffy_diffy = "<div align='center' style='position:absolute;width:99%;display:none;text-align:center' id='dv_{$template['suid']}'>
+						 <table cellspacing='0' width='500' align='center' cellpadding='6' style='background:#EEE;border:2px outset #555;'>
+						 <tr>
+						  <td align='center' valign='top'>
+						   <b>Advanced: Template Bit Incoming Variables</b><br />Leave alone if unsure. Separate many with a comma.
+						   <br /><input class='textinput' name='funcdata_{$template['suid']}' value='{$template['func_data']}' type='text' size='50' />
+						   <br /><br />
+						   <input type='button' class='realdarkbutton' value='Save and Close' onclick=\"togglediv('dv_{$template['suid']}');\" />
+						  </td>
+						 </tr>
+						 </table>
+						</div>";
+		
+		$return .= "<div class='tableborder'>
+		            <div class='titlemedium'>
+				    <table width='100%' cellpadding='0' cellspacing='0' border='0'>
+				    <tr>
+				     <td width='1%' align='left' valign='middle'>
+				         <input type='button' value='Float'  class='realdarkbutton' title='Open this template editor in a large window' onclick=\"pop_win('act=templ&code=floateditor&id={$template['suid']}', 'Float{$template['suid']}', 800, 400)\">&nbsp;
+				     </td>
+				     <td width='95%' align='left' valign='middle'>&nbsp;{$img}<b>{$template['easy_name']}</b></td>
+				     <td width='5% align='right' nowrap='nowrap' >
+					  <input type='button' value='Macro Look-up'  class='realbutton' title='View a macro definition' onClick='pop_win(\"act=rtempl&code=macro_one&suid={$template['suid']}\", \"MacroWindow\", 400, 200)'>
+					  <input type='button' value='Compare'  class='realbutton' title='Compare the edited version to the original' onClick='pop_win(\"act=rtempl&code=compare&suid={$template['suid']}\", \"CompareWindow\", 500,400)'>
+					  <input type='button' value='Restore'  class='realbutton' title='Restore the original, unedited template bit' onClick='restore(\"{$template['suid']}\",\"{$ibforums->input['expand']}\")'>
+					  <input type='button' value='View Original'  class='realbutton' title='View the HTML for the unedited template bit' onClick='pop_win(\"act=rtempl&code=preview&suid={$template['suid']}&type=html\", \"OriginalPreview\", 400,400)'>
+					  <input type='button' value='Show Data Variables...' class='realdarkbutton' title='View and edit the incoming data variables for this template bit' onclick=\"toggleview('dv_{$template['suid']}')\"/>
+					  &nbsp;
+					</td>
+				   </tr>
+				   </table>
+				   $spiffy_diffy
+				   </div>";
+				   			  
+		$return .= "<div align='center' style='padding:2px;'>".$ibforums->adskin->form_textarea("txt{$template['suid']}", $html, $ibforums->vars['tx'], $ibforums->vars['ty'], 'none', "t{$template['suid']}", $this->default_css )."</div>\n";
+		
+		$return .= "</div>";
+		
+		return $return;
+		
+	}
+	
+	//-----------------------------------------
+	// Build JS for floated window
+	//-----------------------------------------
+	
+	function build_editor_area_floated($no_buttons=0)
+	{
+		global $ibforums, $std, $DB;
+		
+		$return = "<form name='theform'>";
+		
+		$return .= $this->html_build_editor_top();
+		
+		$return .= "<div class='tableborder'>
+		            <div class='titlemedium' align='right'>";
+		            
+		if ( $no_buttons == 0 )
+		{
+			$return .= "
+				      <input type='button' value='Search'  class='realbutton' title='Search the templates for a string' onClick='pop_win(\"act=rtempl&code=search&suid={$template['suid']}&type=html\", \"Search\", 500,400)'>
+					  <input type='button' value='Macro Look-up'  class='realbutton' title='View a macro definition' onClick='pop_win(\"code=macro_one&suid={$template['suid']}\", \"MacroWindow\", 400, 200)'>
+					  <input type='button' value='Compare'  class='realbutton' title='Compare the edited version to the original' onClick='pop_win(\"act=rtempl&code=compare&suid={$template['suid']}\", \"CompareWindow\", 500,400)'>
+					  <input type='button' value='Restore'  class='realbutton' title='Restore the original, unedited template bit' onClick='restore(\"{$template['suid']}\",\"{$ibforums->input['expand']}\")'>
+					  <input type='button' value='View Original' class='realbutton' title='View the HTML for the unedited template bit' onClick='pop_win(\"act=rtempl&code=preview&suid={$template['suid']}&type=html\", \"OriginalPreview\", 400,400)'>
+				   ";
+		}
+		
+		$return .= "</div>";
+				   			  
+		$return .= "<div align='center' style='padding:2px;'>".$ibforums->adskin->form_textarea("templatebit", $html, $ibforums->vars['tx'], $ibforums->vars['ty'], 'none', "templatebit", $this->default_css )."</div>\n";
+		
+		$return .= "</div>";
+											  
+		$return .= "<script type='text/javascript'>
+				   		var template_id = '{$ibforums->input['id']}';
+				   		var template_bit  = eval(\"opener.document.theform.txt\"+template_id+\".value\");
+				   		document.theform.templatebit.value = template_bit;
+				   		var template_bit_ids = 'templatebit';
+				   		
+				   		function saveandclose()
+				   		{
+				   			eval(\"opener.document.theform.txt\"+template_id+\".value = document.theform.templatebit.value\");
+				   			window.close();
+				   		}
+				   </script>
+				   ";
+									 
+		$return .= $this->html_build_editor_bottom();
+		
+		$return .= "<br /><div class='tableborder'><div class='catrow2' align='center' style='padding:4px;'><input type='button' onclick='saveandclose()' value='Copy back to original textarea and close window' class='realdarkbutton' /></div></div></form>";
+		
+		$ibforums->html = $return;
+		
+		$ibforums->admin->print_popup();
+		
+	}
+	
+	//-----------------------------------------
+	// Build editor preferences menus
+	//-----------------------------------------
+	
+	function build_editor_pref_menus()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->menu_fontchange =  "<select name='fontchange' class='smalldropdown'>
+								   <option value='monaco'>Monaco</option>
+								   <option value='courier'>Courier</option>
+								   <option value='verdana'>Verdana</option>
+								   <option value='arial'>Arial</option>
+								   </select>";
+						   
+		$this->menu_sizechange =  "<select name='sizechange' class='smalldropdown'>
+								   <option value='8pt'>8pt</option>
+								   <option value='9pt'>9pt</option>
+								   <option value='10pt'>10pt</option>
+								   <option value='11pt'>11pt</option>
+								   <option value='12pt'>12pt</option>
+								   </select>";
+								   
+		$this->menu_backchange =  "<select name='backchange' class='smalldropdown'>
+								   <option value='black'>Black</option>
+								   <option value='white'>White</option>
+								   <option value='#EEEEEE'>Light Gray</option>
+								   <option value='gray'>Gray</option>
+								   </select>";
+								   
+		$this->menu_fontcolor  =  "<select name='fontcolor' class='smalldropdown'>
+								   <option value='black'>Black</option>
+								   <option value='white'>White</option>
+								   <option value='blue'>Blue</option>
+								   <option value='lightgreen'>Light Green</option>
+								   <option value='green'>Green</option>
+								   <option value='darkgreen'>Dark Green</option>
+								   <option value='gray'>Gray</option>
+								   </select>";
+								   
+		$this->menu_widthchange = "<select name='widthchange' class='smalldropdown'>
+								   <option value='100%'>100%</option>
+								   <option value='90%'>90%</option>
+								   <option value='80%'>80%</option>
+								   <option value='70%'>70%</option>
+								   <option value='60%'>60%</option>
+								   <option value='50%'>50%</option>
+								   </select>";
+								  
+		$this->menu_highchange  = "<select name='highchange' class='smalldropdown'>
+								   <option value='50px'>50px</option>
+								   <option value='100px'>100px</option>
+								   <option value='200px'>200px</option>
+								   <option value='300px'>300px</option>
+								   <option value='400px'>400px</option>
+								   <option value='500px'>500px</option>
+								   <option value='600px'>600px</option>
+								   <option value='700px'>700px</option>
+								   <option value='800px'>800px</option>
+								   <option value='900px'>900px</option>
+								   <option value='1000px'>1000px</option>
+								   </select>";
+								   
+		if ( $cookie = $std->my_getcookie( 'acpeditorprefs' ) )
+		{ 
+			list( $font, $size, $bg, $fc, $width, $height ) = explode( "," ,$cookie );
+			
+			$this->default_css  = "font-family:$font;font-size:$size;color:$fc;background-color:$bg;width:$width;height:$height;border:3px outset #555";
+			
+			$this->menu_fontchange   = preg_replace( "/(option value='".preg_quote($font)."')/"   , "\\1 selected='selected'", $this->menu_fontchange  );
+			$this->menu_sizechange   = preg_replace( "/(option value='".preg_quote($size)."')/"   , "\\1 selected='selected'", $this->menu_sizechange  );
+			$this->menu_backchange   = preg_replace( "/(option value='".preg_quote($bg)."')/"     , "\\1 selected='selected'", $this->menu_backchange  );
+			$this->menu_fontcolor    = preg_replace( "/(option value='".preg_quote($fc)."')/"     , "\\1 selected='selected'", $this->menu_fontcolor   );
+			$this->menu_widthchange  = preg_replace( "/(option value='".preg_quote($width)."')/"  , "\\1 selected='selected'", $this->menu_widthchange );
+			$this->menu_highchange   = preg_replace( "/(option value='".preg_quote($height)."')/" , "\\1 selected='selected'", $this->menu_highchange  );
+		}
+	}
+	
+	
+	function html_build_editor_top()
+	{
+		global $ibforums;
+		
+		$this->build_editor_pref_menus();
+		
+		return "
+				<script type='text/javascript'>
+				function toggleprefsmenu()
+				{
+					closedimage = '{$ibforums->skin_url}/editor_closed.gif';
+					openimage   = '{$ibforums->skin_url}/editor_open.gif';
+					id          = 'prefsbox';
+					
+					if ( itm = my_getbyid(id) )
+					{
+						if (itm.style.display == \"none\")
+						{
+							my_show_div(itm);
+							document.images.edimage.src = openimage;
+						}
+						else
+						{
+							my_hide_div(itm);
+							document.images.edimage.src = closedimage;
+						}
+					}
+				}
+				</script>
+				<div class='tableborder'>
+				<div class='maintitle' align='left'><a href='#' onclick=\"toggleprefsmenu()\"><img id='edimage' src='{$ibforums->skin_url}/editor_closed.gif' border='0' alt='Editor Preferences' /></a>
+				<div style='border-left:1px solid #B1B1B1;border-right:1px solid #B1B1B1;border-bottom:1px solid #B1B1B1;width:181px;background:#FFF;display:none;position:absolute;' id='prefsbox'>
+				  <table cellpadding='4' cellspacing='0' width='100%' border='0'>
+				  <tr>
+				   <td nowrap='nowrap'>Font Family</td>
+				   <td width='100%'>{$this->menu_fontchange}</td>
+				  </tr>
+				  <tr>
+				   <td nowrap='nowrap'>Font Size</td>
+				   <td width='100%'>{$this->menu_sizechange}</td>
+				  </tr>
+				  <tr>
+				   <td nowrap='nowrap'>Font Color</td>
+				   <td width='100%'>{$this->menu_fontcolor}</td>
+				  </tr>
+				  <tr>
+				   <td nowrap='nowrap'>Background</td>
+				   <td width='100%'>{$this->menu_backchange}</td>
+				  </tr>
+				  <tr>
+				   <td nowrap='nowrap'>Area Width</td>
+				   <td width='100%'>{$this->menu_widthchange}</td>
+				  </tr>
+				  <tr>
+				   <td nowrap='nowrap'>Area Height</td>
+				   <td width='100%'>{$this->menu_highchange}</td>
+				  </tr>
+				  <tr>
+				   <td colspan='2' align='center'>
+				   <input type='button' value='Change' class='realbutton' onclick=\"toggleprefsmenu(); changefont();\" />
+				   <input type='button' value=' X ' class='realdarkbutton' onclick=\"toggleprefsmenu();\" />
+				   </td>
+				  </tr>
+				  </table>
+				</div>
+				</div>
+				<div class='tablepad'><!--BEFORETEXTAREA-->";
+	}
+	
+	function html_build_editor_bottom()
+	{
+		return "<!--IPB.EDITORBOTTOM--></div>\n</div></div>";
+	}
+	
+	
+}
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/html/sys-img/index.html b/upload/sources/admin/index.html
similarity index 100%
rename from upload/html/sys-img/index.html
rename to upload/sources/admin/index.html
diff --git a/upload/sources/admin/skin_info.php b/upload/sources/admin/skin_info.php
new file mode 100644
index 00000000..da57d813
--- /dev/null
+++ b/upload/sources/admin/skin_info.php
@@ -0,0 +1,190 @@
+<?php
+
+
+$css_names = array(
+
+'BODY' => "Web Page Body",
+'TABLE, TR, TD' => "Default table",
+'a:link, a:visited, a:active' => "Default link",
+'a:hover' => "Default link hover",
+'.googlebottom, .googlebottom a:link, .googlebottom a:visited, .googlebottom a:active' => "Simple Search Results: Dark",
+'.googlish, .googlish a:link, .googlish a:visited, .googlish a:active' => "Simple Search Results: Topic Link",
+'.googlesmall, .googlesmall a:link, .googlesmall a:active, .googlesmall a:visited' => "Simple Search Results: Small Text",
+'option.sub' => "Search Form: Select forums box: subcat colour",
+'.caldate' => "Calendar: Date",
+'#ucpmenu' => "User CP: Menu colour",
+'#ucpcontent' => "User CP: Content colour",
+'#logostrip'  => "Board Header: Logo Strip",
+'#submenu' => "Board Header: Icon Strip",
+'#submenu a:link, #submenu a:visited, #submenu a:active' => "Board Header: Icon Strip link colours",
+'#userlinks' => "Board Header: Member Bar",
+'.activeuserstrip' => 'Forums & Topics: Active users bar',
+'.pformstrip'      => 'Global: Sub heading',
+'.pformleft'       => 'Global: left side table cell',
+'.pformleftw'      => 'Global: left side table cell wide',
+'.pformright'      => 'Global: right side table cell',
+'.post1'           => 'Post View: Alt colour #1',
+'.post2'		   => 'Post View: Alt colour #2',
+'.postlinksbar'     => 'Post View: Track topic, etc links',
+'.row1'			  => 'Global: Alt row #1',
+'.row2'			  => 'Global: Alt row #2',
+'.row3'			  => 'Global: Alt row #3',
+'.row4'			  => 'Global: Alt row #4',
+'.darkrow1'		  => 'Global: Alt dark row #1',
+'.darkrow2'		  => 'Global: Alt dark row #2',
+'.darkrow3'		  => 'Global: Alt dark row #3',
+'.hlight'		  => 'Msgr: Inbox row selected',
+'.dlight'		  => 'Msgr: Inbox row not selected',
+'.titlemedium'	  => 'Global: Sub heading (minor)',
+'.titlemedium a:link, .titlemedium a:visited, .titlemedium a:active' =>'Global: Sub heading (minor) Links',
+'.maintitle'     => 'Global: Main table heading',
+'.maintitle a:link, .maintitle a:visited, .maintitle a:active' => 'Global: Main table heading Links',
+'.plainborder'   => 'Global: Table alt #1',
+'.tableborder'   => 'Global: Table cellspacing colour',
+'.tablefill'     => 'Global: Table alt #2',
+'.tablepad'		 => 'Global: Table alt #3',
+'.desc'			 => 'Forum View: Last post info',
+'.signature'	 => 'Post View: Signature',
+'.normalname'	 => 'Post View: Member name (reg)',
+'.unreg'		 => 'Post View: Unreg name',
+'.searchlite'    => 'Global: Search highlighting',
+'#QUOTE'         => 'Quote Box',
+'#CODE'		     => 'Code Box',
+
+);
+
+$skin_names = array(
+
+					 'skin_boards'  => array(
+					 						   'Board Index',
+					 						   'Elements for the board index listing (shows you all the forums and is the first page you see when visiting the board) such as
+					 						   forum link HTML, active user overview HTML, board statistics overview HTML, today\'s birthdays overview HTML',
+					 						   'act=idx'
+					 						),
+					 						
+					 'skin_buddy'   => array(
+					 							'MyAssistant',
+					 							'Elements for the myAssistant feature, including links and search boxes',
+					 							'act=buddy',
+					 						),
+					 'skin_calendar'=> array(
+					 							'Calendar',
+					 							'Elements for the calendar, including calendar view, view events',
+					 							'act=calendar'
+					 						),
+					 'skin_emails'  => array(
+					 							'Member Contact',
+					 							'Elements from various contact methods, such as ICQ, AIM pager, email form and report post to moderator form',
+					 							'act=ICQ',
+					 						),
+					 'skin_forum'   => array(
+					 							'Forum Index',
+					 							'Elements for forum view (list all topics in forum). Includes forum log in window, forum rules',
+					 							'act=SF&f=1',
+					 						),
+					 'skin_global'  => array(
+					 							'All Global HTML',
+					 							'Various HTML elements such as board header, redirect page, error page',
+					 						),
+					 'skin_help'	=> array(	
+					 							'Help',
+					 							'Elements for the help screen, including search boxes and view help files',
+					 							'act=help'
+					 						),
+					 'skin_legends' => array(
+					 							'Board Legends',
+					 							'Elements for the "view all emoticons" windows, and the "Find User"',
+					 							'act=legends'
+					 						),
+					 'skin_login'   => array(
+					 							'Log In',
+					 							'Elements for the log in form',
+					 							'act=Login'
+					 						),
+					 'skin_mlist'   => array(
+					 							'Member List',
+					 							'Elements for the member list views',
+					 							'act=Members'
+					 						),
+					 'skin_mod'		=> array(
+					 							'Moderator Function',
+					 							'Elements for the moderator tools such as delete topic, edit topic and the moderator CP',
+					 						),
+					 'skin_msg'     => array(
+					 							'Messenger',
+					 							'Elements for the messenger, such as view inbox, view message, archive messages, etc',
+					 							'act=Msg',
+					 						),
+					 'skin_online'  => array (
+					 							'Online List',
+					 							'Elements for the "Show all online users" link',
+					 							'act=Online',
+					 						),
+					 'skin_poll'    => array (
+					 							'View Poll',
+					 							'Elements for the poll view, includes vote form and vote results',
+					 						),
+					 'skin_post'    => array(
+					 							'Post Screen',
+					 							'Elements for the post screens such as new topic, reply to topic, quote post, edit post, some messenger new PM sections, some calender new event',
+					 						),
+					 'skin_printpage'=> array(
+					 							'Printable Topic',
+					 							'Elements for displaying the "printable topic" page',
+					 						),
+					 'skin_profile'	=> array(
+					 							'Profile View',
+					 							'Elements for viewing a members profile',
+					 							'showuser=1',
+					 						),
+					 'skin_register' => array(
+					 							'Register',
+					 							'Elements for the register form, validate account form and COPPA forms',
+					 							'act=Reg',
+					 						),
+					 'skin_search'   => array(
+					 							'Search',
+					 							'Elements for the search forum and the results view',
+					 							'act=Search',
+					 						),
+					 'skin_stats'    => array(
+					 							'Statistics',
+					 							'Elements for various functions such as "View Moderating Team", "View todays top 10 posts", "View Active Topics"',
+					 							'act=Stats',
+					 						),
+					 'skin_topic'	 => array(
+					 							'Topic View',
+					 							'Elements for the topic view screen, such as post view, inline attachment view, etc.',
+					 							'showtopic=1'
+					 						),
+					 
+					 'skin_modcp'	 => array(
+					 							'Mod CP',
+					 							'Elements for the moderators control panel sections.',
+					 							'act=ModCP',
+					 						),
+					 						
+					 'skin_portal'	 => array(
+					 							'IPB Portal',
+					 							'Elements for IPB Portal.',
+					 						),
+					 						
+					 						
+					 'skin_ucp'      => array(
+					 							'User Control Panel',
+					 							'Elements for the user control panel, such as the menu (also used in Messenger Views), edit profile, edit signature, edit avatar, etc.',
+					 							'act=UserCP',
+					 						),
+					 						
+					 						
+					 'skin_subscriptions' => array(
+					 							'Subscriptions Manager (Retail Only)',
+					 							'Elements for the subscription manager.',
+					 						)
+);
+
+
+$bit_names = array();
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/announcements.php b/upload/sources/announcements.php
new file mode 100644
index 00000000..a5d96e34
--- /dev/null
+++ b/upload/sources/announcements.php
@@ -0,0 +1,263 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Announcements module
+|   > Module written by Matt Mecham
+|   > Date started: 29th March 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class announcements
+{
+    /*-------------------------------------------------------------------------*/
+    // CONSTRUCTOR
+    /*-------------------------------------------------------------------------*/
+    
+    function announcements()
+    {
+    
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // AUTO RUN
+    /*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $forums, $print;
+        
+        $ibforums->input['id'] = intval($ibforums->input['id']);
+        $ibforums->input['f']  = intval($ibforums->input['f']);
+        
+        if ( ! $ibforums->input['id'] and ! $ibforums->input['f'] )
+        {
+        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        }
+        
+        //-----------------------------------------
+		// Get the announcement
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'ucp_get_all_announcements_byid', array( 'id' => $ibforums->input['id'] ) );
+		$DB->cache_exec_query();
+		
+		$announce = $DB->fetch_row();
+		
+		if ( ! $announce['announce_id'] or ! $announce['announce_forum'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        }
+       
+        //-----------------------------------------
+		// Permission to see it?
+		//-----------------------------------------
+		
+		$pass = 0;
+		
+		if ( $announce['announce_forum'] == '*' )
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$tmp = explode( ",", $announce['announce_forum'] );
+			
+			if ( ! is_array( $tmp ) and ! ( count( $tmp ) ) )
+			{
+				$pass = 0;
+			}
+			else
+			{
+				foreach( $tmp as $id )
+				{
+					if ( $forums->forum_by_id[ $id ]['id'] )
+					{
+						$pass = 1;
+						break;
+					}
+				}
+			}
+		}
+		
+		if ( $pass != 1 )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        }
+         
+        //-----------------------------------------
+        // Mkay, get the require libraries
+        //-----------------------------------------
+        
+        require_once( ROOT_PATH.'sources/lib/post_parser.php' );
+        $parser = new post_parser();
+        
+        require_once( ROOT_PATH.'sources/topics.php' );
+        $topic = new topics();
+        
+        $topic->topic_init();
+        
+    	//-----------------------------------------
+    	// Parsey parsey!
+    	//-----------------------------------------
+        
+        $member = $topic->parse_member( $announce );
+        
+        //-----------------------------------------
+		// Parse HTML tag on the fly
+		//-----------------------------------------
+		
+		$announce['announce_post'] = $parser->convert( array( 'TEXT'    => $announce['announce_post'],
+															  'SMILIES' => 1,
+															  'CODE'    => 1,
+													 )      );
+															   
+		
+		$parser->pp_do_html  = $announce['announce_html_enabled'];
+		$parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+		$parser->pp_nl2br    = 1;
+		
+		$announce['announce_post'] = $parser->post_db_parse( $announce['announce_post'] );
+		
+		if ( $announce['announce_start'] and $announce['announce_end'] )
+		{
+			$announce['running_date'] = sprintf( $ibforums->lang['announce_both'], gmdate( 'jS F Y', $announce['announce_start'] ), gmdate( 'jS F Y', $announce['announce_end'] ) );
+		}
+		else if ( $announce['announce_start'] and ! $announce['announce_end'] )
+		{
+			$announce['running_date'] = sprintf( $ibforums->lang['announce_start'], gmdate( 'jS F Y', $announce['announce_start'] ) );
+		}
+		else if ( ! $announce['announce_start'] and $announce['announce_end'] )
+		{
+			$announce['running_date'] = sprintf( $ibforums->lang['announce_end'], gmdate( 'jS F Y', $announce['announce_end'] ) );
+		}
+		else
+		{
+			$announce['running_date'] = '';
+		}
+		
+		$this->output = $topic->html->announcement_show($announce, $member);
+		
+		//-----------------------------------------
+		// Show
+		//-----------------------------------------
+		
+		$this->nav = $forums->forums_breadcrumb_nav( $ibforums->input['f'] );
+		
+		//-----------------------------------------
+		// Update hits
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'update' => 'announcements', 'set' => 'announce_views=announce_views+1', 'where' => "announce_id=".$ibforums->input['id'] ) );
+		$DB->simple_shutdown_exec();
+		
+		$print->add_output( $this->output );
+        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$forums->forum_by_id[ $ibforums->input['f'] ]['name'],
+        					 	  'JS'       => 0,
+        					 	  'NAV'      => $this->nav,
+        				 )      );
+        
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // REBUILD
+    /*-------------------------------------------------------------------------*/
+    
+    function announce_retire_expired()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	//-----------------------------------------
+    	// Update all out of date 'uns
+    	//-----------------------------------------
+    	
+    	$DB->do_update( 'announcements', array( 'announce_active' => 0 ), 'announce_end != 0 AND announce_end < '.time() );
+    	
+    	$this->announce_recache();
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // REBUILD
+    /*-------------------------------------------------------------------------*/
+    
+    function announce_recache()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$ibforums->cache['announcements'] = array();
+    	
+    	$DB->cache_add_query( 'ucp_get_all_announcements', array() );
+		$DB->cache_exec_query();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$start_ok = 0;
+			$end_ok   = 0;
+			
+			if ( ! $r['announce_active'] )
+			{
+				continue;
+			}
+			
+			if ( ! $r['announce_start'] )
+			{
+				$start_ok = 1;
+			}
+			else if ( $r['announce_start'] < time() )
+			{
+				$start_ok = 1;
+			}
+			
+			if ( ! $r['announce_end'] )
+			{
+				$end_ok = 1;
+			}
+			else if ( $r['announce_end'] > time() )
+			{
+				$end_ok = 1;
+			}
+			
+			if ( $start_ok and $end_ok )
+			{
+				$ibforums->cache['announcements'][ $r['announce_id'] ] = array( 'announce_id'    => $r['announce_id'],
+																				'announce_title' => $r['announce_title'],
+																				'announce_start' => $r['announce_start'],
+																				'announce_end'   => $r['announce_end'],
+																				'announce_forum' => $r['announce_forum'],
+																				'announce_views' => $r['announce_views'],
+																				'member_id'      => $r['id'],
+																				'member_name'    => $r['name']
+																			  );
+			}
+		}
+		
+		$DB->obj['use_shutdown'] = 0;
+		$std->update_cache( array( 'name' => 'announcements', 'array' => 1, 'deletefirst' => 1 ) );
+    }
+        
+       
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/boards.php b/upload/sources/boards.php
new file mode 100644
index 00000000..f04932e7
--- /dev/null
+++ b/upload/sources/boards.php
@@ -0,0 +1,389 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Board index module
+|   > Module written by Matt Mecham
+|   > Date started: 17th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class boards {
+
+    var $output   = "";
+    var $base_url = "";
+    var $html     = "";
+    var $forums   = array();
+    var $mods     = array();
+    var $cats     = array();
+    var $children = array();
+    var $nav;
+    
+    var $news_topic_id = "";
+    var $news_forum_id = "";
+    var $news_title    = "";
+    var $sep_char      = "";
+    var $statfunc      = "";
+    
+    /*-------------------------------------------------------------------------*/
+    // INIT
+    /*-------------------------------------------------------------------------*/
+    
+    function init()
+    {
+		global $ibforums, $DB, $std, $forums, $print, $skin_universal;
+    	
+    	$this->base_url = $ibforums->base_url;
+
+        // Get more words for this invocation!
+        
+        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_boards', $ibforums->lang_id);
+        
+        $this->html = $std->load_template('skin_boards');
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Auto run function
+    /*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $forums, $print, $skin_universal;
+        
+        $this->init();
+        
+        require ROOT_PATH.'sources/lib/boardstats_functions.php';
+        
+        $this->statfunc = new boardstats_functions();
+       	
+       	$this->statfunc->register_class( $this );
+        
+        if (! $ibforums->member['id'] )
+        {
+        	$ibforums->input['last_visit'] = time();
+        }
+        
+        if ( $ibforums->vars['converge_login_method'] != 'username' )
+        {
+        	$ibforums->lang['qli_name'] = $ibforums->lang['email_address'];
+        }
+        
+        $this->output .= $this->html->PageTop( $std->get_date( $ibforums->input['last_visit'], 'LONG' ) );
+        
+        
+        //-----------------------------------------
+        // What are we doing?
+        //-----------------------------------------
+        
+        $this->process_all_cats();
+        
+        //-----------------------------------------
+		// Add in show online users
+		//-----------------------------------------
+		
+		$stats_html .= $this->statfunc->active_users();
+			
+		//-----------------------------------------
+		// Are we viewing the calendar?
+		//-----------------------------------------
+		
+		$stats_html .= $this->statfunc->show_calendar_events();
+		
+		//-----------------------------------------
+		// Add in show stats
+		//-----------------------------------------
+		
+		$stats_html .= $this->statfunc->show_totals();
+		
+		if ($stats_html != "")
+		{
+			$collapsed_ids = ','.$std->my_getcookie('collapseprefs').',';
+		
+			$show['div_fo'] = 'show';
+			$show['div_fc'] = 'none';
+				
+			if ( strstr( $collapsed_ids, ',stat,' ) )
+			{
+				$show['div_fo'] = 'none';
+				$show['div_fc'] = 'show';
+			}
+			
+			$this->output .= $this->html->stats_header($this->statfunc->users_online, $this->statfunc->total_posts, $this->statfunc->total_members, $show);
+			$this->output .= $stats_html;
+			$this->output .= $this->html->stats_footer();
+		}
+		
+		//-----------------------------------------
+		// Add in board info footer
+		//-----------------------------------------
+		
+		$this->output .= $this->html->bottom_links();
+		
+		//-----------------------------------------
+		// Check for news forum.
+		//-----------------------------------------
+		
+		if ( $forums->forum_by_id[ $ibforums->vars['news_forum_id'] ]['last_id'] and $ibforums->vars['index_news_link'] )
+		{
+			$t_html = $this->html->newslink( $this->news_forum_id, stripslashes($forums->forum_by_id[ $ibforums->vars['news_forum_id'] ]['last_title']) ,
+											 $forums->forum_by_id[ $ibforums->vars['news_forum_id'] ]['last_id']);
+											 
+			$this->output = str_replace( "<!-- IBF.NEWSLINK -->" , "$t_html" , $this->output );
+		}
+		
+		//-----------------------------------------
+		// Showing who's chatting OLD?
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat_account_no'] and $ibforums->vars['chat_who_on'] )
+		{
+			require_once( ROOT_PATH.'sources/lib/chat_functions.php' );
+			
+			$chat = new chat_functions();
+			
+			$chat->register_class( $this );
+			
+			$chat_html = $chat->get_online_list();
+			
+			$this->output = str_replace( "<!--IBF.WHOSCHATTING-->", $chat_html, $this->output );
+		}
+		
+		//-----------------------------------------
+		// Showing who's chatting NEW?
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['chat04_account_no'] and $ibforums->vars['chat04_who_on'] )
+		{
+			require_once( ROOT_PATH.'sources/lib/chat04_functions.php' );
+			
+			$chat = new chat_functions();
+			
+			$chat->register_class( $this );
+			
+			$chat_html = $chat->get_online_list();
+			
+			$this->output = str_replace( "<!--IBF.WHOSCHATTING-->", $chat_html, $this->output );
+		}
+		
+		//-----------------------------------------
+		// Print as normal
+		//-----------------------------------------
+
+        $print->add_output("$this->output");
+        
+        $cp = " (Powered by Invision Power Board)";
+        
+        if ($ibforums->vars['ips_cp_purchase'])
+        {
+        	$cp = "";
+        }
+        
+        $print->do_output( array( 'TITLE' => $ibforums->vars['board_name'].$cp, 'JS' => 0, 'NAV' => $this->nav ) );
+        
+	}
+
+    /*-------------------------------------------------------------------------*/
+	//
+	// Display sub forums
+	//
+	/*-------------------------------------------------------------------------*/
+     
+	function show_subforums($fid)
+	{
+		global $std, $DB, $ibforums, $forums;
+		
+		$this->init();
+		
+		//-----------------------------------------
+		// Get show / hide cookah
+		//-----------------------------------------
+		
+		$collapsed_ids = ','.$std->my_getcookie('collapseprefs').',';
+        
+        $forums->register_class( $this );
+			
+		if ( is_array( $forums->forum_cache[ $fid ] ) )
+		{
+			$cat_data = $forums->forum_by_id[ $fid ];
+			
+			$cat_data['div_fo'] = 'show';
+			$cat_data['div_fc'] = 'none';
+				
+			if ( strstr( $collapsed_ids, ','.$fid.',' ) and ( $cat_data['sub_can_post'] == 1 ) )
+			{
+				$cat_data['div_fo'] = 'none';
+				$cat_data['div_fc'] = 'show';
+			}
+			
+			foreach( $forums->forum_cache[ $fid ] as $id => $forum_data )
+			{
+				//-----------------------------------------
+				// Get all subforum stats
+				// and calculate
+				//-----------------------------------------
+				
+				if ( $ibforums->vars['forum_cache_minimum'] )
+				{
+					$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
+					$need_desc[] = $forum_data['id'];
+				}
+					
+				if ( $forum_data['redirect_on'] )
+				{
+					$temp_html .= $this->html->forum_redirect_row( $forum_data );
+				}
+				else
+				{
+					$temp_html .= $this->html->ForumRow( $forums->forums_format_lastinfo( $forums->forums_calc_children( $forum_data['id'], $forum_data ) ) );
+				}
+			}
+		}
+		
+		if ( $temp_html )
+		{
+			$sub_output .= $this->html->subheader($cat_data);
+			$sub_output .= $temp_html;
+			$sub_output .= $this->html->end_this_cat();
+		}
+		else
+		{
+			return $sub_output;
+		}
+		
+		unset($temp_html);
+		
+		$sub_output .= $this->html->end_all_cats();
+		
+		//-----------------------------------------
+        // Get descriptions?
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['forum_cache_minimum'] and count($need_desc) )
+        {
+        	$DB->simple_construct( array( 'select' => 'id,description', 'from' => 'forums', 'where' => 'id IN('.implode( ',', $need_desc ) .')' ) );
+        	$DB->simple_exec();
+        	
+        	while( $r = $DB->fetch_row() )
+        	{
+        		$sub_output = str_replace( "<!--DESCRIPTION:{$r['id']}-->", $r['description'], $sub_output );
+        	}
+        }
+		
+		return $sub_output;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	//
+	// PROCESS ALL CATEGORIES
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function process_all_cats() {
+		global $std, $DB, $ibforums, $forums;
+		
+		$need_desc = array();
+		
+		//-----------------------------------------
+		// Get show / hide cookah
+		//-----------------------------------------
+		
+		$collapsed_ids = ','.$std->my_getcookie('collapseprefs').',';
+		
+		$forums->register_class( $this );
+		
+		if ( is_array( $forums->forum_cache['root'] ) and count( $forums->forum_cache['root'] ) )
+		{
+			foreach( $forums->forum_cache['root'] as $id => $forum_data )
+			{
+				$cat_data = $forum_data;
+				
+				$cat_data['div_fo'] = 'show';
+				$cat_data['div_fc'] = 'none';
+					
+				if ( strstr( $collapsed_ids, ','.$cat_data['id'].',' ) )
+				{
+					$cat_data['div_fo'] = 'none';
+					$cat_data['div_fc'] = 'show';
+				}
+				
+				if ( is_array( $forums->forum_cache[ $forum_data['id'] ] ) )
+				{
+					foreach( $forums->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+					{
+						//-----------------------------------------
+						// Get all subforum stats
+						// and calculate
+						//-----------------------------------------
+						
+						if ( $ibforums->vars['forum_cache_minimum'] )
+						{
+							$forum_data['description'] = "<!--DESCRIPTION:{$forum_data['id']}-->";
+							$need_desc[] = $forum_data['id'];
+						}
+						
+						if ( $forum_data['redirect_on'] )
+						{
+							$temp_html .= $this->html->forum_redirect_row( $forum_data );
+						}
+						else
+						{
+							$temp_html .= $this->html->ForumRow( $forums->forums_format_lastinfo( $forums->forums_calc_children( $forum_data['id'], $forum_data ) ) );
+						}
+					}
+				}
+				
+				if ( $temp_html )
+				{
+					$this->output .= $this->html->CatHeader_Expanded($cat_data);
+					$this->output .= $temp_html;
+					$this->output .= $this->html->end_this_cat();
+				}
+				
+				unset($temp_html);
+			}
+		}
+		
+        $this->output .= $this->html->end_all_cats();
+        
+        //-----------------------------------------
+        // Get descriptions?
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['forum_cache_minimum'] and count($need_desc) )
+        {
+        	$DB->simple_construct( array( 'select' => 'id,description', 'from' => 'forums', 'where' => 'id IN('.implode( ',', $need_desc ) .')' ) );
+        	$DB->simple_exec();
+        	
+        	while( $r = $DB->fetch_row() )
+        	{
+        		$this->output = str_replace( "<!--DESCRIPTION:{$r['id']}-->", $r['description'], $this->output );
+        	}
+        }
+    }
+    
+        
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/browsebuddy.php b/upload/sources/browsebuddy.php
index 1c185038..7758b0a1 100644
--- a/upload/sources/browsebuddy.php
+++ b/upload/sources/browsebuddy.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,35 +19,44 @@
 |   > Date started: 2nd July 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new buddy;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-class buddy {
+class assistant {
 
     var $output     = "";
     var $page_title = "";
     var $nav        = array();
     var $html       = "";
 
-
-    
-    function buddy() {
-    	global $ibforums, $DB, $std, $print;
+	/*-------------------------------------------------------------------------*/
+	// AUTO RUN
+	/*-------------------------------------------------------------------------*/
+	
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Require the HTML and language modules
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_buddy', $ibforums->lang_id );
     	
     	$this->html = $std->load_template('skin_buddy');
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// What to do?
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	switch($ibforums->input['code']) {
     		
@@ -57,7 +65,9 @@ class buddy {
     			break;
     	}
     	
+    	//-----------------------------------------
     	// If we have any HTML to print, do so...
+    	//-----------------------------------------
     	
     	$this->output = str_replace( "<!--CLOSE.LINK-->", $this->html->closelink(), $this->output );
     	
@@ -66,12 +76,17 @@ class buddy {
     		
  	}
  	
- 	function splash() {
- 		global $ibforums, $DB, $std;
+ 	/*-------------------------------------------------------------------------*/
+ 	// SPLASH
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function splash()
+ 	{
+		global $ibforums, $DB, $std, $forums;
  		
- 		//--------------------------------------------
+ 		//-----------------------------------------
  		// Is this a guest? If so, get 'em to log in.
- 		//--------------------------------------------
+ 		//-----------------------------------------
  		
  		if ( ! $ibforums->member['id'] )
  		{
@@ -80,73 +95,54 @@ class buddy {
  		}
  		else
  		{
- 		
- 			//--------------------------------------------
+ 			//-----------------------------------------
  			// Get the forums we're allowed to search in
- 			//--------------------------------------------
+ 			//-----------------------------------------
  			
  			$allow_forums   = array();
  			
  			$allow_forums[] = '0';
  			
- 			$DB->query("SELECT id, read_perms, password FROM ibf_forums");
- 			
- 			while( $i = $DB->fetch_row() )
- 			{
- 				$pass = 1;
-				
-				if ($i['password'] != "")
-				{
-					if ( ! $c_pass = $std->my_getcookie('iBForum'.$i['id']) )
-					{
-						$pass = 0;
-					}
-				
-					if ( $c_pass == $i['password'] )
-					{
-						$pass = 1;
-					}
-					else
-					{
-						$pass = 0;
-					}
-				}
-				
-				if ($pass == 1)
-				{
-					if ( $std->check_perms($i['read_perms']) == TRUE )
-					{
-						$allow_forums[] = $i['id'];
-					}
-				}
- 			}
+ 			foreach( $forums->forum_by_id as $id => $data )
+			{
+				$allow_forums[] = $data['id'];
+			}
  			
  			$forum_string = implode( ",", $allow_forums );
  			
- 			//--------------------------------------------
+ 			//-----------------------------------------
  			// Get the number of posts since the last visit.
- 			//--------------------------------------------
+ 			//-----------------------------------------
  			
- 			if (! $ibforums->member['last_visit'] )
+ 			if ( ! $ibforums->member['last_visit'] )
  			{
  				$ibforums->member['last_visit'] = time() - 3600;
  			}
  			
- 			$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE post_date > '".$ibforums->member['last_visit']."' AND queued <> 1 AND forum_id IN($forum_string)");
+ 			if ( $ibforums->forum_read[0] > $last_time )
+			{
+				$ibforums->member['last_visit'] = $ibforums->forum_read[0];
+			}
  			
+ 			$DB->cache_add_query( 'buddy_posts_last_visit', array( 'last_visit' => $ibforums->member['last_visit'], 'forum_string' => $forum_string ) );
+			$DB->cache_exec_query();
+		
  			$posts = $DB->fetch_row();
  			
- 			$posts_total = ($posts['posts'] < 1) ? 0 : $posts['posts'];
+ 			$posts_total = intval($posts['posts']);
  			
- 			//-----------------------------------------------------------------------
+ 			//-----------------------------------------
  			// Get the number of posts since the last visit to topics we've started.
- 			//-----------------------------------------------------------------------
+ 			//-----------------------------------------
  			
- 			$DB->query("SELECT COUNT(tid) as replies
- 						FROM ibf_topics WHERE last_post > '".$ibforums->member['last_visit']."'
- 						AND approved=1 AND forum_id IN($forum_string)
- 						AND posts > 0
- 						AND starter_id='".$ibforums->member['id']."'");
+ 			$DB->simple_construct( array( 'select' => 'count(*) as replies',
+ 										  'from'   => 'topics',
+ 										  'where'  => "last_post > {$ibforums->member['last_visit']}
+														AND approved=1 AND forum_id IN($forum_string)
+														AND posts > 0
+														AND starter_id={$ibforums->member['id']}" ) );
+ 			
+ 			$DB->simple_exec();
  			
  			$topic = $DB->fetch_row();
  			
@@ -169,15 +165,9 @@ class buddy {
  				$text = $this->html->build_away_msg();
  			}
  			
- 			
  			$this->output = $this->html->main($text);
  		}
- 		
- 		
  	}
-	 
- 	
-        
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/calendar.php b/upload/sources/calendar.php
index 70d98134..7c78723a 100644
--- a/upload/sources/calendar.php
+++ b/upload/sources/calendar.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,17 +19,22 @@
 |   > Date started: 12th June 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
-
-$idx = new calendar;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
 class calendar {
 
-    var $output   = "";
-    var $base_url = "";
-    var $html     = "";
+    var $output     = "";
+    var $base_url   = "";
+    var $html       = "";
     var $page_title = "";
     var $nav;
     
@@ -41,13 +45,18 @@ class calendar {
     var $offset          = "";
     var $start_date      = "";
     var $first_day_array = "";
-    var $month_words     = array();
-    var $day_words       = array();
+    var $month_words       = array();
+    var $day_words         = array();
+    var $query_month_cache = array();
+    var $query_bday_cache  = array();
     
+    /*-------------------------------------------------------------------------*/
+    // AUTO-RUN
+    /*-------------------------------------------------------------------------*/
     
-    function calendar()
+    function auto_run()
     {
-        global $ibforums, $DB, $std, $print, $skin_universal;
+		global $ibforums, $DB, $std, $print, $skin_universal;
         
         $ibforums->lang = $std->load_words($ibforums->lang, 'lang_calendar', $ibforums->lang_id);
         $ibforums->lang = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
@@ -56,6 +65,7 @@ class calendar {
         
         $this->post_html = $std->load_template('skin_post');
        
+       	$ibforums->vars['bday_show_cal_max'] = 5;
 		
 		//-----------------------------------------
         // Prep our chosen dates
@@ -76,6 +86,11 @@ class calendar {
 								 'seconds' => $a[5]
 							   );
         
+        if ( $ibforums->input['year'] )
+        {
+        	$ibforums->input['y'] = $ibforums->input['year'];
+        }
+        
         $this->chosen_month = ( ! intval($ibforums->input['m']) ) ? $this->now_date['mon']  : intval($ibforums->input['m']);
         $this->chosen_year  = ( ! intval($ibforums->input['y']) ) ? $this->now_date['year'] : intval($ibforums->input['y']);
         
@@ -93,7 +108,7 @@ class calendar {
         // Get the timestamp for our chosen date
         //-----------------------------------------
         
-        $this->our_datestamp   = mktime( 1,1,1, $this->chosen_month, 1, $this->chosen_year);
+        $this->our_datestamp   = mktime( 0,0,1, $this->chosen_month, 1, $this->chosen_year);
         $this->first_day_array = getdate($this->our_datestamp);
         	
         //-----------------------------------------
@@ -109,9 +124,6 @@ class calendar {
         							$ibforums->lang['D_3'], $ibforums->lang['D_4'], $ibforums->lang['D_5'],
         							$ibforums->lang['D_6'] );
         
-        
-        //-----------------------------------------
-        
         switch( $ibforums->input['code'] )
         {
         	case 'newevent':
@@ -142,18 +154,24 @@ class calendar {
         		$this->do_edit();
         		break;
         		
+        	case 'showweek':
+        		$this->show_week();
+        		break;
+        		
         	case 'delete':
         		$ibforums->input['eventid'] = intval($ibforums->input['e']);
         		$this->do_edit(1);
         		break;
+        		
+        	case 'find':
+        		$this->find_date();
+        		break;
         	
         	default:
         		$this->show_month();
         		break;
         }
         
-        //-----------------------------------------
-        
         if ($this->page_title == "")
         {
         	$this->page_title = $ibforums->vars['board_name']." ".$ibforums->lang['page_title'];
@@ -166,17 +184,42 @@ class calendar {
         
         $print->add_output("$this->output");
         $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-        
 	}
 	
+	/*-------------------------------------------------------------------------*/
+ 	// Find
+ 	/*-------------------------------------------------------------------------*/
 	
-	//--------------------------------------
+	function find_date()
+	{
+		global $ibforums, $DB, $std, $print;
+		
+		if ( $ibforums->input['what'] )
+		{
+			if ( $ibforums->input['what'] == 'thismonth' )
+			{
+				$std->boink_it( $ibforums->base_url."act=calendar&amp;m={$this->now_date['mon']}&amp;y={$this->now_date['year']}" );
+			}
+			else
+			{
+				$time = time() + $std->get_time_offset();
+				
+				$std->boink_it( $ibforums->base_url."act=calendar&amp;code=showweek&amp;week={$time}" );
+			}
+		}
+		else
+		{
+			$this->show_month();
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
  	// Display Edit / Delete boxes
- 	//--------------------------------------
+ 	/*-------------------------------------------------------------------------*/
 	
 	function edit()
 	{
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
     
     	if ( $ibforums->member['g_calendar_post'] != 1)
 		{
@@ -188,8 +231,6 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission') );
 		}
 		
-		//-----------------------------------------
-		
 		$eventid   = intval($ibforums->input['eventid']);
 		
 		if ($eventid == "")
@@ -197,15 +238,14 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cal_no_events') );
 		}
         
-        $DB->query("SELECT * FROM ibf_calendar_events WHERE eventid=$eventid");
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'calendar_events', 'where' => "eventid=$eventid" ) );
+        $DB->simple_exec();
         
         if ( ! $event = $DB->fetch_row() )
         {
         	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cal_no_events') );
         }
         
-        //-----------------------------------------
-        
         $can_edit = 0;
         
         //-----------------------------------------
@@ -242,15 +282,11 @@ class calendar {
 			}
 		}
         
-        //-----------------------------------------
-		
 		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] ? $ibforums->vars['max_post_length'] * 1024 : 2140000;
 		
 		$this->nav[] = "<a href='{$ibforums->base_url}&act=calendar'>{$ibforums->lang['page_title']}</a>";
 		$this->nav[] = $ibforums->lang['edit_event']." ".$event['title'];
 		
-		//-----------------------------------------
-		
 		$checked = array( 'normal' => '', 'range' => '', 'recur' => '' );
 		
 		if ( $event['event_ranged'] )
@@ -333,13 +369,13 @@ class calendar {
 		
 		if ($ibforums->member['mgroup'] == $ibforums->vars['admin_group'])
 		{
+			//-----------------------------------------
 			// Get all the group ID's and names from the DB and build the selection box
+			//-----------------------------------------
 			
 			$group_choices = "";
 			
-			$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-			
-			while ( $r = $DB->fetch_row() )
+			foreach( $ibforums->cache['group_cache'] as $id => $r )
 			{
 				$selected = "";
 				
@@ -354,72 +390,30 @@ class calendar {
 			$this->output .= $this->html->calendar_admin_group_box($group_choices);
 		}
 			
-			
-															   
-		$this->output .= $this->post_html->postbox_buttons( str_replace( "<br>", "\n", $event['event_text'] ) );
+		$this->output .= $this->post_html->postbox_buttons( $std->my_br2nl($event['event_text']) );
 		
 		$this->output  = str_replace( '<!--IBF.EMO-->'  , $this->post_html->get_box_enableemo( $event['show_emoticons'] ? 'checked="checked"' : "" )  , $this->output );
 		
 		$this->output .= $this->html->calendar_end_form($ibforums->lang['calendar_edit_submit']);
  		
- 		
- 		//--------------------------------------
+ 		//-----------------------------------------
  		// Add in the smilies box
- 		//--------------------------------------
+ 		//-----------------------------------------
  		
- 		$show_table = 0;
-		$count      = 0;
-		$smilies    = "<tr align='center'>\n";
-		
-		// Get the smilies from the DB
-		
-		$DB->query("SELECT * FROM ibf_emoticons WHERE clickable='1'");
-		
-		while ($elmo = $DB->fetch_row() )
-		{
-		
-			$show_table++;
-			$count++;
-			
-			$smilies .= "<td><a href=\"javascript:emoticon('".$elmo['typed']."')\"><img src=\"".$ibforums->vars['EMOTICONS_URL']."/".$elmo['image']."\" alt='smilie' border='0'></a>&nbsp;</td>\n";
-			
-			if ($count == $ibforums->vars['emo_per_row']) {
-				$smilies .= "</tr>\n\n<tr align='center'>";
-				$count = 0;
-			}
-		}
-		
-		if ($count != $ibforums->vars['emo_per_row'])
-		{
-			for ($i = $count ; $i < $ibforums->vars['emo_per_row'] ; ++$i) {
-				$smilies .= "<td>&nbsp;</td>\n";
-			}
-			$smilies .= "</tr>";
-		}
-		
-		$table = $this->post_html->smilie_table();
-		
-		if ($show_table != 0)
-		{
-			$table = preg_replace( "/<!--THE SMILIES-->/", $smilies, $table );
-			$this->output = preg_replace( "/<!--SMILIE TABLE-->/", $table, $this->output );
-		}
-		
-		// Remove the "add sig" box <!--IBF.END_SIG_CLICK-->
-		
-		$this->output = preg_replace( "/<!--SIG-->.+?<!--ESIG-->/s", "", $this->output );
-															   
-		
+ 		require_once( ROOT_PATH.'sources/post.php' );
+ 		$this->post       = new post();
+ 		$this->post->html = $this->post_html;
+ 		
+ 		$this->output = $this->post->html_add_smilie_box( $this->output );
 	}
 	
-	//-----------------------------------------
+	/*-------------------------------------------------------------------------*/
 	// Do the edit
-	//-----------------------------------------
-	
+	/*-------------------------------------------------------------------------*/
 	
 	function do_edit($del=0)
 	{
-        global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
+		global $ibforums, $DB, $std, $print;
     
     	if ( $ibforums->member['g_calendar_post'] != 1)
 		{
@@ -431,8 +425,6 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission') );
 		}
 		
-		//-----------------------------------------
-		
 		$eventid   = intval($ibforums->input['eventid']);
 		
 		if ($eventid == "")
@@ -440,15 +432,14 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cal_no_events') );
 		}
         
-        $DB->query("SELECT * FROM ibf_calendar_events WHERE eventid='$eventid'");
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'calendar_events', 'where' => "eventid=$eventid" ) );
+        $DB->simple_exec();
         
         if ( ! $event = $DB->fetch_row() )
         {
         	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cal_no_events') );
         }
         
-        //-----------------------------------------
-		
 		$can_edit = 0;
         
         //-----------------------------------------
@@ -477,15 +468,16 @@ class calendar {
         // Are we deleting this event?
         //-----------------------------------------
         
-        if ($HTTP_POST_VARS['event_delete'] == 1 or $del == 1)
+        if ( $_POST['event_delete'] == 1 or $del == 1 )
         {
-        	$DB->query("DELETE FROM ibf_calendar_events WHERE eventid='$eventid'");
-			
+        	$DB->simple_exec_query( array( 'delete' => 'calendar_events', 'where' => "eventid=$eventid" ) );
+        	
+        	$this->_call_recache();
+        	
 			$print->redirect_screen( $ibforums->lang['delete_event_redirect'] , "&act=calendar" );
         }
         else
         {
-        
 			$ibforums->vars['max_post_length'] = $ibforums->vars['max_post_length'] ? $ibforums->vars['max_post_length'] : 2140000;
 			
 			//-----------------------------------------
@@ -500,12 +492,12 @@ class calendar {
 			// Do we have a valid post?
 			//-----------------------------------------
 			
-			if (strlen( trim($HTTP_POST_VARS['Post']) ) < 1)
+			if (strlen( trim($_POST['Post']) ) < 1)
 			{
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_post') );
 			}
 			
-			if (strlen( $HTTP_POST_VARS['Post'] ) > ($ibforums->vars['max_post_length']*1024))
+			if (strlen( $_POST['Post'] ) > ($ibforums->vars['max_post_length']*1024))
 			{
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'post_too_long') );
 			}
@@ -537,9 +529,9 @@ class calendar {
 			
 			if ($ibforums->member['mgroup'] == $ibforums->vars['admin_group'])
 			{
-				if ( is_array( $HTTP_POST_VARS['e_groups'] ) )
+				if ( is_array( $_POST['e_groups'] ) )
 				{
-					$read_perms = implode( ",", $HTTP_POST_VARS['e_groups'] );
+					$read_perms = implode( ",", $_POST['e_groups'] );
 					$read_perms .= ",".$ibforums->vars['admin_group'];
 				}
 				
@@ -547,7 +539,6 @@ class calendar {
 				{
 					$read_perms = '*';
 				}
-			
 			}
 			
 			$day   = intval($ibforums->input['e_day']);
@@ -631,164 +622,361 @@ class calendar {
 			// Add it to the DB
 			//-----------------------------------------
 			
-			$db_string = $DB->compile_db_update_string( array (
-																'year'           => $year,
-																'month'          => $month,
-																'mday'           => $day,
-																'title'          => $ibforums->input['event_title'],
-																'event_text'     => $ibforums->input['Post'],
-																'read_perms'     => $read_perms,
-																'priv_event'     => $private_event,
-																'unix_stamp'     => mktime( 23, 59, 59, $month, $day, $year),
-																'show_emoticons' => $allow_emoticons,
-																'end_day'        => $end_day,
-																'end_month'		 => $end_month,
-																'end_year'       => $end_year,
-																'end_unix_stamp' => mktime( 23, 59, 59, $end_month, $end_day, $end_year),
-																'event_ranged'   => $event_ranged,
-																'event_bgcolor'	 => $ibforums->input['bg'],
-																'event_color'	 => $ibforums->input['ft'],
-																'event_repeat'   => $event_repeat,
-																'repeat_unit'    => $ibforums->input['recur_unit'],
-													  )       );
-													  
-			$DB->query("UPDATE ibf_calendar_events SET $db_string WHERE eventid='$eventid'");
+			$DB->do_update( 'calendar_events', array (
+													   'year'           => $year,
+													   'month'          => $month,
+													   'mday'           => $day,
+													   'title'          => $ibforums->input['event_title'],
+													   'event_text'     => $ibforums->input['Post'],
+													   'read_perms'     => $read_perms,
+													   'priv_event'     => $private_event,
+													   'unix_stamp'     => mktime( 0, 0, 1, $month, $day, $year),
+													   'show_emoticons' => $allow_emoticons,
+													   'end_day'        => $end_day,
+													   'end_month'		=> $end_month,
+													   'end_year'       => $end_year,
+													   'end_unix_stamp' => mktime( 23, 59, 59, $end_month, $end_day, $end_year),
+													   'event_ranged'   => $event_ranged,
+													   'event_bgcolor'  => $ibforums->input['bg'],
+													   'event_color'    => $ibforums->input['ft'],
+													   'event_repeat'   => $event_repeat,
+													   'repeat_unit'    => $ibforums->input['recur_unit'],
+													  )
+							, "eventid=$eventid"   );
+							
+			$this->_call_recache();
 			
 			$print->redirect_screen( $ibforums->lang['edit_event_redirect'] , "&act=calendar&code=showevent&eventid=$eventid" );
-		
 		}
 	}
 	
-	//-----------------------------------------
+	/*-------------------------------------------------------------------------*/
+	// Show WEEK
+	/*-------------------------------------------------------------------------*/
 	
-	function show_month() {
-        global $ibforums, $DB, $std, $print;
+	function show_week()
+	{
+		global $ibforums, $DB, $std, $print;
+        
+        $in_week  = intval($ibforums->input['week']);
         
         //-----------------------------------------
-        // Get the birthdays from the database
+        // Get start of week
         //-----------------------------------------
         
-        if ( $ibforums->vars['show_bday_calendar'] )
+        $startweek = getdate( $in_week );
+        
+        //-----------------------------------------
+        // Not Sunday? Go back..
+        //-----------------------------------------
+        
+        $startweek['wday'] = intval($startweek['wday']);
+        
+        if ( $startweek['wday'] > 0 )
         {
-			$birthdays = array();
-			
-			$DB->query("SELECT bday_day from ibf_members WHERE bday_month=".$this->chosen_month);
-					
-			while ($user = $DB->fetch_row())
+			while ( $startweek['wday'] != 0 )
 			{
-				$birthdays[ $user['bday_day'] ]++;
+				$startweek['wday']--;
+				$in_week -= 86400;
 			}
-		}
-		
-		//-----------------------------------------
-        // Get recurring events
-        //-----------------------------------------
-
-        $recurring = array();
-        
-        $timenow  =  mktime( 1, 1, 1, $this->chosen_month, 1, $this->chosen_year);
-        $timethen =  mktime( 23, 59, 59, $this->chosen_month, 0, $this->chosen_year);
-        
-        $DB->query("SELECT * FROM ibf_calendar_events
-        			WHERE event_repeat=1
-        			AND ( repeat_unit IN ('w','m') OR (repeat_unit='y' AND month={$this->chosen_month}) )
-        			");
-        			
-        while ( $rec = $DB->fetch_row() )
-        {
-        	$recurring[] = $rec;
-        }
-		
-		//-----------------------------------------
-        // Get the events
-        //-----------------------------------------
-        
-        $events  = array();
-        
-        $DB->query("SELECT * FROM ibf_calendar_events
-        			WHERE event_repeat <> 1 AND month={$this->chosen_month} AND year={$this->chosen_year}
-        			OR (event_ranged=1 AND ( unix_stamp < $timenow AND end_unix_stamp > $timenow ) )
-        		  ");
-        
-        while ( $event = $DB->fetch_row() )
-        {
-        	if ( $event['priv_event'] == 1 )
-        	{
-        		if ($ibforums->member['id'] != $event['userid'])
-        		{
-        			continue;
-        		}
-        	}
-        	
-        	if ( $event['read_perms'] != '*' )
-        	{
-        		if ( ! preg_match( "/(^|,)".$ibforums->member['mgroup']."(,|$)/", $event['read_perms'] ) )
-        		{
-        			continue;
-        		}
-        	}
-        	
-        	if ( $event['event_ranged'] == 1 )
-        	{
-        		$range[$event['eventid']] = array(
-												 'end_unix_stamp'  => $event['end_unix_stamp'],
-												 'unix_stamp'      => $event['unix_stamp'],
-												 'day'             => $event['mday'],
-												 'month'		   => $event['month'],
-												 'year'		   	   => $event['year'],
-												 'end_day'		   => $event['end_day'],
-												 'end_month'	   => $event['end_month'],
-												 'end_year'	       => $event['end_year'],
-												 'ft'			   => $event['event_color'],
-												 'bg'			   => $event['event_bgcolor'],
-												 'eventid'		   => $event['eventid'],
-												 'title'		   => $event['title'],
-											   );
-        	}
-        	
-        	$events[ $event['mday'] ][] = $event;
+			
+			$startweek = getdate( $in_week );
         }
         
         //-----------------------------------------
-        // Flip the range array to ensure that old
-        // ranges go to the top for consistency
+        // Get end of week
         //-----------------------------------------
         
-        if ( is_array($range) )
-        {
-       		$range = array_reverse($range, TRUE);
-        }
+        $endweek   = getdate( $in_week + 604800 );
+        
+        $our_timestamp = $in_week;
         
         //-----------------------------------------
         // Figure out the next / previous links
         //-----------------------------------------
         
-        $prev_month = array();
-        $next_month = array();
+        $prev_month = $this->get_prev_month($this->chosen_month, $this->chosen_year);
+        $next_month = $this->get_next_month($this->chosen_month, $this->chosen_year);
         
-        $prev_month['year_id']    = $this->chosen_year;
-        $next_month['year_id']    = $this->chosen_year;
+        $prev_week = getdate( $in_week - 604800 );
+        $next_week = getdate( $in_week + 604800 );
         
-        $prev_month['month_id']   = $this->chosen_month - 1;
-        $prev_month['month_name'] = $this->month_words[$this->chosen_month - 2];
+        $this->output .= $this->html->cal_week_content( $startweek['mday'], $this->month_words[$startweek['mon'] - 1], $startweek['year'], $prev_week, $next_week);
         
-        $next_month['month_name'] = $this->month_words[$this->chosen_month];
-        $next_month['month_id']   = $this->chosen_month + 1;
+        $last_month_id = -1;
         
-        if ($this->chosen_month == 1)
+		//-----------------------------------------
+		// Get events
+		//-----------------------------------------
+		
+		$seen_days = array(); // Holds yday
+		$seen_ids  = array();
+        
+        //-----------------------------------------
+        // Print each effing day :D
+        //-----------------------------------------
+        
+        for ( $i = 0 ; $i <= 6 ; $i++ )
         {
-        	$prev_month['month_name'] = $this->month_words[11];
-        	$prev_month['month_id']   = 12;
-        	$prev_month['year_id']    = $this->chosen_year - 1;
+        	$today = getdate( $our_timestamp );
         	
-        }
-        else if ($this->chosen_month == 12)
-        {
-        	$next_month['month_name'] = $this->month_words[0];
-            $next_month['month_id']   = 1;
-            $next_month['year_id']    = $this->chosen_year + 1;
+        	if ( $last_month_id != $today['mon'] )
+        	{
+        		$last_month_id = $today['mon'];
+        	
+        		$cal_output .= $this->html->cal_week_monthbar( $this->month_words[$today['mon'] - 1], $today['year'] );
+        		
+        		//-----------------------------------------
+				// Get the birthdays from the database
+				//-----------------------------------------
+				
+				if ( $ibforums->vars['show_bday_calendar'] )
+				{
+					$birthdays = array();
+					
+					$this->_get_birthday_sql($today['mon']);
+					
+					$birthdays = $this->query_bday_cache[ $today['mon'] ];
+				}
+				
+				//-----------------------------------------
+				// Get the events
+				//-----------------------------------------
+				
+				$this->_get_events_sql($today['mon'], $today['year']);
+				
+				$this->_process_events_sql($today['mon']);
+				
+				$recurring = $this->recurring;
+				$events    = $this->events;
+				$range     = $this->ranged;
+				
+				//-----------------------------------------
+				// Flip the range array to ensure that old
+				// ranges go to the top for consistency
+				//-----------------------------------------
+				
+				if ( is_array($range) )
+				{
+					$range = array_reverse($range, TRUE);
+				}
+			}
+        	
+        	//-----------------------------------------
+			// Ranged Events...
+			//-----------------------------------------
+			
+			if ( count($range) > 0 )
+			{ 
+				foreach( $range as $r => $d)
+				{
+					$s   = 0;
+					
+					if ( ( $our_timestamp >= $d['unix_stamp'] ) AND ($our_timestamp <= $d['end_unix_stamp']) )
+					{
+						$this_day_events .= $this->html->cal_week_events_wrap_range( "code=showevent&eventid=".$d['eventid'], $d['title'], $d['ft'], $d['bg']);
+						
+						$seen_ids[$d['eventid']] = 1;
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Recurring Events...
+			//-----------------------------------------
+			
+			if ( count($recurring) > 0 )
+			{
+				foreach( $recurring as $rc )
+				{
+					$recur_start = getdate( $rc['unix_stamp'] );
+					
+					$sh = 0;
+					
+					//-----------------------------------------
+					// Out of range END?
+					//-----------------------------------------
+					
+					if ( $today['year'] > $rc['end_year'] )
+					{
+						continue;
+					}
+					else if ( $today['year'] == $rc['end_year'] )
+					{
+						if ( $today['mon'] > $rc['end_month'] )
+						{
+						   continue;
+						}
+						else if ( ($today['mon'] == $rc['end_month']) AND ($today['mday'] > $rc['end_day']) )
+						{
+						   continue;
+						}
+					}
+					
+					//-----------------------------------------
+					// Out of range START?
+					//-----------------------------------------
+					
+					if ( $today['year'] < $rc['year'] )
+					{
+						continue;
+					}
+					else if ( $today['year'] == $rc['year'] )
+					{
+						if ( $today['mon'] < $rc['month'] )
+						{
+						   continue;
+						}
+						else if ( ($today['mon'] == $rc['month']) AND ($today['mday'] < $rc['mday']) )
+						{
+						   continue;
+						}
+					}
+					
+					//-----------------------------------------
+					// Lets do da WEEKLY
+					//-----------------------------------------
+					
+					if ( $rc['repeat_unit'] == 'w' )
+					{
+						if ( $today['wday'] == $recur_start['wday'])
+						{
+							$sh = 1;
+						}
+					}
+					
+					//-----------------------------------------
+					// Lets do da MONTHLY
+					//-----------------------------------------
+						
+					elseif ( $rc['repeat_unit'] == 'm' )
+					{
+						if ( $today['mday'] == $rc['mday'] )
+						{
+							$sh = 1;
+						}
+					}
+					
+					//-----------------------------------------
+					// Lets do da YEARLY
+					//-----------------------------------------
+					
+					elseif ( $rc['repeat_unit'] == 'y' )
+					{
+						if ( ($today['mday'] == $rc['mday']) AND ($today['mon'] == $rc['month']) )
+						{
+							$sh = 1;
+						}
+					}
+					
+					//-----------------------------------------
+					// Show it!
+					//-----------------------------------------
+					
+					if ( $sh == 1 )
+					{
+						$this_day_events .= $this->html->cal_week_events_wrap("code=showevent&eventid=".$rc['eventid'],$rc['title']);
+					}
+				}
+			}
+										  
+			//-----------------------------------------
+			// Normal Events...
+			//-----------------------------------------
+			
+			if ( isset($events[ $today['mday'] ]) and is_array($events[ $today['mday'] ]) )
+			{
+				if ( count( $events[ $today['mday'] ] ) > 0 )
+				{
+					foreach( $events[ $today['mday'] ] as $idx => $data )
+					{
+						if ( $seen_ids[ $data['eventid'] ] == 1 )
+						{
+							continue;
+						}
+					
+						$this_day_events .= $this->html->cal_week_events_wrap("code=showevent&eventid=".$data['eventid'],$data['title']);
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Birthdays
+			//-----------------------------------------
+			
+			if ( isset($birthdays[ $today['mday'] ]) and count( $birthdays[ $today['mday'] ] ) > 0 )
+			{
+				$no_bdays = count($birthdays[ $today['mday'] ]);
+				
+				if ( $ibforums->vars['bday_show_cal_max'] and $no_bdays <= $ibforums->vars['bday_show_cal_max'] )
+				{
+					foreach( $birthdays[ $today['mday'] ] as $idx => $user )
+					{
+						$this_day_events .= $this->html->cal_week_events_wrap(
+																		 "code=birthdays&y=".$today['year']."&m=".$today['mon']."&d=".$today['mday'],
+																		 $user['name'].$ibforums->lang['bd_birthday']
+																	   );
+					}
+
+				}
+				else
+				{
+					$this_day_events .= $this->html->cal_week_events_wrap(
+																	 "code=birthdays&y=".$today['year']."&m=".$today['mon']."&d=".$today['mday'],
+																	 sprintf( $ibforums->lang['entry_birthdays'], count($birthdays[ $today['mday'] ]) )
+																   );
+				}
+			}
+			
+			if ($this_day_events == "")
+			{
+				$this_day_events = '&nbsp;';
+			}
+			
+        	$cal_output .= $this->html->cal_week_dayentry( $this->day_words[ $today['wday'] ], $today['mday'], $this->month_words[$today['mon'] - 1], $today['mon'], $today['year'], $this_day_events );
+        	
+        	$our_timestamp += 86400;
+        	
+        	unset($this_day_events);
         }
         
+        //-----------------------------------------
+        // Switch the HTML tags...
+        //-----------------------------------------
+       
+        $this->output = str_replace( "<!--IBF.DAYS_CONTENT-->"  , $cal_output, $this->output );
+        
+        $this->output = str_replace( "<!--IBF.MONTH_BOX-->"     , $this->get_month_dropdown(), $this->output );
+        $this->output = str_replace( "<!--IBF.YEAR_BOX-->"      , $this->get_year_dropdown() , $this->output );
+        
+        //-----------------------------------------
+        // Get prev / this / next calendars
+        //-----------------------------------------
+        
+        $this->output = str_replace( "<!--PREV.MONTH-->", $this->get_mini_calendar( $prev_month['month_id'], $prev_month['year_id'] ), $this->output );
+        $this->output = str_replace( "<!--THIS.MONTH-->", $this->get_mini_calendar( $this->chosen_month    , $this->chosen_year     ), $this->output );
+        $this->output = str_replace( "<!--NEXT.MONTH-->", $this->get_mini_calendar( $next_month['month_id'], $next_month['year_id'] ), $this->output );
+        	
+        $this->nav[] = "<a href='{$ibforums->base_url}&act=calendar'>{$ibforums->lang['page_title']}</a>";
+        $this->nav[] = $this->month_words[$this->chosen_month - 1]." ".$this->chosen_year;
+        
+    }
+    
+	/*-------------------------------------------------------------------------*/
+	// SHOW MONTH
+	/*-------------------------------------------------------------------------*/
+	
+	function show_month()
+	{
+		global $ibforums, $DB, $std, $print;
+        
+        //-----------------------------------------
+        // Figure out the next / previous links
+        //-----------------------------------------
+        
+        $prev_month = $this->get_prev_month($this->chosen_month, $this->chosen_year);
+        $next_month = $this->get_next_month($this->chosen_month, $this->chosen_year);
+       
         $this->output .= $this->html->cal_main_content($this->month_words[$this->chosen_month - 1], $this->chosen_year, $prev_month, $next_month);
         
         //-----------------------------------------
@@ -798,316 +986,42 @@ class calendar {
         $day_output = "";
         $cal_output = "";
         
-        foreach ($this->day_words as $day)
+		foreach ($this->day_words as $day)
         {
         	$day_output .= $this->html->cal_day_bit($day);
         }
         
-        //-----------------------------------------
-        // Print the main calendar body
-        //-----------------------------------------
-        
-        $seen_days = array(); // Holds yday
-        $seen_ids  = array();
-        
-        for ( $c = 0 ; $c < 42; $c++ )
-        {
-        	$day_array = getdate($this->our_datestamp);
-        	      	
-        	if ( (($c) % 7 ) == 0 )
-        	{
-        		//-----------------------------------------
-        		// Kill the loop if we are no longer on our month
-        		//-----------------------------------------
-        		
-        		if ($day_array['mon'] != $this->chosen_month)
-        		{
-        			break;
-        		}
-        		
-        		$cal_output .= $this->html->cal_new_row();
-        	}
-        	
-        	//-----------------------------------------
-        	// Run out of legal days for this month?
-        	// Or have we yet to get to the first day?
-        	//-----------------------------------------
-        		
-        	if ( ($c < $this->first_day_array['wday']) or ($day_array['mon'] != $this->chosen_month) )
-        	{
-        		$cal_output .= $this->html->cal_blank_cell();
-        	}
-        	else
-        	{
-        		if ( $seen_days[ $day_array['yday'] ] == 1 )
-				{
-					//$c++;
-					continue;
-				}
-        	
-        		$seen_days[ $day_array['yday'] ] = 1;
-        		$this_day_events = "";
-        		$cal_date        = $day_array['mday'];
-        		
-        		//----------------------------------------
-        		// Ranged Events...
-        		//----------------------------------------
-        		
-        		if ( count($range) > 0 )
-        		{ 
-        			foreach( $range as $r => $d)
-        			{
-        				$s   = 0;
-        				
-        				if ( $day_array['year'] == $d['year'] and $day_array['year'] == $d['end_year'])
-        				{
-        					//------------------------------
-        					// Span across months past to cur
-        					// (Don't ask me how I got to this, it was late
-        					// and I was tired and I don't remember much now)
-        					//------------------------------
-        					
-							if ( $day_array['mon'] < $d['end_month'] AND ( $day_array['mon'] >= $d['month'] AND $day_array['mday'] >= $d['day'] ) )
-							{
-								$s = 1;
-							}
-							
-							//------------------------------
-        					// Span across months cur to past
-        					//------------------------------
-        					
-							else if ( $day_array['mon'] == $d['end_month'] AND ( $day_array['mon'] > $d['month'] AND $day_array['mday'] <= $d['end_day'] ) )
-							{
-								$s = 1;
-								
-								if ( $day_array['mday'] == 1 )
-								{
-									$d['title'] = "&laquo;".$d['title'];
-								}
-							
-							}
-							
-							//------------------------------
-        					// Current month
-        					//------------------------------
-        					
-							else if ( ($day_array['mon'] == $d['end_month']) AND ( $day_array['mday'] <= $d['end_day'] AND $day_array['mday'] >= $d['day'] ) )
-							{
-								$s = 1;
-							}
-						
-						}
-						
-						else if ( $day_array['year'] == $d['year'] and $day_array['year'] < $d['end_year'] )
-        				{
-							if ( $day_array['mon'] >= $d['end_month'] AND $day_array['mday'] >= $d['day'] )
-							{
-								$s = 1;
-							}
-						}
-						
-						else if ( $day_array['year'] > $d['year'] and $day_array['year'] == $d['end_year'] )
-        				{
-							if ( $day_array['mon'] <= $d['end_month'] AND $day_array['mday'] <= $d['end_day'] )
-							{
-								$s = 1;
-							}
-						}
-						
-						if ($s == 1)
-						{
-							$this_day_events .= $this->html->cal_events_wrap_range( "code=showevent&eventid=".$d['eventid'], $d['title'], $d['ft'], $d['bg']);
-							
-							$seen_ids[$d['eventid']] = 1;
-						}
-        			}
-        		}
-        		
-        		$this->our_datestamp += 86400;
-				
-				//----------------------------------------
-        		// Recurring Events...
-        		//----------------------------------------
-        		
-        		if ( count($recurring) > 0 )
-        		{
-        			foreach( $recurring as $rc )
-        			{
-        				$recur_start = getdate( $rc['unix_stamp'] );
-        				
-        				$sh = 0;
-        				
-        				//--------------------------------------
-        				// Out of range END?
-        				//--------------------------------------
-        				
-        				if ( $day_array['year'] > $rc['end_year'] )
-        				{
-        					continue;
-        				}
-        				else if ( $day_array['year'] == $rc['end_year'] )
-        				{
-        					if ( $day_array['mon'] > $rc['end_month'] )
-							{
-							   continue;
-							}
-							else if ( ($day_array['mon'] == $rc['end_month']) AND ($day_array['mday'] > $rc['end_day']) )
-							{
-							   continue;
-							}
-        				}
-        				
-        				//--------------------------------------
-        				// Out of range START?
-        				//--------------------------------------
-        				
-        				if ( $day_array['year'] < $rc['year'] )
-        				{
-        					continue;
-        				}
-        				else if ( $day_array['year'] == $rc['year'] )
-        				{
-        					if ( $day_array['mon'] < $rc['month'] )
-							{
-							   continue;
-							}
-							else if ( ($day_array['mon'] == $rc['month']) AND ($day_array['mday'] < $rc['mday']) )
-							{
-							   continue;
-							}
-        				}
-        				
-						//--------------------------------------
-						// Lets do da WEEKLY
-						//--------------------------------------
-						
-						if ( $rc['repeat_unit'] == 'w' )
-						{
-							if ( $day_array['wday'] == $recur_start['wday'])
-							{
-								$sh = 1;
-							}
-						}
-						
-						//--------------------------------------
-						// Lets do da MONTHLY
-						//--------------------------------------
-							
-						elseif ( $rc['repeat_unit'] == 'm' )
-						{
-							if ( $day_array['mday'] == $rc['mday'] )
-							{
-								$sh = 1;
-							}
-						}
-						
-						//--------------------------------------
-						// Lets do da YEARLY
-						//--------------------------------------
-						
-						elseif ( $rc['repeat_unit'] == 'y' )
-						{
-							if ( ($day_array['mday'] == $rc['mday']) AND ($day_array['mon'] == $rc['month']) )
-							{
-								$sh = 1;
-							}
-						}
-						
-						//--------------------------------------
-						// Show it!
-						//--------------------------------------
-						
-						if ( $sh == 1 )
-						{
-							$this_day_events .= $this->html->cal_events_wrap_recurring("code=showevent&eventid=".$rc['eventid'],$rc['title']);
-						}
-					}
-        		}
-				
-											  
-				//----------------------------------------
-				// Normal Events...
-				//----------------------------------------
-				
-				if ( isset($events[ $day_array['mday'] ]) and is_array($events[ $day_array['mday'] ]) )
-				{
-					if ( count( $events[ $day_array['mday'] ] ) > 0 )
-					{
-						foreach( $events[ $day_array['mday'] ] as $idx => $data )
-						{
-							if ( $seen_ids[ $data['eventid'] ] == 1 )
-							{
-								continue;
-							}
-							
-							$this_day_events .= $this->html->cal_events_wrap("code=showevent&eventid=".$data['eventid'],$data['title']);
-						}
-					}
-				}
-				
-				//----------------------------------------
-				// Birthdays
-				//----------------------------------------
-				
-				if ( isset($birthdays[ $day_array['mday'] ]) and $birthdays[ $day_array['mday'] ] > 0 )
-				{
-					$this_day_events .= $this->html->cal_events_wrap(
-																	 "code=birthdays&y=".$this->chosen_year."&m=".$this->chosen_month."&d=".$day_array['mday'],
-																	 sprintf( $ibforums->lang['entry_birthdays'], $birthdays[ $day_array['mday'] ] )
-																   );
-									 
-				}
-        		
-        		
-        		
-        		if ($this_day_events != "")
-        		{
-        			$cal_date = "<a href='{$ibforums->base_url}&act=calendar&code=showday&y=".$this->chosen_year."&m=".$this->chosen_month."&d=".$day_array['mday']."'>{$day_array['mday']}</a>";
-        			
-        			$this_day_events = $this->html->cal_events_start() . $this_day_events . $this->html->cal_events_end();
-        		}
-        		
-        		if ( ($day_array['mday'] == $this->now_date['mday']) and ($this->now_date['mon'] == $day_array['mon']) and ($this->now_date['year'] == $day_array['year']))
-        		{
-        			$cal_output .= $this->html->cal_date_cell_today($cal_date, $this_day_events);
-        		}
-        		else
-        		{
-        			$cal_output .= $this->html->cal_date_cell($cal_date, $this_day_events);
-        		}
-        		
-        		unset($this_day_events);
-        	}
-        	
-        }
+        $cal_output = $this->get_month_events($this->chosen_month, $this->chosen_year);
         
         //-----------------------------------------
         // Switch the HTML tags...
         //-----------------------------------------
        
-        if ( $this->chosen_year < 1500 )
-        {
-        	$this->month_words[$this->chosen_month - 1] = str_replace(",", ';&#', "&#89,101,32,111,108,100,32,99,97,108,101,110,100,97,114,32,111,102;").' '.$this->month_words[$this->chosen_month - 1];
-        }
-        
         $this->output = str_replace( "<!--IBF.DAYS_TITLE_ROW-->", $day_output, $this->output );
         $this->output = str_replace( "<!--IBF.DAYS_CONTENT-->"  , $cal_output, $this->output );
         
         $this->output = str_replace( "<!--IBF.MONTH_BOX-->"     , $this->get_month_dropdown(), $this->output );
         $this->output = str_replace( "<!--IBF.YEAR_BOX-->"      , $this->get_year_dropdown() , $this->output );
         
+        //-----------------------------------------
+        // Get prev / this / next calendars
+        //-----------------------------------------
+        
+        $this->output = str_replace( "<!--PREV.MONTH-->", $this->get_mini_calendar( $prev_month['month_id'], $prev_month['year_id'] ), $this->output );
+        $this->output = str_replace( "<!--THIS.MONTH-->", $this->get_mini_calendar( $this->chosen_month    , $this->chosen_year     ), $this->output );
+        $this->output = str_replace( "<!--NEXT.MONTH-->", $this->get_mini_calendar( $next_month['month_id'], $next_month['year_id'] ), $this->output );
+        	
         $this->nav[] = "<a href='{$ibforums->base_url}&act=calendar'>{$ibforums->lang['page_title']}</a>";
         $this->nav[] = $this->month_words[$this->chosen_month - 1]." ".$this->chosen_year;
-        
     }
     
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     // POST NEW CALENDAR EVENT
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
     function new_event()
     {
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
     
     	if ( $ibforums->member['g_calendar_post'] != 1)
 		{
@@ -1119,6 +1033,20 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission') );
 		}
 		
+		//-----------------------------------------
+		// Got date?
+		//-----------------------------------------
+		
+		$tmp = explode( "-", $ibforums->input['nd'] );
+		
+		$nd = intval( $tmp[2] );
+		$nm = intval( $tmp[1] );
+		$ny = intval( $tmp[0] );
+		
+		$nd = $nd ? $nd : $this->now['mday'];
+		$nm = $nm ? $nm : $this->now['mon'];
+		$ny = $ny ? $ny : $this->now['year'];
+		
 		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] ? $ibforums->vars['max_post_length'] * 1024 : 2140000;
 		
 		$this->nav[] = "<a href='{$ibforums->base_url}&act=calendar'>{$ibforums->lang['page_title']}</a>";
@@ -1127,11 +1055,12 @@ class calendar {
 		$this->output .= $this->post_html->get_javascript();
 		
 		$this->output .= $this->html->calendar_start_form();
+		
 		$this->output .= $this->html->table_top($ibforums->lang['post_new_event']);
 		$this->output .= $this->html->calendar_event_title();
 		$this->output .= $this->html->calendar_choose_date(
-															 $this->get_day_dropdown(), $this->get_month_dropdown(), $this->get_year_dropdown(),
-															 $this->get_day_dropdown(), $this->get_month_dropdown(), $this->get_year_dropdown(),
+															 $this->get_day_dropdown($nd), $this->get_month_dropdown($nm), $this->get_year_dropdown($ny),
+															 $this->get_day_dropdown($nd), $this->get_month_dropdown($nm), $this->get_year_dropdown($ny),
 															 $this->get_day_dropdown("1"), "<option value='w'>{$ibforums->lang['fv_days']}</option><option value='m'>{$ibforums->lang['fv_months']}</option><option value='y'>{$ibforums->lang['fv_years']}</option>",
 															 array( 'range_on' => 'none', 'range_off' => 'show', 'recur_on' => 'none', 'recur_off' => 'show' ),
 															 array( 'range' => '', 'recur' => '', 'normal' => 'checked="checked"' ),
@@ -1147,100 +1076,46 @@ class calendar {
 		
 		if ($ibforums->member['mgroup'] == $ibforums->vars['admin_group'])
 		{
-			// Get all the group ID's and names from the DB and build the selection box
+			//-----------------------------------------
+			// Get all the group ID's and names from
+			// the DB and build the selection box
+			//-----------------------------------------
 			
 			$group_choices = "";
 			
-			$DB->query("SELECT g_id, g_title FROM ibf_groups ORDER BY g_title");
-			
-			while ( $r = $DB->fetch_row() )
+			foreach( $ibforums->cache['group_cache'] as $i => $r )
 			{
 				$group_choices .= "<option value='".$r['g_id']."'>".$r['g_title']."</option>\n";
 			}
 			
 			$this->output .= $this->html->calendar_admin_group_box($group_choices);
 		}
-			
-			
 															   
 		$this->output .= $this->post_html->postbox_buttons("");
 		
 		$this->output  = str_replace( '<!--IBF.EMO-->'  , $this->post_html->get_box_enableemo( 'checked="checked"' )  , $this->output );
 		
-		
 		$this->output .= $this->html->calendar_end_form($ibforums->lang['calendar_submit']);
  		
- 		
- 		//--------------------------------------
+ 		//-----------------------------------------
  		// Add in the smilies box
- 		//--------------------------------------
+ 		//-----------------------------------------
  		
- 		$show_table = 0;
-		$count      = 0;
-		$smilies    = "<tr align='center'>\n";
-		
-		// Get the smilies from the DB
-		
-		$DB->query("SELECT * FROM ibf_emoticons WHERE clickable=1");
-		
-		while ($elmo = $DB->fetch_row() ) {
-		
-			$show_table++;
-			$count++;
-			
-			// Make single quotes as URL's with html entites in them
-			// are parsed by the browser, so ' causes JS error :o
-			
-			if (strstr( $elmo['typed'], "&#39;" ) )
-			{
-				$in_delim  = '"';
-				$out_delim = "'";
-			}
-			else
-			{
-				$in_delim  = "'";
-				$out_delim = '"';
-			}
-			
-			$smilies .= "<td><a href={$out_delim}javascript:emoticon($in_delim".$elmo['typed']."$in_delim){$out_delim}><img src=\"".$ibforums->vars['EMOTICONS_URL']."/".$elmo['image']."\" alt='smilie' border='0'></a>&nbsp;</td>\n";
-			
-			if ($count == $ibforums->vars['emo_per_row']) {
-				$smilies .= "</tr>\n\n<tr align='center'>";
-				$count = 0;
-			}
-		}
-		
-		if ($count != $ibforums->vars['emo_per_row'])
-		{
-			for ($i = $count ; $i < $ibforums->vars['emo_per_row'] ; ++$i)
-			{
-				$smilies .= "<td>&nbsp;</td>\n";
-			}
-			$smilies .= "</tr>";
-		}
-		
-		$table = $this->post_html->smilie_table();
-		
-		if ($show_table != 0)
-		{
-			$table = preg_replace( "/<!--THE SMILIES-->/", $smilies, $table );
-			$this->output = preg_replace( "/<!--SMILIE TABLE-->/", $table, $this->output );
-		}
-		
-		// Remove the "add sig" box <!--IBF.END_SIG_CLICK-->
-		
-		$this->output = preg_replace( "/<!--SIG-->.+?<!--ESIG-->/s", "", $this->output );
-															   
-		
+ 		require_once( ROOT_PATH.'sources/post.php' );
+ 		$this->post       = new post();
+ 		$this->post->html = $this->post_html;
+ 		
+ 		$this->output = $this->post->html_add_smilie_box( $this->output );
 	}
 	
 	
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     // ADD NEW CALENDAR EVENT TO THE DB
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
-    function add_new_event() {
-        global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
+    function add_new_event()
+    {
+		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
     
     	if ( $ibforums->member['g_calendar_post'] != 1)
 		{
@@ -1266,12 +1141,12 @@ class calendar {
 		// Do we have a valid post?
 		//-----------------------------------------
 		
-		if (strlen( trim($HTTP_POST_VARS['Post']) ) < 1)
+		if (strlen( trim($_POST['Post']) ) < 1)
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_post') );
 		}
 		
-		if (strlen( $HTTP_POST_VARS['Post'] ) > ($ibforums->vars['max_post_length']*1024))
+		if (strlen( $_POST['Post'] ) > ($ibforums->vars['max_post_length']*1024))
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'post_too_long') );
 		}
@@ -1303,9 +1178,9 @@ class calendar {
 		
 		if ($ibforums->member['mgroup'] == $ibforums->vars['admin_group'])
 		{
-			if ( is_array( $HTTP_POST_VARS['e_groups'] ) )
+			if ( is_array( $_POST['e_groups'] ) )
 			{
-				$read_perms = implode( ",", $HTTP_POST_VARS['e_groups'] );
+				$read_perms = implode( ",", $_POST['e_groups'] );
 				$read_perms .= ",".$ibforums->vars['admin_group'];
 			}
 			
@@ -1313,7 +1188,6 @@ class calendar {
 			{
 				$read_perms = '*';
 			}
-		
 		}
 		
 		$day   = intval($ibforums->input['e_day']);
@@ -1397,41 +1271,41 @@ class calendar {
 		// Add it to the DB
 		//-----------------------------------------
 		
-		$db_string = $DB->compile_db_insert_string( array (
-															'userid'         => $ibforums->member['id'],
-															'year'           => $year,
-															'month'          => $month,
-															'mday'           => $day,
-															'title'          => $ibforums->input['event_title'],
-															'event_text'     => $ibforums->input['Post'],
-															'read_perms'     => $read_perms,
-															'unix_stamp'     => mktime( 23, 59, 59, $month, $day, $year),
-															'priv_event'     => $private_event,
-															'show_emoticons' => $allow_emoticons,
-															'end_day'        => $end_day,
-															'end_month'		 => $end_month,
-															'end_year'       => $end_year,
-															'end_unix_stamp' => mktime( 23, 59, 59, $end_month, $end_day, $end_year),
-															'event_ranged'   => $event_ranged,
-															'event_bgcolor'	 => $ibforums->input['bg'],
-															'event_color'	 => $ibforums->input['ft'],
-															'event_repeat'   => $event_repeat,
-															'repeat_unit'    => $ibforums->input['recur_unit'],
-												  )       );
-												  
-		$DB->query("INSERT INTO ibf_calendar_events (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
+		$DB->do_insert( 'calendar_events', array (
+												   'userid'         => $ibforums->member['id'],
+												   'year'           => $year,
+												   'month'          => $month,
+												   'mday'           => $day,
+												   'title'          => $ibforums->input['event_title'],
+												   'event_text'     => $ibforums->input['Post'],
+												   'read_perms'     => $read_perms,
+												   'unix_stamp'     => mktime( 0, 0, 1, $month, $day, $year),
+												   'priv_event'     => $private_event,
+												   'show_emoticons' => $allow_emoticons,
+												   'end_day'        => $end_day,
+												   'end_month'		=> $end_month,
+												   'end_year'       => $end_year,
+												   'end_unix_stamp' => mktime( 23, 59, 59, $end_month, $end_day, $end_year),
+												   'event_ranged'   => $event_ranged,
+												   'event_bgcolor'	=> $ibforums->input['bg'],
+												   'event_color'	=> $ibforums->input['ft'],
+												   'event_repeat'   => $event_repeat,
+												   'repeat_unit'    => $ibforums->input['recur_unit'],
+										 )       );
+		
+		$this->_call_recache();
 		
 		$print->redirect_screen( $ibforums->lang['new_event_redirect'] , "&act=calendar" );
 	}
 	
 	
-	//-----------------------------------------
+	/*-------------------------------------------------------------------------*/
     // SHOW DAYS EVENTS
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
     function show_day()
     {
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
         
         $day   = intval($ibforums->input['d']);
 		$month = intval($ibforums->input['m']);
@@ -1441,10 +1315,6 @@ class calendar {
 		
 		$printed = 0;
 		 
-		/*header("Content-type: text/plain");
-		print_r($day_array);
-		exit();*/
-		
 		//-----------------------------------------
 		// Do we have a sensible date?
 		//-----------------------------------------
@@ -1454,7 +1324,7 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cal_date_oor') );
 		}
 		
-		require "./sources/lib/post_parser.php";
+		require ROOT_PATH."sources/lib/post_parser.php";
         
         $this->parser = new post_parser();
         
@@ -1465,21 +1335,21 @@ class calendar {
         //-----------------------------------------
         // Get recurring events
         //-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'calendar_events',
+									  'where'  => "event_repeat=1 AND ( repeat_unit IN ('w','m') OR (repeat_unit='y' AND month={$month}) )" ) );
+		$DB->simple_exec();
 
-        $DB->query("SELECT * FROM ibf_calendar_events
-        			WHERE event_repeat=1
-        			AND ( repeat_unit IN ('w','m') OR (repeat_unit='y' AND month={$month}) )
-        			");
-        			
         while ( $rc = $DB->fetch_row() )
         {
 			$recur_start = getdate( $rc['unix_stamp'] );
 				
 			$sh = 0;
 			
-			//--------------------------------------
+			//-----------------------------------------
 			// Out of range END?
-			//--------------------------------------
+			//-----------------------------------------
 			
 			if ( $day_array['year'] > $rc['end_year'] )
 			{
@@ -1497,9 +1367,9 @@ class calendar {
 				}
 			}
 			
-			//--------------------------------------
+			//-----------------------------------------
 			// Out of range START?
-			//--------------------------------------
+			//-----------------------------------------
 			
 			if ( $day_array['year'] < $rc['year'] )
 			{
@@ -1517,9 +1387,9 @@ class calendar {
 				}
 			}
 			
-			//--------------------------------------
+			//-----------------------------------------
 			// Lets do da WEEKLY
-			//--------------------------------------
+			//-----------------------------------------
 			
 			if ( $rc['repeat_unit'] == 'w' )
 			{
@@ -1529,9 +1399,9 @@ class calendar {
 				}
 			}
 			
-			//--------------------------------------
+			//-----------------------------------------
 			// Lets do da MONTHLY
-			//--------------------------------------
+			//-----------------------------------------
 				
 			elseif ( $rc['repeat_unit'] == 'm' )
 			{
@@ -1541,9 +1411,9 @@ class calendar {
 				}
 			}
 			
-			//--------------------------------------
+			//-----------------------------------------
 			// Lets do da YEARLY
-			//--------------------------------------
+			//-----------------------------------------
 			
 			elseif ( $rc['repeat_unit'] == 'y' )
 			{
@@ -1553,9 +1423,9 @@ class calendar {
 				}
 			}
 			
-			//--------------------------------------
+			//-----------------------------------------
 			// Show it!
-			//--------------------------------------
+			//-----------------------------------------
 			
 			if ( $sh == 1 )
 			{
@@ -1572,10 +1442,13 @@ class calendar {
         //-----------------------------------------
         
         $timenow  =  mktime( 1, 1, 1, $month, $day, $year);
-        //$day_array = array( 'mon' => $month, 'mday' => $day, 'year' => $year );
         
-        $eq = $DB->query("SELECT * FROM ibf_calendar_events WHERE month='$month' AND mday='$day' AND year='$year'
-        				  OR (event_ranged=1 AND ( unix_stamp < $timenow AND end_unix_stamp > $timenow ) )");
+        $DB->simple_construct( array( 'select' => '*',
+							 		  'from'   => 'calendar_events',
+							  		  'where'  => "month='$month' AND mday='$day' AND year='$year'
+        				  				           OR (event_ranged=1 AND ( unix_stamp < $timenow AND end_unix_stamp > $timenow ) )" ) );
+							  
+		$eq = $DB->simple_exec();
         
         if ( $DB->get_num_rows($eq) )
         {
@@ -1621,9 +1494,9 @@ class calendar {
 				}
 			}
 			
-			//----------------------------------------
+			//-----------------------------------------
 			// Ranged Events...
-			//----------------------------------------
+			//-----------------------------------------
 			
 			if ( count($range) > 0 )
 			{ 
@@ -1662,17 +1535,15 @@ class calendar {
         
         $this->nav[] = "<a href='{$ibforums->base_url}&act=calendar'>{$ibforums->lang['page_title']}</a>";
 		$this->nav[] = $day." ".$this->month_words[$this->chosen_month - 1]." ".$this->chosen_year;
-        
     }
-    
 	
-	//-----------------------------------------
+	/*-------------------------------------------------------------------------*/
     // SHOW A SINGLE EVENT BASED ON eventid
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
     function show_event()
     {
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
         
         $eventid   = intval($ibforums->input['eventid']);
 		
@@ -1681,7 +1552,8 @@ class calendar {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cal_no_events') );
 		}
         
-        $DB->query("SELECT * FROM ibf_calendar_events WHERE eventid=$eventid");
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'calendar_events', 'where' => "eventid=$eventid" ) );
+		$DB->simple_exec();
         
         if ( ! $event = $DB->fetch_row() )
         {
@@ -1717,8 +1589,6 @@ class calendar {
         
         $this->parser = new post_parser();
         
-        //-----------------------------------------
-        
         $this->output .= $this->html->cal_page_events_start() . $this->make_event_html($event) . $this->html->cal_page_events_end();
         
         $this->nav[] = "<a href='{$ibforums->base_url}&act=calendar'>{$ibforums->lang['page_title']}</a>";
@@ -1726,13 +1596,13 @@ class calendar {
         
     }
     
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     // MAKE EVENT HTML (return HTML for bdays)
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
     function make_event_html($event)
     {
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
         
         //-----------------------------------------
         // Parse the text
@@ -1765,14 +1635,18 @@ class calendar {
         
         $edit_button = "";
         
+        //-----------------------------------------
         // Are we a super dooper moderator?
+        //-----------------------------------------
         
         if ($ibforums->member['g_is_supmod'] == 1)
         {
         	$edit_button = $this->html->cal_edit_del_button($event['eventid']);
         }
         
+        //-----------------------------------------
         // Are we the OP of this event?
+        //-----------------------------------------
         
         else if ($ibforums->member['id'] == $event['userid'])
         {
@@ -1783,16 +1657,16 @@ class calendar {
         // Get the member details and stuff
         //-----------------------------------------
         
-        $DB->query("SELECT m.id, m.name, m.mgroup, m.posts, m.joined, m.avatar, m.avatar_size, ".
-                   "g.g_id, g.g_title FROM ibf_members m, ibf_groups g WHERE m.id='".$event['userid']."' AND g.g_id=m.mgroup");
-                   
+        $DB->cache_add_query( 'generic_get_all_member', array( 'mid' => $event['userid'] ) );
+		$DB->cache_exec_query();
+		
         $member = $DB->fetch_row();
         
         $member['joined'] = $std->get_date( $member['joined'], 'JOINED' );
         
         $member['avatar'] = $std->get_avatar( $member['avatar'], $ibforums->member['view_avs'], $member['avatar_size']);
         
-        $member['posts'] = $std->do_number_format($member['posts']);
+        $member['posts']  = $std->do_number_format($member['posts']);
         
         $event['month_text'] = $this->month_words[$event['month'] - 1];
         
@@ -1806,25 +1680,458 @@ class calendar {
         if ($event['event_ranged'] == 1 )
         {
         	$type = $ibforums->lang['se_range'];
-        	$de   = $ibforums->lang['se_ends'].' '.gmdate( $ibforums->vars['clock_joined'], $event['end_unix_stamp'] ); //$std->get_date( $event['end_unix_stamp'], 'JOINED' );
+        	$de   = $ibforums->lang['se_ends'].' '.date( $ibforums->vars['clock_joined'], $event['end_unix_stamp'] );
         }
         else if ( $event['event_repeat'] == 1 )
         {
         	$type = $ibforums->lang['se_recur'];
-        	$de   = $ibforums->lang['se_ends'].' '.gmdate( $ibforums->vars['clock_joined'], $event['end_unix_stamp'] );
+        	$de   = $ibforums->lang['se_ends'].' '.date( $ibforums->vars['clock_joined'], $event['end_unix_stamp'] );
         }
         
-        
         return $this->html->cal_show_event($event, $member, $event_type, $edit_button, $type, $de );
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // GET MINI CALENDAR
+    /*-------------------------------------------------------------------------*/
+    
+    function get_mini_calendar($month, $year)
+    {
+		global $ibforums, $DB, $std;
         
+        foreach ($this->day_words as $day)
+        {
+        	$cal_output .= $this->html->mini_cal_day_bit( substr($day,0,1) );
+        }
+        
+        //-----------------------------------------
+        // Print the main calendar body
+        //-----------------------------------------
+        
+        $cal_output .= $this->get_month_events( $month, $year, 1 );
+        
+        return $this->html->mini_cal_mini_wrap($this->month_words[$month - 1], $month, $year, $cal_output);
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Get BIRTHDAYS
+    /*-------------------------------------------------------------------------*/
+    
+    function _get_birthday_sql($month)
+    {
+		global $ibforums, $DB, $std;
+    	
+    	if ( ! is_array( $this->query_bday_cache[ $month ] ) )
+		{
+			$this->query_bday_cache[ $month ] = array();
+			
+			$DB->simple_construct( array( 'select' => 'bday_day, bday_month, id, name', 'from' => 'members', 'where' => 'bday_month='.$month ) );
+			$DB->simple_exec();
+			
+			while ($r = $DB->fetch_row())
+			{
+				$this->query_bday_cache[ $month ][ $r['bday_day'] ][] = $r;
+			}
+		}
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Get EVENTS
+    /*-------------------------------------------------------------------------*/
+    
+    function _get_events_sql($month, $year)
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$timenow  =  mktime( 0, 0, 1   , $month, 1, $year);
+        $timethen =  mktime( 23, 59, 59, $month, 0, $year);
+        
+		//-----------------------------------------
+        // Get the events
+        //-----------------------------------------
+        
+        if ( ! is_array( $this->query_event_cache[ $month ] ) )
+		{
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'calendar_events',
+										  'where'  => "event_repeat <> 1 AND month={$month} AND year={$year}
+													   OR (event_ranged=1 AND ( unix_stamp < $timenow AND end_unix_stamp > $timenow ) )
+													   OR (event_repeat=1 AND ( repeat_unit IN ('w','m') OR (repeat_unit='y' AND month={$month}) ) )" ) );
+			$DB->simple_exec();
+
+			while ( $r = $DB->fetch_row() )
+			{
+				$this->query_event_cache[ $month ][] = $r;
+			}
+		}
+    }
+    
+    function _process_events_sql($month)
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$this->recurring = array();
+    	$this->ranged    = array();
+    	$this->events    = array();
+    	
+    	if ( is_array( $this->query_event_cache[ $month ] ) and count( $this->query_event_cache[ $month ] ) )
+    	{
+			foreach( $this->query_event_cache[ $month ] as $idx => $event )
+			{
+				if ( $event['priv_event'] == 1 )
+				{
+					if ( ! $ibforums->member['id'] )
+					{
+						continue;
+					}
+					
+					if ($ibforums->member['id'] != $event['userid'])
+					{
+						continue;
+					}
+				}
+				
+				if ( $event['read_perms'] != '*' )
+				{
+					if ( ! preg_match( "/(^|,)".$ibforums->member['mgroup']."(,|$)/", $event['read_perms'] ) )
+					{
+						continue;
+					}
+				}
+				
+				if ( $event['event_repeat'] == 1 )
+				{
+					$this->recurring[] = $event;
+				}
+				else if ( $event['event_ranged'] == 1 )
+				{
+					$this->ranged[$event['eventid']] = array(
+													 'end_unix_stamp'  => $event['end_unix_stamp'],
+													 'unix_stamp'      => $event['unix_stamp'],
+													 'day'             => $event['mday'],
+													 'month'		   => $event['month'],
+													 'year'		   	   => $event['year'],
+													 'end_day'		   => $event['end_day'],
+													 'end_month'	   => $event['end_month'],
+													 'end_year'	       => $event['end_year'],
+													 'ft'			   => $event['event_color'],
+													 'bg'			   => $event['event_bgcolor'],
+													 'eventid'		   => $event['eventid'],
+													 'title'		   => $event['title'],
+												   );
+				}
+				else
+				{
+					$this->events[ $event['mday'] ][] = $event;
+				}
+			}
+        }
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Get month stuff
+    /*-------------------------------------------------------------------------*/
+    
+    function get_month_events($month="", $year="", $minical=0)
+	{
+		global $ibforums, $DB, $std, $print;
+        
+        $our_datestamp   = mktime( 0,0,1, $month, 1, $year);
+        
+        $first_day_array = getdate($our_datestamp);
+        
+        //-----------------------------------------
+        // Get the birthdays from the database
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['show_bday_calendar'] )
+        {
+			$birthdays = array();
+			
+			$this->_get_birthday_sql($month);
+			
+			$birthdays = $this->query_bday_cache[ $month ];
+		}
+		
+        $timenow  =  mktime( 0, 0, 1   , $month, 1, $year);
+        $timethen =  mktime( 23, 59, 59, $month, 0, $year);
+        
+		//-----------------------------------------
+        // Get the events
+        //-----------------------------------------
+        
+        $this->_get_events_sql($month, $year);
+        
+        $this->_process_events_sql($month);
+        
+        $recurring = $this->recurring;
+        $events    = $this->events;
+        $range     = $this->ranged;
+        
+        
+        //-----------------------------------------
+        // Flip the range array to ensure that old
+        // ranges go to the top for consistency
+        //-----------------------------------------
+        
+        if ( is_array($range) )
+        {
+       		$range = array_reverse($range, TRUE);
+        }
+        
+        //-----------------------------------------
+        // Get events
+        //-----------------------------------------
+        
+        $seen_days = array(); // Holds yday
+        $seen_ids  = array();
+        
+        for ( $c = 0 ; $c < 42; $c++ )
+        {
+        	$day_array = getdate($our_datestamp);
+        	 
+        	if ( (($c) % 7 ) == 0 )
+        	{
+        		//-----------------------------------------
+        		// Kill the loop if we are no longer on our month
+        		//-----------------------------------------
+        		
+        		if ($day_array['mon'] != $month)
+        		{
+        			break;
+        		}
+        		
+        		if ( $minical )
+        		{
+        			$cal_output .= $this->html->mini_cal_new_row( $our_datestamp );
+        		}
+        		else
+        		{
+        			$cal_output .= $this->html->cal_new_row( $our_datestamp );
+        		}
+        	}
+        	
+        	//-----------------------------------------
+        	// Run out of legal days for this month?
+        	// Or have we yet to get to the first day?
+        	//-----------------------------------------
+        		
+        	if ( ($c < $first_day_array['wday']) or ($day_array['mon'] != $month) )
+        	{
+        		$cal_output .= $minical ? $this->html->mini_cal_blank_cell() : $this->html->cal_blank_cell();
+        	}
+        	else
+        	{
+        		if ( $seen_days[ $day_array['yday'] ] == 1 )
+				{
+					continue;
+				}
+        	
+        		$seen_days[ $day_array['yday'] ] = 1;
+        		$this_day_events = "";
+        		$cal_date        = $day_array['mday'];
+        		
+        		//-----------------------------------------
+        		// Ranged Events...
+        		//-----------------------------------------
+        		
+        		if ( count($range) > 0 )
+        		{ 
+        			foreach( $range as $r => $d)
+        			{
+        				$s   = 0;
+        				
+						if ( ( $our_datestamp >= $d['unix_stamp'] ) AND ($our_datestamp <= $d['end_unix_stamp']) )
+						{
+							$this_day_events .= $this->html->cal_events_wrap_range( "code=showevent&eventid=".$d['eventid'], $d['title'], $d['ft'], $d['bg']);
+							
+							$seen_ids[$d['eventid']] = 1;
+						}
+        			}
+        		}
+        		
+        		$our_datestamp += 86400;
+				
+				//-----------------------------------------
+        		// Recurring Events...
+        		//-----------------------------------------
+        		
+        		if ( count($recurring) > 0 )
+        		{
+        			foreach( $recurring as $rc )
+        			{
+        				$recur_start = getdate( $rc['unix_stamp'] );
+        				
+        				$sh = 0;
+        				
+        				//-----------------------------------------
+        				// Out of range END?
+        				//-----------------------------------------
+        				
+        				if ( $day_array['year'] > $rc['end_year'] )
+        				{
+        					continue;
+        				}
+        				else if ( $day_array['year'] == $rc['end_year'] )
+        				{
+        					if ( $day_array['mon'] > $rc['end_month'] )
+							{
+							   continue;
+							}
+							else if ( ($day_array['mon'] == $rc['end_month']) AND ($day_array['mday'] > $rc['end_day']) )
+							{
+							   continue;
+							}
+        				}
+        				
+        				//-----------------------------------------
+        				// Out of range START?
+        				//-----------------------------------------
+        				
+        				if ( $day_array['year'] < $rc['year'] )
+        				{
+        					continue;
+        				}
+        				else if ( $day_array['year'] == $rc['year'] )
+        				{
+        					if ( $day_array['mon'] < $rc['month'] )
+							{
+							   continue;
+							}
+							else if ( ($day_array['mon'] == $rc['month']) AND ($day_array['mday'] < $rc['mday']) )
+							{
+							   continue;
+							}
+        				}
+        				
+						//-----------------------------------------
+						// Lets do da WEEKLY
+						//-----------------------------------------
+						
+						if ( $rc['repeat_unit'] == 'w' )
+						{
+							if ( $day_array['wday'] == $recur_start['wday'])
+							{
+								$sh = 1;
+							}
+						}
+						
+						//-----------------------------------------
+						// Lets do da MONTHLY
+						//-----------------------------------------
+							
+						elseif ( $rc['repeat_unit'] == 'm' )
+						{
+							if ( $day_array['mday'] == $rc['mday'] )
+							{
+								$sh = 1;
+							}
+						}
+						
+						//-----------------------------------------
+						// Lets do da YEARLY
+						//-----------------------------------------
+						
+						elseif ( $rc['repeat_unit'] == 'y' )
+						{
+							if ( ($day_array['mday'] == $rc['mday']) AND ($day_array['mon'] == $rc['month']) )
+							{
+								$sh = 1;
+							}
+						}
+						
+						//-----------------------------------------
+						// Show it!
+						//-----------------------------------------
+						
+						if ( $sh == 1 )
+						{
+							$this_day_events .= $this->html->cal_events_wrap_recurring("code=showevent&eventid=".$rc['eventid'],$rc['title']);
+						}
+					}
+        		}
+				
+				//-----------------------------------------
+				// Normal Events...
+				//-----------------------------------------
+				
+				if ( isset($events[ $day_array['mday'] ]) and is_array($events[ $day_array['mday'] ]) )
+				{
+					if ( count( $events[ $day_array['mday'] ] ) > 0 )
+					{
+						foreach( $events[ $day_array['mday'] ] as $idx => $data )
+						{
+							if ( $seen_ids[ $data['eventid'] ] == 1 )
+							{
+								continue;
+							}
+							//print 'Event ' . $d['eventid'] . '=' . $our_datestamp . '=' . $d['unix_stamp'] . '<br />';
+							$this_day_events .= $this->html->cal_events_wrap("code=showevent&eventid=".$data['eventid'],$data['title']);
+						}
+					}
+				}
+				
+				//-----------------------------------------
+				// Birthdays
+				//-----------------------------------------
+				
+				if ( isset($birthdays[ $day_array['mday'] ]) and count( $birthdays[ $day_array['mday'] ] ) > 0 )
+				{
+					$no_bdays = count($birthdays[ $day_array['mday'] ]);
+					
+					if ( $no_bdays )
+					{
+						if ( $ibforums->vars['bday_show_cal_max'] and $no_bdays <= $ibforums->vars['bday_show_cal_max'] )
+						{
+							foreach( $birthdays[ $day_array['mday'] ] as $idx => $user )
+							{
+								$this_day_events .= $this->html->cal_events_wrap(
+																				 "code=birthdays&y=".$day_array['year']."&m=".$day_array['mon']."&d=".$day_array['mday'],
+																				 $user['name']."'s Birthday"
+																			   );
+							}
+		
+						}
+						else
+						{
+							$this_day_events .= $this->html->cal_events_wrap(
+																			 "code=birthdays&y=".$day_array['year']."&m=".$day_array['mon']."&d=".$day_array['mday'],
+																			 sprintf( $ibforums->lang['entry_birthdays'], $no_bdays )
+																		   );
+						}
+					}
+				}
+        		
+        		if ($this_day_events != "")
+        		{
+        			$cal_date = "<a href='{$ibforums->base_url}&act=calendar&code=showday&y=".$year."&m=".$month."&d=".$day_array['mday']."'>{$day_array['mday']}</a>";
+        			
+        			$this_day_events = $this->html->cal_events_start() . $this_day_events . $this->html->cal_events_end();
+        		}
+        		
+        		if ( ($day_array['mday'] == $this->now_date['mday']) and ($this->now_date['mon'] == $day_array['mon']) and ($this->now_date['year'] == $day_array['year']))
+        		{
+        			$cal_output .= $minical ? $this->html->mini_cal_date_cell_today($cal_date, $this_day_events) : $this->html->cal_date_cell_today($cal_date, $this_day_events);
+        		}
+        		else
+        		{
+        			$cal_output .= $minical ? $this->html->mini_cal_date_cell($cal_date, $this_day_events) : $this->html->cal_date_cell($cal_date, $this_day_events);
+        		}
+        		
+        		unset($this_day_events);
+        	}
+        }
+        
+        return $cal_output;
     }
 	
-	//-----------------------------------------
+	/*-------------------------------------------------------------------------*/
     // SHOW BIRTHDAYS
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
-    function show_birthdays() {
-        global $ibforums, $DB, $std, $print;
+    function show_birthdays()
+    {
+		global $ibforums, $DB, $std, $print;
         
         $day   = intval($ibforums->input['d']);
 		$month = intval($ibforums->input['m']);
@@ -1846,12 +2153,13 @@ class calendar {
         
     }
     
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     // MAKE BIRTHDAY HTML (return HTML for bdays)
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
     
-    function make_birthday_html($month, $day, $switch=0) {
-        global $ibforums, $DB, $std, $print;
+    function make_birthday_html($month, $day, $switch=0)
+    {
+		global $ibforums, $DB, $std, $print;
     
     	//-----------------------------------------
         // Get the birthdays from the database
@@ -1861,8 +2169,11 @@ class calendar {
         
         $output    = "";
         
-        $DB->query("SELECT id, name, bday_year from ibf_members WHERE bday_month='".$month."' and bday_day='$day'");
-				
+        $DB->simple_construct( array( 'select' => 'bday_day, bday_month, bday_year, id, name',
+        							  'from'   => 'members',
+        							  'where'  => 'bday_month='.$month . " AND bday_day={$day}" ) );
+		$DB->simple_exec();
+		
 		if ( ! $DB->get_num_rows() )
 		{
 			if ($switch == 1)
@@ -1891,14 +2202,13 @@ class calendar {
 		return $output;
 	}
 		
-		
-		
-    
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
+    // Internal
+    /*-------------------------------------------------------------------------*/
     
     function get_month_dropdown($month="")
     {
-    	global $ibforums;
+		global $ibforums;
     	
     	$return = "";
     	
@@ -1918,11 +2228,13 @@ class calendar {
     }
     
     
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
+    // Internal
+    /*-------------------------------------------------------------------------*/
     
     function get_year_dropdown($year="")
     {
-    	global $ibforums;
+		global $ibforums;
     	
     	$return = "";
     	
@@ -1945,11 +2257,13 @@ class calendar {
     }
     
     
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
+    // Internal
+    /*-------------------------------------------------------------------------*/
     
     function get_day_dropdown($day="")
     {
-    	global $ibforums;
+		global $ibforums;
     	
     	if ($day == "")
     	{
@@ -1968,11 +2282,13 @@ class calendar {
     	return $return;
     }
     
-    //-----------------------------------------
+    /*-------------------------------------------------------------------------*/
+    // Internal
+    /*-------------------------------------------------------------------------*/
     
     function get_color_dropdown($name, $active="")
     {
-    	global $ibforums;
+		global $ibforums;
     	
     	$c = array( 'white', 'black', 'aliceblue', 'lightslategray', 'blue','gray', 'yellow', 'orange', 'red', 'lightblue', 'darkblue', 'aqua', 'green', 'lime', 'maroon', 'navy', 'silver', 'teal' );
     	
@@ -1994,7 +2310,71 @@ class calendar {
     
     }
     
+    /*-------------------------------------------------------------------------*/
+    // Internal
+    /*-------------------------------------------------------------------------*/
+    
+    function get_next_month($month, $year)
+    {
+    	//-----------------------------------------
+        // Figure out the next  links
+        //-----------------------------------------
         
+        $next_month = array();
+        
+        $next_month['year_id']    = $year;
+        
+        $next_month['month_name'] = $this->month_words[$month];
+        $next_month['month_id']   = $month + 1;
+        
+        if ($this->chosen_month == 12)
+        {
+        	$next_month['month_name'] = $this->month_words[0];
+            $next_month['month_id']   = 1;
+            $next_month['year_id']    = $year + 1;
+        }
+    	
+    	return $next_month;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Internal
+    /*-------------------------------------------------------------------------*/
+    
+    function _call_recache()
+    {
+		global $ibforums, $std, $DB;
+    	
+    	require_once( ROOT_PATH.'sources/tasks/calendarevents.php' );
+    	
+    	$task = new task_item();
+    	$task->restrict_log = 1;
+    	$task->run_task();
+    }
+    
+    function get_prev_month($month, $year)
+    {
+    	//-----------------------------------------
+        // Figure out the next / previous links
+        //-----------------------------------------
+        
+        $prev_month = array();
+        
+        $prev_month['year_id']    = $year;
+        
+        $prev_month['month_id']   = $month - 1;
+        $prev_month['month_name'] = $this->month_words[$month - 2];
+        
+        if ($this->chosen_month == 1)
+        {
+        	$prev_month['month_name'] = $this->month_words[11];
+        	$prev_month['month_id']   = 12;
+        	$prev_month['year_id']    = $year - 1;
+        	
+        }
+    	
+    	return $prev_month;
+    }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/classes/class_custom_fields.php b/upload/sources/classes/class_custom_fields.php
new file mode 100644
index 00000000..ea77be9a
--- /dev/null
+++ b/upload/sources/classes/class_custom_fields.php
@@ -0,0 +1,543 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > CUSTOM PROFILE FIELD CLASS
+|   > Module written by Matt Mecham
+|   > Date started: 7th April 2004 ( hairdresser was closed today :( )
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
++--------------------------------------------------------------------------
+| EXAMPLE:
+| 
+| $profile->cache_data  = $ibforums->cache['profilefields'];
+| $profile->member_id   = $ibforums->member['id']; // Viewing member
+| $profile->mem_data_id = $data['id']; // Get data for this member
+| $profile->init_data();
+|
++--------------------------------------------------------------------------
+*/
+
+class custom_fields
+{
+	var $member_id   = 0;
+	var $admin       = 0;
+	var $supmod      = 0;
+	var $mem_data_id = 0;
+	var $init        = 0;
+	var $in_fields    = array();
+	var $out_fields   = array();
+	var $out_chosen   = array();
+	var $tmp_fields   = array();
+	var $cache_data   = "";
+	var $member_data  = array();
+	var $field_names  = array();
+	var $field_desc   = array();
+	var $kill_html    = 1;
+	var $error_fields = array( 'toobig' => array(), 'empty' => array(), 'invalid' => array() );
+	
+	var $DB           = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function custom_fields( &$DB )
+	{
+		$this->DB = &$DB;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Init (check, load cache)
+	/*-------------------------------------------------------------------------*/
+	
+	function init_data()
+	{
+		if ( ! $this->init )
+		{
+			//-----------------------------------------
+			// Cache data...
+			//-----------------------------------------
+			
+			if ( ! is_array( $this->cache_data ) )
+			{
+				$this->DB->simple_construct( array( 'select' => '*', 'from' => 'pfields_data', 'order' => 'pf_position' ) );
+				$this->DB->simple_exec();
+				
+				while ( $r = $this->DB->fetch_row() )
+				{
+					$this->cache_data[ $r['pf_id'] ] = $r;
+				}
+			}
+			
+			//-----------------------------------------
+			// Get names...
+			//-----------------------------------------
+			
+			if ( is_array($this->cache_data) and count($this->cache_data) )
+			{
+				foreach( $this->cache_data as $id => $data )
+				{
+					$this->field_names[ $id ] = $data['pf_title'];
+					$this->field_desc[ $id ]  = $data['pf_desc'];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Clean up on aisle #4
+		//-----------------------------------------
+		
+		$this->out_fields = array();
+		$this->tmp_fields = array();
+		$this->out_chosen = array();
+		
+		//-----------------------------------------
+		// Get member...
+		//-----------------------------------------
+		
+		if ( ! count( $this->member_data ) and $this->mem_data_id )
+		{
+			$this->member_data = $this->DB->simple_exec_query( array( 'select' => '*', 'from' => 'pfields_content', 'where' => 'member_id='.intval($this->mem_data_id) ) );
+		}
+		
+		if ( count( $this->member_data ) )
+		{
+			$this->mem_data_id = $this->member_data['id'];
+		}
+		
+		//-----------------------------------------
+		// Parse into in fields
+		//-----------------------------------------
+		
+		if ( is_array($this->cache_data) and count( $this->cache_data ) )
+		{
+			foreach( $this->cache_data as $id => $data )
+			{
+				$this->in_fields[ $id ] = $this->member_data['field_'.$id];
+			}
+		}
+		
+		$this->init = 1;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate for saving
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_to_save( $register=0, $post='field_' )
+	{
+		if ( is_array($this->cache_data) and count($this->cache_data) )
+		{
+			foreach( $this->cache_data as $i => $row )
+			{
+				if ( ! $register )
+				{
+					//-----------------------------------------
+					// Admin / mod only?
+					//-----------------------------------------
+					
+					if ( $row['pf_admin_only'] )
+					{
+						if ( ! $this->admin or ! $this->supmod )
+						{
+							continue;
+						}
+					}
+					
+					//-----------------------------------------
+					// Can edit? (member, admin, mod)
+					//-----------------------------------------
+					
+					if ( ! $row['pf_member_edit'] )
+					{
+						if ( ! $this->admin or ! $this->supmod )
+						{
+							continue;
+						}
+					}
+				}
+				else
+				{
+					//-----------------------------------------
+					// Show on reg?
+					//-----------------------------------------
+					
+					if ( ! $row['pf_show_on_reg'] )
+					{
+						continue;
+					}
+				}
+				
+				$this->tmp_fields[ $i ] = $row;
+			}
+		}
+		
+		//-----------------------------------------
+		// Grab editable fields...
+		//-----------------------------------------
+		
+		if ( is_array($this->tmp_fields) and count($this->tmp_fields) )
+		{
+			foreach( $this->tmp_fields as $i => $row )
+			{
+				//-----------------------------------------
+				// Too big?
+				//-----------------------------------------
+				
+				if ( $this->cache_data[$i]['pf_max_input'] and strlen( $_POST[ $post.$i ] ) > $this->cache_data[$i]['pf_max_input'] )
+				{
+					$this->error_fields['toobig'][] = $row;
+				}
+				
+				//-----------------------------------------
+				// Required and NULL?
+				//-----------------------------------------
+				
+				if ( $this->cache_data[$i]['pf_not_null'] and trim($_POST[ $post.$i ]) == "" )
+				{
+					$this->error_fields['empty'][] = $row;
+				}
+				
+				//-----------------------------------------
+				// Invalid format?
+				//-----------------------------------------
+				
+				if ( $this->cache_data[$i]['pf_input_format'] )
+				{
+					$regex = str_replace( 'n', '\\d', preg_quote( $this->cache_data[$i]['pf_input_format'], "#" ) );
+					$regex = str_replace( 'a', '\\w', $regex );
+					
+					if ( ! preg_match( "#^".$regex."$#i", trim($_POST[ $post.$i ]) ) )
+					{
+						$this->error_fields['invalid'][] = $row;
+					}
+				}
+				
+				$this->out_fields[ $post.$i ] = $this->method_format_text_to_save( $_POST[ $post.$i ] );
+			}
+		}
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate for viewing
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_to_view( $check_topic_format=0 )
+	{
+		if ( is_array( $this->cache_data ) and count( $this->cache_data ) )
+		{
+			foreach( $this->cache_data as $i => $row )
+			{
+				//-----------------------------------------
+				// Admin / mod only?
+				//-----------------------------------------
+				
+				if ( $row['pf_admin_only'] )
+				{
+					if ( ! $this->admin or ! $this->supmod )
+					{
+						continue;
+					}
+				}
+				
+				//-----------------------------------------
+				// Private field (member, admin, mod)
+				//-----------------------------------------
+				
+				if ( $row['pf_member_hide'] )
+				{
+					$pass = 0;
+					
+					if ( $this->admin )
+					{
+						$pass = 1;
+					}
+					else if ( $this->supmod )
+					{
+						$pass = 1;
+					}
+					else if ( $this->member_id and ( $this->member_id == $this->mem_data_id ) )
+					{
+						$pass = 1;
+					}
+					else
+					{
+						$pass = 0;
+					}
+					
+					if ( ! $pass )
+					{
+						continue;
+					}
+				}
+				
+				//-----------------------------------------
+				// Topic format?
+				//-----------------------------------------
+				
+				if ( $check_topic_format )
+				{
+					if ( ! $row['pf_topic_format'] )
+					{
+						continue;
+					}
+				}
+				
+				$this->tmp_fields[ $i ] = $row;
+			}
+		}
+		
+		$this->method_parse_out_fields('view');
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate for viewing on reg form
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_to_register()
+	{
+		if ( is_array( $this->cache_data ) and count( $this->cache_data ) )
+		{
+			foreach( $this->cache_data as $i => $row )
+			{
+				//-----------------------------------------
+				// Show on reg?
+				//-----------------------------------------
+				
+				if ( ! $row['pf_show_on_reg'] )
+				{
+					continue;
+				}
+				
+				$this->tmp_fields[ $i ] = $row;
+			}
+		}
+		
+		$this->method_parse_out_fields('reg');
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Generate for editing
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_to_edit()
+	{
+		if ( is_array($this->cache_data) and count($this->cache_data) )
+		{
+			foreach( $this->cache_data as $i => $row )
+			{
+				//-----------------------------------------
+				// Admin / mod only?
+				//-----------------------------------------
+				
+				if ( $row['pf_admin_only'] )
+				{
+					if ( ! $this->admin or ! $this->supmod )
+					{
+						continue;
+					}
+				}
+				
+				//-----------------------------------------
+				// Private field (member, admin, mod)
+				//-----------------------------------------
+				
+				if ( $row['pf_member_hide'] )
+				{
+					$pass = 0;
+					
+					if ( $this->admin )
+					{
+						$pass = 1;
+					}
+					else if ( $this->mod )
+					{
+						$pass = 1;
+					}
+					else if ( $this->member_id )
+					{
+						$pass = 1;
+					}
+					
+					if ( ! $pass )
+					{
+						continue;
+					}
+				}
+				
+				//-----------------------------------------
+				// Can edit? (member, admin, mod)
+				//-----------------------------------------
+				
+				if ( ! $row['pf_member_edit'] )
+				{
+					if ( ! $this->admin or ! $this->supmod )
+					{
+						continue;
+					}
+				}
+				
+				$this->tmp_fields[ $i ] = $row;
+			}
+		}
+		
+		$this->method_parse_out_fields('edit');
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Method: Parse out_fields
+	/*-------------------------------------------------------------------------*/
+	
+	function method_parse_out_fields($type='view')
+	{
+		foreach( $this->tmp_fields as $i => $row )
+		{
+			if ($row['pf_type'] == 'drop')
+			{ 
+				$carray = explode( '|', trim( $row['pf_content'] ) );
+				
+				foreach( $carray as $entry )
+				{
+					$value = explode( '=', $entry );
+					
+					$ov = trim($value[0]);
+					$td = trim($value[1]);
+					
+					if ( $type == 'reg' )
+					{
+						$this->out_fields[ $row['pf_id'] ] .= "<option value='$ov'>$td</option>\n";
+					}
+					else if ( $type == 'view' )
+					{
+						if ( $this->in_fields[ $row['pf_id'] ] == $ov)
+						{
+							$this->out_fields[ $row['pf_id'] ] = $td;
+							$this->out_chosen[ $row['pf_id'] ] = $ov;
+						}
+					}
+					else if ( $type == 'edit' )
+					{ 
+						if ( $this->in_fields[ $row['pf_id'] ] == $ov and $this->in_fields[ $row['pf_id'] ])
+						{
+							$this->out_fields[ $row['pf_id'] ] .= "<option value='$ov' selected='selected'>$td</option>\n";
+						}
+						else
+						{
+							$this->out_fields[ $row['pf_id'] ] .= "<option value='$ov'>$td</option>\n";
+						}
+					}
+				}
+			}
+			else
+			{
+				if ( $type == 'view' )
+				{
+					$this->out_fields[ $row['pf_id'] ] = $this->method_make_safe_for_view( $this->in_fields[ $row['pf_id'] ] );
+				}
+				else
+				{
+					$this->out_fields[ $row['pf_id'] ] = $this->method_make_safe_for_form( $this->in_fields[ $row['pf_id'] ] );
+				}
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Method: format text to save
+	/*-------------------------------------------------------------------------*/
+	
+	function method_format_text_to_save( $t )
+	{
+		$t = str_replace( "<br>"  , "\n", $t );
+		$t = str_replace( "<br />", "\n", $t );
+		$t = str_replace( "&#39;" , "'" , $t );
+		
+		if ( @get_magic_quotes_gpc() )
+		{
+			$t = stripslashes($t);
+		}
+		
+		return $t;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Method: format_field_for_edit
+	/*-------------------------------------------------------------------------*/
+	
+	function method_format_content_for_edit( $c )
+	{
+		return str_replace( '|', "\n", $c );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Method: format_field_for_topic_view
+	/*-------------------------------------------------------------------------*/
+	
+	function method_format_field_for_topic_view( $i )
+	{
+		$out = $this->out_fields[$i];
+		
+		$tmp = $this->cache_data[$i]['pf_topic_format'];
+		
+		$tmp = str_replace( '{title}'  , $this->field_names[$i], $tmp );
+		$tmp = str_replace( '{key}'    , $this->out_chosen[$i] , $tmp );
+		$tmp = str_replace( '{content}', $out                  , $tmp );
+		
+		return $tmp;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Method: format_field_for_save
+	/*-------------------------------------------------------------------------*/
+	
+	function method_format_content_for_save( $c )
+	{
+		$c = str_replace( "\r"   , "\n", $c );
+		$c = str_replace( "&#39;", "'" , $c );
+		return str_replace( "\n", '|', str_replace( "\n\n", "\n", trim($c) ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Make safe for form viewing
+	/*-------------------------------------------------------------------------*/
+	
+	function method_make_safe_for_form( $t )
+	{
+		return str_replace( "'", "&#39;", $t );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Make safe for other viewing (profile, etc)
+	/*-------------------------------------------------------------------------*/
+	
+	function method_make_safe_for_view( $t )
+	{
+		if ( $this->kill_html )
+		{
+			$t = htmlentities( $t );
+			$t = preg_replace("/&amp;#([0-9]+);/s", "&#\\1;", $t );
+		}
+		
+		return $t;
+	}
+	
+	
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/classes/class_display.php b/upload/sources/classes/class_display.php
new file mode 100644
index 00000000..645f00d7
--- /dev/null
+++ b/upload/sources/classes/class_display.php
@@ -0,0 +1,927 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > DISPLAY CLASS
+|   > Module written by Matt Mecham
+|   > Date started: 26th January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
++--------------------------------------------------------------------------
+*/
+
+
+class display {
+
+    var $to_print = "";
+    var $output   = "";
+    var $macros   = "";
+    
+    //-----------------------------------------
+    // CONSTRUCTOR
+    //-----------------------------------------
+    
+    function display()
+    {
+		global $ibforums, $std;
+    	
+    }
+    
+    
+    //-----------------------------------------
+    // Appends the parsed HTML to our class var
+    //-----------------------------------------
+    
+    function add_output($to_add)
+    {
+        $this->to_print .= $to_add;
+        //return 'true' on success
+        return true;
+    }
+    
+
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Parses all the information and prints it.
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function do_output($output_array)
+    {
+		global $DB, $Debug, $ibforums, $std;
+        
+        //-----------------------------------------
+        // Are we IPSing?
+        //-----------------------------------------
+        
+		$this->_check_ips_report();
+        
+        //-----------------------------------------
+        // UNPACK MACROS
+        //-----------------------------------------
+        
+        $this->_unpack_macros();
+        
+        //-----------------------------------------
+        // END TIMER
+        //-----------------------------------------
+        
+        $this->ex_time  = sprintf( "%.4f",$Debug->endTimer() );
+        
+        //-----------------------------------------
+        // SQL DEBUG?
+        //-----------------------------------------
+        
+        $this->_check_debug();
+        
+        $stats = $this->_show_debug();
+
+        //-----------------------------------------
+        // NAVIGATION
+        //-----------------------------------------
+        
+        $nav  = $ibforums->skin_global->start_nav();
+        
+        $nav .= "<a href='{$ibforums->base_url}act=idx'>{$ibforums->vars['board_name']}</a>";
+        
+        if ( empty($output_array['OVERRIDE']) )
+        {
+			if (is_array( $output_array['NAV'] ) )
+			{
+				foreach ($output_array['NAV'] as $n)
+				{
+					if ($n)
+					{
+						$nav .= "<{F_NAV_SEP}>" . $n;
+					}
+				}
+			}
+        }
+        
+        $nav .= $ibforums->skin_global->end_nav();
+     
+        //-----------------------------------------
+        // CSS
+        //-----------------------------------------
+        
+        $css = $this->_get_css();
+        
+        //-----------------------------------------
+        // Copy it right
+        //-----------------------------------------
+        
+        $extra = "";
+        $ur    = '(Trial)';
+        $pwd   = 'Powered by ';
+        
+        if ( $ibforums->vars['ipb_reg_number'] )
+        {
+        	$ur  = '';
+        	$pwd = '';
+        	
+        	if ( $ibforums->vars['ipb_reg_show'] and $ibforums->vars['ipb_reg_name'] )
+        	{
+        		$extra = "<div align='center' class='copyright'>Registered to: ". $ibforums->vars['ipb_reg_name']."</div>";
+        	}
+        }
+		
+		//-----------------------------------------
+		// REMOVAL OF THIS WITHOUT PURCHASING COPYRIGHT REMOVAL WILL VIOLATE THE LICENCE YOU AGREED
+		// TO WHEN DOWNLOADING THIS PRODUCT. THIS COULD MEAN REMOVAL OF YOUR BOARD AND EVEN
+		// CRIMINAL CHARGES
+		//-----------------------------------------
+		
+        $copyright = "<!-- Copyright Information -->\n\n<div align='center' class='copyright'>{$pwd}<a href=\"http://www.invisionboard.com\" target='_blank'>Invision Power Board</a>{$ur} {$ibforums->version} &copy; ".date("Y")." &nbsp;<a href='http://www.invisionpower.com' target='_blank'>IPS, Inc.</a></div>";
+        
+        if ($ibforums->vars['ipb_copy_number'])
+        {
+        	$copyright = "";
+        }
+        
+        $copyright .= $extra;
+        
+       //-----------------------------------------
+       // Board header
+       //-----------------------------------------
+        
+        $this_header  = $ibforums->skin_global->global_board_header();
+        $this_footer  = $ibforums->skin_global->global_board_footer( $std->get_date( time(), 'SHORT', 1 ) );
+        
+        //-----------------------------------------
+        // Show rules link?
+        //-----------------------------------------
+        
+        if ($ibforums->vars['gl_show'] and $ibforums->vars['gl_title'])
+        {
+        	if ($ibforums->vars['gl_link'] == "")
+        	{
+        		$ibforums->vars['gl_link'] = $ibforums->base_url."act=boardrules";
+        	}
+        	
+        	$this_header = str_replace( "<!--IBF.RULES-->", $ibforums->skin_global->rules_link($ibforums->vars['gl_link'], $ibforums->vars['gl_title']), $this_header );
+        }
+        
+        //-----------------------------------------
+        // Build the members bar
+		//-----------------------------------------
+		
+		if ( ($ibforums->member['g_max_messages'] > 0) and ($ibforums->member['msg_total'] >= $ibforums->member['g_max_messages']) )
+		{
+			$msg_data['TEXT'] = $ibforums->lang['msg_full'];
+		}
+		else
+		{
+			$ibforums->member['new_msg'] = $ibforums->member['new_msg'] == "" ? 0 : $ibforums->member['new_msg'];
+		
+			$msg_data['TEXT'] = sprintf( $ibforums->lang['msg_new'], $ibforums->member['new_msg']);
+		}
+		
+		$output_array['MEMBER_BAR'] = $ibforums->skin_global->member_bar($msg_data);
+		
+		//-----------------------------------------
+		// Board offline?
+		//-----------------------------------------
+		
+ 		if ($ibforums->vars['board_offline'] == 1)
+ 		{
+ 			$output_array['TITLE'] = $ibforums->lang['warn_offline']." ".$output_array['TITLE'];
+ 		}
+        
+        //-----------------------------------------
+        // Showing skin jump?
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['allow_skins'] and $ibforums->member['id'] > 0 )
+        {
+        	$skin_jump = $ibforums->skin_global->global_skin_chooser( $this->_build_skin_list() );
+        }
+        else
+        {
+        	$skin_jump = "";
+        }
+        
+        //-----------------------------------------
+        // Showing skin jump?
+        //-----------------------------------------
+        
+        if ( $ibforums->member['id'] > 0 )
+        {
+        	$lang_jump = $ibforums->skin_global->global_lang_chooser( $this->_build_language_list() );
+        }
+        else
+        {
+        	$lang_jump = "";
+        }
+        
+        //-----------------------------------------
+        // Show quick stats?
+        //-----------------------------------------
+        
+        $gzip_status = $ibforums->vars['disable_gzip'] == 1 ? $ibforums->lang['gzip_off'] : $ibforums->lang['gzip_on'];
+        
+        if ( ! $ibforums->server_load  )
+        {
+        	$ibforums->server_load = '--';
+        }
+        
+        //-----------------------------------------
+        // Basics
+        //-----------------------------------------
+        
+        if ( $ibforums->member['id'] and $ibforums->vars['debug_level'] )
+        {
+        	$quickstats = $ibforums->skin_global->global_quick_stats($this->ex_time, $gzip_status, $ibforums->server_load, $DB->get_query_cnt() );
+        }
+        else
+        {
+        	$quickstats = "";
+        }
+        
+        //-----------------------------------------
+        // Add in task image?
+        //-----------------------------------------
+        
+        if ( time() >= $ibforums->cache['systemvars']['task_next_run'] )
+        {
+        	$this->to_print .= "<!--TASK--><img src='{$ibforums->base_url}act=task' border='0' height='1' width='1' /><!--ETASK-->";
+        }
+        
+        $ibforums->skin['_wrapper'] = str_replace( "<% CSS %>"            , $css                     , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% JAVASCRIPT %>"     , ""                       , $ibforums->skin['_wrapper']);
+        $ibforums->skin['_wrapper'] = str_replace( "<% TITLE %>"          , $output_array['TITLE']   , $ibforums->skin['_wrapper']);
+        $ibforums->skin['_wrapper'] = str_replace( "<% BOARD %>"          , $this->to_print          , $ibforums->skin['_wrapper']);
+        $ibforums->skin['_wrapper'] = str_replace( "<% STATS %>"          , $stats                   , $ibforums->skin['_wrapper']);
+        $ibforums->skin['_wrapper'] = str_replace( "<% GENERATOR %>"      , ""                       , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% COPYRIGHT %>"      , $copyright               , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% BOARD HEADER %>"   , $this_header             , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% BOARD FOOTER %>"   , $this_footer             , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% NAVIGATION %>"     , $nav                     , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% SKINCHOOSER %>"    , $skin_jump               , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% LANGCHOOSER %>"    , $lang_jump               , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% QUICKSTATS %>"     , $quickstats              , $ibforums->skin['_wrapper']);
+		$ibforums->skin['_wrapper'] = str_replace( "<% LOFIVERSION %>"    , $this->_get_lofi_link()  , $ibforums->skin['_wrapper']);
+		
+		if ( empty($output_array['OVERRIDE']) )
+		{
+      	    $ibforums->skin['_wrapper'] = str_replace( "<% MEMBER BAR %>", $output_array['MEMBER_BAR'], $ibforums->skin['_wrapper']);
+        }
+        else
+        {
+      	    $ibforums->skin['_wrapper'] = str_replace( "<% MEMBER BAR %>", $ibforums->skin_global->member_bar_disabled(), $ibforums->skin['_wrapper']);
+      	}
+      	
+      	//-----------------------------------------
+		// Do we have a PM show?
+		//-----------------------------------------
+		
+		if ($ibforums->member['show_popup'])
+		{
+			$DB->simple_construct( array( 'update' => 'members', 'set' => 'show_popup=0', 'where' => 'id='.$ibforums->member['id'] ) );
+			$DB->simple_shutdown_exec();
+			
+			if ( $ibforums->input['act'] != 'Msg' )
+			{
+				$ibforums->skin['_wrapper'] = str_replace( '<!--IBF.NEWPMBOX-->', $std->get_new_pm_notification(), $ibforums->skin['_wrapper'] );
+			}
+		}
+      	
+		//-----------------------------------------
+		// Stick in chat link? top_site_list_integrate
+		//-----------------------------------------
+		
+		if ($ibforums->vars['chat_account_no'] or $ibforums->vars['chat04_account_no'])
+		{
+			$ibforums->vars['chat_height'] += $ibforums->vars['chat_poppad'] ? $ibforums->vars['chat_poppad'] : 50;
+			$ibforums->vars['chat_width']  += $ibforums->vars['chat_poppad'] ? $ibforums->vars['chat_poppad'] : 50;
+			
+			$chat_link = ( $ibforums->vars['chat_display'] == 'self' )
+					   ? $ibforums->skin_global->show_chat_link_inline()
+					   : $ibforums->skin_global->show_chat_link_popup();
+			
+			$ibforums->skin['_wrapper'] = str_replace( "<!--IBF.CHATLINK-->", $chat_link, $ibforums->skin['_wrapper'] );
+		}
+		
+		//-----------------------------------------
+		// Stick in TSL link? 
+		//-----------------------------------------
+		
+		if ($ibforums->vars['top_site_list_integrate'])
+		{
+			$ibforums->skin['_wrapper'] = str_replace( "<!--IBF.TSLLINK-->", $ibforums->skin_global->show_tsl_link_inline(), $ibforums->skin['_wrapper'] );
+		}
+      	
+      	//-----------------------------------------
+      	// Get the macros and replace them
+      	//-----------------------------------------
+      	
+      	if ( is_array( $this->macros ) )
+      	{
+			foreach( $this->macros as $i => $row )
+			{
+				if ($row['macro_value'] != "")
+				{
+					$ibforums->skin['_wrapper'] = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $ibforums->skin['_wrapper'] );
+				}
+			}
+		}
+		
+		$ibforums->skin['_wrapper'] = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $ibforums->skin['_wrapper'] );
+		$ibforums->skin['_wrapper'] = str_replace( "<#EMO_DIR#>", $ibforums->skin['_emodir']  , $ibforums->skin['_wrapper'] );
+		
+		//-----------------------------------------
+		// Images on another server? uncomment and alter below
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['ipb_img_url'] )
+		{
+			$ibforums->skin['_wrapper'] = preg_replace( "#img\s+?src=[\"']style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"".$ibforums->vars['ipb_img_url']."style_\\1\\2\"\\3>", $ibforums->skin['_wrapper'] );
+		}
+		
+		$this->_finish();
+		
+        print $ibforums->skin['_wrapper'];
+
+        exit;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // print the headers
+    //
+    /*-------------------------------------------------------------------------*/
+        
+    function do_headers()
+    {
+		global $ibforums;
+    	
+    	if ($ibforums->vars['print_headers'])
+    	{
+			@header("HTTP/1.0 200 OK");
+			@header("HTTP/1.1 200 OK");
+			@header("Content-type: text/html");
+			
+			if ($ibforums->vars['nocache'])
+			{
+				@header("Cache-Control: no-cache, must-revalidate, max-age=0");
+				@header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+				@header("Pragma: no-cache");
+			}
+        }
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // print a pure redirect screen
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function redirect_screen($text="", $url="", $override=0)
+    {
+		global $ibforums, $std, $DB;
+    	
+    	//-----------------------------------------
+    	// Make sure global skin is loaded
+    	//-----------------------------------------
+    	
+    	if ( $ibforums->skin_global == "" )
+		{
+			$std->load_template('skin_global');
+		}
+    	
+    	if ($ibforums->input['debug'])
+        {
+        	flush();
+        	exit();
+        }
+        
+        //-----------------------------------------
+        // $ibforums not initialized yet?
+        //-----------------------------------------
+        
+        if ( $override != 1 )
+        {
+			if ( $ibforums->base_url )
+			{
+				$url = $ibforums->base_url.$url;
+			}
+			else
+			{
+				$url = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?".$url;
+			}
+    	}
+    	
+    	//-----------------------------------------
+    	// Feck off first?
+    	//-----------------------------------------
+    	
+    	if ( $ibforums->vars['ipb_remove_redirect_pages'] == 1 )
+    	{
+    		$std->boink_it( $url );
+    	}
+    	
+    	$ibforums->lang['stand_by'] = stripslashes($ibforums->lang['stand_by']);
+    	
+    	//-----------------------------------------
+        // CSS
+        //-----------------------------------------
+        
+        $css = $this->_get_css();
+        
+        //-----------------------------------------
+        // Get template
+        //-----------------------------------------
+        
+    	$htm = $ibforums->skin_global->Redirect( ucfirst($text), $url, $css);
+    	
+    	//-----------------------------------------
+    	// Get and parse macros
+    	//-----------------------------------------
+    	
+    	$this->_unpack_macros();
+		
+		foreach( $this->macros as $i => $row )
+      	{
+			if ($row['macro_value'] != "")
+			{
+				$htm = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $htm );
+			}
+		}
+		
+		$htm = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $htm );
+		
+		$this->_finish();
+        
+    	echo ($htm);
+    	exit;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // print a minimalist screen suitable for small pop up windows
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function pop_up_window($title = 'Invision Power Board', $text = "" )
+    {
+		global $ibforums, $DB;
+    	
+    	//-----------------------------------------
+        // CSS
+        //-----------------------------------------
+        
+        $css = $this->_get_css();
+		
+		//-----------------------------------------
+        // Get template
+        //-----------------------------------------
+        
+    	$html = $ibforums->skin_global->pop_up_window($title, $css, $text);
+    	        
+    	//-----------------------------------------
+    	// Get and parse macros
+    	//-----------------------------------------
+    	
+    	$this->_unpack_macros();
+		
+		foreach( $this->macros as $i => $row )
+      	{
+			if ($row['macro_value'] != "")
+			{
+				$html = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $html );
+			}
+		}
+		
+		$html = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $html );
+		$html = str_replace( "<#EMO_DIR#>", $ibforums->skin['_emodir']  , $html );
+    	
+    	//-----------------------------------------
+		// Images on another server? uncomment and alter below
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['ipb_img_url'] )
+		{
+			$html = preg_replace( "#img\s+?src=[\"']style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"".$ibforums->vars['ipb_img_url']."style_\\1\\2\"\\3>", $html );
+		}
+		
+    	$this->_finish();
+        
+    	echo ($html);
+    	exit;
+    } 
+    
+    //-----------------------------------------
+    // Show lo-fi link
+    // @internal
+    //-----------------------------------------
+    
+    function _get_lofi_link()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$link = "";
+    	$char = '/';
+    	
+    	if ( substr(PHP_OS, 0, 3) == 'WIN' OR php_sapi_name() == 'cgi' OR php_sapi_name() == 'apache2filter' )
+		{
+			$char = '?';
+		}
+		
+    	if ( $ibforums->input['act'] == 'st' )
+    	{
+    		$link = $char.'t'.$ibforums->input['t'].'.html';
+    	}
+    	else if ( $ibforums->input['act'] == 'sf' )
+    	{
+    		$link = $char.'f'.$ibforums->input['f'].'.html';
+    	}
+    	
+    	return $link;
+    }
+    
+    //-----------------------------------------
+    // Build Languages List
+    // @internal
+    //-----------------------------------------
+    
+    function _build_language_list()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$lang_list = "";
+    	
+    	//-----------------------------------------
+		// Roots
+		//-----------------------------------------
+		
+		foreach( $ibforums->cache['languages'] as $id => $data )
+		{
+			if ( $ibforums->member['language'] == $data['ldir'] )
+			{
+				$selected = ' selected="selected"';
+			}
+			else
+			{
+				$selected = "";
+			}
+			
+			$lang_list .= "\n<option value='{$data['ldir']}'{$selected}>{$data['lname']}</option>";
+		}
+		
+		return $lang_list;
+    }
+
+	//-----------------------------------------
+    // Build Skin List
+    // @internal
+    //-----------------------------------------
+    
+    function _build_skin_list()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$skin_list = "";
+    	
+    	//-----------------------------------------
+		// Roots
+		//-----------------------------------------
+		
+		foreach( $ibforums->cache['skin_id_cache'] as $id => $data )
+		{
+			$skin_sets[ $data['set_parent'] ]['_children'][] = $id;
+			
+			if ( $data['set_parent'] < 1 and $id > 1 )
+			{
+				if ( $data['set_hidden'] and ! $ibforums->member['g_access_cp'] )
+				{
+					continue;
+				}
+				
+				$star = $data['set_hidden'] ? ' *' : '';
+				
+				if ( $ibforums->skin['_setid'] == $id )
+				{
+					$selected = ' selected="selected"';
+				}
+				else
+				{
+					$selected = "";
+				}
+				
+				$skin_list .= "\n<option value='$id'{$selected}>{$data['set_name']}{$star}</option><!--CHILDREN:{$id}-->";
+			}
+		}
+		
+		//-----------------------------------------
+		// Kids...
+		//-----------------------------------------
+		
+		foreach( $skin_sets as $id => $data )
+		{	
+			if ( is_array( $data['_children'] ) and count( $data['_children'] ) > 0 )
+			{
+				$html = "";
+				
+				foreach( $data['_children'] as $cid )
+				{
+					if ( $ibforums->cache['skin_id_cache'][ $cid ]['set_hidden'] and ! $ibforums->member['g_access_cp'] )
+					{
+						continue;
+					}
+					
+					$star = $ibforums->cache['skin_id_cache'][ $cid ]['set_hidden'] ? ' *' : '';
+					
+					if ( $ibforums->skin['_setid'] == $cid )
+					{
+						$selected = ' selected="selected"';
+					}
+					else
+					{
+						$selected = "";
+					}
+				
+					$html .= "\n<option value='$cid'{$selected}>---- {$ibforums->cache['skin_id_cache'][ $cid ]['set_name']}{$star}</option>";
+				}
+				
+				$skin_list = str_replace( "<!--CHILDREN:{$id}-->", $html, $skin_list );
+			}
+		}
+		return $skin_list;
+    }
+
+    //-----------------------------------------
+    // unpack_macros
+    // @internal
+    //-----------------------------------------
+    
+    function _unpack_macros()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$this->macros = unserialize(stripslashes($ibforums->skin['_macro']));
+    }
+    
+    //-----------------------------------------
+    // show_debug
+    // @internal
+    //-----------------------------------------
+    
+    function _show_debug()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	$input   = "";
+        $queries = "";
+        $sload   = "";
+        $stats   = "";
+        
+       //-----------------------------------------
+       // Form & Get & Skin
+       //-----------------------------------------
+       
+       if ($ibforums->vars['debug_level'] >= 2)
+       {
+       		$stats .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>FORM and GET Input</div><div class='row1' style='padding:6px'>\n";
+        
+			while( list($k, $v) = each($ibforums->input) )
+			{
+				$stats .= "<strong>$k</strong> = $v<br />\n";
+			}
+			
+			$stats .= "</div>\n</div>";
+			
+			$stats .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>SKIN & TASK Info</div><div class='row1' style='padding:6px'>\n";
+        
+			while( list($k, $v) = each($ibforums->skin) )
+			{
+				if ( strlen($v) > 120 )
+				{
+					$v = substr( $v, 0, 120 ). '...';
+				}
+				$stats .= "<strong>$k</strong> = ".$std->txt_htmlspecialchars($v)."<br />\n";
+			}
+			
+			$stats .= "<b>Next task</b> = ".$std->get_date( $ibforums->cache['systemvars']['task_next_run'], 'LONG' )."\n<br /><b>Time now</b> = ".$std->get_date( time(), 'LONG' );
+			$stats .= "<br /><b>Timestamp Now</b> = ".time();
+			
+			$stats .= "</div>\n</div>";
+			
+			$stats .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>Loaded PHP Templates</div><div class='row1' style='padding:6px'>\n";
+        
+			$stats .= "<strong>".implode(", ",$ibforums->loaded_templates)."</strong><br />\n";
+			
+			$stats .= "</div>\n</div>";
+        
+        }
+        
+        //-----------------------------------------
+        // SQL
+        //-----------------------------------------
+        
+        if ($ibforums->vars['debug_level'] >= 3)
+        {
+           	$stats .= "<br />\n<div class='tableborder'>\n<div class='subtitle'>Queries Used</div><div class='row1' style='padding:6px'>";
+       					
+        	foreach($DB->obj['cached_queries'] as $q)
+        	{
+        		$q = htmlspecialchars($q);
+        		$q = preg_replace( "/^SELECT/i" , "<span class='red'>SELECT</span>"   , $q );
+        		$q = preg_replace( "/^UPDATE/i" , "<span class='blue'>UPDATE</span>"  , $q );
+        		$q = preg_replace( "/^DELETE/i" , "<span class='orange'>DELETE</span>", $q );
+        		$q = preg_replace( "/^INSERT/i" , "<span class='green'>INSERT</span>" , $q );
+        		$q = str_replace( "LEFT JOIN"   , "<span class='red'>LEFT JOIN</span>" , $q );
+        		
+        		$q = preg_replace( "/(".$ibforums->vars['sql_tbl_prefix'].")(\S+?)([\s\.,]|$)/", "<span class='purple'>\\1\\2</span>\\3", $q );
+        		
+        		$stats .= "$q<hr />\n";
+        	}
+        	
+        	if ( count( $DB->obj['shutdown_queries'] ) )
+        	{
+				foreach($DB->obj['shutdown_queries'] as $q)
+				{
+					$q = htmlspecialchars($q);
+					$q = preg_replace( "/^SELECT/i" , "<span class='red'>SELECT</span>"   , $q );
+					$q = preg_replace( "/^UPDATE/i" , "<span class='blue'>UPDATE</span>"  , $q );
+					$q = preg_replace( "/^DELETE/i" , "<span class='orange'>DELETE</span>", $q );
+					$q = preg_replace( "/^INSERT/i" , "<span class='green'>INSERT</span>" , $q );
+					$q = str_replace( "LEFT JOIN"   , "<span class='red'>LEFT JOIN</span>" , $q );
+					
+					$q = preg_replace( "/(".$ibforums->vars['sql_tbl_prefix'].")(\S+?)([\s\.,]|$)/", "<span class='purple'>\\1\\2</span>\\3", $q );
+					
+					$stats .= "<div style='background:#DEDEDE'><b>SHUTDOWN:</b> $q</div><hr />\n";
+				}
+        	}
+        	
+        	$stats .= "</div>\n</div>";
+        }
+        
+        if ( $stats )
+        {
+			$collapsed_ids = ','.$std->my_getcookie('collapseprefs').',';
+			
+			$show['div_fo'] = 'show';
+			$show['div_fc'] = 'none';
+				
+			if ( strstr( $collapsed_ids, ',debug,' ) )
+			{
+				$show['div_fo'] = 'none';
+				$show['div_fc'] = 'show';
+			}
+			
+			$stats = "<div align='center' style='display:{$show['div_fc']}' id='fc_debug'>
+					   <div class='row2' style='padding:8px;vertical-align:middle'><a href='javascript:togglecategory(\"debug\", 0);'>Show Debug Information</a></div>
+					  </div>
+					  
+					  <div align='center' style='display:{$show['div_fo']}' id='fo_debug'>
+					   <div class='row2' style='padding:8px;vertical-align:middle'><a href='javascript:togglecategory(\"debug\", 1);'>Hide Debug Information</a></div>
+					   <br />
+					   <div class='tableborder' align='left'>
+						<div class='maintitle'>Debug Information</div>
+						 <div style='padding:5px;background:#8394B2;'>$stats</div>
+					   </div>
+					  </div>";
+        }
+        
+        return $stats;
+    }
+    
+    //-----------------------------------------
+    // check_debug
+    // @internal
+    //-----------------------------------------
+    
+    function _check_debug()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	if ($DB->obj['debug'])
+        {
+        	flush();
+        	print "<html><head><title>SQL Debugger</title><body bgcolor='white'><style type='text/css'> TABLE, TD, TR, BODY { font-family: verdana,arial, sans-serif;color:black;font-size:11px }</style>";
+        	print "<h1 align='center'>SQL Total Time: {$DB->sql_time} for {$query_cnt} queries</h1><br />".$ibforums->debug_html;
+        	print "<br /><div align='center'><strong>Total SQL Time: {$DB->sql_time}</div></body></html>";
+        	exit();
+        }
+    }
+    
+    
+    
+    //-----------------------------------------
+    // check_ips_report
+    // @internal
+    //-----------------------------------------
+    
+    function _check_ips_report()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	//-----------------------------------------
+		// Note, this is designed to allow IPS validate boards
+		// who've purchased copyright removal / registration.
+		// The order number is the only thing shown and the
+		// order number is unique to the person who paid and
+		// is no good to anyone else.
+		// Showing the order number poses no risk at all -
+		// the information is useless to anyone outside of IPS.
+		//-----------------------------------------
+		
+		$pass = 0;
+		
+		if ( $ibforums->input['ipsreport'] or $ibforums->input['ipscheck'] )
+		{
+			if ( $ibforums->vars['ipb_copy_number'] )
+			{
+				flush();
+				print preg_replace( "/^(\d+?)-(\d+?)-(\d+?)-(\d+?)$/", "\\2,\\3", $ibforums->vars['ipb_copy_number'] );
+				exit();
+			}
+			else if ( $ibforums->vars['ipb_reg_number'] )
+			{
+				flush();
+				print preg_replace( "/^(\d+?)-(\d+?)-(\d+?)-(\d+?)-(\d+?)$/", "\\2,\\4", $ibforums->vars['ipb_reg_number'] );
+				exit();
+			}
+			else
+			{
+				print "--";
+				exit();
+			}
+        }	
+    }
+    
+    //-----------------------------------------
+    // get_css
+    // @internal
+    //-----------------------------------------
+    
+    function _get_css()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	if ( $ibforums->skin['_usecsscache'] and @file_exists( CACHE_PATH.'style_images/css_'. $ibforums->skin['_csscacheid'] .'.css' ) )
+        {
+        	$css = $ibforums->skin_global->css_external($ibforums->skin['_csscacheid']);
+        }
+        else
+        {
+        	$css = $ibforums->skin_global->css_inline( str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $ibforums->skin['_css'] ) );
+        }
+        
+        return $css;
+    }
+    
+    //-----------------------------------------
+    // finish
+    // @internal
+    //-----------------------------------------
+    
+    function _finish()
+    {
+		global $ibforums, $DB, $std;
+    	
+    	//-----------------------------------------
+		// Do shutdown
+		//-----------------------------------------
+		
+		if ( ! USE_SHUTDOWN )
+        {
+        	$std->my_deconstructor();
+        	$DB->close_db();
+        }
+        
+		//-----------------------------------------
+		// Start GZIP compression
+        //-----------------------------------------
+        
+        if ($ibforums->vars['disable_gzip'] != 1 )
+        {
+        	$buffer = ob_get_contents();
+        	ob_end_clean();
+        	@ob_start('ob_gzhandler');
+        	print $buffer;
+        }
+        
+        //-----------------------------------------
+        // Print, plop and part
+        //-----------------------------------------
+        
+        $this->do_headers();
+    }
+        
+} // END class
+    
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/emailer.php b/upload/sources/classes/class_email.php
similarity index 53%
rename from upload/sources/lib/emailer.php
rename to upload/sources/classes/class_email.php
index 11e0246f..0333228f 100644
--- a/upload/sources/lib/emailer.php
+++ b/upload/sources/classes/class_email.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,6 +19,7 @@
 |   > Date started: 26th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
 +--------------------------------------------------------------------------
 |
 |   QUOTE OF THE MODULE: (Taken from "Shrek" (c) Dreamworks Pictures)
@@ -36,7 +36,6 @@
 
 class emailer {
 
-
 	var $from         = "";
 	var $to           = "";
 	var $subject      = "";
@@ -47,10 +46,13 @@ class emailer {
 	var $error        = "";
 	var $parts        = array();
 	var $bcc          = array();
-	var $mail_headers = array();
+	var $mail_headers = "";
 	var $multipart    = "";
 	var $boundry      = "";
 	
+	var $html_email   = 0;
+	var $char_set     = 'iso-8859-1';
+	
 	var $smtp_fp      = FALSE;
 	var $smtp_msg     = "";
 	var $smtp_port    = "";
@@ -59,25 +61,26 @@ class emailer {
 	var $smtp_pass    = "";
 	var $smtp_code    = "";
 	
+	var $wrap_brackets = 0;
+	
 	var $mail_method  = 'mail';
 	
-	var $temp_dump = 0;
+	var $temp_dump    = 0;
+	var $root_path    = './';
 	
-	function emailer()
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function emailer($ROOT_PATH="")
 	{
-		global $ibforums;
+		global $ibforums, $DB, $std;
 		
-		//---------------------------------------------------------
-		// Assign $from as the admin out email address, this can be
-		// over-riden at any time.
-		//---------------------------------------------------------
+		$this->email_init();
 		
-		$this->from      = $ibforums->vars['email_out'];
-		$this->temp_dump = $ibforums->vars['fake_mail'];
-		
-		//---------------------------------------------------------
+		//-----------------------------------------
 		// Set up SMTP if we're using it
-		//---------------------------------------------------------
+		//-----------------------------------------
 		
 		if ( $ibforums->vars['mail_method'] == 'smtp' )
 		{ 
@@ -88,10 +91,20 @@ class emailer {
 			$this->smtp_pass   = $ibforums->vars['smtp_pass'];
 		}
 		
-		//---------------------------------------------------------
+		if ( $ROOT_PATH )
+		{
+			$this->root_path = $ROOT_PATH;
+		}
+		
+		if ( ! defined( 'ROOT_PATH') )
+		{
+			define( 'ROOT_PATH', $this->root_path );
+		}
+		
+		//-----------------------------------------
 		// Temporarily assign $header and $footer, this can be over-riden
 		// also
-		//---------------------------------------------------------
+		//-----------------------------------------
 		
 		$this->header  = $ibforums->vars['email_header'];
 		$this->footer  = $ibforums->vars['email_footer'];
@@ -100,8 +113,27 @@ class emailer {
 		$ibforums->vars['board_name'] = $this->clean_message($ibforums->vars['board_name']);
 	}
 	
+	/*-------------------------------------------------------------------------*/
+	// Email init
+	/*-------------------------------------------------------------------------*/
 	
+	function email_init()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Assign $from as the admin out email address, this can be
+		// over-riden at any time.
+		//-----------------------------------------
+		
+		$this->from          = $ibforums->vars['email_out'];
+		$this->temp_dump     = $ibforums->vars['fake_mail'];
+		$this->wrap_brackets = $ibforums->vars['mail_wrap_brackets'];
+	}
 	
+	/*-------------------------------------------------------------------------*/
+	// ADD ATTACHMENT
+	/*-------------------------------------------------------------------------*/
 	
 	function add_attachment($data = "", $name = "", $ctype='application/octet-stream')
 	{
@@ -113,13 +145,29 @@ class emailer {
 							  );
 	}
 	
-	
+	/*-------------------------------------------------------------------------*/
+	// BUILD HEADERS
+	/*-------------------------------------------------------------------------*/
 	
 	function build_headers()
 	{
 		global $ibforums;
 		
-		$this->mail_headers  = "From: \"".$ibforums->vars['board_name']."\" <".$this->from.">\n";
+		//-----------------------------------------
+		// HTML (hitmuhl)
+		//-----------------------------------------
+		
+		if ( $this->html_email )
+		{
+			$this->mail_headers .= "MIME-Version: 1.0\n";
+			$this->mail_headers .= "Content-type: text/html; charset=\"".$this->char_set."\"\n";
+		}
+		
+		//-----------------------------------------
+		// Start mail headers
+		//-----------------------------------------
+		
+		$this->mail_headers  .= "From: \"".$ibforums->vars['board_name']."\" <".$this->from.">\n";
 		
 		if ( $this->mail_method != 'smtp' )
 		{
@@ -137,16 +185,33 @@ class emailer {
 			$this->mail_headers .= "Subject: ".$this->subject."\n";
 		}
 		
+		//-----------------------------------------
+		// we're not spam, really!
+		//-----------------------------------------
+		
 		$this->mail_headers .= "Return-Path: ".$this->from."\n";
 		$this->mail_headers .= "X-Priority: 3\n";
 		$this->mail_headers .= "X-Mailer: IPB PHP Mailer\n";
 		
+		//-----------------------------------------
+		// Count.. oh you get the idea
+		//-----------------------------------------
+		
 		if ( count ($this->parts) > 0 )
 		{
-		    
-			$this->mail_headers .= "MIME-Version: 1.0\n";
-			$this->mail_headers .= "Content-Type: multipart/mixed;\n\tboundary=\"".$this->boundry."\"\n\nThis is a MIME encoded message.\n\n--".$this->boundry;
-			$this->mail_headers .= "\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\nContent-Transfer-Encoding: quoted-printable\n\n".$this->message."\n\n--".$this->boundry;
+			if ( ! $this->html )
+			{
+				$this->mail_headers .= "MIME-Version: 1.0\n";
+				$this->mail_headers .= "Content-Type: multipart/mixed;\n\tboundary=\"".$this->boundry."\"\n\nThis is a MIME encoded message.\n\n--".$this->boundry;
+				$this->mail_headers .= "\nContent-Type: text/plain;\n\tcharset=\"".$this->char_set."\"\nContent-Transfer-Encoding: quoted-printable\n\n".$this->message."\n\n--".$this->boundry;
+			}
+			else
+			{
+				$this->mail_headers .= "MIME-Version: 1.0\n";
+				$this->mail_headers .= "Content-Type: multipart/mixed;\n\tboundary=\"".$this->boundry."\"\n\nThis is a MIME encoded message.\n\n--".$this->boundry;
+				$this->mail_headers .= "\nContent-Type: text/html;\n\tcharset=\"".$this->char_set."\"\nContent-Transfer-Encoding: quoted-printable\n\n".$this->message."\n\n--".$this->boundry;
+			}
+			
 			$this->mail_headers .= $this->build_multipart();
 			
 			$this->message = "";
@@ -154,7 +219,12 @@ class emailer {
 	
 	}
 	
-	function encode_attachment($part) {
+	/*-------------------------------------------------------------------------*/
+	// ENCODE ATTACHMENT
+	/*-------------------------------------------------------------------------*/
+	
+	function encode_attachment($part)
+	{
 		
 		$msg = chunk_split(base64_encode($part['data']));
 		
@@ -163,7 +233,12 @@ class emailer {
 		
 	}
 	
-	function build_multipart() {
+	/*-------------------------------------------------------------------------*/
+	// BUILD MULTIPART
+	/*-------------------------------------------------------------------------*/
+	
+	function build_multipart() 
+	{
 	
 		$multipart = "";
 		
@@ -177,14 +252,18 @@ class emailer {
 	}
 	
 	
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	// send_mail:
 	// Physically sends the email
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	
 	function send_mail()
 	{
-		global $ibforums;
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Wipe ya face
+		//-----------------------------------------
 		
 		$this->to   = preg_replace( "/[ \t]+/" , ""  , $this->to   );
 		$this->from = preg_replace( "/[ \t]+/" , ""  , $this->from );
@@ -195,27 +274,42 @@ class emailer {
 		$this->to     = preg_replace( "#\#\[\]'\"\(\):;/\$!£%\^&\*\{\}#" , "", $this->to  );
 		$this->from   = preg_replace( "#\#\[\]'\"\(\):;/\$!£%\^&\*\{\}#" , "", $this->from);
 		
-		$this->subject = ( $this->lang_subject != "" ) ? $this->lang_subject : $this->subject;
+		$this->subject = ( trim($this->lang_subject) != "" ) ? $this->lang_subject : $this->subject;
 		
 		$this->subject = $this->clean_message($this->subject);
 		
+		//-----------------------------------------
+		// Build headers
+		//-----------------------------------------
+		
 		$this->build_headers();
 		
+		//-----------------------------------------
+		// Lets go..
+		//-----------------------------------------
+		
 		if ( ($this->from) and ($this->subject) )
 		{
 			$this->subject .= " ( From ".$ibforums->vars['board_name']." )";
 			
+			//-----------------------------------------
+			// Tmp dump? (Testing)
+			//-----------------------------------------
+			
 			if ($this->temp_dump == 1)
 			{
 				$blah = $this->subject."\n------------\n".$this->mail_headers."\n\n".$this->message;
 				
-				$pathy = './_mail/'.date("M-j-Y,h:i-A").".txt";
+				$pathy = $this->root_path.'_mail/'.date("M-j-Y,hi-A").str_replace( '@', '+', $this->to ).".txt";
 				$fh = fopen ($pathy, 'w');
 				fputs ($fh, $blah, strlen($blah) );
 				fclose($fh);
 			}
 			else
 			{
+				//-----------------------------------------
+				// PHP MAIL()
+				//-----------------------------------------
 				if ($this->mail_method != 'smtp')
 				{
 					if ( ! @mail( $this->to, $this->subject, $this->message, $this->mail_headers ) )
@@ -223,6 +317,9 @@ class emailer {
 						$this->fatal_error("Could not send the email", "Failed at 'mail' command");
 					}
 				}
+				//-----------------------------------------
+				// SMTP
+				//-----------------------------------------
 				else
 				{
 					$this->smtp_send_mail();
@@ -231,19 +328,32 @@ class emailer {
 		}
 		else
 		{
+			$this->fatal_error("From or subject empty");
 			return FALSE;
 		}
+		
+		$this->to           = "";
+		$this->from         = "";
+		$this->message      = "";
+		$this->subject      = "";
+		$this->mail_headers = "";
+		
+		$this->email_init();
 	}
 	
 	
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	// get_template:
 	// Queries the database, and stores the template we wish to use in memory
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 
 	function get_template($name="", $language="")
 	{
-		global $ibforums, $IB, $DB;
+		global $ibforums, $IB, $DB, $lang;
+		
+		//-----------------------------------------
+		// Check..
+		//-----------------------------------------
 		
 		if ($name == "")
 		{
@@ -251,6 +361,10 @@ class emailer {
 			$this->fatal_error("A valid email template ID was not passed to the email library during template parsing", "");
 		}
 		
+		//-----------------------------------------
+		// Default?
+		//-----------------------------------------
+		
 		if ( $ibforums->vars['default_language'] == "")
 		{
 			$ibforums->vars['default_language'] = 'en';
@@ -261,38 +375,78 @@ class emailer {
 			$language = $ibforums->vars['default_language'];
 		}
 		
-		if (! file_exists("./lang/$language/email_content.php") )
+		//-----------------------------------------
+		// Check and get
+		//-----------------------------------------
+		
+		if ( ! file_exists($this->root_path."lang/$language/lang_email_content.php") )
 		{
-			require "./lang/".$ibforums->vars['default_language']."/email_content.php";
+			if ( ! is_array( $lang ) )
+			{
+				$lang = array();
+			}
+			
+			require_once( $this->root_path."lang/".$ibforums->vars['default_language']."/lang_email_content.php" );
 		}
 		else
 		{
-			require "./lang/$language/email_content.php";
+			if ( ! is_array( $lang ) )
+			{
+				$lang = array();
+			}
+			
+			require_once( $this->root_path."lang/$language/lang_email_content.php" );
 		}
 		
-		if (! isset($EMAIL[ $name ]) )
+		//-----------------------------------------
+		// Stored KEY?
+		//-----------------------------------------
+		
+		if ( ! isset($lang[ $name ]) )
 		{
-			$this->fatal_error("Could not find an email template with an ID of '$name'", "");
+			if ( $language == $ibforums->vars['default_language'] )
+			{
+				$this->fatal_error("Could not find an email template with an ID of '$name'", "");
+			}
+			else
+			{
+				require_once( $this->root_path."lang/".$ibforums->vars['default_language']."/lang_email_content.php" );
+				
+				if ( ! isset($lang[ $name ]) )
+				{
+					$this->fatal_error("Could not find an email template with an ID of '$name'", "");
+				}
+			}
 		}
 		
-		if ( isset( $SUBJECT[ $name ] ) )
+		//-----------------------------------------
+		// Subject?
+		//-----------------------------------------
+		
+		if ( isset( $lang[ 'subject__'. $name ] ) )
 		{
-			$this->lang_subject = $SUBJECT[ $name ];
+			$this->lang_subject = stripslashes($lang[ 'subject__'. $name ]);
 		}
 		
-		$this->template = $EMAIL['header'] . $EMAIL[ $name ] . $EMAIL['footer'];
+		//-----------------------------------------
+		// Return
+		//-----------------------------------------
+		
+		$this->template = stripslashes($lang['header']) . stripslashes($lang[ $name ]) . stripslashes($lang['footer']);
 	}
 		
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	// build_message:
 	// Swops template tags into the corresponding string held in $words array.
 	// Also joins header and footer to message and cleans the message for sending
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 		
-	function build_message($words) {
+	function build_message($words)
+	{
 		global $ibforums;
 		
-		if ($this->template == "") {
+		if ($this->template == "")
+		{
 			$this->error++;
 			$this->fatal_error("Could not build the email message, no template assigned", "Make sure a template is assigned first.");
 		}
@@ -315,11 +469,11 @@ class emailer {
 	}
 
 	
-	//+--------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	// clean_message: (Mainly used internally)
 	// Ensures that \n and <br> are converted into CRLF (\r\n)
-	// Also unconverts some iB_CODE.
-	//+--------------------------------------------------------------------------
+	// Also unconverts some BBCode
+	/*-------------------------------------------------------------------------*/
 	
 	function clean_message($message = "" ) {
 	
@@ -349,48 +503,74 @@ class emailer {
 		
 		$message = preg_replace( "#<!--EDIT\|.+?\|.+?-->#" , "" , $message );
 		
-		$message = str_replace( "<br>" , "\r\n", $message );
-		$message = preg_replace( "#<.+?".">#" , "" , $message );
+		//-----------------------------------------
+		// Bear with me...
+		//-----------------------------------------
+		
+		$message = str_replace( "\n"          , "<br />", $message );
+		$message = str_replace( "\r"          , ""      , $message );
+		
+		$message = str_replace( "<br>"        , "\r\n", $message );
+		$message = str_replace( "<br />"      , "\r\n", $message );
+		$message = preg_replace( "#<.+?".">#" , ""    , $message );
 		
 		$message = str_replace( "&quot;", "\"", $message );
 		$message = str_replace( "&#092;", "\\", $message );
 		$message = str_replace( "&#036;", "\$", $message );
-		$message = str_replace( "&#33;" , "!", $message );
-		$message = str_replace( "&#39;" , "'", $message );
-		$message = str_replace( "&lt;"  , "<", $message );
-		$message = str_replace( "&gt;"  , ">", $message );
-		$message = str_replace( "&#124;", '|', $message );
-		$message = str_replace( "&amp;" , "&", $message );
-		$message = str_replace( "&#58;" , ":", $message );
-		$message = str_replace( "&#91;" , "[", $message );
-		$message = str_replace( "&#93;" , "]", $message );
-		$message = str_replace( "&#064;", '@', $message );
-		$message = str_replace( "&#60;", '<', $message );
-		$message = str_replace( "&#62;", '>', $message );
+		$message = str_replace( "&#33;" , "!" , $message );
+		$message = str_replace( "&#39;" , "'" , $message );
+		$message = str_replace( "&lt;"  , "<" , $message );
+		$message = str_replace( "&gt;"  , ">" , $message );
+		$message = str_replace( "&#124;", '|' , $message );
+		$message = str_replace( "&amp;" , "&" , $message );
+		$message = str_replace( "&#58;" , ":" , $message );
+		$message = str_replace( "&#91;" , "[" , $message );
+		$message = str_replace( "&#93;" , "]" , $message );
+		$message = str_replace( "&#064;", '@' , $message );
+		$message = str_replace( "&#60;" , '<' , $message );
+		$message = str_replace( "&#62;" , '>' , $message );
 		
 		return $message;
 	}
 	
+	/*-------------------------------------------------------------------------*/
+	// FATAL ERROR : LOG AND RETURN
+	/*-------------------------------------------------------------------------*/
+	
 	function fatal_error($msg, $help="")
 	{
-		echo("<h1>Mail Error!</h1><br><b>$msg</b><br>$help");
-		exit();
+		global $DB, $std, $ibforums;
+		
+		$DB->do_insert( 'mail_error_logs',
+						array(
+								'mlog_date'     => time(),
+								'mlog_to'       => $this->to,
+								'mlog_from'     => $this->from,
+								'mlog_subject'  => $this->subject,
+								'mlog_content'  => substr( $this->message, 0, 200 ),
+								'mlog_msg'      => $msg,
+								'mlog_code'     => $this->smtp_code,
+								'mlog_smtp_msg' => $this->smtp_msg
+							 )
+					  );
+		
+		return;
 	}
 	
 	
-	//---------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	//
 	// SMTP methods
 	//
-	//---------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	
-	//+------------------------------------
+	//-----------------------------------------
 	//| get_line()
 	//|
 	//| Reads a line from the socket and returns
 	//| CODE and message from SMTP server
 	//|
-	//+------------------------------------
+	//-----------------------------------------
 	
 	function smtp_get_line()
 	{
@@ -407,13 +587,13 @@ class emailer {
 		}
 	}
 	
-	//+------------------------------------
+	//-----------------------------------------
 	//| send_cmd()
 	//|
 	//| Sends a command to the SMTP server
 	//| Returns TRUE if response, FALSE if not
 	//|
-	//+------------------------------------
+	//-----------------------------------------
 	
 	function smtp_send_cmd($cmd)
 	{
@@ -429,34 +609,28 @@ class emailer {
 		return $this->smtp_code == "" ? FALSE : TRUE;
 	}
 	
-	//+------------------------------------
+	//-----------------------------------------
 	//| error()
 	//|
 	//| Returns SMTP error to our global
 	//| handler
 	//|
-	//+------------------------------------
+	//-----------------------------------------
 	
 	function smtp_error($err = "")
 	{
-		
-		if ( ($this->smtp_code == 501) AND ( preg_match( "/domain missing/i", $this->smtp_msg ) ) )
-		{
-			return;
-		}
-		else
-		{
-			$this->fatal_error( "SMTP protocol failure!</b><br>Host: ".$this->smtp_host."<br>Return Code: ".$this->smtp_code."<br>Return Msg: ".$this->smtp_msg."<br>Invision Power Board Error: $err", "Check your SMTP settings from the admin control panel" );
-		}
+		$this->smtp_msg = $err;
+		$this->fatal_error( $err );
+		return;
 	}
 	
-	//+------------------------------------
+	//-----------------------------------------
 	//| crlf_encode()
 	//|
 	//| RFC 788 specifies line endings in
 	//| \r\n format with no periods on a 
 	//| new line
-	//+------------------------------------
+	//-----------------------------------------
 	
 	function smtp_crlf_encode($data)
 	{
@@ -467,21 +641,22 @@ class emailer {
 		return $data;
 	}
 	
-	//+------------------------------------
+	//-----------------------------------------
 	//| send_mail
 	//|
 	//| Does the bulk of the email sending
-	//+------------------------------------
+	//-----------------------------------------
 	
 	//$this->to, $this->subject, $this->message, $this->mail_headers
 	
 	function smtp_send_mail()
 	{
-		$this->smtp_fp = fsockopen( $this->smtp_host, intval($this->smtp_port), $errno, $errstr, 30 );
+		$this->smtp_fp = @fsockopen( $this->smtp_host, intval($this->smtp_port), $errno, $errstr, 30 );
 		
 		if ( ! $this->smtp_fp )
 		{
 			$this->smtp_error("Could not open a socket to the SMTP server");
+			return;
 		}
 		
 		$this->smtp_get_line();
@@ -492,20 +667,21 @@ class emailer {
 		{
 			$data = $this->smtp_crlf_encode( $this->mail_headers."\n" . $this->message);
 			
-			//---------------------
+			//-----------------------------------------
 			// HELO!, er... HELLO!
-			//---------------------
+			//-----------------------------------------
 			
 			$this->smtp_send_cmd("HELO ".$this->smtp_host);
 			
 			if ( $this->smtp_code != 250 )
 			{
 				$this->smtp_error("HELO");
+				return;
 			}
 			
-			//---------------------
+			//-----------------------------------------
 			// Do you like my user!
-			//---------------------
+			//-----------------------------------------
 			
 			if ($this->smtp_user and $this->smtp_pass)
 			{
@@ -518,6 +694,7 @@ class emailer {
 					if ( $this->smtp_code != 334  )
 					{
 						$this->smtp_error("Username not accepted from the server");
+						return;
 					}
 					
 					$this->smtp_send_cmd( base64_encode($this->smtp_pass) );
@@ -525,23 +702,34 @@ class emailer {
 					if ( $this->smtp_code != 235 )
 					{
 						$this->smtp_error("Password not accepted from the server");
+						return;
 					}
 				}
 				else
 				{
 					$this->smtp_error("This server does not support authorisation");
+					return;
 				}
 			}
 			
-			//---------------------
+			//-----------------------------------------
 			// We're from MARS!
-			//---------------------
+			//-----------------------------------------
+			
+			if ( $this->wrap_brackets )
+			{
+				if ( ! preg_match( "/^</", $this->from ) )
+				{
+					$this->from = "<".$this->from.">";
+				}
+			}
 			
 			$this->smtp_send_cmd("MAIL FROM:".$this->from);
 			
 			if ( $this->smtp_code != 250 )
 			{
 				$this->smtp_error();
+				return;
 			}
 			
 			$to_arry = array( $this->to );
@@ -557,13 +745,20 @@ class emailer {
 				}
 			}
 			
-			//---------------------
+			//-----------------------------------------
 			// You are from VENUS!
-			//---------------------
+			//-----------------------------------------
 			
 			foreach( $to_arry as $to_email )
 			{
-				$this->smtp_send_cmd("RCPT TO:".$to_email);
+				if ( $this->wrap_brackets )
+				{
+						$this->smtp_send_cmd("RCPT TO:<".$to_email.">");
+				}
+				else
+				{
+					$this->smtp_send_cmd("RCPT TO:".$to_email);
+				}
 				
 				if ( $this->smtp_code != 250 )
 				{
@@ -573,9 +768,9 @@ class emailer {
 				}
 			}
 			
-			//---------------------
+			//-----------------------------------------
 			// SEND MAIL!
-			//---------------------
+			//-----------------------------------------
 			
 			$this->smtp_send_cmd("DATA");
 			
@@ -587,11 +782,12 @@ class emailer {
 			else
 			{
 				$this->smtp_error("Error on write to SMTP server");
+				return;
 			}
 			
-			//---------------------
+			//-----------------------------------------
 			// GO ON, NAFF OFF!
-			//---------------------
+			//-----------------------------------------
 			
 			$this->smtp_send_cmd(".");
 			
@@ -609,15 +805,16 @@ class emailer {
 				return;
 			}
 			
-			//---------------------
+			//-----------------------------------------
 			// Tubby-bye-bye!
-			//---------------------
+			//-----------------------------------------
 			
 			@fclose( $this->smtp_fp );
 		}
 		else
 		{
 			$this->smtp_error();
+			return;
 		}
 	}
 
diff --git a/upload/sources/classes/class_forums.php b/upload/sources/classes/class_forums.php
new file mode 100644
index 00000000..9955aaad
--- /dev/null
+++ b/upload/sources/classes/class_forums.php
@@ -0,0 +1,795 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > FORUMS CLASS
+|   > Module written by Matt Mecham
+|   > Date started: 26th January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
++--------------------------------------------------------------------------
+*/
+
+class forum_functions
+{
+
+	var $forum_cache   = array();
+	var $forum_by_id   = array();
+	var $forum_built   = array();
+	var $class         = "";
+	var $template_bit  = "";
+	var $depth_guide   = "--";
+	var $return        = "";
+	var $this_forum    = array();
+	var $strip_invisible = 0;
+	var $mod_cache     = array();
+	var $mod_cache_got = 0;
+	var $read_topic_only = 0;
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// ------------------
+	// Register a $this-> class with this module
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// forums_init
+	// ------------------
+	// Grab all forums and stuff into array
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_init()
+	{
+		global $DB, $std, $ibforums;
+		
+		if ( ! is_array( $ibforums->cache['forum_cache'] ) )
+		{
+			$std->update_forum_cache();
+		}
+		
+		$hide_parents = ',';
+		
+		foreach( $ibforums->cache['forum_cache'] as $i => $f )
+		{
+			if ( $this->strip_invisible )
+			{
+				if ( strstr( $hide_parents, ','. $f['parent_id'] .',' ) )
+				{
+					// Don't show any children of hidden parents
+					$hide_parents .= $f['id'].',';
+					continue;
+				}
+				
+				//if ( $f['status'] < 1 )
+				//{
+				//	$hide_parents .= $f['id'].',';
+				//	continue;
+				//}
+				
+				if ( $f['show_perms'] != '*' )
+				{ 
+					if ( $std->check_perms($f['show_perms']) != TRUE )
+					{
+						$hide_parents .= $f['id'].',';
+						continue;
+					}
+				}
+			}
+			
+			if ( $f['parent_id'] < 1 )
+			{
+				$f['parent_id'] = 'root';
+			}
+			
+			$f['fid'] = $f['id'];
+			
+			$this->forum_cache[ $f['parent_id'] ][ $f['id'] ] = $f;
+			$this->forum_by_id[ $f['id'] ] = &$this->forum_cache[ $f['parent_id'] ][ $f['id'] ];
+		}
+		
+	}
+	
+	
+	function forums_remove_childless_parents()
+	{
+		foreach ( $this->forum_cache['root'] as $id => $forum_data )
+		{
+			if ( ! is_array( $this->forum_cache['root'][ $forum_data['id'] ] ) )
+			{
+				unset( $this->forum_cache['root'][ $forum_data['id'] ] );
+				unset( $this->forum_by_id[ $forum_data['id'] ] );
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// forums_get_moderator_cache
+	// ------------------
+	// Grab all mods innit
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_get_moderator_cache()
+	{
+		global $DB, $ibforums, $std;
+		
+		$this->can_see_queued = array();
+		
+		if ( ! is_array( $ibforums->cache['moderators'] ) )
+		{
+			$ibforums->cache['moderators'] = array();
+			
+			$DB->simple_construct( array( 'select' => "*",
+										  'from'   => 'moderators'
+								 )      );
+			
+			$DB->simple_exec();
+			
+			while ( $i = $DB->fetch_row() )
+			{
+				$ibforums->cache['moderators'][ $i['mid'] ] = $i;
+			}
+			
+			$std->update_cache( array( 'name' => 'moderators', 'array' => 1, 'deletefirst' => 1 ) );
+		}
+		
+		if ( count($ibforums->cache['moderators']) )
+		{
+			foreach( $ibforums->cache['moderators'] as $i => $r )
+			{
+				$this->mod_cache[ $r['forum_id'] ][ $r['mid'] ] = array( 'name'  => $r['member_name'],
+																		 'memid' => $r['member_id'],
+																		 'id'    => $r['mid'],
+																		 'isg'   => $r['is_group'],
+																		 'gname' => $r['group_name'],
+																		 'gid'   => $r['group_id'],
+																	   );
+			}
+		}
+		
+		$this->mod_cache_got = 1;
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// forums_get_moderators
+	// ------------------
+	// Grab all mods innit
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_get_moderators($forum_id="")
+	{
+		global $DB, $ibforums;
+		
+		if ( ! $this->mod_cache_got )
+		{
+			$this->forums_get_moderator_cache();
+		}
+		
+		$mod_string = "";
+		
+		if ($forum_id == "")
+		{
+			return "";
+		}
+		
+		if (isset($this->mod_cache[ $forum_id ] ) )
+		{
+			$mod_string = $ibforums->lang['forum_leader'].' ';
+			
+			if (is_array($this->mod_cache[ $forum_id ]) )
+			{
+				foreach ($this->mod_cache[ $forum_id ] as $moderator)
+				{
+					if ($moderator['isg'] == 1)
+					{
+						$mod_string .= "<a href='{$ibforums->base_url}act=Members&amp;max_results=30&amp;filter={$moderator['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0&amp;b=1'>{$moderator['gname']}</a>, ";
+					}
+					else
+					{
+						$mod_string .= "<a href='{$ibforums->base_url}showuser={$moderator['memid']}'>{$moderator['name']}</a>, ";
+					}
+				}
+				
+				$mod_string = preg_replace( "!,\s+$!", "", $mod_string );
+				
+			}
+			else
+			{
+				if ($moderator['isg'] == 1)
+				{
+					$mod_string .= "<a href='{$ibforums->base_url}act=Members&amp;max_results=30&amp;filter={$this->mods[$forum_id]['gid']}&amp;sort_order=asc&amp;sort_key=name&amp;st=0&amp;b=1'>{$this->mods[$forum_id]['gname']}</a>, ";
+				}
+				else
+				{
+					$mod_string .= "<a href='{$ibforums->base_url}showuser={$this->mods[$forum_id]['memid']}'>{$this->mods[$forum_id]['name']}</a>";
+				}
+			}
+		}
+		
+		return $mod_string;
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Forums check access
+	// ------------------
+	// Blah-de-blah
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_check_access($fid, $prompt_login=0, $in='forum')
+	{
+		global $ibforums, $std;
+		
+		$deny_access = 1;
+		
+		if ( $std->check_perms($this->forum_by_id[$fid]['show_perms']) == TRUE )
+		{
+			if ( $std->check_perms($this->forum_by_id[$fid]['read_perms']) == TRUE )
+			{
+				$deny_access = 0;
+			}
+			else
+			{
+				//-----------------------------------------
+				// Can see topics?
+				//-----------------------------------------
+				
+				if ( $this->forum_by_id[$fid]['permission_showtopic'] )
+				{
+					$this->read_topic_only = 1;
+					
+					if ( $in == 'forum' )
+					{
+						$deny_access = 0;
+					}
+					else
+					{
+						//-----------------------------------------
+						// Custom error?
+						//-----------------------------------------
+						
+						$this->forums_custom_error($fid);
+						
+						$deny_access = 1;
+					}
+				}
+				else
+				{
+					$this->forums_custom_error($fid);
+					
+					$deny_access = 1;
+				}
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// custom error
+			//-----------------------------------------
+			
+			$this->forums_custom_error($fid);
+			
+			$deny_access = 1;
+		}
+		
+		
+		//-----------------------------------------
+		// Do we have permission to even see the password page?
+		//-----------------------------------------
+		
+		if ($deny_access == 0)
+		{
+			if ($this->forum_by_id[$fid]['password'])
+			{
+				if ( $this->forums_compare_password( $fid ) == TRUE )
+				{
+					$deny_access = 0;
+				}
+				else
+				{
+					$deny_access = 1;
+					
+					if ( $prompt_login == 1 )
+					{
+						$this->forums_show_login( $fid );
+					}
+				}
+			}
+		}
+		
+		if ($deny_access == 1)
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'no_permission') );
+        }
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Compare forum pasword
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_compare_password( $fid )
+	{
+		global $ibforums, $std;
+		
+		$cookie_pass = $std->my_getcookie( 'ipbforumpass_'.$fid );
+		
+		if ( trim($cookie_pass) == md5($this->forum_by_id[$fid]['password']) )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Quick check
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_quick_check_access($fid)
+	{
+		global $ibforums, $std;
+		
+		$deny_access = 1;
+		
+		if ( $std->check_perms($this->forum_by_id[$fid]['show_perms']) == TRUE )
+		{
+			$deny_access = 0;
+		}
+		
+		//-----------------------------------------
+		// Do we have permission to even see the password page?
+		//-----------------------------------------
+		
+		if ($deny_access == 0)
+		{
+			if ($this->forum_by_id[$fid]['password'])
+			{
+				if ( $this->forums_compare_password( $fid ) == TRUE )
+				{
+					$deny_access = 0;
+				}
+				else
+				{
+					$deny_access = 1;
+				}
+			}
+		}
+		
+		return $deny_access;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Forums custom error
+	// ------------------
+	// Blah-de-blah
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_custom_error( $fid )
+	{
+		global $ibforums, $std, $DB;
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'permission_custom_error', 'from' => 'forums', 'where' => "id=".$fid) );
+		
+		if ( $tmp['permission_custom_error'] )
+		{
+			$ibforums->lang = $std->load_words($ibforums->lang, "lang_error", $ibforums->lang_id);
+			
+			//-----------------------------------------
+			// Update session
+			//-----------------------------------------
+    	
+    		$DB->do_shutdown_update( 'sessions', array( 'in_error' => 1 ), "id='{$ibforums->my_session}'" );
+			
+			list($em_1, $em_2) = explode( '@', $ibforums->vars['email_in'] );
+			
+			$html  = $ibforums->skin_global->Error( $tmp['permission_custom_error'], $em_1, $em_2);
+			$print = new display();
+			$print->add_output($html);
+			$print->do_output( array('TITLE' => $ibforums->lang['error_title'] ) );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Forums log in screen
+	// ------------------
+	// Blah-de-blah
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_show_login( $fid )
+	{
+		global $ibforums, $std, $DB, $print;
+		
+		if ( ! class_exists( 'skin_forum' ) )
+		{
+			$this->html = $std->load_template('skin_forum');
+			$ibforums->lang = $std->load_words($ibforums->lang, 'lang_forum', $ibforums->lang_id);
+		}
+		else
+		{
+			$this->html = new skin_forum();
+		}
+		
+		if (empty($ibforums->member['id']))
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
+		}
+		
+		$this->output = $this->html->forum_password_log_in( $fid );
+		
+		$print->add_output( $this->output );
+		
+        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->forum_by_id[$fid]['name'],
+        					 	  'JS'       => 0,
+        					 	  'NAV'      => array( 
+        					 	  					   "<a href='".$ibforums->base_url."showforum={$fid}'>{$this->forum_by_id[$fid]['name']}</a>",
+        					 	  					 ),
+        					  ) );
+
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get parents
+	// ------------------
+	// Find all the parents of a child without getting the nice lady to 
+	// use the superstore tannoy to shout "Small ugly boy in tears at reception"
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_get_parents($root_id, $ids=array())
+	{
+		if ( $this->forum_by_id[ $root_id ]['parent_id'] and $this->forum_by_id[ $root_id ]['parent_id'] != 'root' )
+		{
+			$ids[] = $this->forum_by_id[ $root_id ]['parent_id'];
+			
+			$ids = $this->forums_get_parents( $this->forum_by_id[ $root_id ]['parent_id'], $ids );
+		}
+		
+		return $ids;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Gets children (Debug purposes)
+	// ------------------
+	// Get all meh children
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_get_children( $root_id, $ids=array() )
+	{
+		if ( is_array( $this->forum_cache[ $root_id ] ) )
+		{
+			foreach( $this->forum_cache[ $root_id ] as $id => $forum_data )
+			{
+				$ids[] = $forum_data['id'];
+				
+				$ids = $this->forums_get_children($forum_data['id'], $ids);
+			}
+		}
+		
+		return $ids;
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// Calcualte Children
+	// ------------------
+	// Gets cumulative posts/topics - sets new post marker and last topic id
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_calc_children($root_id, $forum_data=array(), $done_pass=0)
+	{
+		global $ibforums;
+		
+		if ( is_array( $this->forum_cache[ $root_id ] ) )
+		{
+			foreach( $this->forum_cache[ $root_id ] as $id => $data )
+			{
+				if ($data['last_post'] > $forum_data['last_post'])
+				{
+					$forum_data['last_post']        = $data['last_post'];
+					$forum_data['fid']              = $data['id'];
+					$forum_data['last_id']          = $data['last_id'];
+					$forum_data['last_title']       = $data['last_title'];
+					$forum_data['password']         = $data['password'];
+					$forum_data['last_poster_id']   = $data['last_poster_id'];
+					$forum_data['last_poster_name'] = $data['last_poster_name'];
+					$forum_data['status']           = $data['status'];
+				}
+				
+				$forum_data['posts']  += $data['posts'];
+				$forum_data['topics'] += $data['topics'];
+				
+				if ( $ibforums->member['g_is_supmod'] or $ibforums->member['_moderator'][ $data['id'] ]['post_q'] == 1 )
+				{
+					$forum_data['queued_posts']  += $data['queued_posts'];
+					$forum_data['queued_topics'] += $data['queued_topics'];
+				}
+				
+				if ( ! $done_pass )
+				{
+					$forum_data['subforums'][ $data['id'] ] = $this->class->html->show_subforum_link($data['id'],$data['name']);
+				}
+				
+				$forum_data = $this->forums_calc_children( $data['id'], $forum_data, 1 );
+			}
+		}
+		
+		return $forum_data;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Create forum breadcrumb nav
+	// ------------------
+	// Simple and effective - just like me :(
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_breadcrumb_nav($root_id, $url='showforum=')
+	{
+		global $ibforums;
+		
+		$nav_array[] = "<a href='".$ibforums->base_url."$url{$root_id}'>{$this->forum_by_id[$root_id]['name']}</a>";
+	
+		$ids = $this->forums_get_parents( $root_id );
+		
+		if ( is_array($ids) and count($ids) )
+		{
+			foreach( $ids as $id )
+			{
+				$data = $this->forum_by_id[$id];
+			
+				$nav_array[] = "<a href='".$ibforums->base_url."$url{$data['id']}'>{$data['name']}</a>";
+			}
+		}
+		
+		return array_reverse($nav_array);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// forum jumpee
+	// ------------------
+	// Builds the forum jumpee dunnit
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_forum_jump($html=0, $override=0)
+	{
+		global $ibforums;
+		
+		foreach( $this->forum_cache['root'] as $id => $forum_data )
+		{
+			if ( $forum_data['sub_can_post'] or ( is_array($this->forum_cache[ $forum_data['id'] ]) and count($this->forum_cache[ $forum_data['id'] ]) ) )
+			{
+				if ($html == 1 or $override == 1)
+				{
+					$selected = "";
+					
+					if ($ibforums->input['f'] and $ibforums->input['f'] == $forum_data['id'])
+					{
+						$selected = ' selected="selected"';
+					}
+				}
+				
+				$jump_string .= "<option value=\"{$forum_data['id']}\"".$selected.">".$forum_data['name']."</option>\n";
+				
+				$depth_guide = $this->depth_guide;
+				
+				if ( is_array( $this->forum_cache[ $forum_data['id'] ] ) )
+				{
+					foreach( $this->forum_cache[ $forum_data['id'] ] as $id => $forum_data )
+					{
+						if ($html == 1 or $override == 1)
+						{
+							$selected = "";
+							
+							if ($ibforums->input['f'] and $ibforums->input['f'] == $forum_data['id'])
+							{
+								$selected = ' selected="selected"';
+							}
+						}
+						
+						$jump_string .= "<option value=\"{$forum_data['id']}\"".$selected.">&nbsp;&nbsp;&#0124;".$depth_guide." ".$forum_data['name']."</option>\n";
+						
+						$jump_string = $this->forums_forum_jump_internal( $forum_data['id'], $jump_string, $depth_guide . $this->depth_guide, $html, $override );
+					}
+				}
+			}
+		}
+		
+		return $jump_string;
+	}
+	
+	function forums_forum_jump_internal($root_id, $jump_string="", $depth_guide="",$html=0, $override=0)
+	{
+		global $ibforums;
+		
+		if ( is_array( $this->forum_cache[ $root_id ] ) )
+		{
+			foreach( $this->forum_cache[ $root_id ] as $id => $forum_data )
+			{
+				if ($html == 1 or $override == 1)
+				{
+					$selected = "";
+					
+					if ($ibforums->input['f'] and $ibforums->input['f'] == $forum_data['id'])
+					{
+						$selected = ' selected="selected"';
+					}
+				}
+					
+				$jump_string .= "<option value=\"{$forum_data['id']}\"".$selected.">&nbsp;&nbsp;&#0124;".$depth_guide." ".$forum_data['name']."</option>\n";
+				
+				$jump_string = $this->forums_forum_jump_internal( $forum_data['id'], $jump_string, $depth_guide . $this->depth_guide, $html, $override );
+			}
+		}
+		
+		
+		return $jump_string;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Format Forum
+	// ------------------
+	// Sorts out last poster, etc
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_format_lastinfo($forum_data)
+	{
+		global $std, $DB, $ibforums;
+		
+		$show_subforums = 1;
+		
+		if ( $std->check_perms($this->forum_by_id[ $forum_data['id'] ]['read_perms']) != TRUE )
+		{
+			$show_subforums = 0;
+		}
+		
+		$forum_data['img_new_post'] = $this->forums_new_posts($forum_data);
+			
+		if ( $forum_data['img_new_post'] == '<{C_ON}>' )
+		{
+			$forum_data['img_new_post'] = $this->class->html->forum_img_with_link($forum_data['img_new_post'], $forum_data['id']);
+		}
+		else if ( $forum_data['img_new_post'] == '<{C_ON_CAT}>' )
+		{
+			$forum_data['img_new_post'] = $this->class->html->subforum_img_with_link($forum_data['img_new_post'], $forum_data['id']);
+		}
+		
+		$forum_data['last_post'] = $std->get_date($forum_data['last_post'], 'LONG');
+					
+		$forum_data['last_topic'] = $ibforums->lang['f_none'];
+		
+		$forum_data['full_last_title'] = $forum_data['last_title'];
+		
+		if (isset($forum_data['last_title']) and $forum_data['last_id'])
+		{
+			$forum_data['last_title'] = strip_tags($forum_data['last_title']);
+			$forum_data['last_title'] = str_replace( "&#33;" , "!", $forum_data['last_title'] );
+			$forum_data['last_title'] = str_replace( "&quot;", "\"", $forum_data['last_title'] );
+			
+			$forum_data['last_title'] = $std->txt_truncate($forum_data['last_title'], 30);
+			
+			if ( $forum_data['password'] OR ( $std->check_perms($this->forum_by_id[ $forum_data['fid'] ]['read_perms']) != TRUE AND $this->forum_by_id[ $forum_data['fid'] ]['permission_showtopic'] == 0 ) )
+			{
+				$forum_data['last_topic'] = $ibforums->lang['f_protected'];
+			}
+			else
+			{
+				$forum_data['last_unread'] = $this->class->html->forumrow_lastunread_link($forum_data['id'], $forum_data['last_id']);
+				$forum_data['last_topic']  = "<a href='{$ibforums->base_url}showtopic={$forum_data['last_id']}&amp;view=getnewpost' title='{$ibforums->lang['tt_gounread']}: {$forum_data['full_last_title']}'>{$forum_data['last_title']}</a>";
+			}
+		}
+		
+						
+		if ( isset($forum_data['last_poster_name']))
+		{
+			$forum_data['last_poster'] = $forum_data['last_poster_id'] ? "<a href='{$ibforums->base_url}showuser={$forum_data['last_poster_id']}'>{$forum_data['last_poster_name']}</a>"
+																	   : $forum_data['last_poster_name'];
+		}
+		else
+		{
+			$forum_data['last_poster'] = $ibforums->lang['f_none'];
+		}
+
+		//-----------------------------------------
+		// Moderators
+		//-----------------------------------------
+		
+		$forum_data['moderator'] = $this->forums_get_moderators($forum_data['id']);
+		
+		$forum_data['posts']  = $std->do_number_format($forum_data['posts']);
+		$forum_data['topics'] = $std->do_number_format($forum_data['topics']);
+		
+		if ( $ibforums->vars['disable_subforum_show'] == 0 AND $show_subforums == 1 )
+		{
+			if ( is_array( $forum_data['subforums'] ) and count( $forum_data['subforums'] ) )
+			{
+				$forum_data['show_subforums'] = $this->class->html->show_subforum_all_links( implode( ', ', $forum_data['subforums'] ) );
+			}
+		}
+		
+		if ( ( $ibforums->member['g_is_supmod'] or $ibforums->member['_moderator'][ $forum_data['id'] ]['post_q'] == 1 )
+		   and ( $forum_data['queued_posts'] or $forum_data['queued_topics'] ) )
+		{
+			$forum_data['_queued_info'] = $this->class->html->show_queued_info( intval($forum_data['queued_posts']), intval($forum_data['queued_topics']) );
+			$forum_data['_queued_img']  = $this->class->html->show_queued_img($forum_data['fid']);
+		}
+		
+		return $forum_data;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Generate the appropriate folder icon for a forum
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function forums_new_posts($forum_data)
+	{
+		global $ibforums, $std;
+        
+        $sub = 0;
+        
+        if ( count($forum_data['subforums']) )
+        {
+        	$sub = 1;
+        }
+        
+        $rtime = $ibforums->input['last_visit'];
+        
+        $fid   = $forum_data['fid'] == "" ? $forum_data['id'] : $forum_data['fid'];
+        
+        $ftime = $ibforums->forum_read[ $fid ];
+        
+        if ( $ibforums->forum_read[0] > $ftime )
+		{
+			$ftime = $ibforums->forum_read[0];
+		}
+		
+        $rtime = $ftime > $rtime ? $ftime : $rtime;
+        
+        if ($sub == 0)
+        {
+			if ( ! $forum_data['status'] )
+			{
+				return "<{C_LOCKED}>";
+			}
+			
+			$sub_cat_img = '';
+        }
+        else
+        {
+        	$sub_cat_img = '_CAT';
+        }
+        
+        if ($forum_data['password'] and $sub == 0)
+        {
+            return $forum_data['last_post'] > $rtime ? "<{C_ON_RES}>"
+                                                     : "<{C_OFF_RES}>";
+        }
+        
+        return $forum_data['last_post']  > $rtime ? "<{C_ON".$sub_cat_img."}>"
+                                                  : "<{C_OFF".$sub_cat_img."}>";
+    }
+
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/classes/class_session.php b/upload/sources/classes/class_session.php
new file mode 100644
index 00000000..9d00d84b
--- /dev/null
+++ b/upload/sources/classes/class_session.php
@@ -0,0 +1,968 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > SESSION CLASS
+|   > Module written by Matt Mecham
+|   > Date started: 26th January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
++--------------------------------------------------------------------------
+*/
+
+class session {
+
+    var $ip_address = 0;
+    var $user_agent = "";
+    var $time_now   = 0;
+    var $session_id = 0;
+    var $session_dead_id = 0;
+    var $session_user_id = 0;
+    var $session_user_pass = "";
+    var $last_click        = 0;
+    var $location          = "";
+    var $member            = array();
+	var $botmap            = array();
+	
+    // No need for a constructor
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Authorise
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function authorise()
+    {
+		global $DB, $ibforums, $std;
+        
+        //-----------------------------------------
+        // Before we go any lets check the load settings..
+        //-----------------------------------------
+        
+        if ($ibforums->vars['load_limit'] > 0)
+        {
+        	if ( file_exists('/proc/loadavg') )
+        	{
+        		if ( $fh = @fopen( '/proc/loadavg', 'r' ) )
+        		{
+        			$data = @fread( $fh, 6 );
+        			@fclose( $fh );
+        			
+        			$load_avg = explode( " ", $data );
+        			
+        			$ibforums->server_load = trim($load_avg[0]);
+        			
+        			if ($ibforums->server_load > $ibforums->vars['load_limit'])
+        			{
+        				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'server_too_busy', 'INIT' => 1 ) );
+        			}
+        		}
+        	}
+        	else
+        	{
+				if ( $serverstats = @exec("uptime") )
+				{
+					preg_match( "/(?:averages)?\: ([0-9\.]+),[\s]+([0-9\.]+),[\s]+([0-9\.]+)/", $serverstats, $load );
+					
+					$ibforums->server_load = $load[1];
+					
+					if ($ibforums->server_load > $ibforums->vars['load_limit'])
+        			{
+        				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'server_too_busy', 'INIT' => 1 ) );
+        			}
+				}
+			}
+        }
+       
+        //-----------------------------------------
+		// Are they banned?
+		//-----------------------------------------
+		
+		if ( is_array( $ibforums->cache['banfilters'] ) and count( $ibforums->cache['banfilters'] ) )
+		{
+			foreach ($ibforums->cache['banfilters'] as $ip)
+			{
+				$ip = str_replace( '\*', '.*', preg_quote($ip, "/") );
+				
+				if ( preg_match( "/^$ip$/", $ibforums->input['IP_ADDRESS'] ) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'you_are_banned', 'INIT' => 1 ) );
+				}
+			}
+		}
+        
+        //-----------------------------------------
+        
+        $this->member = array( 'id' => 0, 'name' => "", 'mgroup' => $ibforums->vars['guest_group'] );
+        
+        //-----------------------------------------
+        // Return as guest if running a task
+        //-----------------------------------------
+        
+        if ( $ibforums->input['act'] == 'task' )
+        {
+        	$this->member = $std->set_up_guest();
+        	$this->member['mgroup'] = $ibforums->vars['guest_group'];
+        	$ibforums->input['last_activity'] = time();
+			$ibforums->input['last_visit']    = time();
+			
+			return $this->member;
+        }
+         
+        //-----------------------------------------
+        // no new headers if we're simply viewing an attachment..
+        //-----------------------------------------
+        
+        if ( $ibforums->input['act'] == 'Attach' or $ibforums->input['act'] == 'Reg' )
+        {
+        	$ibforums->no_print_header = 1;
+        }
+        
+        $_SERVER['HTTP_USER_AGENT'] = $std->clean_value($_SERVER['HTTP_USER_AGENT']);
+        
+        $this->ip_address = $ibforums->input['IP_ADDRESS'] ? $ibforums->input['IP_ADDRESS'] : $_SERVER['REMOTE_ADDR'];
+        $this->user_agent = substr($_SERVER['HTTP_USER_AGENT'],0,50);
+        $this->time_now   = time();
+        
+        //-----------------------------------------
+        // Manage bots? (tee-hee)
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['spider_sense'] == 1 and $ibforums->vars['search_engine_bots'] )
+        {
+        	foreach( explode( "\n", $ibforums->vars['search_engine_bots'] ) as $bot )
+        	{
+        		list($ua, $n) = explode( "=", $bot );
+        		
+        		if ( $ua and $n )
+        		{
+        			$this->bot_map[ $ua ] = $n;
+        			$this->bot_safe[]     = preg_quote( $ua, "/" );
+        		}
+        	}
+        	
+        	if ( preg_match( '/('.implode( '|', $this->bot_safe ) .')/i', $_SERVER['HTTP_USER_AGENT'], $match ) )
+        	{
+        		$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'groups',
+											  'where'  =>" g_id=".intval($ibforums->vars['spider_group'])
+									 )      );
+        		$DB->simple_exec();
+        	
+        		$group = $DB->fetch_row();
+        
+				foreach ($group as $k => $v)
+				{
+					$this->member[ $k ] = $v;
+				}
+				
+				$this->member['restrict_post']    = 1;
+				$this->member['g_use_search']     = 0;
+				$this->member['g_email_friend']   = 0;
+				$this->member['g_edit_profile']   = 0;
+				$this->member['g_use_pm']         = 0;
+				$this->member['g_is_supmod']      = 0;
+				$this->member['g_access_cp']      = 0;
+				$this->member['g_access_offline'] = 0;
+				$this->member['g_avoid_flood']    = 0;
+				$this->member['id']               = 0;
+				
+				$ibforums->perm_id       = $this->member['g_perm_id'];
+       			$ibforums->perm_id_array = explode( ",", $ibforums->perm_id );
+       			$ibforums->session_type  = 'cookie';
+       			$ibforums->is_bot        = 1;
+       			$this->session_id        = "";
+       			
+       			$agent = trim($match[0]);
+       			
+       			//-----------------------------------------
+       			// Using lofi?
+       			//-----------------------------------------
+       			
+       			if ( strstr( $_SERVER['PHP_SELF'], 'lofiversion' ) )
+       			{
+       				$qstring = "Lo-Fi: ".str_replace( "/", "", strrchr( $_SERVER['PHP_SELF'], "/" ) );
+       			}
+       			else
+       			{
+       				$qstring = str_replace( "'", "", $_SERVER['QUERY_STRING']);
+       			}
+       			
+       			if ( $ibforums->vars['spider_visit'] )
+       			{
+       				$DB->do_shutdown_insert( 'spider_logs', array (
+																	'bot'          => $agent,
+																	'query_string' => $qstring,
+																	'ip_address'   => $_SERVER['REMOTE_ADDR'],
+																	'entry_date'   => time(),
+														)        );
+       			}
+       			
+       			if ( $ibforums->vars['spider_active'] )
+       			{
+       				$DB->simple_construct( array( 'delete' => 'sessions',
+												  'where'  => "id='".$agent.'='.str_replace('.','',$this->ip_address )."_session'"
+										 )      );
+					$DB->simple_shutdown_exec();
+        		
+       				$this->create_bot_session($agent, $this->bot_map[ $agent ]);
+       			}
+       			
+       			return $this->member;
+        	}
+        }
+        
+        //-----------------------------------------
+        // Continue!
+        //-----------------------------------------
+        
+        $cookie = array();
+        $cookie['session_id']   = $std->my_getcookie('session_id');
+        $cookie['member_id']    = $std->my_getcookie('member_id');
+        $cookie['pass_hash']    = $std->my_getcookie('pass_hash');
+        
+       
+        if ( $cookie['session_id'] )
+        {
+        	$this->get_session($cookie['session_id']);
+        	$ibforums->session_type = 'cookie';
+        }
+        elseif ( $ibforums->input['s'] )
+        {
+        	$this->get_session($ibforums->input['s']);
+        	$ibforums->session_type = 'url';
+        }
+        else
+        {
+        	$this->session_id = 0;
+        }
+        
+		//-----------------------------------------								  
+		// Do we have a valid session ID?
+		//-----------------------------------------
+		
+		if ( $this->session_id )
+		{
+			// We've checked the IP addy and browser, so we can assume that this is
+			// a valid session.
+			
+			if ( ($this->session_user_id != 0) and ( ! empty($this->session_user_id) ) )
+			{
+				// It's a member session, so load the member.
+				
+				$this->load_member($this->session_user_id);
+				
+				// Did we get a member?
+				
+				if ( (! $this->member['id']) or ($this->member['id'] == 0) )
+				{
+					$this->unload_member();
+					$this->update_guest_session();
+				}
+				else
+				{
+					$this->update_member_session();
+				}
+			}
+			else
+			{
+				$this->update_guest_session();
+			}
+		
+		}
+		else
+		{
+			// We didn't have a session, or the session didn't validate
+			
+			// Do we have cookies stored?
+			
+			if ($cookie['member_id'] != "" and $cookie['pass_hash'] != "")
+			{
+				$this->load_member($cookie['member_id']);
+				
+				if ( (! $this->member['id']) or ($this->member['id'] == 0) )
+				{
+					$this->unload_member();
+					$this->create_guest_session();
+				}
+				else
+				{
+					if ($this->member['member_login_key'] == $cookie['pass_hash'])
+					{
+						$this->create_member_session();
+					}
+					else
+					{
+						$this->unload_member();
+						$this->create_guest_session();
+					}
+				}
+			}
+			else
+			{
+				$this->create_guest_session();
+			}
+		}
+		
+		//-----------------------------------------
+        // Are we a member of several groups?
+        //-----------------------------------------
+		
+        
+        if (! $this->member['id'])
+        {
+        	$this->member = $std->set_up_guest();
+        	$this->member['mgroup'] = $ibforums->vars['guest_group'];
+        	$ibforums->input['last_activity'] = time();
+			$ibforums->input['last_visit']    = time();
+        }
+		
+        //-----------------------------------------
+        // Do we have a cache?
+        //-----------------------------------------
+        
+        if ( ! is_array( $ibforums->cache['group_cache'] ) )
+		{
+			$ibforums->cache['group_cache'] = array();
+			
+			$DB->simple_construct( array( 'select' => "*",
+										  'from'   => 'groups'
+								 )      );
+			
+			$DB->simple_exec();
+			
+			while ( $i = $DB->fetch_row() )
+			{
+				$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+			}
+			
+			$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		}
+		
+		//-----------------------------------------
+        // Set up main 'display' group
+        //-----------------------------------------
+        
+        $this->member = array_merge( $this->member, $ibforums->cache['group_cache'][ $this->member['mgroup'] ] );
+        
+        //-----------------------------------------
+		// Sprinkle on some moderator stuff...
+		//-----------------------------------------
+		
+		if ( $this->member['mgroup'] != $ibforums->vars['guest_group'] )
+		{
+			if ( $this->member['g_is_supmod'] == 1 )
+			{
+				$this->member['is_mod'] = 1;
+			}
+			else if ( count($ibforums->cache['moderators']) )
+			{
+				foreach( $ibforums->cache['moderators'] as $i => $r )
+				{
+					if ( $r['member_id'] == $this->member['id'] or $r['group_id'] == $this->member['mgroup'] )
+					{
+						$this->member['_moderator'][ $r['forum_id'] ] = $r;
+						$this->member['is_mod'] = 1;
+					}
+				}
+			}
+		}
+            
+        //header('content-type:text/plain'); print_r($this->member); exit();
+		
+		//-----------------------------------------
+        // Are we a member of several groups?
+        //-----------------------------------------
+		
+		$this->build_group_permissions();
+        
+        //-----------------------------------------
+        // Synchronise the last visit and activity times if
+        // we have some in the member profile
+        //-----------------------------------------
+        
+        if ($this->member['id'])
+        {
+        	if ( ! $ibforums->input['last_activity'] )
+        	{
+				if ($this->member['last_activity'])
+				{
+					$ibforums->input['last_activity'] = $this->member['last_activity'];
+				}
+				else
+				{
+					$ibforums->input['last_activity'] = $this->time_now;
+				}
+        	}
+        	//-----------------------------------------
+        	
+        	if ( ! $ibforums->input['last_visit'] )
+        	{
+				if ($this->member['last_visit'])
+				{
+					$ibforums->input['last_visit'] = $this->member['last_visit'];
+				}
+				else
+				{
+					$ibforums->input['last_visit'] = $this->time_now;
+				}
+        	}
+        
+			//-----------------------------------------
+			// If there hasn't been a cookie update in 2 hours,
+			// we assume that they've gone and come back
+			//-----------------------------------------
+			
+			if ( ! $this->member['last_visit'] )
+			{
+				// No last visit set, do so now!
+				
+				$DB->simple_construct( array( 'update' => 'members',
+											  'lowpro' => 1,
+											  'set'    => "last_visit=".$this->time_now.", last_activity=".$this->time_now,
+											  'where'  => "id=".$this->member['id']
+									 )      );
+				
+				$DB->simple_shutdown_exec();
+				
+			}
+			else if ( (time() - $ibforums->input['last_activity']) > 300 )
+			{
+				// If the last click was longer than 5 mins ago and this is a member
+				// Update their profile.
+				
+				list( $be_anon, $loggedin ) = explode( '&', $this->member['login_anonymous'] );
+				
+				$DB->simple_construct( array( 'update' => 'members',
+											  'lowpro' => 1,
+											  'set'    => "login_anonymous='$be_anon&1', last_activity=".$this->time_now,
+											  'where'  => "id=".$this->member['id']
+									 )      );
+				
+				$DB->simple_shutdown_exec();
+			}
+			
+			//-----------------------------------------
+			// Check ban status
+			//-----------------------------------------
+			
+			if ( $this->member['temp_ban'] )
+			{
+				$ban_arr = $std->hdl_ban_line(  $this->member['temp_ban'] );
+				
+				if ( time() >= $ban_arr['date_end'] )
+				{
+					// Update this member's profile
+					
+					$DB->simple_construct( array( 'update' => 'members',
+											      'lowpro' => 1,
+												  'set'    => "temp_ban=''",
+												  'where'  => "id=".$this->member['id']
+										 )      );
+					
+					$DB->simple_shutdown_exec();
+				}
+				else
+				{
+					$ibforums->member = $this->member; // Set time right
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'account_susp', 'INIT' => 1, 'EXTRA' => $std->get_date($ban_arr['date_end'],'LONG', 1) ) );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+        // Set a session ID cookie
+        //-----------------------------------------
+        
+        $std->my_setcookie("session_id", $this->session_id, -1);
+        
+        return $this->member;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Build group permissions
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function build_group_permissions()
+    {
+		global $ibforums, $std;
+    	
+    	if ( $this->member['mgroup_others'] )
+		{
+			$groups_id    = explode( ',', $this->member['mgroup_others'] );
+			$exclude      = array( 'g_title', 'g_icon', 'prefix', 'suffix', 'g_promotion', 'g_photo_max_vars' );
+			$less_is_more = array( 'g_search_flood' );
+			
+			if ( count( $groups_id ) )
+			{
+				foreach( $groups_id as $pid )
+				{
+					if ( ! $ibforums->cache['group_cache'][ $pid ]['g_id'] )
+					{
+						continue;
+					}
+					
+					//-----------------------------------------
+					// Loop through and mix
+					//-----------------------------------------
+					
+					foreach( $ibforums->cache['group_cache'][ $pid ] as $k => $v )
+					{
+						if ( ! in_array( $k, $exclude ) )
+						{
+							//-----------------------------------------
+							// Add to perm id list
+							//-----------------------------------------
+							
+							if ( $k == 'g_perm_id' )
+							{
+								$this->member['g_perm_id'] .= ','.$v;
+							}
+							else if ( in_array( $k, $less_is_more ) )
+							{
+								if ( $v < $this->member[ $k ] )
+								{
+									$this->member[ $k ] = $v;
+								}
+							}
+							else
+							{
+								if ( $v > $this->member[ $k ] )
+								{
+									$this->member[ $k ] = $v;
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Tidy perms_id
+			//-----------------------------------------
+			
+			$rmp = array();
+			$tmp = explode( ',', $std->clean_perm_string($this->member['g_perm_id']) );
+			
+			if ( count( $tmp ) )
+			{
+				foreach( $tmp as $t )
+				{
+					$rmp[ $t ] = $t;
+				}
+			}
+			
+			if ( count( $rmp ) )
+			{
+				$this->member['g_perm_id'] = implode( ',', $rmp );
+			}
+		}
+		
+		$ibforums->perm_id       = ( $this->member['org_perm_id'] ) ? $this->member['org_perm_id'] : $this->member['g_perm_id'];
+        
+        $ibforums->perm_id_array = explode( ",", $ibforums->perm_id );
+        
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+	// Attempt to load a member
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function load_member($member_id=0)
+    {
+		global $DB, $std, $ibforums;
+    	
+    	$member_id = intval($member_id);
+    	
+     	if ($member_id != 0)
+        {
+            $DB->cache_add_query( 'session_load_member', array( 'mid' => $member_id ) );
+            				  
+            $DB->simple_exec();
+            
+            if ( $DB->get_num_rows() )
+            {
+            	$this->member = $DB->fetch_row();
+            }
+            
+            //-----------------------------------------
+            // Unless they have a member id, log 'em in as a guest
+            //-----------------------------------------
+            
+            if ( ($this->member['id'] == 0) or (empty($this->member['id'])) )
+            {
+				$this->unload_member();
+            }
+		}
+		
+		unset($member_id);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Remove the users cookies
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function unload_member()
+	{
+		global $DB, $std, $ibforums;
+		
+		// Boink the cookies
+		
+		$std->my_setcookie( "member_id" , "0", -1  );
+		$std->my_setcookie( "pass_hash" , "0", -1  );
+		
+		$this->member['id']       = 0;
+		$this->member['name']     = "";
+	}
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Updates a current session.
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function update_member_session()
+    {
+		global $DB, $ibforums;
+        
+        // Make sure we have a session id.
+        
+        if ( ! $this->session_id )
+        {
+        	$this->create_member_session();
+        	return;
+        }
+        
+        if (empty($this->member['id']))
+        {
+        	$this->unload_member();
+        	$this->create_guest_session();
+        	return;
+        }
+        
+        				
+        $DB->do_shutdown_update( 'sessions',
+								 array(
+										'member_name'  => $this->member['name'],
+										'member_id'    => intval($this->member['id']),
+										'member_group' => $this->member['mgroup'],
+										'in_forum'     => intval($ibforums->input['f']),
+										'in_topic'     => intval($ibforums->input['t']),
+										'login_type'   => substr($this->member['login_anonymous'],0, 1),
+										'running_time' => $this->time_now,
+										'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
+										'in_error'     => 0,
+									  ),
+								"id='{$this->session_id}'"
+							  );
+    }        
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Update guest session
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function update_guest_session()
+    {
+		global $DB, $ibforums, $INFO;
+        
+        // Make sure we have a session id.
+        
+        if ( ! $this->session_id )
+        {
+        	$this->create_guest_session();
+        	return;
+        }
+        
+        $DB->do_shutdown_update( 'sessions',
+								 array(
+										'member_name'  => "",
+										'member_id'    => 0,
+										'member_group' => $ibforums->vars['guest_group'],
+										'in_forum'     => intval($ibforums->input['f']),
+										'in_topic'     => intval($ibforums->input['t']),
+										'login_type'   => substr($this->member['login_anonymous'],0, 1),
+										'running_time' => $this->time_now,
+										'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
+										'in_error'     => 0,
+									  ),
+								"id='{$this->session_id}'"
+							  );
+    } 
+                    
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Get a session based on the current session ID
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function get_session($session_id="")
+    {
+		global $DB, $ibforums, $std;
+        
+        $result = array();
+        
+        $query = "";
+        
+        $session_id = preg_replace("/([^a-zA-Z0-9])/", "", $session_id);
+        
+        if ( $session_id )
+        {
+			if ($ibforums->vars['match_browser'] == 1)
+			{
+				$query = " AND browser='".$this->user_agent."'";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'id, member_id, running_time, location',
+										  'from'   => 'sessions',
+										  'where'  => "id='".$session_id."' and ip_address='".$this->ip_address."'".$query
+								 )      );
+				
+			$DB->simple_exec();
+			
+			if ( $DB->get_num_rows() != 1 )
+			{
+				// Either there is no session, or we have more than one session..
+				
+				$this->session_dead_id   = $session_id;
+				$this->session_id        = 0;
+        		$this->session_user_id   = 0;
+        		return;
+			}
+			else
+			{
+				$result = $DB->fetch_row();
+				
+				if ($result['id'] == "")
+				{
+					$this->session_dead_id   = $session_id;
+					$this->session_id        = 0;
+					$this->session_user_id   = 0;
+					unset($result);
+					return;
+				}
+				else
+				{
+					$this->session_id        = $result['id'];
+					$this->session_user_id   = $result['member_id'];
+					$this->last_click        = $result['running_time'];
+        			$this->location          = $result['location'];
+        			unset($result);
+					return;
+				}
+			}
+		}
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Creates a member session.
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function create_member_session()
+    {
+		global $DB, $INFO, $std, $ibforums;
+        
+        if ($this->member['id'])
+        {
+        	//-----------------------------------------
+        	// Remove the defunct sessions
+        	//-----------------------------------------
+        	
+			$ibforums->vars['session_expiration'] = $ibforums->vars['session_expiration'] ? (time() - $ibforums->vars['session_expiration']) : (time() - 3600);
+			
+			$DB->simple_construct( array( 'delete' => 'sessions', 'where' => "member_id=".$this->member['id'] ) );
+				
+			$DB->simple_exec();
+			
+			$this->session_id  = md5( uniqid(microtime()) );
+			
+			//-----------------------------------------
+        	// Insert the new session
+        	//-----------------------------------------
+        	
+        	$DB->do_shutdown_insert( 'sessions',
+									 array(
+											'id'           => $this->session_id,
+											'member_name'  => $this->member['name'],
+											'member_id'    => intval($this->member['id']),
+											'member_group' => $this->member['mgroup'],
+											'in_forum'     => intval($ibforums->input['f']),
+											'in_topic'     => intval($ibforums->input['t']),
+											'login_type'   => substr($this->member['login_anonymous'],0, 1),
+											'running_time' => $this->time_now,
+											'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
+											'ip_address'   => $this->ip_address,
+											'browser'      => $this->user_agent,
+											'in_error'     => 0,
+										  )
+								  );
+			
+			//-----------------------------------------
+			// If this is a member, update their last visit times, etc.
+			//-----------------------------------------
+			
+			if ( time() - $this->member['last_activity'] > 3600 )
+			{
+				//-----------------------------------------
+				// Reset the topics read cookie..
+				//-----------------------------------------
+				
+				$std->my_setcookie('topicsread', '');
+				
+				list( $be_anon, $loggedin ) = explode( '&', $this->member['login_anonymous'] );
+				
+				$DB->simple_construct( array( 'update' => 'members',
+											  'set'    => "login_anonymous='$be_anon&1', last_visit=last_activity, last_activity=".$this->time_now,
+											  'where'  => "id=".$this->member['id']
+									 )      );
+					
+				$DB->simple_shutdown_exec();
+				
+				//-----------------------------------------
+				// Fix up the last visit/activity times.
+				//-----------------------------------------
+				
+				$ibforums->input['last_visit']    = $this->member['last_activity'];
+				$ibforums->input['last_activity'] = $this->time_now;
+			}
+		}
+		else
+		{
+			$this->create_guest_session();
+		}
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Create guest session
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function create_guest_session()
+    {
+		global $DB, $std, $ibforums;
+        
+		//-----------------------------------------
+		// Remove the defunct sessions
+		//-----------------------------------------
+		
+		if ( ($this->session_dead_id != 0) and ( ! empty($this->session_dead_id) ) )
+		{
+			$extra = " or id='".$this->session_dead_id."'";
+		}
+		else
+		{
+			$extra = "";
+		}
+		
+		$ibforums->vars['session_expiration'] = $ibforums->vars['session_expiration'] ? (time() - $ibforums->vars['session_expiration']) : (time() - 3600);
+		
+		$DB->simple_construct( array( 'delete' => 'sessions', 'where'  => "ip_address='".$this->ip_address."'".$extra ) );
+							 
+		$DB->simple_exec();
+								 
+		$this->session_id  = md5( uniqid(microtime()) );
+		
+		//-----------------------------------------
+		// Insert the new session
+		//-----------------------------------------
+		
+		$DB->do_shutdown_insert( 'sessions',
+								 array(
+										'id'           => $this->session_id,
+										'member_name'  => '',
+										'member_id'    => 0,
+										'member_group' => $ibforums->vars['guest_group'],
+										'in_forum'     => intval($ibforums->input['f']),
+										'in_topic'     => intval($ibforums->input['t']),
+										'login_type'   => 0,
+										'running_time' => $this->time_now,
+										'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
+										'ip_address'   => $this->ip_address,
+										'browser'      => $this->user_agent,
+										'in_error'     => 0,
+									  )
+							  );
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Creates a BOT session
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function create_bot_session($bot, $name="")
+    {
+		global $DB, $std, $ibforums;
+        
+        $DB->do_shutdown_insert( 'sessions',
+								 array(
+										'id'           => $bot.'='.str_replace('.','',$this->ip_address ).'_session',
+										'member_name'  => $name ? $name : $bot,
+										'member_id'    => 0,
+										'member_group' => $ibforums->vars['spider_group'],
+										'in_forum'     => intval($ibforums->input['f']),
+										'in_topic'     => intval($ibforums->input['t']),
+										'login_type'   => $ibforums->vars['spider_anon'],
+										'running_time' => $this->time_now,
+										'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
+										'ip_address'   => $this->ip_address,
+										'browser'      => $this->user_agent,
+										'in_error'     => 0,
+									  )
+							  );
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    //
+    // Updates a BOT current session.
+    //
+    /*-------------------------------------------------------------------------*/
+    
+    function update_bot_session($bot, $name="")
+    {
+		global $DB, $ibforums;
+        
+       $DB->do_shutdown_update( 'sessions',
+								array(
+									   'member_name'  => $name ? $name : $bot,
+									   'member_id'    => 0,
+									   'member_group' => $ibforums->vars['spider_group'],
+									   'in_forum'     => intval($ibforums->input['f']),
+									   'in_topic'     => intval($ibforums->input['t']),
+									   'login_type'   => $ibforums->vars['spider_anon'],
+									   'running_time' => $this->time_now,
+									   'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
+									   'in_error'     => 0,
+									 ),
+								 "id='".$bot.'='.str_replace('.','',$this->ip_address )."_session'"
+							 );
+    }        
+    
+        
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/dynamiclite/ad_dynamiclite.php b/upload/sources/dynamiclite/ad_dynamiclite.php
deleted file mode 100644
index 44fd9251..00000000
--- a/upload/sources/dynamiclite/ad_dynamiclite.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.2 (Click Site)
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Admin Setting
-|   > Module written by Matt Mecham
-|   > Date started: 1st July 03
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new ad_settings();
-
-
-class ad_settings {
-
-	var $base_url;
-
-	function ad_settings() {
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		//---------------------------------------
-		// Kill globals - globals bad, Homer good.
-		//---------------------------------------
-		
-		$tmp_in = array_merge( $_GET, $_POST, $_COOKIE );
-		
-		foreach ( $tmp_in as $k => $v )
-		{
-			unset($$k);
-		}
-
-		switch($IN['code'])
-		{
-			case 'settings':
-				$this->settings();
-				break;
-			case 'dosettings':
-				$this->save_config( array( 'csite_on','csite_article_forum','csite_article_max','csite_article_recent_on','csite_article_recent_max','csite_article_chars','csite_discuss_max','csite_discuss_on',
-	 									   'csite_discuss_len', 'csite_article_len', 'csite_pm_show', 'csite_stats_show', 'csite_search_show', 'csite_poll_show', 'csite_poll_url', 'csite_online_show','csite_skinchange_show',
-	 									   'csite_nav_show', 'csite_title', 'csite_article_date','csite_fav_show' ) );
-				break;
-				
-			
-			default:
-				$this->settings();
-				break;
-		}
-		
-	}
-	
-	//-------------------------------------------------------------
-	// SETTINGS: Do Settings for the clickywickydickytavi
-	//-------------------------------------------------------------- 
-	 
-	
-	function settings()
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-	
-		$this->common_header('dosettings', 'IPDynamic Lite Set-Up', 'You may adjust the settings from this control panel');
-		
-		// Get links
-		
-		$def_nav = "{board_url} [Forums]\n{board_url}act=Search&amp;CODE=getactive [Today's Active Topics]\n{board_url}act=Stats [Today's Top 10 Posters]\n{board_url}act=Stats&amp;CODE=leaders [Contact Staff]";
-		
-		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key IN ('csite_nav_contents', 'csite_fav_contents')");
-		
-		$links = array( 'csite_nav_contents' => $def_nav, 'csite_fav_contents' => "" );
-		
-		while ( $row = $DB->fetch_row() )
-		{
-			$links[ $row['cs_key'] ] = $row['cs_value'];
-		}
-		
-		// Save default informidificationally?
-		
-		if ( $INFO['csite_configured'] != 1 )
-		{
-			$DB->query("REPLACE INTO ibf_cache_store SET cs_key='csite_nav_contents', cs_value=\"$def_nav\"");
-			$DB->query("REPLACE INTO ibf_cache_store SET cs_key='csite_fav_contents', cs_value=''");
-		}
-		
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>ENABLE IPDynamic Lite?</b>" ,
-										  $SKIN->form_yes_no( "csite_on", $INFO['csite_on'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Page Title?</b><br />This will appear inbetween the &lt;title&gt; elements on the page" ,
-										  $SKIN->form_input( "csite_title", str_replace( "'", "&#39;", $INFO['csite_title'] ) )
-								 )      );
-									     
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Forums to export articles from...</b><br>Separate forum ids with a comma for more than one." ,
-										  $SKIN->form_input( "csite_article_forum", $INFO['csite_article_forum'] )
-								 )      );
- 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Number of Articles to display in the main section</b>" ,
-										  $SKIN->form_simple_input( "csite_article_max", $INFO['csite_article_max'] ? $INFO['csite_article_max'] : 15)
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable Recent Articles?</b><br />Allows articles not shown in the main section to show in list form.",
-										          $SKIN->form_yes_no( "csite_article_recent_on", $INFO['csite_article_recent_on'] )
-										          ."<br />Max. no recent articles to show: ".$SKIN->form_simple_input( "csite_article_recent_max", $INFO['csite_article_recent_max'] ? $INFO['csite_article_recent_max'] : 5)
-								 				  ."<br />Max. length of topic titles: ".$SKIN->form_simple_input( "csite_article_len", $INFO['csite_article_len'] ? $INFO['csite_article_len'] : 30)
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Date format for articles?</b><br><a href='http://www.php.net/date'>Same as PHP's date function." ,
-										  $SKIN->form_input( "csite_article_date", $INFO['csite_article_date'] ? $INFO['csite_article_date'] : 'm-j-y H:i' )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Max. no of characters to show per article</b><br>Leave blank or enter 0 to disable.<br />If cut, articles may have bbcode removed." ,
-										  $SKIN->form_input( "csite_article_chars", $INFO['csite_article_chars'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable Recent Discussions?</b><br />Allows recently replied or posted topics to be listed",
-										          $SKIN->form_yes_no( "csite_discuss_on", $INFO['csite_discuss_on'] )
-										          ."<br />Max. no recent discussions to show: ".$SKIN->form_simple_input( "csite_discuss_max", $INFO['csite_discuss_max'] ? $INFO['csite_discuss_max'] : 10)
-										          ."<br />Max. length of topic titles: ".$SKIN->form_simple_input( "csite_discuss_len", $INFO['csite_discuss_len'] ? $INFO['csite_discuss_len'] : 30)
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show User / Guest Info box?</b>" ,
-										  $SKIN->form_yes_no( "csite_pm_show", $INFO['csite_pm_show'] )
-								 )      );
-								 
-		/*$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show forum stats?</b><br />No. posts, topics, members" ,
-										  $SKIN->form_yes_no( "csite_stats_show", $INFO['csite_stats_show'] )
-								 )      );*/
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show online users?</b><br />" ,
-										  $SKIN->form_yes_no( "csite_online_show", $INFO['csite_online_show'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show search box?</b>" ,
-										  $SKIN->form_yes_no( "csite_search_show", $INFO['csite_search_show'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Enable skin selection choice dropdown?</b><br />So that visitors can change skins" ,
-										  $SKIN->form_yes_no( "csite_skinchange_show", $INFO['csite_skinchange_show'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Poll?</b>" ,
-										  $SKIN->form_yes_no( "csite_poll_show", $INFO['csite_poll_show'] )
-										   ."<br />Enter URL to poll topic for inclusion: ".$SKIN->form_input( "csite_poll_url", $INFO['csite_poll_url'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Site Navigation Menu?</b>" ,
-										  $SKIN->form_yes_no( "csite_nav_show", $INFO['csite_nav_show'] )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<span style='vertical-align:top'><b>Site Navigation Menu Links</b><br>One per line in this format<br>http://www.apple.com [Apple's Website]<br><br>{board_url} will convert into your board</span>" ,
-										  $SKIN->form_textarea( "csite_nav_contents", preg_replace( "/&(middot|quot|copy|amp)/", "&amp;\\1", $links['csite_nav_contents'] ), 70, 20 )
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<b>Show Affiliates / Favoured Sites box?</b>" ,
-										  $SKIN->form_yes_no( "csite_fav_show", $INFO['csite_fav_show'] ) 
-								 )      );
-								 
-		$ADMIN->html .= $SKIN->add_td_row( array( "<span style='vertical-align:top'><b>Show Affiliates / Favoured Sites box content</b><br>Raw HTML enabled</span>" ,
-										  $SKIN->form_textarea( "csite_fav_contents", preg_replace( "/&(middot|quot|copy|amp)/", "&amp;\\1", $links['csite_fav_contents'] ), 70, 20 )
-								 )      );
-								 
-		$this->common_footer();
-	
-	
-	}
-	
-	
-	
-	function save_config( $new )
-	{
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP, $HTTP_POST_VARS;
-		
-		$master = array();
-		
-		if ( is_array($new) )
-		{
-			if ( count($new) > 0 )
-			{
-				foreach( $new as $field )
-				{
-					$master[ $field ] = $std->txt_stripslashes($HTTP_POST_VARS[ $field ]);
-				}
-				
-				$master['csite_title']        = str_replace( "'", "&#39;", $master['csite_title'] );
-				$master['csite_article_date'] = str_replace( "'", "&#39;", $master['csite_article_date'] );
-				
-				$master['csite_configured'] = 1;
-				
-				$ADMIN->rebuild_config($master);
-			}
-		}
-		
-		$nav_contents = preg_replace( "/&amp;(middot|quot|copy|\#|amp)/", "&\\1", $std->txt_stripslashes($HTTP_POST_VARS['csite_nav_contents']) );
-		$fav_contents = preg_replace( "/&amp;(middot|quot|copy|\#|amp)/", "&\\1", $std->txt_stripslashes($HTTP_POST_VARS['csite_fav_contents']) );
-		
-		$DB->query("UPDATE ibf_cache_store SET cs_value='".str_replace( "'", '&#39;', $nav_contents )."' WHERE cs_key='csite_nav_contents'");
-		$DB->query("UPDATE ibf_cache_store SET cs_value='".str_replace( "'", '&#39;', $fav_contents )."' WHERE cs_key='csite_fav_contents'");
-		
-		$ADMIN->save_log("IPDynamic Lite Configurations updated, Back Up Written");
-		
-		$ADMIN->done_screen("IPDynamic Lite Configurations updated", "IPDynamic Lite Settings", "act=csite" );
-		
-		
-		
-	}
-	//-------------------------------------------------------------
-	//
-	// Common header: Saves writing the same stuff out over and over
-	//
-	//--------------------------------------------------------------
-	
-	function common_header( $formcode = "", $section = "", $extra = "" )
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-		
-		$extra = $extra ? $extra."<br>" : $extra;
-		
-		$ADMIN->page_detail = $extra . "Please check the data you are entering before submitting the changes";
-		$ADMIN->page_title  = "Board Settings ($section)";
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_form( array( 1 => array( 'code'  , $formcode ),
-												  2 => array( 'act'   , 'csite'      ),
-									     )      );
-		
-		//+-------------------------------
-		
-		$SKIN->td_header[] = array( "{none}"  , "40%" );
-		$SKIN->td_header[] = array( "{none}"  , "60%" );
-		
-		//+-------------------------------
-		
-		$ADMIN->html .= $SKIN->start_table( "Settings" );
-		
-	}
-
-	//-------------------------------------------------------------
-	//
-	// Common footer: Saves writing the same stuff out over and over
-	//
-	//--------------------------------------------------------------
-	
-	function common_footer( $button="Submit Changes" )
-	{
-	
-		global $IN, $INFO, $DB, $SKIN, $ADMIN, $std, $MEMBER, $GROUP;
-
-		$ADMIN->html .= $SKIN->end_form($button);
-										 
-		$ADMIN->html .= $SKIN->end_table();
-		
-		$ADMIN->output();
-		
-	}
-
-
-
-
-}
-
-
-
-
-
-?>
\ No newline at end of file
diff --git a/upload/sources/findpost.php b/upload/sources/findpost.php
new file mode 100644
index 00000000..c07d2017
--- /dev/null
+++ b/upload/sources/findpost.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Find-a-post module (a.k.a: The smallest IPB class ever)
+|   > Module written by Matt Mecham
+|   > Date started: 14th April 2004
+|   > Interesting Fact: I've had iTunes playing every Radiohead tune
+|   > I own for about a week now. Thats a lot of repeats. Got some
+|   > cool rare tracks though. Every album+rare+b sides = 6.7 hours
+|   > music. Not bad. I need to get our more. No, you can't take the
+|   > laptop with you - nerd.
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class findpost
+{
+	var $post;
+	
+    function auto_run()
+    {
+		global $ibforums, $DB, $std;
+    	
+		//-----------------------------------------
+		// Find a post
+		// Don't really need to check perms 'cos topic
+		// will do that for us. Woohoop
+		//-----------------------------------------
+		
+		$pid = intval($ibforums->input['pid']);
+		
+		if ( ! $pid )
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+		}
+		
+		//-----------------------------------------
+		// Get topic...
+		//-----------------------------------------
+		
+		$post = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'posts', 'where' => 'pid='.$pid ) );
+		
+		if ( ! $post['topic_id'] )
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+		}
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(*) as posts',
+									  'from'   => 'posts',
+									  'where'  => "topic_id=".$post['topic_id']." AND pid <= ".$pid,
+							)      );
+							
+		$DB->simple_exec();
+		
+		$cposts = $DB->fetch_row();
+		
+		if ( (($cposts['posts']) % $ibforums->vars['display_max_posts']) == 0 )
+		{
+			$pages = ($cposts['posts']) / $ibforums->vars['display_max_posts'];
+		}
+		else
+		{
+			$number = ( ($cposts['posts']) / $ibforums->vars['display_max_posts'] );
+			$pages = ceil( $number);
+		}
+		
+		$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
+		
+		$std->boink_it($ibforums->base_url."showtopic=".$post['topic_id']."&st=$st&p=$pid"."&#entry".$pid);
+ 	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/forums.php b/upload/sources/forums.php
new file mode 100644
index 00000000..1aa78eab
--- /dev/null
+++ b/upload/sources/forums.php
@@ -0,0 +1,1264 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Forum topic index module
+|   > Module written by Matt Mecham
+|   > Date started: 14th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class forums {
+
+    var $output       = "";
+    var $base_url     = "";
+    var $html         = "";
+    var $moderator    = array();
+    var $forum        = array();
+    var $mods         = array();
+    var $show_dots    = "";
+    var $nav_extra    = "";
+    var $read_array   = array();
+    var $board_html   = "";
+    var $sub_output   = "";
+    var $pinned_print = 0;
+    var $new_posts    = 0;
+    var $is_mod       = 0;
+    var $auth_key     = 0;
+    var $announce_out = "";
+    var $pinned_topic_count = 0;
+    
+    /*-------------------------------------------------------------------------*/
+	// Init functions
+	/*-------------------------------------------------------------------------*/
+	
+	function init()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_forum', $ibforums->lang_id);
+
+        $this->html     = $std->load_template('skin_forum');
+        
+        $this->auth_key = $std->return_md5_check();
+        
+        if ( $read = $std->my_getcookie('topicsread') )
+        {
+        	$this->read_array = unserialize(stripslashes($read));
+        }
+        
+        //-----------------------------------------
+		// Multi TIDS?
+		// If st is not defined then kill cookie
+		// st will always be defined across pages
+		//-----------------------------------------
+		
+		if ( ! isset( $ibforums->input['st'] ) )
+		{
+			$std->my_setcookie('modtids', ',', 0);
+			$ibforums->input['selectedtids'] = "";
+		}
+		else
+		{
+			$ibforums->input['selectedtids'] = $std->my_getcookie('modtids');
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Our constructor, load words, load skin, get DB forum/cat data
+	/*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $forums, $DB, $std, $print;
+       
+        //-----------------------------------------
+        // Are we doing anything with "site jump?"
+        //-----------------------------------------
+        
+        switch( $ibforums->input['f'] )
+        {
+        	case 'sj_home':
+        		$std->boink_it($ibforums->base_url."act=idx");
+        		break;
+        	case 'sj_search':
+        		$std->boink_it($ibforums->base_url."act=Search");
+        		break;
+        	case 'sj_help':
+        		$std->boink_it($ibforums->base_url."act=Help");
+        		break;
+        	default:
+        		$ibforums->input['f'] = intval($ibforums->input['f']);
+        		break;
+        }
+        
+        $this->init();
+        
+        //-----------------------------------------
+        // Get the forum info based on the forum ID,
+        // and get the category name, ID, etc.
+        //-----------------------------------------
+        
+        $this->forum = $forums->forum_by_id[ $ibforums->input['f'] ]; 
+        
+        //-----------------------------------------
+        // Error out if we can not find the forum
+        //-----------------------------------------
+        
+        if (! $this->forum['id'] )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'is_broken_link') );
+        }
+        
+        //-----------------------------------------
+        // Is it a redirect forum?
+        //-----------------------------------------
+        
+        if ( $this->forum['redirect_on'] )
+        {
+        	$redirect = $DB->simple_exec_query( array( 'select' => 'redirect_url', 'from' => 'forums', 'where' => "id=".$this->forum['id']) );
+        	
+        	if ( $redirect['redirect_url'] )
+        	{
+        		//-----------------------------------------
+				// Update hits:
+				//-----------------------------------------
+				
+				$DB->simple_exec_query( array( 'update' => 'forums', 'set' => 'redirect_hits=redirect_hits+1', 'where' => "id=".$this->forum['id']) );
+				
+				//-----------------------------------------
+				// Recache forum
+				//-----------------------------------------
+				
+				$ibforums->cache['forum_cache'][ $this->forum['id'] ][ 'redirect_hits' ] = $this->forum['redirect_hits'] + 1;
+				
+				//-----------------------------------------
+				// Turn off shutdown queries to get this
+				// parsed before the redirect
+				//-----------------------------------------
+				
+				$DB->obj['use_shutdown'] = 0;
+				
+				$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 0 ) );
+				
+				//-----------------------------------------
+				// Boink!
+				//-----------------------------------------
+				
+				$std->boink_it( $redirect['redirect_url'] );
+				
+				// Game over man!
+        	}
+        }
+        
+        //-----------------------------------------
+        // If this is a sub forum, we need to get
+        // the cat details, and parent details
+        //-----------------------------------------
+        
+        $this->nav = $forums->forums_breadcrumb_nav( $this->forum['id'] );
+        
+		$this->forum['FORUM_JUMP'] = $std->build_forum_jump();
+		
+		//-----------------------------------------
+		// Check forum access perms
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['L'] )
+		{
+			$forums->forums_check_access( $this->forum['id'], 1 );
+		}
+		
+		//-----------------------------------------
+        // Are we viewing the forum, or viewing the forum rules?
+        //-----------------------------------------
+        
+        if ( $ibforums->input['act'] == 'SR' )
+        {
+        	$this->show_rules();
+        }
+        else
+        {
+			$this->show_subforums();
+			
+			if ( $this->forum['sub_can_post'] )
+			{
+				$this->show_forum();
+			}
+			else
+			{
+				//-----------------------------------------
+				// No forum to show, just use the HTML in $this->sub_output
+				// or there will be no HTML to use in the str_replace!
+				//-----------------------------------------
+				
+				$this->output  = $std->print_forum_rules($this->forum);
+				$this->output .= $this->sub_output;
+			}
+        }
+        
+        //-----------------------------------------
+		// Subforums
+		//-----------------------------------------
+		
+		if ($this->sub_output != "")
+		{
+			$this->output = str_replace( "<!--IBF.SUBFORUMS-->", $this->sub_output, $this->output );
+		}
+		
+		if ( $this->announce_out )
+		{
+			$this->output = str_replace( "<!--IBF.ANNOUNCEMENTS-->", $this->announce_out, $this->output );
+		}
+		
+		$print->add_output($this->output);
+        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->forum['name'],
+        					 	  'JS'       => 0,
+        					 	  'NAV'      => $this->nav,
+        				 )      );
+     }
+     
+     //-----------------------------------------
+	 // Display any sub forums
+	 //-----------------------------------------
+     
+     function show_subforums()
+     {
+		global $std, $DB, $ibforums, $forums;
+		
+		if ( $forums->read_topic_only == 1 )
+		{
+			//$this->sub_output = "";
+			//return;
+		}
+		
+		require_once( ROOT_PATH.'sources/boards.php' );
+		
+		$boards = new boards();
+		
+		$this->sub_output = $boards->show_subforums($ibforums->input['f']);
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	// Show the forum rules on a separate page
+	/*-------------------------------------------------------------------------*/
+        
+	function show_rules()
+	{
+		global $DB, $ibforums, $std, $print, $forums;
+		
+		//-----------------------------------------
+		// Do we have permission to view these rules?
+		//-----------------------------------------
+		
+		$bad_entry = $forums->forums_check_access($this->forum['id'], 1);
+        
+        if ($bad_entry == 1)
+        {
+        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_view_topic') );
+        }
+        
+        $tmp = $DB->simple_exec_query( array( 'select' => 'rules_title, rules_text', 'from' => 'forums', 'where' => "id=".$this->forum['id']) );
+             
+        if ( $tmp['rules_title'] )
+        {
+        	$rules['title'] = $tmp['rules_title'];
+        	$rules['body']  = $tmp['rules_text'];
+        	$rules['fid']   = $this->forum['id'];
+        	
+        	$this->output .= $this->html->show_rules($rules);
+        	
+			$print->add_output("$this->output");
+			$print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -&gt; ".$this->forum['name'],
+									  'JS'       => 0,
+									  'NAV'      => array( 
+														   $this->forum['name']
+														 ),
+								  ) );
+		}
+		else
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_view_topic') );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Forum view check for authentication
+	/*-------------------------------------------------------------------------*/
+   
+	function show_forum()
+	{
+		global $ibforums;
+   		
+		// are we checking for user authentication via the log in form
+		// for a private forum w/password protection?
+		
+		$ibforums->input['L'] == 1 ? $this->authenticate_user() : $this->render_forum();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Authenicate the log in for a password protected forum
+	/*-------------------------------------------------------------------------*/
+	
+	function authenticate_user()
+	{
+		global $std, $ibforums, $print;
+		
+		if ($ibforums->input['f_password'] == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_blank' ) );
+		}
+		
+		if ( $ibforums->input['f_password'] != $this->forum['password'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'wrong_pass' ) );
+		}
+		
+		$std->my_setcookie( "ipbforumpass_".$this->forum['id'], md5($ibforums->input['f_password']) );
+		
+		$print->redirect_screen( $ibforums->lang['logged_in'] , "showforum=".$this->forum['id'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Main render forum engine
+	/*-------------------------------------------------------------------------*/
+	
+	function render_forum()
+	{
+		global $ibforums, $forums, $DB, $std, $print;
+		
+		//-----------------------------------------
+	    // Are we actually a moderator for this forum?
+	    //-----------------------------------------
+	    
+	    if ( ! $ibforums->member['g_is_supmod'] AND ! $ibforums->member['g_access_cp'] )
+	    {
+	    	if ( ! is_array( $ibforums->member['_moderator'][ $this->forum['id'] ] ) )
+	    	{
+	    		$ibforums->member['is_mod'] = 0;
+	    	}
+	    }
+	    
+		//-----------------------------------------
+		// Announcements
+		//-----------------------------------------
+		
+		if ( is_array( $ibforums->cache['announcements'] ) and count( $ibforums->cache['announcements'] ) )
+		{
+			$announcements = array();
+			
+			foreach( $ibforums->cache['announcements'] as $id => $announce )
+			{
+				$order = $announce['announce_start'] ? $announce['announce_start'].','.$announce['announce_id'] : $announce['announce_id'];
+				
+				if (  $announce['announce_forum'] == '*' )
+				{
+					$announcements[ $order ] = $announce;
+				}
+				else if ( strstr( ','.$announce['announce_forum'].',', ','.$this->forum['id'].',' ) )
+				{
+					$announcements[ $order ] = $announce;
+				}
+			}
+			
+			if ( count( $announcements ) )
+			{
+				//-----------------------------------------
+				// sort by start date
+				//-----------------------------------------
+				
+				$announce_html = "";
+				
+				rsort( $announcements );
+				
+				foreach( $announcements as $id => $announce )
+				{
+					if ( $announce['announce_start'] )
+					{
+						$announce['announce_start'] = gmdate( 'jS F Y', $announce['announce_start'] );
+					}
+					else
+					{
+						$announce['announce_start'] = '--';
+					}
+					
+					$announce['announce_title'] = $std->txt_stripslashes($announce['announce_title']);
+					$announce['forum_id']       = $this->forum['id'];
+					$announce['announce_views'] = intval($announce['announce_views']);
+					$announce_html .= $this->html->announcement_row( $announce );
+				}
+				
+				$this->announce_out = $this->html->announcement_wrap($announce_html);
+			}
+		}
+		
+		//-----------------------------------------
+		// Read topics
+		//-----------------------------------------
+		
+		$First = intval($ibforums->input['st']);
+		
+		$ibforums->input['last_visit'] = $ibforums->forum_read[ $ibforums->input['f'] ] > $ibforums->input['last_visit']
+        						       ? $ibforums->forum_read[ $ibforums->input['f'] ] : $ibforums->input['last_visit'];
+		
+		//-----------------------------------------
+		// Over ride with 'master' cookie?
+		//-----------------------------------------
+		
+		if ( $ibforums->forum_read[0] > $ibforums->forum_read[ $ibforums->input['f'] ] )
+		{
+			$ibforums->forum_read[ $ibforums->input['f'] ] = $ibforums->forum_read[0];
+		}
+		
+		//-----------------------------------------
+		// Sort options
+		//-----------------------------------------
+		
+		$prune_value = $std->select_var( array( 
+												1 => $ibforums->input['prune_day'],
+												2 => $this->forum['prune']        ,
+												3 => '100'                        )
+									    );
+
+		$sort_key    = $std->select_var( array(
+												1 => $ibforums->input['sort_key'],
+												2 => $this->forum['sort_key']    ,
+												3 => 'last_post'                 )
+									   );
+
+		$sort_by     = $std->select_var( array(
+												1 => $ibforums->input['sort_by'],
+												2 => $this->forum['sort_order'] ,
+												3 => 'Z-A'                      )
+									   );
+									  
+		$topicfilter = $ibforums->input['topicfilter'] ? $ibforums->input['topicfilter'] : 'all';
+    
+		//-----------------------------------------
+		// Figure out sort order, day cut off, etc
+		//-----------------------------------------
+		
+		$Prune = $prune_value != 100 ? (time() - ($prune_value * 60 * 60 * 24)) : 0;
+
+		$sort_keys   =  array( 'last_post'         => 'sort_by_date',
+							   'last_poster_name'  => 'sort_by_last_poster',
+							   'title'             => 'sort_by_topic',
+							   'starter_name'      => 'sort_by_poster',
+							   'start_date'        => 'sort_by_start',
+							   'topic_hasattach'   => 'sort_by_attach',
+							   'posts'             => 'sort_by_replies',
+							   'views'             => 'sort_by_views',
+							   
+							 );
+
+		$prune_by_day = array( '1'    => 'show_today',
+							   '5'    => 'show_5_days',
+							   '7'    => 'show_7_days',
+							   '10'   => 'show_10_days',
+							   '15'   => 'show_15_days',
+							   '20'   => 'show_20_days',
+							   '25'   => 'show_25_days',
+							   '30'   => 'show_30_days',
+							   '60'   => 'show_60_days',
+							   '90'   => 'show_90_days',
+							   '100'  => 'show_all',
+							 );
+
+		$sort_by_keys = array( 'Z-A'  => 'descending_order',
+                         	   'A-Z'  => 'ascending_order',
+                             );
+                             
+        $filter_keys  = array( 'all'    => 'topicfilter_all',
+        					   'open'   => 'topicfilter_open',
+        					   'hot'    => 'topicfilter_hot',
+        					   'poll'   => 'topicfilter_poll',
+        					   'locked' => 'topicfilter_locked',
+        					   'moved'  => 'topicfilter_moved',
+        					 );
+        					 
+        if ( $ibforums->member['id'] )
+        {
+        	$filter_keys['istarted'] = 'topicfilter_istarted';
+        	$filter_keys['ireplied'] = 'topicfilter_ireplied';
+        }
+                         
+        //-----------------------------------------
+        // check for any form funny business by wanna-be hackers
+		//-----------------------------------------
+		
+		if ( (!isset($filter_keys[$topicfilter])) or (!isset($sort_keys[$sort_key])) or (!isset($prune_by_day[$prune_value])) or (!isset($sort_by_keys[$sort_by])) )
+		{
+			   $std->Error( array( LEVEL=> 5, MSG =>'incorrect_use') );
+	    }
+	    
+	    $r_sort_by = $sort_by == 'A-Z' ? 'ASC' : 'DESC';
+	    
+	    //-----------------------------------------
+	    // Additional queries?
+	    //-----------------------------------------
+	    
+	    $add_query_array = array();
+	    $add_query       = "";
+	    
+	    switch( $topicfilter )
+	    {
+	    	case 'all':
+	    		break;
+	    	case 'open':
+	    		$add_query_array[] = "state='open'";
+	    		break;
+	    	case 'hot':
+	    		$add_query_array[] = "state='open' AND posts + 1 >= ".intval($ibforums->vars['hot_topic']);
+	    		break;
+	    	case 'locked':
+	    		$add_query_array[] = "state='closed'";
+	    		break;
+	    	case 'moved':
+	    		$add_query_array[] = "state='link'";
+	    		break;
+	    	case 'poll':
+	    		$add_query_array[] = "poll_state='open'";
+	    		break;
+	    	default:
+	    		break;
+	    }
+	    
+	    if ( ! $ibforums->member['g_other_topics'] or $topicfilter == 'istarted' )
+		{
+            $add_query_array[] = "starter_id='".$ibforums->member['id']."'";
+		}
+		
+		if ( count($add_query_array) )
+		{
+			$add_query = ' AND '. implode( ' AND ', $add_query_array );
+		}
+		
+		//-----------------------------------------
+		// Moderator?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->member['is_mod'] )
+		{
+			$approved = 'and approved=1';
+		}
+		else
+		{
+			$approved = '';
+		}
+		
+		//-----------------------------------------
+		// Query the database to see how many topics there are in the forum
+		//-----------------------------------------
+		
+		if ( $topicfilter == 'ireplied' )
+		{
+			//-----------------------------------------
+			// Checking topics we've replied to?
+			//-----------------------------------------
+			
+			if ( $Prune )
+			{
+				$prune_filter = "and (pinned=1 or last_post > $Prune)";
+			}
+			else
+			{
+				$prune_filter = "";
+			}
+			
+			$DB->cache_add_query( 'forums_get_replied_topics', array( 'mid'          => $ibforums->member['id'],
+																	  'fid'          => $this->forum['id'],
+																	  'approved'     => $approved,
+																	  'prune_filter' => $prune_filter ) );
+			$DB->cache_exec_query();
+			
+			$total_possible = $DB->fetch_row();
+		}
+		else if ( ( $add_query or $Prune ) and ! $ibforums->input['modfilter'] )
+		{
+			$DB->simple_construct( array( 'select' => 'COUNT(*) as max',
+										  'from'   => 'topics ',
+										  'where'  => "forum_id=".$this->forum['id']." {$approved} and (pinned=1 or last_post > $Prune)" . $add_query
+								 )      );
+
+			$DB->simple_exec();
+			
+			$total_possible = $DB->fetch_row();
+		}
+		else 
+		{
+			$total_possible['max'] = $this->forum['topics'];
+			$Prune = 0;
+		}
+		
+		//-----------------------------------------
+		// Generate the forum page span links
+		//-----------------------------------------
+		
+		$this->forum['SHOW_PAGES']
+			= $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_possible['max'],
+											'PER_PAGE'    => $ibforums->vars['display_max_topics'],
+											'CUR_ST_VAL'  => $ibforums->input['st'],
+											'L_SINGLE'    => $ibforums->lang['single_page_forum'],
+											'BASE_URL'    => $ibforums->base_url."showforum=".$this->forum['id']."&amp;prune_day=$prune_value&amp;sort_by=$sort_by&amp;sort_key=$sort_key&amp;topicfilter={$topicfilter}",
+										  )
+								   );
+								   
+								   
+		//-----------------------------------------
+		// Do we have any rules to show?
+		//-----------------------------------------
+		
+		 $this->output .= $std->print_forum_rules($this->forum);
+		
+		//-----------------------------------------
+		// Generate the poll button
+		//-----------------------------------------
+		   
+		$this->forum['POLL_BUTTON'] = $this->forum['allow_poll']
+										 ? "<a href='".$ibforums->base_url."act=Post&amp;CODE=10&amp;f=".$this->forum['id']."'><{A_POLL}></a>"
+										 : '';
+	
+		//-----------------------------------------
+		// Start printing the page
+		//-----------------------------------------
+		
+		$this->output .= $this->html->PageTop($this->forum);
+		
+		//-----------------------------------------
+		// Do we have any topics to show?
+		//-----------------------------------------
+		
+		if ($total_possible['max'] < 1)
+		{
+			$this->output .= $this->html->show_no_matches();
+		}
+		
+		$total_topics_printed = 0;
+		
+		//-----------------------------------------
+		// Get main topics
+		//-----------------------------------------
+		
+		$topic_array = array();
+		$topic_ids   = array();
+		$topic_sort  = "";
+        
+        //-----------------------------------------
+        // Mod filter?
+        //-----------------------------------------
+        
+		if ( $ibforums->input['modfilter'] == 'invisible_topics' and $ibforums->member['is_mod'] )
+		{
+			$topic_sort = 'approved asc,';
+		}
+		else if ( $ibforums->input['modfilter'] == 'invisible_posts' and $ibforums->member['is_mod'] )
+		{
+			$topic_sort = 'topic_queuedposts desc,';
+		}
+		else if ( $ibforums->input['modfilter'] == 'all' and $ibforums->member['is_mod'] )
+		{
+			$topic_sort = 'approved asc, topic_queuedposts desc,';
+		}
+		
+		//-----------------------------------------
+		// Cut off?
+		//-----------------------------------------
+		
+		$parse_dots = 1;
+		
+		if ( $Prune )
+		{
+			$query = "forum_id=".$this->forum['id']." {$approved} and (last_post > $Prune OR pinned=1)";
+		}
+		else
+		{
+			$query = "forum_id=".$this->forum['id']." {$approved}";
+		}
+		
+		if ( $topicfilter == 'ireplied' )
+		{
+			//-----------------------------------------
+			// Checking topics we've replied to?
+			// No point in getting dots again...
+			//-----------------------------------------
+			
+			$parse_dots = 0;
+			
+			$DB->cache_add_query( 'forums_get_replied_topics_actual', array( 'mid'          => $ibforums->member['id'],
+																			 'fid'          => $this->forum['id'],
+																			 'query'        => $query,
+																			 'topic_sort'   => $topic_sort,
+																			 'sort_key'     => $sort_key,
+																			 'r_sort_by'    => $r_sort_by,
+																			 'limit_a'      => intval($First),
+																			 'limit_b'      => intval($ibforums->vars['display_max_topics']) ) );
+			$DB->cache_exec_query();
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'topics',
+										  'where'  => $query . $add_query,
+										  'order'  => 'pinned desc, '.$topic_sort.' '.$sort_key .' '. $r_sort_by,
+										  'limit'  => array( intval($First), $ibforums->vars['display_max_topics'] )
+								 )      );
+			$DB->simple_exec();
+		}
+		
+		while ( $t = $DB->fetch_row() )
+		{
+			$topic_array[ $t['tid'] ] = $t;
+			$topic_ids[ $t['tid'] ] = $t['tid'];
+		}
+		
+		//-----------------------------------------
+		// Are we dotty?
+		//-----------------------------------------
+		
+		if ( ($ibforums->vars['show_user_posted'] == 1) and ($ibforums->member['id']) and ( count($topic_ids) ) and ( $parse_dots ) )
+		{
+			$DB->simple_construct( array( 'select' => 'topic_id, author_id',
+										  'from'   => 'posts',
+										  'where'  => "topic_id IN(".implode( ",", $topic_ids ).") AND author_id=".$ibforums->member['id'],
+								)      );
+									  
+			$DB->simple_exec();
+			
+			while( $p = $DB->fetch_row() )
+			{
+				if ( is_array( $topic_array[ $p['topic_id'] ] ) )
+				{
+					$topic_array[ $p['topic_id'] ]['author_id'] = $p['author_id'];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Get topic trackers table? I guess we could JOIN this but...
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['db_topic_read_cutoff'] and count($topic_ids) )
+		{
+			$DB->simple_construct( array( 'select' => 'read_tid, read_date',
+										  'from'   => 'topics_read',
+										  'where'  => "read_tid IN(".implode( ",", $topic_ids ).") AND read_mid=".$ibforums->member['id'],
+								)      );
+									  
+			$DB->simple_exec();
+			
+			while( $p = $DB->fetch_row() )
+			{
+				if ( is_array( $topic_array[ $p['read_tid'] ] ) )
+				{
+					$topic_array[ $p['read_tid'] ]['db_read'] = $p['read_date'];
+				}
+			}
+		} 
+		
+		//-----------------------------------------
+		// Show meh the topics!
+		//-----------------------------------------
+		
+		foreach( $topic_array as $tid => $topic )
+		{
+			if ( $topic['pinned'] )
+			{
+				$this->pinned_topic_count++;
+			}
+			
+			$this->output .= $this->render_entry( $topic );
+			
+			$total_topics_printed++;
+		}
+		
+		//-----------------------------------------
+		// Finish off the rest of the page  $filter_keys[$topicfilter]))
+		//-----------------------------------------
+		
+		foreach ($sort_by_keys as $k => $v)
+		{
+			$sort_by_html   .= $k == $sort_by     ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $sort_by_keys[ $k ] ] . "</option>\n"
+											      : "<option value='$k'>"                     . $ibforums->lang[ $sort_by_keys[ $k ] ] . "</option>\n";
+		}
+	
+		foreach ($sort_keys as  $k => $v)
+		{
+			$sort_key_html  .= $k == $sort_key    ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $sort_keys[ $k ] ]    . "</option>\n"
+											      : "<option value='$k'>"                     . $ibforums->lang[ $sort_keys[ $k ] ]    . "</option>\n";
+		}
+		
+		foreach ($prune_by_day as  $k => $v)
+		{
+			$prune_day_html .= $k == $prune_value ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $prune_by_day[ $k ] ] . "</option>\n"
+												  : "<option value='$k'>"                     . $ibforums->lang[ $prune_by_day[ $k ] ] . "</option>\n";
+		}
+		
+		foreach ($filter_keys as  $k => $v)
+		{
+			$filter_html    .= $k == $topicfilter ? "<option value='$k' selected='selected'>" . $ibforums->lang[ $filter_keys[ $k ] ]  . "</option>\n"
+												  : "<option value='$k'>"                     . $ibforums->lang[ $filter_keys[ $k ] ]  . "</option>\n";
+		}
+	
+		$ibforums->show['sort_by']      = $sort_key_html;
+		$ibforums->show['sort_order']   = $sort_by_html;
+		$ibforums->show['sort_prune']   = $prune_day_html;
+		$ibforums->show['topic_filter'] = $filter_html;
+	
+		$this->output .= $this->html->TableEnd($this->forum, $this->auth_key);
+		
+		//-----------------------------------------
+		// Multi-moderation?
+		//-----------------------------------------
+		
+		if ( $ibforums->member['is_mod'] )
+		{
+			$mm_array = $std->get_multimod( $this->forum['id'] );
+			
+			if ( is_array( $mm_array ) and count( $mm_array ) )
+			{
+				foreach( $mm_array as $m )
+				{
+					$mm_html .= $this->html->mm_entry( $m[0], $m[1] );
+				}
+			}
+			
+			if ( $mm_html )
+			{
+				$this->output = str_replace( '<!--IBF.MMOD-->', $this->html->mm_start() . $mm_html . $this->html->mm_end(), $this->output );
+			}
+		}
+		
+		//-----------------------------------------
+		// If all the new topics have been read in this forum..
+		//-----------------------------------------
+		
+		if ($this->new_posts < 1)
+		{
+			$ibforums->forum_read[ $this->forum['id'] ] = time();
+			
+			$std->hdl_forum_read_cookie('set');
+		}
+		
+		//-----------------------------------------
+		// Process users active in this forum
+		//-----------------------------------------
+		
+		if ($ibforums->vars['no_au_forum'] != 1)
+		{
+			//-----------------------------------------
+			// Get the users
+			//-----------------------------------------
+			
+			$cut_off = ($ibforums->vars['au_cutoff'] != "") ? $ibforums->vars['au_cutoff'] * 60 : 900;
+			 
+			$time = time() - $cut_off;
+			
+			$DB->cache_add_query('forums_get_active_users',  array( 'fid' => $this->forum['id'], 'time' => $time ) );
+			$DB->simple_exec();
+			
+			//-----------------------------------------
+			// ACTIVE USERS
+			//-----------------------------------------
+			
+			$cached = array();
+			$active = array( 'guests' => 0, 'anon' => 0, 'members' => 0, 'names' => "");
+			$rows   = array( 0 => array( 'login_type'   => substr($ibforums->member['login_anonymous'],0, 1),
+										 'running_time' => time(),
+										 'member_id'    => $ibforums->member['id'],
+										 'member_name'  => $ibforums->member['name'],
+										 'member_group' => $ibforums->member['mgroup'] ) );
+			
+			//-----------------------------------------
+			// FETCH...
+			//-----------------------------------------
+			
+			while ($r = $DB->fetch_row() )
+			{
+				$rows[] = $r;
+			}
+			
+			//-----------------------------------------
+			// PRINT...
+			//-----------------------------------------
+			
+			foreach( $rows as $i => $result )
+			{
+				$result['suffix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['suffix'];
+				$result['prefix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['prefix'];
+				
+				if ($result['member_id'] == 0)
+				{
+					$active['guests']++;
+				}
+				else
+				{
+					if (empty( $cached[ $result['member_id'] ] ) )
+					{
+						$cached[ $result['member_id'] ] = 1;
+						
+						$p_start = "";
+						$p_end   = "";
+						$p_title = " title='reading...' ";
+						
+						if ( strstr( $result['location'], 'Post,' ) )
+						{
+							$p_start = "<span class='activeuserposting'>";
+							$p_end   = "</span>";
+							$p_title = " title='posting...' ";
+						}
+						
+						if ($result['login_type'] == 1)
+						{
+							if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
+							{
+								$active['names'] .= "$p_start<a href='{$ibforums->base_url}showuser={$result['member_id']}'$p_title>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*$p_end, ";
+								$active['anon']++;
+							}
+							else
+							{
+								$active['anon']++;
+							}
+						}
+						else
+						{
+							$active['members']++;
+							$active['names'] .= "$p_start<a href='{$ibforums->base_url}showuser={$result['member_id']}'$p_title>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>$p_end, ";
+						}
+					}
+				}
+			}
+			
+			$active['names'] = preg_replace( "/,\s+$/", "" , $active['names'] );
+			
+			$ibforums->lang['active_users_title']   = sprintf( $ibforums->lang['active_users_title']  , ($active['members'] + $active['guests'] + $active['anon'] ) );
+			$ibforums->lang['active_users_detail']  = sprintf( $ibforums->lang['active_users_detail'] , $active['guests'],$active['anon'] );
+			$ibforums->lang['active_users_members'] = sprintf( $ibforums->lang['active_users_members'], $active['members'] );
+			
+			$this->output = str_replace( "<!--IBF.FORUM_ACTIVE-->", $this->html->forum_active_users($active), $this->output );
+		
+		}
+		
+		if ( ! $this->pinned_topic_count and $this->announce_out )
+		{
+			$this->announce_out .= $this->html->render_pinned_end();
+		}
+		
+		return TRUE;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	// Parse data
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_data( $topic )
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get a real ID so that moved
+		// topic don't break owt
+		//-----------------------------------------
+		
+		$topic['real_tid'] = $topic['tid'];
+		$last_time         = 0;
+		
+		//-----------------------------------------
+		// Using DB?
+		//-----------------------------------------
+		
+		if ( $ibforums->member['id'] and $ibforums->vars['db_topic_read_cutoff'] AND ($topic['last_post'] > intval($ibforums->forum_read[ $topic['forum_id'] ])) )
+		{
+			$db_topic_read_cutoff = time() - $ibforums->vars['db_topic_read_cutoff'] * 86400;
+			
+			if ( $topic['last_post'] > $db_topic_read_cutoff )
+			{
+				//-----------------------------------------
+				// Have we read this topic before?
+				//-----------------------------------------
+				
+				if ( $topic['db_read'] )
+				{
+					$last_time = $topic['db_read'];
+				}
+				
+				//-----------------------------------------
+				// No? Must be a new one then
+				//-----------------------------------------
+				
+				else
+				{
+					$last_time = 1;
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Not reading from DB or past out tracking limit
+		//-----------------------------------------
+		
+		if ( ! $last_time )
+		{
+			$last_time = $this->read_array[$topic['tid']] > $ibforums->input['last_visit'] ? $this->read_array[$topic['tid']] : $ibforums->input['last_visit'];
+			
+			if ( $ibforums->forum_read[ $topic['forum_id'] ] > $last_time )
+			{
+				$last_time = $ibforums->forum_read[ $topic['forum_id'] ];
+			}
+		}
+		
+		//-----------------------------------------
+		// Attachy ment
+		//-----------------------------------------
+		
+		if ( $topic['topic_hasattach'] )
+		{
+			$topic['attach_img'] = $this->html->topic_attach_icon($topic['tid'], intval($topic['topic_hasattach']));
+		}
+		
+		//-----------------------------------------
+		// Yawn
+		//-----------------------------------------
+		
+		$topic['last_text']   = $ibforums->lang['last_post_by'];
+		
+		$topic['last_poster'] = $topic['last_poster_id'] ? $std->make_profile_link( $topic['last_poster_name'], $topic['last_poster_id']) : "-".$topic['last_poster_name']."-";
+								
+		$topic['starter']     = $topic['starter_id']     ? $std->make_profile_link( $topic['starter_name'], $topic['starter_id']) : "-".$topic['starter_name']."-";
+	 
+		if ($topic['poll_state'])
+		{
+			$topic['prefix']  = $ibforums->vars['pre_polls'].' ';
+		}
+		
+		if ( ($ibforums->member['id']) and ($topic['author_id']) )
+		{
+			$show_dots = 1;
+		}
+	
+		$topic['folder_img']     = $std->folder_icon( $topic, $show_dots, $last_time );
+		
+		$topic['topic_icon']     = $topic['icon_id']  ? '<img src="'.$ibforums->vars['img_url'] . '/folder_post_icons/icon' . $topic['icon_id'] . '.gif" border="0" alt="" />'
+													  : '&nbsp;';
+		
+		$topic['start_date'] = $std->get_date( $topic['start_date'], 'LONG' );
+	
+		//-----------------------------------------
+		// Pages 'n' posts
+		//-----------------------------------------
+		
+		$pages = 1;
+		
+		if ( $ibforums->member['is_mod'] )
+		{
+			$topic['posts'] += intval($topic['topic_queuedposts']);
+		}
+		
+		if ($topic['posts'])
+		{
+			if ( (($topic['posts'] + 1) % $ibforums->vars['display_max_posts']) == 0 )
+			{
+				$pages = ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'];
+			}
+			else
+			{
+				$number = ( ($topic['posts'] + 1) / $ibforums->vars['display_max_posts'] );
+				$pages = ceil( $number);
+			}
+		}
+		
+		if ($pages > 1)
+		{
+			for ($i = 0 ; $i < $pages ; ++$i )
+			{
+				$real_no = $i * $ibforums->vars['display_max_posts'];
+				$page_no = $i + 1;
+				
+				if ($page_no == 4 and $pages > 4)
+				{
+					$topic['PAGES'] .= $this->html->pagination_show_lastpage($topic['tid'], ($pages - 1) * $ibforums->vars['display_max_posts'], $pages);
+					break;
+				}
+				else
+				{
+					$topic['PAGES'] .= $this->html->pagination_show_page($topic['tid'], $real_no , $page_no);
+				}
+			}
+			
+			$topic['PAGES'] = $this->html->pagination_wrap_pages($topic['tid'], $topic['PAGES'], $topic['posts'] + 1, $ibforums->vars['display_max_posts']);
+		}
+		
+		//-----------------------------------------
+		// Format some numbers
+		//-----------------------------------------
+		
+		$topic['posts']  = $std->do_number_format( intval($topic['posts']) );
+		$topic['views']	 = $std->do_number_format( intval($topic['views']) );
+		
+		//-----------------------------------------
+		// Last time stuff...
+		//-----------------------------------------
+		
+		if ($last_time  && ($topic['last_post'] > $last_time))
+		{
+			$this->new_posts++;
+			$topic['go_new_post']  = "<a href='{$ibforums->base_url}showtopic={$topic['tid']}&amp;view=getnewpost'><{NEW_POST}></a>";
+		}
+		else
+		{
+			$topic['go_new_post']  = "";
+		}
+	
+		$topic['last_post']  = $std->get_date( $topic['last_post'], 'SHORT' );
+		
+		//-----------------------------------------
+		// Linky pinky!
+		//-----------------------------------------
+			
+		if ($topic['state'] == 'link')
+		{
+			$t_array = explode("&", $topic['moved_to']);
+			$topic['tid']       = $t_array[0];
+			$topic['forum_id']  = $t_array[1];
+			$topic['title']     = $topic['title'];
+			$topic['views']     = '--';
+			$topic['posts']     = '--';
+			$topic['prefix']    = $ibforums->vars['pre_moved']." ";
+			$topic['go_new_post'] = "";
+		}
+		else
+		{
+			$topic['posts'] = $this->html->who_link($topic['tid'], $topic['posts']);
+		}
+		
+		if ( ( $ibforums->member['g_is_supmod'] or $ibforums->member['_moderator'][ $data['id'] ]['post_q'] == 1 ) and ( $topic['topic_queuedposts'] ) )
+		{
+			$topic['_hasqueued'] = 1;
+		}
+		
+		//-----------------------------------------
+		// Already switched on?
+		//-----------------------------------------
+		
+		if ( $ibforums->member['is_mod'] )
+		{
+			if ( $ibforums->input['selectedtids'] )
+			{
+				if ( strstr( ','.$ibforums->input['selectedtids'].',', ','.$topic['tid'].',' ) )
+				{
+					$topic['tidon'] = 1;
+				}
+				else
+				{
+					$topic['tidon'] = 0;
+				}
+			}
+		}
+		
+		return $topic;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Crunches the data into pwetty html
+	/*-------------------------------------------------------------------------*/
+
+	function render_entry($topic)
+	{
+		global $DB, $std, $ibforums;
+		
+		$topic = $this->parse_data( $topic );
+		
+		$p_start    = "";
+		$p_end      = "";
+		$class1     = "row2";
+		$class2     = "row1";
+		$classposts = "row2";
+		
+		if ( $ibforums->member['is_mod'] )
+		{
+			if ( ! $topic['approved'] )
+			{
+				$class1     = 'row4shaded';
+				$class2     = 'row2shaded';
+				$classposts = 'row4shaded';
+			}
+			else if ( $topic['_hasqueued'] )
+			{
+				$classposts = 'row4shaded';
+			}
+		}
+		
+		if ($topic['pinned'] == 1)
+		{
+			$topic['prefix'] = $ibforums->vars['pre_pinned'];
+			
+			if ($this->pinned_print == 0)
+			{
+				// we've a pinned topic, but we've not printed the pinned
+				// starter row, so..
+				
+				$show    = $this->announce_out ? 1 : 0;
+				$p_start = $this->html->render_pinned_start( $show );
+				
+				$this->pinned_print = 1;
+			}
+			
+			return $p_start . $this->html->render_forum_row( $topic, $class1, $class2, $classposts, 1 );
+		}
+		else
+		{
+			//-----------------------------------------
+			// This is not a pinned topic, so lets check to see if we've
+			// printed the footer yet.
+			//-----------------------------------------
+			
+			if ($this->pinned_print == 1)
+			{
+				//-----------------------------------------
+				// Nope, so..
+				//-----------------------------------------
+				
+				$p_end = $this->html->render_pinned_end();
+				
+				$this->pinned_print = 0;
+			}
+			
+			return $p_end . $this->html->render_forum_row( $topic, $class1, $class2, $classposts, 1 );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Returns the last action date
+	/*-------------------------------------------------------------------------*/
+	    
+	function get_last_date($topic)
+	{
+		global $ibforums, $std;
+		
+		return $std->get_date( $topic['last_post'], 'SHORT' );
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/functions.php b/upload/sources/functions.php
index e95d87ee..4c888a47 100644
--- a/upload/sources/functions.php
+++ b/upload/sources/functions.php
@@ -1,18 +1,15 @@
 <?php
-
-
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -21,11 +18,10 @@
 |   > Date started: 14th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
-
-
 class FUNC {
 
 	var $time_formats  = array();
@@ -35,21 +31,791 @@ class FUNC {
 	var $num_format    = "";
 	var $allow_unicode = 1;
 	var $get_magic_quotes = 0;
-
-	// Set up some standards to save CPU later
+	var $today_array   = array();
 	
-	function FUNC() {
-		global $INFO;
+	//-----------------------------------------
+	// Set up some standards to save CPU later
+	//-----------------------------------------
+	
+	function FUNC_init()
+	{
+		global $ibforums;
 		
-		$this->time_options = array( 'JOINED' => $INFO['clock_joined'],
-									 'SHORT'  => $INFO['clock_short'],
-									 'LONG'   => $INFO['clock_long']
+		$this->time_options = array( 'JOINED' => $ibforums->vars['clock_joined'],
+									 'SHORT'  => $ibforums->vars['clock_short'],
+									 'LONG'   => $ibforums->vars['clock_long']
 								   );
 								   
-		$this->num_format = ($INFO['number_format'] == 'space') ? ' ' : $INFO['number_format'];
+		$this->num_format = ($ibforums->vars['number_format'] == 'space') ? ' ' : $ibforums->vars['number_format'];
 		
 		$this->get_magic_quotes = get_magic_quotes_gpc();
 		
+		//-----------------------------------------
+		// Sort out the accessing IP
+		// (Thanks to Cosmos and schickb)
+		//-----------------------------------------
+		
+		$addrs = array();
+		
+		if ( $ibforums->vars['xforward_matching'] )
+		{
+			foreach( array_reverse( explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) as $x_f )
+			{
+				$x_f = trim($x_f);
+				
+				if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $x_f ) )
+				{
+					$addrs[] = $x_f;
+				}
+			}
+		}
+		
+		$addrs[] = $_SERVER['REMOTE_ADDR'];
+		$addrs[] = $_SERVER['HTTP_PROXY_USER'];
+		$addrs[] = $_SERVER['HTTP_CLIENT_IP'];
+	
+		//-----------------------------------------
+		// Make sure we take a valid IP address
+		//-----------------------------------------
+		
+		$ibforums->input['IP_ADDRESS'] = preg_replace( "/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/", "\\1.\\2.\\3.\\4", $this->select_var( $addrs ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+    // My gmmktime() - PHP func seems buggy
+    //
+    /*-------------------------------------------------------------------------*/ 
+    
+	function date_gmmktime( $hour=0, $min=0, $sec=0, $month=0, $day=0, $year=0 )
+	{
+		$offset = date( 'Z' );
+		
+		return $offset + mktime( $hour, $min, $sec, $month, $day, $year );
+	}
+		
+	/*-------------------------------------------------------------------------*/
+	//
+	// Check mod queue status
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function can_queue_posts($fid=0)
+	{
+		global $ibforums, $DB;
+		
+		$return = 0;
+		
+		if ( $ibforums->member['g_is_supmod'] )
+		{
+			$return = 1;
+		}
+		else if ( $fid and $ibforums->member['is_mod'] and $ibforums->member['_moderator'][ $fid ]['post_q'] )
+		{
+			$return = 1;
+		}
+		
+		return $return;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Check multi mod status
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function get_multimod($fid)
+	{
+		global $ibforums, $DB, $std;
+	
+		$mm_array = array();
+		
+		$pass_go = FALSE;
+		
+		if ( $ibforums->member['id'] )
+		{
+			if ( $ibforums->member['g_is_supmod'] )
+			{
+				$pass_go = TRUE;
+			}
+			else if ( $ibforums->member['_moderator'][ $fid ]['can_mm'] == 1 )
+			{
+				$pass_go = TRUE;
+			}
+		}
+		
+		if ( $pass_go != TRUE )
+		{
+			return $mm_array;
+		}
+		
+		if ( ! is_array( $ibforums->cache['multimod'] ) )
+        {
+        	$ibforums->cache['multimod'] = array();
+        	
+			$DB->simple_construct( array(
+									 'select' => '*',
+									 'from'   => 'topic_mmod',
+									 'order'  => 'mm_title'
+							 )      );
+								
+			$DB->simple_exec();
+						
+			while ($i = $DB->fetch_row())
+			{
+				$ibforums->cache['multimod'][ $i['mm_id'] ] = $i;
+			}
+			
+			$std->update_cache( array( 'name' => 'multimod', 'array' => 1, 'deletefirst' => 1 ) );
+        }
+		
+		//-----------------------------------------
+		// Get the topic mod thingies
+		//-----------------------------------------
+		
+		foreach( $ibforums->cache['multimod'] as $i => $r )
+		{
+			if ( $r['mm_forums'] == '*' OR strstr( ",".$r['mm_forums'].",", ",".$fid."," ) )
+			{
+				$mm_array[] = array( $r['mm_id'], $r['mm_title'] );
+			}
+		}
+		
+		return $mm_array;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// UPDATE FORUM CACHE
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function update_forum_cache()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ignore_me = array( 'redirect_url', 'redirect_loc', 'rules_text', 'permission_custom_error', 'notify_modq_emails' );
+		
+		if ( $ibforums->vars['forum_cache_minimum'] )
+		{
+			$ignore_me[] = 'description';
+			$ignore_me[] = 'rules_title';
+		}
+		
+		$ibforums->cache['forum_cache'] = array();
+			
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'forums',
+									  'order'  => 'parent_id, position'
+							 )      );
+		$DB->simple_exec();
+		
+		while( $f = $DB->fetch_row() )
+		{
+			$fr = array();
+			
+			$perms = unserialize(stripslashes($f['permission_array']));
+			
+			//-----------------------------------------
+			// Stuff we don't need...
+			//-----------------------------------------
+			
+			foreach( $f as $k => $v )
+			{
+				if ( in_array( $k, $ignore_me ) )
+				{
+					continue;
+				}
+				else
+				{
+					if ( $v != "" )
+					{
+						$fr[ $k ] = $v;
+					}
+				}
+			}
+			
+			$fr['read_perms']   = $perms['read_perms'];
+			$fr['reply_perms']  = $perms['reply_perms'];
+			$fr['start_perms']  = $perms['start_perms'];
+			$fr['upload_perms'] = $perms['upload_perms'];
+			$fr['show_perms']   = $perms['show_perms'];
+			
+			unset($fr['permission_array']);
+			
+			$ibforums->cache['forum_cache'][ $fr['id'] ] = $fr;
+		}
+		
+		$this->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// UPDATE CACHE
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function update_cache( $v=array() )
+	{
+		global $ibforums, $std, $DB;
+		
+		//-----------------------------------------
+		// Don't cache forums?
+		//-----------------------------------------
+		
+		if ( $v['name'] == 'forum_cache' AND $ibforums->vars['no_cache_forums'] )
+		{
+			return;
+		}
+		
+		//-----------------------------------------
+		// Next...
+		//-----------------------------------------
+		
+		if ( $v['name'] )
+		{
+			if ( ! $v['value'] )
+			{
+				$value = $DB->add_slashes(serialize($ibforums->cache[ $v['name'] ]));
+			}
+			
+			$DB->manual_addslashes = 1;
+			
+			if ( $v['deletefirst'] == 1 )
+			{
+				$DB->simple_construct( array( 'delete' => 'cache_store', 'where' => "cs_key='{$v['name']}'" ) );
+				$DB->simple_shutdown_exec();
+				
+				if ( $v['donow'] )
+				{
+					$DB->do_insert( 'cache_store', array( 'cs_array' => intval($v['array']), 'cs_key' => $v['name'], 'cs_value' => $value ) );
+				}
+				else
+				{
+					$DB->do_shutdown_insert( 'cache_store', array( 'cs_array' => intval($v['array']), 'cs_key' => $v['name'], 'cs_value' => $value ) );
+				}
+			}
+			else
+			{
+				if ( $v['donow'] )
+				{
+					$DB->do_update( 'cache_store', array( 'cs_array' => intval($v['array']), 'cs_value' => $value ), "cs_key='{$v['name']}'" );
+				}
+				else
+				{
+					$DB->do_shutdown_update( 'cache_store', array( 'cs_array' => intval($v['array']), 'cs_value' => $value ), "cs_key='{$v['name']}'" );
+				}
+			}
+			
+			$DB->manual_addslashes = 0;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// MY DECONSTRUCTOR
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function my_deconstructor()
+	{
+		global $ibforums, $std, $DB;
+		
+		//-----------------------------------------
+		// Any shutdown queries
+		//-----------------------------------------
+		
+		$DB->return_die = 0;
+		
+		if ( count( $DB->obj['shutdown_queries'] ) )
+		{
+			foreach( $DB->obj['shutdown_queries'] as $q )
+			{
+				$DB->query( $q );
+			}
+		}
+		
+		$DB->return_die = 1;
+		
+		$DB->obj['shutdown_queries'] = array();
+		
+		//-----------------------------------------
+		// Process mail queue
+		//-----------------------------------------
+			
+		$std->process_mail_queue();
+		
+		$DB->close_db();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Process Mail Queue
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function process_mail_queue()
+	{
+		global $ibforums, $DB, $ROOT_PATH;
+		
+		//-----------------------------------------
+		// Bug in PHP?
+		// shutdown func can't use relative
+		// path..
+		//-----------------------------------------
+		
+		$ROOT_PATH = $ROOT_PATH ? $ROOT_PATH.'/' : ROOT_PATH;
+		
+		//-----------------------------------------
+		// SET UP
+		//-----------------------------------------
+		
+		$ibforums->vars['mail_queue_per_blob'] = $ibforums->vars['mail_queue_per_blob'] ? $ibforums->vars['mail_queue_per_blob'] : 5;
+		
+		$ibforums->cache['systemvars']['mail_queue'] = intval($ibforums->cache['systemvars']['mail_queue']);
+		
+		$sent_ids = array();
+		
+		if ( $ibforums->cache['systemvars']['mail_queue'] > 0 )
+		{
+			//-----------------------------------------
+			// Require the emailer...
+			//-----------------------------------------
+			
+			require_once( $ROOT_PATH.'sources/classes/class_email.php' );
+			$emailer = new emailer($ROOT_PATH);
+			
+			//-----------------------------------------
+			// Get the mail stuck in the queue
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'mail_queue', 'order' => 'mail_id', 'limit' => array( 0, $ibforums->vars['mail_queue_per_blob'] ) ) );
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$data[]     = $r;
+				$sent_ids[] = $r['mail_id'];
+			}
+			
+			if ( count($sent_ids) )
+			{
+				//-----------------------------------------
+				// Delete sent mails and update count
+				//-----------------------------------------
+				
+				$ibforums->cache['systemvars']['mail_queue'] = $ibforums->cache['systemvars']['mail_queue'] - count($sent_ids);
+				
+				$DB->simple_exec_query( array( 'delete' => 'mail_queue', 'where' => 'mail_id IN ('.implode(",", $sent_ids).')' ) );
+			
+				foreach( $data as $mail )
+				{
+					if ( $mail['mail_to'] and $mail['mail_subject'] and $mail['mail_content'] )
+					{
+						$emailer->to      = $mail['mail_to'];
+						$emailer->from    = $mail['mail_from'] ? $mail['mail_from'] : $ibforums->vars['email_out'];
+						$emailer->subject = $mail['mail_subject'];
+						$emailer->message = $mail['mail_content'];
+						
+						$emailer->send_mail();
+					}
+				}
+			}
+			else
+			{
+				//-----------------------------------------
+				// No mail after all?
+				//-----------------------------------------
+				
+				$ibforums->cache['systemvars']['mail_queue'] = 0;
+			}
+			
+			//-----------------------------------------
+			// Update cache with remaning email count
+			//-----------------------------------------
+			
+			$DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($ibforums->cache['systemvars'])) ), "cs_key='systemvars'" );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Load a template file from DB or from PHP file
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function load_template( $name, $id='' )
+	{
+		global $ibforums, $DB;
+		
+		$tags = 1;
+		
+		if ( $ibforums->vars['safe_mode_skins'] == 0 AND $ibforums->vars['safe_mode'] == 0 )
+		{
+			//-----------------------------------------
+			// Simply require and return
+			//-----------------------------------------
+			
+			if ( $name != 'skin_global')
+			{
+				if ( ! in_array( 'skin_global', $ibforums->loaded_templates ) )
+				{
+					require_once( CACHE_PATH."skin_cache/cacheid_".$ibforums->skin['_skincacheid']."/skin_global.php" );
+					
+					$ibforums->skin_global        = new skin_global();
+					$ibforums->loaded_templates[] = 'skin_global';
+				}
+				
+				$ibforums->loaded_templates[] = $name;
+				
+				require_once( CACHE_PATH."skin_cache/cacheid_".$ibforums->skin['_skincacheid']."/".$name.".php" );
+				
+				return new $name();
+				
+			}
+			else
+			{
+				if ( $name == 'skin_global' )
+				{
+					$ibforums->loaded_templates[] = 'skin_global';
+					
+					require_once( CACHE_PATH."skin_cache/cacheid_".$ibforums->skin['_skincacheid']."/skin_global.php" );
+					
+					$ibforums->skin_global = new skin_global();
+					return;
+				}
+				else
+				{
+					$ibforums->loaded_templates[] = $name;
+					
+					require_once( CACHE_PATH."skin_cache/cacheid_".$ibforums->skin['_skincacheid']."/".$name.".php" );
+					return new $name();
+				}
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// We're using safe mode skins, yippee
+			// Load the data from the DB
+			//-----------------------------------------
+			
+			$skin_global = "";
+			$other_skin  = "";
+			$ibforums->skin['_type'] = 'Database Skins';
+				
+			if ( $ibforums->skin_global == "" and $name != 'skin_global')
+			{
+				//-----------------------------------------
+				// Skin global not loaded...
+				//-----------------------------------------
+				
+				$ibforums->loaded_templates[] = $name;
+				$ibforums->loaded_templates[] = 'skin_global';
+				
+				$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'skin_templates_cache',
+											  'where'  => "template_set_id=".$ibforums->skin['_skincacheid']." AND template_group_name IN ('skin_global', '$name')"
+									 )      );
+									 
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					if ( $r['template_group_name'] == 'skin_global' )
+					{
+						$skin_global = $r['template_group_content'];
+					}
+					else
+					{
+						$other_skin  = $r['template_group_content'];
+					}
+				}
+				
+				eval($skin_global);
+				
+				$ibforums->skin_global = new skin_global();
+			}
+			else
+			{
+				//-----------------------------------------
+				// Skin global is loaded..
+				//-----------------------------------------
+				
+				if ( $name == 'skin_global' and in_array( 'skin_global', $ibforums->loaded_templates ) )
+				{
+					return;
+				}
+				
+				//-----------------------------------------
+				// Load the skin, man
+				//-----------------------------------------
+				
+				$ibforums->loaded_templates[] = $name;
+				
+				$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'skin_templates_cache',
+											  'where'  => "template_set_id=".$ibforums->skin['_skincacheid']." AND template_group_name='$name'"
+									 )      );
+									 
+				$DB->simple_exec();
+				
+				$r = $DB->fetch_row();
+				
+				$other_skin  = $r['template_group_content'];
+			}
+			
+			eval($other_skin);
+			
+			if ( $name == 'skin_global' )
+			{
+				$ibforums->skin_global = new skin_global();
+			}
+			else
+			{
+				return new $name();
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+    // SKIN, sort out the skin stuff                 
+    /*-------------------------------------------------------------------------*/
+    
+    function load_skin()
+    {
+		global $ibforums, $DB;
+    	
+    	$id         = -1;
+    	$skin_set   = 0;
+    	$from_forum = 0;
+    	$ibforums->input['skinid'] = intval($ibforums->input['skinid']);
+    	$ibforums->member['skin']  = intval($ibforums->member['skin']);
+    	
+    	//-----------------------------------------
+    	// Do we have a cache?
+    	//-----------------------------------------
+    	
+    	if ( ! is_array( $ibforums->cache['skin_id_cache'] ) )
+    	{
+    		define ( 'IN_ACP', 1 );
+    		require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+    		$admin = new admin_cache_functions();
+    		
+    		$ibforums->cache['skin_id_cache'] = $admin->_rebuild_skin_id_cache();
+       	}
+    	
+    	//-----------------------------------------
+    	// Search bot?
+    	//-----------------------------------------
+    	
+    	if ( ( $ibforums->is_bot == 1 ) and ($ibforums->vars['spider_suit'] != "") )
+    	{
+    		$skin_set = 1;
+    		$id       = $ibforums->vars['spider_suit'];
+    	}
+    	else
+    	{
+			//-----------------------------------------
+			// Do we have a skin for a particular forum?
+			//-----------------------------------------
+			
+			if ($ibforums->input['f'] and $ibforums->input['act'] != 'UserCP')
+			{
+				if ( $ibforums->cache['forum_cache'][ $ibforums->input['f'] ]['skin_id'] > 0 )
+				{
+					$id         = $ibforums->cache['forum_cache'][ $ibforums->input['f'] ]['skin_id'];
+					$skin_set   = 1;
+					$from_forum = 1;
+				}
+			}
+			
+			//-----------------------------------------
+			// Are we allowing user chooseable skins?
+			//-----------------------------------------
+			
+			if ($skin_set != 1 and $ibforums->vars['allow_skins'] == 1)
+			{
+				if ( $ibforums->input['skinid'] )
+				{
+					$id        = $ibforums->input['skinid'];
+					$skin_set  = 1;
+				}
+				else if ( $ibforums->member['skin'] )
+				{
+					$id       = $ibforums->member['skin'];
+					$skin_set = 1;
+				}
+			}
+    	}
+    	
+    	//-----------------------------------------
+		// Nothing set / hidden and not admin? Choose the default
+		//-----------------------------------------
+		
+		if ( $ibforums->cache['skin_id_cache'][ $id ]['set_hidden'] )
+		{
+			if ( $from_forum )
+			{
+				$skin_set = 1;
+			}
+			else if ( $ibforums->member['g_access_cp'] )
+			{
+				$skin_set = 1;
+			}
+			else
+			{
+				$skin_set = 0;
+			}
+		}
+			
+		if ( ! $id OR ! $skin_set OR ! is_array($ibforums->cache['skin_id_cache'][ $id ]) )
+		{
+			foreach( $ibforums->cache['skin_id_cache'] as $sid => $data )
+			{
+				if ( $data['set_default'] )
+				{
+					$id       = $data['set_skin_set_id'];
+					$skin_set = 1;
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Get the skin
+		//-----------------------------------------
+    	
+		$db_skin = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'skin_sets', 'where' => 'set_skin_set_id='.$id ) );
+		
+		$ibforums->skin['_css']         = $db_skin['set_cache_css'];
+		$ibforums->skin['_wrapper']     = $db_skin['set_cache_wrapper'];
+		$ibforums->skin['_macro']       = $db_skin['set_cache_macro'];
+		$ibforums->skin['_skincacheid'] = IN_DEV ? 1 : $db_skin['set_skin_set_id'];
+		$ibforums->skin['_csscacheid']  = IN_DEV ? 1 : $db_skin['set_skin_set_id'];
+		$ibforums->skin['_imagedir']    = $db_skin['set_image_dir'];
+		$ibforums->skin['_emodir']      = $db_skin['set_emoticon_folder'];
+		$ibforums->skin['_setid']       = $db_skin['set_skin_set_id'];
+    	$ibforums->skin['_setname']     = $db_skin['set_name'];
+    	$ibforums->skin['_usecsscache'] = $db_skin['set_css_method'] ? 1 : 0;
+    	
+    	//-----------------------------------------
+    	// Setting the skin?
+    	//-----------------------------------------
+    	
+    	if ( ($ibforums->input['setskin']) and ($ibforums->member['id']) )
+    	{
+    		$DB->simple_construct( array( 'update' => 'members',
+										  'set'    => "skin=".intval($id),
+										  'where'  => "id=".$ibforums->member['id']
+								 )      );
+			$DB->simple_exec();
+    		
+    		$ibforums->member['skin'] = $id;
+    	}
+    	
+    	return $row;
+    }
+	
+	/*-------------------------------------------------------------------------*/
+    // Require, parse and return an array containing the language stuff                 
+    /*-------------------------------------------------------------------------*/ 
+    
+    function load_words($current_lang_array, $area, $lang_type) {
+    
+        require ROOT_PATH."lang/".$lang_type."/".$area.".php";
+        
+        foreach ($lang as $k => $v)
+        {
+        	$current_lang_array[$k] = stripslashes($v);
+        }
+        
+        unset($lang);
+        
+        return $current_lang_array;
+    }
+	
+	/*-------------------------------------------------------------------------*/
+	// Truncate text string
+	/*-------------------------------------------------------------------------*/
+	
+	function txt_truncate($text, $limit=30)
+	{
+		global $ibforums;
+		
+		if (strlen($text) > $limit)
+		{
+			$text = substr($text,0, $limit - 3) . "...";
+			$text = preg_replace( "/&(#(\d+;?)?)?\.\.\.$/", '...', $text );
+		}
+		else
+		{
+			$text = preg_replace( "/&(#(\d+?)?)?$/", '', $text );
+		}
+		
+		return $text;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get new PM notification window
+	/*-------------------------------------------------------------------------*/
+	
+	function get_new_pm_notification()
+	{
+		global $DB, $ibforums, $skin_universal;
+		
+		//-----------------------------------------
+		// posty parsery
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/lib/post_parser.php' );
+		
+		$parser = new post_parser();
+		
+		//-----------------------------------------
+		// Get last PM details
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'msg_get_new_pm_notification', array( 'mid' => $ibforums->member['id'] ) );
+		$DB->simple_exec();
+		
+		$msg = $DB->fetch_row();
+		
+		if ( ! $msg['msg_id'] and ! $msg['mt_id'] and ! $msg['id'] )
+		{
+			return '<!-- CANT FIND MESSAGE -->';
+		}
+		
+		$msg['msg_post'] = $parser->strip_all_tags( $msg['msg_post'] );
+		
+		if ( strlen( $msg['msg_post'] ) > 120 )
+		{
+			$msg['msg_post'] = substr( $msg['msg_post'], 0, 117 ) . '...';
+			$msg['msg_post'] = preg_replace( "/&(#(\d+;?)?)?\.\.\.$/", '...', $msg['msg_post'] );
+		}
+		
+		if ( ! is_array( $ibforums->cache['badwords'] ) )
+		{
+			$ibforums->cache['badwords'] = array();
+			
+			$DB->simple_construct( array( 'select' => 'type,swop,m_exact', 'from' => 'badwords' ) );
+			$bbcode = $DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row($bbcode) )
+			{
+				$ibforums->cache['badwords'][] = $r;
+			}
+		}
+		
+		$msg['msg_post'] = $parser->bad_words( $msg['msg_post'] );
+		
+		if ( $msg['mt_hasattach'] )
+		{
+			$msg['attach_img'] = '<{ATTACH_ICON}>&nbsp;';
+		}
+		
+		$msg['avatar'] = $this->get_avatar($msg['avatar_location'], 1, $msg['avatar_size'], $msg['avatar_type']);
+		
+		return $ibforums->skin_global->msg_get_new_pm_notification( $msg );
 	}
 	
 	/*-------------------------------------------------------------------------*/
@@ -66,14 +832,23 @@ class FUNC {
 		
 		// Get subscription details...
 		
-		$DB->query("SELECT * FROM ibf_subscription_trans WHERE subtrans_state='paid' AND subtrans_member_id={$ibforums->member['id']}");
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'subscription_trans',
+									  'where'  => "subtrans_state='paid' AND subtrans_member_id={$ibforums->member['id']}"
+							 )      );
+		$DB->simple_exec();
 		
 		if ( $row = $DB->fetch_row() )
 		{
 			if ( $row['subtrans_old_group'] > 0 )
 			{
-				$DB->query("SELECT g_id FROM ibf_groups WHERE g_id={$row['subtrans_old_group']}");
 				
+				$DB->simple_construct( array( 'select' => 'g_id',
+											  'from'   => 'groups',
+											  'where'  => "g_id={$row['subtrans_old_group']}"
+									 )      );
+				$DB->simple_exec();
+		
 				if ( $group = $DB->fetch_row() )
 				{
 					$query .= ", mgroup={$row['subtrans_old_group']}";
@@ -86,10 +861,19 @@ class FUNC {
 				}
 			}
 			
-			$DB->query("UPDATE ibf_subscription_trans SET subtrans_state='expired' WHERE subtrans_id={$row['subtrans_id']}");
+			$DB->simple_construct( array( 'update' => 'subscription_trans',
+										  'set'    => "subtrans_state='expired'",
+										  'where'  => "subtrans_id={$row['subtrans_id']}"
+								 )      );
+			$DB->simple_exec();
+			
 		}
 		
-		$DB->query("UPDATE ibf_members SET $query WHERE id={$ibforums->member['id']}");
+		$DB->simple_construct( array( 'update' => 'members',
+									  'set'    => $query,
+									  'where'  => "id={$ibforums->member['id']}"
+							 )      );
+		$DB->simple_exec();
     }
 	
 	/*-------------------------------------------------------------------------*/
@@ -130,8 +914,6 @@ class FUNC {
 	
 	/*-------------------------------------------------------------------------*/
 	// Safe Slashes - ensures slashes are saved correctly
-	// ------------------
-	// 
 	/*-------------------------------------------------------------------------*/
 	
 	function txt_safeslashes($t="")
@@ -152,6 +934,7 @@ class FUNC {
 		$t = str_replace( "<", "&lt;"  , $t );
 		$t = str_replace( ">", "&gt;"  , $t );
 		$t = str_replace( '"', "&quot;", $t );
+		$t = str_replace( "'", '&#039;', $t );
 		
 		return $t; // A nice cup of?
 	}
@@ -168,10 +951,26 @@ class FUNC {
 		$t = str_replace( "&lt;"  , "<", $t );
 		$t = str_replace( "&gt;"  , ">", $t );
 		$t = str_replace( "&quot;", '"', $t );
+		$t = str_replace( "&#039;", "'", $t );
 		
 		return $t;
 	}
 	
+	/*-------------------------------------------------------------------------*/
+	// txt_wintounix
+	// ------------------
+	// Converts \r\n to \n
+	/*-------------------------------------------------------------------------*/
+	
+	function txt_windowstounix($t="")
+	{
+		// windows
+		$t = str_replace( "\r\n" , "\n", $t );
+		// Mac OS 9
+		$t = str_replace( "\r"   , "\n", $t );
+		return $t;
+	}
+	
 	/*-------------------------------------------------------------------------*/
 	// return_md5_check
 	// ------------------
@@ -184,7 +983,7 @@ class FUNC {
 		
 		if ( $ibforums->member['id'] )
 		{
-			return md5($ibforums->member['email'].'&'.$ibforums->member['password'].'&'.$ibforums->member['joined']);
+			return md5($ibforums->member['email'].'&'.$ibforums->member['member_login_key'].'&'.$ibforums->member['joined']);
 		}
 		else
 		{
@@ -259,20 +1058,44 @@ class FUNC {
 	
 	function print_forum_rules($forum)
 	{
-		global $ibforums, $skin_universal;
+		global $ibforums, $DB;
 		
-		$ruleshtml = "";
+		$ruleshtml    = "";
+		$rules['fid'] = $forum['id'];
 		
 		if ($forum['show_rules'])
 		{
-			if ( $forum['rules_title'] )
-			{
-				 $rules['title'] = $forum['rules_title'];
-				 $rules['body']  = $forum['rules_text'];
-				 $rules['fid']   = $forum['id'];
-				 
-				 $ruleshtml = $forum['show_rules'] == 2 ? $skin_universal->forum_show_rules_full($rules) : $skin_universal->forum_show_rules_link($rules);
-			}
+			 if ( $forum['show_rules'] == 2 )
+			 {
+				if ( $ibforums->vars['forum_cache_minimum'] )
+				{
+					$tmp = $DB->simple_exec_query( array( 'select' => 'rules_title, rules_text', 'from' => 'forums', 'where' => "id=".$forum['id']) );
+					$rules['title'] = $tmp['rules_title'];
+			 		$rules['body']  = $tmp['rules_text'];
+				}
+				else
+				{
+					$tmp = $DB->simple_exec_query( array( 'select' => 'rules_text', 'from' => 'forums', 'where' => "id=".$forum['id']) );
+			 		$rules['body']  = $tmp['rules_text'];
+			 		$rules['title'] = $forum['rules_title'];
+				}
+				
+				$ruleshtml = $ibforums->skin_global->forum_show_rules_full($rules);
+			 }
+			 else
+			 {
+			 	if ( $ibforums->vars['forum_cache_minimum'] )
+				{
+					$tmp = $DB->simple_exec_query( array( 'select' => 'rules_title', 'from' => 'forums', 'where' => "id=".$forum['id']) );
+					$rules['title'] = $tmp['rules_title'];
+				}
+				else
+				{
+			 		$rules['title'] = $forum['rules_title'];
+				}
+				
+				$ruleshtml = $ibforums->skin_global->forum_show_rules_link($rules);
+			 }
 		}
 		
 		return $ruleshtml;
@@ -307,7 +1130,6 @@ class FUNC {
 			
 			return $arr;
 		}
-		
 	}
 	
 	/*-------------------------------------------------------------------------*/
@@ -321,6 +1143,11 @@ class FUNC {
 	{
 		global $ibforums;
 		
+		if ( ! is_array( $ibforums->perm_id_array ) )
+		{
+			return FALSE;
+		}
+		
 		if ( $forum_perm == "" )
 		{
 			return FALSE;
@@ -367,8 +1194,6 @@ class FUNC {
 		}
 	}
 	
-	
-	
 	/*-------------------------------------------------------------------------*/
 	//
 	// hdl_forum_read_cookie()
@@ -439,12 +1264,9 @@ class FUNC {
 			$ret['img_width']   = ceil( ( $arg['cur_width'] * ( ( $arg['max_height'] * 100 ) / $arg['cur_height'] ) ) / 100 );
 		}
 		
-	
 		return $ret;
-	
 	}
 	
-	
 	/*-------------------------------------------------------------------------*/
 	//
 	// Show NORMAL created security image(s)...
@@ -467,12 +1289,9 @@ class FUNC {
 						  9 => 'R0lGODlhCAANAJEAAAAAAP////4BAgAAACH5BAQUAP8ALAAAAAAIAA0AAAIVDA6hyJabnnISnsnybXdS73hcZlUFADs=',
 						);
 		
-		flush();
-		header("Content-type: image/gif");
+		@header("Content-Type: image/gif");
 		echo base64_decode($numbers[ $this_number ]);
 		exit();
-		
-		
 	}
 	
 	/*-------------------------------------------------------------------------*/
@@ -484,87 +1303,102 @@ class FUNC {
 	function show_gd_img($content="")
 	{
 		global $ibforums, $DB;
-
-		flush();
+		
+		$content = '  '. preg_replace( "/(\w)/", "\\1 ", $content ) .' ';
 		
 		@header("Content-Type: image/jpeg");
 		
-		if ( $ibforums->vars['use_ttf'] != 1 )
-		{
-			$font_style = 5;
-			$no_chars   = strlen($content);
-			
-			$charheight = ImageFontHeight($font_style);
-			$charwidth  = ImageFontWidth($font_style);
-			$strwidth   = $charwidth * intval($no_chars);
-			$strheight  = $charheight;
-			
-			$imgwidth   = $strwidth  + 15;
-			$imgheight  = $strheight + 15;
-			$img_c_x    = $imgwidth  / 2;
-			$img_c_y    = $imgheight / 2;
-			
-			$im       = ImageCreate($imgwidth, $imgheight);
-			$text_col = ImageColorAllocate($im, 0, 0, 0);
-			$back_col = ImageColorAllocate($im, 200,200,200);
-			
-			ImageFilledRectangle($im, 0, 0, $imgwidth, $imgheight, $text_col);
-			ImageFilledRectangle($im, 3, 3, $imgwidth - 4, $imgheight - 4, $back_col);
-			
-			$draw_pos_x = $img_c_x - ($strwidth  / 2) + 1;
-			$draw_pos_y = $img_c_y - ($strheight / 2) + 1;
-			
-			ImageString($im, $font_style, $draw_pos_x, $draw_pos_y, $content, $text_col);
+		$tmp_x = 140;
+		$tmp_y = 20;
 		
+		$image_x = 210;
+		$image_y = 65;
+		
+		$circles = 3;
+		
+		if ( $ibforums->vars['gd_version'] == 1 )
+		{
+			$tmp = imagecreate($tmp_x, $tmp_y);
+			$im  = imagecreate($image_x, $image_y);
 		}
 		else
 		{
-			$image_x = isset($ibforums->vars['gd_width'])  ? $ibforums->vars['gd_width'] : 250;
-			$image_y = isset($ibforums->vars['gd_height']) ? $ibforums->vars['gd_height'] : 70;
-			
-			$im = imagecreate($image_x,$image_y);
-			
-			$white    = ImageColorAllocate($im, 255, 255, 255);
-			$black    = ImageColorAllocate($im, 0, 0, 0);
-			$grey     = ImageColorAllocate($im, 200, 200, 200 );
-			
-			$no_x_lines = ($image_x - 1) / 5;
-			
-			for ( $i = 0; $i <= $no_x_lines; $i++ )
-			{
-				// X lines
-				
-				ImageLine( $im, $i * $no_x_lines, 0, $i * $no_x_lines, $image_y, $grey );
-				
-				// Diag lines
-				
-				ImageLine( $im, $i * $no_x_lines, 0, ($i * $no_x_lines)+$no_x_lines, $image_y, $grey );
-			}
-			
-			$no_y_lines = ($image_y - 1) / 5;
-			
-			for ( $i = 0; $i <= $no_y_lines; $i++ )
-			{
-				ImageLine( $im, 0, $i * $no_y_lines, $image_x, $i * $no_y_lines, $grey );
-			}
-			
-			$font = isset($ibforums->vars['gd_font']) ? $ibforums->vars['gd_font'] : getcwd().'/fonts/progbot.ttf';
-		
-			$text_bbox = ImageTTFBBox(20, 0, $font, $content);
-			
-			$sx = ($image_x - ($text_bbox[2] - $text_bbox[0])) / 2; 
-			$sy = ($image_y - ($text_bbox[1] - $text_bbox[7])) / 2; 
-			$sy -= $text_bbox[7];
-			
-			imageTTFtext($im, 20, 0, $sx, $sy, $black, $font, $content);
+			$tmp = imagecreatetruecolor($tmp_x, $tmp_y);
+			$im  = imagecreatetruecolor($image_x, $image_y);
 		}
 		
+		$white  = ImageColorAllocate($tmp, 255, 255, 255);
+		$black  = ImageColorAllocate($tmp, 0, 0, 0);
+		$grey   = ImageColorAllocate($tmp, 210, 210, 210 );
+		
+		imagefill($tmp, 0, 0, $white);
+		
+		for ( $i = 1; $i <= $circles; $i++ )
+		{
+			$values = array(
+							0  => rand(0, $tmp_x - 10),
+							1  => rand(0, $tmp_y - 3),
+							2  => rand(0, $tmp_x - 10),
+							3  => rand(0, $tmp_y - 3),
+							4  => rand(0, $tmp_x - 10),
+							5  => rand(0, $tmp_y - 3),
+							6  => rand(0, $tmp_x - 10),
+							7  => rand(0, $tmp_y - 3),
+							8  => rand(0, $tmp_x - 10),
+							9  => rand(0, $tmp_y - 3),
+							10 => rand(0, $tmp_x - 10),
+							11 => rand(0, $tmp_y - 3),
+					     );
+	   
+			$randomcolor = imagecolorallocate( $tmp, rand(100,255), rand(100,255),rand(100,255) );
+			imagefilledpolygon($tmp, $values, 6, $randomcolor );
+		}
+
+		imagestring($tmp, 5, 0, 2, $content, $black);
+		
+		//-----------------------------------------
+		// Distort by resizing
+		//-----------------------------------------
+		
+		imagecopyresized($im, $tmp, 0, 0, 0, 0, $image_x, $image_y, $tmp_x, $tmp_y);
+		
+		imagedestroy($tmp);
+		
+		$white   = ImageColorAllocate($im, 255, 255, 255);
+		$black   = ImageColorAllocate($im, 0, 0, 0);
+		$grey    = ImageColorAllocate($im, 100, 100, 100 );
+		
+		$random_pixels = $image_x * $image_y / 10;
+			
+		for ($i = 0; $i < $random_pixels; $i++)
+		{
+			ImageSetPixel($im, rand(0, $image_x), rand(0, $image_y), $black);
+		}
+		
+		$no_x_lines = ($image_x - 1) / 5;
+		
+		for ( $i = 0; $i <= $no_x_lines; $i++ )
+		{
+			// X lines
+			
+			ImageLine( $im, $i * $no_x_lines, 0, $i * $no_x_lines, $image_y, $grey );
+			
+			// Diag lines
+			
+			ImageLine( $im, $i * $no_x_lines, 0, ($i * $no_x_lines)+$no_x_lines, $image_y, $grey );
+		}
+		
+		$no_y_lines = ($image_y - 1) / 5;
+		
+		for ( $i = 0; $i <= $no_y_lines; $i++ )
+		{
+			ImageLine( $im, 0, $i * $no_y_lines, $image_x, $i * $no_y_lines, $grey );
+		}
 		
 		ImageJPEG($im);
 		ImageDestroy($im);
 		
 		exit();
-		
 	}
 	
 	/*-------------------------------------------------------------------------*/
@@ -591,63 +1425,6 @@ class FUNC {
 		
 		return $t;
 	}
-	
-	
-	/*-------------------------------------------------------------------------*/
-	//
-	// Load a template file from DB or from PHP file
-	//
-	/*-------------------------------------------------------------------------*/
-	
-	function load_template( $name, $id='' )
-	{
-		global $ibforums, $DB;
-		
-		$tags      = 1;
-		
-		if ($ibforums->vars['safe_mode_skins'] == 0)
-		{
-			// Simply require and return
-			
-			require ROOT_PATH."Skin/".$ibforums->skin_id."/$name.php";
-			return new $name();
-		}
-		else
-		{
-			// We're using safe mode skins, yippee
-			// Load the data from the DB
-			
-			$DB->query("SELECT func_name, func_data, section_content FROM ibf_skin_templates WHERE set_id='".$ibforums->skin_rid."' AND group_name='$name'");
-			
-			if ( ! $DB->get_num_rows() )
-			{
-				fatal_error("Could not fetch the templates from the database. Template $name, ID {$ibforums->skin_rid}");
-			}
-			else
-			{
-				$new_class = "class $name {\n";
-				
-				while( $row = $DB->fetch_row() )
-				{
-					if ($tags == 1)
-					{
-						$comment = "<!--TEMPLATE: $name, Template Part: ".$row['func_name']."-->\n";
-					}
-					
-					$new_class .= 'function '.$row['func_name'].'('.$row['func_data'].") {\n";
-					$new_class .= "global \$ibforums;\n";
-					$new_class .= 'return <<<EOF'."\n".$comment.$row['section_content']."\nEOF;\n}\n";
-				}
-				
-				$new_class .= "}\n";
-				
-				eval($new_class);
-				
-				return new $name();
-			}
-		}
-	}
-		
 		
 	/*-------------------------------------------------------------------------*/
 	//
@@ -689,7 +1466,6 @@ class FUNC {
 		}
 		else if ($ibforums->vars['header_redirect'] == 'html')
 		{
-			@flush();
 			echo("<html><head><meta http-equiv='refresh' content='0; url=$url'></head><body></body></html>");
 			exit();
 		}
@@ -702,7 +1478,7 @@ class FUNC {
 	
 	/*-------------------------------------------------------------------------*/
 	//
-	// Create a random 8 character password
+	// Create a random 8 character password 
 	//
 	/*-------------------------------------------------------------------------*/
 	
@@ -726,47 +1502,6 @@ class FUNC {
 	
 		return($pass);
 	}
-	
-	/*-------------------------------------------------------------------------*/
-	//
-	// Generate the appropriate folder icon for a forum
-	//
-	/*-------------------------------------------------------------------------*/
-	
-	function forum_new_posts($forum_data, $sub=0) {
-        global $ibforums, $std;
-        
-        $rtime = $ibforums->input['last_visit'];
-        
-        $fid   = $forum_data['fid'] == "" ? $forum_data['id'] : $forum_data['fid'];
-        
-        $ftime = $ibforums->forum_read[ $fid ];
-        
-        $rtime = $ftime > $rtime ? $ftime : $rtime;
-        
-        if ($sub == 0)
-        {
-			if ( ! $forum_data['status'] )
-			{
-				return "<{C_LOCKED}>";
-			}
-			
-			$sub_cat_img = '';
-        }
-        else
-        {
-        	$sub_cat_img = '_CAT';
-        }
-        
-        if ($forum_data['password'] and $sub == 0)
-        {
-            return $forum_data['last_post'] > $rtime ? "<{C_ON_RES}>"
-                                                     : "<{C_OFF_RES}>";
-        }
-        
-        return $forum_data['last_post']  > $rtime ? "<{C_ON".$sub_cat_img."}>"
-                                                  : "<{C_OFF".$sub_cat_img."}>";
-    }
     
 	/*-------------------------------------------------------------------------*/
 	//
@@ -774,10 +1509,13 @@ class FUNC {
 	//
 	/*-------------------------------------------------------------------------*/
 	
-	function folder_icon($topic, $dot="", $last_time=-1) {
+	function folder_icon($topic, $dot="", $last_time)
+	{
 		global $ibforums;
 		
-		$last_time = $last_time > $ibforums->input['last_visit'] ? $last_time : $ibforums->input['last_visit'];
+		//-----------------------------------------
+		// Sort dot
+		//-----------------------------------------
 		
 		if ($dot != "")
 		{
@@ -839,7 +1577,6 @@ class FUNC {
 		}
 		
 		return "<{B_NORM".$dot."}>";
-		
 	}
 	
 	/*-------------------------------------------------------------------------*/
@@ -861,38 +1598,8 @@ class FUNC {
     	//$txt = preg_replace( "/\\n/"   , "&#92;n"       , $txt );
     	
     	return $txt;
-    	
     }
 
-	/*-------------------------------------------------------------------------*/
-    // compile_db_string:
-    // Takes an array of keys and values and formats them into a string the DB
-    // can use.
-    // $array = ( 'THIS' => 'this', 'THAT' => 'that' );
-    // will be returned as THIS, THAT  'this', 'that'                
-    /*-------------------------------------------------------------------------*/
-    
-    function compile_db_string($data) {
-    
-    	$field_names  = "";
-		$field_values = "";
-		
-		foreach ($data as $k => $v) {
-			$v = preg_replace( "/'/", "\\'", $v );
-			$field_names  .= "$k,";
-			$field_values .= "'$v',";
-		}
-		
-		$field_names  = preg_replace( "/,$/" , "" , $field_names  );
-		$field_values = preg_replace( "/,$/" , "" , $field_values );
-		
-		return array( 'FIELD_NAMES'  => $field_names,
-					  'FIELD_VALUES' => $field_values,
-					);
-	}
-
-
-
     /*-------------------------------------------------------------------------*/
     // Build up page span links                
     /*-------------------------------------------------------------------------*/
@@ -904,27 +1611,50 @@ class FUNC {
 		$work = array();
 		
 		$section = ($data['leave_out'] == "") ? 2 : $data['leave_out'];  // Number of pages to show per section( either side of current), IE: 1 ... 4 5 [6] 7 8 ... 10
-	
-		$work['pages']  = 1;
 		
-		if ( ($data['TOTAL_POSS'] % $data['PER_PAGE']) == 0 )
-		{
-			$work['pages'] = $data['TOTAL_POSS'] / $data['PER_PAGE'];
-		}
-		else
-		{
-			$number = ($data['TOTAL_POSS'] / $data['PER_PAGE']);
-			$work['pages'] = ceil( $number);
-		}
+		$use_st  = $data['USE_ST'] == "" ? 'st' : $data['USE_ST'];
 		
+		//-----------------------------------------
+		// Get the number of pages
+		//-----------------------------------------
+		
+		$work['pages'] = ceil( $data['TOTAL_POSS'] / $data['PER_PAGE'] );
+		
+		$work['pages'] = $work['pages'] ? $work['pages'] : 1;
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
 		
 		$work['total_page']   = $work['pages'];
 		$work['current_page'] = $data['CUR_ST_VAL'] > 0 ? ($data['CUR_ST_VAL'] / $data['PER_PAGE']) + 1 : 1;
 		
-	
+		//-----------------------------------------
+		// Next / Previous page linkie poos
+		//-----------------------------------------
+		
+		$previous_link = "";
+		$next_link     = "";
+		
+		if ( $work['current_page'] > 1 )
+		{
+			$start = $data['CUR_ST_VAL'] - $data['PER_PAGE'];
+			$previous_link = $ibforums->skin_global->pagination_previous_link("{$data['BASE_URL']}&amp;$use_st=$start");
+		}
+		
+		if ( $work['current_page'] < $work['pages'] )
+		{
+			$start = $data['CUR_ST_VAL'] + $data['PER_PAGE'];
+			$next_link = $ibforums->skin_global->pagination_next_link("{$data['BASE_URL']}&amp;$use_st=$start");
+		}
+		
+		//-----------------------------------------
+		// Loppy loo
+		//-----------------------------------------
+		
 		if ($work['pages'] > 1)
 		{
-			$work['first_page'] = $skin_universal->make_page_jump($data['TOTAL_POSS'],$data['PER_PAGE'], $data['BASE_URL'])." (".$work['pages'].")";
+			$work['first_page'] = $ibforums->skin_global->pagination_make_jump($data['TOTAL_POSS'],$data['PER_PAGE'], $data['BASE_URL'], $work['pages']);
 			
 			for( $i = 0; $i <= $work['pages'] - 1; ++$i )
 			{
@@ -933,14 +1663,13 @@ class FUNC {
 				
 				if ($RealNo == $data['CUR_ST_VAL'])
 				{
-					$work['page_span'] .= "&nbsp;<b>[{$PageNo}]</b>";
+					$work['page_span'] .=  $ibforums->skin_global->pagination_current_page($PageNo);
 				}
 				else
 				{
-					
 					if ($PageNo < ($work['current_page'] - $section))
 					{
-						$work['st_dots'] = "&nbsp;<a href='{$data['BASE_URL']}&amp;st=0' title='{$ibforums->lang['ps_page']} 1'>&laquo; {$ibforums->lang['ps_first']}</a>&nbsp;...";
+						$work['st_dots'] = $ibforums->skin_global->pagination_start_dots($data['BASE_URL']);
 						continue;
 					}
 					
@@ -948,16 +1677,16 @@ class FUNC {
 					
 					if ($PageNo > ($work['current_page'] + $section))
 					{
-						$work['end_dots'] = "...&nbsp;<a href='{$data['BASE_URL']}&amp;st=".($work['pages']-1) * $data['PER_PAGE']."' title='{$ibforums->lang['ps_page']} {$work['pages']}'>{$ibforums->lang['ps_last']} &raquo;</a>";
+						$work['end_dots'] = $ibforums->skin_global->pagination_end_dots("{$data['BASE_URL']}&amp;$use_st=".($work['pages']-1) * $data['PER_PAGE']);
 						break;
 					}
 					
 					
-					$work['page_span'] .= "&nbsp;<a href='{$data['BASE_URL']}&amp;st={$RealNo}'>{$PageNo}</a>";
+					$work['page_span'] .= $ibforums->skin_global->pagination_page_link("{$data['BASE_URL']}&amp;$use_st={$RealNo}",$PageNo);
 				}
 			}
 			
-			$work['return']    = $work['first_page'].$work['st_dots'].$work['page_span'].'&nbsp;'.$work['end_dots'];
+			$work['return']    = $ibforums->skin_global->pagination_compile($work['first_page'],$previous_link,$work['st_dots'],$work['page_span'],$work['end_dots'],$next_link);
 		}
 		else
 		{
@@ -967,41 +1696,22 @@ class FUNC {
 		return $work['return'];
 	}
     
-    
-    
     /*-------------------------------------------------------------------------*/
     // Build the forum jump menu               
     /*-------------------------------------------------------------------------*/ 
     
 	function build_forum_jump($html=1, $override=0, $remove_redirects=0)
 	{
-		global $INFO, $DB, $ibforums;
+		global $DB, $ibforums, $forums;
 		// $html = 0 means don't return the select html stuff
 		// $html = 1 means return the jump menu with select and option stuff
-		
-		$last_cat_id = -1;
-		
-		if ( $remove_redirects )
-		{
-			$qe = 'AND f.redirect_on <> 1';
-		}
-		else
-		{
-			$qe = '';
-		}
-		
-		$DB->query("SELECT f.id as forum_id, f.parent_id, f.subwrap, f.sub_can_post, f.name as forum_name, f.position, f.redirect_on, f.read_perms, c.id as cat_id, c.name
-				    FROM ibf_forums f
-				     LEFT JOIN ibf_categories c ON (c.id=f.category)
-				    WHERE c.state IN (1,2) $qe
-				    ORDER BY c.position, f.position");
-		
+		// $ibforums->vars['short_forum_jump'] = 0;
 		
 		if ($html == 1) {
 		
 			$the_html = "<form onsubmit=\"if(document.jumpmenu.f.value == -1){return false;}\" action='{$ibforums->base_url}act=SF' method='get' name='jumpmenu'>
 			             <input type='hidden' name='act' value='SF' />\n<input type='hidden' name='s' value='{$ibforums->session_id}' />
-			             <select name='f' onchange=\"if(this.options[this.selectedIndex].value != -1){ document.jumpmenu.submit() }\" class='forminput'>
+			             <select name='f' onchange=\"if(this.options[this.selectedIndex].value != -1){ document.jumpmenu.submit() }\" class='dropdown'>
 			             <optgroup label=\"{$ibforums->lang['sj_title']}\">
 			              <option value='sj_home'>{$ibforums->lang['sj_home']}</option>
 			              <option value='sj_search'>{$ibforums->lang['sj_search']}</option>
@@ -1009,122 +1719,15 @@ class FUNC {
 			             </optgroup>
 			             <optgroup label=\"{$ibforums->lang['forum_jump']}\">";
 		}
-		
-		$forum_keys = array();
-		$cat_keys   = array();
-		$children   = array();
-		$subs       = array();
-		$subwrap    = array();
-		
-		// disable short mode if we're compiling a mod form
-		
-		if ($html == 0 or $override == 1)
-		{
-			$ibforums->vars['short_forum_jump'] = 0;
-		}
 			
-		while ( $i = $DB->fetch_row() )
-		{
-			$selected = '';
-			$redirect = "";
-		
-			if ($html == 1 or $override == 1)
-			{
-				if ($ibforums->input['f'] and $ibforums->input['f'] == $i['forum_id'])
-				{
-					$selected = ' selected="selected"';
-				}
-			}
+		$the_html .= $forums->forums_forum_jump($html, $override, $remove_redirects);
 			
-			if ( $i['redirect_on'] )
-			{
-				$redirect = $ibforums->lang['fj_redirect'];
-			}
-			
-			if ($i['subwrap'] == 1)
-			{
-				$subwrap[ $i['forum_id'] ] = 1;
-			}
-			
-			if ($i['subwrap'] == 1 and $i['sub_can_post'] != 1)
-			{
-				$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "<option value=\"{$i['forum_id']}\"".$selected.">&nbsp;&nbsp;- {$i['forum_name']}</option>\n";
-			}
-			else
-			{
-				if ( $this->check_perms($i['read_perms']) == TRUE )
-				{
-					if ($i['parent_id'] > 0)
-					{
-						$children[ $i['parent_id'] ][] = "<option value=\"{$i['forum_id']}\"".$selected.">&nbsp;&nbsp;---- {$i['forum_name']} $redirect</option>\n";
-					}
-					else
-					{
-						$forum_keys[ $i['cat_id'] ][$i['forum_id']] = "<option value=\"{$i['forum_id']}\"".$selected.">&nbsp;&nbsp;- {$i['forum_name']} $redirect</option><!--fx:{$i['forum_id']}-->\n";
-					}
-				}
-				else
-				{
-					continue;
-				}
-			}
-			
-			if ($last_cat_id != $i['cat_id'])
-			{
-				
-				// Make sure cats with hidden forums are not shown in forum jump
-				
-				$cat_keys[ $i['cat_id'] ] = "<option value='-1'>{$i['name']}</option>\n";
-							              
-				$last_cat_id = $i['cat_id'];
-				
-			}
-		}
-		
-		foreach($cat_keys as $cat_id => $cat_text)
-		{
-			if ( is_array( $forum_keys[$cat_id] ) && count( $forum_keys[$cat_id] ) > 0 )
-			{
-				$the_html .= $cat_text;
-				
-				foreach($forum_keys[$cat_id] as $idx => $forum_text)
-				{
-					if ( $subwrap[$idx] != 1 )
-					{
-						$the_html .= $forum_text;
-					}
-					else if (count($children[$idx]) > 0)
-					{
-						$the_html .= $forum_text;
-						
-						if ($ibforums->vars['short_forum_jump'] != 1)
-						{
-							foreach($children[$idx] as $ii => $tt)
-							{
-								$the_html .= $tt;
-							}
-						}
-						else
-						{
-							$the_html = str_replace( "</option><!--fx:$idx-->", " (+".count($children[$idx])." {$ibforums->lang['fj_subforums']})</option>", $the_html );
-						}
-					}
-					else
-					{
-						$the_html .= $forum_text;
-					}
-				}
-			}
-		}
-			
-		
 		if ($html == 1)
 		{
-			$the_html .= "</optgroup>\n</select>&nbsp;<input type='submit' value='{$ibforums->lang['jmp_go']}' class='forminput' /></form>";
+			$the_html .= "</optgroup>\n</select>&nbsp;<input type='submit' value='{$ibforums->lang['jmp_go']}' class='button' /></form>";
 		}
 		
 		return $the_html;
-		
 	}
 	
 	function clean_email($email = "") {
@@ -1145,144 +1748,6 @@ class FUNC {
     	}
 	}
     
-    
-    /*-------------------------------------------------------------------------*/
-    // SKIN, sort out the skin stuff                 
-    /*-------------------------------------------------------------------------*/
-    
-    function load_skin() {
-    	global $ibforums, $INFO, $DB;
-    	
-    	$id       = -1;
-    	$skin_set = 0;
-    	
-    	if ( ( $ibforums->is_bot == 1 ) and ($ibforums->vars['spider_suit'] != "") )
-    	{
-    		$skin_set = 1;
-    		$id       = $ibforums->vars['spider_suit'];
-    	}
-    	else
-    	{
-			//------------------------------------------------
-			// Do we have a skin for a particular forum?
-			//------------------------------------------------
-			
-			if ($ibforums->input['f'] and $ibforums->input['act'] != 'UserCP')
-			{
-				if ( $ibforums->vars[ 'forum_skin_'.$ibforums->input['f'] ] != "" )
-				{
-					$id = $ibforums->vars[ 'forum_skin_'.$ibforums->input['f'] ];
-					
-					$skin_set = 1;
-				}
-			}
-			
-			//------------------------------------------------
-			// Are we allowing user chooseable skins?
-			//------------------------------------------------
-			
-			$extra = "";
-			
-			if ($skin_set != 1 and $ibforums->vars['allow_skins'] == 1)
-			{
-				if (isset($ibforums->input['skinid']))
-				{
-					$id    = intval($ibforums->input['skinid']);
-					$extra = " AND s.hidden=0";
-					$skin_set = 1;
-				}
-				else if ( $ibforums->member['skin'] != "" and intval($ibforums->member['skin']) >= 0 )
-				{
-					$id = $ibforums->member['skin'];
-					
-					if ($id == 'Default') $id = -1;
-					
-					$skin_set = 1;
-				}
-			}
-    	}
-    	
-    	//------------------------------------------------
-    	// Load the info from the database.
-    	//------------------------------------------------
-    	
-    	if ( $id >= 0 and $skin_set == 1)
-    	{
-    		$DB->query("SELECT s.*, t.template, c.css_text
-    					FROM ibf_skins s
-    					  LEFT JOIN ibf_templates t ON (t.tmid=s.tmpl_id)
-    					  LEFT JOIN ibf_css c ON (c.cssid=s.css_id)
-    	           	   WHERE s.sid=$id".$extra);
-    	           	   
-    	    // Didn't get a row?
-    	    
-    	    if (! $DB->get_num_rows() )
-    	    {
-    	    	// Update this members profile
-    	    	
-    	    	if ( $ibforums->member['id'] )
-    	    	{
-    	    		$DB->query("UPDATE ibf_members SET skin='-1' WHERE id='".$ibforums->member['id']."'");
-    	    	}
-    	    	
-    	    		$DB->query("SELECT s.*, t.template, c.css_text
-    							FROM ibf_skins s
-    					  		 LEFT JOIN ibf_templates t ON (t.tmid=s.tmpl_id)
-    					 		 LEFT JOIN ibf_css c ON (s.css_id=c.cssid)
-    	           	   		    WHERE s.default_set=1");
-    	    }
-    	    
-    	}
-    	else
-    	{
-    		$DB->query("SELECT s.*, t.template, c.css_text
-    					FROM ibf_skins s
-    					  LEFT JOIN ibf_templates t ON (t.tmid=s.tmpl_id)
-    					  LEFT JOIN ibf_css c ON (s.css_id=c.cssid)
-    	           	   WHERE s.default_set=1");
-    	}
-    	
-    	if ( ! $row = $DB->fetch_row() )
-    	{
-    		echo("Could not query the skin information!");
-    		exit();
-    	}
-    	
-    	//-------------------------------------------
-    	// Setting the skin?
-    	//-------------------------------------------
-    	
-    	if ( ($ibforums->input['setskin']) and ($ibforums->member['id']) )
-    	{
-    		$DB->query( "UPDATE ibf_members SET skin=".intval($row['sid'])." WHERE id=".intval($ibforums->member['id']) );
-    		
-    		$ibforums->member['skin'] = $row['sid'];
-    	}
-    	
-    	return $row;
-    	
-    }
-    
-    /*-------------------------------------------------------------------------*/
-    // Require, parse and return an array containing the language stuff                 
-    /*-------------------------------------------------------------------------*/ 
-    
-    function load_words($current_lang_array, $area, $lang_type) {
-    
-        require ROOT_PATH."lang/".$lang_type."/".$area.".php";
-        
-        foreach ($lang as $k => $v)
-        {
-        	$current_lang_array[$k] = stripslashes($v);
-        }
-        
-        unset($lang);
-        
-        return $current_lang_array;
-
-    }
-
-    
     /*-------------------------------------------------------------------------*/
     // Return a date or '--' if the date is undef.
     // We use the rather nice gmdate function in PHP to synchronise our times
@@ -1293,8 +1758,9 @@ class FUNC {
     // be adjusted to match gmdate.             
     /*-------------------------------------------------------------------------*/    
     
-    function get_date($date, $method) {
-        global $ibforums;
+    function get_date($date, $method, $norelative=0)
+    {
+		global $ibforums;
         
         if (!$date)
         {
@@ -1312,11 +1778,56 @@ class FUNC {
         	
 			$this->offset = $this->get_time_offset();
 			
+			if ( $ibforums->vars['time_use_relative'] )
+			{
+				$this->today_time     = gmdate('d,m,Y', ( time() + $this->offset) );
+				$this->yesterday_time = gmdate('d,m,Y', ( (time() - 86400) + $this->offset) );
+			}	
+			
 			$this->offset_set = 1;
         }
         
+        if ( $ibforums->vars['time_use_relative'] and ( $norelative != 1 ) )
+		{
+			$this_time = gmdate('d,m,Y', ($date + $this->offset) );
+			
+			if ( $this_time == $this->today_time )
+			{
+				return str_replace( '{--}', $ibforums->lang['time_today'], gmdate($ibforums->vars['time_use_relative_format'], ($date + $this->offset) ) );
+			}
+			else if  ( $this_time == $this->yesterday_time )
+			{
+				return str_replace( '{--}', $ibforums->lang['time_yesterday'], gmdate($ibforums->vars['time_use_relative_format'], ($date + $this->offset) ) );
+			}
+			else
+			{
+				return gmdate($this->time_options[$method], ($date + $this->offset) );
+			}
+		}
+		else
+		{
+        	return gmdate($this->time_options[$method], ($date + $this->offset) );
+        }
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Returns the time - tick tock, etc           
+    /*-------------------------------------------------------------------------*/   
+    
+    function get_time($date, $method='h:i A')
+    {
+		global $ibforums;
         
-        return gmdate($this->time_options[$method], ($date + $this->offset) );
+        if ($this->offset_set == 0)
+        {
+        	// Save redoing this code for each call, only do once per page load
+        	
+			$this->offset = $this->get_time_offset();
+			
+			$this->offset_set = 1;
+        }
+        
+        return gmdate($method, ($date + $this->offset) );
     }
     
     /*-------------------------------------------------------------------------*/
@@ -1325,7 +1836,7 @@ class FUNC {
     
     function get_time_offset()
     {
-    	global $ibforums;
+		global $ibforums;
     	
     	$r = 0;
     	
@@ -1342,29 +1853,32 @@ class FUNC {
 		}
     	
     	return $r;
-    	
     }
     
     /*-------------------------------------------------------------------------*/
     // Sets a cookie, abstract layer allows us to do some checking, etc                
     /*-------------------------------------------------------------------------*/    
     
-    function my_setcookie($name, $value = "", $sticky = 1) {
-        global $INFO;
+    function my_setcookie($name, $value = "", $sticky = 1)
+    {
+		global $ibforums;
         
-        //$expires = "";
+        if ( $ibforums->no_print_header )
+        {
+        	return;
+        }
         
         if ($sticky == 1)
         {
         	$expires = time() + 60*60*24*365;
         }
 
-        $INFO['cookie_domain'] = $INFO['cookie_domain'] == "" ? ""  : $INFO['cookie_domain'];
-        $INFO['cookie_path']   = $INFO['cookie_path']   == "" ? "/" : $INFO['cookie_path'];
+        $ibforums->vars['cookie_domain'] = $ibforums->vars['cookie_domain'] == "" ? ""  : $ibforums->vars['cookie_domain'];
+        $ibforums->vars['cookie_path']   = $ibforums->vars['cookie_path']   == "" ? "/" : $ibforums->vars['cookie_path'];
         
-        $name = $INFO['cookie_id'].$name;
+        $name = $ibforums->vars['cookie_id'].$name;
       
-        @setcookie($name, $value, $expires, $INFO['cookie_path'], $INFO['cookie_domain']);
+        @setcookie($name, $value, $expires, $ibforums->vars['cookie_path'], $ibforums->vars['cookie_domain']);
     }
     
     /*-------------------------------------------------------------------------*/
@@ -1373,17 +1887,16 @@ class FUNC {
     
     function my_getcookie($name)
     {
-    	global $INFO, $HTTP_COOKIE_VARS;
+		global $ibforums;
     	
-    	if (isset($HTTP_COOKIE_VARS[$INFO['cookie_id'].$name]))
+    	if (isset($_COOKIE[$ibforums->vars['cookie_id'].$name]))
     	{
-    		return urldecode($HTTP_COOKIE_VARS[$INFO['cookie_id'].$name]);
+    		return urldecode($_COOKIE[$ibforums->vars['cookie_id'].$name]);
     	}
     	else
     	{
     		return FALSE;
     	}
-    	
     }
     
     /*-------------------------------------------------------------------------*/
@@ -1392,82 +1905,53 @@ class FUNC {
     
     function parse_incoming()
     {
-    	global $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_CLIENT_IP, $REQUEST_METHOD, $REMOTE_ADDR, $HTTP_PROXY_USER, $HTTP_X_FORWARDED_FOR;
+		global $ibforums;
+    	
+    	$this->get_magic_quotes = get_magic_quotes_gpc();
+    	
     	$return = array();
     	
-		if( is_array($HTTP_GET_VARS) )
+		if( is_array($_GET) )
 		{
-			while( list($k, $v) = each($HTTP_GET_VARS) )
+			while( list($k, $v) = each($_GET) )
 			{
-				if ( $k == 'INFO' )
+				if ( is_array($_GET[$k]) )
 				{
-					continue;
-				}
-				
-				if( is_array($HTTP_GET_VARS[$k]) )
-				{
-					while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
+					while( list($k2, $v2) = each($_GET[$k]) )
 					{
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
+						$return[ $this->clean_key($k) ][ $this->clean_key($k2) ] = $this->clean_value($v2);
 					}
 				}
 				else
 				{
-					$return[$k] = $this->clean_value($v);
+					$return[ $this->clean_key($k) ] = $this->clean_value($v);
 				}
 			}
 		}
 		
+		//-----------------------------------------
 		// Overwrite GET data with post data
+		//-----------------------------------------
 		
-		if( is_array($HTTP_POST_VARS) )
+		if( is_array($_POST) )
 		{
-			while( list($k, $v) = each($HTTP_POST_VARS) )
+			while( list($k, $v) = each($_POST) )
 			{
-				if ( is_array($HTTP_POST_VARS[$k]) )
+				if ( is_array($_POST[$k]) )
 				{
-					while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
+					while( list($k2, $v2) = each($_POST[$k]) )
 					{
-						$return[$k][ $this->clean_key($k2) ] = $this->clean_value($v2);
+						$return[ $this->clean_key($k) ][ $this->clean_key($k2) ] = $this->clean_value($v2);
 					}
 				}
 				else
 				{
-					$return[$k] = $this->clean_value($v);
+					$return[ $this->clean_key($k) ] = $this->clean_value($v);
 				}
 			}
 		}
 		
-		//----------------------------------------
-		// Sort out the accessing IP
-		// (Thanks to Cosmos and schickb)
-		//----------------------------------------
-		
-		$addrs = array();
-		
-		foreach( array_reverse( explode( ',', $HTTP_X_FORWARDED_FOR ) ) as $x_f )
-		{
-			$x_f = trim($x_f);
-			
-			if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $x_f ) )
-			{
-				$addrs[] = $x_f;
-			}
-		}
-		
-		$addrs[] = $_SERVER['REMOTE_ADDR'];
-		$addrs[] = $HTTP_PROXY_USER;
-		$addrs[] = $REMOTE_ADDR;
-		
-		//header("Content-type: text/plain"); print_r($addrs); print $_SERVER['HTTP_X_FORWARDED_FOR']; exit();
-		
-		$return['IP_ADDRESS'] = $this->select_var( $addrs );
-												 
-		// Make sure we take a valid IP address
-		
-		$return['IP_ADDRESS'] = preg_replace( "/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/", "\\1.\\2.\\3.\\4", $return['IP_ADDRESS'] );
-		
-		$return['request_method'] = ( $_SERVER['REQUEST_METHOD'] != "" ) ? strtolower($_SERVER['REQUEST_METHOD']) : strtolower($REQUEST_METHOD);
+		$return['request_method'] = strtolower($_SERVER['REQUEST_METHOD']);
 		
 		return $return;
 	}
@@ -1476,27 +1960,54 @@ class FUNC {
     // Key Cleaner - ensures no funny business with form elements             
     /*-------------------------------------------------------------------------*/
     
-    function clean_key($key) {
-    
+    function clean_key($key)
+    {
     	if ($key == "")
     	{
     		return "";
     	}
+    	
+    	$key = htmlspecialchars(urldecode($key));
     	$key = preg_replace( "/\.\./"           , ""  , $key );
     	$key = preg_replace( "/\_\_(.+?)\_\_/"  , ""  , $key );
     	$key = preg_replace( "/^([\w\.\-\_]+)$/", "$1", $key );
+    	
     	return $key;
     }
     
+    /*-------------------------------------------------------------------------*/
+    // Clean evil tags
+    /*-------------------------------------------------------------------------*/
+    
+    function clean_evil_tags( $t )
+    {
+    	$t = preg_replace( "/javascript/i" , "j&#097;v&#097;script", $t );
+		$t = preg_replace( "/alert/i"      , "&#097;lert"          , $t );
+		$t = preg_replace( "/about:/i"     , "&#097;bout:"         , $t );
+		$t = preg_replace( "/onmouseover/i", "&#111;nmouseover"    , $t );
+		$t = preg_replace( "/onclick/i"    , "&#111;nclick"        , $t );
+		$t = preg_replace( "/onload/i"     , "&#111;nload"         , $t );
+		$t = preg_replace( "/onsubmit/i"   , "&#111;nsubmit"       , $t );
+		$t = preg_replace( "/<body/i"      , "&lt;body"            , $t );
+		$t = preg_replace( "/<html/i"      , "&lt;html"            , $t );
+		$t = preg_replace( "/document\./i" , "&#100;ocument."      , $t );
+		
+		return $t;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Clean value
+    /*-------------------------------------------------------------------------*/
+    
     function clean_value($val)
     {
-    	global $ibforums;
+		global $ibforums;
     	
     	if ($val == "")
     	{
     		return "";
     	}
-    	
+    
     	$val = str_replace( "&#032;", " ", $val );
     	
     	if ( $ibforums->vars['strip_space_chr'] )
@@ -1511,7 +2022,7 @@ class FUNC {
     	$val = str_replace( ">"            , "&gt;"          , $val );
     	$val = str_replace( "<"            , "&lt;"          , $val );
     	$val = str_replace( "\""           , "&quot;"        , $val );
-    	$val = preg_replace( "/\n/"        , "<br>"          , $val ); // Convert literal newlines
+    	$val = preg_replace( "/\n/"        , "<br />"        , $val ); // Convert literal newlines
     	$val = preg_replace( "/\\\$/"      , "&#036;"        , $val );
     	$val = preg_replace( "/\r/"        , ""              , $val ); // Remove literal carriage returns
     	$val = str_replace( "!"            , "&#33;"         , $val );
@@ -1538,7 +2049,6 @@ class FUNC {
     	return $val;
     }
     
-    
     function remove_tags($text="")
     {
     	// Removes < BOARD TAGS > from posted forms
@@ -1569,9 +2079,9 @@ class FUNC {
     // MEMBER FUNCTIONS             
     /*-------------------------------------------------------------------------*/
     
-    
-    function set_up_guest($name='Guest') {
-    	global $INFO;
+    function set_up_guest($name='Guest')
+    {
+		global $INFO;
     
     	return array( 'name'     => $name,
     				  'id'       => 0,
@@ -1589,16 +2099,15 @@ class FUNC {
     // GET USER AVATAR         
     /*-------------------------------------------------------------------------*/
     
-    function get_avatar($member_avatar="", $member_view_avatars=0, $avatar_dims="x")
+    function get_avatar($member_avatar="", $member_view_avatars=0, $avatar_dims="x", $avatar_type='')
     {
-    	global $ibforums;
+		global $ibforums;
     	
-    	if (!$member_avatar or $member_view_avatars == 0 or !$ibforums->vars['avatars_on'])
-    	{
-    		return "";
-    	}
+    	//-----------------------------------------
+    	// No avatar?
+    	//-----------------------------------------
     	
-    	if (preg_match ( "/^noavatar/", $member_avatar ))
+    	if ( ! $member_avatar or $member_view_avatars == 0 or ! $ibforums->vars['avatars_on'] or preg_match ( "/^noavatar/", $member_avatar ) )
     	{
     		return "";
     	}
@@ -1608,21 +2117,44 @@ class FUNC {
     		return "";
     	}
     	
+    	//-----------------------------------------
+    	// Defaults...
+    	//-----------------------------------------
+    	
     	$davatar_dims    = explode( "x", $ibforums->vars['avatar_dims'] );
 		$default_a_dims  = explode( "x", $ibforums->vars['avatar_def'] );
-    	
-    	//---------------------------------------
-		// Have we enabled URL / Upload avatars?
-		//---------------------------------------
-	 
-		$this_dims = explode( "x", $avatar_dims );
+    	$this_dims       = explode( "x", $avatar_dims );
+		
 		if (!$this_dims[0]) $this_dims[0] = $davatar_dims[0];
 		if (!$this_dims[1]) $this_dims[1] = $davatar_dims[1];
-			
-		if ( preg_match( "/^http:\/\//", $member_avatar ) )
+		
+    	//-----------------------------------------
+    	// LEGACY: Determine type
+    	//-----------------------------------------
+		
+		if ( ! $avatar_type )
+		{
+			if ( preg_match( "/^http:\/\//", $member_avatar ) )
+			{
+				$avatar_type = 'url';
+			}
+			else if ( preg_match( "/^upload:/", $member_avatar ) )
+			{
+				$avatar_type   = 'upload';
+				$member_avatar = preg_replace( "/^upload:/", "", $member_avatar );
+			}
+			else
+			{
+				$avatar_type = 'local';
+			}
+	 	}
+		
+		//-----------------------------------------
+		// URL avatar?
+		//-----------------------------------------
+		
+		if ( $avatar_type == 'url' )
 		{
-			// Ok, it's a URL..
-			
 			if (preg_match ( "/\.swf/", $member_avatar))
 			{
 				return "<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" width='{$this_dims[0]}' height='{$this_dims[1]}'>
@@ -1635,14 +2167,15 @@ class FUNC {
 			{
 				return "<img src='{$member_avatar}' border='0' width='{$this_dims[0]}' height='{$this_dims[1]}' alt='' />";
 			}
-			
-			//---------------------------------------
-			// Not a URL? Is it an uploaded avatar?
-			//---------------------------------------
 		}
-		else if ( ($ibforums->vars['avup_size_max'] > 1) and ( preg_match( "/^upload:av-(?:\d+)\.(?:\S+)/", $member_avatar ) ) )
+		
+		//-----------------------------------------
+		// Not a URL? Is it an uploaded avatar?
+		//-----------------------------------------
+			
+		else if ( ($ibforums->vars['avup_size_max'] > 1) and ( $avatar_type == 'upload' ) )
 		{
-			$member_avatar = preg_replace( "/^upload:/", "", $member_avatar );
+			$member_avatar = str_replace( 'upload:', '', $member_avatar );
 			
 			if ( preg_match ( "/\.swf/", $member_avatar) )
 			{
@@ -1658,77 +2191,112 @@ class FUNC {
 			}
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// No, it's not a URL or an upload, must
 		// be a normal avatar then
-		//---------------------------------------
+		//-----------------------------------------
 		
 		else if ($member_avatar != "")
 		{
-			//---------------------------------------
+			//-----------------------------------------
 			// Do we have an avatar still ?
-		   	//---------------------------------------
+		   	//-----------------------------------------
 		   	
 			return "<img src='{$ibforums->vars['AVATARS_URL']}/{$member_avatar}' border='0' alt='' />";
 		}
 		else
 		{
-			//---------------------------------------
+			//-----------------------------------------
 			// No, ok - return blank
-			//---------------------------------------
+			//-----------------------------------------
 			
 			return "";
 		}
     }
  
- 
- 
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Quick, INIT? a.k.a Just enough information to perform
+ 	// (Sorry, listening to stereophonics still)
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function quick_init()
+ 	{
+		global $ibforums, $DB;
+ 		
+ 		$this->load_skin();
+    	    
+	   //-----------------------------------------
+	   // Grab session cookie
+	   //-----------------------------------------
+			  
+	   $ibforums->session_id = $sess->session_id ? $sess->session_id : $this->my_getcookie('session_id');
+	   
+	   //-----------------------------------------
+	   // Organize default info
+	   //-----------------------------------------
+	   
+	   $ibforums->base_url   = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?s='.$ibforums->session_id;
+	   $ibforums->skin_rid   = $ibforums->skin['set_id'];
+	   $ibforums->skin_id    = 's'.$ibforums->skin['set_id'];
+	   
+	   if ($ibforums->vars['default_language'] == "")
+	   {
+		   $ibforums->vars['default_language'] = 'en';
+	   }
+	   
+	   $ibforums->lang_id = $ibforums->member['language'] ? $ibforums->member['language'] : $ibforums->vars['default_language'];
+	   
+	   if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir( ROOT_PATH."lang/".$ibforums->lang_id ) ) )
+	   {
+		   $ibforums->lang_id = $ibforums->vars['default_language'];
+	   }
+	   
+	   //-----------------------------------------
+	   // Get words & skin
+	   //-----------------------------------------
+	   
+	   $ibforums->lang = $this->load_words($ibforums->lang, "lang_global", $ibforums->lang_id);
+	   
+	   $ibforums->vars['img_url'] = 'style_images/' . $ibforums->skin['_imagedir'];
+	   
+	   if ( $ibforums->skin_global == "" )
+	   {
+		   $this->load_template('skin_global');
+	   }
+ 	}
  
     /*-------------------------------------------------------------------------*/
     // ERROR FUNCTIONS             
     /*-------------------------------------------------------------------------*/
     
-    function Error($error) {
-    	global $DB, $ibforums, $skin_universal;
+    function Error($error)
+    {
+		global $DB, $ibforums, $sess;
     	
-    	//INIT is passed to the array if we've not yet loaded a skin and stuff
+    	$override = 0;
+    	
+    	//-----------------------------------------
+    	// Initialize if not done so yet
+    	//-----------------------------------------
     	
     	if ( $error['INIT'] == 1)
     	{
-    		
-    		$DB->query("SELECT s.*, t.template, c.css_text
-    					FROM ibf_skins s
-    					  LEFT JOIN ibf_templates t ON (t.tmid=s.tmpl_id)
-    					  LEFT JOIN ibf_css c ON (s.css_id=c.cssid)
-    	           	   WHERE s.default_set=1");
-    	           	   
-    	    $ibforums->skin = $DB->fetch_row();
-    	           	   
-    		$ibforums->session_id = $this->my_getcookie('session_id');
-
-			$ibforums->base_url   = $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?s='.$ibforums->session_id;
-			$ibforums->skin_rid   = $ibforums->skin['set_id'];
-			$ibforums->skin_id    = 's'.$ibforums->skin['set_id'];
-			
-			if ($ibforums->vars['default_language'] == "")
-			{
-				$ibforums->vars['default_language'] = 'en';
-			}
-			
-			$ibforums->lang_id = $ibforums->member['language'] ? $ibforums->member['language'] : $ibforums->vars['default_language'];
-			
-			if ( ($ibforums->lang_id != $ibforums->vars['default_language']) and (! is_dir( ROOT_PATH."lang/".$ibforums->lang_id ) ) )
-			{
-				$ibforums->lang_id = $ibforums->vars['default_language'];
-			}
-			
-			$ibforums->lang = $this->load_words($ibforums->lang, "lang_global", $ibforums->lang_id);
-			
-			$ibforums->vars['img_url']   = 'style_images/' . $ibforums->skin['img_dir'];
-			
-			$skin_universal = $this->load_template('skin_global');
-
+    		$this->quick_init();
 		}
+		else
+		{
+			$ibforums->session_id = $ibforums->my_session;
+		}
+		
+		if ( $ibforums->skin_global == "" )
+		{
+			$this->load_template('skin_global');
+		}
+		
+		//-----------------------------------------
+		// Get error words
+		//-----------------------------------------
 		
     	$ibforums->lang = $this->load_words($ibforums->lang, "lang_error", $ibforums->lang_id);
     	
@@ -1736,12 +2304,20 @@ class FUNC {
     	
     	$msg = $ibforums->lang[ $error['MSG'] ];
     	
+    	//-----------------------------------------
+    	// Extra info?
+    	//-----------------------------------------
+    	
     	if ($error['EXTRA'])
     	{
     		$msg = preg_replace( "/<#EXTRA#>/", $error['EXTRA'], $msg );
     	}
     	
-    	$html = $skin_universal->Error( $msg, $em_1, $em_2);
+    	//-----------------------------------------
+    	// Show error
+    	//-----------------------------------------
+    	
+    	$html = $ibforums->skin_global->Error( $msg, $em_1, $em_2, 1);
     	
     	//-----------------------------------------
     	// If we're a guest, show the log in box..
@@ -1749,7 +2325,10 @@ class FUNC {
     	
     	if ($ibforums->member['id'] == "" and $error['MSG'] != 'server_too_busy' and $error['MSG'] != 'account_susp')
     	{
-    		$html = str_replace( "<!--IBF.LOG_IN_TABLE-->", $skin_universal->error_log_in($_SERVER['QUERY_STRING']), $html);
+    		$safe_string = str_replace( '&amp;', '&', $this->clean_value($_SERVER['QUERY_STRING']) );
+    		
+    		$html = str_replace( "<!--IBF.LOG_IN_TABLE-->", $ibforums->skin_global->error_log_in($safe_string), $html);
+    		$override = 1;
     	}
     	
     	//-----------------------------------------
@@ -1760,36 +2339,50 @@ class FUNC {
     	{
     		if ( $_POST['Post'] )
     		{
-    			$post_thing = $skin_universal->error_post_textarea($this->txt_htmlspecialchars($this->txt_stripslashes($_POST['Post'])) );
+    			$post_thing = $ibforums->skin_global->error_post_textarea($this->txt_htmlspecialchars($this->txt_stripslashes($_POST['Post'])) );
     			
     			$html = str_replace( "<!--IBF.POST_TEXTAREA-->", $post_thing, $html );
     		}
     	}
     	
+    	//-----------------------------------------
+    	// Update session
+    	//-----------------------------------------
+    	
+    	$DB->do_shutdown_update( 'sessions', array( 'in_error' => 1 ), "id='{$ibforums->session_id}'" );
+    	
+    	//-----------------------------------------
+    	// Print
+    	//-----------------------------------------
     	
     	$print = new display();
     	
     	$print->add_output($html);
     		
-    	$print->do_output( array(
-    								OVERRIDE   => 1,
-    								TITLE      => $ibforums->lang['error_title'],
-    							 )
-    					  );
+    	$print->do_output( array( 'OVERRIDE' => $override, 'TITLE' => $ibforums->lang['error_title'] ) );
     }
     
-    
-    
+    /*-------------------------------------------------------------------------*/
+    // Show Board Offline
+    /*-------------------------------------------------------------------------*/
     
     function board_offline()
     {
-    	global $DB, $ibforums, $root_path, $skin_universal;
+		global $DB, $ibforums;
+    	
+    	$this->quick_init();
+    	
+    	//-----------------------------------------
+    	// Get offline message (not cached)
+    	//-----------------------------------------
+    	
+    	$row = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings', 'where' => "conf_key='offline_msg'" ) );
     	
     	$ibforums->lang = $this->load_words($ibforums->lang, "lang_error", $ibforums->lang_id);
     	
-    	$msg = preg_replace( "/\n/", "<br>", stripslashes($ibforums->vars['offline_msg']) );
+    	$msg = preg_replace( "/\n/", "<br>", stripslashes( $row['conf_value'] ) );
     	
-    	$html = $skin_universal->board_offline( $msg );
+    	$html = $ibforums->skin_global->board_offline( $msg );
     	
     	$print = new display();
     	
@@ -1827,1233 +2420,6 @@ class FUNC {
     	return $chosen;
     }
       
-    
 } // end class
 
-
-//######################################################
-// Our "print" class
-//######################################################
-
-
-class display {
-
-    var $to_print = "";
-    
-    //-------------------------------------------
-    // Appends the parsed HTML to our class var
-    //-------------------------------------------
-    
-    function add_output($to_add) {
-        $this->to_print .= $to_add;
-        //return 'true' on success
-        return true;
-    }
-    
-    //-------------------------------------------
-    // Parses all the information and prints it.
-    //-------------------------------------------
-    
-    function do_output($output_array)
-    {
-        global $DB, $Debug, $skin_universal, $ibforums;
-        
-       
-		// Note, this is designed to allow IPS validate boards who've purchased copyright removal / registration . The order number
-		// is the only thing shown and the order number is unique to the person who paid and is no good to anyone else.
-		// Showing the order number poses no risk at all - the information is useless to anyone outside of IPS.
-		
-		if ( $ibforums->input['ipscheck'] )
-		{
-			if ( $ibforums->input['ipscheck'] == 'copy' )
-			{
-				flush();
-				print preg_replace( "/^(\d+?)-(\d+?)-(\d+?)-(\d+?)$/", "\\2", $ibforums->vars['ipb_copy_number'] );
-				exit();
-			}
-			else if ( $ibforums->input['ipscheck'] == 'reg' )
-			{
-				flush();
-				print preg_replace( "/^(\d+?)-(\d+?)-(\d+?)-(\d+?)-(\d+?)$/", "\\2", $ibforums->vars['ipb_reg_number'] );
-				exit();
-			}
-        }	
-        
-        $TAGS = $DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set={$ibforums->skin['macro_id']}");
-        
-        $ex_time     = sprintf( "%.4f",$Debug->endTimer() );
-        
-        $query_cnt   = $DB->get_query_cnt();
-        
-        if ($DB->obj['debug'])
-        {
-        	flush();
-        	print "<html><head><title>mySQL Debugger</title><body bgcolor='white'><style type='text/css'> TABLE, TD, TR, BODY { font-family: verdana,arial, sans-serif;color:black;font-size:11px }</style>";
-        	print $ibforums->debug_html;
-        	print "</body></html>";
-        	exit();
-        }
-        
-        $input   = "";
-        $queries = "";
-        $sload   = "";
-        
-        $gzip_status = $ibforums->vars['disable_gzip'] == 1 ? $ibforums->lang['gzip_off'] : $ibforums->lang['gzip_on'];
-        
-        if ($ibforums->server_load > 0)
-        {
-        	$sload = '&nbsp; [ Server Load: '.$ibforums->server_load.' ]';
-        }
-        
-        //+----------------------------------------------
-        
-        if ($ibforums->vars['debug_level'] > 0)
-        {
-        
-			$stats = "<br clear='all' />\n<br />\n<div align='center'>[ Script Execution time: $ex_time ] &nbsp; [ $query_cnt queries used ] &nbsp; [ $gzip_status ] $sload</div>\n<br />";
-        }
-        
-        		  
-       //+----------------------------------------------
-        		  
-       if ($ibforums->vars['debug_level'] >= 2)
-       {
-       		$stats .= "<br />\n<div class='tableborder'>\n<div class='pformstrip'>FORM and GET Input</div><div class='row1' style='padding:6px'>\n";
-        
-			while( list($k, $v) = each($ibforums->input) )
-			{
-				$stats .= "<strong>$k</strong> = $v<br />\n";
-			}
-			
-			$stats .= "</div>\n</div>";
-        
-        }
-        
-        //+----------------------------------------------
-        
-        if ($ibforums->vars['debug_level'] >= 3)
-        {
-           	$stats .= "<br />\n<div class='tableborder'>\n<div class='pformstrip'>Queries Used</div><div class='row1' style='padding:6px'>";
-       					
-        	foreach($DB->obj['cached_queries'] as $q)
-        	{
-        		$q = htmlspecialchars($q);
-        		$q = preg_replace( "/^SELECT/i" , "<span class='red'>SELECT</span>"   , $q );
-        		$q = preg_replace( "/^UPDATE/i" , "<span class='blue'>UPDATE</span>"  , $q );
-        		$q = preg_replace( "/^DELETE/i" , "<span class='orange'>DELETE</span>", $q );
-        		$q = preg_replace( "/^INSERT/i" , "<span class='green'>INSERT</span>" , $q );
-        		$q = str_replace( "LEFT JOIN"   , "<span class='red'>LEFT JOIN</span>" , $q );
-        		
-        		$q = preg_replace( "/(".$ibforums->vars['sql_tbl_prefix'].")(\S+?)([\s\.,]|$)/", "<span class='purple'>\\1\\2</span>\\3", $q );
-        		
-        		$stats .= "$q<hr />\n";
-        	}
-        	
-        	$stats .= "</div>\n</div>";
-        }
-
-        
-        /********************************************************/
-        // NAVIGATION
-        
-        $nav  = $skin_universal->start_nav();
-        
-        $nav .= "<a href='{$ibforums->base_url}act=idx'>{$ibforums->vars['board_name']}</a>";
-        
-        if ( empty($output_array['OVERRIDE']) )
-        {
-			if (is_array( $output_array['NAV'] ) )
-			{
-				foreach ($output_array['NAV'] as $n)
-				{
-					if ($n)
-					{
-						$nav .= "<{F_NAV_SEP}>" . $n;
-					}
-				}
-			}
-        }
-        
-        $nav .= $skin_universal->end_nav();
-     
-        //---------------------------------------------------------
-        // CSS
-        //---------------------------------------------------------
-        
-        if ( $ibforums->skin['css_method'] == 'external' )
-        {
-        	$css = $skin_universal->css_external($ibforums->skin['css_id'], $ibforums->skin['img_dir']);
-        }
-        else
-        {
-        	$css = $skin_universal->css_inline(  str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $ibforums->skin['css_text'] ) );
-        }
-        
-        //---------------------------------------------------------
-        
-        $extra = "";
-        $ur    = '(U)';
-        
-        if ( $ibforums->vars['ipb_reg_number'] )
-        {
-        	$ur = '(R)';
-        	
-        	if ( $ibforums->vars['ipb_reg_show'] and $ibforums->vars['ipb_reg_name'] )
-        	{
-        		$extra = "<div align='center' class='copyright'>Registered to: ". $ibforums->vars['ipb_reg_name']."</div>";
-        	}
-        }
-		
-		// Yes, I realise that this is silly and easy to remove the copyright, but
-		// as it's not concealed source, there's no point having a 1337 fancy hashing
-		// algorithm if all you have to do is delete a few lines, so..
-		// However, be warned: If you remove the copyright and you have not purchased
-		// copyright removal, you WILL be spotted and your licence to use Invision Power Board
-		// will be terminated, requiring you to remove your board immediately.
-		// So, have a nice day.
-		
-        $copyright = "<!-- Copyright Information -->\n\n<div align='center' class='copyright'>Powered by <a href=\"http://www.invisionboard.com\" target='_blank'>Invision Power Board</a>{$ur} {$ibforums->version} &copy; 2003 &nbsp;<a href='http://www.invisionpower.com' target='_blank'>IPS, Inc.</a></div>";
-        
-        if ($ibforums->vars['ips_cp_purchase'])
-        {
-        	$copyright = "";
-        }
-        
-        $copyright .= $extra;
-        
-        // Awww, cmon, don't be mean! Literally thousands of hours have gone into
-        // coding Invision Power Board and all we ask in return is one measly little line
-        // at the bottom. That's fair isn't it?
-        // No? Hmmm...
-        // Have you seen how much it costs to remove the copyright from UBB? o_O
-                       
-        /********************************************************/
-        // Build the board header
-        
-        $this_header  = $skin_universal->BoardHeader();
-        
-        // Show rules link?
-        
-        if ($ibforums->vars['gl_show'] and $ibforums->vars['gl_title'])
-        {
-        	if ($ibforums->vars['gl_link'] == "")
-        	{
-        		$ibforums->vars['gl_link'] = $ibforums->base_url."act=boardrules";
-        	}
-        	
-        	$this_header = str_replace( "<!--IBF.RULES-->", $skin_universal->rules_link($ibforums->vars['gl_link'], $ibforums->vars['gl_title']), $this_header );
-        }
-        
-        //---------------------------------------
-        // Build the members bar
-		//---------------------------------------
-		
-        if ($ibforums->member['id'] == 0)
-        {
-        	$output_array['MEMBER_BAR'] = $skin_universal->Guest_bar();
-        }
-        else
-        {
-			$pm_js = "";
-			
-			if ( ($ibforums->member['g_max_messages'] > 0) and ($ibforums->member['msg_total'] >= $ibforums->member['g_max_messages']) )
-			{
-				$msg_data['TEXT'] = $ibforums->lang['msg_full'];
-			}
-			else
-			{
-				$ibforums->member['new_msg'] = $ibforums->member['new_msg'] == "" ? 0 : $ibforums->member['new_msg'];
-			
-				$msg_data['TEXT'] = sprintf( $ibforums->lang['msg_new'], $ibforums->member['new_msg']);
-			}
-			
-			//---------------------------------------
-			// Do we have a pop up to show?
-			//---------------------------------------
-			
-			if ($ibforums->member['show_popup'])
-			{
-				$DB->query("UPDATE ibf_members SET show_popup=0 WHERE id={$ibforums->member['id']}");
-				
-				if ( $ibforums->input['act'] != 'Msg' )
-				{
-					$pm_js = $skin_universal->PM_popup();
-				}
-			}
-			
-			if ( ($ibforums->member['is_mod']) or ($ibforums->member['g_is_supmod'] == 1) )
-			{
-				$mod_link = $skin_universal->mod_link();
-			}
-	
-			$admin_link = $ibforums->member['g_access_cp'] ? $skin_universal->admin_link() : '';
-			$valid_link = $ibforums->member['mgroup'] == $ibforums->vars['auth_group'] ? $skin_universal->validating_link() : '';
-			
-			if ( ! $ibforums->member['g_use_pm'])
-        	{
-        		$output_array['MEMBER_BAR'] = $skin_universal->Member_no_usepm_bar($admin_link, $mod_link, $valid_link);
-        	}
-        	else
-			{
-				$output_array['MEMBER_BAR'] = $pm_js . $skin_universal->Member_bar($msg_data, $admin_link, $mod_link, $valid_link);
-			}
- 			
- 		}
- 		
- 		if ($ibforums->vars['board_offline'] == 1)
- 		{
- 			$output_array['TITLE'] = $ibforums->lang['warn_offline']." ".$output_array['TITLE'];
- 		}
-        
-        //---------------------------------------
-        // Get the template
-        //---------------------------------------
-        
-        $ibforums->skin['template'] = str_replace( "<% CSS %>"            , $css                     , $ibforums->skin['template']);
-		$ibforums->skin['template'] = str_replace( "<% JAVASCRIPT %>"     , ""                       , $ibforums->skin['template']);
-        $ibforums->skin['template'] = str_replace( "<% TITLE %>"          , $output_array['TITLE']   , $ibforums->skin['template']);
-        $ibforums->skin['template'] = str_replace( "<% BOARD %>"          , $this->to_print          , $ibforums->skin['template']);
-        $ibforums->skin['template'] = str_replace( "<% STATS %>"          , $stats                   , $ibforums->skin['template']);
-        $ibforums->skin['template'] = str_replace( "<% GENERATOR %>"      , ""                       , $ibforums->skin['template']);
-		$ibforums->skin['template'] = str_replace( "<% COPYRIGHT %>"      , $copyright               , $ibforums->skin['template']);
-		$ibforums->skin['template'] = str_replace( "<% BOARD HEADER %>"   , $this_header             , $ibforums->skin['template']);
-		$ibforums->skin['template'] = str_replace( "<% NAVIGATION %>"     , $nav                     , $ibforums->skin['template']);
-		
-		if ( empty($output_array['OVERRIDE']) )
-		{
-      	    $ibforums->skin['template'] = str_replace( "<% MEMBER BAR %>"     , $output_array['MEMBER_BAR'], $ibforums->skin['template']);
-        }
-        else
-        {
-      	    $ibforums->skin['template'] = str_replace( "<% MEMBER BAR %>"     , $skin_universal->member_bar_disabled(), $ibforums->skin['template']);
-      	}
-      	
-      	
-		//+--------------------------------------------
-		// Stick in chat link? top_site_list_integrate
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['chat_account_no'])
-		{
-			$ibforums->vars['chat_height'] += $ibforums->vars['chat_poppad'] ? $ibforums->vars['chat_poppad'] : 50;
-			$ibforums->vars['chat_width']  += $ibforums->vars['chat_poppad'] ? $ibforums->vars['chat_poppad'] : 50;
-			
-			$chat_link = ( $ibforums->vars['chat_display'] == 'self' )
-					   ? $skin_universal->show_chat_link_inline()
-					   : $skin_universal->show_chat_link_popup();
-			
-			$ibforums->skin['template'] = str_replace( "<!--IBF.CHATLINK-->", $chat_link, $ibforums->skin['template'] );
-		}
-		
-		//+--------------------------------------------
-		// Stick in TSL link? 
-		//+--------------------------------------------
-		
-		if ($ibforums->vars['top_site_list_integrate'])
-		{
-			$ibforums->skin['template'] = str_replace( "<!--IBF.TSLLINK-->", $skin_universal->show_tsl_link_inline(), $ibforums->skin['template'] );
-		}
-      	
-      	//+--------------------------------------------
-      	//| Get the macros and replace them
-      	//+--------------------------------------------
-      	
-      	while ( $row = $DB->fetch_row($TAGS) )
-      	{
-			if ($row['macro_value'] != "")
-			{
-				$ibforums->skin['template'] = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $ibforums->skin['template'] );
-			}
-		}
-		
-		$ibforums->skin['template'] = str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $ibforums->skin['template'] );
-		
-		/*$ibforums->skin['template'] = preg_replace( "#img\s+?src=[\"'](?!http://)(.+?)[\"'](.+?)?>#is", "img src=\"http://domain.com/\\1\"\\2>", $ibforums->skin['template'] );*/
-		
-		//---------------------------------------
-		// Close this DB connection
-		//---------------------------------------
-		
-		$DB->close_db();
-		
-		//---------------------------------------
-		// Start GZIP compression
-        //---------------------------------------
-        
-        if ($ibforums->vars['disable_gzip'] != 1)
-        {
-        	$buffer = ob_get_contents();
-        	ob_end_clean();
-        	ob_start('ob_gzhandler');
-        	print $buffer;
-        }
-        
-        $this->do_headers();
-		
-        print $ibforums->skin['template'];
-        
-        exit;
-    }
-    
-    //-------------------------------------------
-    // print the headers
-    //-------------------------------------------
-        
-    function do_headers() {
-    	global $ibforums;
-    	
-    	if ($ibforums->vars['print_headers'])
-    	{
-			@header("HTTP/1.0 200 OK");
-			@header("HTTP/1.1 200 OK");
-			@header("Content-type: text/html");
-			
-			if ($ibforums->vars['nocache'])
-			{
-				@header("Cache-Control: no-cache, must-revalidate, max-age=0");
-				@header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-				@header("Pragma: no-cache");
-			}
-        }
-    }
-    
-    //-------------------------------------------
-    // print a pure redirect screen
-    //-------------------------------------------
-    
-    
-    function redirect_screen($text="", $url="", $override=0)
-    {
-    	global $ibforums, $skin_universal, $DB;
-    	
-    	if ($ibforums->input['debug'])
-        {
-        	flush();
-        	exit();
-        }
-        
-        if ( $override != 1 )
-        {
-			if ( $ibforums->base_url )
-			{
-				$url = $ibforums->base_url.$url;
-			}
-			else
-			{
-				$url = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?".$url;
-			}
-    	}
-    	
-    	$ibforums->lang['stand_by'] = stripslashes($ibforums->lang['stand_by']);
-    	
-    	//---------------------------------------------------------
-        // CSS
-        //---------------------------------------------------------
-        
-        if ( $ibforums->skin['css_method'] == 'external' )
-        {
-        	$css = $skin_universal->css_external($ibforums->skin['css_id'], $ibforums->skin['img_dir']);
-        }
-        else
-        {
-        	$css = $skin_universal->css_inline( str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $ibforums->skin['css_text'] ) );
-        }
-          	
-    	$htm = $skin_universal->Redirect($text, $url, $css);
-    	
-    	$TAGS = $DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set='{$ibforums->skin['macro_id']}'");
-    	
-    	while ( $row = $DB->fetch_row($TAGS) )
-      	{
-			if ($row['macro_value'] != "")
-			{
-				$htm = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $htm );
-			}
-		}
-		
-		$htm = str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $htm );
-    	
-    	// Close this DB connection
-		
-		$DB->close_db();
-		
-		// Start GZIP compression
-        
-        if ($ibforums->vars['disable_gzip'] != 1)
-        {
-        	$buffer = ob_get_contents();
-        	ob_end_clean();
-        	ob_start('ob_gzhandler');
-        	print $buffer;
-        }
-        
-        $this->do_headers();
-        
-    	echo ($htm);
-    	exit;
-    }
-    
-    //-------------------------------------------
-    // print a minimalist screen suitable for small
-    // pop up windows
-    //-------------------------------------------
-    
-    function pop_up_window($title = 'Invision Power Board', $text = "" )
-    {
-    	global $ibforums, $skin_universal, $DB;
-    	
-    	//---------------------------------------------------------
-        // CSS
-        //---------------------------------------------------------
-        
-        if ( $ibforums->skin['css_method'] == 'external' )
-        {
-        	$css = $skin_universal->css_external($ibforums->skin['css_id'], $ibforums->skin['img_dir']);
-        }
-        else
-        {
-        	$css = $skin_universal->css_inline( str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $ibforums->skin['css_text'] ) );
-        }
-		
-    	$html = $skin_universal->pop_up_window($title, $css, $text);
-    	        
-    	$TAGS = $DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set='{$ibforums->skin['macro_id']}'");
-    	
-    	while ( $row = $DB->fetch_row($TAGS) )
-      	{
-			if ($row['macro_value'] != "")
-			{
-				$html = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $html );
-			}
-		}
-		
-		$html = str_replace( "<#IMG_DIR#>", $ibforums->skin['img_dir'], $html );
-    	
-    	$DB->close_db();
-    	  
-    	if ($ibforums->vars['disable_gzip'] != 1)
-        {
-        	$buffer = ob_get_contents();
-        	ob_end_clean();
-        	ob_start('ob_gzhandler');
-        	print $buffer;
-        }
-        
-        $this->do_headers();
-        
-    	echo ($html);
-    	exit;
-    } 
-    
-    
-    
-} // END class
-    
-
-
-
-//######################################################
-// Our "session" class
-//######################################################
-
-
-class session {
-
-    var $ip_address = 0;
-    var $user_agent = "";
-    var $time_now   = 0;
-    var $session_id = 0;
-    var $session_dead_id = 0;
-    var $session_user_id = 0;
-    var $session_user_pass = "";
-    var $last_click        = 0;
-    var $location          = "";
-    var $member            = array();
-
-    // No need for a constructor
-    
-    function authorise()
-    {
-        global $DB, $INFO, $ibforums, $std, $HTTP_SERVER_VARS;
-        
-        //-------------------------------------------------
-        // Before we go any lets check the load settings..
-        //-------------------------------------------------
-        
-        if ($ibforums->vars['load_limit'] > 0)
-        {
-        	if ( file_exists('/proc/loadavg') )
-        	{
-        		if ( $fh = @fopen( '/proc/loadavg', 'r' ) )
-        		{
-        			$data = @fread( $fh, 6 );
-        			@fclose( $fh );
-        			
-        			$load_avg = explode( " ", $data );
-        			
-        			$ibforums->server_load = trim($load_avg[0]);
-        			
-        			if ($ibforums->server_load > $ibforums->vars['load_limit'])
-        			{
-        				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'server_too_busy', 'INIT' => 1 ) );
-        			}
-        		}
-        	}
-        	else
-        	{
-				if ( $serverstats = @exec("uptime") )
-				{
-					preg_match( "/averages?: ([0-9\.]+),[\s]+([0-9\.]+),[\s]+([0-9\.]+)/", $serverstats, $load );
-					
-					$ibforums->server_load = $load[1];
-				}
-			}
-        }
-       
-        //--------------------------------------------
-		// Are they banned?
-		//--------------------------------------------
-		
-		if ($ibforums->vars['ban_ip'])
-		{
-			$ips = explode( "|", $ibforums->vars['ban_ip'] );
-			
-			foreach ($ips as $ip)
-			{
-				$ip = preg_replace( "/\*/", '.*' , preg_quote($ip, "/") );
-				
-				if ( preg_match( "/^$ip/", $ibforums->input['IP_ADDRESS'] ) )
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'you_are_banned', 'INIT' => 1 ) );
-				}
-			}
-		}
-        
-        //--------------------------------------------
-        
-        $this->member = array( 'id' => 0, 'password' => "", 'name' => "", 'mgroup' => $INFO['guest_group'] );
-        
-        //--------------------------------------------
-        // no new headers if we're simply viewing an attachment..
-        //--------------------------------------------
-        
-        if ( $ibforums->input['act'] == 'Attach' )
-        {
-        	return $this->member;
-        }
-        
-        $HTTP_SERVER_VARS['HTTP_USER_AGENT'] = $std->clean_value($HTTP_SERVER_VARS['HTTP_USER_AGENT']);
-        
-        $this->ip_address = $ibforums->input['IP_ADDRESS'];
-        $this->user_agent = substr($HTTP_SERVER_VARS['HTTP_USER_AGENT'],0,50);
-        $this->time_now   = time();
-        
-        //-------------------------------------------------
-        // Manage bots? (tee-hee)
-        //-------------------------------------------------
-        
-        if ( $ibforums->vars['spider_sense'] == 1 )
-        {
-        
-        	$remap_agents = array(
-        						   'googlebot'     => 'google',
-        						   'slurp@inktomi' => 'inktomi',
-        						   'ask jeeves'    => 'jeeves',
-        						   'lycos'         => 'lycos',
-        						   'whatuseek'     => 'wuseek',
-        						   'ia_archiver'   => 'Archive_org',
-        						 );
-        						
-        	if ( preg_match( '/(googlebot|slurp@inktomi|ask jeeves|lycos|whatuseek|ia_archiver)/i', $HTTP_SERVER_VARS['HTTP_USER_AGENT'], $match ) )
-        	{
-        		
-        		$DB->query("SELECT * from ibf_groups WHERE g_id=".$ibforums->vars['spider_group']);
-        		
-        		$group = $DB->fetch_row();
-        
-				foreach ($group as $k => $v)
-				{
-					$this->member[ $k ] = $v;
-				}
-				
-				$this->member['restrict_post']    = 1;
-				$this->member['g_use_search']     = 0;
-				$this->member['g_email_friend']   = 0;
-				$this->member['g_edit_profile']   = 0;
-				$this->member['g_use_pm']         = 0;
-				$this->member['g_is_supmod']      = 0;
-				$this->member['g_access_cp']      = 0;
-				$this->member['g_access_offline'] = 0;
-				$this->member['g_avoid_flood']    = 0;
-				$this->member['id']               = 0;
-				
-				$ibforums->perm_id       = $this->member['g_perm_id'];
-       			$ibforums->perm_id_array = explode( ",", $ibforums->perm_id );
-       			$ibforums->session_type  = 'cookie';
-       			$ibforums->is_bot        = 1;
-       			$this->session_id        = "";
-       			
-       			if ( ! $agent = $remap_agents[ $match[1] ] )
-				{
-					$agent = 'google';
-				}	
-       			
-       			if ( $ibforums->vars['spider_visit'] )
-       			{
-       				$dba = $DB->compile_db_insert_string( array (
-       																'bot'          => $agent,
-       																'query_string' => str_replace( "'", "", $HTTP_SERVER_VARS['QUERY_STRING']),
-       																'ip_address'   => $_SERVER['REMOTE_ADDR'],
-       																'entry_date'   => time(),
-       													)        );
-       													
-       				$DB->query("INSERT INTO ibf_spider_logs ({$dba['FIELD_NAMES']}) VALUES({$dba['FIELD_VALUES']})");
-       			}
-       			
-       			if ( $ibforums->vars['spider_active'] )
-       			{
-       				$DB->query("DELETE FROM ibf_sessions WHERE id='".$agent."_session'");
-       				
-       				$this->create_bot_session($agent);
-       			}
-       			
-       			return $this->member;
-        	}
-        }
-        
-        //-------------------------------------------------
-        // Continue!
-        //-------------------------------------------------
-        
-        $cookie = array();
-        $cookie['session_id']   = $std->my_getcookie('session_id');
-        $cookie['member_id']    = $std->my_getcookie('member_id');
-        $cookie['pass_hash']    = $std->my_getcookie('pass_hash');
-        
-       
-        if ( $cookie['session_id'] )
-        {
-        	$this->get_session($cookie['session_id']);
-        	$ibforums->session_type = 'cookie';
-        }
-        elseif ( $ibforums->input['s'] )
-        {
-        	$this->get_session($ibforums->input['s']);
-        	$ibforums->session_type = 'url';
-        }
-        else
-        {
-        	$this->session_id = 0;
-        }
-        
-        //-------------------------------------------------
-        // Finalise the incoming data..
-        //-------------------------------------------------
-        
-        $ibforums->input['Privacy'] = $std->select_var( array( 
-															   1 => $ibforums->input['Privacy'],
-															   2 => $std->my_getcookie('anonlogin')
-												      )      );
-												      
-		//-------------------------------------------------								  
-		// Do we have a valid session ID?
-		//-------------------------------------------------
-		
-		if ( $this->session_id )
-		{
-			// We've checked the IP addy and browser, so we can assume that this is
-			// a valid session.
-			
-			if ( ($this->session_user_id != 0) and ( ! empty($this->session_user_id) ) )
-			{
-				// It's a member session, so load the member.
-				
-				$this->load_member($this->session_user_id);
-				
-				// Did we get a member?
-				
-				if ( (! $this->member['id']) or ($this->member['id'] == 0) )
-				{
-					$this->unload_member();
-					$this->update_guest_session();
-				}
-				else
-				{
-					$this->update_member_session();
-				}
-			}
-			else
-			{
-				$this->update_guest_session();
-			}
-		
-		}
-		else
-		{
-			// We didn't have a session, or the session didn't validate
-			
-			// Do we have cookies stored?
-			
-			if ($cookie['member_id'] != "" and $cookie['pass_hash'] != "")
-			{
-				$this->load_member($cookie['member_id']);
-				
-				if ( (! $this->member['id']) or ($this->member['id'] == 0) )
-				{
-					$this->unload_member();
-					$this->create_guest_session();
-				}
-				else
-				{
-					if ($this->member['password'] == $cookie['pass_hash'])
-					{
-						$this->create_member_session();
-					}
-					else
-					{
-						$this->unload_member();
-						$this->create_guest_session();
-					}
-				}
-			}
-			else
-			{
-				$this->create_guest_session();
-			}
-		}
-		
-        //-------------------------------------------------
-        // Set up a guest if we get here and we don't have a member ID
-        //-------------------------------------------------
-        
-        if (! $this->member['id'])
-        {
-        	$this->member = $std->set_up_guest();
-        	$DB->query("SELECT * from ibf_groups WHERE g_id='".$INFO['guest_group']."'");
-        	$group = $DB->fetch_row();
-        
-			foreach ($group as $k => $v)
-			{
-				$this->member[ $k ] = $v;
-			}
-		
-		}
-		
-        //------------------------------------------------
-        // Synchronise the last visit and activity times if
-        // we have some in the member profile
-        //-------------------------------------------------
-        
-        if ($this->member['id'])
-        {
-        	if ( ! $ibforums->input['last_activity'] )
-        	{
-				if ($this->member['last_activity'])
-				{
-					$ibforums->input['last_activity'] = $this->member['last_activity'];
-				}
-				else
-				{
-					$ibforums->input['last_activity'] = $this->time_now;
-				}
-        	}
-        	//------------
-        	
-        	if ( ! $ibforums->input['last_visit'] )
-        	{
-				if ($this->member['last_visit'])
-				{
-					$ibforums->input['last_visit'] = $this->member['last_visit'];
-				}
-				else
-				{
-					$ibforums->input['last_visit'] = $this->time_now;
-				}
-        	}
-        
-			//-------------------------------------------------
-			// If there hasn't been a cookie update in 2 hours,
-			// we assume that they've gone and come back
-			//-------------------------------------------------
-			
-			if (!$this->member['last_visit'])
-			{
-				// No last visit set, do so now!
-				
-				$DB->query("UPDATE ibf_members SET last_visit='".$this->time_now."', last_activity='".$this->time_now."' WHERE id=".$this->member['id']);
-				
-			}
-			else if ( (time() - $ibforums->input['last_activity']) > 300 )
-			{
-				// If the last click was longer than 5 mins ago and this is a member
-				// Update their profile.
-				
-				$DB->query("UPDATE ibf_members SET last_activity='".$this->time_now."' WHERE id=".$this->member['id']);
-				
-			}
-			
-			//-------------------------------------------------
-			// Check ban status
-			//-------------------------------------------------
-			
-			if ( $this->member['temp_ban'] )
-			{
-				$ban_arr = $std->hdl_ban_line(  $this->member['temp_ban'] );
-				
-				if ( time() >= $ban_arr['date_end'] )
-				{
-					// Update this member's profile
-					
-					$DB->query("UPDATE ibf_members SET temp_ban='' WHERE id=".intval($this->member['id']) );
-				}
-				else
-				{
-					$ibforums->member = $this->member; // Set time right
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'account_susp', 'INIT' => 1, 'EXTRA' => $std->get_date($ban_arr['date_end'],'LONG') ) );
-				}
-			}
-			
-		}
-		
-		//-------------------------------------------------
-        // Set a session ID cookie
-        //-------------------------------------------------
-        
-        $std->my_setcookie("session_id", $this->session_id, -1);
-        
-        $ibforums->perm_id = ( $this->member['org_perm_id'] ) ? $this->member['org_perm_id'] : $this->member['g_perm_id'];
-        
-        $ibforums->perm_id_array = explode( ",", $ibforums->perm_id );
-        
-        return $this->member;
-        
-    }
-    
-    //+-------------------------------------------------
-	// Attempt to load a member
-	//+-------------------------------------------------
-	
-    function load_member($member_id=0)
-    {
-    	global $DB, $std, $ibforums;
-    	
-    	$member_id = intval($member_id);
-    	
-     	if ($member_id != 0)
-        {
-            				  
-            $DB->query("SELECT moderator.mid as is_mod, moderator.allow_warn, m.id, m.name, m.mgroup, m.password, m.email, m.restrict_post, m.view_sigs, m.view_avs, m.view_pop, m.view_img, m.auto_track,
-                              m.mod_posts, m.language, m.skin, m.new_msg, m.show_popup, m.msg_total, m.time_offset, m.posts, m.joined, m.last_post,
-            				  m.last_visit, m.last_activity, m.dst_in_use, m.view_prefs, m.org_perm_id, m.temp_ban, m.sub_end, g.*
-            				  FROM ibf_members m
-            				    LEFT JOIN ibf_groups g ON (g.g_id=m.mgroup)
-            				    LEFT JOIN ibf_moderators moderator ON (moderator.member_id=m.id OR moderator.group_id=m.mgroup )
-            				  WHERE m.id=$member_id");
-            
-            if ( $DB->get_num_rows() )
-            {
-            	$this->member = $DB->fetch_row();
-            }
-            
-            //-------------------------------------------------
-            // Unless they have a member id, log 'em in as a guest
-            //-------------------------------------------------
-            
-            if ( ($this->member['id'] == 0) or (empty($this->member['id'])) )
-            {
-				$this->unload_member();
-            }
-		}
-		
-		unset($member_id);
-	}
-	
-	//+-------------------------------------------------
-	// Remove the users cookies
-	//+-------------------------------------------------
-	
-	function unload_member()
-	{
-		global $DB, $std, $ibforums;
-		
-		// Boink the cookies
-		
-		$std->my_setcookie( "member_id" , "0", -1  );
-		$std->my_setcookie( "pass_hash" , "0", -1  );
-		
-		$this->member['id']       = 0;
-		$this->member['name']     = "";
-		$this->member['password'] = "";
-		
-	}
-    
-    //-------------------------------------------
-    // Updates a current session.
-    //-------------------------------------------
-    
-    function update_member_session() {
-        global $DB, $ibforums;
-        
-        // Make sure we have a session id.
-        
-        if ( ! $this->session_id )
-        {
-        	$this->create_member_session();
-        	return;
-        }
-        
-        if (empty($this->member['id']))
-        {
-        	$this->unload_member();
-        	$this->create_guest_session();
-        	return;
-        }
-        
-        				
-        $db_str = $DB->compile_db_update_string(
-        										 array(
-        										 		'member_name'  => $this->member['name'],
-														'member_id'    => intval($this->member['id']),
-														'member_group' => $this->member['mgroup'],
-														'in_forum'     => intval($ibforums->input['f']),
-														'in_topic'     => intval($ibforums->input['t']),
-														'login_type'   => $ibforums->input['Privacy'],
-														'running_time' => $this->time_now,
-														'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE']
-													  )
-											  );
-											  
-        $DB->query("UPDATE ibf_sessions SET $db_str WHERE id='{$this->session_id}'");
-        
-    }        
-    
-    //--------------------------------------------------------------------
-    
-    function update_guest_session()
-    {
-        global $DB, $ibforums, $INFO;
-        
-        // Make sure we have a session id.
-        
-        if ( ! $this->session_id )
-        {
-        	$this->create_guest_session();
-        	return;
-        }
-        
-        $query  = "UPDATE ibf_sessions SET member_name='',member_id='0',member_group='".$INFO['guest_group']."'";
-        $query .= ",login_type='0', running_time='".$this->time_now."', in_forum='".$ibforums->input['f']."', in_topic='".$ibforums->input['t']."', location='".$ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE']."' ";
-        $query .= "WHERE id='".$this->session_id."'";
-        
-        // Update the database
-        
-        $DB->query($query);
-    } 
-                    
-    
-    //-------------------------------------------
-    // Get a session based on the current session ID
-    //-------------------------------------------
-    
-    function get_session($session_id="")
-    {
-        global $DB, $INFO, $std;
-        
-        $result = array();
-        
-        $query = "";
-        
-        $session_id = preg_replace("/([^a-zA-Z0-9])/", "", $session_id);
-        
-        if ( $session_id )
-        {
-        
-			if ($INFO['match_browser'] == 1)
-			{
-				$query = " AND browser='".$this->user_agent."'";
-			}
-				
-			$DB->query("SELECT id, member_id, running_time, location FROM ibf_sessions WHERE id='".$session_id."' and ip_address='".$this->ip_address."'".$query);
-			
-			if ( $DB->get_num_rows() != 1 )
-			{
-				// Either there is no session, or we have more than one session..
-				
-				$this->session_dead_id   = $session_id;
-				$this->session_id        = 0;
-        		$this->session_user_id   = 0;
-        		return;
-			}
-			else
-			{
-				$result = $DB->fetch_row();
-				
-				if ($result['id'] == "")
-				{
-					$this->session_dead_id   = $session_id;
-					$this->session_id        = 0;
-					$this->session_user_id   = 0;
-					unset($result);
-					return;
-				}
-				else
-				{
-					$this->session_id        = $result['id'];
-					$this->session_user_id   = $result['member_id'];
-					$this->last_click        = $result['running_time'];
-        			$this->location          = $result['location'];
-        			unset($result);
-					return;
-				}
-			}
-		}
-    }
-    
-    //-------------------------------------------
-    // Creates a member session.
-    //-------------------------------------------
-    
-    function create_member_session()
-    {
-        global $DB, $INFO, $std, $ibforums;
-        
-        if ($this->member['id'])
-        {
-        	//---------------------------------
-        	// Remove the defunct sessions
-        	//---------------------------------
-        	
-			$INFO['session_expiration'] = $INFO['session_expiration'] ? (time() - $INFO['session_expiration']) : (time() - 3600);
-			
-			$DB->query( "DELETE FROM ibf_sessions WHERE running_time < {$INFO['session_expiration']} or member_id='".$this->member['id']."'");
-			
-			$this->session_id  = md5( uniqid(microtime()) );
-			
-			//---------------------------------
-        	// Insert the new session
-        	//---------------------------------
-        	
-			$DB->query("INSERT INTO ibf_sessions (id, member_name, member_id, ip_address, browser, running_time, location, login_type, member_group) ".
-					   "VALUES ('".$this->session_id."', '".$this->member['name']."', '".$this->member['id']."', '".$this->ip_address."', '".$this->user_agent."', '".$this->time_now."', ".
-					   "',,', '".$ibforums->input['Privacy']."', ".$this->member['mgroup'].")");
-					   
-			// If this is a member, update their last visit times, etc.
-			
-			if (time() - $this->member['last_activity'] > 300)
-			{
-				//---------------------------------
-				// Reset the topics read cookie..
-				//---------------------------------
-				
-				$std->my_setcookie('topicsread', '');
-				
-				$DB->query("UPDATE ibf_members SET last_visit=last_activity, last_activity='".$this->time_now."' WHERE id='".$this->member['id']."'");
-				
-				//---------------------------------
-				// Fix up the last visit/activity times.
-				//---------------------------------
-				
-				$ibforums->input['last_visit']    = $this->member['last_activity'];
-				$ibforums->input['last_activity'] = $this->time_now;
-			}
-		}
-		else
-		{
-			$this->create_guest_session();
-		}
-    }
-    
-    //--------------------------------------------------------------------
-    
-    function create_guest_session() {
-        global $DB, $INFO, $std, $ibforums;
-        
-		//---------------------------------
-		// Remove the defunct sessions
-		//---------------------------------
-		
-		if ( ($this->session_dead_id != 0) and ( ! empty($this->session_dead_id) ) )
-		{
-			$extra = " or id='".$this->session_dead_id."'";
-		}
-		else
-		{
-			$extra = "";
-		}
-		
-		$INFO['session_expiration'] = $INFO['session_expiration'] ? (time() - $INFO['session_expiration']) : (time() - 3600);
-		
-		$DB->query( "DELETE FROM ibf_sessions WHERE running_time < {$INFO['session_expiration']} or ip_address='".$this->ip_address."'".$extra);
-		
-		$this->session_id  = md5( uniqid(microtime()) );
-		
-		//---------------------------------
-		// Insert the new session
-		//---------------------------------
-		
-		$DB->query("INSERT INTO ibf_sessions (id, member_name, member_id, ip_address, browser, running_time, location, login_type, member_group) ".
-				   "VALUES ('".$this->session_id."', '', '0', '".$this->ip_address."', '".$this->user_agent."', '".$this->time_now."', ".
-				   "',,', '0', ".$INFO['guest_group'].")");
-					   
-    }
-    
-    //-------------------------------------------
-    // Creates a BOT session
-    //-------------------------------------------
-    
-    function create_bot_session($bot)
-    {
-        global $DB, $INFO, $std, $ibforums;
-        
-        $db_str = $DB->compile_db_insert_string(
-        										 array(
-        										 		'id'           => $bot.'_session',
-        										 		'member_name'  => $ibforums->vars['sp_'.$bot],
-														'member_id'    => 0,
-														'member_group' => $ibforums->vars['spider_group'],
-														'in_forum'     => intval($ibforums->input['f']),
-														'in_topic'     => intval($ibforums->input['t']),
-														'login_type'   => $ibforums->vars['spider_anon'],
-														'running_time' => $this->time_now,
-														'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE'],
-														'ip_address'   => $this->ip_address,
-														'browser'      => $this->user_agent,
-													  )
-											  );
-											  
-		$DB->query("INSERT INTO ibf_sessions ({$db_str['FIELD_NAMES']}) VALUES({$db_str['FIELD_VALUES']})");
-					   
-    }
-    
-    //-------------------------------------------
-    // Updates a BOT current session.
-    //-------------------------------------------
-    
-    function update_bot_session($bot)
-    {
-        global $DB, $ibforums, $INFO;
-        
-        $db_str = $DB->compile_db_update_string(
-        										 array(
-        										 		'member_name'  => $ibforums->vars['sp_'.$bot],
-														'member_id'    => 0,
-														'member_group' => $ibforums->vars['spider_group'],
-														'in_forum'     => intval($ibforums->input['f']),
-														'in_topic'     => intval($ibforums->input['t']),
-														'login_type'   => $ibforums->vars['spider_anon'],
-														'running_time' => $this->time_now,
-														'location'     => $ibforums->input['act'].",".$ibforums->input['p'].",".$ibforums->input['CODE']
-													  )
-											  );
-											  
-        $DB->query("UPDATE ibf_sessions SET $db_str WHERE id='".$bot."_session'");
-        
-    }        
-    
-        
-}
-
-
-
-
 ?>
\ No newline at end of file
diff --git a/upload/sources/Help.php b/upload/sources/help.php
similarity index 52%
rename from upload/sources/Help.php
rename to upload/sources/help.php
index 8d7d1670..ea11c624 100644
--- a/upload/sources/Help.php
+++ b/upload/sources/help.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,44 +19,49 @@
 |   > Date started: 24th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new Help;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-class Help {
+class help {
 
     var $output     = "";
     var $page_title = "";
     var $nav        = array();
     var $html       = "";
 
-
-    
-    function Help() {
-    	global $ibforums, $DB, $std, $print;
+	/*-------------------------------------------------------------------------*/
+	// Auto run
+	/*-------------------------------------------------------------------------*/
+	
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
     	
-    	
-    	if ($ibforums->input['CODE'] == "") $ibforums->input['CODE'] = '00';
-    	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Require the HTML and language modules
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_help', $ibforums->lang_id );
     	
     	$this->html = $std->load_template('skin_help');
     	
-    	$this->base_url        = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?s={$ibforums->session_id}";
+    	$this->base_url  = $ibforums->base_url;
     	
-    	
-    	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// What to do?
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
-    	switch($ibforums->input['CODE']) {
+    	switch($ibforums->input['CODE'])
+    	{
     		case '01':
     			$this->show_section();
     			break;
@@ -69,29 +73,43 @@ class Help {
     			break;
     	}
     	
+    	//-----------------------------------------
     	// If we have any HTML to print, do so...
+    	//-----------------------------------------
     	
     	$print->add_output("$this->output");
         $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
  	}
  	
- 	function show_titles() {
- 		global $ibforums, $DB, $std;
+ 	/*-------------------------------------------------------------------------*/
+ 	// Show Titles
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function show_titles()
+ 	{
+		global $ibforums, $DB, $std;
  		
  		$seen = array();
  		
  		$this->output = $this->html->start( $ibforums->lang['page_title'], $ibforums->lang['help_txt'], $ibforums->lang['choose_file'] );
  		
- 		$DB->query("SELECT id, title, description from ibf_faq ORDER BY title ASC");
- 		
+ 		$DB->simple_construct( array( 'select' => 'id, title, description',
+ 									  'from'   => 'faq',
+ 									  'order'  => 'title ASC'
+ 							 )      );
+ 		$DB->simple_exec();
+ 								
  		$cnt = 0;
  		
- 		while ($row = $DB->fetch_row() ) {
+ 		while ($row = $DB->fetch_row() )
+ 		{
  		
- 			if (isset($seen[ $row['title'] ]) ) {
+ 			if (isset($seen[ $row['title'] ]) )
+ 			{
  				continue;
- 			} else {
+ 			}
+ 			else
+ 			{
  				$seen[ $row['title'] ] = 1;
  			}
  			
@@ -103,39 +121,55 @@ class Help {
  			
  		}
  		
- 		$this->output .= $this->html->end();
+ 		$this->output .= $this->html->help_end();
  		
  		$this->page_title = $ibforums->lang['page_title'];
  		$this->nav        = array( $ibforums->lang['page_title'] );
- 		
  	}
 	 
- 	function show_section() {
- 		global $ibforums, $DB, $std;
+	/*-------------------------------------------------------------------------*/
+	// Show section
+	/*-------------------------------------------------------------------------*/
+	 
+ 	function show_section()
+ 	{
+		global $ibforums, $DB, $std;
  		
  		$id = $ibforums->input['HID'];
  		
- 		if (! preg_match( "/^(\d+)$/" , $id ) ) {
- 			$std->Error( array( LEVEL => 1, MSG => 'no_help_file') );
+ 		if (! preg_match( "/^(\d+)$/" , $id ) )
+ 		{
+ 			$this->show_titles();
+ 			return;
  		}
  		
- 		$DB->query("SELECT id, title, text from ibf_faq WHERE ID='$id'");
+ 		$DB->simple_construct( array( 'select' => 'id, title, text',
+ 									  'from'   => 'faq',
+ 									  'where'  => "ID='$id'"
+ 							 )      );
+ 		$DB->simple_exec();
+ 		
  		$topic = $DB->fetch_row();
  		
  		$this->output  = $this->html->start( $ibforums->lang['help_topic'], $ibforums->lang['topic_text'], $topic['title'] );
  		$this->output .= $this->html->display( $std->text_tidy( $topic['text'] ) );
 
- 		$this->output .= $this->html->end();
+ 		$this->output .= $this->html->help_end();
  		
  		$this->page_title = $ibforums->lang['help_topic'];
  		$this->nav        = array( "<a href='{$this->base_url}&amp;act=Help'>{$ibforums->lang['help_topics']}</a>", $ibforums->lang['help_topic'] );
- 		
  	}	    
     
- 	function do_search() {
- 		global $ibforums, $DB, $std;
+    /*-------------------------------------------------------------------------*/
+    // Do search
+    /*-------------------------------------------------------------------------*/
+    
+ 	function do_search()
+ 	{
+		global $ibforums, $DB, $std;
  		
- 		if (empty( $ibforums->input['search_q'] ) ) {
+ 		if (empty( $ibforums->input['search_q'] ) )
+ 		{
  			$std->Error( array( LEVEL => 1, MSG => 'no_help_file') );
  		}
  		
@@ -146,15 +180,20 @@ class Help {
  		
  		$this->output = $this->html->start( $ibforums->lang['page_title'], $ibforums->lang['results_txt'], $ibforums->lang['search_results'] );
  		
- 		$DB->query("SELECT id, title, description from ibf_faq WHERE LOWER(title) LIKE '%$search_string%' or LOWER(text) LIKE '%$search_string%' ORDER BY title ASC");
+ 		$DB->cache_add_query( 'help_search', array( 'search_string' => $search_string ) );
+		$DB->cache_exec_query();
  		
  		$cnt = 0;
  		
- 		while ($row = $DB->fetch_row() ) {
+ 		while ($row = $DB->fetch_row() )
+ 		{
  		
- 			if (isset($seen[ $row['title'] ]) ) {
+ 			if (isset($seen[ $row['title'] ]) )
+ 			{
  				continue;
- 			} else {
+ 			}
+ 			else
+ 			{
  				$seen[ $row['title'] ] = 1;
  			}
  			
@@ -166,18 +205,18 @@ class Help {
  			
  		}
  		
- 		if ($cnt == 0) {
+ 		if ($cnt == 0)
+ 		{
  			$this->output .= $this->html->no_results();
  		}
  		
- 		$this->output .= $this->html->end();
+ 		$this->output .= $this->html->help_end();
  		
  		$this->page_title = $ibforums->lang['page_title'];
  		$this->nav        = array( "<a href='{$this->base_url}&amp;act=Help'>{$ibforums->lang['help_topics']}</a>", $ibforums->lang['results_title'] );
- 		
  	}
 
         
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/dynamiclite/csite.php b/upload/sources/ipbportal.php
similarity index 55%
rename from upload/sources/dynamiclite/csite.php
rename to upload/sources/ipbportal.php
index 1e1d4f26..afd597b2 100644
--- a/upload/sources/dynamiclite/csite.php
+++ b/upload/sources/ipbportal.php
@@ -2,15 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.2 (Click Site Module)
+|   Invision Power Board v2.0 (IPB Portal Module)
 |   ========================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services
 |   http://www.invisionpower.com
 |   ========================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Email: matt@invisionpower.com
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
@@ -19,11 +19,12 @@
 |   > Module written by Matt Mecham
 |   > Date started: 1st July 2003
 |
-|	> Module Version Number: 1.0.0
+|	> Module Version Number: 2.0.0
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
-class click_site {
+class ipdl {
 
     var $output     = "";
     var $html       = "";
@@ -35,14 +36,36 @@ class click_site {
     var $bad_forum  = array();
     var $good_forum = array();
     var $raw        = "";
+    var $topic      = "";
     
-    function click_site()
+    function auto_run()
     {
-    	global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print, $forums;
     	
-		//--------------------------------------------
+    	//-----------------------------------------
+    	// Get settings...
+    	//-----------------------------------------
+    	
+    	$DB->simple_construct( array( 'select' => 'conf_key,conf_value,conf_default', 'from' => 'conf_settings', 'where' => "conf_key LIKE 'csite%'" ) );
+    	$DB->simple_exec();
+    	
+    	while( $r = $DB->fetch_row() )
+    	{
+    		$value = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+    		
+    		if ( $r['conf_key'] == 'csite_nav_contents' or $r['conf_key'] == 'csite_fav_contents' )
+    		{
+    			$this->raw[ $r['conf_key'] ] = str_replace( '&#39;', "'", str_replace( "\r\n", "\n", $value ) );
+    		}
+    		else
+    		{
+    			$ibforums->vars[ $r['conf_key'] ] = $value;
+    		}
+    	}
+    	
+		//-----------------------------------------
     	// Require the HTML and language modules
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	if ( ! $ibforums->vars['csite_on'] )
     	{
@@ -50,37 +73,28 @@ class click_site {
     		exit();
     	}
     	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_csite', $ibforums->lang_id );
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_portal', $ibforums->lang_id );
     	
-    	$this->html = $std->load_template('skin_csite');
+    	$this->html = $std->load_template('skin_portal');
     	
-    	require ROOT_PATH."sources/lib/post_parser.php";
+    	require_once( ROOT_PATH."sources/lib/post_parser.php" );
         
-        $this->parser = new post_parser();
+        $this->parser = new post_parser( 1 );
+        
+        //-----------------------------------------
+        // ??
+        //-----------------------------------------
         
         if ( $ibforums->vars['dynamiclite'] == "" )
         {
         	$ibforums->vars['dynamiclite'] = $ibforums->base_url.'act=home';
         }
         
-        //--------------------------------------------
-		// Get site nav / favourites
-		//--------------------------------------------
-		
-        $DB->query("SELECT cs_key, cs_value FROM ibf_cache_store WHERE cs_key IN ('csite_nav_contents', 'csite_fav_contents')");
- 		
- 		while ( $row = $DB->fetch_row() )
- 		{
- 			$this->raw[ $row['cs_key'] ] = str_replace( '&#39;', "'", str_replace( "\r\n", "\n", $row['cs_value'] ) );
- 		}
-        
-        //--------------------------------------------
+        //-----------------------------------------
 		// Get forums we're allowed to read
-		//--------------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("SELECT id, read_perms, password FROM ibf_forums");
-		
-		while( $f = $DB->fetch_row() )
+		foreach( $forums->forum_by_id as $id => $f )
 		{
 			if ( ($std->check_perms($f['read_perms']) != TRUE) or ($f['password'] != "" ) )
         	{
@@ -92,9 +106,9 @@ class click_site {
         	}
         }
         
-        //--------------------------------------------
+        //-----------------------------------------
     	// Grab articles new/recent in 1 bad ass query
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$limit = $ibforums->vars['csite_article_max'];
     	
@@ -105,62 +119,58 @@ class click_site {
     	
     	if ( count($this->bad_forum) > 0 )
     	{
-    		$qe = " AND p.forum_id NOT IN(".implode(',', $this->bad_forum ).") ";
+    		$qe = " AND t.forum_id NOT IN(".implode(',', $this->bad_forum ).") ";
     	}
+    	
+    	if ( count($this->good_forum) > 0 )
+		{
+			$qe .= " AND t.forum_id IN(".implode(',', $this->good_forum ).") ";
+		}
         
         if ( $ibforums->vars['csite_article_forum'] )
         {
         	$ibforums->vars['csite_article_forum'] = ','.$ibforums->vars['csite_article_forum'];
         }
         
+        //-----------------------------------------
         // have we converted from another board?
+        //-----------------------------------------
         
         if ( $ibforums->vars['vb_configured'] )
         {
-			$DB->query("SELECT t.*, f.read_perms, f.use_html, p.*, m.avatar, m.view_avs, m.avatar_size, m.id as member_id, m.name as member_name, m.mgroup, g.g_id, g.g_dohtml
+			$DB->query("SELECT t.*, p.*, me.avatar_location, m.view_avs, me.avatar_size, m.id as member_id, m.name as member_name, m.mgroup
 						FROM ibf_posts p
 						 LEFT JOIN ibf_topics t on (t.tid=p.topic_id and t.approved=1 and t.moved_to IS NULL)
-						 LEFT JOIN ibf_forums f on (f.id=p.forum_id)
 						 LEFT JOIN ibf_members m on (p.author_id=m.id)
-						 LEFT JOIN ibf_groups g on (g.g_id=m.mgroup)
-						WHERE p.forum_id IN (-1{$ibforums->vars['csite_article_forum']}) $qe
+						 LEFT JOIN ibf_member_extra me on (m.id=me.id)
+						WHERE t.forum_id IN (-1{$ibforums->vars['csite_article_forum']}) $qe
 						GROUP BY p.topic_id
 						ORDER BY t.pinned DESC, p.post_date DESC
 						LIMIT 0,$limit");
         }
         else
         {
-			$DB->query("SELECT t.*, f.read_perms, f.use_html, p.*, m.avatar, m.view_avs, m.avatar_size,
-						m.id as member_id, m.name as member_name, m.mgroup, g.g_id, g.g_dohtml
-						FROM ibf_topics t
-						 LEFT JOIN ibf_members m ON (t.starter_id=m.id)
-						 LEFT JOIN ibf_groups g ON (g.g_id=m.mgroup)
-						 LEFT JOIN ibf_posts p ON (p.topic_id=t.tid AND p.new_topic=1)
-						 LEFT JOIN ibf_forums f on (f.id=p.forum_id)
-						WHERE t.forum_id IN (-1{$ibforums->vars['csite_article_forum']}) $qe
-						AND t.approved=1 AND (t.moved_to IS NULL or t.moved_to='')
-						ORDER BY t.pinned DESC, t.start_date DESC
-						LIMIT 0,$limit");
+        	$DB->cache_add_query( 'portal_get_monster_bitch', array( 'csite_article_forum' => $ibforums->vars['csite_article_forum'], 'qe' => $qe, 'limit' => $limit ) );
+			$DB->cache_exec_query();
         }			
         
         $i = 0;
         			
         while ( $r = $DB->fetch_row() )
         {
-        	
         	if ( $i >= $ibforums->vars['csite_article_max'] )
         	{
-        		//------------------------------------
+        		//-----------------------------------------
         		// Store recent
-        		//------------------------------------
+        		//-----------------------------------------
         		
         		$this->recent[ $r['pid'] ] = $r;
         	}
         	else
         	{
-        		//------------------------------------
+        		//-----------------------------------------
         		// Store new
-        		//------------------------------------
+        		//-----------------------------------------
         		
         		$this->articles[ $r['pid'] ] = $r;
         	}
@@ -168,15 +178,15 @@ class click_site {
         	$i++;
         }
         
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Assign skeletal template ma-doo-bob
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$this->template = $this->html->csite_skeleton_template();
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Work on some fancy replacements
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$this->site_bits['welcomebox']     = $this->_show_welcomebox();
     	$this->site_bits['search']         = $this->_show_search();
@@ -190,63 +200,57 @@ class click_site {
     	$this->site_bits['affiliates']     = $this->_show_affiliates();
     	
     	$this->_do_output();
-    		
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Do OUTPUT
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _do_output()
  	{
- 		global $ibforums, $DB, $std, $print, $Debug;
+		global $ibforums, $DB, $std, $print, $Debug;
  		
  		if ($DB->obj['debug'])
         {
         	flush();
-        	print "<html><head><title>mySQL Debugger</title><body bgcolor='white'><style type='text/css'> TABLE, TD, TR, BODY { font-family: verdana,arial, sans-serif;color:black;font-size:11px }</style>";
+        	print "<html><head><title>MySQL Debugger</title><body bgcolor='white'><style type='text/css'> TABLE, TD, TR, BODY { font-family: verdana,arial, sans-serif;color:black;font-size:11px }</style>";
         	print $ibforums->debug_html;
         	print "</body></html>";
         	exit();
         }
  		
- 		//------------------------------------------
+ 		//-----------------------------------------
         // CSS
-        //------------------------------------------
+        //-----------------------------------------
  		
- 		if ( $ibforums->skin['css_method'] == 'external' )
-        {
-        	$css = $this->html->csite_css_external($ibforums->skin['css_id'], $ibforums->skin['img_dir']);
-        }
-        else
-        {
-        	$css = $this->html->csite_css_inline( preg_replace( "#(?!".preg_quote($ibforums->vars['board_url'], '/')."/)style_images/<\#IMG_DIR\#>#is", $ibforums->vars['board_url']."/style_images/".$ibforums->skin['img_dir'], $ibforums->skin['css_text'] ) );
-        }
-        
-        //------------------------------------------
+ 		$ibforums->skin['_usecsscache'] = 0;
+ 		
+ 		$css = $print->_get_css();
+ 		
+        //-----------------------------------------
         // TEMPLATE REPLACEMENTS
-        //------------------------------------------
+        //-----------------------------------------
         
         $this->site_bits['title']      = $ibforums->vars['csite_title'];
         $this->site_bits['css']        = $css;
         $this->site_bits['javascript'] = $this->html->csite_javascript();
         
-        //------------------------------------------
+        //-----------------------------------------
         // SITE REPLACEMENTS
-        //------------------------------------------
+        //-----------------------------------------
         
         foreach( $this->site_bits as $sbk => $sbv )
         {
         	$this->template = str_replace( "<!--CS.TEMPLATE.".strtoupper($sbk)."-->", $sbv, $this->template );
         }
         
-        //------------------------------------------
+        //-----------------------------------------
       	// MACROS
-      	//------------------------------------------
+      	//-----------------------------------------
       	
-      	$DB->query("SELECT macro_value, macro_replace FROM ibf_macro WHERE macro_set={$ibforums->skin['macro_id']}");
-        
-      	while ( $row = $DB->fetch_row() )
+      	$print->_unpack_macros();
+      	
+      	foreach( $print->macros as $i => $row )
       	{
 			if ($row['macro_value'] != "")
 			{
@@ -254,23 +258,21 @@ class click_site {
 			}
 		}
 		
-		$this->template = preg_replace( "#(?!".preg_quote($ibforums->vars['board_url'], '/')."/)style_images/<\#IMG_DIR\#>#is", $ibforums->vars['board_url']."/style_images/".$ibforums->skin['img_dir'], $this->template );
-		
-		//------------------------------------------
+		//-----------------------------------------
       	// DEBUG
-      	//------------------------------------------
+      	//-----------------------------------------
 		
 		if ( $ibforums->vars['debug_level'] )
 		{
 			$this->template = str_replace( "<!--CS.TEMPLATE.DEBUG-->", $this->html->tmpl_debug( $DB->get_query_cnt(), sprintf( "%.4f",$Debug->endTimer() ) ), $this->template );
 		}
 		
-		//------------------------------------------
+		//-----------------------------------------
       	// CPYRT
-      	//------------------------------------------
+      	//-----------------------------------------
 		
 		$extra = "";
-        $ur    = '(U)';
+        $ur    = ' (Trial)';
         
         if ( $ibforums->vars['ipb_reg_number'] )
         {
@@ -282,7 +284,7 @@ class click_site {
         	}
         }
 		
-        $copyright = "\n\n<div align='center' class='copyright'>Powered by <a href=\"http://www.invisionboard.com\" target='_blank'>IPDynamic Lite</a>{$ur} {$ibforums->version} &copy; 2003 &nbsp;<a href='http://www.invisionpower.com' target='_blank'>IPS, Inc.</a>$extra</div>";
+        $copyright = "\n\n<div align='center' class='copyright'>Powered by <a href=\"http://www.invisionboard.com\" target='_blank'>IPB Portal</a>{$ur} v2 &copy; 2004 &nbsp;<a href='http://www.invisionpower.com' target='_blank'>IPS, Inc.</a>$extra</div>";
         
         if ($ibforums->vars['ips_cp_purchase'])
         {
@@ -291,9 +293,9 @@ class click_site {
 		
 		$this->template = str_replace( "<!--CS.TEMPLATE.COPYRIGHT-->", $copyright, $this->template );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// CHAT
-		//---------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->vars['chat_account_no'])
 		{
@@ -307,9 +309,18 @@ class click_site {
 			$this->template = str_replace( "<!--IBF.CHATLINK-->", $chat_link, $this->template );
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
+		// Stick in TSL link? 
+		//-----------------------------------------
+		
+		if ($ibforums->vars['top_site_list_integrate'])
+		{
+			$this->template = str_replace( "<!--IBF.TSLLINK-->", $ibforums->skin_global->show_tsl_link_inline(), $this->template );
+		}
+		
+		//-----------------------------------------
 		// BOARD RULES
-		//---------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->vars['gl_show'] and $ibforums->vars['gl_title'])
         {
@@ -321,15 +332,31 @@ class click_site {
         	$this->template = str_replace( "<!--IBF.RULES-->", $this->html->rules_link($ibforums->vars['gl_link'], $ibforums->vars['gl_title']), $this->template );
         }
         
-		//---------------------------------------
-		// Close this DB connection
-		//---------------------------------------
+        //-----------------------------------------
+        // Img dir.. (?!".preg_quote($ibforums->vars['board_url'], '/')."/)
+        //-----------------------------------------
+        
+        $this->template = preg_replace( "#([^/])style_images/(<\#IMG_DIR\#>|".preg_quote($ibforums->skin['_imagedir'], '/').")#is", "\\1".$ibforums->vars['board_url']."/style_images/\\2", $this->template );
+		$this->template = preg_replace( "#(?!".preg_quote($ibforums->vars['board_url'], '/')."/)style_emoticons#is", $ibforums->vars['board_url']."/style_emoticons", $this->template );
+		$this->template = preg_replace( "#(?!".preg_quote($ibforums->vars['board_url'], '/')."/)style_avatars#is", $ibforums->vars['board_url']."/style_avatars", $this->template );
+		$this->template = preg_replace( "#(?!".preg_quote($ibforums->vars['board_url'], '/')."/)jscripts#is", $ibforums->vars['board_url']."/jscripts", $this->template );
 		
-		$DB->close_db();
+		$this->template = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $this->template );
+		$this->template = str_replace( "<#EMO_DIR#>", $ibforums->skin['_emodir']  , $this->template );
+        
+		//-----------------------------------------
+		// Do shutdown
+		//-----------------------------------------
 		
-		//---------------------------------------
+		if ( ! USE_SHUTDOWN )
+        {
+        	$std->my_deconstructor();
+        	$DB->close_db();
+        }
+		
+		//-----------------------------------------
 		// Start GZIP compression
-        //---------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->vars['disable_gzip'] != 1)
         {
@@ -341,22 +368,22 @@ class click_site {
         
         $print->do_headers();
         
-		//------------------------------------------
+		//-----------------------------------------
       	// PRINT!
-      	//------------------------------------------
+      	//-----------------------------------------
       	
 		print $this->template;
 		
 		exit();
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Format topic entry
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _tmpl_format_topic($entry, $cut)
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		$entry['title'] = strip_tags($entry['title']);
 		$entry['title'] = str_replace( "&#33;" , "!" , $entry['title'] );
@@ -379,15 +406,16 @@ class click_site {
  	}
  	
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Main articles
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_articles()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		$html = "";
+ 		$attach_pids = array();
  		
  		foreach( $this->articles as $pid => $entry )
  		{
@@ -427,43 +455,62 @@ class click_site {
  			
  			$entry['post'] = str_replace( '<br>', '<br />', $entry['post'] );
  			
- 			$entry['post'] = $this->parser->post_db_parse($entry['post'], ($entry['use_html'] AND $entry['g_dohtml']) );
+ 			//-----------------------------------------
+ 			// Quoted attachments?
+ 			//-----------------------------------------
  			
- 			if ( $ibforums->vars['csite_article_chars'] > 0 )
- 			{
- 				if ( strlen($entry['post']) > $ibforums->vars['csite_article_chars'] )
- 				{
- 					$entry['post'] = substr( $entry['post'], 0, $ibforums->vars['csite_article_chars'] );
- 					
- 					$read_more = $this->html->tmpl_readmore_link($entry['tid']);
- 				}
+ 			preg_match( "#\[attachmentid=(\d+)\]i#", $entry['post'], $match );
+ 			
+ 			if ( $match[1] )
+ 			{ 
+ 				$attach_pids[ $match[1] ] = $match[1];
  			}
  			
- 			//-------------------------------------
- 			// Avatar
- 			//-------------------------------------
+ 			//-----------------------------------------
+ 			// Inline attachments?
+ 			//-----------------------------------------
  			
- 			$entry['avatar'] = $std->get_avatar( $entry['avatar'], 1, $entry['avatar_size'] );
+ 			$attach_pids[ $entry['pid'] ] = $entry['pid'];
+ 			
+ 			$this->parser->pp_do_html  = ( $ibforums->cache['forum_cache'][ $entry['forum_id'] ]['use_html'] and $entry['post_htmlstate'] ) ? 1 : 0;
+			$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+			$this->parser->pp_nl2br    = $entry['post_htmlstate'] == 2 ? 1 : 0;
+ 			
+ 			$entry['post'] = $this->parser->post_db_parse( $entry['post'] );
+ 			
+ 			//-----------------------------------------
+ 			// Avatar
+ 			//-----------------------------------------
+ 			
+ 			$entry['avatar'] = $std->get_avatar( $entry['avatar_location'], 1, $entry['avatar_size'], $entry['avatar_type'] );
  			
  			if ( $entry['avatar'] )
  			{
  				$entry['avatar'] = $this->html->tmpl_wrap_avatar( $entry['avatar'] );
  			}
  			
- 			$html .= $this->html->tmpl_articles_row($entry, $bottom_string, $read_more, $top_string);
+ 			$html .= $this->html->tmpl_articles_row($entry, $bottom_string, $top_string);
+ 		}
  		
+ 		if ( count( $attach_pids ) )
+ 		{
+ 			require_once( ROOT_PATH.'sources/topics.php' );
+			$this->topic = new topics();
+ 			$this->topic->topic_init();
+ 			
+ 			$html = $this->topic->parse_attachments( $html, $attach_pids );
  		}
  		
  		return $this->html->tmpl_articles($html);
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Recent articles
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_recentarticles()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_article_recent_on'] )
  		{
@@ -485,13 +532,13 @@ class click_site {
  		return $this->html->tmpl_recentarticles($html);
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Latest Posts
- 	//---------------------------------------------------
+	/*-------------------------------------------------------------------------*/
  	
  	function _show_latestposts()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_discuss_on'] )
  		{
@@ -501,16 +548,18 @@ class click_site {
  		$html  = "";
  		$limit = $ibforums->vars['csite_discuss_max'] ? $ibforums->vars['csite_discuss_max'] : 5;
  		
- 		if ( count($this->bad_forum) > 0 )
+ 		if ( count($this->good_forum) > 0 )
     	{
-    		$qe = " AND forum_id NOT IN(".implode(',', $this->bad_forum ).") ";
+    		$qe = "forum_id IN(".implode(',', $this->good_forum ).") AND ";
     	}
  		
- 		$DB->query("SELECT tid, title, posts, starter_id as member_id, starter_name as member_name, start_date as post_date, views
- 		            FROM ibf_topics
- 		            WHERE state!='closed' AND approved=1 AND (moved_to IS NULL or moved_to='') $qe
- 		            ORDER BY start_date DESC LIMIT 0,$limit");
- 		            
+ 		$DB->simple_construct( array( 'select' => 'tid, title, posts, starter_id as member_id, starter_name as member_name, start_date as post_date, views',
+									  'from'   => 'topics',
+									  'where'  => "$qe approved=1 and state != 'closed' and (moved_to is null or moved_to = '')",
+									  'order'  => 'start_date DESC',
+									  'limit'  => array( 0, $limit ) ) );
+		$DB->simple_exec();
+		
  		while ( $row = $DB->fetch_row() )
  		{
  			$html .= $this->_tmpl_format_topic($row, $ibforums->vars['csite_discuss_len']);
@@ -519,31 +568,26 @@ class click_site {
  		return $this->html->tmpl_latestposts($html);
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Poll
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_poll()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		$extra = "";
  		$sql   = "";
  		$check = 0;
  		
- 		if ( ! $ibforums->vars['csite_poll_show'] )
- 		{
- 			return;
- 		}
- 		
  		if ( ! $ibforums->vars['csite_poll_url'] )
  		{
  			return;
  		}
  		
- 		//------------------------------------------
+ 		//-----------------------------------------
 		// Get the topic ID of the entered URL
-		//------------------------------------------
+		//-----------------------------------------
 		
 		preg_match( "/(\?|&amp;)?(t|showtopic)=(\d+)($|&amp;)/", $ibforums->vars['csite_poll_url'], $match );
 		
@@ -554,21 +598,13 @@ class click_site {
 			return;
 		}
 		
-		if ( $ibforums->member['id'] )
-		{
-			$extra = "LEFT JOIN ibf_voters v ON (v.member_id={$ibforums->member['id']} and v.tid=t.tid)";
-			$sql   = ", v.member_id as member_voted";
-		}
-		
-		//------------------------------------------
+		//-----------------------------------------
 		// Get the stuff from the DB
-		//------------------------------------------
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'portal_get_poll_join', array( 'mid' => intval($ibforums->member['id']), 'tid' => $tid ) );
+		$DB->cache_exec_query();
 		
-		$DB->query("SELECT t.tid, t.title, t.state, t.last_vote, p.* $sql
-					 FROM ibf_topics t, ibf_polls p
-					 $extra
-					 WHERE t.tid=$tid AND p.tid=t.tid");
-					 
 		$poll = $DB->fetch_row();
 		
 		if ( ! $poll['pid'] )
@@ -578,9 +614,9 @@ class click_site {
 		
 		$poll['poll_question'] = $poll['poll_question'] ? $poll['poll_question'] : $poll['title'];
 		
-		//------------------------------------------
+		//-----------------------------------------
 		// Can we vote?
-		//------------------------------------------
+		//-----------------------------------------
 		
 		if ( $poll['state'] == 'closed' )
         {
@@ -608,15 +644,15 @@ class click_site {
         	$poll_footer = $this->html->tmpl_poll_vote();
         }
         	
-		//------------------------------------------
+		//-----------------------------------------
 		// Show it
-		//------------------------------------------
+		//-----------------------------------------
 		
         if ($check == 1)
         {
-        	//----------------------------------
+        	//-----------------------------------------
         	// Show the results
-        	//----------------------------------
+        	//-----------------------------------------
         	
         	$total_votes = 0;
         	
@@ -659,9 +695,9 @@ class click_site {
         	$poll_answers = unserialize(stripslashes($poll['choices']));
         	reset($poll_answers);
         	
-        	//----------------------------------
+        	//-----------------------------------------
         	// Show poll form
-        	//----------------------------------
+        	//-----------------------------------------
         	
         	$html = $this->html->tmpl_poll_header($poll['poll_question'], $poll['tid']);
         	
@@ -697,13 +733,13 @@ class click_site {
  		return $html;
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Online users
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_onlineusers()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_online_show'] )
  		{
@@ -712,80 +748,166 @@ class click_site {
  		
  		$this->sep_char = $this->html->csite_sep_char();
  		
- 		//------------------------------------------
+ 		//-----------------------------------------
 		// Get the users from the DB
-		//------------------------------------------
+		//-----------------------------------------
 		
 		$time = time() - ( ($ibforums->vars['au_cutoff'] ? $ibforums->vars['au_cutoff'] : 15) * 60 );
 		
-		$DB->query("SELECT s.id, s.member_id, s.member_name, s.login_type, g.suffix, g.prefix
-					FROM ibf_sessions s
-					  LEFT JOIN ibf_groups g ON (g.g_id=s.member_group)
-					WHERE running_time > $time
-					ORDER BY s.running_time DESC");
+		$DB->simple_construct( array( 'select' => 'id, member_id, member_name, login_type, running_time, member_group',
+									  'from'   => 'sessions',
+									  'where'  => "running_time > $time",
+									  'order'  => "running_time DESC"
+							 )      );
+							 
+		$DB->simple_exec();
 		
-		//------------------------------------------
+		//-----------------------------------------
 		// Cache all printed members
-		//------------------------------------------
+		//-----------------------------------------
+		
+		if ($ibforums->vars['au_cutoff'] == "")
+		{
+			$ibforums->vars['au_cutoff'] = 15;
+		}
+		
+		//-----------------------------------------
+		// Get the users from the DB
+		//-----------------------------------------
+		
+		$cut_off = $ibforums->vars['au_cutoff'] * 60;
+		$time    = time() - $cut_off;
+		$qe      = "";
+		$rows    = array( 0 => array( 'login_type'   => substr($ibforums->member['login_anonymous'],0, 1),
+									  'running_time' => time(),
+									  'member_id'    => $ibforums->member['id'],
+									  'member_name'  => $ibforums->member['name'],
+									  'member_group' => $ibforums->member['mgroup'] ) );
+		
+		if ( $ibforums->member['id'] )
+		{
+			$qe = "member_id !=".intval($ibforums->member['id'])." AND ";
+		}
+		
+		$DB->simple_construct( array( 'select' => 'id, member_id, member_name, login_type, running_time, member_group',
+									  'from'   => 'sessions',
+									  'where'  => $qe." running_time > $time",
+									  'order'  => "running_time DESC"
+							 )      );
+		
+		
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		// FETCH...
+		//-----------------------------------------
+		
+		while ($r = $DB->fetch_row() )
+		{
+			$rows[] = $r;
+		}
+		
+		//-----------------------------------------
+		// cache all printed members so we
+		// don't double print them
+		//-----------------------------------------
 		
 		$cached = array();
-		$active = array();
 		
-		while ($result = $DB->fetch_row() )
+		foreach ( $rows as $result )
 		{
+			$last_date = $std->get_time( $result['running_time'] );
+			
+			//-----------------------------------------
+			// Bot?
+			//-----------------------------------------
+			
 			if ( strstr( $result['id'], '_session' ) )
 			{
-				if ( $ibforums->vars['spider_anon'] )
+				//-----------------------------------------
+				// Seen bot of this type yet?
+				//-----------------------------------------
+				
+				$botname = preg_replace( '/^(.+?)=/', "\\1", $result['id'] );
+				
+				if ( ! $cached[ $result['member_name'] ] )
 				{
-					if ( $ibforums->member['mgroup'] == $ibforums->vars['admin_group'] )
+					if ( $ibforums->vars['spider_anon'] )
 					{
-						$active['names'] .= "{$result['member_name']}*{$this->sep_char} \n";
+						if ( $ibforums->member['mgroup'] == $ibforums->vars['admin_group'] )
+						{
+							$active['NAMES'] .= "{$result['member_name']}*{$this->sep_char} \n";
+						}
 					}
+					else
+					{
+						$active['NAMES'] .= "{$result['member_name']}{$this->sep_char} \n";
+					}
+					
+					$cached[ $result['member_name'] ] = 1;
 				}
 				else
 				{
-					$active['names'] .= "{$result['member_name']}{$this->sep_char} \n";
+					//-----------------------------------------
+					// Yup, count others as guest
+					//-----------------------------------------
+					
+					$active['GUESTS']++;
 				}
 			}
+			
+			//-----------------------------------------
+			// Guest?
+			//-----------------------------------------
+			
 			else if ($result['member_id'] == 0 )
 			{
-				$active['guests']++;
+				$active['GUESTS']++;
 			}
+			
+			//-----------------------------------------
+			// Member?
+			//-----------------------------------------
+			
 			else
 			{
 				if ( empty( $cached[ $result['member_id'] ] ) )
 				{
 					$cached[ $result['member_id'] ] = 1;
 					
-					if ($result['login_type'] == 1)
+					$result['prefix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['prefix'];
+					$result['suffix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['suffix'];
+					
+					if ($result['login_type'])
 					{
 						if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
 						{
-							$active['names'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*{$this->sep_char} \n";
-							$active['anon']++;
+							$active['NAMES'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}' title='$last_date'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*{$this->sep_char} \n";
+							$active['ANON']++;
 						}
 						else
 						{
-							$active['anon']++;
+							$active['ANON']++;
 						}
 					}
 					else
 					{
-						$active['members']++;
-						$active['names'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>{$this->sep_char} \n";
+						$active['MEMBERS']++;
+						$active['NAMES'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}' title='$last_date'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>{$this->sep_char} \n";
 					}
 				}
 			}
 		}
 		
-		$active['names'] = preg_replace( "/".preg_quote($this->sep_char)."$/", "", trim($active['names']) );
+		$active['names'] = preg_replace( "/".preg_quote($this->sep_char)."$/", "", trim($active['NAMES']) );
 		
-		$active['total']    = $active['members'] + $active['guests'] + $active['anon'];
-		$active['visitors'] = $active['guests']  + $active['anon'];
+		$active['total']    = $active['MEMBERS'] + $active['GUESTS'] + $active['ANON'];
+		$active['visitors'] = $active['GUESTS']  + $active['ANON'];
+		$active['members']  = $active['MEMBERS'];
 		
-		//------------------------------------------
+		//-----------------------------------------
 		// Parse language
-		//------------------------------------------
+		//-----------------------------------------
 		
 		$breakdown = sprintf( $ibforums->lang['online_breakdown'], intval($active['total']) );
 		$split     = sprintf( $ibforums->lang['online_split']    , intval($active['members']), intval($active['visitors']) );
@@ -794,13 +916,13 @@ class click_site {
  		return $this->html->tmpl_onlineusers($breakdown, $split, $active['names']);
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Navigation Stuff
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_sitenav()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_nav_show'] )
  		{
@@ -827,13 +949,13 @@ class click_site {
  		return $this->html->tmpl_sitenav($links);
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Affiliates
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_affiliates()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_fav_show'] )
  		{
@@ -843,13 +965,13 @@ class click_site {
  		return $this->html->tmpl_affiliates($this->raw['csite_fav_contents']);
  	}
  	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Change skin
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_changeskin()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_skinchange_show'] )
  		{
@@ -858,46 +980,24 @@ class click_site {
  		
  		$select = $this->html->tmpl_skin_select_top();
  		
- 		//---------------------------------------
+ 		//-----------------------------------------
  		// Query DB for skins
- 		//---------------------------------------
+ 		//-----------------------------------------
  		
- 		$DB->query("SELECT sname, sid, default_set FROM ibf_skins where hidden=0");
- 		
- 		while( $s = $DB->fetch_row() )
- 		{
- 			$used = "";
- 			
- 			if ( $ibforums->member['skin'] == "" )
- 			{
- 				if ( $s['default_set'] == 1 )
- 				{
- 					$used = 'selected="selected"';
- 				}
- 			}
- 			else
- 			{
- 				if ( $ibforums->member['skin'] == $s['sid'] )
- 				{
- 					$used = 'selected="selected"';
- 				}
- 			}
- 			
- 			$select .= $this->html->tmpl_skin_select_row($s['sid'], $s['sname'], $used);
- 		}
+ 		$select .= $print->_build_skin_list();
  		
  		$select .= $this->html->tmpl_skin_select_bottom();
  		
  		return $this->html->tmpl_changeskin($select);
  	}
  	
-	//---------------------------------------------------
+	/*-------------------------------------------------------------------------*/
  	// Search box
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_search()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_search_show'] )
  		{
@@ -907,14 +1007,13 @@ class click_site {
  		return $this->html->tmpl_search();
  	}
  	
- 	
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	// Welcome Box
- 	//---------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function _show_welcomebox()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		if ( ! $ibforums->vars['csite_pm_show'] )
  		{
@@ -934,9 +1033,9 @@ class click_site {
  		
  		if ( $ibforums->member['id'] )
  		{
- 			//------------------------------
+ 			//-----------------------------------------
  			// Work member info
- 			//------------------------------
+ 			//-----------------------------------------
  			
 		    $pm_string  = sprintf( $ibforums->lang['wbox_pm_string'] , "<a href='{$ibforums->base_url}act=Msg'>".intval($ibforums->member['new_msg'])."</a>" );
 		    $last_visit = sprintf( $ibforums->lang['wbox_last_visit'], $std->get_date( $ibforums->member['last_visit'], 'LONG' ) );
@@ -952,11 +1051,9 @@ class click_site {
  		}
  		
  		return $html;
- 		
 	}
  	
-
         
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/add_poll.php b/upload/sources/lib/add_poll.php
index b7ad608a..b8a92e68 100644
--- a/upload/sources/lib/add_poll.php
+++ b/upload/sources/lib/add_poll.php
@@ -2,21 +2,21 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > Add POLL module
 |   > Module written by Matt Mecham
+|   > DBA Checked: Fri 21 May 2004
 |
 +--------------------------------------------------------------------------
 |
@@ -28,10 +28,13 @@
 +-------------------------------------------------------------------------- 
 */
 
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-$idx = new Poll;
-
-class Poll {
+class poll {
 
 
 	var $topic = array();
@@ -40,8 +43,7 @@ class Poll {
 	var $poll_count = 0;
 	var $poll_choices = "";
 
-	function Poll() {
-	
+	function auto_run() {
 		global $ibforums, $std, $DB, $print;
 		
 		$ibforums->lang      = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
@@ -65,15 +67,18 @@ class Poll {
 
 		// Make sure we have a valid poll id
 		
-       	$ibforums->input[t] = $std->is_number($ibforums->input[t]);
-		if (! $ibforums->input[t] ) {
+       	$ibforums->input['t'] = intval($ibforums->input['t']);
+       	
+		if (! $ibforums->input['t'] )
+		{
 			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
 		}
    
    		// Load the topic and poll
    		
-   		$DB->query("SELECT f.allow_pollbump, t.*, p.pid as poll_id,p.choices,p.starter_id,p.votes from ibf_polls p, ibf_topics t, ibf_forums f WHERE t.tid='".$ibforums->input['t']."' and p.tid=t.tid and t.forum_id=f.id");
-   		
+   		$DB->cache_add_query( 'poll_get_poll_with_topic', array( 'tid' => $ibforums->input['t'] ) );
+		$DB->cache_exec_query();
+		
    		$this->topic = $DB->fetch_row();
    		
    		if (! $this->topic['tid'] )
@@ -85,9 +90,11 @@ class Poll {
    		{
    			$std->Error( array( LEVEL => 1, MSG => 'locked_topic') );
    		}
+   		
 		// Have we voted before?
 		
-		$DB->query("SELECT member_id from ibf_voters WHERE tid='".$this->topic['tid']."' and member_id='".$ibforums->member['id']."'");
+		$DB->simple_construct( array( 'select' => 'member_id', 'from' => 'voters', 'where' => "tid={$this->topic['tid']} and member_id=".$ibforums->member['id'] ) );
+		$DB->simple_exec();
 		
 		if ( $DB->get_num_rows() )
 		{
@@ -96,23 +103,16 @@ class Poll {
 		
 		// If we're here, lets add the vote
 		
-		
-		$db_string = $std->compile_db_string(
-											  array (
-											  			'member_id'  => $ibforums->member['id'],
-											  			'ip_address' => $ibforums->input['IP_ADDRESS'],
-											  			'tid'        => $this->topic['tid'],
-											  			'forum_id'   => $this->topic['forum_id'],
-											  			'vote_date'  => time(),
-											  		)
-											  );
+		$DB->do_insert( 'voters', array( 'member_id'  => $ibforums->member['id'],
+										 'ip_address' => $ibforums->input['IP_ADDRESS'],
+										 'tid'        => $this->topic['tid'],
+										 'forum_id'   => $this->topic['forum_id'],
+										 'vote_date'  => time(),
+										) );
 											  
-		$DB->query("INSERT INTO ibf_voters (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-
-
 		// If this isn't a null vote...
 		
-		if (!$ibforums->input['nullvote'])
+		if ( ! $ibforums->input['nullvote'] )
 		{
 			$poll_answers = unserialize(stripslashes($this->topic['choices']));
         	reset($poll_answers);
@@ -133,40 +133,29 @@ class Poll {
         	
         	$this->topic['choices'] = addslashes(serialize($new_poll_array));
         	
-        	$DB->query("UPDATE ibf_polls SET ".
-        				 "votes=votes+1, ".
-        				 "choices='"  . $this->topic['choices'] . "' ".
-        				 "WHERE pid='" . $this->topic['poll_id']    . "'");
+        	$DB->simple_exec_query( array( 'update' => 'polls',
+        								   'set'    => "votes=votes+1,choices='{$this->topic['choices']}'",
+        								   'where'  => "pid={$this->topic['poll_id']}" ) );
+		
         				 
         	if ($this->topic['allow_pollbump'])
         	{
-        	
         		$this->topic['last_vote'] = time();
         		$this->topic['last_post'] = time();
-
-				$DB->query("UPDATE ibf_topics SET ".
-        				 	"last_vote='" . $this->topic['last_vote'] . "', ".
-        				 	"last_post='" . $this->topic['last_post'] . "' ".
-        				 	"WHERE tid='" . $this->topic['tid']       . "'");
-        				 	
+				
+				$DB->do_update( 'topics', array( 'last_vote' => $this->topic['last_vote'], 'last_post' => $this->topic['last_post'] ), 'tid='.$this->topic['tid'] );
         	}
         	else
         	{
         		$this->topic['last_vote'] = time();
         		
-				$DB->query("UPDATE ibf_topics SET ".
-        				 	"last_vote='" . $this->topic['last_vote'] . "', ".
-        				 	"last_post='" . $this->topic['last_post'] . "' ".
-        				 	"WHERE tid='" . $this->topic['tid']       . "'");
-        				 	
+        		$DB->do_update( 'topics', array( 'last_vote' => $this->topic['last_vote'], 'last_post' => $this->topic['last_post'] ), 'tid='.$this->topic['tid'] );
         	}
-        	
-        	
         }
 
 		$lang = $ibforums->input['nullvote'] ? $ibforums->lang['poll_viewing_results'] : $ibforums->lang['poll_vote_added'];
 		
-		$print->redirect_screen( $lang , "act=ST&f={$this->topic['forum_id']}&t={$this->topic['tid']}" );
+		$print->redirect_screen( $lang , "act=ST&f={$this->topic['forum_id']}&t={$this->topic['tid']}&st={$ibforums->input['st']}" );
 
 
 	}
diff --git a/upload/sources/lib/boardstats_functions.php b/upload/sources/lib/boardstats_functions.php
new file mode 100644
index 00000000..079545ad
--- /dev/null
+++ b/upload/sources/lib/boardstats_functions.php
@@ -0,0 +1,506 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Board index functions module
+|   > Module written by Matt Mecham
+|   > Date started: 18th November 2003
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Fri 21 May 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+
+class boardstats_functions
+{
+
+	var $class    = "";
+	var $sep_char = "";
+	
+	var $users_online  = "";
+	var $total_posts   = "";
+	var $total_members = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// ------------------
+	// Register a $this-> class with this module
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->sep_char = '<{ACTIVE_LIST_SEP}>';
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// DISPLAY ACTIVE USERS
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function active_users()
+	{
+		global $DB, $std, $ibforums;
+		
+		$active = array( 'TOTAL'   => 0 ,
+						 'NAMES'   => "",
+						 'GUESTS'  => 0 ,
+						 'MEMBERS' => 0 ,
+						 'ANON'    => 0 ,
+					   );
+					   
+		$stats_html = "";
+		
+		if ($ibforums->vars['show_active'])
+		{
+			if ($ibforums->vars['au_cutoff'] == "")
+			{
+				$ibforums->vars['au_cutoff'] = 15;
+			}
+			
+			//-----------------------------------------
+			// Get the users from the DB
+			//-----------------------------------------
+			
+			$cut_off = $ibforums->vars['au_cutoff'] * 60;
+			$time    = time() - $cut_off;
+			$qe      = "";
+			$rows    = array( 0 => array( 'login_type'   => substr($ibforums->member['login_anonymous'],0, 1),
+										  'running_time' => time(),
+										  'member_id'    => $ibforums->member['id'],
+										  'member_name'  => $ibforums->member['name'],
+										  'member_group' => $ibforums->member['mgroup'] ) );
+			
+			if ( $ibforums->member['id'] )
+			{
+				$qe = "member_id !=".intval($ibforums->member['id'])." AND ";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'id, member_id, member_name, login_type, running_time, member_group',
+										  'from'   => 'sessions',
+										  'where'  => $qe." running_time > $time",
+										  'order'  => "running_time DESC"
+								 )      );
+			
+			
+			$DB->simple_exec();
+			
+			//-----------------------------------------
+			// FETCH...
+			//-----------------------------------------
+			
+			while ($r = $DB->fetch_row() )
+			{
+				$rows[] = $r;
+			}
+			
+			//-----------------------------------------
+			// cache all printed members so we
+			// don't double print them
+			//-----------------------------------------
+			
+			$cached = array();
+			
+			foreach ( $rows as $result )
+			{
+				$last_date = $std->get_time( $result['running_time'] );
+				
+				//-----------------------------------------
+				// Bot?
+				//-----------------------------------------
+				
+				if ( strstr( $result['id'], '_session' ) )
+				{
+					//-----------------------------------------
+					// Seen bot of this type yet?
+					//-----------------------------------------
+					
+					$botname = preg_replace( '/^(.+?)=/', "\\1", $result['id'] );
+					
+					if ( ! $cached[ $result['member_name'] ] )
+					{
+						if ( $ibforums->vars['spider_anon'] )
+						{
+							if ( $ibforums->member['mgroup'] == $ibforums->vars['admin_group'] )
+							{
+								$active['NAMES'] .= "{$result['member_name']}*{$this->sep_char} \n";
+							}
+						}
+						else
+						{
+							$active['NAMES'] .= "{$result['member_name']}{$this->sep_char} \n";
+						}
+						
+						$cached[ $result['member_name'] ] = 1;
+					}
+					else
+					{
+						//-----------------------------------------
+						// Yup, count others as guest
+						//-----------------------------------------
+						
+						$active['GUESTS']++;
+					}
+				}
+				
+				//-----------------------------------------
+				// Guest?
+				//-----------------------------------------
+				
+				else if ($result['member_id'] == 0 )
+				{
+					$active['GUESTS']++;
+				}
+				
+				//-----------------------------------------
+				// Member?
+				//-----------------------------------------
+				
+				else
+				{
+					if ( empty( $cached[ $result['member_id'] ] ) )
+					{
+						$cached[ $result['member_id'] ] = 1;
+						
+						$result['prefix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['prefix'];
+						$result['suffix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['suffix'];
+						
+						if ($result['login_type'])
+						{
+							if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
+							{
+								$active['NAMES'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}' title='$last_date'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*{$this->sep_char} \n";
+								$active['ANON']++;
+							}
+							else
+							{
+								$active['ANON']++;
+							}
+						}
+						else
+						{
+							$active['MEMBERS']++;
+							$active['NAMES'] .= "<a href='{$ibforums->base_url}showuser={$result['member_id']}' title='$last_date'>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>{$this->sep_char} \n";
+						}
+					}
+				}
+			}
+			
+			$active['NAMES'] = preg_replace( "/".preg_quote($this->sep_char)."$/", "", trim($active['NAMES']) );
+			
+			$active['TOTAL'] = $active['MEMBERS'] + $active['GUESTS'] + $active['ANON'];
+			
+			$this->users_online = $active['TOTAL'];
+			
+			//-----------------------------------------
+			// Show a link?
+			//-----------------------------------------
+			
+			if ($ibforums->vars['allow_online_list'])
+			{
+				$active['links'] = $this->class->html->active_user_links();
+			}
+			
+			$ibforums->lang['active_users'] = sprintf( $ibforums->lang['active_users'], $ibforums->vars['au_cutoff'] );
+			
+			return $this->class->html->ActiveUsers($active, $ibforums->vars['au_cutoff']);
+		}
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// SHOW CALENDAR EVENTS
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function show_calendar_events()
+	{
+		global $DB, $ibforums, $std;
+		
+		if ($ibforums->vars['show_birthdays'])
+		{
+			$a = explode( ',', gmdate( 'Y,n,j,G,i,s', time() + $std->get_time_offset() ) );
+		
+			$day   = $a[2];
+			$month = $a[1];
+			$year  = $a[0];
+			
+			$birthstring = "";
+			$count       = 0;
+			$users       = array();
+			
+			//-----------------------------------------
+			// Not caching?
+			//-----------------------------------------
+			
+			if ( ! $ibforums->vars['cache_calendar'] )
+			{
+				$DB->simple_construct( array( 'select' => 'id, name, bday_day, bday_month, bday_year', 'from' => 'members', 'where' => "bday_day=$day and bday_month=$month" ) );
+				$DB->simple_exec();
+				
+				while( $r = $DB->fetch_row() )
+				{
+					$users[] = $r;
+				}
+			}
+			
+			//-----------------------------------------
+			// Or caching...
+			//-----------------------------------------
+			
+			else
+			{
+				if ( count( $ibforums->cache['birthdays'] ) )
+				{
+					foreach( $ibforums->cache['birthdays'] as $id => $u )
+					{
+						if ( $u['bday_day'] == $day and $u['bday_month'] == $month )
+						{
+							$users[] = $u;
+						}
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Spin and print...
+			//-----------------------------------------
+			
+			foreach ( $users as $id => $user )
+			{
+				$birthstring .= "<a href='{$ibforums->base_url}showuser={$user['id']}'>{$user['name']}</a>";
+				
+				if ($user['bday_year'])
+				{
+					$pyear = $year - $user['bday_year'];
+					$birthstring .= "(<b>$pyear</b>)";
+				}
+				
+				$birthstring .= $this->sep_char."\n";
+				
+				$count++;
+			}
+			
+			//-----------------------------------------
+			// Fix up string...
+			//-----------------------------------------
+			
+			$birthstring = preg_replace( "/".$this->sep_char."$/", "", trim($birthstring) );
+			
+			$lang = $ibforums->lang['no_birth_users'];
+			
+			if ($count > 0)
+			{
+				$lang = ($count > 1) ? $ibforums->lang['birth_users'] : $ibforums->lang['birth_user'];
+				$stats_html .= $this->class->html->birthdays( $birthstring, $count, $lang  );
+			}
+			else
+			{
+				$count = "";
+				
+				if ( ! $ibforums->vars['autohide_bday'] )
+				{
+					$stats_html .= $this->class->html->birthdays( $birthstring, $count, $lang  );
+				}
+			}
+		}
+		
+		
+		//-----------------------------------------
+		// Are we viewing the calendar?
+		//-----------------------------------------
+		
+		if ($ibforums->vars['show_calendar'])
+		{
+		
+			if ($ibforums->vars['calendar_limit'] < 2)
+			{
+				$ibforums->vars['calendar_limit'] = 2;
+			}
+			
+			$our_unix = mktime( 0, 0, 1, $month, $day, $year);
+			$max_date = $our_unix + ($ibforums->vars['calendar_limit'] * 86400);
+			$events   = array();
+			$show_events = array();
+			
+			//-----------------------------------------
+			// Not caching?
+			//-----------------------------------------
+			
+			if ( ! $ibforums->vars['cache_calendar'] )
+			{
+				$DB->simple_construct( array( 'select' => 'eventid, title, read_perms, priv_event, userid, unix_stamp',
+											  'from'   => 'calendar_events',
+											  'where'  => "unix_stamp > $our_unix and unix_stamp < $max_date",
+											  'order'  => 'unix_stamp'
+									 )      );
+				$DB->simple_exec();
+				
+				while( $r = $DB->fetch_row() )
+				{
+					$events[] = $r;
+				}
+			}
+			
+			//-----------------------------------------
+			// Or caching...
+			//-----------------------------------------
+			
+			else
+			{
+				if ( count( $ibforums->cache['calendar'] ) )
+				{
+					foreach( $ibforums->cache['calendar'] as $id => $u )
+					{
+						if ( $u['unix_stamp'] >= $our_unix and $u['unix_stamp'] <= $max_date )
+						{
+							$events[] = $u;
+						}
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Print...
+			//-----------------------------------------
+			
+			foreach( $events as $e => $event )
+			{
+				if ($event['priv_event'] == 1 and $ibforums->member['id'] != $event['userid'])
+				{
+					continue;
+				}
+				
+				//-----------------------------------------
+				// Do we have permission to see the event?
+				//-----------------------------------------
+				
+				if ( $event['read_perms'] != '*' )
+				{
+					if ( ! preg_match( "/(^|,)".$ibforums->member['mgroup']."(,|$)/", $event['read_perms'] ) )
+					{
+						continue;
+					}
+				}
+				
+				$c_time = date( 'j-F-y', $event['unix_stamp']);
+				
+				$show_events[] = "<a href='{$ibforums->base_url}act=calendar&amp;code=showevent&amp;eventid={$event['eventid']}' title='$c_time'>".$event['title']."</a>";
+			}
+			
+			$ibforums->lang['calender_f_title'] = sprintf( $ibforums->lang['calender_f_title'], $ibforums->vars['calendar_limit'] );
+			
+			if ( count($show_events) > 0 )
+			{
+				$event_string = implode( $this->sep_char.' ', $show_events );
+				$stats_html .= $this->class->html->calendar_events( $event_string  );
+			}
+			else
+			{
+				if ( ! $ibforums->vars['autohide_calendar'] )
+				{
+					$event_string = $ibforums->lang['no_calendar_events'];
+					$stats_html .= $this->class->html->calendar_events( $event_string  );
+				}
+			}
+		}
+	
+		return $stats_html;
+	
+	}
+
+	/*-------------------------------------------------------------------------*/
+	//
+	// SHOW TOTALS
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function show_totals()
+	{
+		global $DB, $ibforums, $std;
+		
+		if ($ibforums->vars['show_totals'])
+		{
+			if ( ! is_array( $ibforums->cache['stats'] ) )
+			{
+				$ibforums->cache['stats'] = array();
+				
+				$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key='stats'" ) );
+				$DB->do_insert( 'cache_store', array( 'cs_array' => 1, 'cs_key' => 'stats', 'cs_value' => addslashes(serialize($ibforums->cache['stats'])) ) );
+			}
+			
+			$stats = $ibforums->cache['stats'];
+			
+			//-----------------------------------------
+			// Update the most active count if needed
+			//-----------------------------------------
+			
+			if ($this->users_online > $stats['most_count'])
+			{
+				$stats['most_count'] = $this->users_online;
+				$stats['most_date']  = time();
+				
+				$DB->do_update( 'cache_store',
+								array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($stats)) ),
+							    "cs_key='stats'"
+							  );
+			}
+			
+			$most_time = $std->get_date( $stats['most_date'], 'LONG' );
+			
+			$ibforums->lang['most_online'] = str_replace( "<#NUM#>" ,   $std->do_number_format($stats['most_count'])  , $ibforums->lang['most_online'] );
+			$ibforums->lang['most_online'] = str_replace( "<#DATE#>",                   $most_time                    , $ibforums->lang['most_online'] );
+			
+			$total_posts = $stats['total_replies'] + $stats['total_topics'];
+			
+			$total_posts        = $std->do_number_format($total_posts);
+			$stats['mem_count'] = $std->do_number_format($stats['mem_count']);
+			
+			$this->total_posts    = $total_posts;
+			$this->total_members  = $stats['mem_count'];
+			
+			$link = $ibforums->base_url."showuser=".$stats['last_mem_id'];
+			
+			$ibforums->lang['total_word_string'] = str_replace( "<#posts#>" , "$total_posts"          , $ibforums->lang['total_word_string'] );
+			$ibforums->lang['total_word_string'] = str_replace( "<#reg#>"   , $stats['mem_count']     , $ibforums->lang['total_word_string'] );
+			$ibforums->lang['total_word_string'] = str_replace( "<#mem#>"   , $stats['last_mem_name'] , $ibforums->lang['total_word_string'] );
+			$ibforums->lang['total_word_string'] = str_replace( "<#link#>"  , $link                   , $ibforums->lang['total_word_string'] );
+			
+			$stats_html .= $this->class->html->ShowStats($ibforums->lang['total_word_string']);
+			
+		}
+
+		return $stats_html;
+		
+	}
+
+
+
+}
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/chat04_functions.php b/upload/sources/lib/chat04_functions.php
new file mode 100644
index 00000000..3fc159e0
--- /dev/null
+++ b/upload/sources/lib/chat04_functions.php
@@ -0,0 +1,215 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPChat functions
+|   > Script written by Matt Mecham
+|   > Date started: 29th September 2003
+|
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly.";
+	exit();
+}
+
+
+class chat_functions
+{
+
+	var $class  = "";
+	var $server = "";
+	var $html   = "";
+	
+	function chat_functions()
+	{
+		global $DB, $std, $ibforums;
+		
+		$this->server = str_replace( 'http://', '', $ibforums->vars['chat04_whodat_server_addr'] );
+	}
+	
+	//-----------------------------------------
+	// register_class($class)
+	//
+	// Register a $this-> with this class 
+	//
+	//-----------------------------------------
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+	}
+
+	//-----------------------------------------
+	// Print online list
+	//
+	//-----------------------------------------
+	
+	function get_online_list()
+	{
+		global $DB, $std, $ibforums;
+		
+		if ( ! $ibforums->vars['chat04_who_on'] )
+		{
+			return;
+		}
+		
+		//-----------------------------------------
+		// Get details from the DB
+		//-----------------------------------------
+		
+		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
+		
+		$row = $DB->fetch_row();
+		
+		list( $hits, $time ) = explode( '&', $row['cs_extra'] );
+		
+		//-----------------------------------------
+		// Do we need to update?
+		//-----------------------------------------
+		
+		$final = "";
+		$time_is_running_out = time();
+		$member_ids = array();
+		
+		if ( $time < time() - ( $ibforums->vars['chat04_who_save'] * 60 ) )
+		//if ( 1 == 1)
+		{
+			//-----------------------------------------
+			// Get service library
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'retail/chatservice.php' );
+			
+			$server_url = 'http://'.$CHAT_SERVER[ $ibforums->vars['chat04_servicetype'] ].'/'.$CHAT_ONLINELIST[ $ibforums->vars['chat04_servicetype'] ].$ibforums->vars['chat04_account_no'];
+			
+			if ( $data = @file( $server_url ) )
+			{
+				if ( count($data) > 0 )
+				{
+					$hits_left = intval( array_shift($data) );
+				}
+				
+				$data = implode( "", $data );
+				$data = str_replace( "<html>" , "", $data );
+				$data = str_replace( "</html>", "", $data );
+				
+				$data = preg_replace( "#^.+?:\s#i", "", strtolower($data) );
+				$tmp  = explode( " ", $data );
+				$na   = array();
+				
+				if ( is_array( $tmp ) and count ($tmp) )
+				{
+					foreach( $tmp as $n )
+					{
+						$n = trim( $n );
+						
+						//-----------------------------------------
+						// Look for underscore version too?
+						//-----------------------------------------
+						
+						if ( strstr( $n, '_' ) )
+						{
+							//$n = str_replace( '_', ' ', $n );
+						}
+						
+						//-----------------------------------------
+						// Like?
+						//-----------------------------------------
+						
+						if ( strstr( $n, '-' ) )
+						{
+							$n = str_replace( '-', '_', $n );
+						}
+						
+						$n = str_replace( '"', '&quot;', $n );
+						
+						$na[] = "lower(name) LIKE '{$n}'";
+					}
+				}
+				
+				$timecutoff = time() - ( 30 * 60 );
+				
+				$query_string = implode( ' OR ', $na );
+				
+				if ( $query_string )
+				{
+					$DB->query("SELECT m.id, m.name, g.g_id, g.prefix, g.suffix FROM ibf_members m
+								 LEFT JOIN ibf_groups g ON (m.mgroup=g.g_id)
+								WHERE $query_string AND m.last_activity > $timecutoff ORDER BY m.name");
+					
+					while ( $m = $DB->fetch_row() )
+					{
+						$member_ids[] = "<a href=\"{$ibforums->base_url}showuser={$m['id']}\">{$m['prefix']}{$m['name']}{$m['suffix']}</a>";
+					}
+					
+					$final = implode( ",\n", $member_ids );
+					
+					$final .= '|&|'.intval(count($member_ids));
+				}
+				
+				if ( ! $hits_left )
+				{
+					$hits_left = 100000;
+				}
+				
+				$DB->query("UPDATE ibf_cache_store SET cs_value='".$DB->add_slashes($final)."', cs_extra='{$hits_left}&{$time_is_running_out}' WHERE cs_key='chatstat'");
+				
+				$row['cs_value'] = $final;
+			}
+		}
+		
+		//-----------------------------------------
+		// Any members to show?
+		//-----------------------------------------
+		
+		$ibforums->vars['chat04_height'] += $ibforums->vars['chat04_poppad'] ? $ibforums->vars['chat04_poppad'] : 50;
+		$ibforums->vars['chat04_width']  += $ibforums->vars['chat04_poppad'] ? $ibforums->vars['chat04_poppad'] : 50;
+		
+		$chat_link = ( $ibforums->vars['chat04_display'] == 'self' )
+				   ? $this->class->html->whoschatting_inline_link()
+				   : $this->class->html->whoschatting_popup_link();
+		
+		list ($names, $count) = explode( '|&|', $row['cs_value'] );
+		
+		if ( $count > 0 )
+		{
+			$txt = sprintf( $ibforums->lang['whoschatting_delay'], $ibforums->vars['chat04_who_save'] );
+			$this->html = $this->class->html->whoschatting_show( intval($count), stripslashes($names), $chat_link, $txt );
+		}
+		else
+		{
+			if ( ! $ibforums->vars['chat04_hide_whoschatting'] )
+			{
+				$this->html = $this->class->html->whoschatting_empty($chat_link);
+			}
+		}
+		
+		return $this->html;
+				
+	}
+
+
+
+
+
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/chat_functions.php b/upload/sources/lib/chat_functions.php
index 71ac7514..0932423c 100644
--- a/upload/sources/lib/chat_functions.php
+++ b/upload/sources/lib/chat_functions.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -44,22 +43,22 @@ class chat_functions
 		$this->server = str_replace( 'http://', '', $ibforums->vars['chat_server_addr'] );
 	}
 	
-	//-----------------------------------------------
+	//-----------------------------------------
 	// register_class($class)
 	//
 	// Register a $this-> with this class 
 	//
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function register_class(&$class)
 	{
 		$this->class = $class;
 	}
 
-	//-----------------------------------------------
+	//-----------------------------------------
 	// Print online list
 	//
-	//-----------------------------------------------
+	//-----------------------------------------
 	
 	function get_online_list()
 	{
@@ -70,9 +69,9 @@ class chat_functions
 			return;
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Get details from the DB
-		//----------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='chatstat'");
 		
@@ -80,13 +79,14 @@ class chat_functions
 		
 		list( $hits, $time ) = explode( '&', $row['cs_extra'] );
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Do we need to update?
-		//----------------------------------
+		//-----------------------------------------
 		
 		$final = "";
 		$time_is_running_out = time();
 		$member_ids = array();
+		$new        = array();
 		
 		if ( $time < time() - ( $ibforums->vars['chat_who_save'] * 60 ) )
 		{
@@ -99,17 +99,26 @@ class chat_functions
 					$hits_left = array_shift($data);
 				}
 				
-				$name_string = strtolower( implode( '","', str_replace( '"', '&quot;', str_replace( '_', ' ', $data ) ) ) );
-				
-				if ( count($data) > 0 )
+				foreach( $data as $t )
 				{
-					$DB->query("SELECT m.id, m.name, g.g_id, g.prefix, g.suffix FROM ibf_members m
-								 LEFT JOIN ibf_groups g ON (m.mgroup=g.g_id)
+					$t = strtolower(trim($t));
+					$t = str_replace( '_', ' ', $t );
+					$t = str_replace( '"', '&quot;', $t );
+					
+					$new[] = $t;
+				}
+				
+				$name_string = implode( '","', $new );
+				
+				if ( count($new) > 0 )
+				{ 
+					$DB->query("SELECT m.id, m.name, m.mgroup FROM ibf_members m
 								WHERE lower(name) IN (\"".$name_string."\") ORDER BY m.name");
 					
 					while ( $m = $DB->fetch_row() )
 					{
-						$member_ids[] = "<a href=\"{$ibforums->base_url}showuser={$m['id']}\">{$m['prefix']}{$m['name']}{$m['suffix']}</a>";
+						$g = $ibforums->cache['group_cache'][ $m['mgroup'] ];
+						$member_ids[] = "<a href=\"{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?showuser={$m['id']}\">{$g['prefix']}{$m['name']}{$g['suffix']}</a>";
 					}
 					
 					$final = implode( ",\n", $member_ids );
@@ -123,9 +132,9 @@ class chat_functions
 			}
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Any members to show?
-		//----------------------------------
+		//-----------------------------------------
 		
 		$ibforums->vars['chat_height'] += $ibforums->vars['chat_poppad'] ? $ibforums->vars['chat_poppad'] : 50;
 		$ibforums->vars['chat_width']  += $ibforums->vars['chat_poppad'] ? $ibforums->vars['chat_poppad'] : 50;
diff --git a/upload/sources/lib/digest_functions.php b/upload/sources/lib/digest_functions.php
new file mode 100644
index 00000000..b460ebe5
--- /dev/null
+++ b/upload/sources/lib/digest_functions.php
@@ -0,0 +1,357 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Task Manager functions ( Digest Library )
+|   > Script written by Matt Mecham
+|   > Date started: 9th June 2004
+|   > DBA Checked: 9th June 2004
+|
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly.";
+	exit();
+}
+
+
+
+class digest_functions
+{
+	var $digest_time = 'daily';
+	var $digest_type = 'topic';
+	var $root_path   = './';
+	var $midnight    = 0;
+	var $last_week   = 0;
+	var $last_day    = 0;
+	var $last_time   = 0;
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// CONSTRUCTOR
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function digest_functions()
+	{
+		global $DB, $std, $ibforums, $ROOT_PATH;
+		
+		if ( $ROOT_PATH )
+		{
+			$this->root_path = $ROOT_PATH.'/';
+		}
+		else if ( ROOT_PATH )
+		{
+			$this->root_path = ROOT_PATH;
+		}
+		
+		//-----------------------------------------
+		// Get midnight (GMT - roughly)
+		//-----------------------------------------
+		
+		$this->midnight = mktime( 0, 0 );
+		
+		//-----------------------------------------
+		// Midnight today minus a weeks worth of secs
+		//-----------------------------------------
+		
+		$this->last_week = $this->midnight - 604800;
+		
+		//-----------------------------------------
+		// Midnight today minus a day worth of secs
+		//-----------------------------------------
+		
+		$this->last_day  = $this->midnight - 86400;
+		
+		$DB->load_cache_file( $this->root_path.'sources/sql/'.SQL_DRIVER.'_extra_queries.php', 'sql_extra_queries' );
+		
+		//-----------------------------------------
+        // Load the email libby
+        //-----------------------------------------
+        
+        require_once( $this->root_path.'sources/classes/class_email.php' );
+		$this->email = new emailer($this->root_path);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Run the digest
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function run_digest()
+	{
+		global $ibforums, $DB, $std;
+		
+		$this->last_time = $this->digest_time == 'daily' ? $this->last_day : $this->last_week;
+		
+		if ( $this->digest_type == 'topic' )
+		{
+			$this->_send_topic_digest();
+		}
+		else
+		{
+			$this->_send_forum_digest();
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOPIC DIGEST
+	/*-------------------------------------------------------------------------*/
+	
+	function _send_topic_digest()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get all posts / topics
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'digest_get_topics', array(
+														  'type'      => $this->digest_time,
+														  'last_time' => $this->last_time
+														), 'sql_extra_queries' );
+		$topic_query = $DB->cache_exec_query();
+		
+		//-----------------------------------------
+		// Now, loop print and send to subscribers
+		//-----------------------------------------
+		
+		$main_output = "";
+		$count       = 0;
+		$cached      = array();
+		$subject     = $this->digest_time == 'daily' ? 'digest_topic_daily' : 'digest_topic_weekly';
+		
+		while( $t = $DB->fetch_row( $topic_query ) )
+		{
+			$main_output    = "";
+			$others_posted = 0;
+			
+			if ( ! $cached[ $t['tid'] ] )
+			{
+				$topic_title = $t['title'];
+				$forum_name  = $ibforums->cache['forum_cache'][ $t['forum_id'] ]['name'];
+				
+				//-----------------------------------------
+				// Get posts...
+				//-----------------------------------------
+				
+				$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'posts',
+											  'where'  => "topic_id={$t['tid']} AND queued=0 AND post_date > {$this->last_time}",
+											  'order'  => 'post_date' ) );
+											  
+				$post_query = $DB->simple_exec();
+				
+				$post_output = "";
+				
+				while( $p = $DB->fetch_row( $post_query ) )
+				{
+					//-----------------------------------------
+					// Do we have other posters?
+					//-----------------------------------------
+					
+					if ( $t['trmid'] != $p['author_id'] )
+					{
+						$others_posted = 1;
+					}
+					
+					$post_author  = $p['author_name'];
+					$post_date    = $std->get_date( $p['post_date'], 'SHORT' );
+					$post_content = $p['post'];
+					
+					$post_output .= "\n-------------------------------------------\n"
+								 .  "{$post_author} -- {$post_date}\n{$post_content}\n\n";
+				}
+				
+				//-----------------------------------------
+				// Process
+				//-----------------------------------------
+				
+				$main_output .= "Topic: $topic_title (Forum: $forum_name)\n"
+							 .  "=====================================\n"
+							 .  $post_output
+							 .  "\n=====================================\n";
+				
+				$cached[ $t['tid'] ] = $main_output;
+			}
+			else
+			{
+				$main_output = $cached[ $t['tid'] ];
+			}
+			
+			if ( $others_posted )
+			{
+				$count++;
+				
+				//-----------------------------------------
+				// Send email...
+				//-----------------------------------------
+				
+				$this->email->get_template( $subject, $data['language']);
+				
+				$this->email->build_message( array(
+													'TOPIC_ID'        => $t['tid'],
+													'FORUM_ID'        => $t['forum_id'],
+													'TITLE'           => $topic_title,
+													'NAME'            => $t['name'],
+													'CONTENT'         => $main_output,
+										   )     );
+				
+				$DB->do_insert( 'mail_queue', array( 'mail_to'      => $t['email'],
+													 'mail_date'    => time(),
+													 'mail_subject' => $this->email->lang_subject,
+													 'mail_content' => $std->txt_safeslashes($this->email->message) ) );
+			}
+			
+		}
+		
+		$ibforums->cache['systemvars']['mail_queue'] += $count;
+		
+		//-----------------------------------------
+		// Update cache with remaning email count
+		//-----------------------------------------
+		
+		$DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($ibforums->cache['systemvars'])) ), "cs_key='systemvars'" );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOPIC DIGEST
+	/*-------------------------------------------------------------------------*/
+	
+	function _send_forum_digest()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Get all posts / topics
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'digest_get_forums', array(
+														 'type'      => $this->digest_time
+														), 'sql_extra_queries' );
+		$forum_query = $DB->simple_exec();
+				
+		//-----------------------------------------
+		// Now, loop print and send to subscribers
+		//-----------------------------------------
+		
+		$main_output = "";
+		$count       = 0;
+		$cached      = array();
+		$subject     = $this->digest_time == 'daily' ? 'digest_forum_daily' : 'digest_forum_weekly';
+		
+		while( $t = $DB->fetch_row( $forum_query ) )
+		{
+			$main_output   = "";
+			$others_posted = 0;
+			
+			if ( ! $cached[ $t['forum_id'] ] )
+			{
+				$forum_name  = $ibforums->cache['forum_cache'][ $t['forum_id'] ]['name'];
+				
+				//-----------------------------------------
+				// Get topics...
+				//-----------------------------------------
+				
+				$DB->cache_add_query( 'digest_get_forums_topics', array(
+																		'forum_id'  => $t['forum_id'],
+																		'last_time' => $this->last_time
+																	  ), 'sql_extra_queries' );
+				$topic_query = $DB->cache_exec_query();
+				
+				$post_output = "";
+				
+				while( $p = $DB->fetch_row( $topic_query ) )
+				{
+					//-----------------------------------------
+					// Do we have other posters?
+					//-----------------------------------------
+					
+					if ( $t['member_id'] != $p['starter_id'] )
+					{
+						$others_posted = 1;
+					}
+					
+					$post_author  = $p['author_name'];
+					$post_date    = $std->get_date( $p['post_date'], 'SHORT' );
+					$post_content = $p['post'];
+					$topic_title  = $p['title'];
+					
+					$post_output .= "\n-------------------------------------------\n"
+					             .  "Topic: {$topic_title} ({$post_author} -- {$post_date})"
+								 .  "\n............................................\n"
+								 .  "{$post_content}\n\n";
+				}
+				
+				//-----------------------------------------
+				// Process
+				//-----------------------------------------
+				
+				$main_output .= "Forum: $forum_name\n"
+							 .  "=====================================\n"
+							 .  $post_output
+							 .  "\n=====================================\n";
+				
+				$cached[ $t['forum_id'] ] = $main_output;
+			}
+			else
+			{
+				$main_output = $cached[ $t['forum_id'] ];
+			}
+			
+			if ( $others_posted )
+			{
+				$count++;
+				
+				//-----------------------------------------
+				// Send email...
+				//-----------------------------------------
+				
+				$this->email->get_template( $subject, $data['language']);
+				
+				$this->email->build_message( array(
+													'FORUM_ID'        => $t['forum_id'],
+													'NAME'            => $t['name'],
+													'CONTENT'         => $main_output,
+										   )     );
+				
+				$DB->do_insert( 'mail_queue', array( 'mail_to'      => $t['email'],
+													 'mail_date'    => time(),
+													 'mail_subject' => $this->email->lang_subject,
+													 'mail_content' => $std->txt_safeslashes($this->email->message) ) );
+			}
+			
+		}
+		
+		$ibforums->cache['systemvars']['mail_queue'] += $count;
+		
+		//-----------------------------------------
+		// Update cache with remaning email count
+		//-----------------------------------------
+		
+		$DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($ibforums->cache['systemvars'])) ), "cs_key='systemvars'" );
+	}
+	
+	
+	
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/modfunctions.php b/upload/sources/lib/modfunctions.php
index 12e88d48..55c56e8e 100644
--- a/upload/sources/lib/modfunctions.php
+++ b/upload/sources/lib/modfunctions.php
@@ -1,21 +1,22 @@
 <?php
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
+|   Invision Power Board v2.0.0 
 |   ========================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services
 |   http://www.ibforums.com
 |   ========================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Email: matt@ibforums.com
 |   Licence Info: http://www.invisionpower.com
 +---------------------------------------------------------------------------
 |
 |   > Moderator Core Functions
 |   > Module written by Matt Mecham
+|   > DBA Checked: Fri 21 May 2004
 |
 +--------------------------------------------------------------------------
 | NOTE:
@@ -26,12 +27,12 @@
 
 class modfunctions
 {
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @modfunctions: constructor
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	var $topic = "";
 	var $forum = "";
@@ -55,14 +56,14 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @init: initialize module (allows us to create new obj)
 	// -----------
 	// Accepts: References to @$forum [ @$topic , @$moderator ]
 	// Returns: NOTHING (TRUE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
-	function init($forum, $topic="", $moderator="")
+	function init($forum="", $topic="", $moderator="")
 	{
 		$this->forum = $forum;
 		
@@ -79,13 +80,265 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	
+	//-----------------------------------------
+	// @post_delete: delete post ID(s)
+	// -----------
+	// Accepts: $id (array | string) 
+	// Returns: NOTHING (TRUE/FALSE)
+	//-----------------------------------------
+	
+	function post_delete($id)
+	{
+		global $std, $ibforums, $DB;
+		
+		$posts      = array();
+		$attach_tid = array();
+		$topics     = array();
+		
+		$this->error = "";
+
+		if ( is_array( $id ) )
+		{
+			if ( count($id) > 0 )
+			{
+				$pid = " IN(".implode(",",$id).")";
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+		else
+		{
+			if ( intval($id) )
+			{
+				$pid   = "=$id";
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+		
+		//-----------------------------------------
+		// Get Stuff
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'pid, topic_id', 'from' => 'posts', 'where' => 'pid'.$pid ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$posts[ $r['pid'] ]       = $r['topic_id'];
+			$topics[ $r['topic_id'] ] = 1;
+		}
+		
+		//-----------------------------------------
+		// Is there an attachment to this post?
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_pid".$pid ) );
+		$DB->simple_exec();
+		
+		$attach_ids = array();
+		
+		while ( $killmeh = $DB->fetch_row( ) )
+		{
+			if ( $killmeh['attach_location'] )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
+			}
+			if ( $killmeh['attach_thumb_location'] )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+			}
+			
+			$attach_ids[] = $killmeh['attach_id'];
+			$attach_tid[ $posts[ $killmeh['attach_pid'] ] ] = $posts[ $killmeh['attach_pid'] ];
+		}
+		
+		if ( count($attach_ids) )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'attachments', 'where' => "attach_id IN(".implode(",",$attach_ids).")" ) );
+			
+			//-----------------------------------------
+			// Recount topic upload marker
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'sources/post.php' );
+			
+			$postlib = new post();
+			
+			foreach( $attach_tid as $apid => $tid )
+			{
+				$postlib->pf_recount_topic_attachments($tid);
+			}
+		}
+		
+		//-----------------------------------------
+		// delete the post
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'posts', 'where' => "pid".$pid ) );
+		
+		//-----------------------------------------
+		// Update the stats
+		//-----------------------------------------
+		
+		$ibforums->cache['stats']['total_replies'] -= count($posts);
+		
+		$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 0 ) );
+		
+		//-----------------------------------------
+		// Update all relevant topics
+		//-----------------------------------------
+		
+		foreach( array_keys($topics) as $tid )
+		{
+			$this->rebuild_topic($tid);
+		}
+		
+		$this->add_moderate_log("", "", "", $pid, "Deleted posts ($pid)");
+	}
+	
+	//-----------------------------------------
 	// @topic_add_reply: Appends topic with reply
 	// -----------
 	// Accepts: $post, $tids = array( 'tid', 'forumid' );
 	//         
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
+	
+	function rebuild_topic($tid, $doforum=1)
+	{
+		global $std, $ibforums, $DB, $forums;
+		
+		$tid = intval($tid);
+		
+		//-----------------------------------------
+		// Get the correct number of replies
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id=$tid and queued != 1" ) );
+		$DB->simple_exec();
+		
+		$posts = $DB->fetch_row();
+		
+		$pcount = intval( $posts['posts'] - 1 );
+		
+		//-----------------------------------------
+		// Get the correct number of queued replies
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id=$tid and queued=1" ) );
+		$DB->simple_exec();
+		
+		$qposts = $DB->fetch_row();
+		
+		$qpcount = intval( $qposts['posts'] );
+		
+		//-----------------------------------------
+		// Get last post info
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'mod_func_get_last_post', array( 'tid' => $tid ) );
+		$DB->cache_exec_query();
+		
+		$last_post = $DB->fetch_row();
+		
+		//-----------------------------------------
+		// Get first post info
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'post_date, author_id, author_name, pid',
+									  'from'   => 'posts',
+									  'where'  => "topic_id=$tid",
+									  'order'  => 'pid ASC',
+									  'limit'  => array(0,1) ) );
+		$DB->simple_exec();
+		
+		$first_post = $DB->fetch_row();
+		
+		//-----------------------------------------
+		// Get number of attachments
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'mod_func_get_attach_count', array( 'tid' => $tid ) );
+		$DB->cache_exec_query();
+		
+		$attach = $DB->fetch_row();
+
+		//-----------------------------------------
+		// Update topic
+		//-----------------------------------------
+		
+		$DB->do_update( 'topics', array( 'last_post'         => $last_post['post_date'],
+										 'last_poster_id'    => $last_post['author_id'],
+										 'last_poster_name'  => $last_post['author_name'],
+										 'topic_queuedposts' => $qpcount,
+										 'posts'             => $pcount,
+										 'starter_id'        => $first_post['author_id'],
+										 'starter_name'      => $first_post['author_name'],
+										 'start_date'        => $first_post['post_date'],
+										 'topic_firstpost'   => $first_post['pid'],
+										 'topic_hasattach'   => intval($attach['count'])
+									   ), 'tid='.$tid );
+									   
+		//-----------------------------------------
+		// Update first post
+		//-----------------------------------------
+		
+		if ( $first_post['new_topic'] != 1 and $first_post['pid'] )
+		{
+			$DB->do_shutdown_update( 'posts', array( 'new_topic' => 0 ), 'topic_id='.$tid );
+			$DB->do_shutdown_update( 'posts', array( 'new_topic' => 1 ), 'pid='.$first_post['pid'] );
+		}
+		
+		//-----------------------------------------
+		// If we deleted the last post in a topic that was
+		// the last post in a forum, best update that :D
+		//-----------------------------------------
+		
+		if ( ($forums->forums_by_id[ $last_post['forum_id'] ]['last_id'] == $tid) AND ($doforum == 1) )
+		{
+			$tt = $DB->simple_exec_query( array( 'select' => 'title, tid, last_post, last_poster_id, last_poster_name',
+												 'from'   => 'topics',
+												 'where'  => 'forum_id='.$last_post['forum_id'].' and approved=1',
+												 'order'  => 'last_post desc',
+												 'limit'  => array( 0,1 )
+										)      );
+			
+			$dbs = array(
+						 'last_title'       => $tt['title']            ? $tt['title']            : "",
+						 'last_id'          => $tt['tid']              ? $tt['tid']              : "",
+						 'last_post'        => $tt['last_post']        ? $tt['last_post']        : "",
+						 'last_poster_name' => $tt['last_poster_name'] ? $tt['last_poster_name'] : "",
+						 'last_poster_id'   => $tt['last_poster_id']   ? $tt['last_poster_id']   : "",
+						);
+			
+			$DB->do_update( 'forums', $dbs, "id=".intval($this->forum['id']) );
+			
+			//-----------------------------------------
+			// Update forum cache
+			//-----------------------------------------
+			
+			foreach( $dbs as $k => $v )
+			{
+				$ibforums->cache['forum_cache'][ $this->forum['id'] ][ $k ] = $v;
+			}
+			
+			$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 0 ) );
+		}
+	}
+	
+	//-----------------------------------------
+	// @topic_add_reply: Appends topic with reply
+	// -----------
+	// Accepts: $post, $tids = array( 'tid', 'forumid' );
+	//         
+	// Returns: NOTHING (TRUE/FALSE)
+	//-----------------------------------------
 	
 	function topic_add_reply($post="", $tids=array(), $incpost=0)
 	{
@@ -110,17 +363,13 @@ class modfunctions
 					  'icon_id'     => 0,
 					  'post'        => $post,
 					  'author_name' => $ibforums->member['name'],
-					  'forum_id'    => "",
 					  'topic_id'    => "",
 					  'queued'      => 0,
-					  'attach_id'   => "",
-					  'attach_hits' => "",
-					  'attach_type' => "",
 					 );
 					 
-		//-------------------------------------
+		//-----------------------------------------
 		// Add posts...
-		//-------------------------------------
+		//-----------------------------------------
 		 
 		$seen_fids = array();
 		$add_posts = 0;
@@ -140,14 +389,9 @@ class modfunctions
 			if ( $tid and $fid )
 			{
 				$pa = $post;
-				$pa['forum_id'] = $fid;
 				$pa['topic_id'] = $tid;
 				
-				$db_string = $DB->compile_db_insert_string( $pa );
-		
-				$DB->query("INSERT INTO ibf_posts (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-				
-				unset($db_string);
+				$DB->do_insert( 'posts', $pa );
 				
 				$ta = array (
 							  'last_poster_id'   => $ibforums->member['id'],
@@ -157,8 +401,8 @@ class modfunctions
 							
 				$db_string = $DB->compile_db_update_string( $ta );
 				
-				$DB->query("UPDATE ibf_topics SET ".$db_string.", posts=posts+1 WHERE tid=$tid");
-				
+				$DB->simple_exec_query( array( 'update' => 'topics', 'set' => $db_string.", posts=posts+1", 'where' => 'tid='.$tid ) );
+		
 				$add_posts++;
 			}
 		}
@@ -176,11 +420,13 @@ class modfunctions
 		
 		if ( $add_posts > 0 )
 		{
-			$DB->query("UPDATE ibf_stats SET TOTAL_REPLIES=TOTAL_REPLIES+".$add_posts);
-			
-			//-------------------------------------------------
+			$ibforums->cache['stats']['total_replies'] += $add_posts;
+		
+			$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 0 ) );
+		
+			//-----------------------------------------
 			// Update current members stuff
-			//-------------------------------------------------
+			//-----------------------------------------
 		
 			$pcount = "";
 			$mgroup = "";
@@ -188,16 +434,16 @@ class modfunctions
 			
 			if ( ($this->forum['inc_postcount']) and ($incpost != 0) )
 			{
-				//------------------------------------
+				//-----------------------------------------
 				// Increment the users post count
-				//------------------------------------
+				//-----------------------------------------
 				
 				$pcount = "posts=posts+".$add_posts.", ";
 			}
 			
-			//------------------------------------
+			//-----------------------------------------
 			// Are we checking for auto promotion?
-			//------------------------------------
+			//-----------------------------------------
 			
 			if ($ibforums->member['g_promotion'] != '-1&-1')
 			{
@@ -212,20 +458,18 @@ class modfunctions
 				}
 			}
 			
-			$DB->query("UPDATE ibf_members SET ".$pcount.$mgroup."last_post=".time()." WHERE id=".$ibforums->member['id']);
-			
+			$DB->simple_exec_query( array( 'update' => 'members', 'set' => $pcount.$mgroup."last_post=".time(), 'where' => "id=".$ibforums->member['id'] ) );
 		}
 		
 		return TRUE;
-		
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @topic_close: close topic ID's
 	// -----------
 	// Accepts: Array ID's | Single ID
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function topic_close($id)
 	{
@@ -237,12 +481,12 @@ class modfunctions
 	}
 	
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @topic_open: open topic ID's
 	// -----------
 	// Accepts: Array ID's | Single ID
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function topic_open($id)
 	{
@@ -253,12 +497,12 @@ class modfunctions
 		$this->stm_exec($id);
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @topic_pin: pin topic ID's
 	// -----------
 	// Accepts: Array ID's | Single ID
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function topic_pin($id)
 	{
@@ -269,12 +513,12 @@ class modfunctions
 		$this->stm_exec($id);
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @topic_unpin: unpin topic ID's
 	// -----------
 	// Accepts: Array ID's | Single ID
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function topic_unpin($id)
 	{
@@ -286,17 +530,20 @@ class modfunctions
 	}
 	
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @topic_delete: deletetopic ID(s)
 	// -----------
 	// Accepts: $id (array | string) 
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
-	function topic_delete($id)
+	function topic_delete($id, $nostats=0)
 	{
 		global $std, $ibforums, $DB;
 		
+		$posts  = array();
+		$attach = array();
+		
 		$this->error = "";
 
 		if ( is_array( $id ) )
@@ -322,75 +569,99 @@ class modfunctions
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Remove polls assigned to this topic
-		//------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("DELETE FROM ibf_polls WHERE tid".$tid);
+		$DB->simple_exec_query( array( 'delete' => 'polls', 'where' => "tid".$tid ) );
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Remove polls assigned to this topic
-		//------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("DELETE FROM ibf_voters WHERE tid".$tid);
+		$DB->simple_exec_query( array( 'delete' => 'voters', 'where' => "tid".$tid ) );
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Remove polls assigned to this topic
-		//------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("DELETE FROM ibf_topics WHERE tid".$tid);
+		$DB->simple_exec_query( array( 'delete' => 'topics', 'where' => "tid".$tid ) );
 		
-		//------------------------------------
-		// Remove polls assigned to this topic
-		//------------------------------------
+		//-----------------------------------------
+		// Get PIDS for attachment deletion
+		//-----------------------------------------
 		
-		$DB->query("SELECT attach_id, attach_hits, attach_file FROM ibf_posts WHERE attach_id <> '' AND topic_id".$tid);
+		$DB->simple_construct( array( 'select' => 'pid', 'from' => 'posts', 'where' => "topic_id".$tid ) );
+		$DB->simple_exec();
 		
-		//------------------------------------
-		// Remove the attachments
-		//------------------------------------
-		
-		if ( $DB->get_num_rows() )
+		while ( $r = $DB->fetch_row() )
 		{
-			while ( $r = $DB->fetch_row() )
+			$posts[] = $r['pid'];
+		}
+		
+		//-----------------------------------------
+		// Remove the attachments
+		//-----------------------------------------
+		
+		if ( count( $posts ) )
+		{
+			$DB->simple_construct( array( "select" => '*', 'from' => 'attachments', 'where' => "attach_pid IN (".implode(",",$posts).")" ) );
+			$o = $DB->simple_exec();
+			
+			while ( $killmeh = $DB->fetch_row( $o ) )
 			{
-				if (is_file($this->upload_dir."/".$r['attach_id']))
+				if ( $killmeh['attach_location'] )
 				{
-					@unlink ($this->upload_dir."/".$r['attach_id']);
+					@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
 				}
+				if ( $killmeh['attach_thumb_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+				}
+				
+				$attach[] = $killmeh['attach_id'];
+			}
+			
+			if ( count( $attach ) )
+			{
+				$DB->simple_construct( array( 'delete' => 'attachments', 'where' => "attach_id IN (".implode(",",$attach).")" ) );
+				$DB->simple_exec();
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Remove the posts
-		//------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("DELETE FROM ibf_posts WHERE topic_id".$tid);
+		$DB->simple_exec_query( array( 'delete' => 'posts', 'where' => "topic_id".$tid ) );
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Recount forum...
-		//------------------------------------
+		//-----------------------------------------
 		
-		if ( $this->forum['id'] )
+		if ( $nostats == 0 )
 		{
-			$this->forum_recount( $this->forum['id'] );
+			if ( $this->forum['id'] )
+			{
+				$this->forum_recount( $this->forum['id'] );
+			}
+			
+			$this->stats_recount();
 		}
-		
-		$this->stats_recount();
 	}
 	
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @topic_move: move topic ID(s)
 	// -----------
 	// Accepts: $topics (array | string) $source,
 	//          $moveto
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function topic_move($topics, $source, $moveto, $leavelink=0)
 	{
-		global $std, $ibforums, $DB;
+		global $std, $ibforums, $DB, $forums;
 		
 		$this->error = "";
 		
@@ -420,76 +691,64 @@ class modfunctions
 			}
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Update the topic
-		//----------------------------------
+		//-----------------------------------------
 		
-		$DB->query("UPDATE ibf_topics SET forum_id=$moveto WHERE forum_id=$source AND tid".$tid);
+		$DB->do_update( 'topics', array( 'forum_id' => $moveto ), "forum_id=$source AND tid".$tid );
 		
-		//----------------------------------
-		// Update the posts
-		//----------------------------------
-		
-		$DB->query("UPDATE ibf_posts SET forum_id=$moveto WHERE forum_id=$source AND topic_id".$tid);
-		
-		//----------------------------------
+		//-----------------------------------------
 		// Update the polls
-		//----------------------------------
+		//-----------------------------------------
 		
-		$DB->query("UPDATE ibf_polls SET forum_id=$moveto WHERE forum_id=$source AND tid".$tid);
+		$DB->do_update( 'polls', array( 'forum_id' => $moveto ), "forum_id=$source AND tid".$tid );
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Are we leaving a stink er link?
-		//----------------------------------
+		//-----------------------------------------
 		
 		if ( $leavelink != 0 )
 		{
-			$oq = $DB->query("SELECT * FROM ibf_topics WHERE tid".$tid);
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "tid".$tid ) );
+			$oq = $DB->simple_exec();
 			
 			while ( $row = $DB->fetch_row($oq) )
 			{
-				$db_string = $DB->compile_db_insert_string( array (
-																	 'title'            => $row['title'],
-																	 'description'      => $row['description'],
-																	 'state'            => 'link',
-																	 'posts'            => 0,
-																	 'views'            => 0,
-																	 'starter_id'       => $row['starter_id'],
-																	 'start_date'       => $row['start_date'],
-																	 'starter_name'     => $row['starter_name'],
-																	 'last_post'        => $row['last_post'],
-																	 'forum_id'         => $source,
-																	 'approved'         => 1,
-																	 'pinned'           => 0,
-																	 'moved_to'         => $row['tid'].'&'.$moveto,
-																	 'last_poster_id'   => $row['last_poster_id'],
-																	 'last_poster_name' => $row['last_poster_name']
-														 )        );
-														 
-				$DB->query("INSERT INTO ibf_topics (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
+				$DB->do_insert( 'topics', array (
+												  'title'            => $row['title'],
+												  'description'      => $row['description'],
+												  'state'            => 'link',
+												  'posts'            => 0,
+												  'views'            => 0,
+												  'starter_id'       => $row['starter_id'],
+												  'start_date'       => $row['start_date'],
+												  'starter_name'     => $row['starter_name'],
+												  'last_post'        => $row['last_post'],
+												  'forum_id'         => $source,
+												  'approved'         => 1,
+												  'pinned'           => 0,
+												  'moved_to'         => $row['tid'].'&'.$moveto,
+												  'last_poster_id'   => $row['last_poster_id'],
+												  'last_poster_name' => $row['last_poster_name']
+									  )        );
 			}
 		
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Sort out subscriptions
-		//----------------------------------
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'mod_func_get_topic_tracker', array( 'tid' => $tid ) );
+		$DB->cache_exec_query();
 		
-		$DB->query("SELECT tr.*, m.id, m.mgroup, m.org_perm_id, f.read_perms, f.id, t.tid, g.g_id, g.g_perm_id
-				     FROM ibf_tracker tr
-				     LEFT JOIN ibf_topics t ON (tr.topic_id=t.tid)
-				     LEFT JOIN ibf_forums f ON (t.forum_id=f.id)
-				     LEFT JOIN ibf_members m on (m.id=tr.member_id)
-				     LEFT JOIN ibf_groups g on (g.g_id=m.mgroup)
-				    WHERE tr.topic_id".$tid);
-				    
 		$trid_to_delete = array();
 		
 		while ( $r = $DB->fetch_row() )
 		{
-			//----------------------------------------
+			//-----------------------------------------
 			// Match the perm group against forum_mask
-			//----------------------------------------
+			//-----------------------------------------
 			
 			$perm_id = $r['g_perm_id'];
 			
@@ -500,7 +759,7 @@ class modfunctions
 			
 			$pass = 0;
 			
-			$forum_perm_array = explode( ",", $r['read_perms'] );
+			$forum_perm_array = explode( ",", $forums->forum_by_id[ $r['forum_id'] ]['read_perms'] );
 			
 			foreach( explode( ',', $perm_id ) as $u_id )
 			{
@@ -518,85 +777,51 @@ class modfunctions
 		
 		if ( count($trid_to_delete) > 0 )
 		{
-			$DB->query("DELETE FROM ibf_tracker WHERE trid IN(".implode(',', $trid_to_delete ).")");
+			$DB->simple_exec_query( array( 'delete' => 'tracker', 'where' => "trid IN(".implode(',', $trid_to_delete ).")" ) );
 		}
 		
-		
 		return TRUE;
-	
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stats_recount: Recount all topics & posts
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stats_recount()
 	{
 		global $ibforums, $DB, $std;
-	
-		$DB->query("SELECT COUNT(tid) as tcount from ibf_topics WHERE approved=1");
-		$topics = $DB->fetch_row();
 		
-		$DB->query("SELECT COUNT(pid) as pcount from ibf_posts WHERE queued <> 1");
-		$posts  = $DB->fetch_row();
+		if ( ! is_array($ibforums->cache['stats']) )
+		{
+			$stats = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='stats'" ) );
 		
-		$posts = $posts['pcount'] - $topics['tcount'];
+			$ibforums->cache['stats'] = unserialize(stripslashes($stats['cs_value']));
+		}
 		
-		$DB->query("UPDATE ibf_stats SET TOTAL_TOPICS=".$topics['tcount'].", TOTAL_REPLIES=".$posts);
+		$topics = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as tcount',
+												 'from'   => 'topics',
+												 'where'  => 'approved=1' ) );
+		
+		$posts  = $DB->simple_exec_query( array( 'select' => 'SUM(posts) as replies',
+												 'from'   => 'topics',
+												 'where'  => 'approved=1' ) );
+		
+		$ibforums->cache['stats']['total_topics']  = $topics['tcount'];
+		$ibforums->cache['stats']['total_replies'] = $posts['replies'];
+		
+		$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 0 ) );
 	}
 	
-	//------------------------------------------------------
-	// @forum_recount_queue: Resets use_mod_posts boolean
-	// -----------
-	// Accepts: forum_id
-	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
 	
-	function forum_recount_queue($fid="")
-	{
-		global $ibforums, $DB, $std;
-		
-		$fid = intval($fid);
-		
-		if ( ! $fid )
-		{
-			return FALSE;
-		}
-		
-		$DB->query("SELECT count(tid) as cnt FROM ibf_topics WHERE forum_id=$fid and approved <> 1");
-		
-		$topic = $DB->fetch_row();
-		
-		$tcount = intval( $topic['cnt'] );
-		
-		$DB->query("SELECT count(pid) as cnt FROM ibf_posts WHERE forum_id=$fid and queued=1");
-		
-		$post = $DB->fetch_row();
-		
-		$pcount = intval( $post['cnt'] );
-		
-		if ( ($tcount > 0) or ($pcount > 0) )
-		{
-			$DB->query("UPDATE ibf_forums SET has_mod_posts=1 WHERE id=$fid");
-		}
-		else
-		{
-			$DB->query("UPDATE ibf_forums SET has_mod_posts=0 WHERE id=$fid");
-		}
-		
-		return TRUE;
-		
-	}
-	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @forum_recount: Recount topic & posts in a forum
 	// -----------
 	// Accepts: forum_id
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function forum_recount($fid="")
 	{
@@ -616,60 +841,92 @@ class modfunctions
 			}
 		}
 		
-		//----------------------------------------------
+		//-----------------------------------------
 		// Get the topics..
-		//----------------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("SELECT COUNT(tid) as count FROM ibf_topics WHERE approved=1 and forum_id=$fid");
-		$topics = $DB->fetch_row();
+		$topics = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as count',
+												 'from'   => 'topics',
+												 'where'  => "approved=1 and forum_id=$fid" ) );
 		
-		//----------------------------------------------
+		//-----------------------------------------
+		// Get the QUEUED topics..
+		//-----------------------------------------
+		
+		$queued_topics = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as count',
+														'from'   => 'topics',
+														'where'  => "approved=0 and forum_id=$fid" ) );
+		
+		//-----------------------------------------
 		// Get the posts..
-		//----------------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("SELECT COUNT(pid) as count FROM ibf_posts WHERE queued <> 1 and forum_id=$fid");
-		$posts = $DB->fetch_row();
+		$posts = $DB->simple_exec_query( array( 'select' => 'SUM(posts) as replies',
+												'from'   => 'topics',
+												'where'  => "approved=1 and forum_id=$fid" ) );
 		
-		//----------------------------------------------
+		//-----------------------------------------
+		// Get the QUEUED posts..
+		//-----------------------------------------
+		
+		$queued_posts = $DB->simple_exec_query( array( 'select' => 'SUM(topic_queuedposts) as replies',
+													   'from'   => 'topics',
+													   'where'  => "forum_id=$fid" ) );
+		
+		//-----------------------------------------
 		// Get the forum last poster..
-		//----------------------------------------------
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'tid, title, last_poster_id, last_poster_name, last_post',
+									  'from'   => 'topics',
+									  'where'  => "approved=1 and forum_id=$fid",
+									  'order'  => 'last_post DESC',
+									  'limit'  => array( 0,1 ) ) );
+		
+		$DB->simple_exec();
 		
-		$DB->query("SELECT tid, title, last_poster_id, last_poster_name, last_post FROM ibf_topics WHERE approved=1 and forum_id=$fid ORDER BY last_post DESC LIMIT 0,1");
 		$last_post = $DB->fetch_row();
 		
-		//----------------------------------------------
-		// Get real post count by removing topic starting posts from the count
-		//----------------------------------------------
-		
-		$real_posts = intval($posts['count']) - intval($topics['count']);
-		
-		//----------------------------------------------
+		//-----------------------------------------
 		// Reset this forums stats
-		//----------------------------------------------
+		//-----------------------------------------
 		
-		$db_string = $DB->compile_db_update_string( array (
-															 'last_poster_id'   => $last_post['last_poster_id'],
-															 'last_poster_name' => $last_post['last_poster_name'],
-															 'last_post'        => $last_post['last_post'],
-															 'last_title'       => $last_post['title'],
-															 'last_id'          => $last_post['tid'],
-															 'topics'           => intval($topics['count']) < 1 ? 0 : intval($topics['count']),
-															 'posts'            => intval($real_posts)      < 1 ? 0 : intval($real_posts),
-												 )        );
+		$dbs = array(
+					  'last_poster_id'   => $last_post['last_poster_id'],
+					  'last_poster_name' => $last_post['last_poster_name'],
+					  'last_post'        => $last_post['last_post'],
+					  'last_title'       => $last_post['title'],
+					  'last_id'          => $last_post['tid'],
+					  'topics'           => intval($topics['count']),
+					  'posts'            => intval($posts['replies']),
+					  'queued_topics'    => intval($queued_topics['count']),
+					  'queued_posts'     => intval($queued_posts['replies']),
+					);
 												 
-		$DB->query("UPDATE ibf_forums SET $db_string WHERE id=".$fid);
+		$DB->do_update( 'forums', $dbs, "id=".$fid );
+		
+		//-----------------------------------------
+		// Update forum cache
+		//-----------------------------------------
+		
+		foreach( $dbs as $k => $v )
+		{
+			$ibforums->cache['forum_cache'][ $fid ][ $k ] = $v;
+		}
+		
+		$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 0 ) );
 		
 		return TRUE;
 		
 	}
 	
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_init: Clear statement ready for multi-actions
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_init()
 	{
@@ -678,12 +935,12 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_exec: Executes stored statement
 	// -----------
 	// Accepts: Array ID's | Single ID
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_exec($id)
 	{
@@ -710,8 +967,7 @@ class modfunctions
 		{
 			if ( count($id) > 0 )
 			{
-				$DB->query("UPDATE ibf_topics SET $db_string WHERE tid IN(".implode( ",", $id ).")");
-				
+				$DB->simple_exec_query( array( 'update' => 'topics', 'set' => $db_string, 'where' => "tid IN(".implode( ",", $id ).")" ) );
 				return TRUE;
 			}
 			else
@@ -721,7 +977,7 @@ class modfunctions
 		}
 		else if ( intval($id) != "" )
 		{
-			$DB->query("UPDATE ibf_topics SET $db_string WHERE tid=".intval($id));
+			$DB->simple_exec_query( array( 'update' => 'topics', 'set' => $db_string, 'where' => "tid=".intval($id) ) );
 		}
 		else
 		{
@@ -730,12 +986,12 @@ class modfunctions
 	}
 	
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_add_pin: add pin command to statement
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_add_pin()
 	{
@@ -744,12 +1000,12 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_add_unpin: add unpin command to statement
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_add_unpin()
 	{
@@ -758,12 +1014,12 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_add_close: add close command to statement
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_add_close()
 	{
@@ -772,12 +1028,12 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_add_open: add open command to statement
 	// -----------
 	// Accepts: NOTHING
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_add_open()
 	{
@@ -786,12 +1042,12 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_add_title: add edit title command to statement
 	// -----------
 	// Accepts: new_title
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_add_title($new_title='')
 	{
@@ -805,12 +1061,12 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @stm_add_desc: add edit desc command to statement
 	// -----------
 	// Accepts: new_title
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function stm_add_desc($new_desc='')
 	{
@@ -824,13 +1080,41 @@ class modfunctions
 		return TRUE;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
+	// @stm_add_approve: Approve topic
+	// -----------
+	// Accepts: NOTHING
+	// Returns: NOTHING (TRUE/FALSE)
+	//-----------------------------------------
+	
+	function stm_add_approve()
+	{
+		$this->stm[] = array( 'approved' => 1 );
+		
+		return TRUE;
+	}
+	
+	//-----------------------------------------
+	// @stm_add_unapprove: Unapprove topic
+	// -----------
+	// Accepts: NOTHING
+	// Returns: NOTHING (TRUE/FALSE)
+	//-----------------------------------------
+	
+	function stm_add_unapprove()
+	{
+		$this->stm[] = array( 'approved' => 0 );
+		
+		return TRUE;
+	}
+	
+	//-----------------------------------------
 	// @sql_prune_create: returns formatted SQL statement
 	// -----------
 	// Accepts: forum_id, poss_starter_id, poss_topic_state, poss_post_min
 	//			poss_date_expiration, poss_ignore_pin_state
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function sql_prune_create( $forum_id, $starter_id="", $topic_state="", $post_min="", $date_exp="", $ignore_pin="" )
 	{
@@ -869,12 +1153,12 @@ class modfunctions
 	
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @mm_authorize: Authorizes current member
 	// -----------
 	// Accepts: (NOTHING: Should already be passed to init)
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function mm_authorize()
 	{
@@ -897,19 +1181,19 @@ class modfunctions
 		return $pass_go;
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @mm_check_id_in_forum: Checks to see if mm_id is in
     //                        the forum saved topic_mm_id
 	// -----------
 	// Accepts: (forum_topic_mm_id , this_mm_id)
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
-	function mm_check_id_in_forum( $forum_topic_mm_id, $this_mm_id )
+	function mm_check_id_in_forum( $fid, $mm_data)
 	{
 		$retval = FALSE;
 		
-		if ( stristr( $forum_topic_mm_id , ','.$this_mm_id.',' ) )
+		if (  $mm_data['mm_forums'] == '*' OR strstr( ",". $mm_data['mm_forums'].",", ",".$fid."," ) )
 		{
 			$retval = TRUE;
 		}
@@ -917,34 +1201,30 @@ class modfunctions
 		return $retval;	
 	}
 	
-	//------------------------------------------------------
+	//-----------------------------------------
 	// @add_moderate_log: Adds entry to mod log
 	// -----------
 	// Accepts: (forum_id, topic_id, topic_title, post_id, title)
 	// Returns: NOTHING (TRUE/FALSE)
-	//------------------------------------------------------
+	//-----------------------------------------
 	
 	function add_moderate_log($fid, $tid, $pid, $t_title, $mod_title='Unknown')
 	{
 		global $std, $ibforums, $DB, $HTTP_REFERER, $QUERY_STRING;
 		
-		$db_string = $std->compile_db_string( array (
-														'forum_id'    => $fid,
-														'topic_id'    => $tid,
-														'post_id'     => $pid,
-														'member_id'   => $ibforums->member['id'],
-														'member_name' => $ibforums->member['name'],
-														'ip_address'  => $ibforums->input['IP_ADDRESS'],
-														'http_referer'=> $HTTP_REFERER,
-														'ctime'       => time(),
-														'topic_title' => $t_title,
-														'action'      => $mod_title,
-														'query_string'=> $QUERY_STRING,
-													)
-										    );
-		
-		$DB->query("INSERT INTO ibf_moderator_logs (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
+		$DB->do_insert( 'moderator_logs', array (
+												  'forum_id'    => $fid,
+												  'topic_id'    => $tid,
+												  'post_id'     => $pid,
+												  'member_id'   => $ibforums->member['id'],
+												  'member_name' => $ibforums->member['name'],
+												  'ip_address'  => $ibforums->input['IP_ADDRESS'],
+												  'http_referer'=> $HTTP_REFERER,
+												  'ctime'       => time(),
+												  'topic_title' => $t_title,
+												  'action'      => $mod_title,
+												  'query_string'=> $QUERY_STRING,
+											  )  );
 	}
 	
 	
diff --git a/upload/sources/lib/msg_functions.php b/upload/sources/lib/msg_functions.php
new file mode 100644
index 00000000..45797567
--- /dev/null
+++ b/upload/sources/lib/msg_functions.php
@@ -0,0 +1,1179 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Msg Func module
+|   > Module written by Matt Mecham
+|   > Date started: 14th February 2002
+|
+|   > Module Version 1.0.0
+|   > DBA Checked: Fri 21 May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class msg_functions
+{
+
+	var $postlib      = "";
+	var $class        = "";
+	var $output       = "";
+	var $can_upload   = 0;
+	var $form_extra   = "";
+	var $hidden_field = "";
+	var $redirect_url = "";
+	var $redirect_lang= "";
+	
+	var $force_pm     = 0;
+	
+	function register_class( $class )
+	{
+		$this->class = &$class;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Initiate
+	/*-------------------------------------------------------------------------*/
+	
+	function init()
+	{
+		global $DB, $ibforums, $forums, $std, $print, $skin_universal;
+		
+		//-----------------------------------------
+		// Get post stuff
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/post.php' );
+		$this->postlib = new post();
+		$this->postlib->init();
+		
+		if ( $ibforums->member['g_attach_max'] != -1 and $ibforums->member['g_can_msg_attach'] )
+		{
+			$this->can_upload   = 1;
+			$this->form_extra   = " enctype='multipart/form-data'";
+			$this->hidden_field = "<input type='hidden' name='MAX_FILE_SIZE' value='".($ibforums->member['g_attach_max']*1024)."' />";
+		}
+		
+		$this->postlib->can_upload = $this->can_upload;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Send form stuff
+	/*-------------------------------------------------------------------------*/
+	
+	function send_form($preview=0, $errors="")
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$this->form_mid     = intval($ibforums->input['MID']);
+ 		$this->form_orig_id = intval($ibforums->input['MSID']);
+ 		
+ 		//-----------------------------------------
+ 		// Fix up errors
+ 		//-----------------------------------------
+ 		
+ 		$errors = preg_replace( "/^<br>/", "", $errors );
+ 		
+    	//-----------------------------------------
+    	// Preview post?
+    	//-----------------------------------------
+    	
+    	if ( $preview )
+    	{
+    		$old_msg = $this->postlib->parser->convert( array( 'TEXT'    => $std->remove_tags($ibforums->input['Post']),
+															   'SMILIES' => 1,
+															   'CODE'    => $ibforums->vars['msg_allow_code'],
+															   'HTML'    => $ibforums->vars['msg_allow_html']
+													  )     );
+											 
+			$this->output .= $this->class->html->preview($old_msg);
+    	
+    	}
+    	
+    	if ($errors != "")
+    	{
+    		$this->output .= $this->class->html->pm_errors($errors);
+    		$preview = 1;
+    	}
+    	
+    	//-----------------------------------------
+ 		// Load the contacts
+ 		//-----------------------------------------
+ 		
+ 		$contacts = $this->build_contact_list();
+ 		
+ 		$name_to_enter = "";
+ 		$old_message   = "";
+ 		$old_title     = "";
+    	
+    	//-----------------------------------------
+ 		// Did we come from a button with a user ID?
+ 		//-----------------------------------------
+ 		
+		if ( $this->form_mid )
+		{
+			$DB->simple_construct( array( 'select' => 'name, id', 'from' => 'members', 'where' => "id=".$this->form_mid ) );
+			$DB->simple_exec();
+			
+			$name = $DB->fetch_row();
+			
+			if ($ibforums->input['fwd'] != 1)
+			{
+				if ($name['id'])
+				{
+					$name_to_enter = $name['name'];
+				}
+			}
+		}
+		else
+		{
+			$name_to_enter = $ibforums->input['entered_name'];
+		}
+ 		
+ 		//-----------------------------------------
+ 		// Are we quoting an old message?
+ 		//-----------------------------------------
+ 		
+ 		if ( $preview or $this->class->show_form )
+ 		{
+ 			$old_message = $std->txt_htmlspecialchars($std->txt_stripslashes($_POST['Post']));
+ 			$old_title   = preg_replace( "/'/", "&#39;", $std->txt_stripslashes($_POST['msg_title']) );
+ 			
+ 		}
+ 		else if ( $this->form_orig_id )
+ 		{
+ 			$DB->cache_add_query( 'msg_get_saved_msg', array( 'msgid' => $this->form_orig_id, 'mid' => $ibforums->member['id'] ) );
+ 			$DB->simple_exec();
+ 			
+ 			$old_msg = $DB->fetch_row();
+ 			
+ 			if ($old_msg['mt_title'])
+ 			{
+ 				if ( $this->class->edit_saved ) 
+				{
+					$name_to_enter         = $old_msg['name'];
+					$cc_text               = $old_msg['msg_cc_users'];
+					$old_title             = $old_msg['mt_title'];
+					$old_message           = $std->my_br2nl( $old_msg['msg_post'] );
+					$this->class->post_key = $old_msg['msg_post_key'];
+					$ibforums->input['OID']= $old_msg['mt_id'];
+				}
+ 				else if ($ibforums->input['fwd'] == 1)
+ 				{
+ 					$old_title     = "Fwd:".$old_msg['mt_title'];
+ 					$old_title     = preg_replace( "/^(?:Fwd\:){1,}/i", "Fwd:", $old_title );
+ 					$old_message   = '[QUOTE]'.sprintf($ibforums->lang['vm_forward_text'], $name['name'])."\n\n".$old_msg['msg_post'].'[/QUOTE]'."\n";
+ 					$old_message   = $std->my_br2nl( $old_message );
+ 				}
+ 				else
+ 				{
+ 					$old_title   = "Re:".$old_msg['mt_title'];
+ 					$old_title   = preg_replace( "/^(?:Re\:){1,}/i", "Re:", $old_title );
+ 					$old_message = '[QUOTE]'.$old_msg['msg_post'].'[/QUOTE]'."\n";
+ 					$old_message = $std->my_br2nl( $old_message );
+ 				}
+ 			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Build up the HTML for the send form
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->postlib->html->get_javascript();
+ 		
+ 		$this->output .= $this->class->html->Send_form( array (
+																'CONTACTS'  => $contacts,
+																'MEMBER'    => $this->member,
+																'N_ENTER'   => $name_to_enter,
+																'O_TITLE'   => $old_title,
+																'OID'       => $ibforums->input['OID'], // Old unsent msg id for restoring saved msg - used to delete saved when sent
+																'post_key'  => $this->class->post_key,
+																'form_extra'=> $this->form_extra,
+																'upload'    => $this->hidden_field,
+																
+													  )       );
+ 		
+ 		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
+ 		
+ 		$this->output .= $this->postlib->html->pm_postbox_buttons($old_message);
+ 		
+ 		if ($this->can_upload)
+		{
+			$this->output .= $this->postlib->html_build_uploads($this->class->post_key,'msg');
+		}
+ 		
+ 		$this->output .= $this->class->html->send_form_footer();
+ 		
+ 		//-----------------------------------------
+ 		// Add in the smilies box
+ 		//-----------------------------------------
+ 		
+ 		$this->output = $this->postlib->html_add_smilie_box($this->output);
+		
+		$this->class->page_title = $ibforums->lang['t_welcome'];
+ 		$this->class->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+		
+		//-----------------------------------------
+ 		// Do we have permission to mass PM peeps?
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->member['g_max_mass_pm'] > 0)
+ 		{
+ 			$ibforums->lang['carbon_copy_desc'] = sprintf( $ibforums->lang['carbon_copy_desc'], $ibforums->member['g_max_mass_pm'] );
+ 			
+ 			if ( isset($_POST['carbon_copy']) or $cc_text )
+ 			{
+ 				$cc_text = $cc_text ? $cc_text : $std->txt_htmlspecialchars($_POST['carbon_copy']);
+ 				
+ 				$cc_box = preg_replace( "#</textarea>#i", "", $std->txt_stripslashes($cc_text) );
+ 			}
+ 			
+ 			$this->output = str_replace( "<!--IBF.MASS_PM_BOX-->", $this->class->html->mass_pm_box($cc_box), $this->output );
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Build contact listy poos
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function build_contact_list()
+	{
+		global $DB, $std, $ibforums;
+		
+		$contacts = "";
+ 		
+ 		$DB->simple_construct( array( 'select' => '*', 'from' => 'contacts', 'where' => "member_id=".$ibforums->member['id'], 'order' => "contact_name") );
+ 		$DB->simple_exec();
+ 		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			$contacts = "<select name='from_contact' class='forminput'><option value='-'>".$ibforums->lang['other']."</option>\n<option value='-'>--------------------</option>\n";
+ 			
+ 			while ( $entry = $DB->fetch_row() )
+ 			{
+ 				$selected = ( $ibforums->input['from_contact'] == $entry['contact_id'] ) ? ' selected="selected"' : '';
+ 				
+ 				$contacts .= "<option value='".$entry['contact_id']."'{$selected}>".$entry['contact_name']."</option>\n";
+ 			}
+ 			
+ 			$contacts .= "</select>\n";
+ 		}
+ 		else
+ 		{
+ 			$contacts = $ibforums->lang['address_list_empty'];
+ 		}
+ 		
+ 		return $contacts;
+ 	}
+ 	
+ 	
+ 	//-----------------------------------------
+ 	// API for deleting messages
+ 	//-----------------------------------------
+ 	
+ 	function delete_messages($ids, $owner_id, $extra="")
+ 	{
+		global $DB, $ibforums, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Basic WHERE
+ 		//-----------------------------------------
+ 		
+ 		if ( ! $extra )
+ 		{
+ 			$extra = "mt_owner_id=$owner_id";
+ 		}
+ 		
+ 		$id_string = "";
+ 		
+ 		if ( is_array( $ids ) )
+ 		{
+ 			if ( ! count($ids) )
+ 			{
+ 				return;
+ 			}
+ 			
+ 			$id_string = 'IN ('.implode( ",", $ids ).')';
+ 		}
+ 		else
+ 		{
+ 			if ( ! $ids )
+ 			{
+ 				return;
+ 			}
+ 			
+ 			$id_string = '='.$ids;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Are these our messages?
+ 		//-----------------------------------------
+ 		
+ 		$DB->simple_construct( array( 'select' => 'mt_id, mt_msg_id', 'from' => 'message_topics', 'where' => "$extra AND mt_id $id_string" ) );
+ 		$DB->simple_exec();
+ 		
+ 		$final_ids = array();
+ 		$final_mts = array();
+ 		
+ 		while ( $i = $DB->fetch_row() )
+ 		{
+ 			$final_ids[ $i['mt_id'] ] = $i['mt_msg_id'];
+ 			$final_mts[] = $i['mt_id'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Delete MT topics
+ 		//-----------------------------------------
+ 		
+ 		if ( count($final_mts) )
+ 		{
+ 			$DB->simple_construct( array( 'delete' => 'message_topics', 'where' => "mt_id IN (".implode( ',',$final_mts ).")" ) );
+ 			$DB->simple_exec();
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Update delete count
+ 		//-----------------------------------------
+ 		
+ 		if ( count($final_ids) )
+ 		{
+ 			$DB->simple_construct( array( 'update' => 'message_text', 'set' => "msg_deleted_count=msg_deleted_count+1", 'where' => "msg_id IN (".implode( ',',$final_ids ).")" ) );
+ 			$DB->simple_exec();
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Run through and delete dead msgs
+ 		//-----------------------------------------
+ 		
+ 		$deleted_ids = array();
+ 		$attach_ids  = array();
+ 		
+ 		$DB->simple_construct( array( 'select' => 'msg_id', 'from' => 'message_text', 'where' => 'msg_deleted_count >= msg_sent_to_count' ) );
+ 		$DB->simple_exec();
+ 		
+ 		while ( $r = $DB->fetch_row() )
+ 		{
+ 			$deleted_ids[] = $r['msg_id'];
+ 		}
+ 		
+ 		if ( count($deleted_ids) )
+ 		{
+ 			$DB->simple_construct( array( 'delete' => 'message_text', 'where' => "msg_id IN (".implode( ',',$deleted_ids ).")") );
+ 			$DB->simple_exec();
+ 			
+ 			$DB->simple_construct( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_msg IN (".implode( ',',$deleted_ids ).")") );
+ 			$DB->simple_exec();
+ 		
+ 			while ( $a = $DB->fetch_row() )
+ 			{
+ 				$attach_ids[] = $a['attach_id'];
+ 				
+ 				if ( $a['attach_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$a['attach_location'] );
+				}
+				if ( $a['attach_thumb_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$a['attach_thumb_location'] );
+				}
+ 			}
+ 			
+ 			if ( count($attach_ids) )
+ 			{
+ 				$DB->simple_construct( array( 'delete' => 'attachments', 'where' => "attach_id IN (".implode( ',',$attach_ids ).")") );
+ 				$DB->simple_exec();
+ 			}
+ 		}
+ 	}
+
+ 	/*-------------------------------------------------------------------------*/
+	// Send form stuff
+	/*-------------------------------------------------------------------------*/
+	
+	function send_pm( $opts=array() )
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// INIT some vars
+ 		//-----------------------------------------
+ 		
+ 		if ( ! $this->to and $this->to_by_id )
+ 		{
+ 			//-----------------------------------------
+ 			// Just an id...
+ 			//-----------------------------------------
+ 			
+ 			$tmp = $DB->simple_exec_query( array( 'select' => 'name', 'from' => 'members', 'where' => 'id='.$this->to_by_id ) );
+ 			
+ 			$this->to = $tmp['name'];
+ 		}
+ 		
+ 		$this->to = strtolower(str_replace( '|', '&#124;', $this->to) );
+ 		
+ 		$DB->cache_add_query( 'msg_get_cc_users', array( 'name_array' => array( 0 => "'".$this->to."'" ) ) );
+		$DB->simple_exec();
+			
+ 		if ( ! $this->send_to_member = $DB->fetch_row() )
+ 		{
+ 			$this->error = $ibforums->lang['err_no_such_member'];
+ 			return;
+ 		}
+ 		
+ 		$this->error = "";
+ 		$this->save_only      = $opts['save_only'];
+ 		$this->orig_id        = $opts['orig_id'];
+ 		$this->preview        = $opts['preview'];
+ 		$this->add_tracking   = $opts['track'];
+ 		$this->add_sent       = $opts['add_sent'];
+ 		$this->hide_cc        = $opts['hide_cc'];
+ 		
+ 		//-----------------------------------------
+ 		// Are we simply saving this for later?
+ 		//-----------------------------------------
+ 		
+ 		$this->_process_save_only();
+ 		
+ 		if ( $this->redirect_url )
+ 		{
+ 			return;
+ 		}
+ 		
+ 		if ( $this->force_pm != 1 )
+ 		{
+ 			//-----------------------------------------
+			// Can the reciepient use the PM system?
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'msg_get_msg_poster', array( 'mid' => $this->send_to_member['id'] ) );
+			$DB->simple_exec();
+			
+			$to_msg_stats = $DB->fetch_row();
+ 		
+			if ($to_msg_stats['g_use_pm'] != 1)
+			{
+				$ibforums->input['MID'] = $this->send_to_member['id'];
+				$this->error = $ibforums->lang['no_usepm_member'];
+				return;
+			}
+			
+			//-----------------------------------------
+			// Does the target member have enough room
+			// in their inbox for a new message?
+			//-----------------------------------------
+			
+			$to_msg_stats = $this->_get_real_allowance( $to_msg_stats );
+			
+			if ( (($to_msg_stats['msg_total']) >= $to_msg_stats['g_max_messages']) and ($to_msg_stats['g_max_messages'] > 0) )
+			{
+				$this->error = $ibforums->lang['no_usepm_member'];
+				return;
+			}
+ 		
+			//-----------------------------------------
+			// Has the reciepient blocked us?
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => 'contact_id, allow_msg', 'from' => 'contacts', 'where' => "contact_id=".$this->from_member['id']." AND member_id=".$this->send_to_member['id'] ) );
+			$DB->simple_exec();
+			
+			$can_msg = $DB->fetch_row();
+ 		
+			if ( (isset($can_msg['contact_id'])) and ($can_msg['allow_msg'] != 1) )
+			{
+				$ibforums->input['MID'] = $this->send_to_member['id'];
+				$this->error = $ibforums->lang['msg_blocked'];
+				return;
+			}
+			
+			//-----------------------------------------
+			// Do we have enough room to store a
+			// saved copy?
+			//-----------------------------------------
+			
+			if ($ibforums->input['add_sent'] and ($ibforums->member['g_max_messages'] > 0) )
+			{
+				if ( ($this->msg_stats['msg_total'] + 1) >= $ibforums->member['g_max_messages'] )
+				{
+					$this->error = $ibforums->lang['max_message_from'];
+					return;
+				}
+			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// CC PM stuff
+ 		//-----------------------------------------
+ 		
+ 		$this->can_mass_pm = 0;
+ 		
+ 		if ( $ibforums->member['g_max_mass_pm'] > 0 or $this->force_pm )
+ 		{
+ 			$cc_array = $this->_process_cc();
+ 		}
+ 		
+ 		if ( $this->error != "" )
+ 		{
+ 			return;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Add our original ID
+ 		//-----------------------------------------
+ 		
+ 		$cc_array[ $this->send_to_member['id'] ] = $this->send_to_member;
+ 		
+ 		unset($to_member);
+ 		
+ 		//-----------------------------------------
+ 		// Insert the message body
+ 		//-----------------------------------------
+ 		
+ 		$count = count( $cc_array );
+ 		
+ 		if ( $this->add_sent )
+ 		{
+ 			// we're storing a copy locally, so
+ 			// add 1 to the "sent_to_count"
+ 			
+ 			$count++;
+ 		}
+ 		
+ 		$DB->do_insert( 'message_text', array(
+											   'msg_date'	       => time(),
+											   'msg_post'          => $std->remove_tags($this->msg_post),
+											   'msg_cc_users'      => $this->cc_users,
+											   'msg_sent_to_count' => $count,
+											   'msg_post_key'      => $this->class->post_key,
+											   'msg_author_id'     => $this->from_member['id']
+									  )      );
+			
+			
+		$msg_id = $DB->get_insert_id();
+		
+		//-----------------------------------------
+		// Make attachments permanent
+		//-----------------------------------------
+		
+		$no_attachments = $this->postlib->pf_make_attachments_permanent( $this->class->post_key, "", "", $msg_id );
+		
+		//-----------------------------------------
+		// If we have an original ID - delete it and 'move'
+		// attachments
+		//-----------------------------------------
+		
+		if ( $this->orig_id )
+		{
+			$DB->cache_add_query( 'msg_get_saved_msg', array( 'mid' => $this->from_member['id'], 'msgid' => $this->orig_id ) );
+			$DB->simple_exec();
+			
+			if( $old = $DB->fetch_row() )
+			{
+				//-----------------------------------------
+				// Update attachments
+				//-----------------------------------------
+				
+				$DB->simple_construct( array( 'update' => 'attachments', 'set' => "attach_post_key='{$this->class->post_key}', attach_msg=$msg_id", 'where' => "attach_msg={$old['msg_id']}" ) );
+				$DB->simple_exec();
+				
+				$DB->simple_construct( array( 'delete' => 'message_topics', 'where' => "mt_id={$old['mt_id']}" ) );
+				$DB->simple_exec();
+				
+				$DB->simple_construct( array ( 'update' => 'message_text', 'set' => 'msg_deleted_count=msg_deleted_count-1', 'where' => "msg_id={$old['msg_id']}" ) );
+				$DB->simple_exec();
+				
+				$no_attachments = $old['mt_hasattach'];
+			}
+		}
+ 		
+ 		//-----------------------------------------
+ 		// loop....
+ 		//-----------------------------------------
+ 		
+ 		foreach ($cc_array as $user_id => $to_member)
+ 		{
+			//-----------------------------------------
+			// Sort out tracking and pop us status
+			//-----------------------------------------
+			
+			$show_popup =  $to_member['view_pop'];
+			
+			//-----------------------------------------
+			// Enter the info into the DB
+			// Target user side.
+			//-----------------------------------------
+			
+			$DB->do_insert( 'message_topics', array(
+													 'mt_msg_id'     => $msg_id,
+													 'mt_date'       => time(),
+													 'mt_title'      => $this->msg_title,
+													 'mt_from_id'    => $this->from_member['id'],
+													 'mt_to_id'      => $to_member['id'],
+													 'mt_vid_folder' => 'in',
+													 'mt_hide_cc'    => 0,
+													 'mt_tracking'   => $this->add_tracking,
+													 'mt_hasattach'  => intval($no_attachments),
+													 'mt_owner_id'   => $to_member['id'],
+													 'mt_hide_cc'    => $this->hide_cc,
+									       )      );
+			
+			
+			$mt_id = $DB->get_insert_id();
+			
+			//-----------------------------------------
+			// Update profile
+			//-----------------------------------------
+			
+			$inbox_count = $this->_get_dir_count( $to_member['vdirs'], 'in' );
+			
+			$new_vdir = $this->rebuild_dir_count( $to_member['id'],
+												  "",
+												  'in',
+												  $inbox_count + 1,
+												  'save',
+												  "msg_total=msg_total+1,new_msg=new_msg+1,show_popup={$show_popup}"
+												);
+												
+			//-----------------------------------------
+			// Has this member requested a PM email nofity?
+			//-----------------------------------------
+			
+			if ($to_member['email_pm'] == 1)
+			{
+				$to_member['language'] = $to_member['language'] == "" ? 'en' : $to_member['language'];
+				
+				$this->postlib->email->get_template("pm_notify", $to_member['language']);
+			
+				$this->postlib->email->build_message( array(
+													'NAME'   => $to_member['name'],
+													'POSTER' => $this->from_member['name'],
+													'TITLE'  => $this->msg_title,
+													'LINK'   => "?act=Msg&CODE=03&VID=in&MSID=$mt_id",
+													)       );
+											
+				$this->postlib->email->subject = $ibforums->lang['pm_email_subject'];
+				$this->postlib->email->to      = $to_member['email'];
+				$this->postlib->email->send_mail();
+			
+			}
+		}
+		
+ 		//-----------------------------------------
+ 		// Add the data to the current members DB if we are
+ 		// adding it to our "sent items" folder
+ 		//-----------------------------------------
+ 		
+ 		if ( $this->add_sent )
+ 		{
+ 			$sent_count = $this->_get_dir_count( $this->from_member['vdirs'], 'sent' );
+			
+			$this->rebuild_dir_count( $this->from_member['id'],
+									  "",
+									  'sent',
+									  $sent_count + 1,
+									  'save',
+									  "msg_total=msg_total+1"
+									);
+									 
+			$DB->do_insert( 'message_topics', array(
+													 'mt_msg_id'     => $msg_id,
+													 'mt_date'       => time(),
+													 'mt_title'      => $this->msg_title,
+													 'mt_from_id'    => $this->from_member['id'],
+													 'mt_to_id'      => $this->send_to_member['id'],
+													 'mt_vid_folder' => 'sent',
+													 'mt_hide_cc'    => 0,
+													 'mt_tracking'   => 0,
+													 'mt_hasattach'  => intval($no_attachments),
+													 'mt_owner_id'   => $this->from_member['id'],
+													 'mt_hide_cc'    => $this->hide_cc,
+									       )      );
+			
+		}
+		
+		$this->to_by_id = "";
+		$this->to       = "";
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// Rebuild DIR count
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_dir_count($mid, $vdir, $cur_dir, $new_count, $nosave='save', $extra="")
+	{
+		global $DB, $std, $ibforums, $forums;
+		
+		$rebuild = array();
+		
+		if ( ! $vdir )
+		{
+			$DB->simple_construct( array( "select" => 'vdirs', 'from' => 'member_extra', 'where' => 'id='.$mid ) );
+			$DB->simple_exec();
+			
+			$mem = $DB->fetch_row();
+			
+			$vdir = $mem['vdirs'] ? $mem['vdirs'] : 'in:Inbox;0|sent:Sent Items;0';
+		}
+		
+		foreach( explode( "|", $vdir ) as $dir )
+    	{
+    		list ($id  , $data)  = explode( ":", $dir );
+    		list ($real, $count) = explode( ";", $data );
+    		
+    		if ( ! $id )
+    		{
+    			continue;
+    		}
+    		
+    		if ( $id == $cur_dir )
+    		{
+    			$count = $new_count;
+    			$count = $count < 1 ? 0 : $count;
+    		}
+    		
+    		$rebuild[$id] = $id.':'.$real.';'.intval($count);
+    	}
+    	
+    	$final = implode( '|', $rebuild );
+    	
+    	if ( $nosave != 'nosave' )
+    	{ 
+			$DB->simple_construct( array( 'update' =>  'member_extra', 'set' => 'vdirs="'.$final.'"', 'where' => 'id='.$mid ) );
+			$DB->simple_exec();
+			
+			if ( $extra )
+			{
+				$DB->simple_construct( array( 'update' =>  'members', 'set' => $extra, 'where' => 'id='.$mid ) );
+				$DB->simple_exec();
+			}
+    	}
+    	
+    	return $final;
+		
+	}
+	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// POST PROCESS CC
+	/*-------------------------------------------------------------------------*/
+	
+	function format_cc_string($cc_users, $mid )
+	{
+		global $DB, $std, $ibforums;
+		
+		$cc_array = array();
+		$final    = array();
+		
+		$cc_array = $this->get_cc_array( $cc_users );
+		
+		foreach( $cc_array as $id => $data )
+		{
+			if ( $id == $mid )
+			{
+				continue;
+			}
+			
+			$final[] = $std->make_profile_link( $data['name'], $data['id'] );
+		}
+		
+		return implode( ", ", $final );
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// PROCESS CC
+	/*-------------------------------------------------------------------------*/
+	
+	function get_cc_array($cc_users)
+	{
+		global $DB, $std, $ibforums, $forums;
+		
+ 		$cc_array = array();
+ 		
+		$cc_users = strtolower(str_replace( '|', '&#124;', $cc_users) );
+		
+		if ( $cc_users )
+		{
+			//-----------------------------------------
+			// Sort out the array
+			//-----------------------------------------
+			
+			$cc_users = str_replace(  "<br><br>", "<br>" , trim($cc_users) );
+			$cc_users = preg_replace( "/^(<br>){1}/", "" , $cc_users );
+			$cc_users = preg_replace( "/(<br>){1}$/", "" , $cc_users );
+			$cc_users = preg_replace( "/<br>\s+/",  ","  , $cc_users );
+			
+			$temp_array = explode( "<br>", $cc_users );
+			
+			//-----------------------------------------
+			// Make SQL'able
+			//-----------------------------------------
+			
+			if ( is_array($temp_array) and count($temp_array) > 0 )
+			{
+				$new_array = array();
+				
+				foreach( $temp_array as $name )
+				{
+					$name  = "'".trim(strtolower($name))."'";
+					
+					if (in_array( $name, $new_array ) )
+					{
+						continue;
+					}
+					
+					$new_array[] = $name;
+				}
+			}
+			
+			//-----------------------------------------
+			// SQL it
+			//-----------------------------------------
+			
+			if ( is_array($new_array) and count($new_array) > 0 )
+			{
+				$array_count = count($new_array);
+				
+				$DB->cache_add_query( 'msg_get_cc_users', array( 'name_array' => $new_array ) );
+				$DB->simple_exec();
+				
+				while( $r = $DB->fetch_row() )
+				{
+					$cc_array[$r['id']] = $r;
+				}
+			}
+		}
+		
+		return $cc_array;
+	}
+			
+
+	/*-------------------------------------------------------------------------*/
+	// PROCESS CC
+	/*-------------------------------------------------------------------------*/
+	
+	function _process_cc()
+	{
+		global $DB, $std, $ibforums, $forums;
+		
+		$this->can_mass_pm = 1;
+ 		$cc_array = array();
+ 		
+		$this->cc_users = strtolower(str_replace( '|', '&#124;', $this->cc_users) );
+		
+		if (isset($this->cc_users) and $this->cc_users != "")
+		{
+			//-----------------------------------------
+			// Sort out the array
+			//-----------------------------------------
+			
+			$this->cc_users = str_replace(  "<br>", "<br />" , trim($this->cc_users) );
+			$this->cc_users = str_replace(  "<br /><br />", "<br />" , trim($this->cc_users) );
+			$this->cc_users = preg_replace( "#^(<br />){1}#", "" , $this->cc_users );
+			$this->cc_users = preg_replace( "#(<br />){1}$#", "" , $this->cc_users );
+			$this->cc_users = preg_replace( "#<br />\s+#",  ","  , $this->cc_users );
+			
+			$temp_array = explode( "<br />", $this->cc_users );
+			
+			//-----------------------------------------
+			// Make SQL'able
+			//-----------------------------------------
+			
+			if ( is_array($temp_array) and count($temp_array) > 0 )
+			{
+				$new_array = array();
+				
+				foreach( $temp_array as $name )
+				{
+					$name  = "'".trim(strtolower($name))."'";
+					
+					if (in_array( $name, $new_array ) )
+					{
+						continue;
+					}
+					
+					$new_array[] = $name;
+				}
+			}
+			
+			//-----------------------------------------
+			// SQL it
+			//-----------------------------------------
+			
+			if ( is_array($new_array) and count($new_array) > 0 )
+			{
+				$array_count = count($new_array);
+				
+				$DB->cache_add_query( 'msg_get_cc_users', array( 'name_array' => $new_array ) );
+				$DB->simple_exec();
+						   
+				if ( ! $DB->get_num_rows() )
+				{
+					$this->error = $ibforums->lang['pme_no_cc_user'];
+					return;
+				}
+				else
+				{
+					while( $r = $DB->fetch_row() )
+					{
+						$cc_array[$r['id']] = $r;
+					}
+					
+					//-----------------------------------------
+					
+					if ( $this->force_pm != 1 )
+					{
+						if ( count($cc_array) > $ibforums->member['g_max_mass_pm'])
+						{
+							$ibforums->input['MID'] = $this->send_to_member['id'];
+							$this->error = $ibforums->lang['pme_too_many'];
+							return;
+						}
+					}
+					
+					//-----------------------------------------
+					// Names exist?
+					//-----------------------------------------
+					
+					$cc_error = "";
+					
+					if ( count($cc_array) != $array_count )
+					{
+						foreach( $new_array as $n )
+						{
+							$seen = 0;
+							
+							foreach( $cc_array as $idx => $cc_user )
+							{
+								$tmp = "'".strtolower($cc_user['name'])."'";
+								
+								if ($tmp == $n)
+								{
+									$seen = 1;
+								}
+							}
+							
+							if ($seen != 1)
+							{
+								$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_nomem'], $n, $n );
+							}
+						}
+					}
+					
+					if ($cc_error != "")
+					{
+						$ibforums->input['MID'] = $this->send_to_member['id'];
+						$this->error = $cc_error;
+						return;
+					}
+					
+					//-----------------------------------------
+					// Can use PM system?
+					//-----------------------------------------
+					
+					$cc_error   = "";
+					$cc_id_array = array();
+					
+					foreach($cc_array as $idx => $cc_user)
+					{
+						if ($cc_user['g_use_pm'] != 1)
+						{
+							$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_nopm'], $cc_user['name'], $cc_user['name'] );
+						}
+						
+						$cc_user = $this->_get_real_allowance($cc_user);
+						
+						if ($cc_user['g_max_messages'] > 0 and ($cc_user['msg_total'] + 1 > $cc_user['g_max_messages']) )
+						{
+							$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_maxed'], $cc_user['name'], $cc_user['name'] );
+						}
+						
+						$cc_id_array[] = $cc_user['id'];
+					}
+					
+					if ( $this->force_pm != 1 )
+					{
+						if ($cc_error != "")
+						{
+							$ibforums->input['MID'] = $this->send_to_member['id'];
+							$this->error = $cc_error;
+							return;
+						}
+					}
+					
+					//-----------------------------------------
+					// Check the block list..
+					//-----------------------------------------
+					
+					$DB->cache_add_query( 'msg_get_cc_blocked', array( 'mid' => $this->from_member['id'], 'cc_array' => $cc_id_array ) );
+					$DB->simple_exec();
+					
+					while ( $c = $DB->fetch_row() )
+					{
+						if ($c['allow_msg'] != 1)
+						{
+							$cc_error .= "<br>".sprintf( $ibforums->lang['pme_failed_block'], $c['name'], $c['name'] );
+						}
+					}
+					
+					if ( $this->force_pm != 1 )
+					{
+						if ($cc_error != "")
+						{
+							$ibforums->input['MID'] = $this->send_to_member['id'];
+							$this->error = $cc_error;
+							return;
+						}
+					}
+				}
+			}
+		}
+		
+		return $cc_array;	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SAVE stuff
+	/*-------------------------------------------------------------------------*/
+	
+	function _process_save_only()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		if ( $this->save_only )
+ 		{
+ 		
+			$raw = array( 
+						  'msg_date'	      => time(),
+						  'msg_post'          => $std->remove_tags($this->msg_post),
+						  'msg_cc_users'      => $this->cc_users,
+						  'msg_sent_to_count' => 0,
+						  'msg_post_key'      => $this->class->post_key,
+						  'msg_author_id'     => $this->from_member['id']
+						);
+			
+			$saved = 0;
+			
+			if ( $this->orig_id )
+			{
+				//-----------------------------------------
+				// We have an OID which means that this message
+				// is already from the unsent folder, lets check that
+				// and if true, update rather than create a new unsent
+				// row
+				//-----------------------------------------
+				
+				$DB->simple_construct( array( 'select' => 'mt_id, mt_msg_id', 'from' => 'message_topics', 'where' => "mt_id=".$this->orig_id." AND mt_owner_id=".$this->from_member['id']." AND mt_vid_folder='unsent'" ) );
+				$DB->simple_exec();
+				
+				if ( $omsg = $DB->fetch_row() )
+				{
+					$saved = 1;
+					
+					$DB->do_update( 'message_text', $raw, "msg_id=".$omsg['mt_msg_id'] );
+					
+					//-----------------------------------------
+					// Make attachments permanent
+					//-----------------------------------------
+					
+					$no_attachments = $this->postlib->pf_make_attachments_permanent( $this->class->post_key, "", "", $omsg['mt_msg_id'] );
+					
+					$DB->simple_construct( array( 'update' => 'message_topics', 'set' => "mt_hasattach=$no_attachments, mt_date=".time(), 'where' => 'mt_owner_id='.$ibforums->member['id'].' AND mt_id='.$omsg['mt_id'] ) );
+					$DB->simple_exec();
+				}
+			}
+			
+			if ($saved == 0)
+			{
+				$DB->do_insert( 'message_text', $raw);
+				
+				$msg_id = $DB->get_insert_id();
+				
+				//-----------------------------------------
+				// Make attachments permanent
+				//-----------------------------------------
+				
+				$no_attachments = $this->postlib->pf_make_attachments_permanent( $this->class->post_key, "", "", $msg_id );
+				
+				$DB->do_insert( 'message_topics', array(
+														 'mt_msg_id'     => $msg_id,
+														 'mt_date'       => time(),
+														 'mt_title'      => $this->msg_title,
+														 'mt_from_id'    => $this->from_member['id'],
+														 'mt_to_id'      => $this->send_to_member['id'],
+														 'mt_vid_folder' => 'unsent',
+														 'mt_hide_cc'    => 0,
+														 'mt_tracking'   => 0,
+														 'mt_hasattach'  => intval($no_attachments),
+														 'mt_owner_id'   => $this->from_member['id'],
+											   )      );
+			}
+			
+			$this->redirect_url  = "&act=Msg&CODE=01";
+			$this->redirect_lang = $ibforums->lang['pms_redirect'];
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Return count of current VDIR (quickly)
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function _get_dir_count( $vdir, $vid )
+ 	{
+ 		preg_match( "#(?:^|\|)$vid:.+?;(\d+)(?:\||$)#i", $vdir, $match );
+			
+		return intval($match[1]);
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Get real allowance based on multi-groups
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function _get_real_allowance( $member )
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+ 		$groups_id = explode( ',', $member['mgroup_others'] );
+ 		
+ 		if ( count( $groups_id ) )
+		{
+			foreach( $groups_id as $pid )
+			{
+				if ( ! $ibforums->cache['group_cache'][ $pid ]['g_id'] )
+				{
+					continue;
+				}
+				
+				if ( $ibforums->cache['group_cache'][ $pid ]['g_max_messages'] > $member['g_max_messages'] )
+				{
+					$member['g_max_messages'] = $ibforums->cache['group_cache'][ $pid ]['g_max_messages'];
+				}
+			}
+		}
+		
+		return $member;
+ 	}
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/post_edit_post.php b/upload/sources/lib/post_edit_post.php
index d26d4ce5..9c05fd4f 100644
--- a/upload/sources/lib/post_edit_post.php
+++ b/upload/sources/lib/post_edit_post.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,6 +19,7 @@
 |   > Date started: 19th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Fri 21 May 2004
 +--------------------------------------------------------------------------
 */
 
@@ -35,32 +35,40 @@ class post_functions extends Post {
 	var $moderator         = array( 'member_id' => 0, 'member_name' => "", 'edit_post' => 0 );
 	var $orig_post         = array();
 	var $edit_title        = 0;
-
-	function post_functions($class) {
+	var $post_key		   = "";
+	var $class             = "";
 	
+	function post_functions($class)
+	{
 		global $ibforums, $std, $DB;
 		
-		//-------------------------------------------------
+		$this->class = $class;
+		
+		//-----------------------------------------
 		// Lets load the topic from the database before we do anything else.
-		//-------------------------------------------------
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "tid=".intval($ibforums->input['t']) ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT * FROM ibf_topics WHERE tid=".intval($ibforums->input['t']));
 		$this->topic = $DB->fetch_row();
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Is it legitimate?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if (! $this->topic['tid'])
 		{
 			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Load the old post
-		//-------------------------------------------------
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'posts', 'where' => "pid=".intval($ibforums->input['p']) ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT * FROM ibf_posts WHERE pid=".intval($ibforums->input['p']));
 		$this->orig_post = $DB->fetch_row();
 		
 		if (! $this->orig_post['pid'])
@@ -68,20 +76,47 @@ class post_functions extends Post {
 			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Generate post key (do we have one?)
+		//-----------------------------------------
+		
+		if ( ! $this->orig_post['post_key'] )
+		{
+			//-----------------------------------------
+			// Generate one and save back to post and attachment
+			// to ensure 1.3 < compatibility
+			//-----------------------------------------
+			
+			$this->post_key = md5(microtime());
+			
+			$DB->do_update( 'posts', array( 'post_key' => $this->post_key ), 'pid='.$this->orig_post['pid'] );
+			
+			$DB->do_update( 'attachments', array( 'attach_post_key' => $this->post_key ), 'attach_pid='.$this->orig_post['pid'] );
+		}
+		else
+		{
+			$this->post_key = $this->orig_post['post_key'];
+		}
+		
+		//-----------------------------------------
 		// Load the moderator
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->member['id'])
 		{
-			$DB->query("SELECT member_id, member_name, mid, edit_post, edit_topic FROM ibf_moderators WHERE forum_id=".$class->forum['id']." AND (member_id=".$ibforums->member['id']." OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))");
+			$DB->simple_construct( array( 'select' => 'member_id, member_name, mid, edit_post, edit_topic',
+										  'from'   => 'moderators',
+										  'where'  => "forum_id=".$this->class->forum['id']." AND (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))" ) );
+										  
+			$DB->simple_exec();
+		
 			$this->moderator = $DB->fetch_row();
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Lets do some tests to make sure that we are
 		// allowed to edit this topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$can_edit = 0;
 		
@@ -115,21 +150,15 @@ class post_functions extends Post {
 			$std->Error( array( LEVEL => 1, MSG => 'not_op') );
 		}
 		
-		//-----------------------------
-		// Is the topic locked?
-		//-----------------------------
+		//-----------------------------------------
+		// Check access
+		//-----------------------------------------
 		
-		if (($this->topic['state'] != 'open') and (!$ibforums->member['g_is_supmod']))
-		{
-			if ($ibforums->member['g_post_closed'] != 1)
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'locked_topic') );
-			}
-		}
+		$this->class->check_for_edit($this->topic);
 		
-		//-----------------------------
+		//-----------------------------------------
 		// // Do we have edit topic abilities?
-		//-----------------------------
+		//-----------------------------------------
 		
 		if ( $this->orig_post['new_topic'] == 1 )
 		{
@@ -150,23 +179,58 @@ class post_functions extends Post {
 				$this->edit_title = 1;
 			}
 		}
-
 	}
 	
-	function process($class) {
+	/*-------------------------------------------------------------------------*/
+	// MAIN PROCESS FUNCTION
+	/*-------------------------------------------------------------------------*/
 	
+	function process()
+	{
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Did we remove an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['removeattachid'] )
+		{
+			if ( $ibforums->input[ 'removeattach_'. $ibforums->input['removeattachid'] ] )
+			{
+				$this->class->pf_remove_attachment( intval($ibforums->input['removeattachid']), $this->post_key );
+				$this->show_form();
+			}
+		}
+		
+		//-----------------------------------------
+		// Did we add an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['attachgo'] )
+		{
+			$this->class->obj['post_errors'] = "";
+			$this->upload_id = $this->class->process_upload();
+			$this->show_form();
+		}
+		
+		//-----------------------------------------
 		// Parse the post, and check for any errors.
 		// overwrites saved post intentionally
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$this->post   = $class->compile_post();
+		$this->post = $this->class->compile_post();
 		
-		if ( ($class->obj['post_errors'] != "") or ($class->obj['preview_post'] != "") )
+		if ($this->class->obj['post_errors'] == "")
 		{
+			$this->upload = $this->class->process_upload();
+		}
+		
+		if ( ($this->class->obj['post_errors'] != "") or ($this->class->obj['preview_post'] != "") )
+		{
+			//-----------------------------------------
 			// Show the form again
+			//-----------------------------------------
+			
 			$this->show_form($class);
 		}
 		else
@@ -176,87 +240,19 @@ class post_functions extends Post {
 	}
 	
 	
+	/*-------------------------------------------------------------------------*/
+	// COMPLETE EDIT THINGY
+	/*-------------------------------------------------------------------------*/
 	
-	
-	
-	function complete_edit($class) {
-		
-		global $ibforums, $std, $DB, $print, $HTTP_POST_FILES;
+	function complete_edit($class)
+	{
+		global $ibforums, $std, $DB, $print;
 		
 		$time = $std->get_date( time(), 'LONG' );
 				
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Reset some data
-		//-------------------------------------------------
-		
-		// Do we have to adjust the attachments?
-		
-		if ($this->orig_post['attach_id'])
-		{
-			if ( isset($ibforums->input['editupload']) AND ($ibforums->input['editupload'] != 'keep') )
-			{
-				// We're either uploading a new attachment, or deleting one, so lets
-				// remove the old attachment first eh?
-				
-				if (is_file($ibforums->vars['upload_dir']."/".$this->orig_post['attach_id']))
-				{
-					@unlink($ibforums->vars['upload_dir']."/".$this->orig_post['attach_id']);
-				}
-				
-				if ($ibforums->input['editupload'] == 'new')
-				{
-					// w00t, we're uploading a new ..um.. upload
-
-					$new_upload = $class->process_upload();
-					
-					if ( $class->obj['post_errors'] != "") {
-			
-						$this->show_form($class);
-					}
-					   
-					$this->post['attach_id']   = $new_upload['attach_id'];
-					$this->post['attach_type'] = $new_upload['attach_type'];
-					$this->post['attach_hits'] = $new_upload['attach_hits'];
-					$this->post['attach_file'] = $new_upload['attach_file'];
-				}
-				else if ($ibforums->input['editupload'] == 'delete')
-				{
-					// Simply remove the DB data as we've already removed the file
-					
-					$this->post['attach_id']   = "";
-					$this->post['attach_type'] = "";
-					$this->post['attach_hits'] = "";
-					$this->post['attach_file'] = "";
-				}
-			}
-			else
-			{
-				// We are keeping the old attachment
-				$this->post['attach_id']   = $this->orig_post['attach_id'];
-				$this->post['attach_type'] = $this->orig_post['attach_type'];
-				$this->post['attach_hits'] = $this->orig_post['attach_hits'];
-				$this->post['attach_file'] = $this->orig_post['attach_file'];
-			}
-		}
-		else
-		{
-			// Is there a new attachment?
-			
-			$new_upload = $class->process_upload();
-					
-			if ( $class->obj['post_errors'] != "") {
-	
-				$this->show_form($class);
-			}
-			
-			if ( $new_upload['attach_id'] )
-			{
-				$this->post['attach_id']   = $new_upload['attach_id'];
-				$this->post['attach_type'] = $new_upload['attach_type'];
-				$this->post['attach_hits'] = $new_upload['attach_hits'];
-				$this->post['attach_file'] = $new_upload['attach_file'];
-			}
-		}
+		//-----------------------------------------
 		
 		$this->post['ip_address']  = $this->orig_post['ip_address'];
 		$this->post['topic_id']    = $this->orig_post['topic_id'];
@@ -268,58 +264,48 @@ class post_functions extends Post {
 		$this->post['edit_time']   = time();
 		$this->post['edit_name']   = $ibforums->member['name'];
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// If the post icon has changed, update the topic post icon
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ($this->orig_post['new_topic'] == 1)
 		{
 			if ($this->post['icon_id'] != $this->orig_post['icon_id'])
 			{
-				$DB->query("UPDATE ibf_topics SET icon_id='".$this->post['icon_id']."' WHERE tid=".$this->topic['tid']);
+				$DB->do_update( 'topics', array( 'icon_id' => $this->post['icon_id'] ), 'tid='.$this->topic['tid'] );
 			}
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Update topic title?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ( $this->edit_title == 1 )
 		{
-			if ($ibforums->vars['etfilter_punct'])
-			{
-				$ibforums->input['TopicTitle']	= preg_replace( "/\?{1,}/"      , "?"    , $ibforums->input['TopicTitle'] );		
-				$ibforums->input['TopicTitle']	= preg_replace( "/(&#33;){1,}/" , "&#33;", $ibforums->input['TopicTitle'] );
-			}
+			$ibforums->input['TopicTitle'] = $this->class->pf_clean_topic_title( $ibforums->input['TopicTitle'] );
 			
-			if ($ibforums->vars['etfilter_shout'])
-			{
-				$ibforums->input['TopicTitle'] = ucwords(strtolower($ibforums->input['TopicTitle']));
-			}
-			
-			$ibforums->input['TopicTitle'] = trim( $class->parser->bad_words( $ibforums->input['TopicTitle'] ) );
-			$ibforums->input['TopicDesc']  = trim( $class->parser->bad_words( $ibforums->input['TopicDesc']  ) );
+			$ibforums->input['TopicTitle'] = trim( $this->class->parser->bad_words( $ibforums->input['TopicTitle'] ) );
+			$ibforums->input['TopicDesc']  = trim( $this->class->parser->bad_words( $ibforums->input['TopicDesc']  ) );
 			
 			if ( $ibforums->input['TopicTitle'] != "" )
 			{
 				if ( ($ibforums->input['TopicTitle'] != $this->topic['title']) or ($ibforums->input['TopicDesc'] != $this->topic['description'])  )
 				{
-					$dbs = $DB->compile_db_update_string( array( 
-																 'title'       => $ibforums->input['TopicTitle'],
-																 'description' => $ibforums->input['TopicDesc']
-														)      );
-														
-					$DB->query("UPDATE ibf_topics SET $dbs WHERE tid=".$this->topic['tid']);
+					$DB->do_update( 'topics', array( 'title'       => $ibforums->input['TopicTitle'],
+													 'description' => $ibforums->input['TopicDesc']
+												   ) , "tid=".$this->topic['tid']
+								  );
 					
-					if ($this->topic['tid'] == $class->forum['last_id'])
+					if ($this->topic['tid'] == $this->class->forum['last_id'])
 					{
-						$DB->query("UPDATE ibf_forums SET last_title='{$ibforums->input['TopicTitle']}' WHERE id='".$class->forum['id']."'");
+						$DB->do_update( 'forums', array( 'last_title' => $ibforums->input['TopicTitle'] ), 'id='.$this->class->forum['id'] );
+						$std->update_forum_cache();
 					}
 					
 					if ( ($this->moderator['edit_topic'] == 1) OR ( $ibforums->member['g_is_supmod'] == 1 ) )
 					{
-						$db_string = $std->compile_db_string( array (
-																'forum_id'    => $class->forum['id'],
+						$DB->do_insert( 'moderator_logs', array (
+																'forum_id'    => $this->class->forum['id'],
 																'topic_id'    => $this->topic['tid'],
 																'post_id'     => $this->post['pid'],
 																'member_id'   => $ibforums->member['id'],
@@ -330,18 +316,15 @@ class post_functions extends Post {
 																'topic_title' => $this->topic['title'],
 																'action'      => "Edited topic title or description '{$this->topic['title']}' to '{$ibforums->input['TopicTitle']}' via post form",
 																'query_string'=> $QUERY_STRING,
-															)
-													);
-				
-						$DB->query("INSERT INTO ibf_moderator_logs (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
+															)    );
 					}
 				}
 			}
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Update the database (ib_forum_post)
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$this->post['append_edit'] = 1;
 		
@@ -353,111 +336,117 @@ class post_functions extends Post {
 			}
 		}
 		
-		
 		$db_string = $DB->compile_db_update_string( $this->post );
 		
-		$DB->query("UPDATE ibf_posts SET $db_string WHERE pid='".$this->post['pid']."'");
-
+		$DB->do_update( 'posts', $this->post, 'pid='.$this->post['pid'] );
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Make attachments "permanent"
+		//-----------------------------------------
+		
+		$this->class->pf_make_attachments_permanent($this->post_key, $this->topic['tid'], $this->post['pid']);
+		
+		//-----------------------------------------
+		// Make sure paperclip symbol is OK
+		//-----------------------------------------
+		
+		$this->class->pf_recount_topic_attachments($this->topic['tid']);
+		
+		//-----------------------------------------
 		// Redirect them back to the topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$print->redirect_screen( $ibforums->lang['post_edited'], "act=ST&f={$class->forum['id']}&t={$this->topic['tid']}&st={$ibforums->input['st']}#entry{$this->post['pid']}");
+		$print->redirect_screen( $ibforums->lang['post_edited'], "act=ST&f={$this->class->forum['id']}&t={$this->topic['tid']}&st={$ibforums->input['st']}#entry{$this->post['pid']}");
 		
 	}
 
+	/*-------------------------------------------------------------------------*/
+	// SHOW FORM
+	/*-------------------------------------------------------------------------*/
 
-
-
-
-
-	function show_form($class) {
-	
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
+	function show_form()
+	{
+		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Sort out the "raw" textarea input and make it safe incase
 		// we have a <textarea> tag in the raw post var.
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$raw_post = isset($HTTP_POST_VARS['Post'])  ? $std->txt_htmlspecialchars($HTTP_POST_VARS['Post']) : $class->parser->unconvert($this->orig_post['post'], $class->forum['use_ibc'], $class->forum['use_html']);
+		$raw_post = isset($_POST['Post']) ? $std->txt_htmlspecialchars($_POST['Post']) : $this->class->parser->unconvert($this->orig_post['post'], $this->class->forum['use_ibc'], $this->class->forum['use_html']);
 
 		if (isset($raw_post))
 		{
 			$raw_post = $std->txt_raw2form($raw_post);
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Is this the first post in the topic?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ( $this->edit_title == 1 )
 		{
-			$topic_title = isset($HTTP_POST_VARS['TopicTitle']) ? $ibforums->input['TopicTitle'] : $this->topic['title'];
-			$topic_desc  = isset($HTTP_POST_VARS['TopicDesc'])  ? $ibforums->input['TopicDesc']  : $this->topic['description'];
+			$topic_title = isset($_POST['TopicTitle']) ? $ibforums->input['TopicTitle'] : $this->topic['title'];
+			$topic_desc  = isset($_POST['TopicDesc'])  ? $ibforums->input['TopicDesc']  : $this->topic['description'];
 			
-			$topic_title = $class->html->topictitle_fields( array( 'TITLE' => $topic_title, 'DESC' => $topic_desc ) );
+			$topic_title = $this->class->html->topictitle_fields( array( 'TITLE' => $topic_title, 'DESC' => $topic_desc ) );
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Do we have any posting errors?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ($class->obj['post_errors'])
+		if ($this->class->obj['post_errors'])
 		{
-			$class->output .= $class->html->errors( $ibforums->lang[ $class->obj['post_errors'] ]);
+			$this->class->output .= $this->class->html->errors( $ibforums->lang[ $this->class->obj['post_errors'] ]);
 		}
 		
-		if ($class->obj['preview_post'])
+		if ($this->class->obj['preview_post'])
 		{
-			$this->post['post'] = $class->parser->post_db_parse(
-															     $class->parser->convert( array(
+			$this->class->parser->pp_do_html = intval($ibforums->input['post_htmlstatus']) AND $this->class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0;
+			$this->class->parser->pp_nl2br   = $ibforums->input['post_htmlstatus'] == 2 ? 1 : 0;
+			
+			$this->post['post'] = $this->class->parser->post_db_parse(
+															     $this->class->parser->convert( array(
 															     								 'TEXT'    => $this->post['post'],
-															     								 'CODE'    => $class->forum['use_ibc'],
+															     								 'CODE'    => $this->class->forum['use_ibc'],
 															     								 'SMILIES' => $ibforums->input['enableemo'],
-															     								 'HTML'    => $class->forum['use_html']
-															     						)      ) ,
-															     $class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0);
-			$class->output .= $class->html->preview( $this->post['post'] );
+															     								 'HTML'    => $this->class->forum['use_html']
+															     						)      )
+															        );
+															        
+			$this->class->output .= $this->class->html->preview( $this->post['post'] );
 		}
 		
-		$class->check_upload_ability();
 		
-		$class->output .= $class->html_start_form( array( 1 => array( 'CODE', '09' ),
-														  2 => array( 't'   , $this->topic['tid']),
-														  3 => array( 'p'   , $ibforums->input['p'] ),
-														  4 => array( 'st'  , $ibforums->input['st'] ),
-														) );
+		$this->class->output .= $this->class->html_start_form( array( 1 => array( 'CODE', '09' ),
+																	  2 => array( 't'   , $this->topic['tid']),
+																	  3 => array( 'p'   , $ibforums->input['p'] ),
+																	  4 => array( 'st'  , $ibforums->input['st'] ),
+																	  5 => array( 'post_key', $this->post_key )
+															 )       );
 														
-		//---------------------------------------
+		//-----------------------------------------
 		// START TABLE
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output .= $class->html->table_structure();
+		$this->class->output .= $this->class->html->table_structure();
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$start_table = $class->html->table_top( "{$ibforums->lang['top_txt_edit']} {$this->topic['title']}");
+		$start_table = $this->class->html->table_top( "{$ibforums->lang['top_txt_edit']} {$this->topic['title']}");
 		
-		$name_fields = $class->html_name_field();
+		$name_fields = $this->class->html_name_field();
 		
-		$post_box    = $class->html_post_body( $raw_post );
+		$post_box    = $this->class->html_post_body( $raw_post );
 		
-		$end_form    = $class->html->EndForm( $ibforums->lang['submit_edit'] );
+		$end_form    = $this->class->html->EndForm( $ibforums->lang['submit_edit'] );
 		
-		$post_icons  = $class->html_post_icons($this->orig_post['icon_id']);
+		$post_icons  = $this->class->html_post_icons($this->orig_post['icon_id']);
 		
-		if ( $class->obj['can_upload'] )
+		if ($this->class->can_upload)
 		{
-			if ($this->orig_post['attach_id'] != "")
-			{
-				$upload_field = $class->html->edit_upload_field( $std->size_format( $ibforums->member['g_attach_max'] * 1024 ), $this->orig_post['attach_file'] );
-			}
-			else
-			{
-				$upload_field = $class->html->Upload_field( $std->size_format( $ibforums->member['g_attach_max'] * 1024 ) );
-			}
+			$upload_field = $this->class->html_build_uploads($this->post_key,'edit',$this->orig_post['pid']);
 		}
 		
 		if ($ibforums->member['g_append_edit'])
@@ -469,47 +458,49 @@ class post_functions extends Post {
 				$checked = "checked";
 			}
 			
-			$edit_option = $class->html->add_edit_box($checked);
+			$edit_option = $this->class->html->add_edit_box($checked);
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output = str_replace( "<!--START TABLE-->" , $start_table  , $class->output );
-		$class->output = str_replace( "<!--NAME FIELDS-->" , $name_fields  , $class->output );
-		$class->output = str_replace( "<!--POST BOX-->"    , $post_box     , $class->output );
-		$class->output = str_replace( "<!--POST ICONS-->"  , $post_icons   , $class->output );
-		$class->output = str_replace( "<!--END TABLE-->"   , $end_form     , $class->output );
-		$class->output = str_replace( "<!--UPLOAD FIELD-->", $upload_field , $class->output );
-		$class->output = str_replace( "<!--MOD OPTIONS-->" , $edit_option  , $class->output );
-		$class->output = str_replace( "<!--FORUM RULES-->" , $std->print_forum_rules($class->forum), $class->output );
-		$class->output = str_replace( "<!--TOPIC TITLE-->" , $topic_title  , $class->output );
+		$this->class->output = str_replace( "<!--START TABLE-->" , $start_table  , $this->class->output );
+		$this->class->output = str_replace( "<!--NAME FIELDS-->" , $name_fields  , $this->class->output );
+		$this->class->output = str_replace( "<!--POST BOX-->"    , $post_box     , $this->class->output );
+		$this->class->output = str_replace( "<!--POST ICONS-->"  , $post_icons   , $this->class->output );
+		$this->class->output = str_replace( "<!--END TABLE-->"   , $end_form     , $this->class->output );
+		$this->class->output = str_replace( "<!--UPLOAD FIELD-->", $upload_field , $this->class->output );
+		$this->class->output = str_replace( "<!--MOD OPTIONS-->" , $edit_option  , $this->class->output );
+		$this->class->output = str_replace( "<!--FORUM RULES-->" , $std->print_forum_rules($this->class->forum), $this->class->output );
+		$this->class->output = str_replace( "<!--TOPIC TITLE-->" , $topic_title  , $this->class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_add_smilie_box();
+		$this->class->output = $this->class->html_add_smilie_box( $this->class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Add in siggy buttons and such
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_checkboxes('edit');
+		$ibforums->input['post_htmlstatus'] = $this->orig_post['post_htmlstate'];
 		
-		//---------------------------------------
+		$this->class->html_checkboxes('edit', $this->topic['tid'], $this->class->forum['id']);
 		
-		$class->html_topic_summary($this->topic['tid']);
+		//-----------------------------------------
 		
-		$this->nav = array( "<a href='{$class->base_url}&act=SC&c={$class->forum['cat_id']}'>{$class->forum['cat_name']}</a>",
-							"<a href='{$class->base_url}&act=SF&f={$class->forum['id']}'>{$class->forum['name']}</a>",
-							"<a href='{$class->base_url}&act=ST&f={$class->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>",
+		$this->class->html_topic_summary($this->topic['tid']);
+		
+		$this->nav = array( "<a href='{$this->class->base_url}&act=SC&c={$this->class->forum['cat_id']}'>{$this->class->forum['cat_name']}</a>",
+							"<a href='{$this->class->base_url}&act=SF&f={$this->class->forum['id']}'>{$this->class->forum['name']}</a>",
+							"<a href='{$this->class->base_url}&act=ST&f={$this->class->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>",
 						  );
 						  
 		$this->title = $ibforums->lang['editing_post'].' '.$this->topic['title'];
 		
-		$print->add_output("$class->output");
+		$print->add_output( $this->class->output );
 		
         $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->title,
         					 	  'JS'       => 1,
-        					 	  'NAV'      => $this->nav,
+        					 	  'NAV'      => $this->class->nav,
         					  ) );
 		
 	}
diff --git a/upload/sources/lib/post_new_post.php b/upload/sources/lib/post_new_post.php
index f9ac51d0..2e5d27b9 100644
--- a/upload/sources/lib/post_new_post.php
+++ b/upload/sources/lib/post_new_post.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,54 +19,80 @@
 |   > Date started: 17th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Fri 21 May 2004
 +--------------------------------------------------------------------------
 */
 
 
-
-
-class post_functions extends Post {
-
+class post_functions extends Post
+{
 	var $nav = array();
-	var $title = "";
-	var $post  = array();
-	var $topic = array();
-	var $upload = array();
+	var $title     = "";
+	var $post      = array();
+	var $topic     = array();
+	var $upload    = array();
 	var $mod_topic = array();
-	
-	var $m_group = "";
+	var $class     = "";
+	var $m_group   = "";
+	var $post_key  = "";
 
-	function post_functions($class) {
-	
+	function post_functions($class)
+	{
 		global $ibforums, $std, $DB;
 		
-		// Lets do some tests to make sure that we are allowed to start a new topic
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
 		
-		if (! $ibforums->member['g_post_new_topics'])
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_starting') );
-		}
+		$this->post_key = $ibforums->input['post_key'] ? $ibforums->input['post_key'] : md5(microtime());
+		
+		$this->class = $class;
+		
+		$this->class->check_for_new_topic();
 		
-		if ( $std->check_perms($class->forum['start_perms']) == FALSE )
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_starting') );
-		}
-
 	}
 	
-	function process($class) {
+	/*-------------------------------------------------------------------------*/
+	// MAIN PROCESS FUNCTION
+	/*-------------------------------------------------------------------------*/
 	
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
+	function process()
+	{
+		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Did we remove an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['removeattachid'] )
+		{
+			if ( $ibforums->input[ 'removeattach_'. $ibforums->input['removeattachid'] ] )
+			{
+				$this->class->pf_remove_attachment( intval($ibforums->input['removeattachid']), $this->post_key );
+				$this->show_form();
+			}
+		}
+		
+		//-----------------------------------------
+		// Did we add an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['attachgo'] )
+		{
+			$this->class->obj['post_errors'] = "";
+			$this->upload_id = $this->class->process_upload();
+			$this->show_form();
+		}
+		
+		//-----------------------------------------
 		// Parse the post, and check for any errors.
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$this->post   = $class->compile_post();
+		$this->post = $this->class->compile_post();
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// check to make sure we have a valid topic title
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$ibforums->input['TopicTitle'] = str_replace( "<br>", "", $ibforums->input['TopicTitle'] );
 		
@@ -75,66 +100,62 @@ class post_functions extends Post {
 		
 		if ( (strlen($ibforums->input['TopicTitle']) < 2) or (!$ibforums->input['TopicTitle'])  )
 		{
-			$class->obj['post_errors'] = 'no_topic_title';
+			$this->class->obj['post_errors'] = 'no_topic_title';
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// More unicode..
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$temp = $std->txt_stripslashes($HTTP_POST_VARS['TopicTitle']);
+		$temp = $std->txt_stripslashes($_POST['TopicTitle']);
 		
 		$temp = preg_replace("/&#([0-9]+);/", "-", $temp );
 		
 		if ( strlen($temp) > 64 )
 		{
-			$class->obj['post_errors'] = 'topic_title_long';
+			$this->class->obj['post_errors'] = 'topic_title_long';
 		}
 		
-
-		//-------------------------------------------------
+		//-----------------------------------------
 		// If we don't have any errors yet, parse the upload
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ($class->obj['post_errors'] == "")
+		if ($this->class->obj['post_errors'] == "")
 		{
-			$this->upload = $class->process_upload();
+			$this->upload = $this->class->process_upload();
 		}
 		
 		
-		if ( ($class->obj['post_errors'] != "") or ($class->obj['preview_post'] != "") ) {
+		if ( ($this->class->obj['post_errors'] != "") or ($this->class->obj['preview_post'] != "") )
+		{
+			//-----------------------------------------
 			// Show the form again
-			$this->show_form($class);
-		} else {
-			$this->add_new_topic($class);
+			//-----------------------------------------
+			
+			$this->show_form();
+		}
+		else
+		{
+			$this->add_new_topic();
 		}
 	}
 	
+	/*-------------------------------------------------------------------------*/
+	// ADD TOPIC FUNCTION
+	/*-------------------------------------------------------------------------*/
 	
-	
-	
-	
-	function add_new_topic($class) {
-		
+	function add_new_topic()
+	{
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Fix up the topic title
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ($ibforums->vars['etfilter_punct'])
-		{
-			$ibforums->input['TopicTitle']	= preg_replace( "/\?{1,}/"      , "?"    , $ibforums->input['TopicTitle'] );		
-			$ibforums->input['TopicTitle']	= preg_replace( "/(&#33;){1,}/" , "&#33;", $ibforums->input['TopicTitle'] );
-		}
+		$ibforums->input['TopicTitle'] = $this->class->pf_clean_topic_title( $ibforums->input['TopicTitle'] );
 		
-		if ($ibforums->vars['etfilter_shout'])
-		{
-			$ibforums->input['TopicTitle'] = ucwords(strtolower($ibforums->input['TopicTitle']));
-		}
-		
-		$ibforums->input['TopicTitle'] = $class->parser->bad_words( $ibforums->input['TopicTitle'] );
-		$ibforums->input['TopicDesc']  = $class->parser->bad_words( $ibforums->input['TopicDesc']  );
+		$ibforums->input['TopicTitle'] = $this->class->parser->bad_words( $ibforums->input['TopicTitle'] );
+		$ibforums->input['TopicDesc']  = $this->class->parser->bad_words( $ibforums->input['TopicDesc']  );
 		
 		$pinned = 0;
 		$state  = 'open';
@@ -143,37 +164,37 @@ class post_functions extends Post {
 		{
 			if ($ibforums->input['mod_options'] == 'pin')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['pin_topic'] == 1)
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['pin_topic'] == 1)
 				{
 					$pinned = 1;
 					
-					$class->moderate_log('Pinned topic from post form', $ibforums->input['TopicTitle']);
+					$this->class->moderate_log('Pinned topic from post form', $ibforums->input['TopicTitle']);
 				}
 			}
 			else if ($ibforums->input['mod_options'] == 'close')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['close_topic'] == 1)
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['close_topic'] == 1)
 				{
 					$state = 'closed';
 					
-					$class->moderate_log('Closed topic from post form', $ibforums->input['TopicTitle']);
+					$this->class->moderate_log('Closed topic from post form', $ibforums->input['TopicTitle']);
 				}
 			}
 			else if ($ibforums->input['mod_options'] == 'pinclose')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or ( $class->moderator['pin_topic'] == 1 AND $class->moderator['close_topic'] == 1 ) )
+				if ($ibforums->member['g_is_supmod'] == 1 or ( $this->class->moderator['pin_topic'] == 1 AND $this->class->moderator['close_topic'] == 1 ) )
 				{
 					$pinned = 1;
 					$state = 'closed';
 					
-					$class->moderate_log('Pinned & closed topic from post form', $ibforums->input['TopicTitle']);
+					$this->class->moderate_log('Pinned & closed topic from post form', $ibforums->input['TopicTitle']);
 				}
 			}
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Build the master array
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$this->topic = array(
 							  'title'            => $ibforums->input['TopicTitle'],
@@ -191,268 +212,221 @@ class post_functions extends Post {
 							  'poll_state'       => 0,
 							  'last_vote'        => 0,
 							  'views'            => 0,
-							  'forum_id'         => $class->forum['id'],
-							  'approved'         => ( $class->obj['moderate'] == 1 || $class->obj['moderate'] == 2 ) ? 0 : 1,
+							  'forum_id'         => $this->class->forum['id'],
+							  'approved'         => ( $this->class->obj['moderate'] == 1 || $this->class->obj['moderate'] == 2 ) ? 0 : 1,
 							  'pinned'           => $pinned,
 							 );
 							
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Insert the topic into the database to get the
 		// last inserted value of the auto_increment field
 		// follow suit with the post
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$db_string = $DB->compile_db_insert_string( $this->topic );
+		$DB->do_insert( 'topics', $this->topic );
 		
-		$DB->query("INSERT INTO ibf_topics (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
 		$this->post['topic_id']  = $DB->get_insert_id();
 		$this->topic['tid']      = $this->post['topic_id'];
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Update the post info with the upload array info
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$this->post['attach_id']   = $this->upload['attach_id'];
-		$this->post['attach_type'] = $this->upload['attach_type'];
-		$this->post['attach_hits'] = $this->upload['attach_hits'];
-		$this->post['attach_file'] = $this->upload['attach_file'];
-		$this->post['new_topic']   = 1;
+		$this->post['post_key']  = $this->post_key;
+		$this->post['new_topic'] = 1;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Unqueue the post if we're starting a new topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ( $class->obj['moderate'] == 3 )
-		{
-			$this->post['queued'] = 0;
-		}
+		$this->post['queued'] = 0;
 		
-		$db_string = $DB->compile_db_insert_string( $this->post );
-		
-		$DB->query("INSERT INTO ibf_posts (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
+		//-----------------------------------------
+		// Add post to DB
+		//-----------------------------------------
 		
+		$DB->do_insert( 'posts', $this->post );
+	
 		$this->post['pid'] = $DB->get_insert_id();
 		
-		if ( $class->obj['moderate'] == 1 OR $class->obj['moderate'] == 2 )
-		{
-			//-------------------------------------------------
-			// Redirect them with a message telling them the
-			// post has to be previewed first
-			//-------------------------------------------------
-			
-			$DB->query("UPDATE ibf_forums SET has_mod_posts=1 WHERE id=".$class->forum['id']);
-			
-			$class->notify_new_topic_approval( $this->topic['tid'], $this->topic['title'], $this->topic['starter_name'] );
-			
-			$print->redirect_screen( $ibforums->lang['moderate_topic'], "act=SF&f={$class->forum['id']}" );
-		}
+		//-----------------------------------------
+		// Update topic with firstpost ID
+		//-----------------------------------------
 		
-		//-------------------------------------------------
+		$DB->simple_construct( array( 'update' => 'topics',
+									  'set'    => "topic_firstpost=".$this->post['pid'],
+									  'where'  => "tid=".$this->topic['tid']
+							 )      );
+							 
+		$DB->simple_exec();
+		
+		//-----------------------------------------
 		// If we are still here, lets update the
 		// board/forum stats
-		//------------------------------------------------- 
+		//----------------------------------------- 
 		
-		$class->forum['last_title']       = $this->topic['title'];
-		$class->forum['last_id']          = $this->topic['tid'];
-		$class->forum['last_post']        = time();
-		$class->forum['last_poster_name'] = $ibforums->member['id'] ?  $ibforums->member['name'] : $ibforums->input['UserName'];
-		$class->forum['last_poster_id']   = $ibforums->member['id'];
-		$class->forum['topics']++;
+		$this->class->pf_update_forum_and_stats($this->topic['tid'], $this->topic['title'], 'new');
 		
-		// Update the database
+		//-----------------------------------------
+		// Make attachments "permanent"
+		//-----------------------------------------
 		
-		$DB->query("UPDATE ibf_forums    SET last_title='"      .$class->forum['last_title']       ."', ".
-											"last_id='"         .$class->forum['last_id']          ."', ".
-											"last_post='"       .$class->forum['last_post']        ."', ".
-											"last_poster_name='".$class->forum['last_poster_name'] ."', ".
-											"last_poster_id='"  .$class->forum['last_poster_id']   ."', ".
-											"topics='"          .$class->forum['topics']           ."' ".
-											"WHERE id='"        .$class->forum['id']               ."'");
+		$this->class->pf_make_attachments_permanent($this->post_key, $this->topic['tid'], $this->post['pid']);
 		
-		
-		$DB->query("UPDATE ibf_stats SET TOTAL_TOPICS=TOTAL_TOPICS+1");
-		
-		//-------------------------------------------------
-		// Are we tracking new topics we start 'auto_track'?
-		//-------------------------------------------------
-		
-		if ( $ibforums->member['id'] AND $ibforums->input['enabletrack'] == 1 )
-		{
-			$db_string = $DB->compile_db_insert_string( array (
-																'member_id'  => $ibforums->member['id'],
-																'topic_id'   => $this->topic['tid'],
-																'start_date' => time(),
-													  )       );
-			
-			$DB->query("INSERT INTO ibf_tracker ({$db_string['FIELD_NAMES']}) VALUES ({$db_string['FIELD_VALUES']})");
-		}
-		
-		//---------------------------------------------------------------
-		// Are we tracking this forum? If so generate some mailies - yay!
-		//---------------------------------------------------------------
-		
-		$class->forum_tracker($class->forum['id'], $this->topic['tid'], $this->topic['title'], $class->forum['name'] );
-		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// If we are a member, lets update thier last post
 		// date and increment their post count.
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$pcount = "";
+		$this->class->pf_increment_user_post_count();
 		
-		if ($ibforums->member['id'])
+		//-----------------------------------------
+		// Moderating?
+		//-----------------------------------------
+		
+		if ( $this->class->obj['moderate'] == 1 OR $this->class->obj['moderate'] == 2 )
 		{
-			if ($class->forum['inc_postcount'])
-			{
-				// Increment the users post count
-				
-				$pcount = "posts=posts+1, ";
-				
-			}
+			//-----------------------------------------
+			// Redirect them with a message telling them the
+			// post has to be previewed first
+			//-----------------------------------------
 			
-			// Are we checking for auto promotion?
+			$this->class->notify_new_topic_approval( $this->topic['tid'], $this->topic['title'], $this->topic['starter_name'], $this->post['pid'] );
 			
-			if ($ibforums->member['g_promotion'] != '-1&-1')
-			{
-				list($gid, $gposts) = explode( '&', $ibforums->member['g_promotion'] );
-				
-				if ( $gid > 0 and $gposts > 0 )
-				{
-					if ( $ibforums->member['posts'] + 1 >= $gposts )
-					{
-						$mgroup = "mgroup='$gid', ";
-						
-						if ( USE_MODULES == 1 )
-						{
-							$class->modules->register_class(&$class);
-							$class->modules->on_group_change($ibforums->member['id'], $gid);
-						}
-					}
-				}
-			}
-			
-			$ibforums->member['last_post'] = time();
-			
-			$DB->query("UPDATE ibf_members SET ".$pcount.$mgroup.
-											  "last_post='"    .$ibforums->member['last_post']   ."'".
-											  "WHERE id='"     .$ibforums->member['id']."'");
+			$print->redirect_screen( $ibforums->lang['moderate_topic'], "act=SF&f={$this->class->forum['id']}" );
 		}
 		
-		//-------------------------------------------------
-		// Redirect them back to the topic
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Are we tracking new topics we start 'auto_track'?
+		//-----------------------------------------
 		
-		$std->boink_it($class->base_url."act=ST&f={$class->forum['id']}&t={$this->topic['tid']}");
+		$this->class->pf_add_tracked_topic($this->topic['tid']);
+		
+		//-----------------------------------------
+		// Are we tracking this forum? If so generate some mailies - yay!
+		//-----------------------------------------
+		
+		$this->class->forum_tracker($this->class->forum['id'], $this->topic['tid'], $this->topic['title'], $this->class->forum['name'], $this->post['post'] );
+		
+		//-----------------------------------------
+		// Redirect them back to the topic
+		//-----------------------------------------
+		
+		$std->boink_it($this->class->base_url."showtopic={$this->topic['tid']}");
 		
 	}
 
+	/*-------------------------------------------------------------------------*/
+	// SHOW FORM
+	/*-------------------------------------------------------------------------*/
 
-
-
-
-
-	function show_form(&$class) {
-	
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
+	function show_form()
+	{
+		global $ibforums, $std, $DB, $print;
 		
+		//-----------------------------------------
+		// Are we quoting posts?
+		//-----------------------------------------
+		
+		$raw_post = $this->class->check_multi_quote();
+		
+		//-----------------------------------------
 		// Sort out the "raw" textarea input and make it safe incase
 		// we have a <textarea> tag in the raw post var.
+		//-----------------------------------------
 		
-		$raw_post    = isset($HTTP_POST_VARS['Post'])       ? $std->txt_htmlspecialchars($HTTP_POST_VARS['Post'])        : "";
-		$topic_title = isset($HTTP_POST_VARS['TopicTitle']) ? $ibforums->input['TopicTitle'] : "";
-		$topic_desc  = isset($HTTP_POST_VARS['TopicDesc'])  ? $ibforums->input['TopicDesc']  : "";
-		
-		if (isset($raw_post))
-		{
-			$raw_post = $std->txt_raw2form($raw_post);
-		}
+		$topic_title = isset($_POST['TopicTitle']) ? $ibforums->input['TopicTitle'] : "";
+		$topic_desc  = isset($_POST['TopicDesc'])  ? $ibforums->input['TopicDesc']  : "";
 		
+		//-----------------------------------------
 		// Do we have any posting errors?
+		//-----------------------------------------
 		
-		if ($class->obj['post_errors'])
+		if ($this->class->obj['post_errors'])
 		{
-			$class->output .= $class->html->errors( $ibforums->lang[ $class->obj['post_errors'] ]);
+			$this->class->output .= $this->class->html->errors( $ibforums->lang[ $this->class->obj['post_errors'] ]);
 		}
 		
-		if ($class->obj['preview_post'])
+		if ($this->class->obj['preview_post'])
 		{
-			$this->post['post'] = $class->parser->post_db_parse(
-															     $class->parser->convert( array(
-															     								 'TEXT'    => $this->post['post'],
-															     								 'CODE'    => $class->forum['use_ibc'],
-															     								 'SMILIES' => $ibforums->input['enableemo'],
-															     								 'HTML'    => $class->forum['use_html']
-															     						)      ) ,
-															     $class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0 );
-			$class->output .= $class->html->preview( $this->post['post'] );
+			$this->class->parser->pp_do_html = intval($ibforums->input['post_htmlstatus']) AND $this->class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0;
+			$this->class->parser->pp_nl2br   = $ibforums->input['post_htmlstatus'] == 2 ? 1 : 0;
+			
+			$this->post['post'] = $this->class->parser->post_db_parse(
+																	  $this->class->parser->convert( array(
+																									  'TEXT'    => $this->post['post'],
+																									  'CODE'    => $this->class->forum['use_ibc'],
+																									  'SMILIES' => $ibforums->input['enableemo'],
+																									  'HTML'    => $this->class->forum['use_html']
+																							 )      )
+															        );
+															     
+			$this->class->output .= $this->class->html->preview( $this->post['post'] );
 		}
 		
-		$class->check_upload_ability();
+		$this->class->output .= $this->class->html_start_form( array( 1 => array( 'CODE', '01' ),
+														  			  2 => array( 'post_key', $this->post_key ),
+											     			 )      );
 		
-		$class->output .= $class->html_start_form( array( 1 => array( 'CODE', '01' ) ) );
-		
-		//---------------------------------------
+		//-----------------------------------------
 		// START TABLE
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output .= $class->html->table_structure();
+		$this->class->output .= $this->class->html->table_structure();
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$topic_title = $class->html->topictitle_fields( array( 'TITLE' => $topic_title, 'DESC' => $topic_desc ) );
+		$topic_title = $this->class->html->topictitle_fields( array( 'TITLE' => $topic_title, 'DESC' => $topic_desc ) );
 		
-		$start_table = $class->html->table_top( "{$ibforums->lang['top_txt_new']} {$class->forum['name']}");
+		$start_table = $this->class->html->table_top( "{$ibforums->lang['top_txt_new']} {$this->class->forum['name']}");
 		
-		$name_fields = $class->html_name_field();
+		$name_fields = $this->class->html_name_field();
 		
-		$post_box    = $class->html_post_body( $raw_post );
+		$post_box    = $this->class->html_post_body( $raw_post );
 		
-		$mod_options = $class->mod_options();
+		$mod_options = $this->class->mod_options();
 		
-		$end_form    = $class->html->EndForm( $ibforums->lang['submit_new'] );
+		$end_form    = $this->class->html->EndForm( $ibforums->lang['submit_new'] );
 		
-		$post_icons  = $class->html_post_icons();
+		$post_icons  = $this->class->html_post_icons();
 		
-		if ($class->obj['can_upload'])
+		if ($this->class->can_upload)
 		{
-			$upload_field = $class->html->Upload_field( $std->size_format( $ibforums->member['g_attach_max'] * 1024 ) );
+			$upload_field = $this->class->html_build_uploads($this->post_key,'new');
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output = preg_replace( "/<!--START TABLE-->/" , "$start_table"  , $class->output );
-		$class->output = preg_replace( "/<!--NAME FIELDS-->/" , "$name_fields"  , $class->output );
-		$class->output = preg_replace( "/<!--POST BOX-->/"    , "$post_box"     , $class->output );
-		$class->output = preg_replace( "/<!--POST ICONS-->/"  , "$post_icons"   , $class->output );
-		$class->output = preg_replace( "/<!--UPLOAD FIELD-->/", "$upload_field" , $class->output );
-		$class->output = preg_replace( "/<!--MOD OPTIONS-->/" , "$mod_options"  , $class->output );
-		$class->output = preg_replace( "/<!--END TABLE-->/"   , "$end_form"     , $class->output );
-		$class->output = preg_replace( "/<!--TOPIC TITLE-->/" , "$topic_title"  , $class->output );
-		$class->output = str_replace("<!--FORUM RULES-->", $std->print_forum_rules($class->forum), $class->output );
+		$this->class->output = str_replace( "<!--START TABLE-->" , $start_table  , $this->class->output );
+		$this->class->output = str_replace( "<!--NAME FIELDS-->" , $name_fields  , $this->class->output );
+		$this->class->output = str_replace( "<!--POST BOX-->"    , $post_box     , $this->class->output );
+		$this->class->output = str_replace( "<!--POST ICONS-->"  , $post_icons   , $this->class->output );
+		$this->class->output = str_replace( "<!--UPLOAD FIELD-->", $upload_field , $this->class->output );
+		$this->class->output = str_replace( "<!--MOD OPTIONS-->" , $mod_options  , $this->class->output );
+		$this->class->output = str_replace( "<!--END TABLE-->"   , $end_form     , $this->class->output );
+		$this->class->output = str_replace( "<!--TOPIC TITLE-->" , $topic_title  , $this->class->output );
+		$this->class->output = str_replace( "<!--FORUM RULES-->" , $std->print_forum_rules($this->class->forum), $this->class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_add_smilie_box();
+		$this->class->output = $this->class->html_add_smilie_box( $this->class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Add in siggy buttons and such
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_checkboxes();
+		$this->class->html_checkboxes('new', 0, $this->class->forum['id']);
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$this->nav = array( "<a href='{$class->base_url}act=SC&amp;c={$class->forum['cat_id']}'>{$class->forum['cat_name']}</a>",
-							"<a href='{$class->base_url}act=SF&amp;f={$class->forum['id']}'>{$class->forum['name']}</a>",
-						  );
 		$this->title = $ibforums->lang['posting_new_topic'];
 		
-		$print->add_output("$class->output");
+		$print->add_output( $this->class->output );
         $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->title,
         					 	  'JS'       => 1,
-        					 	  'NAV'      => $this->nav,
-        					  ) );
+        					 	  'NAV'      => $this->class->nav,
+        				 )     );
 		
 	}
 	
diff --git a/upload/sources/lib/post_parser.php b/upload/sources/lib/post_parser.php
index 4345b03b..9ca66b79 100644
--- a/upload/sources/lib/post_parser.php
+++ b/upload/sources/lib/post_parser.php
@@ -2,22 +2,22 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > Text processor module
 |   > Module written by Matt Mecham
-|   > Official Version: 1.2 - Number of changes to date 3 billion (estimated)
+|   > Official Version: 2.0 - Number of changes to date 3 billion (estimated)
+|   > DBA Checked: Mon 24th May 2004
 |
 +--------------------------------------------------------------------------
 */
@@ -25,38 +25,28 @@
 
 class post_parser {
 
-	var $error          = "";
-	var $image_count    = 0;
-	var $emoticon_count = 0;
-	var $quote_html     = array();
-	var $quote_open     = 0;
-	var $quote_closed   = 0;
-	var $quote_error    = 0;
-	var $emoticons      = "";
-	var $badwords       = "";
-	var $strip_quotes   = "";
-	var $in_sig         = "";
-	var $allow_unicode  = 1;
-	
-	function smilie_length_sort($a, $b)
-	{
-		if ( strlen($a['typed']) == strlen($b['typed']) )
-		{
-			return 0;
-		}
-		return ( strlen($a['typed']) > strlen($b['typed']) ) ? -1 : 1;
-	}
-	
-	
-	function word_length_sort($a, $b)
-	{
-		if ( strlen($a['type']) == strlen($b['type']) )
-		{
-			return 0;
-		}
-		return ( strlen($a['type']) > strlen($b['type']) ) ? -1 : 1;
-	}
+	var $error            = "";
+	var $image_count      = 0;
+	var $emoticon_count   = 0;
+	var $quote_html       = array();
+	var $quote_open       = 0;
+	var $quote_closed     = 0;
+	var $quote_error      = 0;
+	var $emoticons        = "";
+	var $badwords         = "";
+	var $strip_quotes     = "";
+	var $in_sig           = "";
+	var $allow_unicode    = 1;
+	var $bypass_badwords  = 0;
+	var $load_custom_tags = 0;
+	var $pp_do_html       = 0;
+	var $pp_nl2br         = 1;
+	var $pp_wordwrap      = 0;
+	var $max_embed_quotes = 10;
 	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
 	
 	function post_parser($load=0)
 	{
@@ -64,52 +54,120 @@ class post_parser {
 		
 		$this->strip_quotes = $ibforums->vars['strip_quotes'];
 		
-		if ($load != 0)
+		if ( $load )
 		{
-			// Pre-load the bad words
-			
-			$DB->query("SELECT * from ibf_badwords");
-			
-			if ( $DB->get_num_rows() )
-			{
-				while ( $r = $DB->fetch_row() )
-				{
-					$this->badwords[] = array( 'type'    => stripslashes($r['type']),
-											   'swop'    => stripslashes($r['swop']),
-											   'm_exact' => $r['m_exact'],
-											 );
-				}
-			}
-			else
-			{
-				$this->no_bad_words = 1;
-			}
-			
-			// Pre-load the smilies
-			
-			$this->emoticons = array();
-		
-			$DB->query("SELECT typed, image from ibf_emoticons");
-			
-			if ( $DB->get_num_rows() )
-			{
-				while ( $r = $DB->fetch_row() )
-				{
-					$this->emoticons[] = array( 'typed'     => stripslashes($r['typed']),
-											    'image'     => stripslashes($r['image']),
-											    'clickable' => $r['clickable'],
-											  );
-				}
-			}
-			
+			$this->check_caches($load);
 		}
-		
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
+	// CHECK (AND LOAD) CACHES
+	/*-------------------------------------------------------------------------*/
+	
+	function check_caches($load=0)
+	{
+		global $ibforums, $std, $DB;
+		
+		if ( ! is_array( $ibforums->cache['emoticons'] ) )
+		{
+			$ibforums->cache['emoticons'] = array();
+			
+			$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$ibforums->cache['emoticons'][] = $r;
+			}
+			
+			if ( $load )
+			{
+				$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+			}
+		}
+		
+		if ( ! is_array( $ibforums->cache['bbcode'] ) )
+		{
+			$ibforums->cache['bbcode'] = array();
+			
+			$DB->simple_construct( array( 'select' => 'bbcode_id, bbcode_tag, bbcode_replace, bbcode_useoption', 'from' => 'custom_bbcode' ) );
+			$bbcode = $DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row($bbcode) )
+			{
+				$ibforums->cache['bbcode'][] = $r;
+			}
+			
+			if ( $load )
+			{
+				$std->update_cache( array( 'name' => 'bbcode', 'array' => 1, 'deletefirst' => 1 ) );
+			}
+		}
+		
+		if ( ! is_array( $ibforums->cache['badwords'] ) )
+		{
+			$ibforums->cache['badwords'] = array();
+			
+			$DB->simple_construct( array( 'select' => 'type,swop,m_exact', 'from' => 'badwords' ) );
+			$bbcode = $DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row($bbcode) )
+			{
+				$ibforums->cache['badwords'][] = $r;
+			}
+			
+			if ( $load )
+			{
+				$std->update_cache( array( 'name' => 'badwords', 'array' => 1, 'deletefirst' => 1 ) );
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Strip quote tags
+	/*-------------------------------------------------------------------------*/
+	
+	function strip_quote_tags( $txt="" )
+	{
+		return preg_replace( "#\[QUOTE(=.+?,.+?)?\].+?\[/QUOTE\]#is", "", $txt );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// strip all tags
+	/*-------------------------------------------------------------------------*/
+	
+	function strip_all_tags( $txt="" )
+	{
+		$txt = $this->strip_quote_tags( $this->unconvert( $txt ) );
+		
+		$txt = preg_replace( "#\[.+?\](.+?)\[/.+?\]#is", "\\1", $txt );
+		
+		return $txt;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// strip all tags to formatted HTML
+	/*-------------------------------------------------------------------------*/
+	
+	function strip_all_tags_to_formatted( $txt="" )
+	{
+		//$txt = $this->strip_quote_tags( $this->unconvert( $txt ) );
+		
+		//$txt = preg_replace( "#\[CODE\](.+?)\[/CODE\]#is", "<pre>\\1</pre>", $txt );
+		
+		//$txt = preg_replace( "#\[LIST\](.+?)\[/LIST\]#eis", "'<ul>' .str_replace( '[*]', '<li>', nl2br('\\1') ).'</ul>';", $txt );
+		
+		//$txt = preg_replace( "#\[LIST=.+?\](.+?)\[/LIST\]#eis", "'<ul>' .str_replace( '[*]', '<li>', nl2br('\\1') ).'</ul>';", $txt );
+		
+		//$txt = preg_replace( "#\[.+?\](.+?)\[/.+?\]#is", "\\1", $txt );
+		
+		return $txt;
+	}
+	
+	/*-------------------------------------------------------------------------*/
 	// PARSE POLL TAGS
 	// Converts certain code tags for polling
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function parse_poll_tags($txt)
 	{
@@ -126,72 +184,75 @@ class post_parser {
 		return $txt;
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// convert:
 	// Parses raw text into smilies, HTML and iB CODE
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 
-	function convert($in=array( 'TEXT' => "", 'SMILIES' => 0, 'CODE' => 0, 'SIGNATURE' => 0, 'HTML' => 0)) {
+	function convert($in=array( 'TEXT' => "", 'SMILIES' => 0, 'CODE' => 0, 'SIGNATURE' => 0, 'HTML' => 0))
+	{
 		global $ibforums, $DB;
 		
+		$this->check_caches();
+		
 		$this->in_sig = $in['SIGNATURE'];
 		
 		$txt = $in['TEXT'];
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Returns any errors as $this->error
-		//--------------------------------------
+		//-----------------------------------------
 		
 		// Remove session id's from any post
 		
 		$txt = preg_replace( "#(\?|&amp;|;|&)s=([0-9a-zA-Z]){32}(&amp;|;|&|$)?#e", "\$this->regex_bash_session('\\1', '\\3')", $txt );
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// convert <br> to \n
-		//--------------------------------------
+		//-----------------------------------------
 		
 		$txt = preg_replace( "/<br>|<br \/>/", "\n", $txt );
 		
-		//--------------------------------------
+		//-----------------------------------------
 		// Are we parsing iB_CODE and do we have either '[' or ']' in the
 		// text we are processing?
-		//--------------------------------------
+		//-----------------------------------------
 		
-		if ( $in['CODE'] == 1 ) {
-		
-			//---------------------------------
+		if ( $in['CODE'] == 1 )
+		{
+			//-----------------------------------------
 			// Do [CODE] tag
-			//---------------------------------
+			//-----------------------------------------
 			
 			$txt = preg_replace( "#\[code\](.+?)\[/code\]#ies", "\$this->regex_code_tag('\\1')", $txt );
 		
-			//--------------------------------------
+			//-----------------------------------------
 			// Auto parse URLs
-			//--------------------------------------
+			//-----------------------------------------
 			
 			$txt = preg_replace( "#(^|\s)((http|https|news|ftp)://\w+[^\s\[\]]+)#ie"  , "\$this->regex_build_url(array('html' => '\\2', 'show' => '\\2', 'st' => '\\1'))", $txt );
 		
-			//---------------------------------
+			//-----------------------------------------
 			// Do [QUOTE(name,date)] tags
-			//---------------------------------
+			//-----------------------------------------
 			
 			// Find the first, and last quote tag (greedy match)...
 			
 			$txt = preg_replace( "#(\[quote(.+?)?\].*\[/quote\])#ies" , "\$this->regex_parse_quotes('\\1')"  , $txt );
 			
-			/***********************************************/
+			/*-------------------------------------------------------------------------*/
 			// If we are not parsing a siggie, lets have a bash
 			// at the [PHP] [SQL] and [HTML] tags.
-			/***********************************************/
+			/*-------------------------------------------------------------------------*/
 			
 			if ($in['SIGNATURE'] != 1) {
 				
 				$txt = preg_replace( "#\[sql\](.+?)\[/sql\]#ies"    , "\$this->regex_sql_tag('\\1')"    , $txt );
 				$txt = preg_replace( "#\[html\](.+?)\[/html\]#ies"  , "\$this->regex_html_tag('\\1')"   , $txt );
 				
-				//-------------------------
+				//-----------------------------------------
 				// [LIST]    [*]    [/LIST]
-				//-------------------------
+				//-----------------------------------------
 				
 				while( preg_match( "#\n?\[list\](.+?)\[/list\]\n?#ies" , $txt ) )
 				{
@@ -204,9 +265,9 @@ class post_parser {
 				}
 			}
 			 
-			//---------------------------------
+			//-----------------------------------------
 			// Do [IMG] [FLASH] tags
-			//---------------------------------
+			//-----------------------------------------
 			
 			if ($ibforums->vars['allow_images'])
 			{
@@ -266,7 +327,7 @@ class post_parser {
 		
 		// Swop \n back to <br>
 		
-		$txt = preg_replace( "/\n/", "<br>", $txt );
+		$txt = preg_replace( "/\n/", "<br />", $txt );
 		
 		// Unicode?
 		
@@ -275,97 +336,105 @@ class post_parser {
 			$txt = preg_replace("/&amp;#([0-9]+);/s", "&#\\1;", $txt );
 		}
 		
-		//+---------------------------------------------------------------------------------------------------
+		//-----------------------------------------
 		// Parse smilies (disallow smilies in siggies, or we'll have to query the DB for each post
 		// and each signature when viewing a topic, not something that we really want to do.
-		//+---------------------------------------------------------------------------------------------------
-		
-		if ($in['SMILIES'] != 0 and $in['SIGNATURE'] == 0) {
+		//-----------------------------------------
 		
+		if ($in['SMILIES'] != 0 and $in['SIGNATURE'] == 0)
+		{
 			$txt = ' '.$txt.' ';
 		
-			if ( ! is_array($this->emoticons) )
+			usort( $ibforums->cache['emoticons'] , array( 'post_parser', 'smilie_length_sort' ) );
+			
+			if ( count( $ibforums->cache['emoticons'] ) > 0 )
 			{
-				$DB->query("SELECT typed, image from ibf_emoticons");
-				
-				$this->emoticons = array();
-				
-				if ( $DB->get_num_rows() )
+				foreach( $ibforums->cache['emoticons']  as $a_id => $row)
 				{
-					while ( $r = $DB->fetch_row() )
+					if ( $row['emo_set'] != $ibforums->skin['_emodir'] )
 					{
-						$this->emoticons[] = array( 'typed'     => stripslashes($r['typed']),
-													'image'     => stripslashes($r['image']),
-													'clickable' => $r['clickable'],
-												  );
+						continue;
 					}
-				}
-			}
-			
-			usort($this->emoticons, array( 'post_parser', 'smilie_length_sort' ) );
-			
-			if ( count($this->emoticons) > 0 )
-			{
-			
-				foreach($this->emoticons as $a_id => $row)
-				{
 					
 					$code  = $row['typed'];
 					$image = $row['image'];
 					
+					//-----------------------------------------
 					// Make safe for regex
+					//-----------------------------------------
 					
 					$code = preg_quote($code, "/");
 					
 					$txt = preg_replace( "!(?<=[^\w&;/])$code(?=.\W|\W.|\W$)!ei", "\$this->convert_emoticon('$code', '$image')", $txt );
-					
 				}
-			
 			}
 			
-			if ($ibforums->vars['max_emos'])
+			$txt = trim($txt);
+			
+			if ( $ibforums->vars['max_emos'] )
 			{
 				if ($this->emoticon_count > $ibforums->vars['max_emos'])
 				{
 					$this->error = 'too_many_emoticons';
-					
-					// Uncovert the little yellow chappies
-					
-					//$txt = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $txt );
 				}
 			}
-		
 		}
 		
 		$txt = $this->bad_words($txt);
 		
+		$txt = $this->bbcode_check($txt);
+		
 		return $txt;
 	}
 	
-	//--------------------------------------------------------------
-	// Post DB parse tags
-	// ...................
-	//--------------------------------------------------------------
+	//-----------------------------------------
+	// Checks opening and closing bbtags - doesn't parse at this point
+	//-----------------------------------------
 	
-	function post_db_parse($t="", $use_html=0)
+	function bbcode_check($t="")
 	{
-		global $ibforums, $DB;
+		global $ibforums, $DB, $std;
 		
-		if ( $use_html )
+		$count = array();
+		
+		foreach( $ibforums->cache['bbcode'] as $i => $r )
 		{
-			$t = preg_replace( "#\[dohtml\](.+?)\[/dohtml\]#ies", "\$this->parse_html('\\1')", $t );
-		}
-		else
-		{
-			$t = preg_replace( "#(\[dohtml\])(.+?)(\[/dohtml\])#ies", "\$this->my_strip_tags('\\2')", $t );
+			if ( $r['bbcode_useoption'] )
+			{
+				$count[ $r['bbcode_id'] ]['open']      = substr_count( strtolower($t), '['.strtolower($r['bbcode_tag']).'=' );
+				$count[ $r['bbcode_id'] ]['wrongopen'] = substr_count( strtolower($t), '['.strtolower($r['bbcode_tag']).']' );
+			}
+			else
+			{
+				$count[ $r['bbcode_id'] ]['open']      = substr_count( strtolower($t), '['.strtolower($r['bbcode_tag']).']' );
+				$count[ $r['bbcode_id'] ]['wrongopen'] = substr_count( strtolower($t), '['.strtolower($r['bbcode_tag']).'=' );
+			}
+			
+			$count[ $r['bbcode_id'] ]['closed'] = substr_count( strtolower($t), '[/'.strtolower($r['bbcode_tag']).']' );
+			
+			//-----------------------------------------
+			// check...
+			//-----------------------------------------
+			
+			if ( $count[ $r['bbcode_id'] ]['open'] != $count[ $r['bbcode_id'] ]['closed'] )
+			{
+				if ( $count[ $r['bbcode_id'] ]['wrongopen'] == $count[ $r['bbcode_id'] ]['closed'] )
+				{
+					$this->error = 'custom_tags_incorrect2';
+				}
+				else
+				{
+					$this->error = 'custom_tags_incorrect';
+				}
+			}
 		}
 		
 		return $t;
 	}
 	
-	//---------------------------------------------------------------
+	//-----------------------------------------
 	// My strip-tags. Converts HTML entities back before strippin' em
-	//---------------------------------------------------------------
+	//-----------------------------------------
 	
 	function my_strip_tags($t="")
 	{
@@ -383,9 +452,9 @@ class post_parser {
 	}
 		
 	
-	//--------------------------------------------------------------
+	//-----------------------------------------
 	// Word wrap, wraps 'da word innit
-	//--------------------------------------------------------------
+	//-----------------------------------------
 	
 	function my_wordwrap($t="", $chrs=0, $replace="<br />")
 	{
@@ -405,27 +474,127 @@ class post_parser {
 		
 	}
 	
-	//--------------------------------------------------------------
+	//-----------------------------------------
+	// Post DB parse tags
+	//-----------------------------------------
+	
+	function post_db_parse($t="")
+	{
+		global $ibforums, $DB;
+		
+		if ( $this->pp_do_html )
+		{
+			$t = $this->post_db_parse_html( $t );
+		}
+		else
+		{
+			//$t = $this->my_strip_tags( $t );
+		}
+		
+		if ( $this->pp_wordwrap > 0 )
+		{
+			$t = $this->my_wordwrap( $t, $this->pp_wordwrap );
+		}
+		
+		//-----------------------------------------
+		// Custom BB code
+		//-----------------------------------------
+		
+		if ( strstr( $t, '[/' )  )
+		{ 
+			$t = $this->post_db_parse_bbcode($t);
+		}
+		
+		return $t;
+	}
+	
+	//-----------------------------------------
+	// Post DB parse BBCode
+	//-----------------------------------------
+	
+	function post_db_parse_bbcode($t="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( is_array( $ibforums->cache['bbcode'] ) and count( $ibforums->cache['bbcode'] ) )
+		{
+			foreach( $ibforums->cache['bbcode'] as $i => $row )
+			{
+				if ( substr_count( $row['bbcode_replace'], '{content}' ) > 1 )
+				{
+					//-----------------------------------------
+					// Slightly slower
+					//-----------------------------------------
+					
+					if ( $row['bbcode_useoption'] )
+					{
+						preg_match_all( "#(\[".$row['bbcode_tag']."=(?:&quot;|&\#39;)?(.+?)(?:&quot;|&\#39;)?\])(.+?)(\[/".$row['bbcode_tag']."\])#si", $t, $match );
+						
+						for ($i=0; $i < count($match[0]); $i++)
+						{
+							$tmp = $row['bbcode_replace'];
+							$tmp = str_replace( '{option}' , $match[2][$i], $tmp );
+							$tmp = str_replace( '{content}', $match[3][$i], $tmp );
+							$t   = str_replace( $match[0][$i], $tmp, $t );
+						}
+					}
+					else
+					{
+						preg_match_all( "#(\[".$row['bbcode_tag']."\])(.+?)(\[/".$row['bbcode_tag']."\])#si", $t, $match );
+	
+						for ($i=0; $i < count($match[0]); $i++)
+						{
+							$tmp = $row['bbcode_replace'];
+							$tmp = str_replace( '{content}', $match[2][$i], $tmp );
+							$t   = str_replace( $match[0][$i], $tmp, $t );
+						}
+					}
+				}
+				else
+				{
+					$replace = explode( '{content}', $row['bbcode_replace'] );
+					
+					if ( $row['bbcode_useoption'] )
+					{
+						$t = preg_replace( "#\[".$row['bbcode_tag']."=(?:&quot;|&\#39;)?(.+?)(?:&quot;|&\#39;)?\]#si", str_replace( '{option}', "\\1", $replace[0] ), $t );
+					}
+					else
+					{
+						$t = preg_replace( '#\['.$row['bbcode_tag'].'\]#i' , $replace[0], $t );
+					}
+					
+					$t = preg_replace( '#\[/'.$row['bbcode_tag'].'\]#i', $replace[1], $t );
+				}
+			}
+		}
+		
+		return $t;
+	}
+	
+	//-----------------------------------------
 	// parse_html
 	// Converts the doHTML tag
-	//--------------------------------------------------------------
+	//-----------------------------------------
 	
-	function parse_html($t="", $do_br=1)
+	function post_db_parse_html($t="")
 	{
 		if ( $t == "" )
 		{
 			return $t;
 		}
 		
+		//-----------------------------------------
 		// Remove <br>s 'cos we know they can't
 		// be user inputted, 'cos they are still
 		// &lt;br&gt; at this point :)
+		//-----------------------------------------
 		
-		if ( $do_br == 1 )
+		if ( $this->pp_nl2br != 1 )
 		{
 			$t = str_replace( "<br>"    , "\n" , $t );
 			$t = str_replace( "<br />"  , "\n" , $t );
 		}
+		
 		$t = str_replace( "&#39;"   , "'", $t );
 		$t = str_replace( "&#33;"   , "!", $t );
 		$t = str_replace( "&#036;"   , "$", $t );
@@ -435,24 +604,28 @@ class post_parser {
 		$t = str_replace( "&lt;"    , "<", $t );
 		$t = str_replace( "&quot;"  , '"', $t );
 		
+		//-----------------------------------------
 		// Take a crack at parsing some of the nasties
 		// NOTE: THIS IS NOT DESIGNED AS A FOOLPROOF METHOD
 		// AND SHOULD NOT BE RELIED UPON!
+		//-----------------------------------------
 		
-		$t = preg_replace( "/alert/i"      , "&#097;lert"      , $t );
-		$t = preg_replace( "/onmouseover/i", "&#111;nmouseover", $t );
-		$t = preg_replace( "/onclick/i"    , "&#111;nclick"    , $t );
-		$t = preg_replace( "/onload/i"     , "&#111;nload"     , $t );
-		$t = preg_replace( "/onsubmit/i"   , "&#111;nsubmit"   , $t );
+		$t = preg_replace( "/javascript/i" , "j&#097;v&#097;script", $t );
+		$t = preg_replace( "/alert/i"      , "&#097;lert"          , $t );
+		$t = preg_replace( "/about:/i"     , "&#097;bout:"         , $t );
+		$t = preg_replace( "/onmouseover/i", "&#111;nmouseover"    , $t );
+		$t = preg_replace( "/onclick/i"    , "&#111;nclick"        , $t );
+		$t = preg_replace( "/onload/i"     , "&#111;nload"         , $t );
+		$t = preg_replace( "/onsubmit/i"   , "&#111;nsubmit"       , $t );
 		
 		return $t;
 	}
 	
 	
-	//--------------------------------------------------------------
+	//-----------------------------------------
 	// Badwords:
 	// Swops naughty, naugty words and stuff
-	//--------------------------------------------------------------
+	//-----------------------------------------
 	
 	function bad_words($text = "")
 	{
@@ -463,76 +636,58 @@ class post_parser {
 			return "";
 		}
 		
-		if ( $this->no_bad_words == 1 )
+		if ( $this->bypass_badwords == 1 )
 		{
 			return $text;
 		}
 		
-		//--------------------------------
+		//-----------------------------------------
 		
-		if ( ! is_array($this->badwords) )
+		if ( is_array( $ibforums->cache['badwords'] ) )
 		{
-			$DB->query("SELECT * from ibf_badwords");
+			usort( $ibforums->cache['badwords'] , array( 'post_parser', 'word_length_sort' ) );
 			
-			$this->badwords = array();
-			
-			if ( $DB->get_num_rows() )
+			if ( count($ibforums->cache['badwords']) > 0 )
 			{
-				while ( $r = $DB->fetch_row() )
+				foreach($ibforums->cache['badwords'] as $idx => $r)
 				{
-					$this->badwords[] = array( 'type'    => stripslashes($r['type']),
-											   'swop'    => stripslashes($r['swop']),
-											   'm_exact' => $r['m_exact'],
-											 );
+				
+					if ($r['swop'] == "")
+					{
+						$replace = '######';
+					}
+					else
+					{
+						$replace = $r['swop'];
+					}
+					
+					//-----------------------------------------
+					
+					$r['type'] = preg_quote($r['type'], "/");
+					
+					//-----------------------------------------
+				
+					if ($r['m_exact'] == 1)
+					{
+						$text = preg_replace( "/(^|\b)".$r['type']."(\b|!|\?|\.|,|$)/i", "$replace", $text );
+					}
+					else
+					{
+						$text = preg_replace( "/".$r['type']."/i", "$replace", $text );
+					}
 				}
 			}
 		}
 		
-		usort($this->badwords, array( 'post_parser', 'word_length_sort' ) );
-		
-		if ( count($this->badwords) > 0 )
-		{
-			
-			foreach($this->badwords as $idx => $r)
-			{
-			
-				if ($r['swop'] == "")
-				{
-					$replace = '######';
-				}
-				else
-				{
-					$replace = $r['swop'];
-				}
-				
-				//---------------------------
-				
-				$r['type'] = preg_quote($r['type'], "/");
-				
-				//---------------------------
-			
-				if ($r['m_exact'] == 1)
-				{
-					$text = preg_replace( "/(^|\b)".$r['type']."(\b|!|\?|\.|,|$)/i", "$replace", $text );
-				}
-				else
-				{
-					$text = preg_replace( "/".$r['type']."/i", "$replace", $text );
-				}
-			}
-		
-		
-		}
-		
 		return $text;
 		
 	}
 	
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// unconvert:
 	// Parses the HTML back into plain text
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 		
 	function unconvert($txt="", $code=1, $html=0) {
 	
@@ -544,45 +699,50 @@ class post_parser {
 			$txt = preg_replace( "#<!--html-->(.+?)<!--html1-->(.+?)<!--html2-->(.+?)<!--html3-->#e", "\$this->unconvert_htm(\"\\2\")", $txt);
 		
 			$txt = preg_replace( "#<!--Flash (.+?)-->.+?<!--End Flash-->#e"  , "\$this->unconvert_flash('\\1')", $txt );
-			$txt = preg_replace( "#<img src=[\"'](\S+?)['\"].+?".">#"           , "\[IMG\]\\1\[/IMG\]"            , $txt );
+			$txt = preg_replace( "#<img src=[\"'](\S+?)['\"].+?".">#"           , "\[img\]\\1\[/img\]"            , $txt );
 			
-			$txt = preg_replace( "#<a href=[\"']mailto:(.+?)['\"]>(.+?)</a>#"                         , "\[EMAIL=\\1\]\\2\[/EMAIL\]"   , $txt );
-			$txt = preg_replace( "#<a href=[\"'](http://|https://|ftp://|news://)?(\S+?)['\"].+?".">(.+?)</a>#" , "\[URL=\\1\\2\]\\3\[/URL\]"  , $txt );
+			$txt = preg_replace( "#<a href=[\"']mailto:(.+?)['\"]>(.+?)</a>#"                         , "\[email=\\1\]\\2\[/email\]"   , $txt );
+			$txt = preg_replace( "#<a href=[\"'](http://|https://|ftp://|news://)?(\S+?)['\"].+?".">(.+?)</a>#" , "\[url=\\1\\2\]\\3\[/url\]"  , $txt );
 			
-			$txt = preg_replace( "#<!--QuoteBegin-->(.+?)<!--QuoteEBegin-->#"                , '[QUOTE]'         , $txt );
-			$txt = preg_replace( "#<!--QuoteBegin-{1,2}([^>]+?)\+([^>]+?)-->(.+?)<!--QuoteEBegin-->#"  , "[QUOTE=\\1,\\2]" , $txt );
-			$txt = preg_replace( "#<!--QuoteBegin-{1,2}([^>]+?)\+-->(.+?)<!--QuoteEBegin-->#"       , "[QUOTE=\\1]" , $txt );
+			$txt = preg_replace( "#<!--QuoteBegin-->(.+?)<!--QuoteEBegin-->#"                , '[quote]'         , $txt );
+			$txt = preg_replace( "#<!--QuoteBegin-{1,2}([^>]+?)\+([^>]+?)-->(.+?)<!--QuoteEBegin-->#"  , "[quote=\\1,\\2]" , $txt );
+			$txt = preg_replace( "#<!--QuoteBegin-{1,2}([^>]+?)\+-->(.+?)<!--QuoteEBegin-->#"       , "[quote=\\1]" , $txt );
 			
-			$txt = preg_replace( "#<!--QuoteEnd-->(.+?)<!--QuoteEEnd-->#"                    , '[/QUOTE]'        , $txt );
+			$txt = preg_replace( "#<!--QuoteEnd-->(.+?)<!--QuoteEEnd-->#"                    , '[/quote]'        , $txt );
 			
-			$txt = preg_replace( "#<!--c1-->(.+?)<!--ec1-->#", '[CODE]'   , $txt );
-			$txt = preg_replace( "#<!--c2-->(.+?)<!--ec2-->#", '[/CODE]'  , $txt );
+			$txt = preg_replace( "#<!--c1-->(.+?)<!--ec1-->#", '[code]'   , $txt );
+			$txt = preg_replace( "#<!--c2-->(.+?)<!--ec2-->#", '[/code]'  , $txt );
 			
 			$txt = preg_replace( "#<i>(.+?)</i>#is"  , "\[i\]\\1\[/i\]"  , $txt );
 			$txt = preg_replace( "#<b>(.+?)</b>#is"  , "\[b\]\\1\[/b\]"  , $txt );
 			$txt = preg_replace( "#<s>(.+?)</s>#is"  , "\[s\]\\1\[/s\]"  , $txt );
 			$txt = preg_replace( "#<u>(.+?)</u>#is"  , "\[u\]\\1\[/u\]"  , $txt );
 			
-			$txt = preg_replace( "#(\n){0,}<ul>#" , "\\1\[LIST\]"  , $txt );
-			$txt = preg_replace( "#(\n){0,}<ol type='(a|A|i|I|1)'>#" , "\\1\[LIST=\\2\]\n"  , $txt );
+			$txt = preg_replace( "#(\n){0,}<ul>#" , "\\1\[list\]"  , $txt );
+			$txt = preg_replace( "#(\n){0,}<ol type='(a|A|i|I|1)'>#" , "\\1\[list=\\2\]\n"  , $txt );
 			$txt = preg_replace( "#(\n){0,}<li>#" , "\n\[*\]"     , $txt );
-			$txt = preg_replace( "#(\n){0,}</ul>(\n){0,}#", "\n\[/LIST\]\\2" , $txt );
-			$txt = preg_replace( "#(\n){0,}</ol>(\n){0,}#", "\n\[/LIST\]\\2" , $txt );
+			$txt = preg_replace( "#(\n){0,}</ul>(\n){0,}#", "\n\[/list\]\\2" , $txt );
+			$txt = preg_replace( "#(\n){0,}</ol>(\n){0,}#", "\n\[/list\]\\2" , $txt );
 			
-			$txt = preg_replace( "#<!--me&(.+?)-->(.+?)<!--e--me-->#e" , "\$this->unconvert_me('\\1', '\\2')", $txt );
-			
-			$txt = preg_replace( "#<span style=['\"]font-size:(.+?)pt;line-height:100%['\"]>(.+?)</span>#se" , "\$this->unconvert_size('\\1', '\\2')", $txt );
+			while ( preg_match( "#<span style=['\"]font-size:(.+?)pt;line-height:100%['\"]>(.+?)</span>#is", $txt ) )
+			{
+				$txt = preg_replace( "#<span style=['\"]font-size:(.+?)pt;line-height:100%['\"]>(.+?)</span>#ise" , "\$this->unconvert_size('\\1', '\\2')", $txt );
+			}
 			
 			while ( preg_match( "#<span style=['\"]color:(.+?)['\"]>(.+?)</span>#is", $txt ) )
 			{
 				$txt = preg_replace( "#<span style=['\"]color:(.+?)['\"]>(.+?)</span>#is"    , "\[color=\\1\]\\2\[/color\]", $txt );
 			}
 			
-			$txt = preg_replace( "#<span style=['\"]font-family:(.+?)['\"]>(.+?)</span>#is", "\[font=\\1\]\\2\[/font\]", $txt );
+			while ( preg_match( "#<span style=['\"]font-family:(.+?)['\"]>(.+?)</span>#is", $txt ) )
+			{
+				$txt = preg_replace( "#<span style=['\"]font-family:(.+?)['\"]>(.+?)</span>#is", "\[font=\\1\]\\2\[/font\]", $txt );
+			}
 			
 			// Tidy up the end quote stuff
 			
-			$txt = preg_replace( "#(\[/QUOTE\])\s*?<br>\s*#si", "\\1\n", $txt );
+			$txt = preg_replace( "#(\[/QUOTE\])\s*?<br />\s*#si", "\\1\n", $txt );
+			$txt = preg_replace( "#(\[/QUOTE\])\s*?<br>\s*#si"  , "\\1\n", $txt );
 			
 			$txt = preg_replace( "#<!--EDIT\|.+?\|.+?-->#" , "" , $txt );
 			
@@ -596,45 +756,39 @@ class post_parser {
 			$txt = str_replace( "&#39;", "'", $txt);
 		}
 		
-		$txt = preg_replace( "#<br>#", "\n", $txt );
-		
+		$txt = str_replace( "<br>"  , "\n", $txt );
+		$txt = str_replace( "<br />", "\n", $txt );
 		
 		
 		return trim(stripslashes($txt));
 	}
 	
-//+-----------------------------------------------------------------------------------------
+//-----------------------------------------
 //+-----------------------------------------------------------------------------------------
 // UNCONVERT FUNCTIONS
 //+-----------------------------------------------------------------------------------------
 //+-----------------------------------------------------------------------------------------
 
-	function unconvert_size($size="", $text="") {
+	function unconvert_size($size="", $text="")
+	{
 		
 		$size -= 7;
 		
-		return '[SIZE='.$size.']'.$text.'[/SIZE]';
+		return '[size='.$size.']'.$text.'[/size]';
 		
 	}
 
-	function unconvert_flash($flash="") {
+	function unconvert_flash($flash="")
+	{
 	
 		$f_arr = explode( "+", $flash );
 		
-		return '[FLASH='.$f_arr[0].','.$f_arr[1].']'.$f_arr[2].'[/FLASH]';
+		return '[flash='.$f_arr[0].','.$f_arr[1].']'.$f_arr[2].'[/flash]';
 		
 	}
 	
-	function unconvert_me($name="", $text="") {
-	
-		$text = preg_replace( "#<span class='ME'><center>(.+?)</center></span>#", "\\1" , $text );
-		$text = preg_replace( "#$name#", "", $text );
-		
-		return '[ME='.$name.']'.$text.'[/ME]';
-		
-	}
-	
-	function unconvert_sql($sql="") {
+	function unconvert_sql($sql="")
+	{
 		$sql = stripslashes($sql);
 		
 		while ( preg_match( "#<span style='.+?'>(.+?)</span>#is", $sql ) )
@@ -644,11 +798,12 @@ class post_parser {
 		
 		$sql = preg_replace( "#\s*$#"    , "", $sql );
 		
-		return '[SQL]'.$sql.'[/SQL]';
+		return '[sql]'.$sql.'[/sql]';
 		
 	}
 
-	function unconvert_htm($html="") {
+	function unconvert_htm($html="")
+	{
 		$html = stripslashes($html);
 		
 		while ( preg_match( "#<span style='.+?'>(.+?)</span>#is", $html ) )
@@ -658,28 +813,32 @@ class post_parser {
 		
 		$html = preg_replace( "#\s*$#"    , "", $html );
 		
-		return '[HTML]'.$html.'[/HTML]';
+		return '[html]'.$html.'[/html]';
 		
 	}
 	
 	
-//+-----------------------------------------------------------------------------------------
+//-----------------------------------------
 //+-----------------------------------------------------------------------------------------
 // CONVERT FUNCTIONS
 //+-----------------------------------------------------------------------------------------
 //+-----------------------------------------------------------------------------------------
 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// convert_emoticon:
 	// replaces the text with the emoticon image
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function convert_emoticon($code="", $image="") {
+	function convert_emoticon($code="", $image="")
+	{
 		global $ibforums;
 		
 		if (!$code or !$image) return;
 		
+		//-----------------------------------------
 		// Remove slashes added by preg_quote
+		//-----------------------------------------
+		
 		$code = stripslashes($code);
 		
 		$this->emoticon_count++;
@@ -687,41 +846,33 @@ class post_parser {
 		return "<!--emo&".trim($code)."--><img src='{$ibforums->vars['EMOTICONS_URL']}/$image' border='0' style='vertical-align:middle' alt='$image' /><!--endemo-->";
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// wrap style:
 	// code and quote table HTML generator
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function wrap_style( $in=array() ) {
+	function wrap_style( $type='quote', $extra="" )
+	{
 		global $ibforums;
 		
-		if (! isset($in['TYPE']) )  $in['TYPE']  = 'class';
-		if (! isset($in['CSS']) )   $in['CSS']   = $this->in_sig == 1 ? 'signature' : 'postcolor';
-		if (! isset($in['STYLE']) ) $in['STYLE'] = 'QUOTE';
+		$used = array(
+					   'quote' => array( 'title' => 'QUOTE', 'css_top' => 'quotetop' , 'css_main' => 'quotemain' ),
+					   'code'  => array( 'title' => 'CODE' , 'css_top' => 'codetop'  , 'css_main' => 'codemain'  ),
+					   'sql'   => array( 'title' => 'SQL'  , 'css_top' => 'sqltop'   , 'css_main' => 'sqlmain'   ),
+					   'html'  => array( 'title' => 'HTML' , 'css_top' => 'htmltop'  , 'css_main' => 'htmlmain'  )
+					 );
 		
-		//-----------------------------
-		// This returns two array elements:
-		//  START: Contains the HTML code for the start wrapper
-		//  END  : Contains the HTML code for the end wrapper
-		//-----------------------------
 		
-		$possible_use = array( 'CODE'  => array( 'CODE',  'CODE' ),
-							   'QUOTE' => array( 'QUOTE', 'QUOTE'  ),
-							   'SQL'   => array( 'CODE' , 'SQL'),
-							   'HTML'  => array( 'CODE' , 'HTML'),
-							   'PHP'   => array( 'CODE' , 'PHP')
-							 );
-							 
-		return array( 'START' => "</div><table border='0' align='center' width='95%' cellpadding='3' cellspacing='1'><tr><td><b>{$possible_use[$in[STYLE]][1]}</b> {$in[EXTRA]}</td></tr><tr><td id='{$possible_use[ $in[STYLE] ][0]}'>",
-				      'END'   => "</td></tr></table><div {$in[TYPE]}='{$in[CSS]}'>"
-				    );
+		return array( 'START' => "<div class='{$used[ $type ]['css_top']}'>{$used[ $type ]['title']}{$extra}</div><div class='{$used[ $type ]['css_main']}'>",
+					  'END'   => "</div>"
+					);
 	}
 
 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_list: List generation
 	// 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_list( $txt="", $type="" )
 	{
@@ -730,8 +881,6 @@ class post_parser {
 			return;
 		}
 		
-		//$txt = str_replace( "\n", "", str_replace( "\r\n", "\n", $txt ) );
-		
 		if ( $type == "" )
 		{
 			// Unordered list.
@@ -755,33 +904,28 @@ class post_parser {
 			
 		
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_html_tag: HTML syntax highlighting
 	// 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_html_tag($html="") {
 	
 		if ($html == "") return;
 		
-		// Ensure that spacing is preserved
-
+		//-----------------------------------------
 		// Too many embedded code/quote/html/sql tags can crash Opera and Moz
+		//-----------------------------------------
 		
 		if (preg_match( "/\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\]/i", $html) )
 		{
 			return $default;
 		}
 				
-		//$html = preg_replace( "#\s{2}#", " &nbsp;", $html );
-		
-		// Knock off any preceeding newlines (which have
-		// since been converted into <br>)
-		
-		//$html = nl2br($html);
-		
+		//-----------------------------------------
 		// Take a stab at removing most of the common
 		// smilie characters.
+		//-----------------------------------------
 		
 		$html = preg_replace( "#:#"      , "&#58;", $html );
 		$html = preg_replace( "#\[#"     , "&#91;", $html );
@@ -789,8 +933,9 @@ class post_parser {
 		$html = preg_replace( "#\)#"     , "&#41;", $html );
 		$html = preg_replace( "#\(#"     , "&#40;", $html );
 		
-		$html = preg_replace( "/^<br>/", "", $html );
-		$html = preg_replace( "/^\s+/" , "", $html );
+		$html = preg_replace( "/^<br>/"  , "", $html );
+		$html = preg_replace( "#^<br />#", "", $html );
+		$html = preg_replace( "/^\s+/"   , "", $html );
 		
 		$html = preg_replace( "#&lt;([^&<>]+)&gt;#"                           , "&lt;<span style='color:blue'>\\1</span>&gt;"        , $html );   //Matches <tag>
 		$html = preg_replace( "#&lt;([^&<>]+)=#"                              , "&lt;<span style='color:blue'>\\1</span>="           , $html );   //Matches <tag
@@ -798,35 +943,40 @@ class post_parser {
 		$html = preg_replace( "!=(&quot;|&#39;)(.+?)?(&quot;|&#39;)(\s|&gt;)!" , "=\\1<span style='color:orange'>\\2</span>\\3\\4"    , $html );   //Matches ='this'
 		$html = preg_replace( "!&#60;&#33;--(.+?)--&#62;!"                    , "&lt;&#33;<span style='color:red'>--\\1--</span>&gt;", $html );
 		
-		
-		
-		$wrap = $this->wrap_style( array( 'STYLE' => 'HTML' ) );
+		$wrap = $this->wrap_style( 'html' );
 		
 		return "<!--html-->{$wrap['START']}<!--html1-->$html<!--html2-->{$wrap['END']}<!--html3-->";
 	}
 		
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_sql_tag: SQL syntax highlighting
 	// 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_sql_tag($sql="") {
 		
 		if ($sql == "") return;
-
+		
+		//-----------------------------------------
 		// Too many embedded code/quote/html/sql tags can crash Opera and Moz
+		//-----------------------------------------
 		
 		if (preg_match( "/\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\]/i", $sql) ) {
 			return $default;
 		}
-				
+		
+		//-----------------------------------------	
 		// Knock off any preceeding newlines (which have
 		// since been converted into <br>)
+		//-----------------------------------------
 		
-		$sql = preg_replace( "/^<br>/", "", $sql );
-		$sql = preg_replace( "/^\s+/" , "", $sql );
+		$sql = preg_replace( "/^<br>/"  , "", $sql );
+		$sql = preg_replace( "#^<br />#", "", $sql );
+		$sql = preg_replace( "/^\s+/"   , "", $sql );
 		
+		//-----------------------------------------
 		// Make certain regex work..
+		//-----------------------------------------
 		
 		if (! preg_match( "/\s+$/" , $sql) )
 		{
@@ -842,31 +992,36 @@ class post_parser {
 	    $sql = preg_replace( "#(FROM|INTO)\s{1,}(\S+?)\s{1,}#i"                                , "<span style='color:green'>\\1</span> <span style='color:orange'>\\2</span> ", $sql );
 	    $sql = preg_replace( "#(SELECT|INSERT|UPDATE|DELETE|ALTER TABLE|DROP)#i"               , "<span style='color:blue;font-weight:bold'>\\1</span>" , $sql );
 	    
-	    $html = $this->wrap_style( array( 'STYLE' => 'SQL' ) );
+	    $html = $this->wrap_style( 'sql' );
 	    
 	    return "<!--sql-->{$html['START']}<!--sql1-->{$sql}<!--sql2-->{$html['END']}<!--sql3-->";
 	 }
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_code_tag: Builds this code tag HTML
 	// 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function regex_code_tag($txt="") {
+	function regex_code_tag($txt="")
+	{
 		global $ibforums;
 		
 		$default = "\[code\]$txt\[/code\]";
 		
 		if ($txt == "") return;
 		
+		//-----------------------------------------
 		// Too many embedded code/quote/html/sql tags can crash Opera and Moz
+		//-----------------------------------------
 		
 		if (preg_match( "/\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\]/i", $txt) ) {
 			return $default;
 		}
 		
+		//-----------------------------------------
 		// Take a stab at removing most of the common
 		// smilie characters.
+		//-----------------------------------------
 		
 		//$txt = str_replace( "&" , "&amp;", $txt );
 		$txt = preg_replace( "#&lt;#"   , "&#60;", $txt );
@@ -877,24 +1032,26 @@ class post_parser {
 		$txt = preg_replace( "#\]#"     , "&#93;", $txt );
 		$txt = preg_replace( "#\)#"     , "&#41;", $txt );
 		$txt = preg_replace( "#\(#"     , "&#40;", $txt );
-		$txt = preg_replace( "#\r#"     , "<br>", $txt );
-		$txt = preg_replace( "#\n#"     , "<br>", $txt );
+		$txt = preg_replace( "#\r#"     , "<br />", $txt );
+		$txt = preg_replace( "#\n#"     , "<br />", $txt );
 		$txt = preg_replace( "#\s{1};#" , "&#59;", $txt );
 		
+		//-----------------------------------------
 		// Ensure that spacing is preserved
+		//-----------------------------------------
 		
 		$txt = preg_replace( "#\s{2}#", " &nbsp;", $txt );
 		
-		$html = $this->wrap_style( array( 'STYLE' => 'CODE' ) );
+		$html = $this->wrap_style( 'code' );
 		
 		return "<!--c1-->{$html['START']}<!--ec1-->$txt<!--c2-->{$html['END']}<!--ec2-->";
 		
 	}
 	
-	/****************************************************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_parse_quotes: Builds this quote tag HTML
 	// [QUOTE] .. [/QUOTE] - allows for embedded quotes
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_parse_quotes($the_txt="") {
 		
@@ -902,21 +1059,21 @@ class post_parser {
 		
 		$txt = $the_txt;
 		
-		// Too many embedded code/quote/html/sql tags can crash Opera and Moz
-		
-		/*if (preg_match( "/\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\].+?\[(quote|code|html|sql)\]/is", $txt) ) {
-			$this->quote_error++;
+		if ( substr_count( strtolower($txt), '[quote' ) > $this->max_embed_quotes )
+		{
 			return $txt;
-		}*/
+		}
 		
-		$this->quote_html = $this->wrap_style( array( 'STYLE' => 'QUOTE' ) );
+		$txt = str_replace( chr(173).']', '&#93;', $txt );
 		
-		$txt = preg_replace( "#\[quote\]#ie"                        , "\$this->regex_simple_quote_tag()"    , $txt );
-		$txt = preg_replace( "#\[quote=([^\]]+?),([^\]]+?)\]#ie"    , "\$this->regex_quote_tag('\\1', '\\2')"  , $txt );
-		$txt = preg_replace( "#\[quote=([^\]]+?)\]#ie"              , "\$this->regex_quote_tag('\\1', '')"  , $txt );
-		$txt = preg_replace( "#\[/quote\]#ie"                       , "\$this->regex_close_quote()"          , $txt );
+		$this->quote_html = $this->wrap_style('quote');
 		
-		$txt = preg_replace( "/\n/", "<br>", $txt );
+		$txt = preg_replace( "#\[quote\]#ie"                        , "\$this->regex_simple_quote_tag()"       , $txt );
+		$txt = preg_replace( "#\[quote=([^\],]+?),([^\]]+?)\]#ie"   , "\$this->regex_quote_tag('\\1', '\\2')"  , $txt );
+		$txt = preg_replace( "#\[quote=([^\]]+?)\]#ie"              , "\$this->regex_quote_tag('\\1', '')"     , $txt );
+		$txt = preg_replace( "#\[/quote\]#ie"                       , "\$this->regex_close_quote()"            , $txt );
+		
+		$txt = str_replace( "\n", "<br />", $txt );
 		
 		if ( ($this->quote_open == $this->quote_closed) and ($this->quote_error == 0) )
 		{
@@ -931,35 +1088,37 @@ class post_parser {
 		
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_preserve_spacing: keeps double spaces
 	// without CSS killing <pre> tags
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_preserve_spacing($txt="")
 	{
-		$txt = preg_replace( "#\s{2}#", "&nbsp; ", trim($txt) );
+		$txt = preg_replace( "#^<!--QuoteEBegin-->(?:<br>|<br />)#", "<!--QuoteEBegin-->", trim($txt) );
+		
+		$txt = preg_replace( "#\s{2}#", "&nbsp; ", $txt );
 		return $txt;
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_simple_quote_tag: Builds this quote tag HTML
 	// [QUOTE] .. [/QUOTE]
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function regex_simple_quote_tag() {
+	function regex_simple_quote_tag()
+	{
 		global $ibforums;
 		
 		$this->quote_open++;
 
 		return "<!--QuoteBegin-->{$this->quote_html['START']}<!--QuoteEBegin-->";
-		
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_close_quote: closes a quote tag
 	// 
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_close_quote() {
 	
@@ -974,10 +1133,10 @@ class post_parser {
 		return "<!--QuoteEnd-->{$this->quote_html['END']}<!--QuoteEEnd-->";
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_quote_tag: Builds this quote tag HTML
 	// [QUOTE=Matthew,14 February 2002]
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function regex_quote_tag($name="", $date="")
 	{
@@ -994,7 +1153,9 @@ class post_parser {
 		
 		if ( strstr( $name, '<!--c1-->' ) or strstr( $date, '<!--c1-->' ) )
 		{
+			//-----------------------------------------
 			// Code tag detected...
+			//-----------------------------------------
 			
 			$this->quote_error++;
 		 	return $default;
@@ -1009,11 +1170,11 @@ class post_parser {
 	
 		if ($date == "")
 		{
-			$html = $this->wrap_style( array( 'STYLE' => 'QUOTE', 'EXTRA' => "($name)" ) );
+			$html = $this->wrap_style( 'quote', "($name)");
 		}
 		else
 		{
-			$html = $this->wrap_style( array( 'STYLE' => 'QUOTE', 'EXTRA' => "($name &#064; $date)" ) );
+			$html = $this->wrap_style( 'quote', "($name &#064; $date)" );
 		}
 		
 		$extra = "-".$name.'+'.$date;
@@ -1022,12 +1183,13 @@ class post_parser {
 		
 	}		
 	
-	/****************************************************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_check_flash: Checks, and builds the <object>
 	// html.
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function regex_check_flash($width="", $height="", $url="") {
+	function regex_check_flash($width="", $height="", $url="")
+	{
 		global $ibforums;
 		
 		$default = "\[flash=$width,$height\]$url\[/flash\]";
@@ -1054,12 +1216,13 @@ class post_parser {
 		return "<!--Flash $width+$height+$url--><OBJECT CLASSID='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000' WIDTH=$width HEIGHT=$height><PARAM NAME=MOVIE VALUE=$url><PARAM NAME=PLAY VALUE=TRUE><PARAM NAME=LOOP VALUE=TRUE><PARAM NAME=QUALITY VALUE=HIGH><EMBED SRC=$url WIDTH=$width HEIGHT=$height PLAY=TRUE LOOP=TRUE QUALITY=HIGH></EMBED></OBJECT><!--End Flash-->";
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_check_image: Checks, and builds the <img>
 	// html.
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function regex_check_image($url="") {
+	function regex_check_image($url="")
+	{
 		global $ibforums;
 		
 		if (!$url) return;
@@ -1070,7 +1233,9 @@ class post_parser {
 		
 		++$this->image_count;
 		
+		//-----------------------------------------
 		// Make sure we've not overriden the set image # limit
+		//-----------------------------------------
 		
 		if ($ibforums->vars['max_images'])
 		{
@@ -1081,7 +1246,9 @@ class post_parser {
 			}
 		}
 		
+		//-----------------------------------------
 		// Are they attempting to post a dynamic image, or JS?
+		//-----------------------------------------
 		
 		if ($ibforums->vars['allow_dynamic_img'] != 1)
 		{
@@ -1097,7 +1264,9 @@ class post_parser {
 			}
 		}
 		
+		//-----------------------------------------
 		// Is the img extension allowed to be posted?
+		//-----------------------------------------
 		
 		if ($ibforums->vars['img_ext'])
 		{
@@ -1113,21 +1282,25 @@ class post_parser {
 			
 			$ibforums->vars['img_ext'] = strtolower($ibforums->vars['img_ext']);
 			
-			if (!preg_match( "/".preg_quote($extension, '/')."(\||$)/", $ibforums->vars['img_ext'] ))
+			if ( ! preg_match( "/".preg_quote($extension, '/')."(,|$)/", $ibforums->vars['img_ext'] ))
 			{
 				$this->error = 'invalid_ext';
 				return $default;
 			}
 		}
 		
+		//-----------------------------------------
 		// Is it a legitimate image?
+		//-----------------------------------------
 		
 		if (!preg_match( "/^(http|https|ftp):\/\//i", $url )) {
 			$this->error = 'no_dynamic';
 			return $default;
 		}
 		
+		//-----------------------------------------
 		// If we are still here....
+		//-----------------------------------------
 		
 		$url = str_replace( " ", "%20", $url );
 		
@@ -1135,16 +1308,19 @@ class post_parser {
 	}
 		
 	
-    /**************************************************/
+    /*-------------------------------------------------------------------------*/
 	// regex_font_attr:
 	// Returns a string for an /e regexp based on the input
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function regex_font_attr($IN) {
+	function regex_font_attr($IN)
+	{
 		if (!is_array($IN)) return "";
 		
+		//-----------------------------------------
 		// Trim out stoopid 1337 stuff
 		// [color=black;font-size:500pt;border:orange 50in solid;]hehe[/color]
+		//-----------------------------------------
 		
 		if ( preg_match( "/;/", $IN['1'] ) )
 		{
@@ -1176,17 +1352,20 @@ class post_parser {
 		}
 	}
 	
-	/**************************************************/
+	/*-------------------------------------------------------------------------*/
 	// regex_build_url: Checks, and builds the a href
 	// html
-	/**************************************************/
-	
-	function regex_build_url($url=array()) {
+	/*-------------------------------------------------------------------------*/
 	
+	function regex_build_url($url=array())
+	{
 		$skip_it = 0;
 		
-		// Make sure the last character isn't punctuation.. if it is, remove it and add it to the
+		//-----------------------------------------
+		// Make sure the last character isn't punctuation..
+		// if it is, remove it and add it to the
 		// end array
+		//-----------------------------------------
 		
 		if ( preg_match( "/([\.,\?]|&#33;)$/", $url['html'], $match) )
 		{
@@ -1195,29 +1374,42 @@ class post_parser {
 			$url['show'] = preg_replace( "/([\.,\?]|&#33;)$/", "", $url['show'] );
 		}
 		
-		// Make sure it's not being used in a closing code/quote/html or sql block
+		//-----------------------------------------
+		// Make sure it's not being used in a
+		// closing code/quote/html or sql block
+		//-----------------------------------------
 		
 		if (preg_match( "/\[\/(html|quote|code|sql)/i", $url['html']) )
 		{
 			return $url['html'];
 		}
 		
-		// clean up the ampersands
-		$url['html'] = preg_replace( "/&amp;/" , "&" , $url['html'] );
+		//-----------------------------------------
+		// clean up the ampersands / brackets
+		//-----------------------------------------
 		
+		$url['html'] = str_replace( "&amp;" , "&"   , $url['html'] );
+		$url['html'] = str_replace( "["     , "%5b" , $url['html'] );
+		$url['html'] = str_replace( "]"     , "%5d" , $url['html'] );
+		
+		//-----------------------------------------
 		// Make sure we don't have a JS link
+		//-----------------------------------------
+		
 		$url['html'] = preg_replace( "/javascript:/i", "java script&#58; ", $url['html'] );
 		
+		//-----------------------------------------
 		// Do we have http:// at the front?
+		//-----------------------------------------
 		
 		if ( ! preg_match("#^(http|news|https|ftp|aim)://#", $url['html'] ) )
 		{
 			$url['html'] = 'http://'.$url['html'];
 		}
 		
-		//-------------------------
+		//-----------------------------------------
 		// Tidy up the viewable URL
-		//-------------------------
+		//-----------------------------------------
 
 		if (preg_match( "/^<img src/i", $url['show'] )) $skip_it = 1;
 
@@ -1226,13 +1418,16 @@ class post_parser {
 		
 		if ( (strlen($url['show']) -58 ) < 3 )  $skip_it = 1;
 		
+		//-----------------------------------------
 		// Make sure it's a "proper" url
+		//-----------------------------------------
 		
 		if (!preg_match( "/^(http|ftp|https|news):\/\//i", $url['show'] )) $skip_it = 1;
 		
 		$show     = $url['show'];
 		
-		if ($skip_it != 1) {
+		if ($skip_it != 1)
+		{
 			$stripped = preg_replace( "#^(http|ftp|https|news)://(\S+)$#i", "\\2", $url['show'] );
 			$uri_type = preg_replace( "#^(http|ftp|https|news)://(\S+)$#i", "\\1", $url['show'] );
 			
@@ -1245,12 +1440,12 @@ class post_parser {
 	
 	function regex_bash_session($start_tok, $end_tok)
 	{
-		// Bug fix :D
+		//-----------------------------------------
 		// Case 1: index.php?s=0000        :: Return nothing (parses: index.php)
 		// Case 2: index.php?s=0000&this=1 :: Return ?       (parses: index.php?this=1)
 		// Case 3: index.php?this=1&s=0000 :: Return nothing (parses: index.php?this=1)
 		// Case 4: index.php?t=1&s=00&y=2  :: Return &       (parses: index.php?t=1&y=2)
-		// Thanks to LavaSoft for spotting this one.
+		//-----------------------------------------
 		
 		$start_tok = str_replace( '&amp;', '&', $start_tok );
 		$end_tok   = str_replace( '&amp;', '&', $end_tok   );
@@ -1281,6 +1476,25 @@ class post_parser {
 	
 	}
 	
+	function smilie_length_sort($a, $b)
+	{
+		if ( strlen($a['typed']) == strlen($b['typed']) )
+		{
+			return 0;
+		}
+		return ( strlen($a['typed']) > strlen($b['typed']) ) ? -1 : 1;
+	}
+	
+	
+	function word_length_sort($a, $b)
+	{
+		if ( strlen($a['type']) == strlen($b['type']) )
+		{
+			return 0;
+		}
+		return ( strlen($a['type']) > strlen($b['type']) ) ? -1 : 1;
+	}
+	
 }
 
 
diff --git a/upload/sources/lib/post_poll.php b/upload/sources/lib/post_poll.php
index a0c2ab6d..de1e9d83 100644
--- a/upload/sources/lib/post_poll.php
+++ b/upload/sources/lib/post_poll.php
@@ -2,21 +2,21 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > New Post module
 |   > Module written by Matt Mecham
+|   > DBA Checked: Fri 21 May 2004
 |
 +--------------------------------------------------------------------------
 */
@@ -39,127 +39,161 @@ class post_functions extends Post {
 	
 	function post_functions($class)
 	{
-	
 		global $ibforums, $std, $DB;
 		
-		//-------------------------------------------------------------------------
+		$this->class = $class;
+		
+		$this->post_key = $ibforums->input['post_key'] ? $ibforums->input['post_key'] : md5(microtime());
+		
+		//-----------------------------------------
 		// Sort out maximum number of poll choices allowed
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		$ibforums->vars['max_poll_choices'] = $ibforums->vars['max_poll_choices'] ? $ibforums->vars['max_poll_choices'] : 10;
 		
 		$ibforums->lang['poll_choices']      = sprintf( $ibforums->lang['poll_choices'], $ibforums->vars['max_poll_choices'] );
 		
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		// Lets do some tests to make sure that we are allowed to start a new topic
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		if (! $ibforums->member['g_post_polls'])
 		{
 			$std->Error( array( LEVEL => 1, MSG => 'no_start_polls') );
 		}
 		
-		if ( ! $class->forum['allow_poll'] )
+		if ( ! $this->class->forum['allow_poll'] )
 		{
 			$std->Error( array( LEVEL => 1, MSG => 'no_start_polls') );
 		}
 			
 		$this->m_group = $ibforums->perm_id;
 		
-		if ( $std->check_perms($class->forum['start_perms']) != TRUE )
+		if ( $std->check_perms($this->class->forum['start_perms']) != TRUE )
 		{
 			$std->Error( array( LEVEL => 1, MSG => 'no_start_polls') );
 		}
 
 	}
 	
-	function process($class) {
-	
+	function process()
+	{
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
-		// Parse the post, and check for any errors.
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Did we remove an attachment?
+		//-----------------------------------------
 		
-		$this->post   = $class->compile_post();
-		
-		//-------------------------------------------------
-		// check to make sure we have a valid topic title
-		//-------------------------------------------------
-		
-		if ( (strlen($ibforums->input['TopicTitle']) < 2) or (!$ibforums->input['TopicTitle'])  ) {
-			$class->obj['post_errors'] = 'no_topic_title';
+		if ( $ibforums->input['removeattachid'] )
+		{
+			if ( $ibforums->input[ 'removeattach_'. $ibforums->input['removeattachid'] ] )
+			{
+				$this->class->pf_remove_attachment( intval($ibforums->input['removeattachid']), $this->post_key );
+				$this->show_form();
+			}
 		}
 		
-		//-------------------------------------------------
-		// More unicode..
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Did we add an attachment?
+		//-----------------------------------------
 		
-		$temp = $std->txt_stripslashes($HTTP_POST_VARS['TopicTitle']);
+		if ( $ibforums->input['attachgo'] )
+		{
+			$this->class->obj['post_errors'] = "";
+			$this->upload_id = $this->class->process_upload();
+			$this->show_form();
+		}
+		
+		//-----------------------------------------
+		// Parse the post, and check for any errors.
+		//-----------------------------------------
+		
+		$this->post   = $this->class->compile_post();
+		
+		//-----------------------------------------
+		// check to make sure we have a valid topic title
+		//-----------------------------------------
+		
+		if ( (strlen($ibforums->input['TopicTitle']) < 2) or (!$ibforums->input['TopicTitle'])  )
+		{
+			$this->class->obj['post_errors'] = 'no_topic_title';
+		}
+		
+		//-----------------------------------------
+		// More unicode..
+		//-----------------------------------------
+		
+		$temp = $std->txt_stripslashes($_POST['TopicTitle']);
 		
 		$temp = preg_replace("/&#([0-9]+);/", "-", $temp );
 		
 		if ( strlen($temp) > 64 )
 		{
-			$class->obj['post_errors'] = 'topic_title_long';
+			$this->class->obj['post_errors'] = 'topic_title_long';
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// check to make sure we have a correct # of choices
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$this->poll_choices = $ibforums->input['PollAnswers'];
 		
-		$this->poll_choices = preg_replace( "/<br><br>/" , ""                              , $this->poll_choices );
+		$this->poll_choices = preg_replace( "#<br /><br />#" , ""                              , $this->poll_choices );
 		
-		$this->poll_choices = preg_replace( "/<br>/e"    , "\$this->regex_count_choices()" , $this->poll_choices );
+		$this->poll_choices = preg_replace( "#<br />#e"      , "\$this->regex_count_choices()" , $this->poll_choices );
 		
 		if ($this->poll_count > $ibforums->vars['max_poll_choices'])
 		{
-			$class->obj['post_errors'] = 'poll_to_many';
+			$this->class->obj['post_errors'] = 'poll_to_many';
 		}
 		
 		if ($this->poll_count < 1)
 		{
-			$class->obj['post_errors'] = 'poll_not_enough';
+			$this->class->obj['post_errors'] = 'poll_not_enough';
 		}
 
-		//-------------------------------------------------
+		//-----------------------------------------
 		// If we don't have any errors yet, parse the upload
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ($class->obj['post_errors'] == "")
+		if ($this->class->obj['post_errors'] == "")
 		{
-			$this->upload = $class->process_upload();
+			$this->upload = $this->class->process_upload();
 		}
 		
-		
-		if ( ($class->obj['post_errors'] != "") or ($class->obj['preview_post'] != "") ) {
+		if ( ($this->class->obj['post_errors'] != "") or ($this->class->obj['preview_post'] != "") )
+		{
+			//-----------------------------------------
 			// Show the form again
-			$this->show_form($class);
-		} else {
-			$this->add_new_poll($class);
+			//-----------------------------------------
+			
+			$this->show_form();
+		}
+		else
+		{
+			$this->add_new_poll();
 		}
 	}
 	
 	
+	/*-------------------------------------------------------------------------*/
+	// ADD POLL FUNCTION
+	/*-------------------------------------------------------------------------*/
 	
 	
-	
-	function add_new_poll($class) {
-		
+	function add_new_poll() {
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Sort out the poll stuff
 		// This is somewhat contrived, but it has to be
 		// compatible with the current perl version.
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$poll_array  = array();
 		$count       = 0;
 		
-		$polls       = explode( "<br>", $this->poll_choices );
+		$polls       = explode( "<br />", $this->poll_choices );
 		
 		foreach ($polls as $polling)
 		{
@@ -167,27 +201,18 @@ class post_functions extends Post {
 			{
 				continue;
 			}
-			$poll_array[] = array( $count , $class->parser->bad_words($polling), 0 );
+			$poll_array[] = array( $count , $this->class->parser->bad_words($polling), 0 );
 			$count++;
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Fix up the topic title
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ($ibforums->vars['etfilter_punct'])
-		{
-			$ibforums->input['TopicTitle']	= preg_replace( "/\?{1,}/"      , "?"    , $ibforums->input['TopicTitle'] );		
-			$ibforums->input['TopicTitle']	= preg_replace( "/(&#33;){1,}/", "&#33;" , $ibforums->input['TopicTitle'] );
-		}
+		$ibforums->input['TopicTitle'] = $this->class->pf_clean_topic_title( $ibforums->input['TopicTitle'] );
 		
-		if ($ibforums->vars['etfilter_shout'])
-		{
-			$ibforums->input['TopicTitle'] = ucwords($ibforums->input['TopicTitle']);
-		}
-		
-		$ibforums->input['TopicTitle'] = $class->parser->bad_words( $ibforums->input['TopicTitle'] );
-		$ibforums->input['TopicDesc']  = $class->parser->bad_words( $ibforums->input['TopicDesc']  );
+		$ibforums->input['TopicTitle'] = $this->class->parser->bad_words( $ibforums->input['TopicTitle'] );
+		$ibforums->input['TopicDesc']  = $this->class->parser->bad_words( $ibforums->input['TopicDesc']  );
 		
 		if ( $ibforums->vars['poll_disable_noreply'] != 1 )
 		{
@@ -198,14 +223,49 @@ class post_functions extends Post {
 			$poll_state = 'open';
 		}
 		
-		//-------------------------------------------------
+		$pinned = 0;
+		$state  = 'open';
+		
+		if ( ($ibforums->input['mod_options'] != "") or ($ibforums->input['mod_options'] != 'nowt') )
+		{
+			if ($ibforums->input['mod_options'] == 'pin')
+			{
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['pin_topic'] == 1)
+				{
+					$pinned = 1;
+					
+					$this->class->moderate_log('Pinned topic from post form', $ibforums->input['TopicTitle']);
+				}
+			}
+			else if ($ibforums->input['mod_options'] == 'close')
+			{
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['close_topic'] == 1)
+				{
+					$state = 'closed';
+					
+					$this->class->moderate_log('Closed topic from post form', $ibforums->input['TopicTitle']);
+				}
+			}
+			else if ($ibforums->input['mod_options'] == 'pinclose')
+			{
+				if ($ibforums->member['g_is_supmod'] == 1 or ( $this->class->moderator['pin_topic'] == 1 AND $this->class->moderator['close_topic'] == 1 ) )
+				{
+					$pinned = 1;
+					$state = 'closed';
+					
+					$this->class->moderate_log('Pinned & closed topic from post form', $ibforums->input['TopicTitle']);
+				}
+			}
+		}
+		
+		//-----------------------------------------
 		// Build the master array
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$this->topic = array(
 							  'title'            => $ibforums->input['TopicTitle'],
 							  'description'      => $ibforums->input['TopicDesc'] ,
-							  'state'            => 'open',
+							  'state'            => $state,
 							  'posts'            => 0,
 							  'starter_id'       => $ibforums->member['id'],
 							  'starter_name'     => $ibforums->member['id'] ?  $ibforums->member['name'] : $ibforums->input['UserName'],
@@ -218,211 +278,181 @@ class post_functions extends Post {
 							  'poll_state'       => $poll_state,
 							  'last_vote'        => 0,
 							  'views'            => 0,
-							  'forum_id'         => $class->forum['id'],
-							  'approved'         => $class->obj['moderate'] ? 0 : 1,
-							  'pinned'           => 0,
+							  'forum_id'         => $this->class->forum['id'],
+							  'approved'         => $this->class->obj['moderate'] ? 0 : 1,
+							  'pinned'           => $pinned,
 							 );
 		
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Insert the topic into the database to get the
 		// last inserted value of the auto_increment field
 		// follow suit with the post
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$db_string = $DB->compile_db_insert_string( $this->topic );
+		$DB->do_insert( 'topics', $this->topic );
 		
-		$DB->query("INSERT INTO ibf_topics (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
 		$this->post['topic_id']  = $DB->get_insert_id();
 		$this->topic['tid']      = $this->post['topic_id'];
-		/*---------------------------------------------------*/
 		
+		//-----------------------------------------
 		// Update the post info with the upload array info
+		//-----------------------------------------
 		
-		$this->post['attach_id']   = $this->upload['attach_id'];
-		$this->post['attach_type'] = $this->upload['attach_type'];
-		$this->post['attach_hits'] = $this->upload['attach_hits'];
+		$this->post['post_key']    = $this->post_key;
 		$this->post['new_topic']   = 1;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Unqueue the post if we're starting a new topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ( $class->obj['moderate'] == 3 )
+		if ( $this->class->obj['moderate'] == 3 )
 		{
 			$this->post['queued'] = 0;
 		}
 		
-		$db_string = $DB->compile_db_insert_string( $this->post );
+		//-----------------------------------------
+		// Add post to DB
+		//-----------------------------------------
 		
-		$DB->query("INSERT INTO ibf_posts (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
+		$DB->do_insert( 'posts', $this->post );
+	
 		$this->post['pid'] = $DB->get_insert_id();
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Update topic with firstpost ID
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'update' => 'topics',
+									  'set'    => "topic_firstpost=".$this->post['pid'],
+									  'where'  => "tid=".$this->topic['tid']
+							 )      );
+							 
+		$DB->simple_exec();
+		
+		
+		//-----------------------------------------
 		// Add the poll to the forum_polls table
 		// if we are moderating this post
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$db_string = $std->compile_db_string(
-											  array (
-											  			'tid'           => $this->topic['tid'],
-											  			'forum_id'      => $class->forum['id'],
-											  			'start_date'    => time(),
-											  			'choices'       => addslashes(serialize($poll_array)),
-											  			'starter_id'    => $ibforums->member['id'],
-											  			'votes'         => 0,
-											  			'poll_question' => $class->parser->bad_words($ibforums->input['pollq']),
-											  		)
-											  );
-											  
-		$DB->query("INSERT INTO ibf_polls (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-		
-								    
-		
-		if ( $class->obj['moderate'] == 1 OR $class->obj['moderate'] == 2 )
-		{
-			// Redirect them with a message telling them the post has to be previewed first
-			
-			$DB->query("UPDATE ibf_forums SET has_mod_posts=1 WHERE id=".$class->forum['id']);
-			
-			$class->notify_new_topic_approval( $this->topic['tid'], $this->topic['title'], $this->topic['starter_name'] );
-			
-			$print->redirect_screen( $ibforums->lang['moderate_topic'], "act=SF&f={$class->forum['id']}" );
-		}
-		
-		//-------------------------------------------------
+		$DB->do_insert( 'polls', 
+						 array (
+								   'tid'           => $this->topic['tid'],
+								   'forum_id'      => $this->class->forum['id'],
+								   'start_date'    => time(),
+								   'choices'       => addslashes(serialize($poll_array)),
+								   'starter_id'    => $ibforums->member['id'],
+								   'votes'         => 0,
+								   'poll_question' => $this->class->parser->bad_words($ibforums->input['pollq']),
+						 )     );
+											 
+		//-----------------------------------------
 		// If we are still here, lets update the
 		// board/forum stats
-		//-------------------------------------------------
+		//----------------------------------------- 
 		
-		$class->forum['last_title']       = $this->topic['title'];
-		$class->forum['last_id']          = $this->topic['tid'];
-		$class->forum['last_post']        = time();
-		$class->forum['last_poster_name'] = $ibforums->member['id'] ?  $ibforums->member['name'] : $ibforums->input['UserName'];
-		$class->forum['last_poster_id']   = $ibforums->member['id'];
-		$class->forum['topics']++;
+		$this->class->pf_update_forum_and_stats($this->topic['tid'], $this->topic['title'], 'new');
 		
-		// Update the database
+		//-----------------------------------------
+		// Make attachments "permanent"
+		//-----------------------------------------
 		
-		$DB->query("UPDATE ibf_forums    SET last_title='"      .$class->forum['last_title']       ."', ".
-											"last_id='"         .$class->forum['last_id']          ."', ".
-											"last_post='"       .$class->forum['last_post']        ."', ".
-											"last_poster_name='".$class->forum['last_poster_name'] ."', ".
-											"last_poster_id='"  .$class->forum['last_poster_id']   ."', ".
-											"topics='"          .$class->forum['topics']           ."' ".
-											"WHERE id='"        .$class->forum['id']               ."'");
+		$this->class->pf_make_attachments_permanent($this->post_key, $this->topic['tid'], $this->post['pid']);
 		
-		// At this point in time, we'll scan the database for the correct number
-		// of topics - if this proves to database intensive, we'll simply increment
-		// the value stored in the ibf_stats database.
-		
-		$DB->query("SELECT COUNT(tid) as topic_cnt FROM ibf_topics");
-		$stats = $DB->fetch_row();
-		
-		$DB->query("UPDATE ibf_stats SET TOTAL_TOPICS='".$stats['topic_cnt']."'");
-		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// If we are a member, lets update thier last post
 		// date and increment their post count.
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$pcount = "";
+		$this->class->pf_increment_user_post_count();
 		
-		if ($ibforums->member['id'])
+		//-----------------------------------------
+		// Moderating?
+		//-----------------------------------------
+		
+		if ( $this->class->obj['moderate'] == 1 OR $this->class->obj['moderate'] == 2 )
 		{
-			if ($class->forum['inc_postcount'])
-			{
-				// Increment the users post count
-				
-				$pcount = "posts=posts+1, ";
-				
-			}
+			//-----------------------------------------
+			// Redirect them with a message telling them the
+			// post has to be previewed first
+			//-----------------------------------------
+		
+			$this->class->notify_new_topic_approval( $this->topic['tid'], $this->topic['title'], $this->topic['starter_name'] );
 			
-			// Are we checking for auto promotion?
-			
-			if ($ibforums->member['g_promotion'] != '-1&-1')
-			{
-				list($gid, $gposts) = explode( '&', $ibforums->member['g_promotion'] );
-				
-				if ( $gid > 0 and $gposts > 0 )
-				{
-					if ( $ibforums->member['posts'] + 1 >= $gposts )
-					{
-						$mgroup = "mgroup='$gid', ";
-						
-						if ( USE_MODULES == 1 )
-						{
-							$class->modules->register_class(&$class);
-							$class->modules->on_group_change($ibforums->member['id'], $gid);
-						}
-					}
-				}
-			}
-			
-			$ibforums->member['last_post'] = time();
-			
-			$DB->query("UPDATE ibf_members SET ".$pcount.$mgroup.
-											  "last_post='"    .$ibforums->member['last_post']   ."'".
-											  "WHERE id='"     .$ibforums->member['id']."'");
+			$print->redirect_screen( $ibforums->lang['moderate_topic'], "act=SF&f={$this->class->forum['id']}" );
 		}
 		
-		//-------------------------------------------------
-		// Set a last post time cookie
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Are we tracking new topics we start 'auto_track'?
+		//-----------------------------------------
 		
-		$std->my_setcookie( "LPid", time() );
+		$this->class->pf_add_tracked_topic($this->topic['tid']);
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Are we tracking this forum? If so generate some mailies - yay!
+		//-----------------------------------------
+		
+		$this->class->forum_tracker($this->class->forum['id'], $this->topic['tid'], $this->topic['title'], $this->class->forum['name'] );
+		
+		//-----------------------------------------
 		// Redirect them back to the topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$std->boink_it($class->base_url."act=ST&f={$class->forum['id']}&t={$this->topic['tid']}");
+		$std->boink_it($this->class->base_url."act=ST&f={$this->class->forum['id']}&t={$this->topic['tid']}");
 		
 	}
 
 
 
+	/*-------------------------------------------------------------------------*/
+	// SHOW FORM
+	/*-------------------------------------------------------------------------*/
 
 
-
-	function show_form($class) {
-	
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
+	function show_form()
+	{
+		global $ibforums, $std, $DB, $print;
 		
+		//-----------------------------------------
+		// Are we quoting posts?
+		//-----------------------------------------
+		
+		$raw_post = $this->class->check_multi_quote();
+		
+		//-----------------------------------------
 		// Sort out the "raw" textarea input and make it safe incase
 		// we have a <textarea> tag in the raw post var.
+		//-----------------------------------------
 		
-		$raw_post    = isset($HTTP_POST_VARS['Post'])        ? $std->txt_htmlspecialchars($HTTP_POST_VARS['Post'])       : "";
-		$topic_title = isset($HTTP_POST_VARS['TopicTitle'])  ? str_replace("'", "&#39;", stripslashes($HTTP_POST_VARS['TopicTitle']) ) : "";
-		$topic_desc  = isset($HTTP_POST_VARS['TopicDesc'])   ? str_replace("'", "&#39;", stripslashes($HTTP_POST_VARS['TopicDesc']) ) : "";
-		$poll        = isset($HTTP_POST_VARS['PollAnswers']) ? $std->txt_htmlspecialchars($std->txt_stripslashes($HTTP_POST_VARS['PollAnswers'])) : "";
+		$topic_title = isset($_POST['TopicTitle']) ? $ibforums->input['TopicTitle'] : "";
+		$topic_desc  = isset($_POST['TopicDesc'])  ? $ibforums->input['TopicDesc']  : "";
 		
-		if (isset($raw_post))
-		{
-			$raw_post = $std->txt_raw2form($raw_post);
-			$raw_post = str_replace( '<%', "&lt;%"  , $raw_post );
-			
-		}
+		$poll        = isset($_POST['PollAnswers']) ? $std->txt_htmlspecialchars($std->txt_stripslashes($_POST['PollAnswers'])) : "";
 		
+		//-----------------------------------------
 		// Do we have any posting errors?
+		//-----------------------------------------
 		
-		if ($class->obj['post_errors'])
+		if ($this->class->obj['post_errors'])
 		{
-			$class->output .= $class->html->errors( $ibforums->lang[ $class->obj['post_errors'] ]);
+			$this->class->output .= $this->class->html->errors( $ibforums->lang[ $this->class->obj['post_errors'] ]);
 		}
 		
-		if ($class->obj['preview_post'])
+		if ($this->class->obj['preview_post'])
 		{
-			$this->post['post'] = $class->parser->post_db_parse(
-															     $class->parser->convert( array(
-															     								 'TEXT'    => $this->post['post'],
-															     								 'CODE'    => $class->forum['use_ibc'],
-															     								 'SMILIES' => $ibforums->input['enableemo'],
-															     								 'HTML'    => $class->forum['use_html']
-															     						)      ) ,
-															     $class->forum['use_html']);
-			$class->output .= $class->html->preview( $this->post['post'] );
+			$this->class->parser->pp_do_html = intval($ibforums->input['post_htmlstatus']) AND $this->class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0;
+			$this->class->parser->pp_nl2br   = $ibforums->input['post_htmlstatus'] == 2 ? 1 : 0;
+			
+			$this->post['post'] = $this->class->parser->post_db_parse(
+																	  $this->class->parser->convert( array(
+																									  'TEXT'    => $this->post['post'],
+																									  'CODE'    => $this->class->forum['use_ibc'],
+																									  'SMILIES' => $ibforums->input['enableemo'],
+																									  'HTML'    => $this->class->forum['use_html']
+																							 )      )
+															        );
+			$this->class->output .= $this->class->html->preview( $this->post['post'] );
 		}
 		
 		$extra = "";
@@ -432,82 +462,86 @@ class post_functions extends Post {
 			$extra = $ibforums->lang['poll_tag_allowed'];
 		}
 		
-		$class->output .= $class->html_start_form( array( 1 => array( 'CODE', '11' ), 2 => array( 'f', $class->forum['id']) ) );
+		$this->class->output .= $this->class->html_start_form( array( 1 => array( 'CODE', '11' ),
+															          2 => array( 'f', $this->class->forum['id']),
+															          3 => array( 'post_key', $this->post_key ),
+															 )      );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// START TABLE
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output .= $class->html->table_structure();
+		$this->class->output .= $this->class->html->table_structure();
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$topic_title = $class->html->topictitle_fields( array( TITLE => $topic_title, DESC => $topic_desc ) );
+		$topic_title = $this->class->html->topictitle_fields( array( TITLE => $topic_title, DESC => $topic_desc ) );
 		
-		$start_table = $class->html->table_top( "{$ibforums->lang['top_txt_poll']}: {$class->forum['name']}");
+		$start_table = $this->class->html->table_top( "{$ibforums->lang['top_txt_poll']}: {$this->class->forum['name']}");
 		
-		$name_fields = $class->html_name_field();
+		$name_fields = $this->class->html_name_field();
 		
-		$post_box    = $class->html_post_body( $raw_post );
+		$post_box    = $this->class->html_post_body( $raw_post );
 		
-		$mod_options = $class->mod_options();
+		$mod_options = $this->class->mod_options();
 		
-		$poll_box    = $class->html->poll_box( $poll, $extra);
+		$poll_box    = $this->class->html->poll_box( $poll, $extra);
 		
-		$end_form    = $class->html->EndForm( $ibforums->lang['submit_poll'] );
+		$end_form    = $this->class->html->EndForm( $ibforums->lang['submit_poll'] );
 		
-		$post_icons  = $class->html_post_icons();
+		$post_icons  = $this->class->html_post_icons();
 		
-		if ($class->obj['can_upload'])
+		if ($this->class->can_upload)
 		{
-			$upload_field = $class->html->Upload_field( $ibforums->member['g_attach_max'] * 1024 );
+			$upload_field = $this->class->html_build_uploads($this->post_key,'new');
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output = preg_replace( "/<!--START TABLE-->/" , "$start_table"  , $class->output );
-		$class->output = preg_replace( "/<!--NAME FIELDS-->/" , "$name_fields"  , $class->output );
-		$class->output = preg_replace( "/<!--POST BOX-->/"    , "$post_box"     , $class->output );
-		$class->output = preg_replace( "/<!--POST ICONS-->/"  , "$post_icons"   , $class->output );
-		$class->output = preg_replace( "/<!--UPLOAD FIELD-->/", "$upload_field" , $class->output );
-		//$class->output = preg_replace( "/<!--MOD OPTIONS-->/" , "$mod_options"  , $class->output );
-		$class->output = preg_replace( "/<!--END TABLE-->/"   , "$end_form"     , $class->output );
-		$class->output = preg_replace( "/<!--TOPIC TITLE-->/" , "$topic_title"  , $class->output );
-		$class->output = preg_replace( "/<!--POLL BOX-->/"    , "$poll_box"     , $class->output );
-		$class->output = str_replace("<!--FORUM RULES-->", $std->print_forum_rules($class->forum), $class->output );
+		$this->class->output = str_replace( "<!--POLL BOX-->"    , $poll_box     , $this->class->output );
+		$this->class->output = str_replace( "<!--START TABLE-->" , $start_table  , $this->class->output );
+		$this->class->output = str_replace( "<!--NAME FIELDS-->" , $name_fields  , $this->class->output );
+		$this->class->output = str_replace( "<!--POST BOX-->"    , $post_box     , $this->class->output );
+		$this->class->output = str_replace( "<!--POST ICONS-->"  , $post_icons   , $this->class->output );
+		$this->class->output = str_replace( "<!--UPLOAD FIELD-->", $upload_field , $this->class->output );
+		$this->class->output = str_replace( "<!--MOD OPTIONS-->" , $mod_options  , $this->class->output );
+		$this->class->output = str_replace( "<!--END TABLE-->"   , $end_form     , $this->class->output );
+		$this->class->output = str_replace( "<!--TOPIC TITLE-->" , $topic_title  , $this->class->output );
+		$this->class->output = str_replace( "<!--FORUM RULES-->" , $std->print_forum_rules($this->class->forum), $this->class->output );
+		
+		//-----------------------------------------
+		
+		$this->class->html_add_smilie_box();
 		
 		if ( $ibforums->vars['poll_disable_noreply'] != 1 )
 		{
-			$class->output = str_replace("<!--IBF.POLL_OPTIONS-->", $class->html->poll_options(), $class->output );
+			$this->class->output = str_replace("<!--IBF.POLL_OPTIONS-->", $this->class->html->poll_options(), $this->class->output );
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Add in siggy buttons and such
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_checkboxes();
+		$this->class->html_checkboxes('new', 0, $this->class->forum['id']);
 		
+		$this->class->output = $this->class->html_add_smilie_box( $this->class->output );
 		
-		$class->html_add_smilie_box();
-		
-		$this->nav = array( "<a href='{$class->base_url}act=SC&amp;c={$class->forum['cat_id']}'>{$class->forum['cat_name']}</a>",
-							"<a href='{$class->base_url}act=SF&amp;f={$class->forum['id']}'>{$class->forum['name']}</a>",
-						  );
 		$this->title = $ibforums->lang['posting_new_topic'];
 		
-		$print->add_output("$class->output");
+		$print->add_output( $this->class->output );
         $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->title,
         					 	  'JS'       => 1,
-        					 	  'NAV'      => $this->nav,
+        					 	  'NAV'      => $this->class->nav,
         					  ) );
 		
 	}
 	
-	function regex_count_choices() {
+	function regex_count_choices()
+	{
 		
 		++$this->poll_count;
 		
-		return "<br>";
+		return "<br />";
 		
 	}
 	
diff --git a/upload/sources/lib/post_poll_after.php b/upload/sources/lib/post_poll_after.php
index 5132b347..987be69c 100644
--- a/upload/sources/lib/post_poll_after.php
+++ b/upload/sources/lib/post_poll_after.php
@@ -2,21 +2,21 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > New Post module
 |   > Module written by Matt Mecham
+|   > DBA Checked: Fri 21 May 2004
 |
 +--------------------------------------------------------------------------
 */
@@ -37,21 +37,21 @@ class post_functions extends Post {
 
 	var $m_group = "";
 	
-	function post_functions($class) {
-	
+	function post_functions($class)
+	{
 		global $ibforums, $std, $DB;
 		
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		// Sort out maximum number of poll choices allowed
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		$ibforums->vars['max_poll_choices'] = $ibforums->vars['max_poll_choices'] ? $ibforums->vars['max_poll_choices'] : 10;
 		
-		$ibforums->lang['poll_choices']      = sprintf( $ibforums->lang['poll_choices'], $ibforums->vars['max_poll_choices'] );
+		$ibforums->lang['poll_choices']     = sprintf( $ibforums->lang['poll_choices'], $ibforums->vars['max_poll_choices'] );
 		
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		// Lets do some tests to make sure that we are allowed to start a new topic
-		//-------------------------------------------------------------------------
+		//-----------------------------------------
 		
 		if (! $ibforums->member['g_post_polls'])
 		{
@@ -76,7 +76,8 @@ class post_functions extends Post {
 		{
 			$tid = intval($ibforums->input['t']);
 			
-			$DB->query("SELECT * from ibf_topics WHERE tid=$tid");
+			$DB->simple_construct( array('select' => '*', 'from' => 'topics', 'where' => "tid=$tid") );
+			$DB->simple_exec();
 			
 			if ( ! $this->topic = $DB->fetch_row() )
 			{
@@ -108,18 +109,17 @@ class post_functions extends Post {
 	}
 	
 	function process($class) {
-	
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// check to make sure we have a correct # of choices
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$this->poll_choices = $ibforums->input['PollAnswers'];
 		
-		$this->poll_choices = preg_replace( "/<br><br>/" , ""                              , $this->poll_choices );
+		$this->poll_choices = preg_replace( "#<br /><br />#" , ""                          , $this->poll_choices );
 		
-		$this->poll_choices = preg_replace( "/<br>/e"    , "\$this->regex_count_choices()" , $this->poll_choices );
+		$this->poll_choices = preg_replace( "#<br />#e"  , "\$this->regex_count_choices()" , $this->poll_choices );
 		
 		if ($this->poll_count > $ibforums->vars['max_poll_choices'])
 		{
@@ -149,19 +149,18 @@ class post_functions extends Post {
 	
 	
 	function add_new_poll($class) {
-		
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Sort out the poll stuff
 		// This is somewhat contrived, but it has to be
 		// compatible with the current perl version.
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$poll_array  = array();
 		$count       = 0;
 		
-		$polls       = explode( "<br>", $this->poll_choices );
+		$polls       = explode( "<br />", $this->poll_choices );
 		
 		foreach ($polls as $polling)
 		{
@@ -174,43 +173,37 @@ class post_functions extends Post {
 		}
 		
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Add the poll to the forum_polls table
 		// if we are moderating this post
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$db_string = $std->compile_db_string(
-											  array (
-											  			'tid'           => $this->topic['tid'],
-											  			'forum_id'      => $class->forum['id'],
-											  			'start_date'    => time(),
-											  			'choices'       => addslashes(serialize($poll_array)),
-											  			'starter_id'    => $ibforums->member['id'],
-											  			'votes'         => 0,
-											  			'poll_question' => $class->parser->bad_words($ibforums->input['pollq']),
-											  		)
-											  );
+		$DB->do_insert( 'polls',
+						 array (
+								   'tid'           => $this->topic['tid'],
+								   'forum_id'      => $class->forum['id'],
+								   'start_date'    => time(),
+								   'choices'       => addslashes(serialize($poll_array)),
+								   'starter_id'    => $ibforums->member['id'],
+								   'votes'         => 0,
+								   'poll_question' => $class->parser->bad_words($ibforums->input['pollq']),
+							   ) );
 											  
-		$DB->query("INSERT INTO ibf_polls (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-		$DB->query("UPDATE ibf_topics SET poll_state='open' WHERE tid={$this->topic['tid']}");
-								    
-		//-------------------------------------------------
+		$DB->simple_construct( array( 'update' => 'topics', 'set' => 'poll_state="open"', 'where' => "tid={$this->topic['tid']}" ) );
+		$DB->simple_exec();
+							    
+		//-----------------------------------------
 		// Redirect them back to the topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$std->boink_it($class->base_url."act=ST&f={$class->forum['id']}&t={$this->topic['tid']}");
+		$std->boink_it($class->base_url."showtopic={$this->topic['tid']}");
 		
 	}
 
 
 
-
-
-
 	function show_form($class)
 	{
-	
 		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
 		
 		// Sort out the "raw" textarea input and make it safe incase
@@ -227,13 +220,13 @@ class post_functions extends Post {
 		
 		$class->output .= $class->html_start_form( array( 1 => array( 'CODE', '15' ), 2 => array( 'f', $class->forum['id']), 2 => array( 't', $this->topic['tid']) ) );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// START TABLE
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$class->output .= $class->html->table_structure();
 		
-		//---------------------------------------
+		//-----------------------------------------
 				
 		$start_table = $class->html->table_top( "{$ibforums->lang['top_txt_poll']}: {$class->forum['name']} -> ".$this->topic['title']);
 						
@@ -241,7 +234,7 @@ class post_functions extends Post {
 		
 		$end_form    = $class->html->poll_end_form( $ibforums->lang['submit_poll'] );
 			
-		//---------------------------------------
+		//-----------------------------------------
 		
 		$class->output = preg_replace( "/<!--START TABLE-->/" , "$start_table"  , $class->output );
 		//$class->output = preg_replace( "/<!--NAME FIELDS-->/" , "$name_fields"  , $class->output );
@@ -254,7 +247,7 @@ class post_functions extends Post {
 		$class->output = preg_replace( "/<!--POLL BOX-->/"    , "$poll_box"     , $class->output );
 		$class->output = str_replace("<!--FORUM RULES-->", $std->print_forum_rules($class->forum), $class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
 		
 		$class->html_add_smilie_box();
@@ -268,7 +261,7 @@ class post_functions extends Post {
 		$print->add_output("$class->output");
         $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->title,
         					 	  'JS'       => 1,
-        					 	  'NAV'      => $this->nav,
+        					 	  'NAV'      => $class->nav,
         					  ) );
 		
 	}
@@ -277,7 +270,7 @@ class post_functions extends Post {
 		
 		++$this->poll_count;
 		
-		return "<br>";
+		return "<br />";
 		
 	}
 	
diff --git a/upload/sources/lib/post_q_reply_post.php b/upload/sources/lib/post_q_reply_post.php
deleted file mode 100644
index dfaf5898..00000000
--- a/upload/sources/lib/post_q_reply_post.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Reply with quote library
-|   > Module written by Matt Mecham
-|
-+--------------------------------------------------------------------------
-*/
-
-
-
-class post_functions extends Post {
-
-	var $nav               = array();
-	var $title             = "";
-	var $post              = array();
-	var $topic             = array();
-	var $upload            = array();
-	var $mod_topic         = array();
-	var $quoted_post        = array();
-	var $quoted_post_author = array();
-	
-	var $m_group = "";
-
-	function post_functions($class) {
-	
-		global $ibforums, $std, $DB;
-		
-		// Lets load the topic from the database before we do anything else.
-		
-		$DB->query("SELECT * FROM ibf_topics WHERE forum_id='".$class->forum['id']."' AND tid='".$ibforums->input['t']."'");
-		$this->topic = $DB->fetch_row();
-		
-		// Is it legitimate?
-		
-		if (! $this->topic['tid'])
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-		}
-		
-		//-------------------------------------------------
-		// Lets do some tests to make sure that we are
-		// allowed to reply to this topic
-		//-------------------------------------------------
-		
-		if ($this->topic['poll_state'] == 'closed' and $ibforums->member['g_is_supadmin'] != 1)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-		}
-		
-		if ($this->topic['starter_id'] == $ibforums->member['id'])
-		{
-			if (! $ibforums->member['g_reply_own_topics'])
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-			}
-		}
-		
-		if ($this->topic['starter_id'] != $ibforums->member['id'])
-		{
-			if (! $ibforums->member['g_reply_other_topics'])
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-			}
-		}
-		
-		if ( $std->check_perms($class->forum['reply_perms']) == FALSE )
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-		}
-		
-		// Is the topic locked?
-		
-		if ($this->topic['state'] != 'open')
-		{
-			if ($ibforums->member['g_post_closed'] != 1)
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'locked_topic') );
-			}
-		}
-
-	}
-	
-	function process($class) {
-	
-		global $ibforums, $std, $DB, $print;
-		
-		//-------------------------------------------------
-		// Parse the post, and check for any errors.
-		//-------------------------------------------------
-		
-		$this->post   = $class->compile_post();
-		
-		//-------------------------------------------------
-		// If we have a post to quote, lets sort that now
-		//-------------------------------------------------
-		
-		if ($ibforums->input['QPost'])
-		{
-		
-			$this->quoted_post['AUTHOR']['name'] = $ibforums->input['QAuthorN'];
-			
-			$this->quoted_post['DATE'] = $std->get_date( $ibforums->input['QDate'], 'LONG' );
-			
-			$this->quoted_post['post'] = $class->parser->convert( array( 'TEXT'    => $ibforums->input['QPost'],
-																		 'SMILIES' => $ibforums->input['enableemo'],
-																		 'CODE'    => 1,
-																		 'HTML'    => 0,
-																	   ) );
-																	   
-			if ( $class->parser->error != "" )
-			{
-				$class->obj['post_errors'] = $class->parser->error;
-				
-				$class->dump_quote = '[QUOTE='.$this->quoted_post['AUTHOR']['name'].','.$this->quoted_post['DATE'].']'.$ibforums->input['QPost'].'[/QUOTE]'."\n";
-				
-				$this->show_form($class);
-			}
-			
-			// add it to the post
-			
-			$html = $class->parser->wrap_style( array( 'STYLE' => 'QUOTE',
-													   'EXTRA' => '(' . $this->quoted_post['AUTHOR']['name'] . ' @ ' . $this->quoted_post['DATE'] . ')'
-													 ) );
-			if ( $class->obj['preview_post'] == "" )
-			{
-				$this->quoted_post['AUTHOR']['name'] = str_replace( "-", "&#045;", $this->quoted_post['AUTHOR']['name'] );
-				
-				$this->post['post'] = "<!--QuoteBegin-{$this->quoted_post['AUTHOR']['name']}+{$this->quoted_post['DATE']}-->"
-									. "{$html['START']}<!--QuoteEBegin--> ".trim($this->quoted_post['post'])." <!--QuoteEnd--> "
-									. "{$html['END']} <!--QuoteEEnd--><br>"
-									. $this->post['post'];
-			}
-			else
-			{
-				$class->dump_quote = '[QUOTE='.$this->quoted_post['AUTHOR']['name'].','.$this->quoted_post['DATE'].']'.$ibforums->input['QPost'].'[/QUOTE]'."\n";
-			}
-		
-		}
-		
-		if ($class->obj['post_errors'] == "")
-		{
-			$this->upload = $class->process_upload();
-		}
-		
-		if ( ($class->obj['post_errors'] != "") or ($class->obj['preview_post'] != "") )
-		{
-			// Show the form again
-			
-			$this->show_form($class);
-		}
-		else
-		{
-			$this->add_reply($class);
-		}
-	}
-	
-	
-	
-	
-	
-function add_reply($class) {
-		
-		global $ibforums, $std, $DB, $print;
-		
-		//-------------------------------------------------
-		// Update the post info with the upload array info
-		//-------------------------------------------------
-		
-		$this->post['attach_id']   = $this->upload['attach_id'];
-		$this->post['attach_type'] = $this->upload['attach_type'];
-		$this->post['attach_hits'] = $this->upload['attach_hits'];
-		$this->post['attach_file'] = $this->upload['attach_file'];
-		
-		//-------------------------------------------------
-		// Insert the post into the database to get the
-		// last inserted value of the auto_increment field
-		//-------------------------------------------------
-		
-		$this->post['topic_id'] = $this->topic['tid'];
-		
-		$return_to_move = 0;
-		
-		if ( ($ibforums->input['mod_options'] != "") or ($ibforums->input['mod_options'] != 'nowt') )
-		{
-			if ($ibforums->input['mod_options'] == 'pin')
-			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['pin_topic'] == 1)
-				{
-					$this->topic['pinned'] = 1;
-					
-					$class->moderate_log('Pinned topic from post form', $this->topic['title']);
-				}
-			}
-			else if ($ibforums->input['mod_options'] == 'close')
-			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['close_topic'] == 1)
-				{
-					$this->topic['state'] = 'closed';
-					
-					$class->moderate_log('Closed topic from post form', $this->topic['title']);
-				}
-			}
-			else if ($ibforums->input['mod_options'] == 'move')
-			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['move_topic'] == 1)
-				{
-					$return_to_move = 1;
-				}
-			}
-			else if ($ibforums->input['mod_options'] == 'pinclose')
-			{
-				if ($ibforums->member['g_is_supmod'] == 1 or ( $class->moderator['pin_topic'] == 1 AND $class->moderator['close_topic'] == 1 ) )
-				{
-					$this->topic['pinned'] = 1;
-					$this->topic['state']  = 'closed';
-					
-					$class->moderate_log('Pinned & closed topic from post form', $this->topic['title']);
-				}
-			}
-		}
-		
-		$db_string = $std->compile_db_string( $this->post );
-		
-		$DB->query("INSERT INTO ibf_posts (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		$this->post['pid'] = $DB->get_insert_id();
-		
-		if ( $class->obj['moderate'] == 1 or $class->obj['moderate'] == 3 )
-		{
-			$DB->query("UPDATE ibf_forums SET has_mod_posts=1 WHERE id=".$class->forum['id']);
-			
-			$page = floor( ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts']);
-			$page = $page * $ibforums->vars['display_max_posts'];
-			
-			$print->redirect_screen( $ibforums->lang['moderate_post'], "showtopic={$this->topic['tid']}&st=$page" );
-		}
-		
-		//-------------------------------------------------
-		// If we are still here, lets update the
-		// board/forum/topic stats
-		//-------------------------------------------------
-		
-		$class->forum['last_title']       = str_replace( "'", "&#39;", $this->topic['title'] );;
-		$class->forum['last_id']          = $this->topic['tid'];
-		$class->forum['last_post']        = time();
-		$class->forum['last_poster_name'] = $ibforums->member['id'] ?  $ibforums->member['name'] : $ibforums->input['UserName'];
-		$class->forum['last_poster_id']   = $ibforums->member['id'];
-		$class->forum['posts']++;
-		
-		// Update the database
-		
-		$DB->query("UPDATE ibf_forums    SET last_title='"      .$class->forum['last_title']       ."', ".
-											"last_id='"         .$class->forum['last_id']          ."', ".
-											"last_post='"       .$class->forum['last_post']        ."', ".
-											"last_poster_name='".$class->forum['last_poster_name'] ."', ".
-											"last_poster_id='"  .$class->forum['last_poster_id']   ."', ".
-											"posts='"           .$class->forum['posts']            ."' ".
-											"WHERE id='"        .$class->forum['id']               ."'");
-		
-		
-		
-		
-		//-------------------------------------------------
-		// Get the correct number of replies the topic has
-		//-------------------------------------------------
-		
-		$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE topic_id={$this->topic['tid']} and queued != 1");
-		
-		$posts = $DB->fetch_row();
-		
-		$pcount = intval( $posts['posts'] - 1 );
-		
-		//+------------------------------------------------------------------------------------------------------
-		
-		$DB->query("UPDATE ibf_topics     SET last_poster_id='"       .$class->forum['last_poster_id']    ."', ".
-											  "last_poster_name='"    .$class->forum['last_poster_name']  ."', ".
-											  "last_post='"           .$class->forum['last_post']         ."', ".
-											  "pinned='"              .$this->topic['pinned']             ."', ".
-											  "state='"               .$this->topic['state']              ."', ".
-											  "posts=$pcount ".
-											  "WHERE tid='"           .$this->topic['tid']             ."'");
-		
-		//+------------------------------------------------------------------------------------------------------
-		
-		$DB->query("UPDATE ibf_stats SET TOTAL_REPLIES=TOTAL_REPLIES+1");
-		
-		//-------------------------------------------------
-		// If we are a member, lets update thier last post
-		// date and increment their post count.
-		//-------------------------------------------------
-		
-		$pcount = "";
-		
-		if ($ibforums->member['id'])
-		{
-			if ($class->forum['inc_postcount'])
-			{
-				// Increment the users post count
-				
-				$pcount = "posts=posts+1, ";
-				
-			}
-			
-			// Are we checking for auto promotion?
-			
-			if ($ibforums->member['g_promotion'] != '-1&-1')
-			{
-				list($gid, $gposts) = explode( '&', $ibforums->member['g_promotion'] );
-				
-				if ( $gid > 0 and $gposts > 0 )
-				{
-					if ( $ibforums->member['posts'] + 1 >= $gposts )
-					{
-						$mgroup = "mgroup='$gid', ";
-						
-						if ( USE_MODULES == 1 )
-						{
-							$class->modules->register_class(&$class);
-							$class->modules->on_group_change($ibforums->member['id'], $gid);
-						}
-					}
-				}
-			}
-			
-			$ibforums->member['last_post'] = time();
-			
-			$DB->query("UPDATE ibf_members SET ".$pcount.$mgroup.
-											  "last_post='"    .$ibforums->member['last_post']   ."'".
-											  "WHERE id='"     .$ibforums->member['id']."'");
-		}
-		
-		//-------------------------------------------------
-		// Are we tracking topics we reply in 'auto_track'?
-		//-------------------------------------------------
-		
-		if ( $ibforums->member['id'] AND $ibforums->input['enabletrack'] == 1 )
-		{
-			$DB->query("SELECT trid FROM ibf_tracker WHERE topic_id='".$this->topic['tid']."' AND member_id='".$ibforums->member['id']."'");
-			
-			if ( ! $DB->get_num_rows() )
-			{
-				$db_string = $DB->compile_db_insert_string( array (
-																	'member_id'  => $ibforums->member['id'],
-																	'topic_id'   => $this->topic['tid'],
-																	'start_date' => time(),
-														  )       );
-				
-				$DB->query("INSERT INTO ibf_tracker ({$db_string['FIELD_NAMES']}) VALUES ({$db_string['FIELD_VALUES']})");
-			}
-		}
-		
-		//-------------------------------------------------
-		// Check for subscribed topics
-		// Pass on the previous last post time of the topic
-		// to see if we need to send emails out
-		//-------------------------------------------------
-		
-		$class->topic_tracker( $this->topic['tid'], $this->post['post'], $class->forum['last_poster_name'], $this->topic['last_post'] );
-		
-		//-------------------------------------------------
-		// Redirect them back to the topic
-		//-------------------------------------------------
-		
-		if ($return_to_move == 1)
-		{
-			$std->boink_it($class->base_url."act=Mod&CODE=02&f={$class->forum['id']}&t={$this->topic['tid']}");
-		}
-		else
-		{
-			$page = floor( ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts']);
-			$page = $page * $ibforums->vars['display_max_posts'];
-			$std->boink_it($class->base_url."showtopic={$this->topic['tid']}&st=$page&#entry{$this->post['pid']}");
-		}
-		
-	}
-
-
-
-
-
-
-
-	function show_form($class) {
-	
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
-		
-		//-------------------------------------------------
-		// Sort out the "raw" textarea input and make it safe incase
-		// we have a <textarea> tag in the raw post var.
-		//-------------------------------------------------
-		
-		$quote_post  = $this->post['post'];
-		
-		$raw_post    = isset($HTTP_POST_VARS['Post']) ? $std->txt_htmlspecialchars($HTTP_POST_VARS['Post']) : "";
-
-		if (isset($raw_post))
-		{
-			$raw_post = $std->txt_raw2form($raw_post);
-			
-			if ($class->dump_quote != "")
-			{
-				$raw_post   = str_replace( "<br>", "\n", $class->dump_quote ) . $raw_post;
-				$quote_post = str_replace( "<br>", "\n", $class->dump_quote ) . $quote_post;
-			}
-		}
-		
-		//-------------------------------------------------
-		// Get the old post
-		//-------------------------------------------------
-		
-		$DB->query("SELECT post, author_id, author_name, post_date, pid FROM ibf_posts WHERE pid='".$ibforums->input['p']."'");
-		$this->quoted_post = $DB->fetch_row();
-		
-		//-------------------------------------------------
-		// Unconvert the smilies, HTML and iB_Code
-		//-------------------------------------------------
-		
-		$this->quoted_post['post'] = trim($class->parser->unconvert( $this->quoted_post['post'] ));
-		
-		//-------------------------------------------------
-		// Are we stripping quotes?
-		//-------------------------------------------------
-		
-		if ($ibforums->vars['strip_quotes'])
-		{
-			$this->quoted_post['post'] = preg_replace( "#\[QUOTE(=.+?,.+?)?\].+?\[/QUOTE\]#is", "", $this->quoted_post['post'] );
-		}
-		
-		//-------------------------------------------------
-		// Do we have any posting errors?
-		//-------------------------------------------------
-		
-		if ($class->obj['post_errors'])
-		{
-			$class->output .= $class->html->errors( $ibforums->lang[ $class->obj['post_errors'] ]);
-		}
-		
-		if ($class->obj['preview_post'])
-		{
-			$this->post['post'] = $class->parser->post_db_parse(
-															     $class->parser->convert( array(
-															     								 'TEXT'    => $quote_post,
-															     								 'CODE'    => $class->forum['use_ibc'],
-															     								 'SMILIES' => $ibforums->input['enableemo'],
-															     								 'HTML'    => $class->forum['use_html']
-															     						)      ) ,
-															     $class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0);
-			$class->output .= $class->html->preview( $this->post['post'] );
-		}
-		
-		$class->check_upload_ability();
-		
-		$class->output .= $class->html_start_form( array( 1 => array( 'CODE', '07' ),
-														  2 => array( 't'   , $this->topic['tid']),
-														  3 => array( 'p'   , $ibforums->input['p'] )
-														) );
-		//---------------------------------------
-		// START TABLE
-		//---------------------------------------
-		
-		$class->output .= $class->html->table_structure();
-		
-		//---------------------------------------
-		
-		$start_table = $class->html->table_top( "{$ibforums->lang['top_txt_reply']} {$this->topic['title']}");
-		
-		$name_fields = $class->html_name_field();
-		
-		if (! $class->obj['preview_post'])
-		{
-			$quote_box   = $class->html->quote_box( $this->quoted_post );
-		}
-		
-		$post_box    = $class->html_post_body( $raw_post );
-		
-		$mod_options = $class->mod_options(1);
-		
-		$end_form    = $class->html->EndForm( $ibforums->lang['submit_reply'] );
-		
-		$post_icons  = $class->html_post_icons();
-		
-		if ($class->obj['can_upload'])
-		{
-			$upload_field = $class->html->Upload_field( $std->size_format( $ibforums->member['g_attach_max'] * 1024 ) );
-		}
-		
-		//---------------------------------------
-		
-		$class->output = preg_replace( "/<!--START TABLE-->/" , "$start_table"  , $class->output );
-		$class->output = preg_replace( "/<!--NAME FIELDS-->/" , "$name_fields"  , $class->output );
-		$class->output = preg_replace( "/<!--POST BOX-->/"    , "$post_box"     , $class->output );
-		$class->output = preg_replace( "/<!--POST ICONS-->/"  , "$post_icons"   , $class->output );
-		$class->output = preg_replace( "/<!--UPLOAD FIELD-->/", "$upload_field" , $class->output );
-		$class->output = preg_replace( "/<!--MOD OPTIONS-->/" , "$mod_options"  , $class->output );
-		$class->output = preg_replace( "/<!--END TABLE-->/"   , "$end_form"     , $class->output );
-		$class->output = preg_replace( "/<!--QUOTE BOX-->/"   , "$quote_box"    , $class->output );
-		$class->output = str_replace("<!--FORUM RULES-->", $std->print_forum_rules($class->forum), $class->output );
-		
-		//---------------------------------------
-		
-		$class->html_add_smilie_box();
-		
-		//---------------------------------------
-		// Add in siggy buttons and such
-		//---------------------------------------
-		
-		$class->html_checkboxes('reply', $this->topic['tid']);
-		
-		//---------------------------------------
-		
-		$class->html_topic_summary($this->topic['tid']);
-		
-		$this->nav = array( "<a href='{$class->base_url}act=SC&c={$class->forum[cat_id]}'>{$class->forum['cat_name']}</a>",
-							"<a href='{$class->base_url}showforum={$class->forum['id']}'>{$class->forum['name']}</a>",
-							"<a href='{$class->base_url}showtopic={$this->topic['tid']}'>{$this->topic['title']}</a>",
-						  );
-						  
-		$this->title = $ibforums->lang['quoting_post'].' '.$this->topic['title'];
-		
-		$print->add_output("$class->output");
-		
-        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->title,
-        					 	  'JS'       => 1,
-        					 	  'NAV'      => $this->nav,
-        					  ) );
-		
-	}
-	
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/sources/lib/post_reply_post.php b/upload/sources/lib/post_reply_post.php
index b4ef8d7a..f0b16a34 100644
--- a/upload/sources/lib/post_reply_post.php
+++ b/upload/sources/lib/post_reply_post.php
@@ -2,21 +2,21 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
 |   > Reply post module
 |   > Module written by Matt Mecham
+|   > DBA Checked: Fri 21 May 2004
 |
 +--------------------------------------------------------------------------
 */
@@ -24,92 +24,102 @@
 
 class post_functions extends Post {
 
-	var $nav = array();
-	var $title = "";
-	var $post  = array();
-	var $topic = array();
-	var $upload = array();
-	var $mod_topic = array();
+	var $nav        = array();
+	var $title      = "";
+	var $post       = array();
+	var $topic      = array();
+	var $upload     = array();
+	var $mod_topic  = array();
+	var $class      = "";
+	var $m_group    = "";
+	var $post_key   = "";
+	var $quote_pids = array();
+	var $quote_posts = array();
 	
-	var $m_group = "";
-
-	function post_functions($class) {
-	
-		global $ibforums, $std, $DB;
+	function post_functions($class)
+	{
+		global $ibforums, $std, $DB, $forums;
 		
+		$this->class = $class;
+		
+		$this->post_key = $ibforums->input['post_key'] ? $ibforums->input['post_key'] : md5(microtime());
+		
+		//-----------------------------------------
 		// Lets load the topic from the database before we do anything else.
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "forum_id=".intval($this->class->forum['id'])." AND tid=".intval($ibforums->input['t']) ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT * FROM ibf_topics WHERE forum_id='".$class->forum['id']."' AND tid='".$ibforums->input['t']."'");
 		$this->topic = $DB->fetch_row();
 		
-		// Is it legitimate?
+		//-----------------------------------------
+		// Check permissions, etc
+		//-----------------------------------------
 		
 		if (! $this->topic['tid'])
 		{
 			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Lets do some tests to make sure that we are
 		// allowed to reply to this topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ($this->topic['poll_state'] == 'closed' and $ibforums->member['g_is_supadmin'] != 1)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-		}
+		$this->class->check_for_reply($this->topic);
 		
-		if ($this->topic['starter_id'] == $ibforums->member['id'])
-		{
-			if (! $ibforums->member['g_reply_own_topics'])
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-			}
-		}
-		
-		if ($this->topic['starter_id'] != $ibforums->member['id'])
-		{
-			if (! $ibforums->member['g_reply_other_topics'])
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-			}
-		}
-
-		if ( $std->check_perms($class->forum['reply_perms']) == FALSE )
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_replies') );
-		}
-		
-		// Is the topic locked?
-		
-		if ($this->topic['state'] != 'open')
-		{
-			if ($ibforums->member['g_post_closed'] != 1)
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'locked_topic') );
-			}
-		}
-
 	}
 	
-	function process($class) {
+	/*-------------------------------------------------------------------------*/
+	// MAIN PROCESS FUNCTION
+	/*-------------------------------------------------------------------------*/
 	
+	function process()
+	{
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
-		// Parse the post, and check for any errors.
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Did we remove an attachment?
+		//-----------------------------------------
 		
-		$this->post   = $class->compile_post();
-		
-		if ($class->obj['post_errors'] == "")
+		if ( $ibforums->input['removeattachid'] )
 		{
-			$this->upload = $class->process_upload();
+			if ( $ibforums->input[ 'removeattach_'. $ibforums->input['removeattachid'] ] )
+			{
+				$this->class->pf_remove_attachment( intval($ibforums->input['removeattachid']), $this->post_key );
+				$this->show_form();
+			}
 		}
 		
-		if ( ($class->obj['post_errors'] != "") or ($class->obj['preview_post'] != "") )
+		//-----------------------------------------
+		// Did we add an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['attachgo'] )
 		{
+			$this->class->obj['post_errors'] = "";
+			$this->upload_id = $this->class->process_upload();
+			$this->show_form();
+		}
+		
+		//-----------------------------------------
+		// Parse the post, and check for any errors.
+		//-----------------------------------------
+		
+		$this->post = $this->class->compile_post();
+		
+		if ($this->class->obj['post_errors'] == "")
+		{
+			$this->upload = $this->class->process_upload();
+		}
+		
+		if ( ($this->class->obj['post_errors'] != "") or ($this->class->obj['preview_post'] != "") )
+		{
+			//-----------------------------------------
 			// Show the form again
+			//-----------------------------------------
+			
 			$this->show_form($class);
 		}
 		else
@@ -119,32 +129,34 @@ class post_functions extends Post {
 	}
 	
 	
+	/*-------------------------------------------------------------------------*/
+	// ADD THE REPLY
+	/*-------------------------------------------------------------------------*/
 	
 	
-	
-	function add_reply($class) {
-		
+	function add_reply()
+	{
 		global $ibforums, $std, $DB, $print;
 		
-		//-------------------------------------------------
-		// Update the post info with the upload array info
-		//-------------------------------------------------
-		
-		$this->post['attach_id']   = $this->upload['attach_id'];
-		$this->post['attach_type'] = $this->upload['attach_type'];
-		$this->post['attach_hits'] = $this->upload['attach_hits'];
-		$this->post['attach_file'] = $this->upload['attach_file'];
-		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Insert the post into the database to get the
 		// last inserted value of the auto_increment field
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$this->post['topic_id'] = $this->topic['tid'];
 		
-		//-------------------------------------------------
+		//-----------------------------------------
+		// Get the last post time of this topic not counting
+		// this new reply
+		//-----------------------------------------
+		
+		$this->last_post = $this->topic['last_post'];
+		
+		//die( $this->last_post .' - '.$ibforums->member['last_activity'] . ' l');
+		
+		//-----------------------------------------
 		// Are we a mod, and can we change the topic state?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$return_to_move = 0;
 		
@@ -152,50 +164,134 @@ class post_functions extends Post {
 		{
 			if ($ibforums->input['mod_options'] == 'pin')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['pin_topic'] == 1)
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['pin_topic'] == 1)
 				{
 					$this->topic['pinned'] = 1;
 					
-					$class->moderate_log('Pinned topic from post form', $this->topic['title']);
+					$this->class->moderate_log('Pinned topic from post form', $this->topic['title']);
 				}
 			}
 			else if ($ibforums->input['mod_options'] == 'close')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['close_topic'] == 1)
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['close_topic'] == 1)
 				{
 					$this->topic['state'] = 'closed';
 					
-					$class->moderate_log('Closed topic from post form', $this->topic['title']);
+					$this->class->moderate_log('Closed topic from post form', $this->topic['title']);
 				}
 			}
 			else if ($ibforums->input['mod_options'] == 'move')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or $class->moderator['move_topic'] == 1)
+				if ($ibforums->member['g_is_supmod'] == 1 or $this->class->moderator['move_topic'] == 1)
 				{
 					$return_to_move = 1;
 				}
 			}
 			else if ($ibforums->input['mod_options'] == 'pinclose')
 			{
-				if ($ibforums->member['g_is_supmod'] == 1 or ( $class->moderator['pin_topic'] == 1 AND $class->moderator['close_topic'] == 1 ) )
+				if ($ibforums->member['g_is_supmod'] == 1 or ( $this->class->moderator['pin_topic'] == 1 AND $this->class->moderator['close_topic'] == 1 ) )
 				{
 					$this->topic['pinned'] = 1;
 					$this->topic['state']  = 'closed';
 					
-					$class->moderate_log('Pinned & closed topic from post form', $this->topic['title']);
+					$this->class->moderate_log('Pinned & closed topic from post form', $this->topic['title']);
 				}
 			}
 		}
 		
-		$db_string = $DB->compile_db_insert_string( $this->post );
+		//-----------------------------------------
+		// Add post to DB
+		//-----------------------------------------
 		
-		$DB->query("INSERT INTO ibf_posts (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
+		$this->post['post_key']    = $this->post_key;
+		$this->post['post_parent'] = intval($ibforums->input['parent_id']);
+		
+		//-----------------------------------------
+		// Typecast
+		//-----------------------------------------
+		
+		$DB->force_data_type = array( 'pid'  => 'int',
+									  'post' => 'string' );
+		
+		$DB->do_insert( 'posts', $this->post );
 		
 		$this->post['pid'] = $DB->get_insert_id();
 		
-		if ( $class->obj['moderate'] == 1 or $class->obj['moderate'] == 3 )
+		//-----------------------------------------
+		// If we are still here, lets update the
+		// board/forum/topic stats
+		//-----------------------------------------
+		
+		$this->class->pf_update_forum_and_stats($this->topic['tid'], $this->topic['title'], 'reply');
+		
+		//-----------------------------------------
+		// Get the correct number of replies
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']} and queued != 1" ) );
+		$DB->simple_exec();
+		
+		$posts = $DB->fetch_row();
+		
+		$pcount = intval( $posts['posts'] - 1 );
+		
+		//-----------------------------------------
+		// Get the correct number of queued replies
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']} and queued=1" ) );
+		$DB->simple_exec();
+		
+		$qposts = $DB->fetch_row();
+		
+		$qpcount = intval( $qposts['posts'] );
+		
+		//-----------------------------------------
+		// UPDATE TOPIC
+		//-----------------------------------------
+		
+		$poster_name = $ibforums->member['id'] ? $ibforums->member['name'] : $ibforums->input['UserName'];
+		
+		$update_array = array(
+							  'posts'			 => $pcount,
+							  'topic_queuedposts'=> $qpcount
+							 );
+							 
+		if ( $this->class->obj['moderate'] != 1 and $this->class->obj['moderate'] != 3 )
+		{					 
+			$update_array['last_poster_id']   = $ibforums->member['id'];
+			$update_array['last_poster_name'] = $poster_name;
+			$update_array['last_post']        = time();
+			$update_array['pinned']           = $this->topic['pinned'];
+			$update_array['state']            = $this->topic['state'];
+		}				 
+							 
+		$DB->do_update( 'topics', $update_array, "tid={$this->topic['tid']}"  );
+											
+		//-----------------------------------------
+		// If we are a member, lets update thier last post
+		// date and increment their post count.
+		//-----------------------------------------
+		
+		$this->class->pf_increment_user_post_count();
+		
+		//-----------------------------------------
+		// Make attachments "permanent"
+		//-----------------------------------------
+		
+		$this->class->pf_make_attachments_permanent($this->post_key, $this->topic['tid'], $this->post['pid']);
+		
+		//-----------------------------------------
+		// Moderating?
+		//-----------------------------------------
+		
+		if ( $this->class->obj['moderate'] == 1 or $this->class->obj['moderate'] == 3 )
 		{
-			$DB->query("UPDATE ibf_forums SET has_mod_posts=1 WHERE id=".$class->forum['id']);
+			//-----------------------------------------
+			// Boing!!!
+			//-----------------------------------------
+			
+			$this->class->notify_new_topic_approval( $this->topic['tid'], $this->topic['title'], $this->topic['starter_name'], $this->post['pid'], 'reply' );
 			
 			$page = floor( ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts']);
 			$page = $page * $ibforums->vars['display_max_posts'];
@@ -203,250 +299,150 @@ class post_functions extends Post {
 			$print->redirect_screen( $ibforums->lang['moderate_post'], "showtopic={$this->topic['tid']}&st=$page" );
 		}
 		
-		//-------------------------------------------------
-		// If we are still here, lets update the
-		// board/forum/topic stats
-		//-------------------------------------------------
-		
-		$class->forum['last_title']       = str_replace( "'", "&#39;", $this->topic['title'] );
-		$class->forum['last_id']          = $this->topic['tid'];
-		$class->forum['last_post']        = time();
-		$class->forum['last_poster_name'] = $ibforums->member['id'] ?  $ibforums->member['name'] : $ibforums->input['UserName'];
-		$class->forum['last_poster_id']   = $ibforums->member['id'];
-		$class->forum['posts']++;
-		
-		// Update the database
-		
-		$DB->query("UPDATE ibf_forums    SET last_title='"      .$class->forum['last_title']       ."', ".
-											"last_id='"         .$class->forum['last_id']          ."', ".
-											"last_post='"       .$class->forum['last_post']        ."', ".
-											"last_poster_name='".$class->forum['last_poster_name'] ."', ".
-											"last_poster_id='"  .$class->forum['last_poster_id']   ."', ".
-											"posts='"           .$class->forum['posts']            ."' ".
-											"WHERE id='"        .$class->forum['id']               ."'");
-		
-		
-		//-------------------------------------------------
-		// Get the correct number of replies the topic has
-		//-------------------------------------------------
-		
-		$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE topic_id={$this->topic['tid']} and queued != 1");
-		
-		$posts = $DB->fetch_row();
-		
-		$pcount = intval( $posts['posts'] - 1 );
-		
-		//+------------------------------------------------------------------------------------------------------
-		
-		$DB->query("UPDATE ibf_topics     SET last_poster_id='"       .$class->forum['last_poster_id']    ."', ".
-											  "last_poster_name='"    .$class->forum['last_poster_name']  ."', ".
-											  "last_post='"           .$class->forum['last_post']         ."', ".
-											  "pinned='"              .$this->topic['pinned']             ."', ".
-											  "state='"               .$this->topic['state']              ."', ".
-											  "posts=$pcount ".
-											  "WHERE tid='"           .$this->topic['tid']             ."'");
-		
-		//+------------------------------------------------------------------------------------------------------
-		
-		$DB->query("UPDATE ibf_stats SET TOTAL_REPLIES=TOTAL_REPLIES+1");
-		
-		//-------------------------------------------------
-		// If we are a member, lets update thier last post
-		// date and increment their post count.
-		//-------------------------------------------------
-		
-		$pcount = "";
-		$mgroup = "";
-		
-		if ($ibforums->member['id'])
-		{
-			if ($class->forum['inc_postcount'])
-			{
-				// Increment the users post count
-				$pcount = "posts=posts+1, ";
-			}
-			
-			// Are we checking for auto promotion?
-			
-			if ($ibforums->member['g_promotion'] != '-1&-1')
-			{
-				list($gid, $gposts) = explode( '&', $ibforums->member['g_promotion'] );
-				
-				if ( $gid > 0 and $gposts > 0 )
-				{
-					if ( $ibforums->member['posts'] + 1 >= $gposts )
-					{
-						$mgroup = "mgroup='$gid', ";
-						
-						if ( USE_MODULES == 1 )
-						{
-							$class->modules->register_class(&$class);
-							$class->modules->on_group_change($ibforums->member['id'], $gid);
-						}
-					}
-				}
-			}
-			
-			$ibforums->member['last_post'] = time();
-			
-			$DB->query("UPDATE ibf_members SET ".$pcount.$mgroup.
-											  "last_post='"    .$ibforums->member['last_post']   ."'".
-											  "WHERE id='"     .$ibforums->member['id']."'");
-		}
-		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Are we tracking topics we reply in 'auto_track'?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		if ( $ibforums->member['id'] AND $ibforums->input['enabletrack'] == 1 )
-		{
-			$DB->query("SELECT trid FROM ibf_tracker WHERE topic_id='".$this->topic['tid']."' AND member_id='".$ibforums->member['id']."'");
-			
-			if ( ! $DB->get_num_rows() )
-			{
-				$db_string = $DB->compile_db_insert_string( array (
-																	'member_id'  => $ibforums->member['id'],
-																	'topic_id'   => $this->topic['tid'],
-																	'start_date' => time(),
-														  )       );
-				
-				$DB->query("INSERT INTO ibf_tracker ({$db_string['FIELD_NAMES']}) VALUES ({$db_string['FIELD_VALUES']})");
-			}
-		}
+		$this->class->pf_add_tracked_topic($this->topic['tid'], 1);
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Check for subscribed topics
 		// Pass on the previous last post time of the topic
 		// to see if we need to send emails out
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$class->topic_tracker( $this->topic['tid'], $this->post['post'], $class->forum['last_poster_name'], $this->topic['last_post'] );
+		$this->class->topic_tracker( $this->topic['tid'], $this->post['post'], $poster_name, $this->last_post );
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Redirect them back to the topic
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ($return_to_move == 1)
 		{
-			$std->boink_it($class->base_url."act=Mod&CODE=02&f={$class->forum['id']}&t={$this->topic['tid']}");
+			$std->boink_it($this->class->base_url."act=Mod&CODE=02&f={$this->class->forum['id']}&t={$this->topic['tid']}");
 		}
 		else
 		{
 			$page = floor( ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts']);
 			$page = $page * $ibforums->vars['display_max_posts'];
-			$std->boink_it($class->base_url."showtopic={$this->topic['tid']}&st=$page&#entry{$this->post['pid']}");
+			$std->boink_it($ibforums->base_url."showtopic={$this->topic['tid']}&st=$page&p={$this->post['pid']}&#entry{$this->post['pid']}");
 		}
 		
 	}
 
 
+	/*-------------------------------------------------------------------------*/
+	// SHOW FORM
+	/*-------------------------------------------------------------------------*/
 
 
-
-
-	function show_form($class) {
-	
-		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
+	function show_form()
+	{
+		global $ibforums, $std, $DB, $print, $forums;
 		
-		// Sort out the "raw" textarea input and make it safe incase
-		// we have a <textarea> tag in the raw post var.
+		//-----------------------------------------
+		// Are we quoting posts?
+		//-----------------------------------------
 		
-		$raw_post    = isset($HTTP_POST_VARS['Post']) ? $std->txt_htmlspecialchars($HTTP_POST_VARS['Post']) : "";
-
-		if (isset($raw_post))
-		{
-			$raw_post = $std->txt_raw2form($raw_post);
-		}
+		$raw_post = $this->class->check_multi_quote();
 		
+		//-----------------------------------------
 		// Do we have any posting errors?
+		//-----------------------------------------
 		
-		if ($class->obj['post_errors'])
+		if ($this->class->obj['post_errors'])
 		{
-			$class->output .= $class->html->errors( $ibforums->lang[ $class->obj['post_errors'] ]);
+			$this->class->output .= $this->class->html->errors( $ibforums->lang[ $this->class->obj['post_errors'] ]);
 		}
 		
-		if ($class->obj['preview_post'])
+		if ($this->class->obj['preview_post'])
 		{
-			$this->post['post'] = $class->parser->post_db_parse(
-															     $class->parser->convert( array(
+			$this->class->parser->pp_do_html = intval($ibforums->input['post_htmlstatus']) AND $this->class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0;
+			$this->class->parser->pp_nl2br   = $ibforums->input['post_htmlstatus'] == 2 ? 1 : 0;
+			
+			$this->post['post'] = $this->class->parser->post_db_parse(
+															     $this->class->parser->convert( array(
 															     								 'TEXT'    => $this->post['post'],
-															     								 'CODE'    => $class->forum['use_ibc'],
+															     								 'CODE'    => $this->class->forum['use_ibc'],
 															     								 'SMILIES' => $ibforums->input['enableemo'],
-															     								 'HTML'    => $class->forum['use_html']
-															     						)      ) ,
-															     $class->forum['use_html'] AND $ibforums->member['g_dohtml'] ? 1 : 0);
-			$class->output .= $class->html->preview( $this->post['post'] );
+															     								 'HTML'    => $this->class->forum['use_html']
+															     						)      )
+															     );
+															     
+			$this->class->output .= $this->class->html->preview( $this->post['post'] );
 		}
 		
-		$class->check_upload_ability();
 		
-		$class->output .= $class->html_start_form( array( 1 => array( 'CODE', '03' ),
-														  2 => array( 't'   , $this->topic['tid'])
-														) );
+		
+		$this->class->output .= $this->class->html_start_form( array( 1 => array( 'CODE'     , '03' ),
+														              2 => array( 't'        , $this->topic['tid'] ),
+														              3 => array( 'post_key' , $this->post_key     ),
+														              4 => array( 'parent_id', $ibforums->input['parent_id'] ),
+														     )      );
 														
-		//---------------------------------------
+		//-----------------------------------------
 		// START TABLE
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output .= $class->html->table_structure();
+		$this->class->output .= $this->class->html->table_structure();
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$start_table = $class->html->table_top( "{$ibforums->lang['top_txt_reply']} {$this->topic['title']}");
+		$start_table = $this->class->html->table_top( "{$ibforums->lang['top_txt_reply']} {$this->topic['title']}");
 		
-		$name_fields = $class->html_name_field();
+		$name_fields = $this->class->html_name_field();
 		
-		$post_box    = $class->html_post_body( $raw_post );
+		$post_box    = $this->class->html_post_body( $raw_post );
 		
-		$mod_options = $class->mod_options(1);
+		$mod_options = $this->class->mod_options(1);
 		
-		$end_form    = $class->html->EndForm( $ibforums->lang['submit_reply'] );
+		$end_form    = $this->class->html->EndForm( $ibforums->lang['submit_reply'] );
 		
-		$post_icons  = $class->html_post_icons();
+		$post_icons  = $this->class->html_post_icons();
 		
-		if ($class->obj['can_upload'])
+		if ($this->class->can_upload)
 		{
-			$upload_field = $class->html->Upload_field( $std->size_format( $ibforums->member['g_attach_max'] * 1024 ) );
+			$upload_field = $this->class->html_build_uploads($this->post_key,'reply');
 		}
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->output = preg_replace( "/<!--START TABLE-->/" , "$start_table"  , $class->output );
-		$class->output = preg_replace( "/<!--NAME FIELDS-->/" , "$name_fields"  , $class->output );
-		$class->output = preg_replace( "/<!--POST BOX-->/"    , "$post_box"     , $class->output );
-		$class->output = preg_replace( "/<!--POST ICONS-->/"  , "$post_icons"   , $class->output );
-		$class->output = preg_replace( "/<!--UPLOAD FIELD-->/", "$upload_field" , $class->output );
-		$class->output = preg_replace( "/<!--MOD OPTIONS-->/" , "$mod_options"  , $class->output );
-		$class->output = preg_replace( "/<!--END TABLE-->/"   , "$end_form"     , $class->output );
-		$class->output = str_replace("<!--FORUM RULES-->", $std->print_forum_rules($class->forum), $class->output );
+		$this->class->output = str_replace( "<!--START TABLE-->" , $start_table  , $this->class->output );
+		$this->class->output = str_replace( "<!--NAME FIELDS-->" , $name_fields  , $this->class->output );
+		$this->class->output = str_replace( "<!--POST BOX-->"    , $post_box     , $this->class->output );
+		$this->class->output = str_replace( "<!--POST ICONS-->"  , $post_icons   , $this->class->output );
+		$this->class->output = str_replace( "<!--UPLOAD FIELD-->", $upload_field , $this->class->output );
+		$this->class->output = str_replace( "<!--MOD OPTIONS-->" , $mod_options  , $this->class->output );
+		$this->class->output = str_replace( "<!--END TABLE-->"   , $end_form     , $this->class->output );
+		$this->class->output = str_replace( "<!--FORUM RULES-->" , $std->print_forum_rules($this->class->forum), $this->class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_add_smilie_box();
+		$this->class->output = $this->class->html_add_smilie_box( $this->class->output );
 		
-		//---------------------------------------
+		//-----------------------------------------
 		// Add in siggy buttons and such
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_checkboxes('reply', $this->topic['tid']);
+		$this->class->html_checkboxes('reply', $this->topic['tid'], $this->class->forum['id']);
 		
-		//---------------------------------------
+		//-----------------------------------------
 		
-		$class->html_topic_summary($this->topic['tid']);
+		$this->class->html_topic_summary($this->topic['tid']);
 		
-		$this->nav = array( "<a href='{$class->base_url}act=SC&amp;c={$class->forum[cat_id]}'>{$class->forum['cat_name']}</a>",
-							"<a href='{$class->base_url}showforum={$class->forum['id']}'>{$class->forum['name']}</a>",
-							"<a href='{$class->base_url}showtopic={$this->topic['tid']}'>{$this->topic['title']}</a>",
+		$this->nav = array( "<a href='{$this->class->base_url}act=SC&amp;c={$this->class->forum[cat_id]}'>{$this->class->forum['cat_name']}</a>",
+							"<a href='{$this->class->base_url}showforum={$this->class->forum['id']}'>{$this->class->forum['name']}</a>",
+							"<a href='{$this->class->base_url}showtopic={$this->topic['tid']}'>{$this->topic['title']}</a>",
 						  );
 						  
 		$this->title = $ibforums->lang['replying_in'].' '.$this->topic['title'];
 		
-		$print->add_output("$class->output");
+		$print->add_output( $this->class->output );
 		
         $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> ".$this->title,
         					 	  'JS'       => 1,
-        					 	  'NAV'      => $this->nav,
-        					  ) );
+        					 	  'NAV'      => $this->class->nav,
+        			     )      );
 		
 	}
 	
diff --git a/upload/sources/lib/search_mysql_ftext.php b/upload/sources/lib/search_mysql_ftext.php
index ca6095c1..01cbd29f 100644
--- a/upload/sources/lib/search_mysql_ftext.php
+++ b/upload/sources/lib/search_mysql_ftext.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -30,34 +29,34 @@ class search_lib extends Search
     var $parser      = "";
     var $is          = "";
     
-    //--------------------------------------------
+    //-----------------------------------------
 	// Constructor
-	//--------------------------------------------
+	//-----------------------------------------
     	
     function search_lib($that)
     {
-    	global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
     	
     	$this->is = &$that; // hahaha!
+    	
+    	
  	}
  	
- 	
- 	//--------------------------------------------
+ 	//-----------------------------------------
 	// Simple search
-	//--------------------------------------------
- 
+	//-----------------------------------------
 
 	function do_simple_search()
 	{
-		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
+		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print, $forums;
 		
 		if ( ! $ibforums->input['sid'] )
 		{
 			$boolean = "";
 			
-			//--------------------------------------------
+			//-----------------------------------------
 			// NEW SEARCH.. Check Keywords..
-			//--------------------------------------------
+			//-----------------------------------------
 			
 			if ( $this->is->mysql_version >= 40010 )
 			{
@@ -76,45 +75,79 @@ class search_lib extends Search
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_words') );
 			}
 			
-			if (strlen(trim($keywords)) < 4)
+			if (strlen(trim($keywords)) < $ibforums->vars['min_search_word'])
 			{
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_word_short', 'EXTRA' => 4) );
 			}
 			
-			//--------------------------------------------
+			//-----------------------------------------
+			// Check for filter abuse..
+			//-----------------------------------------
+			
+			$tmp = explode( ' ', $keywords );
+			
+			foreach( $tmp as $t )
+			{
+				if ( ! $t )
+				{
+					continue;
+				}
+				
+				$t = preg_replace( "#[\+\-\*\.]#", "", $t );
+				
+				//-----------------------------------------
+				// Allow abc* but not a***
+				//-----------------------------------------
+				
+				if ( strlen( $t ) < 3 )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_word_short', 'EXTRA' => 4) );
+				}
+			}
+			
+			//print $check_keywords; exit();
+			
+			//-----------------------------------------
 			// Get forums...
-			//--------------------------------------------
+			//-----------------------------------------
 			
-			$forums = $this->is->get_searchable_forums();
+			$myforums = $this->is->get_searchable_forums();
 			
-			if ($forums == "")
+			if ($myforums == "")
 			{
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
 			}
 			
-			//--------------------------------------------
+			//-----------------------------------------
 			// How many results?
-			//--------------------------------------------
+			//-----------------------------------------
 			
-			$DB->query("SELECT COUNT(*) as dracula FROM ibf_posts p WHERE p.forum_id IN ($forums) AND MATCH(post) AGAINST ('$check_keywords' $boolean)");
+			$DB->query("SELECT COUNT(*) as dracula
+						FROM ".SQL_PREFIX."posts p
+						 LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=p.topic_id)
+						WHERE t.forum_id IN ($myforums)
+						AND MATCH(p.post) AGAINST ('$check_keywords' $boolean)");
 			
 			$count = $DB->fetch_row();
 			
 			if ( $count['dracula'] < 1 ) // Tee-hee!
 			{
-				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+				$this->output .= $this->is->html->search_error_page($ibforums->input['keywords']);
+				$print->add_output( $this->output );
+				$print->do_output( array( 'TITLE' => $ibforums->lang['g_simple_title'], 'JS' => 0, NAV => array( $ibforums->lang['g_simple_title'] ) ) );
 			}
 			
-			//--------------------------------------------
+			//-----------------------------------------
 			// Store it daddy-o!
-			//--------------------------------------------
+			//-----------------------------------------
 			
-			$cache = "SELECT MATCH(post) AGAINST ('$check_keywords' $boolean) as score, t.tid, t.title, t.posts, t.views,
-			                 f.category, f.id, f.name, p.post, p.author_id, p.author_name, p.post_date, p.pid
-					  FROM ibf_posts p
-					   LEFT JOIN ibf_forums f ON (p.forum_id=f.id)
-					   LEFT JOIN ibf_topics t on (p.topic_id=t.tid)
-					  WHERE p.forum_id IN ($forums) AND t.title IS NOT NULL
+			$cache = "SELECT MATCH(post) AGAINST ('$check_keywords' $boolean) as score, t.tid, t.posts as topic_posts, t.title as topic_title, t.views, t.forum_id,
+			                 p.post, p.author_id, p.author_name, p.post_date, p.pid, p.post_htmlstate,m.*, me.*
+					  FROM ".SQL_PREFIX."posts p
+					   LEFT JOIN ".SQL_PREFIX."topics t on (p.topic_id=t.tid)
+					   LEFT JOIN ".SQL_PREFIX."members m on (m.id=p.author_id)
+					   LEFT JOIN ".SQL_PREFIX."member_extra me on (me.id=p.author_id)
+					  WHERE t.forum_id IN ($myforums) AND t.title IS NOT NULL
 					  AND MATCH(post) AGAINST ('$check_keywords' $boolean)";
 			
 			if ( $ibforums->input['sortby'] != "relevant" )
@@ -138,14 +171,25 @@ class search_lib extends Search
 			
 			$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
 			
-			$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&CODE=simpleresults&sid=$unique_id&highlite=".urlencode(trim(str_replace( '&amp;', '&', $ibforums->input['keywords']))) );
+			$hilight = str_replace( '&quot;', '', $ibforums->input['keywords'] );
+			$hilight = urlencode(trim(str_replace( '&amp;', '&', $hilight)));
+			
+			$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&CODE=simpleresults&sid=$unique_id&highlite=".$hilight );
 		
 		}
 		else
 		{
-			//--------------------------------------------
+			//-----------------------------------------
+			// Load up the topic stuff
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'sources/topics.php' );
+			$this->topics = new topics();
+			$this->topics->topic_init();
+			
+			//-----------------------------------------
 			// Get SQL schtuff
-			//--------------------------------------------
+			//-----------------------------------------
 			
 			$this->unique_id = $ibforums->input['sid'];
 		
@@ -165,9 +209,9 @@ class search_lib extends Search
 		
 			$check_keywords = preg_replace( '/&amp;(lt|gt|quot);/', "&\\1;", trim(urldecode($ibforums->input['highlite'])) );
 		
-			//--------------------------------------------
+			//-----------------------------------------
 			// Display
-			//--------------------------------------------
+			//-----------------------------------------
 			
 			$this->links = $std->build_pagelinks(
 						     array(
@@ -177,28 +221,13 @@ class search_lib extends Search
 									'CUR_ST_VAL'  => $this->is->first,
 									'L_SINGLE'    => $ibforums->lang['sp_single'],
 									'L_MULTI'     => "",
-									'BASE_URL'    => $ibforums->base_url."&amp;act=Search&amp;CODE=simpleresults&amp;sid=".$this->unique_id."&amp;highlite=".urlencode($check_keywords),
+									'BASE_URL'    => $ibforums->base_url."&amp;act=Search&amp;CODE=simpleresults&amp;sid=".$this->unique_id."&amp;highlite=".urlencode(str_replace('"', '', $check_keywords)),
 								  )
 						   					    );
 		
-			require "./sources/lib/post_parser.php";
-			$this->parser = new post_parser();
-			
-			//--------------------------------------------
-			// Get categories
-			//--------------------------------------------
-			
-			$DB->query("SELECT id, name FROM ibf_categories");
-			
-			while ( $cat = $DB->fetch_row() )
-			{
-				$cat_array[ $cat['id'] ] = $cat['name'];
-			}
-			
-			
-			//--------------------------------------------
+			//-----------------------------------------
 			// oh look, a query!
-			//--------------------------------------------
+			//-----------------------------------------
 			
 			$last_tid = 0;
 			
@@ -206,7 +235,7 @@ class search_lib extends Search
 			
 			$SQLtime->startTimer();
 			
-			$DB->query($query." LIMIT {$this->is->first},25");
+			$outer = $DB->query($query." LIMIT {$this->is->first},25");
 			
 			$ex_time = sprintf( "%.4f",$SQLtime->endTimer() );
 			
@@ -225,10 +254,12 @@ class search_lib extends Search
 																		 'ex_time' => $ex_time,
 																		 'keyword' => $check_keywords,
 																  )     );
+			
+			$attach_pids = array();
 						
-			while ( $row = $DB->fetch_row() )
+			while ( $row = $DB->fetch_row($outer) )
 			{
-				//---------------------------------------------------------------------
+				//-----------------------------------------
 				// Listen up, this is relevant.
 				// MySQL's relevance is a bit of a mystery. It's
 				// based on many hazy variables such as placing, occurance
@@ -236,89 +267,12 @@ class search_lib extends Search
 				// No one can really disect what this means in human terms, so I'm
 				// going to simply assume that anything over 1.0 is 100%, and *100 any
 				// other relevance result.
-				//---------------------------------------------------------------------
+				//-----------------------------------------
+				
+				$member = $this->topics->parse_member( $row );
 				
 				$row['relevance'] = sprintf( "%3d", ( $row['score'] > 1.0 ) ? 100 : $row['score'] * 100 );
 				
-				//-----------------------------------------
-				// Fix up da post
-				//-----------------------------------------
-				
-				$row['post']      = $this->parser->unconvert($row['post']);
-				
-				// Strip out BB tags
-				
-				$row['post']      = preg_replace( "#\[.+?/?\]#", "", $row['post'] );
-				
-				// Try and locate keyword in the post...
-				
-				$start     = 0;
-				$end       = 250;
-				$tmp_post  = strtolower($row['post']);
-				$tmp_words = explode(" ", trim(strtolower($check_keywords)) );
-				
-				if ( $st = strpos( $tmp_post, $tmp_words[0] ) )
-				{
-					$start  = $st - 100;
-					$start  = $start < 0 ? 0 : $start;
-					$end   += $start;
-				}
-				
-				$row['post'] = substr( $row['post'], $start, $end );
-				
-				
-				// Finish tidy up..
-				
-				if ( $start > 0 )
-				{
-					// We're cutting at the start, so..
-					// If it's not a capital letter, it's probably
-					// cut a word in half / it's a lower case word so it doesnt matter
-					
-					if ( ! preg_match( "/^[A-Z]/", $row['post'] ) )
-					{
-						// find the first space..
-						
-						if ( $new_start = strpos( $row['post'], " " ) )
-						{
-							// Cut to space..
-							
-							$row['post'] = substr( $row['post'], $new_start );
-							
-							$row['post'] = '...'.$row['post'];
-						}
-					}
-				}
-				
-				// Tidy up the end..
-				// Find the last space..
-				
-				if ( strlen( $row['post'] ) > 250  )
-				{
-					if ( $new_end = strrpos( $row['post'], " " ) )
-					{
-						$row['post'] = substr( $row['post'], 0, $new_end );
-						
-						$row['post'] .= '...';
-					}
-				}	
-					
-				// Basic highlighting
-				
-				$row['post'] = preg_replace( "/".preg_quote($tmp_words[0], '/')."/i", "<strong>".$tmp_words[0]."</strong>", $row['post'] );
-				
-				$row['css_class'] = 'googleroot';
-				
-				if ( $row['tid'] == $last_tid )
-				{
-					$row['css_class'] = 'googlechild';
-				}
-				
-				$last_tid = $row['tid'];
-				
-				$row['cat_id']   = $row['category'];
-				$row['cat_name'] = $cat_array[ $row['category'] ];
-				
 				$row['post_date'] = $std->get_date( $row['post_date'], 'LONG' );
 				
 				// Link member's name
@@ -328,12 +282,68 @@ class search_lib extends Search
 					$row['author_name'] = "<a href='{$ibforums->base_url}act=Profile&amp;MID={$row['author_id']}'>{$row['author_name']}</a>";
 				}
 				
-				$this->output .= $this->is->html->result_simple_entry($row);
-			}			
+				//-----------------------------------------
+				// Attachments?
+				//-----------------------------------------
+				
+				if ( strstr( $row['post'], '[attachmentid=' ) )
+				{
+					$attach_pids[] = $row['pid'];
+				}
+				
+				//-----------------------------------------
+				// Fix up quotes..
+				//-----------------------------------------
+				
+				$row['post'] = $this->topics->parser->unconvert( $row['post'] );
+				
+				$row['post'] = $this->topics->parser->convert( array(
+																	  'TEXT'    => $row['post'],
+																	  'CODE'    => $forums->forum_by_id[$row['forum_id']]['use_ibc'],
+																	  'SMILIES' => 1,
+																	  'HTML'    => 0
+															 )      );
+															 
+				$this->topics->parser->pp_do_html  = ( $forums->forum_by_id[$row['forum_id']]['use_html'] and $ibforums->cache['group_cache'][ $row['mgroup'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+				$this->topics->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+				$this->topics->parser->pp_nl2br    = $row['post_htmlstate'] == 2 ? 1 : 0;
+				
+				$row['post'] = $this->topics->parser->post_db_parse( $row['post'] );
+				
+				$keywords_array = explode( " ", str_replace( "+", " ", $ibforums->input['highlite'] ) );
+				
+				if ( count($keywords_array) )
+				{
+					foreach( $keywords_array as $keys )
+					{
+						if ( $keys == "" )
+						{
+							continue;
+						}
 						
-			$this->output .= $this->is->html->result_simple_footer(array(
-																		 'links'   => $this->links,
-																  )     );
+						while( preg_match( "/(^|\s|'|\"|>)(".preg_quote($keys, '/').")(\s|'|\"|,|\.|!|<br|$)/is", $row['post'] ) )
+						{
+							$row['post'] = preg_replace( "/(^|\s|'|\"|>)(".preg_quote($keys, '/').")(\s|'|\"|,|\.|!|<br|$)/is", "\\1<span class='searchlite'>\\2</span>\\3", $row['post'] );
+						}
+					}
+				}
+				
+				$row['forum_name'] = $forums->forum_by_id[ $row['forum_id'] ]['name'];
+				
+				
+				$this->output .= $this->is->html->RenderPostRow($row, $member);
+			}
+			
+			//-----------------------------------------
+			// Add in attachments?
+			//-----------------------------------------
+			
+			if ( count( $attach_pids ) )
+			{
+				$this->output = $this->topics->parse_attachments( $this->output, $attach_pids );
+			}
+						
+			$this->output .= $this->is->html->end_results_table(array( 'SHOW_PAGES'   => $this->links ) , 1 );
 																  			
 			$print->add_output("$this->output");
 			$print->do_output( array( 'TITLE' => $ibforums->lang['g_simple_title'], 'JS' => 0, NAV => array( $ibforums->lang['g_simple_title'] ) ) );
@@ -345,22 +355,22 @@ class search_lib extends Search
  	
  	
  	
- 	//--------------------------------------------
+ 	//-----------------------------------------
 	// Main Board Search-e-me-doo-daa
-	//--------------------------------------------
+	//-----------------------------------------
  
 
 	function do_main_search()
 	{
 		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Do we have any input?
-		//------------------------------------
+		//-----------------------------------------
 		
-		//------------------------------------
+		//-----------------------------------------
 		// USING FULL TEXT - Wooohoo!!
-		//------------------------------------
+		//-----------------------------------------
 		
 		
 		if ($ibforums->input['namesearch'] != "")
@@ -392,7 +402,7 @@ class search_lib extends Search
 			$type='nameonly';
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ( $this->is->mysql_version >= 40010 )
 		{
@@ -415,33 +425,58 @@ class search_lib extends Search
 		}
 		else
 		{
-			if (strlen(trim($keywords)) < 4)
+			if ( strlen(trim($keywords)) < $ibforums->vars['min_search_word'] and $type != 'nameonly' )
 			{
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_word_short', 'EXTRA' => 4) );
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
+		// Check for filter abuse..
+		//-----------------------------------------
+		
+		$tmp = explode( ' ', $keywords );
+		
+		foreach( $tmp as $t )
+		{
+			if ( ! $t )
+			{
+				continue;
+			}
+			
+			$t = preg_replace( "#[\+\-\*\.]#", "", $t );
+			
+			//-----------------------------------------
+			// Allow abc* but not a***
+			//-----------------------------------------
+			
+			if ( ( strlen( $t ) < $ibforums->vars['min_search_word'] )  and $type != 'nameonly' )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_word_short', 'EXTRA' => 4) );
+			}
+		}
+		
+		//-----------------------------------------
 		
 		if ($ibforums->input['search_in'] == 'titles')
 		{
 			$this->is->search_in = 'titles';
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$forums = $this->is->get_searchable_forums();
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Do we have any forums to search in?
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($forums == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
 		}
 	
-		//------------------------------------
+		//-----------------------------------------
 		
 		foreach( array( 'last_post', 'posts', 'starter_name', 'forum_id' ) as $v )
 		{
@@ -451,7 +486,7 @@ class search_lib extends Search
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		foreach ( array( 1, 7, 30, 60, 90, 180, 365, 0 ) as $v )
 		{
@@ -461,14 +496,14 @@ class search_lib extends Search
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->input['sort_order'] == 'asc')
 		{
 			$this->is->sort_order = 'asc';
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->input['result_type'] == 'posts')
 		{
@@ -480,16 +515,24 @@ class search_lib extends Search
 			$ibforums->vars['min_search_word'] = 4;
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Add on the prune days
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($this->is->prune > 0)
 		{
 			$gt_lt = $ibforums->input['prune_type'] == 'older' ? "<" : ">";
 			$time = time() - ($ibforums->input['prune'] * 86400);
 			
-			$topics_datecut = "t.last_post $gt_lt $time AND";
+			if ( $this->is->result_type == 'posts' )
+			{
+				$topics_datecut = "t.start_date $gt_lt $time AND";
+			}
+			else
+			{
+				$topics_datecut = "t.last_post $gt_lt $time AND";
+			}
+			
 			$posts_datecut  = "p.post_date $gt_lt $time AND";
 		}
 		
@@ -500,9 +543,9 @@ class search_lib extends Search
 		 
 		 if ( $name_filter != "" )
 		 {
-			//------------------------------------------------------------------
+			//-----------------------------------------
 			// Get all the possible matches for the supplied name from the DB
-			//------------------------------------------------------------------
+			//-----------------------------------------
 			
 			$name_filter = str_replace( '|', "&#124;", $name_filter );
 			
@@ -551,93 +594,117 @@ class search_lib extends Search
 		
 		if ($type != 'nameonly')
 		{
-			$topics_query = "SELECT t.tid
-							FROM ibf_topics t
-							WHERE $topics_datecut t.forum_id IN ($forums)
-							$topics_name AND t.approved=1 AND MATCH(title) AGAINST ('".trim($keywords)."' $boolean)";
-		
-		
-			$posts_query = "SELECT p.pid ".
-						   "FROM ibf_posts p ".
-						   "WHERE $posts_datecut  p.forum_id IN ($forums)".
-						   " AND p.queued <> 1".
-						   " $posts_name AND MATCH(post) AGAINST ('".trim($keywords)."' $boolean)";
+			if ( ! $this->is->topic_search_only )
+			{
+				$topics_query = "SELECT t.tid
+								FROM ibf_topics t
+								WHERE $topics_datecut t.forum_id IN ($forums)
+								$topics_name AND t.approved=1 AND MATCH(title) AGAINST ('".trim($keywords)."' $boolean)";
+			
+			
+				$posts_query = "SELECT p.pid
+								FROM ibf_posts p
+								 LEFT JOIN ibf_topics t ON ( p.topic_id=t.tid )
+								WHERE $posts_datecut  t.forum_id IN ($forums)
+								 AND p.queued <> 1
+								 $posts_name AND MATCH(post) AGAINST ('".trim($keywords)."' $boolean)";
+			}
+			else
+			{
+				//-----------------------------------------
+				// Search in topic only
+				//-----------------------------------------
+				
+				$posts_query = "SELECT p.pid
+								FROM ibf_posts p
+								 LEFT JOIN ibf_topics t ON ( p.topic_id=t.tid )
+								WHERE
+								 p.topic_id={$this->is->topic_id}
+								 AND $posts_datecut  t.forum_id IN ($forums)
+								 AND p.queued <> 1
+								 $posts_name AND MATCH(post) AGAINST ('".trim($keywords)."' $boolean)";
+			}
 		}
 		else
 		{
+			
 			$topics_query = "SELECT t.tid
 							FROM ibf_topics t
 							WHERE $topics_datecut t.forum_id IN ($forums)
 							$topics_name";
 		
-		
-			$posts_query = "SELECT p.pid ".
-						   "FROM ibf_posts p ".
-						   "WHERE $posts_datecut  p.forum_id IN ($forums)".
-						   " AND p.queued <> 1".
-						   " $posts_name";
+			$posts_query = "SELECT p.pid
+						    FROM ibf_posts p
+						     LEFT JOIN ibf_topics t ON ( p.topic_id=t.tid )
+						    WHERE $posts_datecut t.forum_id IN ($forums)
+						     AND p.queued <> 1
+						     $posts_name";
 		}
-					   
-		//------------------------------------------------
+			   
+		//-----------------------------------------
 		// Get the topic ID's to serialize and store into
 		// the database
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		$topics = "";
 		$posts  = "";
+		$topic_array = array();
+		$post_array  = array();
 		
-		//------------------------------------
+		//-----------------------------------------
 		
-		$DB->query($topics_query);
-	
-		$topic_max_hits = $DB->get_num_rows();
-		
-		while ($row = $DB->fetch_row() )
+		if ( ! $this->is->topic_search_only )
 		{
-			$topics .= $row['tid'].",";
+			$DB->query($topics_query);
+		
+			while ($row = $DB->fetch_row() )
+			{
+				$topic_array[ $row['tid'] ] = $row['tid'];
+			}
+			
+			$DB->free_result();
 		}
 		
-		$DB->free_result();
-		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$DB->query($posts_query);
-	
-		$post_max_hits = $DB->get_num_rows();
 		
 		while ($row = $DB->fetch_row() )
 		{
-			$posts .= $row['pid'].",";
+			$post_array[ $row['pid'] ] = $row['pid'];
 		}
 		
 		$DB->free_result();
 		
-		//------------------------------------
+		//-----------------------------------------
 		
-		$topics = preg_replace( "/,$/", "", $topics );
-		$posts  = preg_replace( "/,$/", "", $posts );
+		$topics = implode( ",", $topic_array );
+		$posts  = implode( ",", $post_array );
 		
-		//------------------------------------------------
+		//-----------------------------------------
 		// Do we have any results?
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		if ($topics == "" and $posts == "")
 		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+			$this->output .= $this->is->html->search_error_page($ibforums->input['keywords']);
+			$print->add_output( $this->output );
+			$print->do_output( array( 'TITLE' => $ibforums->lang['g_simple_title'], 'JS' => 0, NAV => array( $ibforums->lang['g_simple_title'] ) ) );
+	
 		}
 		
-		//------------------------------------------------
+		//-----------------------------------------
 		// If we are still here, return data like a good
 		// boy (or girl). Yes Reg; or girl.
 		// What have the Romans ever done for us?
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		return array(
 					  'topic_id'  => $topics,
 					  'post_id'   => $posts,
-					  'topic_max' => $topic_max_hits,
-					  'post_max'  => $post_max_hits,
-					  'keywords'  => $keywords,
+					  'topic_max' => intval( count( $topic_array ) ),
+					  'post_max'  => intval( count( $post_array  ) ),
+					  'keywords'  => str_replace( '"', "", $keywords ),
 					);
 		
 	}
@@ -645,4 +712,4 @@ class search_lib extends Search
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/search_mysql_man.php b/upload/sources/lib/search_mysql_man.php
index 126d9d57..b20713d2 100644
--- a/upload/sources/lib/search_mysql_man.php
+++ b/upload/sources/lib/search_mysql_man.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -26,33 +25,32 @@
 
 class search_lib extends Search
 {
-
     var $parser      = "";
     var $is          = "";
     
-    //--------------------------------------------
+    //-----------------------------------------
 	// Constructor
-	//--------------------------------------------
+	//-----------------------------------------
     	
     function search_lib($that)
     {
-    	global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
     	
     	$this->is = &$that; // hahaha!
  	}
  	
- 	//--------------------------------------------
+ 	//-----------------------------------------
 	// Main Board Search-e-me-doo-daa
-	//--------------------------------------------
+	//-----------------------------------------
  
 
 	function do_main_search()
 	{
 		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Do we have any input?
-		//------------------------------------
+		//-----------------------------------------
 		
 		
 		if ($ibforums->input['namesearch'] != "")
@@ -84,7 +82,7 @@ class search_lib extends Search
 			$type='nameonly';
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$check_keywords = trim($keywords);
 		
@@ -98,27 +96,27 @@ class search_lib extends Search
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->input['search_in'] == 'titles')
 		{
 			$this->is->search_in = 'titles';
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$forums = $this->is->get_searchable_forums();
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Do we have any forums to search in?
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($forums == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
 		}
 	
-		//------------------------------------
+		//-----------------------------------------
 		
 		foreach( array( 'last_post', 'posts', 'starter_name', 'forum_id' ) as $v )
 		{
@@ -128,7 +126,7 @@ class search_lib extends Search
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		foreach ( array( 1, 7, 30, 60, 90, 180, 365, 0 ) as $v )
 		{
@@ -138,14 +136,14 @@ class search_lib extends Search
 			}
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->input['sort_order'] == 'asc')
 		{
 			$this->is->sort_order = 'asc';
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->input['result_type'] == 'posts')
 		{
@@ -157,9 +155,9 @@ class search_lib extends Search
 			$ibforums->vars['min_search_word'] = 4;
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Add on the prune days
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ($this->is->prune > 0)
 		{
@@ -177,9 +175,9 @@ class search_lib extends Search
 		 
 		 if ( $name_filter != "" )
 		 {
-			//------------------------------------------------------------------
+			//-----------------------------------------
 			// Get all the possible matches for the supplied name from the DB
-			//------------------------------------------------------------------
+			//-----------------------------------------
 			
 			$name_filter = str_replace( '|', "&#124;", $name_filter );
 			
@@ -273,11 +271,12 @@ class search_lib extends Search
 							$topics_name AND t.approved=1 AND ($title_like)";
 		
 		
-			$posts_query = "SELECT p.pid ".
-						   "FROM ibf_posts p ".
-						   "WHERE $posts_datecut  p.forum_id IN ($forums)".
-						   " AND p.queued <> 1".
-						   " $posts_name AND ($post_like)";
+			$posts_query = "SELECT p.pid
+						    FROM ibf_posts p
+						     LEFT JOIN ibf_topics t on (t.tid=p.topic_id)
+						    WHERE $posts_datecut  t.forum_id IN ($forums)
+						     AND p.queued <> 1
+						     $posts_name AND ($post_like)";
 		}
 		else
 		{
@@ -287,22 +286,23 @@ class search_lib extends Search
 							$topics_name";
 		
 		
-			$posts_query = "SELECT p.pid ".
-						   "FROM ibf_posts p ".
-						   "WHERE $posts_datecut  p.forum_id IN ($forums)".
-						   " AND p.queued <> 1".
-						   " $posts_name";
+			$posts_query = "SELECT p.pid
+						    FROM ibf_posts p
+						    LEFT JOIN ibf_topics t on (t.tid=p.topic_id)
+						    WHERE $posts_datecut  t.forum_id IN ($forums)
+						    AND p.queued <> 1
+						     $posts_name";
 		}
 					   
-		//------------------------------------------------
+		//-----------------------------------------
 		// Get the topic ID's to serialize and store into
 		// the database
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		$topics = "";
 		$posts  = "";
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$DB->query($topics_query);
 	
@@ -315,7 +315,7 @@ class search_lib extends Search
 		
 		$DB->free_result();
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$DB->query($posts_query);
 	
@@ -328,25 +328,25 @@ class search_lib extends Search
 		
 		$DB->free_result();
 		
-		//------------------------------------
+		//-----------------------------------------
 		
 		$topics = preg_replace( "/,$/", "", $topics );
 		$posts  = preg_replace( "/,$/", "", $posts );
 		
-		//------------------------------------------------
+		//-----------------------------------------
 		// Do we have any results?
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		if ($topics == "" and $posts == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
 		}
 		
-		//------------------------------------------------
+		//-----------------------------------------
 		// If we are still here, return data like a good
 		// boy (or girl). Yes Reg; or girl.
 		// What have the Romans ever done for us?
-		//------------------------------------------------
+		//-----------------------------------------
 		
 		return array(
 					  'topic_id'  => $topics,
@@ -361,4 +361,4 @@ class search_lib extends Search
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/tar.php b/upload/sources/lib/tar.php
index 148fc86f..738a4ba5 100644
--- a/upload/sources/lib/tar.php
+++ b/upload/sources/lib/tar.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -90,9 +89,9 @@ class tar {
 	var $tarfile_path_name = "";
 	var $workfiles         = array();
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// CONSTRUCTOR: Attempt to guess the current working dir.
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function tar() {
 		global $HTTP_SERVER_VARS;
@@ -119,12 +118,12 @@ class tar {
 								 );
 	}
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// Set the tarname. If we are extracting a tarball, then it must be the
 	// path to the tarball, and it's name (eg: $tar->new_tar("/foo/bar" ,'myTar.tar')
 	// or if we are creating a tar, then it must be the path and name of the tar file
 	// to create.
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function new_tar($tarpath, $tarname) {
 		
@@ -140,9 +139,9 @@ class tar {
 	}
 	
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// Easy way to overwrite defaults
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function over_write_existing() {
 		$this->attributes['over_write_existing'] = 1;
@@ -159,9 +158,9 @@ class tar {
 	
 	
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// User assigns the root directory for the tar ball creation/extraction
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function current_dir($dir = "") {
 		
@@ -169,9 +168,9 @@ class tar {
 		
 	}
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// list files: returns an array with all the filenames in the tar file
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function list_files($advanced="") {
 	
@@ -201,13 +200,13 @@ class tar {
 		return $final;
 	}
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// Add a directory to the tar files.
 	// $tar->add_directory( str(TO DIRECTORY) )
 	//    Can be used in the following methods.
 	//	  $tar->add_directory( "/foo/bar" );
 	//	  $tar->write_tar( "/foo/bar" );
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function add_directory( $dir ) {
 	
@@ -233,7 +232,7 @@ class tar {
 		
 	}
 	
-	//-------------------------------------
+	//-----------------------------------------
 	
 	function get_dir_contents( $dir )
 	{
@@ -276,7 +275,7 @@ class tar {
 		}
 	}
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// Extract the tarball
 	// $tar->extract_files( str(TO DIRECTORY), [ array( FILENAMES )  ] )
 	//    Can be used in the following methods.
@@ -284,7 +283,7 @@ class tar {
 	// 	  This will seek out the files in the user array and extract them
 	//    $tar->extract( "/foo/bar" );
 	//    Will extract the complete tar file into the user specified directory
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function extract_files( $to_dir, $files="" ) {
 	
@@ -299,18 +298,18 @@ class tar {
 			return;
 		}
 		
-		//---------------------------------------------
+		//-----------------------------------------
 		// change into the directory chosen by the user.
-		//---------------------------------------------
+		//-----------------------------------------
 		
 		chdir($to_dir);
 		$cur_dir = getcwd();
 		
 		$to_dir_slash = $to_dir . "/";
 		
-		//+------------------------------
+		//-----------------------------------------
 		// Get the file info from the tar
-		//+------------------------------
+		//-----------------------------------------
 		
 		$in_files = $this->read_tar();
 		
@@ -320,9 +319,9 @@ class tar {
 		
 		foreach ($in_files as $k => $file) {
 		
-			//---------------------------------------------
+			//-----------------------------------------
 			// Are we choosing which files to extract?
-			//---------------------------------------------
+			//-----------------------------------------
 			
 			if (is_array($files))
 			{
@@ -334,10 +333,10 @@ class tar {
 			
 			chdir($cur_dir);
 			
-			//---------------------------------------------
+			//-----------------------------------------
 			// GNU TAR format dictates that all paths *must* be in the *nix
 			// format - if this is not the case, blame the tar vendor, not me!
-			//---------------------------------------------
+			//-----------------------------------------
 			
 			if ( preg_match("#/#", $file['name']) )
 			{
@@ -349,9 +348,9 @@ class tar {
 				$file_name = $file['name'];
 			}
 			
-			//---------------------------------------------
+			//-----------------------------------------
 			// If we have a path, then we must build the directory tree
-			//---------------------------------------------
+			//-----------------------------------------
 			
 			
 			if (count($path_info) > 0)
@@ -380,9 +379,9 @@ class tar {
 				}
 			}
 			
-			//---------------------------------------------
+			//-----------------------------------------
 			// check the typeflags, and work accordingly
-			//---------------------------------------------
+			//-----------------------------------------
 			
 			if (($file['typeflag'] == 0) or (!$file['typeflag']) or ($file['typeflag'] == ""))
 			{
@@ -445,7 +444,7 @@ class tar {
 		
 	}
 		
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// add files:
 	//  Takes an array of files, and adds them to the tar file
 	//  Optionally takes a path to use as root for the tar file - if omitted, it
@@ -461,20 +460,21 @@ class tar {
 	//  in an error. Either that, or use:
 	//  chdir("/usr/home/somedir/forums");
 	//  $tar->add_files( $files );
-	//+--------------------------------------------------------------------------
-	
-	function add_files( $files, $root_path="" ) {
+	//-----------------------------------------
 	
+	function add_files( $files, $root_path="" )
+	{
 		// Do we a root path to change into?
 		
-		if ($root_path != "") {
+		if ($root_path != "")
+		{
 			chdir($root_path);
 		}
 		
 		$count    = 0;
 		
-		foreach ($files as $file) {
-		
+		foreach ($files as $file)
+		{
 			// is it a Mac OS X work file?
 			
 			if ( preg_match("/\.ds_store/i", $file ) )
@@ -490,7 +490,8 @@ class tar {
 			
 			// Did stat fail?
 			
-			if (! is_array($stat) ) {
+			if (! is_array($stat) )
+			{
 				$this->warnings[] = "Error: Stat failed on $file";
 				continue;
 			}
@@ -502,25 +503,34 @@ class tar {
 			$size  = filesize($file);
 			$mtime = filemtime($file);
 			
-			if (is_file($file)) {
+			if (is_file($file))
+			{
 				// It's a plain file, so lets suck it up
+				
 				$typeflag = 0;
-				if ( $FH = fopen($file, 'rb') ) {
+				
+				if ( $FH = fopen($file, 'rb') )
+				{
 					$data = fread( $FH, filesize($file) );
 					fclose($FH);
-				} else {
+				}
+				else
+				{
 					$this->warnings[] = "ERROR: Failed to open $file";
 					continue;
 				}
 			}
-			else if (is_link($file)) {
+			else if (is_link($file))
+			{
 				$typeflag = 1;
 				$linkname = @readlink($file);
 			}
-			else if (is_dir($file)) {
+			else if (is_dir($file))
+			{
 				$typeflag = 5;
 			}
-			else {
+			else
+			{
 				// Sockets, Pipes and char/block specials are not
 				// supported, so - lets use a silly value to keep the
 				// tar ball legitimate.
@@ -563,11 +573,11 @@ class tar {
 	
 	}
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// write_tar:
 	// Writes the tarball into the directory specified in new_tar with a filename
 	// specified in new_tar
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function write_tar() {
 	
@@ -591,16 +601,22 @@ class tar {
 		
 			// make sure the filename isn't longer than 99 characters.
 			
-			if (strlen($file['name']) > 99) {
+			if (strlen($file['name']) > 99)
+			{
 				$pos = strrpos( $file['name'], "/" );
-				if (is_string($pos) && !$pos) {
+				
+				if (is_string($pos) && !$pos)
+				{
 					// filename alone is longer than 99 characters!
 					$this->error[] = "Filename {$file['name']} exceeds the length allowed by GNU Tape ARchives";
 					continue;
 				}
+				
 				$prefix = substr( $file['name'], 0 , $pos );  // Move the path to the prefix
 				$file['name'] = substr( $file['name'], ($pos+1));
-				if (strlen($prefix) > 154) {
+				
+				if (strlen($prefix) > 154)
+				{
 					$this->error[] = "File path exceeds the length allowed by GNU Tape ARchives";
 					continue;
 				}
@@ -635,15 +651,18 @@ class tar {
 			
 			$checksum = 0;
 			
-			for ($i = 0 ; $i < 148 ; $i++ ) {
+			for ($i = 0 ; $i < 148 ; $i++ )
+			{
 				$checksum += ord( substr($tmp, $i, 1) );
 			}
 			
-			for ($i = 148 ; $i < 156 ; $i++) {
+			for ($i = 148 ; $i < 156 ; $i++)
+			{
 				$checksum += ord(' ');
 			}
 			
-			for ($i = 156, $j = 0 ; $i < 512 ; $i++, $j++) {
+			for ($i = 156, $j = 0 ; $i < 512 ; $i++, $j++)
+			{
 				$checksum += ord( substr($last, $j, 1) );
 			}
 			
@@ -684,9 +703,9 @@ class tar {
 		// Done..
 	}
 		   
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// Read the tarball - builds an associative array
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function read_tar() {
 	
@@ -832,13 +851,13 @@ class tar {
 
 
 
-//+------------------------------------------------------------------------------
+//-----------------------------------------
 // INTERNAL FUNCTIONS - These should NOT be called outside this module
 //+------------------------------------------------------------------------------
 	
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	// build_string: Builds a repititive string
-	//+--------------------------------------------------------------------------
+	//-----------------------------------------
 	
 	function internal_build_string($string="", $times=0) {
 	
diff --git a/upload/sources/lib/task_functions.php b/upload/sources/lib/task_functions.php
new file mode 100644
index 00000000..be4552bc
--- /dev/null
+++ b/upload/sources/lib/task_functions.php
@@ -0,0 +1,472 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Task Manager functions
+|   > Script written by Matt Mecham
+|   > Date started: 29th September 2003
+|   > DBA Checked: Fri 21 May 2004
+|
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly.";
+	exit();
+}
+
+
+
+class task_functions
+{
+	var $type      = 'internal';
+	var $root_path = './';
+	var $time_now  = 0;
+	var $date_now  = array();
+	var $cron_key  = "";
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// CONSTRUCTOR
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function task_functions()
+	{
+		global $DB, $std, $ibforums, $ROOT_PATH;
+		
+		if ( $ROOT_PATH )
+		{
+			$this->root_path = $ROOT_PATH.'/';
+		}
+		else if ( ROOT_PATH )
+		{
+			$this->root_path = ROOT_PATH;
+		}
+		
+		if ( $ibforums->input['ck'] )
+		{
+			$this->type = 'cron';
+			
+			$this->cron_key = substr( trim($ibforums->input['ck']), 0, 32 );
+		}
+		
+		$this->time_now = time();
+		
+		$this->date_now['minute']      = intval( gmdate( 'i', $this->time_now ) );
+		$this->date_now['hour']        = intval( gmdate( 'H', $this->time_now ) );
+		$this->date_now['wday']        = intval( gmdate( 'w', $this->time_now ) );
+		$this->date_now['mday']        = intval( gmdate( 'd', $this->time_now ) );
+		$this->date_now['month']       = intval( gmdate( 'm', $this->time_now ) );
+		$this->date_now['year']        = intval( gmdate( 'Y', $this->time_now ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Run the task
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $this->type == 'internal' )
+		{
+			//-----------------------------------------
+			// Loaded by our image...
+			// ... get next job
+			//-----------------------------------------
+			
+			$this_task = $DB->simple_exec_query( array( 'select' => '*',
+														'from'   => 'task_manager',
+														'where'  => 'task_enabled = 1 AND task_next_run <= '.$this->time_now,
+														'order'  => 'task_next_run ASC',
+														'limit'  => array(0,1)
+											   )      );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Cron.. load from cron key
+			//-----------------------------------------
+			
+			$this_task = $DB->simple_exec_query( array( 'select' => '*',
+														'from'   => 'task_manager',
+														'where'  => "task_cronkey='".$this->cron_key."'",
+											   )      );
+		
+		}
+		
+											   
+		if ( $this_task['task_id'] )
+		{
+			//-----------------------------------------
+			// Got it, now update row and run..
+			//-----------------------------------------
+			
+			$newdate = $this->generate_next_run($this_task);
+			
+			$DB->do_update( 'task_manager', array( 'task_next_run' => $newdate ), "task_id=".$this_task['task_id'] );
+			
+			$this->save_next_run_stamp();
+			
+			if ( file_exists( $this->root_path.'sources/tasks/'.$this_task['task_file'] ) )
+			{
+				require_once( $this->root_path.'sources/tasks/'.$this_task['task_file'] );
+				$myobj = new task_item();
+				$myobj->register_class( $this );
+				$myobj->pass_task( $this_task );
+				$myobj->run_task();
+			}
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Update next run variable in the systemvars cache
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function save_next_run_stamp()
+	{
+		global $ibforums, $DB, $std;
+		
+		$this_task = $DB->simple_exec_query( array( 'select' => 'task_next_run', 'from' => 'task_manager', 'where' => 'task_enabled = 1', 'order' => 'task_next_run ASC', 'limit' => array(0,1) ) );
+		
+		if ( ! $this_task['task_next_run'] )
+		{
+			//-----------------------------------------
+			// Fail safe...
+			//-----------------------------------------
+			
+			$this_task['task_next_run'] = $this->time_now + 3600;
+		}
+		
+		$cache_array = array();
+		
+		$cache       = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='systemvars'" ) );
+		
+		$cache_array = unserialize(stripslashes($cache['cs_value']));
+		
+		$cache_array['task_next_run'] = $this_task['task_next_run'];
+		
+		$DB->do_update( 'cache_store', array( 'cs_value' => addslashes(serialize($cache_array)) ), "cs_key='systemvars'" );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Generate next_run unix timestamp
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function generate_next_run($task=array())
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Did we set a day?
+		//-----------------------------------------
+		
+		$day_set       = 1;
+		$min_set       = 1;
+		$day_increment = 0;
+		
+		$this->run_day    = $this->date_now['wday'];
+		$this->run_minute = $this->date_now['minute'];
+		$this->run_hour   = $this->date_now['hour'];
+		$this->run_month  = $this->date_now['month'];
+		$this->run_year   = $this->date_now['year'];
+		
+		if ( $task['task_week_day'] == -1 and $task['task_month_day'] == -1 )
+		{
+			$day_set = 0;
+		}
+		
+		if ( $task['task_minute'] == -1 )
+		{
+			$min_set = 0;
+		}
+		
+		if ( $task['task_week_day'] == -1 )
+		{
+			if ( $task['task_month_day'] != -1 )
+			{
+				$this->run_day = $task['task_month_day'];
+				$day_increment = 'month';
+			}
+			else
+			{
+				$this->run_day = $this->date_now['mday'];
+				$day_increment = 'anyday';
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Calc. next week day from today
+			//-----------------------------------------
+			
+			$this->run_day = $this->date_now['mday'] + ( $task['task_week_day'] - $this->date_now['wday'] );
+			
+			$day_increment = 'week';
+		}
+		
+		//-----------------------------------------
+		// If the date to run next is less
+		// than today, best fetch the next
+		// time...
+		//-----------------------------------------
+		
+		if ( $this->run_day < $this->date_now['mday'] )
+		{
+			switch ( $day_increment )
+			{
+				case 'month':
+					$this->_add_month();
+					break;
+				case 'week':
+					$this->_add_day(7);
+					break;
+				default:
+					$this->_add_day();
+					break;
+			}
+		}
+				
+		//-----------------------------------------
+		// Sort out the hour...
+		//-----------------------------------------
+		
+		if ( $task['task_hour'] == -1)
+		{
+			$this->run_hour = $this->date_now['hour'];
+		}
+		else
+		{
+			//-----------------------------------------
+			// If ! min and ! day then it's
+			// every X hour
+			//-----------------------------------------
+			
+			if ( ! $day_set and ! $min_set )
+			{
+				$this->_add_hour( $task['task_hour'] );
+			}
+			else
+			{
+				$this->run_hour = $task['task_hour'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Can we run the minute...
+		//-----------------------------------------
+		
+		if ( $task['task_minute'] == -1 )
+		{
+			$this->_add_minute();
+		}
+		else
+		{
+			if ( $task['task_hour'] == -1 and ! $day_set )
+			{
+				//-----------------------------------------
+				// Runs every X minute..
+				//-----------------------------------------
+				
+				$this->_add_minute($task['task_minute']);
+			}
+			else
+			{
+				//-----------------------------------------
+				// runs at hh:mm
+				//-----------------------------------------
+				
+				$this->run_minute = $task['task_minute'];
+			}
+		}
+		
+		if ( $this->run_hour <= $this->date_now['hour'] and $this->run_day == $this->date_now['mday'] )
+		{
+			if ( $task['task_hour'] == -1 )
+			{
+				//-----------------------------------------
+				// Every hour...
+				//-----------------------------------------
+				
+				if ( $this->run_hour == $this->date_now['hour'] and $this->run_minute <= $this->date_now['min'] )
+				{
+ 					$this->_add_hour();
+ 				}
+ 			}
+ 			else
+ 			{
+ 				//-----------------------------------------
+ 				// Every X hour, try again in x hours
+ 				//-----------------------------------------
+ 				
+ 				if ( ! $day_set and ! $min_set )
+ 				{
+ 					$this->_add_hour($task['task_hour'] );
+ 				}
+ 				
+ 				//-----------------------------------------
+ 				// Specific hour, try tomorrow
+ 				//-----------------------------------------
+ 				
+ 				else if ( ! $day_set )
+ 				{
+ 					$this->_add_day();
+ 				}
+ 				else
+ 				{
+ 					//-----------------------------------------
+ 					// Oops, specific day...
+ 					//-----------------------------------------
+ 					
+ 					switch ( $day_increment )
+					{
+						case 'month':
+							$this->_add_month();
+							break;
+						case 'week':
+							$this->_add_day(7);
+							break;
+						default:
+							$this->_add_day();
+							break;
+					}
+ 				}
+ 			}
+		}
+		
+		//-----------------------------------------
+		// Return stamp...
+		//-----------------------------------------
+		
+		$next_run = gmmktime( $this->run_hour, $this->run_minute, 0, $this->run_month, $this->run_day, $this->run_year );
+		
+		return $next_run;
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Add to the log file
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function append_task_log($task,$desc)
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $task['task_log'] )
+		{
+			return;
+		}
+	
+		$save = array( 'log_title' => $task['task_title'],
+					   'log_date'  => time(),
+					   'log_ip'    => $_SERVER['REMOTE_ADDR'],
+					   'log_desc'  => $desc
+					 );
+					 
+		$DB->do_insert( 'task_logs', $save );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Add on a month for the next run time..
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function _add_month()
+	{
+		if ($this->date_now['month'] == 12)
+		{
+			$this->run_month = 1;
+			$this->run_year++;
+		}
+		else
+		{
+			$this->run_month++;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Add on a day for the next run time..
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function _add_day($days=1)
+	{
+		if ( $this->date['mday'] >= ( gmdate( 't', $this->time_now ) - $days ) )
+		{
+			$this->run_day = ($this->date['mday'] + $days) - date( 't', $this->time_now );
+			$this->_add_month();
+		}
+		else
+		{
+			$this->run_day += $days;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Add on a hour for the next run time...
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function _add_hour($hour=1)
+	{
+		if ($this->date_now['hour'] >= (24 - $hour ) )
+		{
+			$this->run_hour = ($this->date_now['hour'] + $hour) - 24;
+			$this->_add_day();
+		}
+		else
+		{
+			$this->run_hour += $hour;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Add on a minute...
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function _add_minute($mins=1)
+	{
+		if ( $this->date_now['minute'] >= (60 - $mins) )
+		{
+			$this->run_minute = ( $this->date_now['minute'] + $mins ) - 60;
+			$this->_add_hour();
+		}
+		else
+		{
+			$this->run_minute += $mins;
+		}
+	}
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/template_engine.bak.php b/upload/sources/lib/template_engine.bak.php
new file mode 100644
index 00000000..3c0f2e68
--- /dev/null
+++ b/upload/sources/lib/template_engine.bak.php
@@ -0,0 +1,451 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Template Engine module
+|   > Module written by Matt Mecham
+|   > Date started: 5th January 2004
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+|   New template module to build, rebuild and generate caches of templates
+|   which include the new IPB HTML Logic system.
+|   Example:
+|   <ipb-htmllogic>
+|    <if="ibf.vars['threaded_per_page'] == 10">
+|      html here
+|    </if>
+|    <else if="ibf.vars['threaded_per_page'] >= 100 or some_var == 'this'">
+|      html here
+|    </if>
+|    <else if="show['this'] > 100">
+|      html here
+|    </if>
+|    <else>
+|     html here
+|    </else>
+|   </ipb-htmllogic>
++--------------------------------------------------------------------------
+*/
+
+class ipb_template_engine
+{
+	var $root_path   = './';
+	var $cache_dir   = 'skin_cache';
+	var $cache_id    = '1';
+	var $database_id = '1';
+	
+	var $cache_path  = '';
+	
+	function class_template()
+	{
+		$this->cache_path = $this->root_path . $this->cache_dir . '/cacheid_' . $this->cache_id;
+	}
+	
+	//===================================================
+	// Convert HTML to PHP cache file
+	//===================================================
+	
+	function convert_html_to_php($func_name, $func_data, $func_html)
+	{
+		//-----------------------------------------
+		// Make sure we have ="" on each
+		// func data
+		//-----------------------------------------
+		
+		$func_data = preg_replace( "#".'\$'."(\w+)(,|$)#i", "\$\\1=\"\"\\2", str_replace( " ", "", $func_data ) );
+		
+		$top    = "//===========================================================================\n".
+			      "// {$func_name}\n".
+			      "//===========================================================================\n";
+			      
+		$start  = "function {$func_name}($func_data) {\nglobal \$ibforums;\n\$IPBHTML = \"\";\n//--starthtml--//\n";
+		$middle = $this->build_section_html_to_php($func_html);
+		$end    = "\n//--endhtml--//\nreturn \$IPBHTML;\n}\n";
+		
+		return $top.$start.$middle.$end;
+	}
+	
+	//===================================================
+	// Alias: Convert PHP to HTML
+	//===================================================
+	
+	function convert_php_to_html($php)
+	{
+		return $this->_convert_php_to_html($php);
+	}
+	
+	//===================================================
+	// Build Section: PHP to HTML
+	// - Updates HTML database with PHP cache file
+	//===================================================
+	
+	function build_section_php_to_html($php="")
+	{
+	
+	}
+	
+	//===================================================
+	// Build Section: HTML to PHP
+	// - Makes PHP cache of raw HTML
+	//===================================================
+	
+	function build_section_html_to_php($html="")
+	{
+		//-----------------------------------------
+		// Does it have logic sections?
+		//-----------------------------------------
+		
+		if ( preg_match( "#<ipb-htmllogic>#si", $html ) )
+		{
+			//-----------------------------------------
+			// Convert between logic sections
+			//-----------------------------------------
+			
+			$html = preg_replace( "#(</ipb-htmllogic>)(.+?)(<ipb-htmllogic>)#ise", "\$this->_wrap_in_php('\\2', '\\3', '\\1');", $html );
+			
+			//-----------------------------------------
+			// Convert before logic sections
+			//-----------------------------------------
+			
+			$html = preg_replace( "#^(.+?)(<ipb-htmllogic>)#ise", "\$this->_wrap_in_php('\\1', '\\2');", $html );
+			
+			//-----------------------------------------
+			// Convert after logic sections
+			//-----------------------------------------
+			
+			if ( preg_match( "#^(.*)</ipb-htmllogic>(.+?)$#is", $html, $match ) )
+			{
+				if ( $match[1] and $match[2] )
+				{	
+					$html = preg_replace( "#^(.*</ipb-htmllogic>)(.+?)$#ise", "\$this->_wrap_in_php('\\2', '', '\\1');", $html );
+				}
+			}
+			
+			//-----------------------------------------
+			// Find and convert ipb-htmllogic bits
+			//-----------------------------------------
+			
+			while ( preg_match( "#<ipb-htmllogic>(.+?)</ipb-htmllogic>#si", $html, $match ) )
+			{
+				$html = preg_replace( "#<ipb-htmllogic>(.+?)</ipb-htmllogic>#sie", "'//start-htmllogic' . \$this->_convert_html_to_php('\\1') . '//end-htmllogic';", $html );
+			}
+			
+		}
+		else
+		{
+			$html = $this->_wrap_in_php( $html );
+		}
+		
+		//-----------------------------------------
+		// Remove extra spaces
+		//-----------------------------------------
+		
+		$html = preg_replace( "#(//endelse|//endif)\s+?(//end-htmllogic)#is", "\\1\n\\2", $html );
+		
+		//-----------------------------------------
+		// Unconvert special tags
+		//-----------------------------------------
+		
+		$html = $this->unconvert_tags($html);
+		
+		return $html;
+	}
+	
+	//===================================================
+	// Convert special tags into HTML safe versions
+	//===================================================
+	
+	function convert_tags($t="")
+	{
+		$t = preg_replace( "/{?\\\$ibforums->base_url}?/"             , "{ipb.script_url}" , $t );
+		$t = preg_replace( "/{?\\\$ibforums->session_id}?/"           , "{ipb.session_id}" , $t );
+		$t = preg_replace( "#\\\$ibforums->(member|vars|skin|lang)#i" , "ipb.\\1"          , $t );
+		
+		//-----------------------------------------
+		// Make some tags safe..
+		//-----------------------------------------
+		
+		$t = preg_replace( "/\{ipb\.vars\[(['\"])?(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)(['\"])?\]\}/", "" , $t );
+				
+		return $t;
+	}
+	
+	//===================================================
+	// Uncovert them back again
+	//===================================================
+	
+	function unconvert_tags($t="")
+	{
+		//-----------------------------------------
+		// Make some tags safe..
+		//-----------------------------------------
+		
+		$t = preg_replace( "/\{ipb\.vars\[(['\"])?(sql_driver|sql_host|sql_database|sql_pass|sql_user|sql_port|sql_tbl_prefix|smtp_host|smtp_port|smtp_user|smtp_pass|html_dir|base_dir|upload_dir)(['\"])?\]\}/", "" , $t );
+		
+		$t = preg_replace( "/{ipb\.script_url}/i"           , '{$ibforums->base_url}'  , $t);
+		$t = preg_replace( "/{ipb\.session_id}/i"           , '{$ibforums->session_id}', $t);
+		$t = preg_replace( "#ipb\.(member|vars|skin|lang)#i", '$ibforums->\\1'         , $t );
+		
+		return $t;
+	}
+	
+	//===================================================
+	// Wrap HTML into PHP
+	//===================================================
+	
+	function _wrap_in_php( $html, $after="", $before="" )
+	{
+		$html = $this->_trim_newlines($this->_trim_slashes($html));
+		
+		$before = $this->_trim_slashes($before);
+		$after  = $this->_trim_slashes($after);
+		
+		if ( strlen($html) < 1 )
+		{
+			return $before.$html.$after;
+		}
+			
+		return $before."\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n".$after;
+	}
+	
+	
+	//===================================================
+	// Convert: HTML Logic to PHP logic
+	//===================================================
+	
+	function _convert_html_to_php($html)
+	{
+		$html = $this->_trim_slashes($html);
+		$html = preg_replace( "#\s+?<if=[\"'](.+?)[\"']>(.+?)</if>#ise", "\$this->_statement_if('\\1', '\\2')", $html );
+		$html = preg_replace( "#\s+?<else if=[\"'](.+?)[\"']>(.+?)</if>#ise", '$this->_statement_elseif("\\1", "\\2")', $html );
+		$html = preg_replace( "#\s+?<else>(.+?)</else>#ise", '$this->_statement_else("\\1")', $html );
+		
+		return $html;
+	}
+	
+	//===================================================
+	// Convert: PHP logic to HTML logic
+	//===================================================
+	
+	function _convert_php_to_html($php)
+	{
+		$php = preg_replace( "#else if\s+?\((.+?)\)\s+?{(.+?)}//endif\n?#ise", "\$this->_reverse_if('\\1', '\\2', 'else if')", $php );
+		$php = preg_replace( "#if\s+?\((.+?)\)\s+?{(.+?)}//endif\n?#ise", "\$this->_reverse_if('\\1', '\\2', 'if')", $php );
+		$php = preg_replace( "#else\s+?{(.+?)}//endelse\n?#ise", "\$this->_reverse_else( '\\1' )", $php );
+		
+		//-----------------------------------------
+		// Parse raw sections
+		//-----------------------------------------
+		
+		$php = $this->_reverse_ipbhtml($php);
+		
+		//-----------------------------------------
+		// Convert ipb-htmllogic tags
+		//-----------------------------------------
+		
+		$php = preg_replace( "#//start-htmllogic#i" , "<ipb-htmllogic>", $php );
+		$php = preg_replace( "#//end-htmllogic#i", "</ipb-htmllogic>"  , $php );
+		
+		//-----------------------------------------
+		// Remove extra spaces
+		//-----------------------------------------
+		
+		$php = preg_replace( "#(</if>|</else>)\s+?(<if|<else|</ipb-htmllogic>)#is", "\\1\n\\2", $php );
+		
+		//-----------------------------------------
+		// Make safe special $Ibforums vars
+		//-----------------------------------------
+		
+		$php = $this->convert_tags($php);
+		
+		return $php;
+	}
+	
+	//===================================================
+	// Reverse: PHP IF to HTML IF
+	//===================================================
+	
+	function _reverse_if( $code, $php, $start='if' )
+	{
+		$code = $this->_trim_slashes(trim($code));
+		$code = preg_replace( "/(^|and|or)(\s+)(.+?)(\s|$)/ise", "\$this->_reverse_prep_left('\\3', '\\1', '\\2', '\\4')", ' '.$code );
+		
+		$php = $this->_reverse_ipbhtml($php);
+		
+		return "<".$start."=\"".trim($code)."\">\n".$php."\n</if>\n";
+	
+	}
+	
+	//===================================================
+	// Reverse: PHP else to HTML else
+	//===================================================
+	
+	function _reverse_else( $php )
+	{
+		$php = $this->_trim_slashes(trim($php));
+		
+		$php = $this->_reverse_ipbhtml($php);
+		
+		return "<else>\n".$php."\n</else>\n";
+	
+	}
+	
+	//===================================================
+	// Reverse: $IPBHTML to normal $HTML
+	//===================================================
+	
+	function _reverse_ipbhtml( $code )
+	{
+		$code = $this->_trim_slashes($code);
+		
+		$code = preg_replace("/".'\$'."IPBHTML\s+?\.?=\s+?<<<EOF(.+?)EOF;\s?/si", "\\1", $code );
+		
+		$code = trim($code);
+		$code = $this->_trim_newlines($code);
+		
+		return $code;
+	}
+	
+	//===================================================
+	// Reverse PHP IF code to HTML code
+	//===================================================
+	
+	function _reverse_prep_left($left, $andor="", $fs="", $ls="")
+	{
+		$left = trim($this->_trim_slashes($left));
+		
+		if ( preg_match( "/".'\$'."ibforums->/", $left ) )
+		{
+			$left = preg_replace( "/".'\$'."ibforums->(.+?)$/", 'ipb.'."\\1", $left );
+		}
+		else
+		{
+			$left = str_replace( '$', '', $left );
+		}
+		
+		return $andor.$fs.$left.$ls;
+	}
+
+	//===================================================
+	// Statement: Return PHP 'IF' statement
+	//===================================================
+	
+	function _statement_if( $code, $html )
+	{
+		$html = $this->_func_prep_html($html);
+		$code = $this->_func_prep_if($code);
+		
+		return "\nif ( $code )\n{\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n}//endif\n";
+	}
+	
+	//===================================================
+	// Statement: Return PHP 'ELSE IF' statement
+	//===================================================
+	
+	function _statement_elseif( $code, $html )
+	{
+		$html = $this->_func_prep_html($html);
+		$code = $this->_func_prep_if($code);
+		
+		return "\nelse if ( $code )\n{\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n}//endif\n";
+	}
+	
+	//===================================================
+	// Statement: Return PHP 'ELSE' statement
+	//===================================================
+	
+	function _statement_else( $html )
+	{
+		$html = $this->_func_prep_html($html);
+		
+		return "\nelse\n{\n\$IPBHTML .= <<<EOF\n$html\nEOF;\n}//endelse\n";
+	}
+	
+	
+	//===================================================
+	// Strip leading newlines, etc
+	//===================================================
+	
+	function _func_prep_html($html)
+	{
+		$html = trim($this->_trim_slashes($html));
+		
+		//$html = preg_replace( '/"/', '\\"', $html );
+		
+		return $html;
+	}
+	
+	//===================================================
+	// Sort out left bit of comparison
+	//===================================================
+	
+	function _func_prep_left($left, $andor="", $fs="", $ls="")
+	{
+		$left = trim($this->_trim_slashes($left));
+		
+		if ( preg_match( "/^ipb\./", $left ) )
+		{
+			$left = preg_replace( "/^ipb\.(.+?)$/", '$ibforums->'."\\1", $left );
+		}
+		else
+		{
+			$left = '$'.$left;
+		}
+		
+		return $andor.$fs.$left.$ls;
+	}
+	
+	//===================================================
+	// Statement: Prep AND OR, etc
+	//===================================================
+	
+	function _func_prep_if( $code )
+	{
+		$code = preg_replace( "/(^|and|or)(\s+)(.+?)(\s|$)/ise", "\$this->_func_prep_left('\\3', '\\1', '\\2', '\\4')", ' '.$code );
+		
+		return trim($code);
+	}
+	
+	//===================================================
+	// Remove leading and trailing newlines
+	//===================================================
+	
+	function _trim_newlines($code)
+	{
+		$code = preg_replace("/^\n{1,}/s", "", $code );
+		$code = preg_replace("/\n{1,}$/s", "", $code );
+		return $code;
+	}
+	
+	//===================================================
+	// Remove preg_replace/e slashes
+	//===================================================
+	
+	function _trim_slashes($code)
+	{
+		$code = str_replace( '\"' , '"', $code );
+		$code = str_replace( "\\'", "'", $code );
+		return $code;
+	}
+
+	
+}
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/topic_linear.php b/upload/sources/lib/topic_linear.php
new file mode 100644
index 00000000..537d7c6d
--- /dev/null
+++ b/upload/sources/lib/topic_linear.php
@@ -0,0 +1,418 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Topic display module
+|   > Module written by Matt Mecham
+|   > Date started: 18th February 2002
+|
+|	> Module Version Number: 1.1.0
+|   > DBA Checked: Fri 21 May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class topic_display {
+
+    var $output    = "";
+    var $base_url  = "";
+    var $html      = "";
+    var $moderator = array();
+    var $forum     = array();
+    var $topic     = array();
+    var $mem_titles = array();
+    var $mod_action = array();
+    var $poll_html  = "";
+    var $parser     = "";
+    var $mimetypes  = "";
+    var $nav_extra  = "";
+    var $read_array = array();
+    var $mod_panel_html = "";
+    var $warn_range = 0;
+    var $warn_done  = 0;
+    var $pfields    = array();
+    var $pfields_dd = array();
+    var $md5_check  = "";
+    var $post_count  = 0;
+    var $cached_members = array();
+    var $first_printed  = 0;
+    var $pids           = array();
+    
+    /*-------------------------------------------------------------------------*/
+	// Register class
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class($class="")
+	{
+		$this->lib = &$class;
+		
+		$this->topic = $this->lib->topic;
+        $this->forum = $this->lib->forum;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	//
+	// Our constructor, load words, load skin, print the topic listing
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function auto_run()
+    {
+		global $ibforums, $forums, $DB, $std, $print, $skin_universal;
+        
+        require_once( ROOT_PATH.'sources/topics.php' );
+        
+        $this->lib = new topics();
+        
+        $this->lib->init();
+        $this->lib->topic_set_up();
+        
+        $this->topic = &$this->lib->topic;
+        $this->forum = &$this->lib->forum;
+        
+        //-----------------------------------------
+        // Checky checky
+        //-----------------------------------------
+        
+        if ( ! $this->topic['topic_firstpost'] )
+        {
+        	$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid'].'&amp;mode=standard');
+        }
+        
+        //-----------------------------------------
+		// Print it
+		//-----------------------------------------
+		
+		$this->output = str_replace( "<!--IBF.MOD_PANEL-->", $this->lib->moderation_panel(), $this->output );
+		
+		// Enable quick reply box?
+		
+		if (   ( $this->topic['quick_reply'] == 1 )
+		   and ( $std->check_perms( $this->topic['reply_perms']) == TRUE )
+		   and ( $this->topic['state'] != 'closed' ) )
+		{
+			$show = "none";
+			
+			$sqr = $std->my_getcookie("open_qr");
+			
+			if ( $sqr == 1 )
+			{
+				$show = "show";
+			}
+			$this->output = str_replace( "<!--IBF.QUICK_REPLY_CLOSED-->", $this->lib->html->quick_reply_box_closed(), $this->output );
+			$this->output = str_replace( "<!--IBF.QUICK_REPLY_OPEN-->"  , $this->lib->html->quick_reply_box_open($this->topic['forum_id'], $this->topic['tid'], $show, $this->md5_check), $this->output );
+		}
+		
+		$this->output = str_replace( "<!--IBF.TOPIC_OPTIONS_CLOSED-->", $this->lib->html->topic_opts_closed(), $this->output );
+		$this->output = str_replace( "<!--IBF.TOPIC_OPTIONS_OPEN-->"  , $this->lib->html->topic_opts_open($this->topic['forum_id'], $this->topic['tid']), $this->output );
+		
+		$this->topic['id'] = $this->topic['forum_id'];
+		
+		$this->output = str_replace( "<!--IBF.FORUM_RULES-->", $std->print_forum_rules($this->topic), $this->output );
+		
+		//-----------------------------------------
+		// Topic multi-moderation - yay!
+		//-----------------------------------------
+		
+		$this->output = str_replace( "<!--IBF.MULTIMOD-->", $this->lib->multi_moderation(), $this->output );
+		
+		// Pass it to our print routine
+		
+		$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> {$this->topic['title']}",
+        					 	  'JS'       => 1,
+        					 	  'NAV'      => $this->lib->nav,
+        				 )      );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Show the damned topic batman
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function display_topic()
+    {
+		global $ibforums, $forums, $DB, $std, $print;
+        
+		//-----------------------------------------
+		// Grab the posts we'll need
+		//-----------------------------------------
+		
+		$first = intval($ibforums->input['st']);
+		
+		$query_type = 'topics_get_posts';
+		
+		if ( $ibforums->vars['post_order_column'] != 'post_date' )
+		{
+			$ibforums->vars['post_order_column'] = 'pid';
+		}
+		
+		if ( $ibforums->vars['post_order_sort'] != 'desc' )
+		{
+			$ibforums->vars['post_order_sort'] = 'asc';
+		}
+		
+		if ($ibforums->vars['au_cutoff'] == "")
+		{
+			$ibforums->vars['au_cutoff'] = 15;
+		}
+		
+		if ( $ibforums->vars['custom_profile_topic'] == 1 )
+		{
+			$query_type = 'topics_get_posts_with_join';
+		}
+		
+		//-----------------------------------------
+		// Moderator?
+		//-----------------------------------------
+		
+		$queued_query_bit = ' and queued=0';
+			
+		if ( $std->can_queue_posts($this->topic['forum_id']) )
+		{
+			$queued_query_bit = '';
+			
+			if ( $ibforums->input['modfilter'] == 'invisible_posts' )
+			{
+				$queued_query_bit = ' and queued=1';
+			}
+		}
+			
+		//-----------------------------------------
+		// Using "new" mode?
+		//-----------------------------------------
+		
+		if ( $this->lib->topic_view_mode == 'linearplus' and $this->topic['topic_firstpost'] )
+		{
+			$this->topic['new_mode_start'] = $first + 1;
+			
+			if ( $first )
+			{
+				$this->topic['new_mode_start']--;
+			}
+			
+			if ( $first + $ibforums->vars['display_max_posts'] > ( $this->topic['posts'] + 1 ) )
+			{
+				$this->topic['new_mode_end'] = $this->topic['posts'];
+			}
+			else
+			{
+				$this->topic['new_mode_end'] = $first + ($ibforums->vars['display_max_posts'] - 1);
+			}
+		
+			if ( $first )
+			{
+				$this->pids = array( 0 => $this->topic['topic_firstpost'] );
+			}
+			
+			//-----------------------------------------
+			// Get PIDS of this page/topic
+			//-----------------------------------------
+			
+			$DB->simple_construct( array (
+										   'select' => 'pid',
+										   'from'   => 'posts',
+										   'where'  => 'topic_id='.$this->topic['tid']. $queued_query_bit,
+										   'order'  => 'pid',
+										   'limit'  => array( $first, $ibforums->vars['display_max_posts'] )
+								)        );
+								
+			$DB->simple_exec();
+			
+			while( $p = $DB->fetch_row() )
+			{
+				$this->pids[] = $p['pid'];
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Run query
+			//-----------------------------------------
+			
+			$this->lib->topic_view_mode = 'linear';
+			
+			$DB->simple_construct( array (
+										   'select' => 'pid',
+										   'from'   => 'posts',
+										   'where'  => 'topic_id='.$this->topic['tid']. $queued_query_bit,
+										   'order'  => $ibforums->vars['post_order_column'].' '.$ibforums->vars['post_order_sort'],
+										   'limit'  => array( $first, $ibforums->vars['display_max_posts'] )
+								)        );
+								
+			$DB->simple_exec();
+			
+			while( $p = $DB->fetch_row() )
+			{
+				$this->pids[] = $p['pid'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Do we have any PIDS?
+		//-----------------------------------------
+		
+		if ( ! count( $this->pids ) )
+		{
+			if ( $first )
+			{
+				//-----------------------------------------
+				// Add dummy PID, AUTO FIX
+				// will catch this below...
+				//-----------------------------------------
+				
+				$this->pids[] = 0;
+			}
+			
+			if ( $ibforums->input['modfilter'] == 'invisible_posts' )
+			{
+				$this->pids[] = 0;
+			}
+		}
+		
+		//-----------------------------------------
+		// Attachment PIDS
+		//-----------------------------------------
+		
+		$this->lib->attach_pids = $this->pids;
+		
+		//-----------------------------------------
+		// Fail safe
+		//-----------------------------------------
+		
+		if ( ! is_array( $this->pids ) or ! count( $this->pids ) )
+		{
+			$this->pids = array( 0 => 0 );
+		}
+		
+		//-----------------------------------------
+		// Get posts
+		//-----------------------------------------
+		
+		$DB->cache_add_query( $query_type, array( 'pids' => $this->pids, 'scol' => $ibforums->vars['post_order_column'], 'sord' => $ibforums->vars['post_order_sort'] ) );
+										 					 
+		$oq = $DB->simple_exec();
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			if ($first >= $ibforums->vars['display_max_posts'])
+			{
+				//-----------------------------------------
+				// AUTO FIX: Get the correct number of replies...
+				//-----------------------------------------
+				
+				$DB->simple_construct( array(
+											 'select' => 'COUNT(*) as pcount',
+											 'from'   => 'posts',
+											 'where'  => "topic_id=".$this->topic['tid']." and queued !=1"
+									 )      );
+								 
+				$newq   = $DB->simple_exec();
+				
+				$pcount = $DB->fetch_row($newq);
+				
+				$pcount['pcount'] = $pcount['pcount'] > 0 ? $pcount['pcount'] - 1 : 0;
+				
+				//-----------------------------------------
+				// Update the post table...
+				//-----------------------------------------
+				
+				if ($pcount['pcount'] > 1)
+				{
+					$DB->simple_construct( array(
+											 'update' => 'topics',
+											 'set'    => "posts=".$pcount['pcount'],
+											 'where'  => "tid=".$this->topic['tid']
+									 )      );
+								 
+					$DB->simple_exec();
+					
+				}
+				
+				$std->boink_it($ibforums->base_url."act=ST&f={$this->forum['id']}&t={$this->topic['tid']}&view=getlastpost");
+			}
+		}
+		
+		//-----------------------------------------
+		// Render the page top
+		//-----------------------------------------
+		
+		if ( $this->lib->topic_view_mode == 'linearplus' and $this->topic['posts'] > 0 )
+		{
+			$this->output .= $this->lib->html->topic_page_top_new_mode( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
+		}
+		else
+		{
+			$this->output .= $this->lib->html->topic_page_top_classic( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
+		}
+		
+		//-----------------------------------------
+		// Format and print out the topic list
+		//-----------------------------------------
+		
+		while ( $row = $DB->fetch_row( $oq ) )
+		{
+			$return = $this->lib->parse_row( $row );
+			
+			$poster = $return['poster'];
+			$row    = $return['row'];
+			
+			//-----------------------------------------
+			// Are we giving this bloke a good ignoring?
+			//-----------------------------------------
+			
+			if ( $ibforums->member['ignored_users'] )
+			{
+				if ( strstr( $ibforums->member['ignored_users'], ','.$poster['id'].',' ) and $ibforums->input['p'] != $row['pid'] )
+				{
+					if ( ! strstr( $ibforums->vars['cannot_ignore_groups'], ','.$poster['mgroup'].',' ) )
+					{
+						$this->output .= $this->lib->html->render_row_hidden( $row, $poster );
+						continue;
+					}
+				}
+			}
+			
+			$this->output .= $this->lib->html->RenderRow( $row, $poster );
+			
+			//-----------------------------------------
+			// Show end first post
+			//-----------------------------------------
+			
+			if ( $this->lib->topic_view_mode == 'linearplus' and $this->first_printed == 0 and $row['pid'] == $this->topic['topic_firstpost'] and $this->topic['posts'] > 0)
+			{
+				$this->output .= $this->lib->html->topic_end_first_post( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
+			}
+				
+		}
+		
+		//-----------------------------------------
+		// Print the footer
+		//-----------------------------------------
+		
+		$this->output .= $this->lib->html->TableFooter( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ), 0, $std->return_md5_check() );
+				        
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/topic_threaded.php b/upload/sources/lib/topic_threaded.php
new file mode 100644
index 00000000..b59aa342
--- /dev/null
+++ b/upload/sources/lib/topic_threaded.php
@@ -0,0 +1,508 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Topic Outline Display Module wodule wookie, nookie shut up
+|   > Module written by Matt Mecham
+|   > Date started: 1st December 2003 (Pinch and a punch!)
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Fri 21 May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class topic_display {
+
+    var $output         = "";
+    var $html           = "";
+    var $forum          = array();
+    var $topic          = array();
+    var $mem_titles     = array();
+    var $mod_action     = array();
+    var $poll_html      = "";
+    var $parser         = "";
+    var $mimetypes      = "";
+    var $nav_extra      = "";
+    var $mod_panel_html = "";
+    var $warn_range     = 0;
+    var $warn_done      = 0;
+    var $pfields        = array();
+    var $pfields_dd     = array();
+    var $md5_check      = "";
+    var $post_count     = 0;
+    var $cached_members = array();
+    var $pids           = array();
+    var $lib            = "";
+    var $structured_pids = array();
+    var $post_cache      = array();
+    
+    
+	/*-------------------------------------------------------------------------*/
+	// Register class
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class($class="")
+	{
+		$this->lib = &$class;
+		
+		$this->topic = $this->lib->topic;
+        $this->forum = $this->lib->forum;
+        
+        $this->topic['SHOW_PAGES'] = "";
+    }
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Our constructor, load words, load skin, print the topic listing
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function auto_run()
+    {
+		global $ibforums, $forums, $DB, $std, $print, $skin_universal;
+        
+        //-----------------------------------------
+        // Require and init topics.php
+        //-----------------------------------------
+        
+        require_once( ROOT_PATH.'sources/topics.php' );
+        
+        $this->lib = new topics();
+        
+        $this->lib->init();
+        $this->lib->topic_set_up();
+        
+        $this->topic = &$this->lib->topic;
+        $this->forum = &$this->lib->forum;
+        
+        $this->topic['SHOW_PAGES'] = "";
+        
+        //-----------------------------------------
+        // Checky checky
+        //-----------------------------------------
+        
+        if ( ! $this->topic['topic_firstpost'] )
+        {
+        	$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid'].'&amp;mode=standard');
+        }
+        
+        $this->display_topic();
+        
+        //-----------------------------------------
+		// Print it
+		//-----------------------------------------
+		
+		$this->topic['id'] = $this->topic['forum_id'];
+		
+		$this->output = str_replace( "<!--IBF.FORUM_RULES-->", $std->print_forum_rules($this->topic), $this->output );
+		
+		// Pass it to our print routine
+		
+		$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> {$this->topic['title']}",
+        					 	  'JS'       => 1,
+        					 	  'NAV'      => $this->lib->nav,
+        				 )      );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Show the damned topic batman
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function display_topic()
+    {
+		global $ibforums, $forums, $DB, $std, $print, $skin_universal;
+        
+		//-----------------------------------------
+		// Grab the posts we'll need
+		//-----------------------------------------
+		
+		$query_type = 'topics_get_posts';
+		
+		$first = intval($ibforums->input['start']);
+		$last  = $ibforums->vars['threaded_per_page'] ? $ibforums->vars['threaded_per_page'] : 250;
+		
+		if ( $ibforums->vars['custom_profile_topic'] == 1 )
+		{
+			$query_type = 'topics_get_posts_with_join';
+		}
+		
+		//-----------------------------------------
+		// GET meh pids
+		//-----------------------------------------
+		
+		if ( $first > 0 )
+		{
+			// we're on a page, make sure init val is there
+			
+			$this->pids[0]                = $this->topic['topic_firstpost'];
+			$this->structured_pids[ 0 ][] = $this->topic['topic_firstpost'];
+		}
+		
+		$DB->simple_construct( array (
+									   'select' => 'pid, post_parent',
+									   'from'   => 'posts',
+									   'where'  => 'topic_id='.$this->topic['tid']. ' and queued != 1',
+									   'order'  => 'pid',
+									   'limit'  => array( $first, $last )
+							)        );
+							
+		$DB->simple_exec();
+		
+		while( $p = $DB->fetch_row() )
+		{
+			$this->pids[] = $p['pid'];
+			
+			// Force to be children of 'root' post
+			
+			if ( ! $p['post_parent'] and $p['pid'] != $this->topic['topic_firstpost'] )
+			{
+				$p['post_parent'] = $this->topic['topic_firstpost'];
+			}
+			
+			$this->structured_pids[ $p['post_parent'] ][] = $p['pid'];
+		}
+		
+		//-----------------------------------------
+		// Get post bodah
+		//-----------------------------------------
+		
+		if ( count( $this->pids ) )
+		{
+			$DB->simple_construct( array (
+											'select' => 'pid, post, author_id, author_name, post_date, post_title, post_parent, topic_id, icon_id',
+											'from'   => 'posts',
+											'where'  => 'pid IN('.implode(',',$this->pids).')',
+											'order'  => 'pid',
+								 )        );
+								 
+			$DB->simple_exec();
+			
+			while( $p = $DB->fetch_row() )
+			{
+				if ( ! $p['post_parent'] and $p['pid'] != $this->topic['topic_firstpost'] )
+				{
+					$p['post_parent'] = $this->topic['topic_firstpost'];
+				}
+				
+				$this->post_cache[ $p['pid'] ] = $p;
+				
+				$this->last_id = $p['pid'];
+			}
+		}
+		
+		//-----------------------------------------
+		// Force root in cache
+		//-----------------------------------------
+		
+		$this->post_cache[0] = array( 'id' => 1 );
+		
+		$this->post_cache[$this->topic['topic_firstpost']]['post_title']  = $this->topic['title'];
+		
+		//-----------------------------------------
+		// Are we viewing Posts?
+		//-----------------------------------------
+		
+		$post_id = intval($ibforums->input['pid']);
+		
+		$postid_array = array( 1 => $post_id );
+		
+		if ( $post_id and $post_id != $this->topic['topic_firstpost'] )
+		{
+			$parents = $this->post_get_parents( $post_id );
+			
+			if ( count($parents) )
+			{
+				foreach( $parents as $p => $pid )
+				{
+					if ( $pid != $this->topic['topic_firstpost'] )
+					{
+						$postid_array[] = $pid;
+					}
+				}
+			}
+		}
+		
+		if ( count($postid_array) )
+		{
+			//-----------------------------------------
+			// Get root post and children of clicked
+			//-----------------------------------------
+			
+			$this->used_post_ids = ','.implode( ",", $postid_array ).',';
+			
+			$postid_array[0] = $this->topic['topic_firstpost'];
+			
+			$DB->cache_add_query( $query_type, array( 'pids' => $postid_array, 'scol' => 'pid', 'sord' => 'asc') );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Just get root
+			//-----------------------------------------
+			
+			$DB->cache_add_query( $query_type, array( 'pids' => array( 0 => $this->topic['topic_firstpost'] ) ) );
+		}
+		
+		//-----------------------------------------
+		// Attachment PIDS
+		//-----------------------------------------
+		
+		$this->lib->attach_pids = $postid_array;
+		
+		//-----------------------------------------
+		// Render the original post
+		//-----------------------------------------
+		
+		$this->output .= $this->lib->html->topic_page_top_new_mode( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
+										 					 
+		$DB->simple_exec();
+		
+		//-----------------------------------------
+		// Format and print out the topic list
+		//-----------------------------------------
+		
+		$num_rows = $DB->get_num_rows();
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			$return = $this->lib->parse_row( $row );
+			
+			$poster = $return['poster'];
+			$row    = $return['row'];
+			
+			//-----------------------------------------
+			// Are we giving this bloke a good ignoring?
+			//-----------------------------------------
+			
+			if ( $ibforums->member['ignored_users'] )
+			{
+				if ( strstr( $ibforums->member['ignored_users'], ','.$poster['id'].',' ) and $ibforums->input['p'] != $row['pid'] )
+				{
+					if ( ! strstr( $ibforums->vars['cannot_ignore_groups'], ','.$poster['mgroup'].',' ) )
+					{
+						$this->output .= $this->lib->html->render_row_hidden( $row, $poster );
+						continue;
+					}
+				}
+			}	
+			
+			$this->output .= $this->lib->html->RenderRow( $row, $poster );
+			
+			if ( ! $this->printed and $num_rows > 1 )
+			{
+				$this->output .= $this->lib->html->topic_end_first_post( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ), 1 );
+				$this->printed = 1;
+			}
+		}
+		
+		$this->output .= $this->lib->html->topic_end_outline( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ) );
+		
+		//-----------------------------------------
+		// Sort out pagination
+		//-----------------------------------------
+		
+		$total_replies = $this->topic['posts'];
+		$show_replies  = count( $this->structured_pids) - 1;
+		
+		$this->topic['threaded_pages'] = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_replies,
+																	   'PER_PAGE'    => $last,
+																	   'CUR_ST_VAL'  => $ibforums->input['start'],
+																	   'L_SINGLE'    => "",
+																	   'BASE_URL'    => $ibforums->base_url."showtopic=".$this->topic['tid'],
+																	   'USE_ST'      => 'start'
+																	 )  );
+		
+		//-----------------------------------------
+		// START GETTING THE OUTLINE LIST
+		//-----------------------------------------
+		
+		$this->output .= $this->lib->html->toutline_start_list();
+		
+		$this->output .= $this->loop_get_children();
+		
+		$this->output .= $this->lib->html->toutline_end_list($this->topic['threaded_pages']);
+		
+		$this->output .= $this->lib->html->TableFooter( array( 'TOPIC' => $this->topic, 'FORUM' => $this->forum ), 1, $std->return_md5_check() );
+		
+	}
+	
+	//-----------------------------------------
+	// Render kiddies
+	//-----------------------------------------
+	
+	function loop_get_children($root_id=0, $html="" ,$dguide=-1)
+	{
+		global $DB, $ibforums, $std, $forums;
+		
+		$dguide++;
+		
+		if ( is_array( $this->structured_pids[ $root_id ] ) )
+		{
+			if ( count( $this->structured_pids[ $root_id ] ) )
+			{
+				$html .= $this->lib->html->toutline_start_new_parent();
+				
+				foreach( $this->structured_pids[ $root_id ] as $idx => $pid )
+				{
+					$html .= $this->render_list_row( $this->post_cache[ $pid ], $dguide );
+					
+					$html = $this->loop_get_children( $pid, $html, $dguide );
+				}
+				
+				$html .= $this->lib->html->toutline_end_new_parent();
+			}
+		}
+		
+		return $html;
+		
+	}
+	
+	//-----------------------------------------
+	// Parse row
+	//-----------------------------------------
+	
+	function render_list_row( $post, $depth=0 )
+	{
+		global $DB, $ibforums, $std, $forums;
+		
+		$post['depthguide'] = "";
+		
+		$ibforums->vars['post_showtext_notitle'] = 1;
+		
+		for( $i = 1 ; $i < $depth; $i++ )
+		{
+			$post['depthguide'] .= $this->depth_guide[ $i ];
+		}
+		
+		// Last child?
+		
+		if ( $depth > 0 )
+		{
+			$last_id = count($this->structured_pids[ $post['post_parent'] ]) - 1;
+			
+			if ( $this->structured_pids[ $post['post_parent'] ][$last_id] == $post['pid'] )
+			{
+				$this->depth_guide[ $depth ] = '<img src="style_images/<#IMG_DIR#>/spacer.gif" width="20" height="16">';
+				$post['depthguide'] .= '<img src="style_images/<#IMG_DIR#>/to_post_no_children.gif" />';
+			}
+			else
+			{
+				$this->depth_guide[ $depth ] = '<img src="style_images/<#IMG_DIR#>/to_down_pipe.gif">';
+				$post['depthguide'] .= '<img src="style_images/<#IMG_DIR#>/to_post_with_children.gif" />';
+			}
+		}
+		
+		if ( ! $post['post_title'] )
+		{
+			if ( $ibforums->vars['post_showtext_notitle'] )
+			{
+				$post_text = $this->lib->parser->strip_all_tags( $post['post'] );
+				
+				if ( strlen($post_text) > 50 )
+				{
+					$post['post_title'] = substr( $post_text, 0, 50 ).'...';
+					$post['post_title'] = preg_replace( "/&#?(\w+)?;?\.\.\.$/", '...', $post['post_title'] );
+				}
+				else
+				{
+					$post['post_title'] = $post_text;
+				}
+				
+				if ( ! trim($post['post_title']) )
+				{
+					$post['post_title'] = 'RE: '.$this->topic['title'];
+				}
+			}
+			else
+			{
+				$post['post_title'] = 'RE: '.$this->topic['title'];
+			}
+		}
+		
+		
+		$post['linked_name'] = $std->make_profile_link( $post['author_name'], $post['author_id'] );
+		
+		$post['formatted_date'] = $std->get_date( $post['post_date'], 'LONG' );
+		
+		$post['new_post'] = '<img src="style_images/<#IMG_DIR#>/to_post_off.gif" />';
+		
+		if ( $post['post_date'] > $this->lib->last_read_tid )
+		{
+			$post['new_post'] = '<img src="style_images/<#IMG_DIR#>/to_post.gif" />';
+		}
+		
+		//$post['post_debug'] = "{ID: {$post['pid']}} Last Array Index: $last_id - Last id in tree{$this->structured_pids[ $post['post_parent'] ][$last_id]}, DEPTH: $depth, [parent: {$post['post_parent']}]";
+		
+		if ( strstr( $this->used_post_ids, ','.$post['pid'].',' ) )
+		{
+			return $this->lib->html->toutline_show_row_highlight( $post );
+		}
+		else
+		{
+			return $this->lib->html->toutline_show_row( $post );
+		}
+		
+	}
+	
+	//-----------------------------------------
+	// Get parents
+	//-----------------------------------------
+	
+	function post_get_parents($root_id, $ids=array())
+	{
+		if ( $this->post_cache[ $root_id ]['post_parent'] )
+		{
+			$ids[] = $this->post_cache[ $root_id ]['post_parent'];
+			
+			$ids = $this->post_get_parents( $this->post_cache[ $root_id ]['post_parent'], $ids );
+		}
+		
+		return $ids;
+	}
+	
+	//-----------------------------------------
+	// Get children
+	//-----------------------------------------
+	
+	function post_get_children($root_id, $ids=array())
+	{
+		if ( is_array($this->structured_pids[ $root_id ]) )
+		{
+			foreach( $this->structured_pids[ $root_id ] as $id => $pid )
+			{
+				$ids[] = $pid;
+				
+				$ids = $this->post_get_children( $pdaid, $ids );
+			}
+		}
+		
+		return $ids;
+	}
+	
+	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/lib/usercp_functions.php b/upload/sources/lib/usercp_functions.php
index 341b514e..2c15037e 100644
--- a/upload/sources/lib/usercp_functions.php
+++ b/upload/sources/lib/usercp_functions.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,6 +19,7 @@
 |   > Date started: 20th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Fri 21 May 2004
 +--------------------------------------------------------------------------
 */
 
@@ -27,69 +27,241 @@
 class usercp_functions {
 
 	var $class;
+	var $image;
 	
-	function usercp_functions($class) {
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function usercp_functions($class)
+	{
+		$this->class = &$class;
 		
-		$this->class = $class;
+		require_once( KERNEL_PATH.'class_image.php' );
+		$this->image = new class_image();
 	}
 	
-	//----------------------------------------------------------------------
-	//
+	/*-------------------------------------------------------------------------*/
+	// HANDLE SUBSCRIPTION START
+	/*-------------------------------------------------------------------------*/
+	
+	function subs_choose($save="")
+	{
+		global $ibforums, $DB, $std, $print, $forums;
+		
+		//-----------------------------------------
+		// Topic - forum - what?
+		//-----------------------------------------
+		
+		$method = $ibforums->input['method'] == 'forum' ? 'forum' : 'topic';
+		$tid    = intval($ibforums->input['tid']);
+		$fid    = intval($ibforums->input['fid']);
+		
+		if ( $method == 'topic' )
+		{
+			//-----------------------------------------
+			// Get the details from the DB (TOPIC)
+			//-----------------------------------------
+		
+			$topic = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.$tid ) );
+			
+			if ( ! $topic['tid'] )
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+			}
+			
+			$forum = $forums->forum_by_id[ $topic['forum_id'] ];
+		}
+		else
+		{
+			//-----------------------------------------
+			// Get the details (FORUM)
+			//-----------------------------------------
+		
+			$forum = $forums->forum_by_id[ $fid ];
+		}
+		
+		//-----------------------------------------
+		// Permy check
+		//-----------------------------------------
+		
+		if ( $std->check_perms( $forums->forum_by_id[ $forum['id'] ]['read_perms'] ) != TRUE )
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+		}
+		
+		//-----------------------------------------
+		// Passy check
+		//-----------------------------------------
+		
+		if ( $forum['password'] != "" )
+		{
+			if ( $forums->forums_compare_password( $forum['id'] ) != TRUE )
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'forum_no_access') );
+			}
+		}
+		
+		//-----------------------------------------
+		// Have we already subscribed?
+		//-----------------------------------------
+		
+		if ( $method == 'forum' )
+		{
+			$tmp = $DB->simple_exec_query( array( 'select' => 'frid as tmpid',
+												  'from'   => 'forum_tracker',
+												  'where'  => "forum_id={$fid} AND member_id=".$ibforums->member['id'] ) );
+		}
+		else
+		{
+			$tmp = $DB->simple_exec_query( array( 'select' => 'trid as tmpid',
+												  'from'   => 'tracker',
+												  'where'  => "topic_id={$tid} AND member_id=".$ibforums->member['id'] ) );
+		}
+		
+		if ( $tmp['tmpid'] )
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'already_sub') );
+		}
+		
+		//-----------------------------------------
+		// What to do...
+		//-----------------------------------------
+		
+		if ( ! $save )
+		{
+			//-----------------------------------------
+			// Okay, lets do the HTML
+			//-----------------------------------------
+			
+			$this->class->output .= $this->class->html->subs_show_choice_page( $forum, $topic, $method, $this->class->md5_check );
+		}
+		else
+		{
+			//-----------------------------------------
+			// Method..
+			//-----------------------------------------
+			
+			switch ($ibforums->input['emailtype'])
+			{
+				case 'immediate':
+					$this->method = 'immediate';
+					break;
+				case 'delayed':
+					$this->method = 'delayed';
+					break;
+				case 'none':
+					$this->method = 'none';
+					break;
+				case 'daily':
+					$this->method = 'daily';
+					break;
+				case 'weekly':
+					$this->method = 'weekly';
+					break;
+				default:
+					$this->method = 'delayed';
+					break;
+			}
+        
+			//-----------------------------------------
+			// Add it to the DB
+			//-----------------------------------------
+			
+			if ( $method == 'forum' )
+			{
+			
+				$DB->do_insert( 'forum_tracker', array (
+														 'member_id'        => $ibforums->member['id'],
+														 'forum_id'         => $fid,
+														 'start_date'       => time(),
+														 'forum_track_type' => $this->method,
+											  )       );
+														  
+				$print->redirect_screen( $ibforums->lang['sub_added'], "showforum=$fid" );	
+			
+			}
+			else
+			{
+				$DB->do_insert( 'tracker',  array (
+												   'member_id'        => $ibforums->member['id'],
+												   'topic_id'         => $tid,
+												   'start_date'       => time(),
+												   'topic_track_type' => $this->method,
+										)       );
+										
+				$print->redirect_screen( $ibforums->lang['sub_added'], "showtopic=$tid&st={$ibforums->input['st']}" );
+	
+			}
+		}
+		
+		$this->class->page_title = $ibforums->lang['t_welcome'];
+ 		$this->class->nav        = array( "<a href='".$ibforums->base_url."act=usercp&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
 	// HANDLE PHOTO OP'S
-	//
-	//----------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	
 	function do_photo()
 	{
-		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS, $HTTP_POST_FILES;
+		global $ibforums, $DB, $std, $print;
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Did we press "remove"?
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ( $ibforums->input['remove'] )
 		{
 			$this->bash_uploaded_photos($ibforums->member['id']);
 			
-			$DB->query("SELECT id FROM ibf_member_extra WHERE id={$ibforums->member['id']}");
+			$DB->simple_construct( array( 'select' => 'id', 'from' => 'member_extra', 'where' => "id=".$ibforums->member['id'] ) );
+			$DB->simple_exec();
 		
 			if ( $DB->get_num_rows() )
 			{
-				$DB->query("UPDATE ibf_member_extra SET photo_location='', photo_type='', photo_dimensions='' WHERE id={$ibforums->member['id']}");
+				$DB->do_update( 'member_extra', array( 'photo_location'   => '',
+													   'photo_type'       => '',
+													   'photo_dimensions' => '',
+													 ), 'id='.$ibforums->member['id'] );
 			}
 			else
 			{
-				$DB->query("INSERT INTO ibf_member_extra SET photo_location='', photo_type='', photo_dimensions='', id={$ibforums->member['id']}");
+				$DB->do_insert( 'member_extra', array( 'photo_location'   => '',
+													   'photo_type'       => '',
+													   'photo_dimensions' => '',
+													   'id'               => $ibforums->member['id']
+													 )  );
 			}
 			
 			$print->redirect_screen( $ibforums->lang['photo_c_up'], "act=UserCP&CODE=photo" );
-			
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// NO? CARRY ON!!
-		//------------------------------------
+		//-----------------------------------------
 		
 		list($p_max, $p_width, $p_height) = explode( ":", $ibforums->member['g_photo_max_vars'] );
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// Check to make sure we don't just have
 		// http:// in the URL box..
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ( preg_match( "/^http:\/\/$/i", $ibforums->input['url_photo'] ) )
 		{
@@ -98,105 +270,132 @@ class usercp_functions {
 	
 		if ( empty($ibforums->input['url_photo']) )
 		{
-			//------------------------------------
+			//-----------------------------------------
 			// Lets check for an uploaded photo..
-			//------------------------------------
+			//-----------------------------------------
 		
-			if ($HTTP_POST_FILES['upload_photo']['name'] != "" and ($HTTP_POST_FILES['upload_photo']['name'] != "none") )
+			if ($_FILES['upload_photo']['name'] != "" and ($_FILES['upload_photo']['name'] != "none") )
 			{
-				$FILE_NAME = $HTTP_POST_FILES['upload_photo']['name'];
-				$FILE_SIZE = $HTTP_POST_FILES['upload_photo']['size'];
-				$FILE_TYPE = $HTTP_POST_FILES['upload_photo']['type'];
-				
-				if ($HTTP_POST_FILES['upload_photo']['name'] == "")
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_name' ) );
-				}
-	
-				// Naughty Opera adds the filename on the end of the
-				// mime type - we don't want this.
-				
-				$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-				
-				//------------------------------------
-				// Are we allowed to upload a photo?
-				//------------------------------------
-				
+				//-----------------------------------------
+				// Are we allowed to upload this avatar?
+				//-----------------------------------------
+					
 				if ( $p_max < 0 )
 				{
 					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_upload' ) );
 				}
 				
-				//-------------------------------------------------
-				// Check the file size
-				//-------------------------------------------------
-				
-				if ($FILE_SIZE > ($p_max * 1024))
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_to_big' ) );
-				}
-				
-				$ext = '.gif';
-	
-				switch($FILE_TYPE)
-				{
-					case 'image/gif':
-						$ext = '.gif';
-						break;
-					case 'image/jpeg':
-						$ext = '.jpg';
-						break;
-					case 'image/pjpeg':
-						$ext = '.jpg';
-						break;
-					case 'image/x-png':
-						$ext = '.png';
-						break;
-					case 'image/png':
-						$ext = '.png';
-						break;
-					default:
-						$ext = '.gif';
-						break;
-				}
-
-				$real_name = 'photo-'.$ibforums->member['id'].$ext;
-				
-				//-------------------------------------------------
-				// Remove any uploaded images..
-				//-------------------------------------------------
+				//-----------------------------------------
+				// Remove any uploaded photos...
+				//-----------------------------------------
 				
 				$this->bash_uploaded_photos($ibforums->member['id']);
 				
-				//-------------------------------------------------
-				// Copy the upload to the uploads directory
-				//-------------------------------------------------
+				$real_name = 'photo-'.$ibforums->member['id'];
+				$real_type = 'upload';
 				
-				if (! @move_uploaded_file( $HTTP_POST_FILES['upload_photo']['tmp_name'], $ibforums->vars['upload_dir']."/".$real_name) )
+				//-----------------------------------------
+				// Load the library
+				//-----------------------------------------
+				
+				require_once( KERNEL_PATH.'class_upload.php' );
+				$upload = new class_upload();
+				
+				//-----------------------------------------
+				// Set up the variables
+				//-----------------------------------------
+				
+				$upload->out_file_name     = 'photo-'.$ibforums->member['id'];
+				$upload->out_file_dir      = $ibforums->vars['upload_dir'];
+				$upload->max_file_size     = ($p_max * 1024) * 8;  // Allow xtra for compression
+				$upload->upload_form_field = 'upload_photo';
+				
+				//-----------------------------------------
+				// Populate allowed extensions
+				//-----------------------------------------
+				
+				if ( is_array( $ibforums->cache['attachtypes'] ) and count( $ibforums->cache['attachtypes'] ) )
 				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_failed' ) );
-				}
-				else
-				{
-					@chmod( $ibforums->vars['upload_dir']."/".$real_name, 0777 );
+					foreach( $ibforums->cache['attachtypes'] as $idx => $data )
+					{
+						if ( $data['atype_photo'] )
+						{
+							$upload->allowed_file_ext[] = $data['atype_extension'];
+						}
+					}
 				}
 				
-				//-------------------------------------------------
+				//-----------------------------------------
+				// Upload...
+				//-----------------------------------------
+				
+				$upload->upload_process();
+				
+				//-----------------------------------------
+				// Error?
+				//-----------------------------------------
+				
+				if ( $upload->error_no )
+				{
+					switch( $upload->error_no )
+					{
+						case 1:
+							// No upload
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_failed' ) );
+						case 2:
+							// Invalid file ext
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_type' ) );
+						case 3:
+							// Too big...
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_to_big') );
+						case 4:
+							// Cannot move uploaded file
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_failed' ) );
+					}
+				}
+							
+				//-----------------------------------------
+				// Still here?
+				//-----------------------------------------
+				
+				$real_name = $upload->parsed_file_name;
+				
+				//-----------------------------------------
 				// Check image size...
-				//-------------------------------------------------
-				
-				$im = array();
+				//-----------------------------------------
 				
 				if ( ! $ibforums->vars['disable_ipbsize'] )
 				{
-					$img_size = GetImageSize( $ibforums->vars['upload_dir']."/".$real_name );
+					$this->image->in_type        = 'file';
+					$this->image->out_type       = 'file';
+					$this->image->in_file_dir    = $ibforums->vars['upload_dir'];
+					$this->image->in_file_name   = $real_name;
+					$this->image->out_file_name  = 'photos-'.$ibforums->member['id'];
+					$this->image->desired_width  = $p_width;
+					$this->image->desired_height = $p_height;
 					
-					$im = $std->scale_image( array(
-													'max_width'  => $p_width,
-													'max_height' => $p_height,
-													'cur_width'  => $img_size[0],
-													'cur_height' => $img_size[1]
-										   )      );
+					$return = $this->image->generate_thumbnail();
+		
+					$im['img_width']  = $return['thumb_width'];
+					$im['img_height'] = $return['thumb_height'];
+					
+					//-----------------------------------------
+					// Do we have an attachment?
+					//-----------------------------------------
+					
+					if ( strstr( $return['thumb_location'], 'photos-' ) )
+					{
+						//-----------------------------------------
+						// Kill old and rename new...
+						//-----------------------------------------
+						
+						@unlink( $ibforums->vars['upload_dir']."/".$real_name );
+						
+						$real_name = 'photo-'.$ibforums->member['id'].'.'.$this->image->file_extension;
+						
+						@rename( $ibforums->vars['upload_dir']."/".$return['thumb_location'], $ibforums->vars['upload_dir']."/".$real_name );
+						@chmod(  $ibforums->vars['upload_dir']."/".$real_name, 0777 );
+					}
 				}
 				else
 				{	
@@ -206,23 +405,35 @@ class usercp_functions {
 					$im['img_height'] = $h > $p_height ? $p_height : $h;
 				}
 				
+				//-----------------------------------------
+				// Check the file size (after compression)
+				//-----------------------------------------
+				
+				if ( filesize( $ibforums->vars['upload_dir']."/".$real_name ) > ( $p_max * 1024 ) )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$real_name );
+					
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_to_big' ) );
+				}
+				
 				$final_location  = $real_name;
 				$final_type      = 'upload';
 				$final_dimension = $im['img_width'].','.$im['img_height'];
 			}
 			else
 			{
+				//-----------------------------------------
 				// URL field and upload field left blank.
-		
+				//-----------------------------------------
+				
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_photo_selected' ) );
-			
 			}
 		}
 		else
 		{
-			//-------------------------------------------------
+			//-----------------------------------------
 			// It's an entered URL 'ting man
-			//-------------------------------------------------
+			//-----------------------------------------
 			
 			if ( empty($ibforums->vars['allow_dynamic_img']) )
 			{
@@ -232,11 +443,11 @@ class usercp_functions {
 				}
 			}
 			
-			//-------------------------------------------------
+			//-----------------------------------------
 			// Check extension
-			//-------------------------------------------------
+			//-----------------------------------------
 			
-			$ext = explode ( "|", $ibforums->vars['photo_ext'] );
+			$ext = explode ( ",", $ibforums->vars['photo_ext'] );
 			$checked = 0;
 			$av_ext = preg_replace( "/^.*\.(\S+)$/", "\\1", $ibforums->input['url_photo'] );
 			
@@ -253,9 +464,9 @@ class usercp_functions {
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'photo_invalid_ext' ) );
 			}
 			
-			//-------------------------------------------------
+			//-----------------------------------------
 			// Check image size...
-			//-------------------------------------------------
+			//-----------------------------------------
 			
 			$im = array();
 			
@@ -281,9 +492,9 @@ class usercp_functions {
 				$im['img_height'] = $h > $p_height ? $p_height : $h;
 			}
 			
-			//-------------------------------------------------
+			//-----------------------------------------
 			// Remove any uploaded images..
-			//-------------------------------------------------
+			//-----------------------------------------
 			
 			$this->bash_uploaded_photos($ibforums->member['id']);
 			
@@ -294,15 +505,23 @@ class usercp_functions {
 		
 		// Do we have an entry?
 		
-		$DB->query("SELECT id FROM ibf_member_extra WHERE id={$ibforums->member['id']}");
-		
+		$DB->simple_construct( array( 'select' => 'id', 'from' => 'member_extra', 'where' => "id=".$ibforums->member['id'] ) );
+		$DB->simple_exec();
+	
 		if ( $DB->get_num_rows() )
 		{
-			$DB->query("UPDATE ibf_member_extra SET photo_location='$final_location', photo_type='$final_type', photo_dimensions='$final_dimension' WHERE id={$ibforums->member['id']}");
+			$DB->do_update( 'member_extra', array( 'photo_location'   => $final_location,
+												   'photo_type'       => $final_type,
+												   'photo_dimensions' => $final_dimension,
+												 ), 'id='.$ibforums->member['id'] );
 		}
 		else
 		{
-			$DB->query("INSERT INTO ibf_member_extra SET photo_location='$final_location', photo_type='$final_type', photo_dimensions='$final_dimension', id={$ibforums->member['id']}");
+			$DB->do_insert( 'member_extra', array( 'photo_location'   => $final_location,
+												   'photo_type'       => $final_type,
+												   'photo_dimensions' => $final_dimension,
+												   'id'               => $ibforums->member['id']
+												 )  );
 		}
 		
 		$print->redirect_screen( $ibforums->lang['photo_c_up'], "act=UserCP&CODE=photo" );
@@ -310,11 +529,9 @@ class usercp_functions {
 	}
 	
 	
-	//----------------------------------------------------------------------
-	//
+	/*-------------------------------------------------------------------------*/
 	// REMOVE UPLOADED PICCIES
-	//
-	//----------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	
 	function bash_uploaded_photos($id)
 	{
@@ -342,11 +559,9 @@ class usercp_functions {
 		}
 	}
 	
-	//----------------------------------------------------------------------
-	//
+	/*-------------------------------------------------------------------------*/
 	// SAVE SKIN/LANG PREFS
-	//
-	//----------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
 	
 	function do_skin_langs()
 	{
@@ -354,33 +569,33 @@ class usercp_functions {
 		
 		// Check input for 1337 h/\x0r nonsense
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		if ( preg_match( "/\.\./", $ibforums->input['u_skin'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
-		//+----------------------------------------
+		//-----------------------------------------
 		if ( preg_match( "/\.\./", $ibforums->input['u_language'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->vars['allow_skins'] == 1)
 		{
@@ -404,56 +619,60 @@ class usercp_functions {
 													  )         );
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		
 		
-		$DB->query("UPDATE ibf_members SET $db_string WHERE id='".$this->class->member['id']."'");
+		$DB->query("UPDATE ibf_members SET $db_string WHERE id='".$ibforums->member['id']."'");
 		
 		$print->redirect_screen( $ibforums->lang['set_updated'], "act=UserCP&CODE=06" );
 	
 	}
 	
+	/*-------------------------------------------------------------------------*/
+	// Board prefs
+	/*-------------------------------------------------------------------------*/
 	
-	function do_board_prefs() {
+	function do_board_prefs()
+	{
 		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
 		
 		// Check the input for naughties :D
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
-		//+----------------------------------------
+		//-----------------------------------------
 		if ( ! preg_match( "/^[\-\d\.]+$/", $ibforums->input['u_timezone'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
-		//+----------------------------------------
+		//-----------------------------------------
 		if ( ! preg_match( "/^\d+$/", $ibforums->input['VIEW_IMG'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
-		//+----------------------------------------
+		//-----------------------------------------
 		if ( ! preg_match( "/^\d+$/", $ibforums->input['VIEW_SIGS'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
-		//+----------------------------------------
+		//-----------------------------------------
 		if ( ! preg_match( "/^\d+$/", $ibforums->input['VIEW_AVS'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
-		//+----------------------------------------
+		//-----------------------------------------
 		if ( ! preg_match( "/^\d+$/", $ibforums->input['DO_POPUP'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
@@ -469,7 +688,7 @@ class usercp_functions {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->vars['postpage_contents'] == "")
 		{
@@ -489,35 +708,23 @@ class usercp_functions {
 			$ibforums->input['postpage'] = '-1';
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		if (! preg_match( "/(^|,)".$ibforums->input['topicpage'].",/", $ibforums->vars['topicpage_contents'] ) )
 		{
 			$ibforums->input['topicpage'] = '-1';
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
-		$db_string = $DB->compile_db_update_string(  array (
-															  'time_offset'  => $ibforums->input['u_timezone'],
-															  'view_avs'     => $ibforums->input['VIEW_AVS'],
-															  'view_sigs'    => $ibforums->input['VIEW_SIGS'],
-															  'view_img'     => $ibforums->input['VIEW_IMG'],
-															  'view_pop'     => $ibforums->input['DO_POPUP'],
-															  'dst_in_use'   => $ibforums->input['DST'],
-															  'view_prefs'   => $ibforums->input['postpage']."&".$ibforums->input['topicpage'],
-												  )         );
-		
-		$DB->query("UPDATE ibf_members SET $db_string WHERE id='".$this->class->member['id']."'");
-		
-		/*if ($ibforums->input['HIDE_SESS'] == 1)
-		{
-			$std->my_setcookie('hide_sess', '1');
-		}
-		else
-		{
-			$std->my_setcookie('hide_sess', '0');
-		}*/
+		$DB->do_update( 'members',  array (  'time_offset'  => $ibforums->input['u_timezone'],
+											 'view_avs'     => $ibforums->input['VIEW_AVS'],
+											 'view_sigs'    => $ibforums->input['VIEW_SIGS'],
+											 'view_img'     => $ibforums->input['VIEW_IMG'],
+											 'view_pop'     => $ibforums->input['DO_POPUP'],
+											 'dst_in_use'   => $ibforums->input['DST'],
+											 'view_prefs'   => $ibforums->input['postpage']."&".$ibforums->input['topicpage'],
+								 ) , 'id='.$ibforums->member['id']  );
 		
 		if ($ibforums->input['OPEN_QR'] == 1)
 		{
@@ -533,25 +740,29 @@ class usercp_functions {
 	}
 	
 	
+	/*-------------------------------------------------------------------------*/
+	// Complete email settings
+	/*-------------------------------------------------------------------------*/
 	
-	function do_email_settings() {
+	function do_email_settings()
+	{
 		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		//check and set the rest of the info
 		
@@ -565,57 +776,66 @@ class usercp_functions {
 			}
 		}
 		
-		$db_string = $DB->compile_db_update_string(  array (
-															  'hide_email'         => $ibforums->input['hide_email'],
-															  'email_full'         => $ibforums->input['send_full_msg'],
-															  'email_pm'           => $ibforums->input['pm_reminder'],
-															  'allow_admin_mails'  => $ibforums->input['admin_send'],
-															  'auto_track'         => $ibforums->input['auto_track'],
-												  )         );
+		if ( $ibforums->input['auto_track'] )
+		{
+			$allowed = array( 'none', 'immediate', 'delayed', 'daily', 'weekly' );
+ 			
+ 			if ( in_array( $ibforums->input['trackchoice'], $allowed ) )
+ 			{
+ 				$ibforums->input['auto_track'] = $ibforums->input['trackchoice'];
+ 			}
+ 		}
 		
-		$DB->query("UPDATE ibf_members SET $db_string WHERE id='".$this->class->member['id']."'");
+		$DB->do_update( 'members', array ( 'hide_email'         => $ibforums->input['hide_email'],
+										   'email_full'         => $ibforums->input['send_full_msg'],
+										   'email_pm'           => $ibforums->input['pm_reminder'],
+										   'allow_admin_mails'  => $ibforums->input['admin_send'],
+										   'auto_track'         => $ibforums->input['auto_track'],
+					  )  ,'id='.$ibforums->member['id']       );
 		
 		$print->redirect_screen( $ibforums->lang['email_c_up'], "act=UserCP&CODE=02" );
 	
 	}
 	
-	//-----------------------------------------------------------------------------
+	/*-------------------------------------------------------------------------*/
+	// Set gallery avatar
+	/*-------------------------------------------------------------------------*/
 	
 	function set_internal_avatar()
 	{
 		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		$real_choice = 'noavatar';
 		$real_dims   = '';
 		$real_dir    = "";
 		$save_dir    = "";
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		// Check incoming..
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		$current_folder  = preg_replace( "/[^\s\w_-]/"             , "", urldecode($ibforums->input['current_folder']) );
 		$selected_avatar = preg_replace( "/[^\s\w\._\-\[\]\(\)]/"  , "", urldecode($ibforums->input['avatar']) );
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		// Are we in a folder?
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		if ($current_folder == 'root')
 		{
@@ -628,13 +848,13 @@ class usercp_functions {
 			$save_dir = $current_folder."/";
 		}
 		
-		//+----------------------------------------
+		//-----------------------------------------
 		// Check it out!
-		//+----------------------------------------
+		//-----------------------------------------
 		
 		$avatar_gallery = array();
 	
-		$dh = opendir( $ibforums->vars['html_dir'].'avatars'.$real_dir );
+		$dh = opendir( CACHE_PATH.'style_avatars'.$real_dir );
 		
 		while ( $file = readdir( $dh ) )
 		{
@@ -654,58 +874,81 @@ class usercp_functions {
 		
 		// Update the DB
 		
-		$DB->query("UPDATE ibf_members SET avatar='$final_string' WHERE id='".$ibforums->member['id']."'");
+		$DB->do_update( 'member_extra', array( 'avatar_location' => $final_string, 'avatar_type' => 'local' ), 'id='.$ibforums->member['id'] );
 	
 		$print->redirect_screen( $ibforums->lang['av_c_up'], "act=UserCP&CODE=24" );
 	
 	}
 	
 	
-	//-----------------------------------------------------------------------------
-	
+	/*-------------------------------------------------------------------------*/
+	// Save avatar
+	/*-------------------------------------------------------------------------*/
 	
 	function do_avatar()
 	{
-		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS, $HTTP_POST_FILES;
+		global $ibforums, $DB, $std, $print;
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		//-----------------------------------------
+		// Got attachment types?
+		//-----------------------------------------
+		
+		if ( ! is_array( $ibforums->cache['attachtypes'] ) )
+		{
+			$ibforums->cache['attachtypes'] = array();
+				
+			$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+			}
+		}
+		
+		$real_type = "";
+		
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// Did we press "remove"?
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ( $ibforums->input['remove'] )
 		{
 			$this->bash_uploaded_avatars($ibforums->member['id']);
 			
-			$DB->query("UPDATE ibf_members SET avatar='noavatar', avatar_size='' WHERE id='".$this->class->member['id']."'");
+			$DB->do_update( 'member_extra', array( 'avatar_location' => '',
+												   'avatar_size'     => '',
+												   'avatar_type'     => '',
+												 ), 'id='.$ibforums->member['id'] );
 			
 			$print->redirect_screen( $ibforums->lang['av_c_up'], "act=UserCP&CODE=24" );
 			
 		}
 		
-		//------------------------------------
+		//-----------------------------------------
 		// NO? CARRY ON!!
-		//------------------------------------
+		//-----------------------------------------
 
 		list($p_width, $p_height) = explode( "x", $ibforums->vars['avatar_dims'] );
 		
-		//-----------------------------------
+		//-----------------------------------------
 		// Check to make sure we don't just have
 		// http:// in the URL box..
-		//------------------------------------
+		//-----------------------------------------
 		
 		if ( preg_match( "/^http:\/\/$/i", $ibforums->input['url_avatar'] ) )
 		{
@@ -714,125 +957,133 @@ class usercp_functions {
 	
 		if ( empty($ibforums->input['url_avatar']) )
 		{
-			//------------------------------------
+			//-----------------------------------------
 			// Lets check for an uploaded photo..
-			//------------------------------------
+			//-----------------------------------------
 		
-			if ($HTTP_POST_FILES['upload_avatar']['name'] != "" and ($HTTP_POST_FILES['upload_avatar']['name'] != "none") )
+			if ($_FILES['upload_avatar']['name'] != "" and ($_FILES['upload_avatar']['name'] != "none") )
 			{
-			
-				$FILE_NAME = $HTTP_POST_FILES['upload_avatar']['name'];
-				$FILE_SIZE = $HTTP_POST_FILES['upload_avatar']['size'];
-				$FILE_TYPE = $HTTP_POST_FILES['upload_avatar']['type'];
-				
-				if ($HTTP_POST_FILES['upload_avatar']['name'] == "")
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_name' ) );
-				}
-				
-				//-------------------------------------------------
-				// Naughty Opera adds the filename on the end of the
-				// mime type - we don't want this.
-				//-------------------------------------------------
-				
-				$FILE_TYPE = preg_replace( "/^(.+?);.*$/", "\\1", $FILE_TYPE );
-				
-				//-------------------------------------------------
+				//-----------------------------------------
 				// Are we allowed to upload this avatar?
-				//-------------------------------------------------
+				//-----------------------------------------
 					
 				if ( ($ibforums->member['g_avatar_upload'] != 1) or ($ibforums->vars['avup_size_max'] < 1) )
 				{
 					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_upload' ) );
 				}
 				
-				// Check to make sure it's the correct content type.
-				// Naughty Nominell won't be able to use PNG :P
-				
-				require "./conf_mime_types.php";
-				
-				if ($mime_types[ $FILE_TYPE ][3] != 1)
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_type' ) );
-				}
-				   
-				//-------------------------------------------------
-				// Check the file size
-				//-------------------------------------------------
-				
-				if ($FILE_SIZE > ($ibforums->vars['avup_size_max']*1024))
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_to_big' ) );
-				}
-				
-				$ext = '.gif';
-	
-				switch($FILE_TYPE)
-				{
-					case 'image/gif':
-						$ext = '.gif';
-						break;
-					case 'image/jpeg':
-						$ext = '.jpg';
-						break;
-					case 'image/pjpeg':
-						$ext = '.jpg';
-						break;
-					case 'image/x-png':
-						$ext = '.png';
-						break;
-					case 'image/png':
-						$ext = '.png';
-						break;
-					case "application/x-shockwave-flash":
-						if ( $ibforums->vars['allow_flash'] != 1 )
-						{
-							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_flash_av' ) );
-						}
-						$ext = '.swf';
-						break;
-					default:
-						$ext = '.gif';
-						break;
-				}
-				
-				$real_name = 'av-'.$ibforums->member['id'].$ext;
-				
-				//-------------------------------------------------
+				//-----------------------------------------
 				// Remove any uploaded avatars..
-				//-------------------------------------------------
+				//-----------------------------------------
 				
 				$this->bash_uploaded_avatars($ibforums->member['id']);
 				
-				//-------------------------------------------------
-				// Copy the upload to the uploads directory
-				//-------------------------------------------------
+				$real_name = 'av-'.$ibforums->member['id'];
+				$real_type = 'upload';
 				
-				if (! @move_uploaded_file( $HTTP_POST_FILES['upload_avatar']['tmp_name'], $ibforums->vars['upload_dir']."/".$real_name) )
+				//-----------------------------------------
+				// Load the library
+				//-----------------------------------------
+				
+				require_once( KERNEL_PATH.'class_upload.php' );
+				$upload = new class_upload();
+				
+				//-----------------------------------------
+				// Set up the variables
+				//-----------------------------------------
+				
+				$upload->out_file_name     = 'av-'.$ibforums->member['id'];
+				$upload->out_file_dir      = $ibforums->vars['upload_dir'];
+				$upload->max_file_size     = ($ibforums->vars['avup_size_max'] * 1024) * 8;  // Allow xtra for compression
+				$upload->upload_form_field = 'upload_avatar';
+				
+				//-----------------------------------------
+				// Populate allowed extensions
+				//-----------------------------------------
+				
+				if ( is_array( $ibforums->cache['attachtypes'] ) and count( $ibforums->cache['attachtypes'] ) )
 				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_failed' ) );
-				}
-				else
-				{
-					@chmod( $ibforums->vars['upload_dir']."/".$real_name, 0777 );
+					foreach( $ibforums->cache['attachtypes'] as $idx => $data )
+					{
+						if ( $data['atype_photo'] )
+						{
+							$upload->allowed_file_ext[] = $data['atype_extension'];
+						}
+					}
 				}
 				
-				//-------------------------------------------------
-				// Check image size...
-				//-------------------------------------------------
+				//-----------------------------------------
+				// Upload...
+				//-----------------------------------------
 				
-				$im = array();
+				$upload->upload_process();
 				
-				if ( ! $ibforums->vars['disable_ipbsize'] )
+				//-----------------------------------------
+				// Error?
+				//-----------------------------------------
+				
+				if ( $upload->error_no )
 				{
-					$img_size = GetImageSize( $ibforums->vars['upload_dir']."/".$real_name );
+					switch( $upload->error_no )
+					{
+						case 1:
+							// No upload
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_failed' ) );
+						case 2:
+							// Invalid file ext
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_av_type' ) );
+						case 3:
+							// Too big...
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_to_big') );
+						case 4:
+							// Cannot move uploaded file
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_failed' ) );
+					}
+				}
+				
+				if ( ( $upload->file_extension == 'swf' ) AND ($ibforums->vars['allow_flash'] != 1) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_flash_av' ) );
+				}
+							
+				//-----------------------------------------
+				// Still here?
+				//-----------------------------------------
+				
+				$real_name = $upload->parsed_file_name;
+				
+				if ( ! $ibforums->vars['disable_ipbsize'] and $upload->file_extension != '.swf' )
+				{
+					$this->image->in_type        = 'file';
+					$this->image->out_type       = 'file';
+					$this->image->in_file_dir    = $ibforums->vars['upload_dir'];
+					$this->image->in_file_name   = $real_name;
+					$this->image->out_file_name  = 'avs-'.$ibforums->member['id'];
+					$this->image->desired_width  = $p_width;
+					$this->image->desired_height = $p_height;
 					
-					$im = $std->scale_image( array(
-													'max_width'  => $p_width,
-													'max_height' => $p_height,
-													'cur_width'  => $img_size[0],
-													'cur_height' => $img_size[1]
-										   )      );
+					$return = $this->image->generate_thumbnail();
+		
+					$im['img_width']  = $return['thumb_width'];
+					$im['img_height'] = $return['thumb_height'];
+					
+					//-----------------------------------------
+					// Do we have an attachment?
+					//-----------------------------------------
+					
+					if ( strstr( $return['thumb_location'], 'avs-' ) )
+					{
+						//-----------------------------------------
+						// Kill old and rename new...
+						//-----------------------------------------
+						
+						@unlink( $ibforums->vars['upload_dir']."/".$real_name );
+						
+						$real_name = 'av-'.$ibforums->member['id'].'.'.$this->image->file_extension;
+						
+						@rename( $ibforums->vars['upload_dir']."/".$return['thumb_location'], $ibforums->vars['upload_dir']."/".$real_name );
+						@chmod(  $ibforums->vars['upload_dir']."/".$real_name, 0777 );
+					}
 				}
 				else
 				{	
@@ -842,24 +1093,39 @@ class usercp_functions {
 					$im['img_height'] = $h > $p_height ? $p_height : $h;
 				}
 				
-				// Set the "real" avatar..
+				//-----------------------------------------
+				// Check the file size (after compression)
+				//-----------------------------------------
+				
+				if ( filesize( $ibforums->vars['upload_dir']."/".$real_name ) > ($ibforums->vars['avup_size_max']*1024))
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$real_name );
 					
-				$real_choice = 'upload:'.$real_name;
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'upload_to_big' ) );
+				}
+				
+				//-----------------------------------------
+				// Set the "real" avatar..
+				//-----------------------------------------
+					
+				$real_choice = $real_name;
 				$real_dims   = $im['img_width'].'x'.$im['img_height'];
 			}
 			else
 			{
+				//-----------------------------------------
 				// URL field and upload field left blank.
-		
+				//-----------------------------------------
+				
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_avatar_selected' ) );
 			
 			}
 		}
 		else
 		{
-			//-------------------------------------------------
+			//-----------------------------------------
 			// It's an entered URL 'ting man
-			//-------------------------------------------------
+			//-----------------------------------------
 			
 			$ibforums->input['url_avatar'] = trim($ibforums->input['url_avatar']);
 			
@@ -871,11 +1137,11 @@ class usercp_functions {
 				}
 			}
 			
-			//-------------------------------------------------
+			//-----------------------------------------
 			// Check extension
-			//-------------------------------------------------
+			//-----------------------------------------
 			
-			$ext = explode ( "|", $ibforums->vars['avatar_ext'] );
+			$ext = explode ( ",", $ibforums->vars['avatar_ext'] );
 			$checked = 0;
 			$av_ext = preg_replace( "/^.*\.(\S+)$/", "\\1", $ibforums->input['url_avatar'] );
 			
@@ -897,9 +1163,9 @@ class usercp_functions {
 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'avatar_invalid_ext' ) );
 			}
 			
-			//-------------------------------------------------
+			//-----------------------------------------
 			// Check image size...
-			//-------------------------------------------------
+			//-----------------------------------------
 			
 			$im = array();
 			
@@ -907,8 +1173,6 @@ class usercp_functions {
 			{
 				if ( ! $img_size = @GetImageSize( $ibforums->input['url_avatar'] ) )
 				{
-					//$std->Error( array( 'LEVEL' => 1, 'MSG' => 'avatar_invalid_url' ) );
-					
 					$img_size[0] = $p_width;
 					$img_size[1] = $p_height;
 				}
@@ -928,22 +1192,23 @@ class usercp_functions {
 				$im['img_height'] = $h > $p_height ? $p_height : $h;
 			}
 			
-			//-------------------------------------------------
+			//-----------------------------------------
 			// Remove any uploaded images..
-			//-------------------------------------------------
+			//-----------------------------------------
 			
 			$this->bash_uploaded_avatars($ibforums->member['id']);
 			
 			$real_choice = $ibforums->input['url_avatar'];
 			$real_dims   = $im['img_width'].'x'.$im['img_height'];
+			$real_type   = 'url';
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Update the DB
-		//-------------------------------------------------
+		//-----------------------------------------
+		
+		$DB->do_update( 'member_extra', array( 'avatar_location' => $real_choice, 'avatar_size' => $real_dims, 'avatar_type' => $real_type ), 'id='.$ibforums->member['id'] );
 		
-		$DB->query("UPDATE ibf_members SET avatar='$real_choice', avatar_size='$real_dims' WHERE id='".$this->class->member['id']."'");
-	
 		$print->redirect_screen( $ibforums->lang['av_c_up'], "act=UserCP&CODE=24" );
 	
 	}
@@ -951,88 +1216,94 @@ class usercp_functions {
 	
 	function do_profile()
 	{
-		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
+		global $ibforums, $DB, $std, $print;
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Check for bad entry
-		//----------------------------------
+		//-----------------------------------------
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Nawty, Nawty!
-        //-------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['auth_key'] != $this->class->md5_check )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Custom profile field stuff
-		//----------------------------------
+		//-----------------------------------------
 		
-		$custom_fields = array();
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->member_id   = $ibforums->member['id'];
+    	$fields->mem_data_id = $ibforums->member['id'];
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_save();
 		
-		$DB->query("SELECT * from ibf_pfields_data WHERE fedit=1");
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
 		
-		while ( $row = $DB->fetch_row() )
+		if ( count( $fields->error_fields['empty'] ) )
 		{
-			if ($row['freq'] == 1)
-			{
-				if ($HTTP_POST_VARS[ 'field_'.$row['fid'] ] == "")
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
-				}
-			}
-			
-			if ($row['fmaxinput'] > 0)
-			{
-				if (strlen($HTTP_POST_VARS[ 'field_'.$row['fid'] ]) > $row['fmaxinput'])
-				{
-					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cf_to_long', 'EXTRA' => $row['ftitle'] ) );
-				}
-			}
-			
-			$custom_fields[ 'field_'.$row['fid'] ] = str_replace( '<br>', "\n", $ibforums->input[ 'field_'.$row['fid'] ] );
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
 		
-		//+--------------------
+		if ( count( $fields->error_fields['invalid'] ) )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+		}
 		
-		if ( (strlen($HTTP_POST_VARS['Interests']) > $ibforums->vars['max_interest_length']) and ($ibforums->vars['max_interest_length']) )
+		if ( count( $fields->error_fields['toobig'] ) )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cf_to_long' ) );
+		}
+		
+		//-----------------------------------------
+		
+		if ( (strlen($_POST['Interests']) > $ibforums->vars['max_interest_length']) and ($ibforums->vars['max_interest_length']) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'int_too_long' ) );
 		}
-		//+--------------------
-		if ( (strlen($HTTP_POST_VARS['Location']) > $ibforums->vars['max_location_length']) and ($ibforums->vars['max_location_length']) )
+		//-----------------------------------------
+		if ( (strlen($_POST['Location']) > $ibforums->vars['max_location_length']) and ($ibforums->vars['max_location_length']) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'loc_too_long' ) );
 		}
-		//+--------------------
-		if (strlen($HTTP_POST_VARS['WebSite']) > 150)
+		//-----------------------------------------
+		if (strlen($_POST['WebSite']) > 150)
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'web_too_long' ) );
 		}
-		//+--------------------
-		if (strlen($HTTP_POST_VARS['Photo']) > 150) 
+		//-----------------------------------------
+		if (strlen($_POST['Photo']) > 150) 
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'photo_too_long' ) );
 		}
-		//+--------------------
-		if ( ($HTTP_POST_VARS['ICQNumber']) && (!preg_match( "/^(?:\d+)$/", $HTTP_POST_VARS['ICQNumber'] ) ) )
+		//-----------------------------------------
+		if ( ($_POST['ICQNumber']) && (!preg_match( "/^(?:\d+)$/", $_POST['ICQNumber'] ) ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'not_icq_number' ) );
 		}
 		
 		
-		//----------------------------------
+		//-----------------------------------------
 		// make sure that either we entered
 		// all calendar fields, or we left them
 		// all blank
-		//----------------------------------
+		//-----------------------------------------
 		
 		$c_cnt = 0;
 		
@@ -1054,75 +1325,75 @@ class usercp_functions {
 			$ibforums->input['WebSite'] = 'http://'.$ibforums->input['WebSite'];
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Start off our array
-		//----------------------------------
+		//-----------------------------------------
 		
-		$set = array(  'website'     => $ibforums->input['WebSite'],
-					   'icq_number'  => $ibforums->input['ICQNumber'],
-					   'aim_name'    => $ibforums->input['AOLName'],
-					   'yahoo'       => $ibforums->input['YahooName'],
-					   'msnname'     => $ibforums->input['MSNName'],
-					   'integ_msg'   => $ibforums->input['integ_msg'],
-					   'location'    => $ibforums->input['Location'],
-					   'interests'   => $ibforums->input['Interests'],
+		$set = array(  
 					   'bday_day'    => $ibforums->input['day'],
 					   'bday_month'  => $ibforums->input['month'],
 					   'bday_year'   => $ibforums->input['year'],
 					);
+					
+		$bet = array(  'website'     => $ibforums->input['WebSite'],
+					   'icq_number'  => $ibforums->input['ICQNumber'],
+					   'aim_name'    => $ibforums->input['AOLName'],
+					   'yahoo'       => $ibforums->input['YahooName'],
+					   'msnname'     => $ibforums->input['MSNName'],
+					   'location'    => $ibforums->input['Location'],
+					   'interests'   => $ibforums->input['Interests'],
+					);
 		
-		//----------------------------------
+		//-----------------------------------------
 		// check to see if we can enter a member title
 		// and if one is entered, update it.
-		//----------------------------------
+		//-----------------------------------------
 		
-		if ( (isset($ibforums->input['member_title'])) and ( isset($ibforums->vars['post_titlechange']) ) and ( $this->class->member['posts'] >= $ibforums->vars['post_titlechange']) )
+		if ( (isset($ibforums->input['member_title'])) and ( isset($ibforums->vars['post_titlechange']) ) and ( $ibforums->member['posts'] >= $ibforums->vars['post_titlechange']) )
 		{
 			$set['title'] = $ibforums->input['member_title'];
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Update the DB
-		//----------------------------------
+		//-----------------------------------------
 		
-		$set_string = $DB->compile_db_update_string($set);
+		$DB->do_update( 'members'     , $set, 'id='.$ibforums->member['id'] );
+		$DB->do_update( 'member_extra', $bet, 'id='.$ibforums->member['id'] );
 		
-		$DB->query("UPDATE ibf_members SET $set_string WHERE id='".$this->class->member['id']."'");
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Save the profile stuffy wuffy
-		//----------------------------------
+		//-----------------------------------------
 		
-		if ( count($custom_fields) > 0 )
+		if ( count( $fields->out_fields ) )
 		{
-		
-			// Do we already have an entry in the content table?
+			//-----------------------------------------
+			// Do we already have an entry in
+			// the content table?
+			//-----------------------------------------
 			
-			$DB->query("SELECT member_id FROM ibf_pfields_content WHERE member_id='".$ibforums->member['id']."'");
-			$test = $DB->fetch_row();
+			$test = $DB->simple_exec_query( array( 'select' => 'member_id', 'from' => 'pfields_content', 'where' => 'member_id='.$ibforums->member['id'] ) );
 			
 			if ( $test['member_id'] )
 			{
+				//-----------------------------------------
 				// We have it, so simply update
+				//-----------------------------------------
 				
-				$db_string = $DB->compile_db_update_string($custom_fields);
-				
-				$DB->query("UPDATE ibf_pfields_content SET $db_string WHERE member_id='".$ibforums->member['id']."'");
+				$DB->do_update( 'pfields_content', $fields->out_fields, 'member_id='.$ibforums->member['id'] );
 			}
 			else
 			{
-				$custom_fields['member_id'] = $ibforums->member['id'];
+				$fields->out_fields['member_id'] = $ibforums->member['id'];
 				
-				$db_string = $DB->compile_db_insert_string($custom_fields);
-				
-				$DB->query("INSERT INTO ibf_pfields_content (".$db_string['FIELD_NAMES'].") VALUES(".$db_string['FIELD_VALUES'].")");
+				$DB->do_insert( 'pfields_content', $fields->out_fields );
 			}
-		
 		}
 		
-		//--------------------------------------------
+		//-----------------------------------------
  		// Use sync module?
- 		//--------------------------------------------
+ 		//-----------------------------------------
  		
  		if ( USE_MODULES == 1 )
 		{
@@ -1137,32 +1408,32 @@ class usercp_functions {
 		
 	}
 	
-	function do_signature() {
-		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
+	function do_signature()
+	{
+		global $ibforums, $DB, $std, $print;
 		
-		if ($HTTP_POST_VARS['act'] == "")
+		//-----------------------------------------
+		// Check for bad entry
+		//-----------------------------------------
+		
+		if ($_POST['act'] == "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
 		}
-		//+----------------------------------------
 		
-		//----------------------------------
-		// Check for bad entry
-		//----------------------------------
-		
-		if ( (strlen($HTTP_POST_VARS['Post']) > $ibforums->vars['max_sig_length']) and ($ibforums->vars['max_sig_length']) )
+		if ( (strlen($_POST['Post']) > $ibforums->vars['max_sig_length']) and ($ibforums->vars['max_sig_length']) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'sig_too_long' ) );
 		}
 		
-		if ( $HTTP_POST_VARS['key'] != $std->return_md5_check() )
+		if ( $_POST['key'] != $std->return_md5_check() )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Check for valid IB CODE
-		//----------------------------------
+		//-----------------------------------------
 		//
 		// For efficiency, we convert the IBF code into HTML and store it in the DB
 		// Otherwise we'll have to parse the siggies each time we view a post - that
@@ -1176,22 +1447,34 @@ class usercp_functions {
 		// in siggies, so it's not much of a bother.
 		
 		$ibforums->input['Post'] = $this->class->parser->convert(  array( 'TEXT'      => $ibforums->input['Post'],
-																   'SMILIES'   => 0,
-																   'CODE'      => $ibforums->vars['sig_allow_ibc'],
-																   'HTML'      => $ibforums->vars['sig_allow_html'],
-																   'SIGNATURE' => 1
-														 )       );
+																		  'SMILIES'   => 0,
+																		  'CODE'      => $ibforums->vars['sig_allow_ibc'],
+																		  'HTML'      => $ibforums->vars['sig_allow_html'],
+																		  'SIGNATURE' => 1
+																)       );
 									   
 		if ($this->class->parser->error != "")
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => $this->class->parser->error) );
 		}
 		
-		//Write it to the DB.
+		//-----------------------------------------
+		// Write it to the DB.
+		//-----------------------------------------
 		
-		$ibforums->input['Post'] = preg_replace( "/'/", "\\'", $ibforums->input['Post'] );
+		if ( $mem = $DB->simple_exec_query( array( 'select' => 'id', 'from' => 'member_extra', 'where' => 'id='.$ibforums->member['id'] ) ) )
+		{
+			$DB->do_update( 'member_extra', array( 'signature' => $ibforums->input['Post'] ), 'id='.$ibforums->member['id'] );
+		}
+		else
+		{
+			$DB->do_insert( 'member_extra', array( 'id' => $ibforums->member['id'], 'signature' => $ibforums->input['Post'] ) );
+		}
 		
-		$DB->query("UPDATE ibf_members SET signature='".$ibforums->input['Post']."' WHERE id ='".$this->class->member['id']."'");
+		
+		//-----------------------------------------
+		// Member sync?
+		//-----------------------------------------
 		
 		if ( USE_MODULES == 1 )
  		{
@@ -1199,17 +1482,158 @@ class usercp_functions {
      		$this->class->modules->on_signature_update($ibforums->member, $ibforums->input['Post']);
     	}
 		
+		//-----------------------------------------
 		// Buh BYE:
+		//-----------------------------------------
 		
-		$std->boink_it($this->class->base_url."act=UserCP&CODE=22");
-		
-		exit;
+		$std->boink_it($ibforums->base_url."act=UserCP&CODE=22");
 	}
 	
 	
 	
+	function ignore_user_add()
+	{
+		global $ibforums, $DB, $std;
+		
+		$temp_users = array();
+		
+		//-----------------------------------------
+ 		// Stored as userid,userid,userid
+ 		//-----------------------------------------
+ 		
+ 		$ignored_users = explode( ',', $ibforums->member['ignored_users'] );
+ 		
+ 		foreach( $ignored_users as $id )
+ 		{
+ 			if ( intval($id) )
+ 			{
+ 				$temp_users[] = $id;
+ 			}
+ 		}
+ 	
+ 		$final_string = ",".implode( ',', $temp_users ).",";
+ 		
+ 		$final_string = preg_replace( "/,{2,}/", ",", str_replace( " ", "", $final_string ) );
+ 		
+ 		$lookup_meh_pants = array();
+ 		
+ 		if ( $ibforums->input['newbox_1'] )
+ 		{
+ 			$lookup_meh_pants[] = "'".strtolower(str_replace( '|', '&#124;', $ibforums->input['newbox_1']))."'";
+ 		}
+ 		if ( $ibforums->input['newbox_2'] )
+ 		{
+ 			$lookup_meh_pants[] = "'".strtolower(str_replace( '|', '&#124;', $ibforums->input['newbox_2']))."'";
+ 		}
+ 		if ( $ibforums->input['newbox_3'] )
+ 		{
+ 			$lookup_meh_pants[] = "'".strtolower(str_replace( '|', '&#124;', $ibforums->input['newbox_3']))."'";
+ 		}
+		
+		if ( count($lookup_meh_pants) )
+		{
+			//-----------------------------------------
+			// See if we have any MEMBRES IN THE DB
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => 'id, name, mgroup', 'from' => 'members', 'where' => "lower(name) IN (".implode(",", $lookup_meh_pants ).")" ) );
+			$DB->simple_exec();
+			
+			while( $s = $DB->fetch_row() )
+			{
+				if ( strstr( $ibforums->vars['cannot_ignore_groups'], ','.$s['mgroup'].',' ) )
+				{
+					continue;
+				}
+				
+				if ( strstr( $final_string, ','.$s['id'].',') )
+				{
+					continue;
+				}
+					
+				if ( $s['id'] != $ibforums->member['id'] )
+				{
+					$members[ $s['name'] ] = $s['id'];
+				}
+			}
+			
+			if ( count($members ) )
+			{
+				foreach( $members as $name => $id )
+				{
+					foreach( array( 1,2,3 ) as $hehe )
+					{
+						if ( strtolower($name) == strtolower($ibforums->input[ 'newbox_'.$hehe ]) )
+						{
+							$ibforums->input[ 'newbox_'.$hehe ] = "";
+						}
+					}
+					
+					$final_string .= $id.",";
+				}
+				
+				$DB->do_update( 'members', array( 'ignored_users' => $final_string ), 'id='.$ibforums->member['id'] );
+			}
+			
+			$cant_find = array();
+			
+			foreach( array( 1,2,3 ) as $hehe )
+			{
+				if ( $ibforums->input[ 'newbox_'.$hehe ] != "" )
+				{
+					$cant_find[] = $ibforums->input[ 'newbox_'.$hehe ];
+				}
+			}
+			
+			if ( count($cant_find) )
+			{
+				$ibforums->member['ignored_users'] = $final_string;
+				
+				$this->class->ignore_user_splash( sprintf( $ibforums->lang['mi5_cantfind'], implode( ",", $cant_find ) ) );
+				return;
+			}
+		}
+		
+		$ibforums->member['ignored_users'] = $final_string;
+		
+		$this->class->ignore_user_splash();
+		return;
+		
+	}
 	
 	
+	function ignore_user_remove()
+	{
+		global $ibforums, $DB, $std;
+		
+		$temp_users = array();
+		
+		//-----------------------------------------
+ 		// Stored as userid,userid,userid
+ 		//-----------------------------------------
+ 		
+ 		$ignored_users = explode( ',', $ibforums->member['ignored_users'] );
+ 		
+ 		foreach( $ignored_users as $id )
+ 		{
+ 			if ( intval($id) and ( $id != $ibforums->input['id'] ) )
+ 			{
+ 				$temp_users[] = $id;
+ 			}
+ 		}
+ 		
+ 		$final_string = ",".implode( ',', $temp_users ).",";
+ 		
+ 		$final_string = preg_replace( "/,{2,}/", ",", str_replace( " ", "", $final_string ) );
+ 		
+ 		$DB->do_update( 'members', array( 'ignored_users' => $final_string ), 'id='.$ibforums->member['id'] );
+ 		
+ 		$ibforums->member['ignored_users'] = $final_string;
+ 		
+		$this->class->ignore_user_splash();
+		return true;
+		
+	}
 }
 
 
diff --git a/upload/sources/login.php b/upload/sources/login.php
new file mode 100644
index 00000000..32382c1f
--- /dev/null
+++ b/upload/sources/login.php
@@ -0,0 +1,739 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Log in / log out module
+|   > Module written by Matt Mecham
+|   > Date started: 14th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class login {
+
+    var $output     = "";
+    var $page_title = "";
+    var $nav        = array();
+    var $login_html = "";
+    var $modules    = "";
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_login', $ibforums->lang_id);
+    	
+    	$this->login_html = $std->load_template('skin_login');
+    	
+    	if ( USE_MODULES == 1 )
+		{
+			require ROOT_PATH."modules/ipb_member_sync.php";
+			
+			$this->modules = new ipb_member_sync();
+		}
+
+    	//-----------------------------------------
+    	// Are we enforcing log ins?
+    	//-----------------------------------------
+    	
+    	if ($ibforums->vars['force_login'] == 1)
+    	{
+    		$msg = 'admin_force_log_in';
+    	}
+    	else
+    	{
+    		$msg = "";
+    	}
+    	
+    	//-----------------------------------------
+    	// What to do?
+    	//-----------------------------------------
+    	
+    	switch($ibforums->input['CODE'])
+    	{
+    		case '01':
+    			$this->do_log_in();
+    			break;
+    		case '02':
+    			$this->log_in_form();
+    			break;
+    		case '03':
+    			$this->do_log_out();
+    			break;
+    			
+    		case '04':
+    			$this->markforum();
+    			break;
+    			
+    		case '05':
+    			$this->markboard();
+    			break;
+    			
+    		case '06':
+    			$this->delete_cookies();
+    			break;
+    			
+    		case 'autologin':
+    			$this->auto_login();
+    			break;
+    			
+    		default:
+    			$this->log_in_form($msg);
+    			break;
+    	}
+    	
+    	//-----------------------------------------
+    	// If we have any HTML to print, do so...
+    	//-----------------------------------------
+    	
+    	$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+    		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// AUTO LOG IN
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function auto_login()
+ 	{
+		global $ibforums, $DB, $std, $print, $sess;
+ 		
+ 		//-----------------------------------------
+ 		// Universal routine.
+ 		// If we have cookies / session created, simply return to the index screen
+ 		// If not, return to the log in form
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->member = $sess->authorise();
+ 		
+ 		//-----------------------------------------
+ 		// If there isn't a member ID set, do a quick check ourselves.
+ 		// It's not that important to do the full session check as it'll
+ 		// occur when they next click a link.
+ 		//-----------------------------------------
+ 		
+ 		if ( ! $ibforums->member['id'] )
+ 		{
+			$mid = intval($std->my_getcookie('member_id'));
+			$pid = $std->my_getcookie('pass_hash');
+			
+			If ( $mid and $pid )
+			{
+				$DB->simple_construct( array( 'select' => '*',
+									          'from'   => 'members',
+									          'where'  => "id=$mid and member_login_key='$pid'"
+									 )      );
+				$DB->simple_exec();
+				
+				if ( $member = $DB->fetch_row() )
+				{
+					$ibforums->member = $member;
+					$ibforums->session_id = "";
+					$std->my_setcookie('session_id', '0', -1 );
+				}
+			}
+ 		}
+ 		
+ 		$true_words  = $ibforums->lang['logged_in'];
+ 		$false_words = $ibforums->lang['not_logged_in'];
+ 		$method = 'no_show';
+ 		
+ 		if ($ibforums->input['fromreg'] == 1)
+ 		{
+ 			$true_words  = $ibforums->lang['reg_log_in'];
+ 			$false_words = $ibforums->lang['reg_not_log_in'];
+ 			$method = 'show';
+ 		}
+ 		else if ($ibforums->input['fromemail'] == 1)
+ 		{
+ 			$true_words  = $ibforums->lang['email_log_in'];
+ 			$false_words = $ibforums->lang['email_not_log_in'];
+ 			$method = 'show';
+ 		}
+ 		else if ($ibforums->input['frompass'] == 1)
+ 		{
+ 			$true_words  = $ibforums->lang['pass_log_in'];
+ 			$false_words = $ibforums->lang['pass_not_log_in'];
+ 			$method = 'show';
+ 		}
+ 		
+ 		if ($ibforums->member['id'])
+ 		{
+ 			if ($method == 'show')
+ 			{
+ 				$print->redirect_screen( $true_words, "" );
+ 			}
+ 			else
+ 			{
+ 				$std->boink_it($ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext']);
+ 			}
+ 		}
+ 		else
+ 		{
+ 			if ($method == 'show')
+ 			{
+ 				$print->redirect_screen( $false_words, 'act=Login&CODE=00' );
+ 			}
+ 			else
+ 			{
+ 				$std->boink_it($ibforums->base_url.'&act=Login&CODE=00');
+ 			}
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// DELETE IPB COOKIES
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function delete_cookies()
+ 	{
+		global $ibforums, $DB, $std, $HTTP_COOKIE_VARS;
+ 		
+ 		if (is_array($HTTP_COOKIE_VARS))
+ 		{
+ 			foreach( $HTTP_COOKIE_VARS as $cookie => $value)
+ 			{
+ 				if (preg_match( "/^(".$ibforums->vars['cookie_id']."ibforum.*$)/i", $cookie, $match))
+ 				{
+ 					$std->my_setcookie( str_replace( $ibforums->vars['cookie_id'], "", $match[0] ) , '-', -1 );
+ 				}
+ 			}
+ 		}
+ 		
+ 		$std->my_setcookie('pass_hash' , '-1');
+ 		$std->my_setcookie('member_id' , '-1');
+ 		$std->my_setcookie('session_id', '-1');
+ 		$std->my_setcookie('topicsread', '-1');
+ 		$std->my_setcookie('anonlogin' , '-1');
+ 		$std->my_setcookie('forum_read', '-1');
+ 		
+		$std->boink_it($ibforums->base_url);
+		exit();
+	}  
+	
+ 	/*-------------------------------------------------------------------------*/
+ 	// MARK ALL AS READ
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function markboard()
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+		//-----------------------------------------	
+        // Reset cookie (yum)
+        //-----------------------------------------
+        
+        $ibforums->forum_read[0] = time();
+		
+		$std->hdl_forum_read_cookie('set');
+				
+		$std->boink_it($ibforums->base_url.'act=idx');
+	}  
+    
+    /*-------------------------------------------------------------------------*/
+    // MARK FORUM AS READ
+    /*-------------------------------------------------------------------------*/
+    
+    function markforum()
+    {
+		global $ibforums, $DB, $std, $forums;
+        
+        $ibforums->input['f'] = intval($ibforums->input['f']);
+        
+        if ( ! $ibforums->input['f'] )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'missing_files' ) );
+        }
+        
+        $f = $forums->forum_by_id[ $ibforums->input['f'] ];
+        
+        if ( ! $f['id'] )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'missing_files' ) );
+        }
+        
+        $children = $forums->forums_get_children( $f['id'] );
+        
+        if ( $ibforums->input['i'] )
+        {
+			if ( is_array( $children ) and count($children) )
+			{
+				foreach( $children as $id )
+				{
+					$ibforums->forum_read[ $id ] = time();
+				}
+			}
+        }
+        
+        //-----------------------------------------	
+        // Reset cookie (yum)
+        //-----------------------------------------
+        
+        $ibforums->forum_read[ $ibforums->input['f'] ] = time();
+		
+		$std->hdl_forum_read_cookie('set');
+		
+		//-----------------------------------------	
+        // Are we getting kicked back to the root forum (if sub forum) or index?
+        //-----------------------------------------
+        
+        if ( ( count($children) > 1) AND ($ibforums->input['i'] != 1) )
+        {
+        	//-----------------------------------------
+        	// Its a sub forum, lets go redirect to parent forum
+        	//-----------------------------------------
+        	
+        	$std->boink_it($ibforums->base_url."showforum=".$f['parent_id']);
+        }
+        else
+        {
+        	$std->boink_it($ibforums->base_url);
+        }
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // LOG IN FORM
+    /*-------------------------------------------------------------------------*/
+    
+    function log_in_form($message="")
+    {
+		global $ibforums, $DB, $std, $print, $HTTP_REFERER;
+        
+        //-----------------------------------------
+		// Are they banned?
+		//-----------------------------------------
+		
+		if ( is_array( $ibforums->cache['banfilters'] ) and count( $ibforums->cache['banfilters'] ) )
+		{
+			foreach ($ibforums->cache['banfilters'] as $ip)
+			{
+				$ip = str_replace( '\*', '.*', preg_quote($ip, "/") );
+				
+				if ( preg_match( "/^$ip$/", $ibforums->input['IP_ADDRESS'] ) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'you_are_banned', 'INIT' => 1 ) );
+				}
+			}
+		}
+        
+        if ($message != "")
+        {
+        	$message = $ibforums->lang[ $message ];
+        	$message = preg_replace( "/<#NAME#>/", "<b>{$ibforums->input[UserName]}</b>", $message );
+        
+			$this->output .= $this->login_html->errors($message);
+		}
+		
+		$this->output .= $this->login_html->ShowForm( $ibforums->lang['please_log_in'], $HTTP_REFERER );
+		
+		$this->nav        = array( $ibforums->lang['log_in'] );
+	 	$this->page_title = $ibforums->lang['log_in'];
+		
+		$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+        
+        exit();
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // DO LOG IN
+    /*-------------------------------------------------------------------------*/
+    
+    function do_log_in()
+    {
+		global $DB, $ibforums, $std, $print, $sess, $HTTP_USER_AGENT;
+    	
+    	$url = "";
+    	
+    	//-----------------------------------------
+		// More unicode..
+		//-----------------------------------------
+		
+		$len_u = $std->txt_stripslashes($_POST['UserName']);
+		
+		$len_u = preg_replace("/&#([0-9]+);/", "-", $len_u );
+		
+		$len_p = $std->txt_stripslashes($_POST['PassWord']);
+		
+		$len_p = preg_replace("/&#([0-9]+);/", "-", $len_p );
+		
+    	//-----------------------------------------
+    	// Make sure the username and password were entered
+    	//-----------------------------------------
+    	
+    	if ( $_POST['UserName'] == "" )
+    	{
+    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
+    	}
+    
+     	if ( $_POST['PassWord'] == "" )
+     	{
+    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_blank' ) );
+    	}   
+		
+		//-----------------------------------------
+		// Check for input length
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['converge_login_method'] == 'username' )
+		{
+			if (strlen($len_u) > 32)
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'username_long' ) );
+			}
+			
+			$username = strtolower(str_replace( '|', '&#124;', $ibforums->input['UserName']) );
+		}
+		else
+		{
+			$email    = strtolower( trim( $ibforums->input['UserName'] ) );
+		}
+		
+		if (strlen($len_p) > 32)
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'pass_too_long' ) );
+		}
+		
+		$password = md5( $ibforums->input['PassWord'] );
+		
+		//-----------------------------------------
+		// NAME LOG IN
+		//-----------------------------------------
+			
+		if ( $ibforums->vars['converge_login_method'] == 'username' )
+		{
+			$DB->cache_add_query( 'login_getmember', array( 'username' => $username ) );
+			$DB->cache_exec_query();
+			
+			$member = $DB->fetch_row();
+								 
+			//-----------------------------------------
+			// Got a username?
+			//-----------------------------------------
+			
+			if ( empty($member['id']) or ($member['id'] == "") )
+			{
+				$this->log_in_form( 'wrong_name' );
+			}
+			
+			$ibforums->converge->converge_load_member($member['email']);
+			
+			if ( ! $ibforums->converge->member['converge_id'] )
+			{
+				$this->log_in_form( 'wrong_name' );
+			}
+		}
+		//-----------------------------------------
+		// EMAIL LOG IN
+		//-----------------------------------------
+		else
+		{
+			//-----------------------------------------
+			// No email, but username?
+			//-----------------------------------------
+			
+			if ( ! $email and $username )
+			{
+				$email = $username;
+			}
+			
+			$ibforums->converge->converge_load_member( $email );
+			
+			if ( $ibforums->converge->member['converge_id'] )
+			{
+				$member = $DB->simple_exec_query( array( 'select' => 'id, name, email, mgroup, member_login_key, ip_address, login_anonymous',
+														 'from'   => 'members',
+														 'where'  => "id=".$ibforums->converge->member['converge_id']
+												)      );
+			}
+			else
+			{
+				$this->log_in_form( 'wrong_name' );
+			}
+		}
+		
+		//-----------------------------------------
+		// Check password...
+		//-----------------------------------------
+		
+		if ( $ibforums->converge->converge_authenticate_member( $password ) != TRUE )
+		{
+			$this->log_in_form( 'wrong_pass' );
+		}
+		
+		//-----------------------------------------
+		// We in a validating group?
+		// still need this?
+		//-----------------------------------------
+		
+		if ($member['mgroup'] == $ibforums->vars['auth_group'])
+		{
+			//$this->log_in_form( 'need_validation' );
+		}
+		
+		//-----------------------------------------
+		// No member log in key?
+		//-----------------------------------------
+		
+		if ( ! $member['member_login_key'] )
+		{
+			$member['member_login_key'] = $ibforums->converge->generate_auto_log_in_key();
+		
+			$DB->do_update( 'members', array( 'member_login_key' => $member['member_login_key'] ), 'id='.$member['id'] );
+		}
+		
+		//-----------------------------------------
+		// Cookie me softly?
+		//-----------------------------------------
+		
+		if ($ibforums->input['CookieDate'])
+		{
+			$std->my_setcookie("member_id"   , $member['id']              , 1);
+			$std->my_setcookie("pass_hash"   , $member['member_login_key'], 1);
+		}
+		
+		//-----------------------------------------
+		// Update profile if IP addr missing
+		//-----------------------------------------
+		
+		if ( $member['ip_address'] == "" OR $member['ip_address'] == '127.0.0.1' )
+		{
+			$DB->simple_construct( array( 'update' => 'members',
+										  'set'    => "ip_address='{$ibforums->input['IP_ADDRESS']}'",
+										  'where'  => "id={$member['id']}"
+								 )      );
+								 
+			$DB->simple_exec();
+		}
+		
+		//-----------------------------------------
+		// Create / Update session
+		//-----------------------------------------
+		
+		$poss_session_id = "";
+		
+		if ( $cookie_id = $std->my_getcookie('session_id') )
+		{
+			$poss_session_id = $std->my_getcookie('session_id');
+		}
+		else if ( $ibforums->input['s'] )
+		{
+			$poss_session_id = $ibforums->input['s'];
+		}
+		
+		if ($poss_session_id)
+		{
+			$session_id = $poss_session_id;
+			
+			//-----------------------------------------
+			// Delete any old sessions with this users IP
+			// addy that doesn't match our session ID.
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'delete' => 'sessions',
+										  'where'  => "ip_address='".$ibforums->input['IP_ADDRESS']."' AND id <> '$session_id'"
+								 )      );
+								 
+			$DB->simple_shutdown_exec();
+			
+			
+			$DB->do_shutdown_update( 'sessions',
+							array (
+									'member_name'  => $member['name'],
+									'member_id'    => $member['id'],
+									'running_time' => time(),
+									'member_group' => $member['mgroup'],
+									'login_type'   => $ibforums->input['Privacy'] ? 1 : 0
+								  ),
+							"id='".$session_id."'"
+						);
+		}
+		else
+		{
+			$session_id = md5( uniqid(microtime()) );
+			
+			//-----------------------------------------
+			// Delete any old sessions with this users IP addy.
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'delete' => 'sessions',
+										  'where'  => "ip_address='".$ibforums->input['IP_ADDRESS']."'"
+								 )      );
+								 
+			$DB->simple_shutdown_exec();
+			
+			$DB->do_shutdown_insert( 'sessions',
+									 array (
+											 'id'           => $session_id,
+											 'member_name'  => $member['name'],
+											 'member_id'    => $member['id'],
+											 'running_time' => time(),
+											 'member_group' => $member['mgroup'],
+											 'ip_address'   => substr($ibforums->input['IP_ADDRESS'], 0, 50),
+											 'browser'      => substr($std->clean_value($HTTP_USER_AGENT), 0, 50),
+											 'login_type'   => $ibforums->input['Privacy'] ? 1 : 0
+								  )       );
+		}
+		
+		$ibforums->member           = $member;
+		$ibforums->session_id       = $session_id;
+		
+		if ($ibforums->input['referer'] && ($ibforums->input['act'] != 'Reg'))
+		{
+			$url = $ibforums->input['referer'];
+			$url = str_replace( "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}", "", $url );
+			$url = preg_replace( "!^\?!"       , ""   , $url );
+			$url = preg_replace( "!s=(\w){32}!", ""   , $url );
+			$url = preg_replace( "!act=(login|reg|lostpass)!i", "", $url );
+		}
+		
+		//-----------------------------------------
+		// set our privacy status
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'update' => 'members',
+									  'set'    => "login_anonymous='".intval($ibforums->input['Privacy'])."&1'",
+									  'where'  => "id={$member['id']}"
+							 )      );
+							 
+		$DB->simple_shutdown_exec();
+			
+		//-----------------------------------------
+		// Clear out any passy change stuff
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'delete' => 'validating',
+									  'where'  => "member_id={$ibforums->member['id']} AND lost_pass=1"
+							 )      );
+							 
+		$DB->simple_shutdown_exec();
+		
+		//-----------------------------------------
+		// Redirect them to either the board
+		// index, or where they came from
+		//-----------------------------------------
+		
+		$std->my_setcookie("session_id", $ibforums->session_id, -1);
+		
+		$this->logged_in = 1;
+		
+		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+			$this->modules->on_login($member);
+		}
+		
+		if ( $ibforums->input['return'] != "" )
+		{
+			$return = urldecode($ibforums->input['return']);
+			
+			if ( preg_match( "#^http://#", $return ) )
+			{
+				$std->boink_it($return);
+			}
+		}
+		
+		//-----------------------------------------
+		// Check for dupemail
+		//-----------------------------------------
+		
+		$member_extra = $DB->simple_exec_query( array( 'select' => 'bio', 'from' => 'member_extra', 'where' => 'id='.$member['id'] ) );
+		
+		if ( $member_extra['bio'] == 'dupemail' )
+		{
+			$print->redirect_screen( "{$ibforums->lang[thanks_for_login]} {$ibforums->member['name']}", 'act=usercp' );
+		}
+		else
+		{
+			$print->redirect_screen( "{$ibforums->lang[thanks_for_login]} {$ibforums->member['name']}", $url );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// DO LOG OUT
+	/*-------------------------------------------------------------------------*/
+
+	function do_log_out()
+	{
+		global $std, $ibforums, $DB, $print, $sess;
+		
+		$DB->simple_construct( array( 'update' => 'sessions',
+									  'set'    => "member_name='',member_id='0',login_type='0'",
+									  'where'  => "id='". $sess->session_id ."'"
+							 )      );
+							 
+		$DB->simple_shutdown_exec();
+		
+		list( $privacy, $loggedin ) = explode( '&', $ibforums->member['login_anonymous'] );
+		
+		
+		$DB->simple_construct( array( 'update' => 'members',
+									  'set'    => "login_anonymous='{$privacy}&0', last_visit=".time().", last_activity=".time(),
+									  'where'  => "id=".$ibforums->member['id']
+							 )      );
+							 
+		$DB->simple_shutdown_exec();
+		
+		//-----------------------------------------
+		// Set some cookies
+		//-----------------------------------------
+		
+		$std->my_setcookie( "member_id" , "0"  );
+		$std->my_setcookie( "pass_hash" , "0"  );
+		$std->my_setcookie( "anonlogin" , "-1" );
+		
+		if ( is_array($_COOKIE) )
+ 		{
+ 			foreach( $_COOKIE as $cookie => $value )
+ 			{
+ 				if ( preg_match( "/^(".$ibforums->vars['cookie_id']."ibforum.*$)/i", $cookie, $match) )
+ 				{
+ 					$std->my_setcookie( str_replace( $ibforums->vars['cookie_id'], "", $match[0] ) , '-', -1 );
+ 				}
+ 			}
+ 		}
+		
+		//-----------------------------------------
+		// Redirect...
+		//-----------------------------------------
+		
+		$url = "";
+		
+		if ( $ibforums->input['return'] != "" )
+		{
+			$return = urldecode($ibforums->input['return']);
+			
+			if ( preg_match( "#^http://#", $return ) )
+			{
+				$std->boink_it($return);
+			}
+		}
+		
+		$print->redirect_screen( $ibforums->lang['thanks_for_logout'], "" );
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/memberlist.php b/upload/sources/memberlist.php
new file mode 100644
index 00000000..3e3084d7
--- /dev/null
+++ b/upload/sources/memberlist.php
@@ -0,0 +1,488 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Show all the members
+|   > Module written by Matt Mecham
+|   > Date started: 20th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class memberlist {
+
+    var $output     = "";
+    var $page_title = "";
+    var $nav        = array();
+    var $html       = "";
+   
+    var $first       = 0;
+    var $max_results = 10;
+    var $sort_key    = 'name';
+    var $sort_order  = 'asc';
+    var $filter      = 'ALL';
+    
+    var $mem_titles = array();
+    var $mem_groups = array();
+    
+    var $ucp_html   = "";
+    var $topic      = "";
+    
+    /*-------------------------------------------------------------------------*/
+	// Auto-run
+	/*-------------------------------------------------------------------------*/
+
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	//-----------------------------------------
+    	// Require the HTML and language modules
+    	//-----------------------------------------
+    	
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_mlist', $ibforums->lang_id );
+    	
+    	$this->html = $std->load_template('skin_mlist');
+    	
+    	if ($ibforums->member['g_mem_info'] != 1)
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
+    	}
+    	
+    	//-----------------------------------------
+    	// Grab topics.php to parse member
+    	//-----------------------------------------
+    	
+    	require_once( ROOT_PATH.'sources/topics.php' );
+    	$this->topic = new topics();
+    	$this->topic->topic_init( 1 );
+    	
+    	$see_groups = array();
+    	
+    	//-----------------------------------------
+    	// Get the member groups, member titles stuff
+    	//-----------------------------------------
+    	
+    	foreach( $ibforums->cache['group_cache'] as $id => $row )
+    	{
+    		if ( $row['g_hide_from_list'] )
+    		{
+    			continue;
+    		}
+    		
+    		$see_groups[] = $row['g_id'];
+    		
+    		$this->mem_groups[ $row['g_id'] ] = array( 'TITLE'  => $row['g_title'],
+    												   'ICON'   => $row['g_icon'],
+    											     );
+    	}
+    	
+    	$the_filter  = array( 'ALL' => $ibforums->lang['show_all'] );
+    	
+    	foreach($this->mem_groups as $id => $data)
+    	{
+    		if ($id == $ibforums->vars['guest_group'])
+    		{
+    			continue;
+    		}
+    		
+    		$the_filter[$id] = $data['TITLE'];
+    	}
+    	
+    	$group_string = implode( ",", $see_groups );
+    	
+    	//-----------------------------------------
+    	// Test for input 
+    	//-----------------------------------------
+    	
+    	if (isset($ibforums->input['st']))          $this->first       = intval($ibforums->input['st']);
+    	if (isset($ibforums->input['max_results'])) $this->max_results = $ibforums->input['max_results'];
+    	if (isset($ibforums->input['sort_key']))    $this->sort_key    = $ibforums->input['sort_key'];
+    	if (isset($ibforums->input['sort_order']))  $this->sort_order  = $ibforums->input['sort_order'];
+    	if (isset($ibforums->input['filter']))      $this->filter      = $ibforums->input['filter'];
+    	
+    	//-----------------------------------------
+    	// Init some arrays
+    	//-----------------------------------------
+    	
+    	$the_sort_key = array( 'name'    => 'sort_by_name',
+    						   'posts'   => 'sort_by_posts',
+    						   'joined'  => 'sort_by_joined',
+    						 );
+    						 
+    	$the_max_results = array( 10  => '10',
+    							  20  => '20',
+    							  30  => '30',
+    							  40  => '40',
+    							  50  => '50',
+    						    );
+    						    
+    	$the_sort_order = array(  'desc' => 'descending_order',
+    							  'asc'  => 'ascending_order',
+    						   );
+    						   
+    	//-----------------------------------------
+    	// Start the form stuff
+    	//-----------------------------------------
+    						   
+    	$filter_html      = "<select name='filter' class='forminput'>\n";
+    	$sort_key_html    = "<select name='sort_key' class='forminput'>\n";
+    	$max_results_html = "<select name='max_results' class='forminput'>\n";
+    	$sort_order_html  = "<select name='sort_order' class='forminput'>\n";
+    	
+    	foreach ($the_sort_order as $k => $v)
+    	{
+			$sort_order_html .= $k == $this->sort_order ? "<option value='$k' selected>" . $ibforums->lang[ $the_sort_order[ $k ] ] . "</option>\n"
+											            : "<option value='$k'>"          . $ibforums->lang[ $the_sort_order[ $k ] ] . "</option>\n";
+		}
+     	foreach ($the_filter as $k => $v)
+     	{
+			$filter_html .= $k == $this->filter  ? "<option value='$k' selected>"         . $the_filter[ $k ] . "</option>\n"
+											            : "<option value='$k'>"          . $the_filter[ $k ] . "</option>\n";
+		}   	
+    	foreach ($the_sort_key as $k => $v)
+    	{
+			$sort_key_html .= $k == $this->sort_key ? "<option value='$k' selected>"     . $ibforums->lang[ $the_sort_key[ $k ] ] . "</option>\n"
+											            : "<option value='$k'>"          . $ibforums->lang[ $the_sort_key[ $k ] ] . "</option>\n";
+		}    	
+    	foreach ($the_max_results as $k => $v)
+    	{
+			$max_results_html .= $k == $this->max_results ? "<option value='$k' selected>". $the_max_results[ $k ] . "</option>\n"
+											            : "<option value='$k'>"          . $the_max_results[ $k ] . "</option>\n";
+		}
+		
+		$ibforums->lang['sorting_text'] = preg_replace( "/<#FILTER#>/"      , $filter_html."</select>"     , $ibforums->lang['sorting_text'] );
+    	$ibforums->lang['sorting_text'] = preg_replace( "/<#SORT_KEY#>/"    , $sort_key_html."</select>"   , $ibforums->lang['sorting_text'] );
+    	$ibforums->lang['sorting_text'] = preg_replace( "/<#SORT_ORDER#>/"  , $sort_order_html."</select>" , $ibforums->lang['sorting_text'] );
+    	$ibforums->lang['sorting_text'] = preg_replace( "/<#MAX_RESULTS#>/" , $max_results_html."</select>", $ibforums->lang['sorting_text'] );
+    	
+    	$error = 0;
+    	
+    	if ( ! isset($the_sort_key[ $this->sort_key ]) )       $error = 1;
+    	if ( ! isset($the_sort_order[ $this->sort_order ]) )   $error = 1;
+    	if ( ! isset($the_filter[ $this->filter ]) )           $error = 1;
+    	if ( ! isset($the_max_results[ $this->max_results ]) ) $error = 1;
+    	
+    	//-----------------------------------------
+    	// Error?
+    	//-----------------------------------------
+    	
+    	if ($error == 1 )
+    	{
+    		if ( $ibforums->input['b'] == 1 ) 
+    		{
+    			$std->Error( array( LEVEL=> 1, MSG =>'ml_error') );
+    		}
+    		else
+    		{
+    			$std->Error( array( LEVEL=> 5, MSG =>'incorrect_use') );
+    		}
+    	}
+    	
+    	//-----------------------------------------
+    	// Quick form?
+    	//-----------------------------------------
+    	
+    	$quick_jump = "";
+    	
+    	for ( $i = 65; $i <= 90; $i++ )
+    	{
+    		$letter      = strtolower(chr($i));
+    		$selected    = $ibforums->input['quickjump'] == $letter ? ' selected="selected"' : '';
+    		$quick_jump .= $this->html->mlist_quick_jump_entry( $letter, $selected );
+    	}
+    	
+    	//-----------------------------------------
+    	// Get custom profile information
+    	//-----------------------------------------
+		
+		$custom_fields = "";
+		
+    	$this->topic->custom_fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$this->topic->custom_fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	$this->topic->custom_fields->member_id   = $ibforums->member['id'];
+    	$this->topic->custom_fields->mem_data_id = 0;
+    	
+    	$this->topic->custom_fields->init_data();
+    	$this->topic->custom_fields->parse_to_edit();
+    	
+    	//-----------------------------------------
+    	// Query..
+    	//-----------------------------------------
+    	
+    	$query        = array();
+    	$url          = array();
+    	$query_string = "";
+    	
+    	//-----------------------------------------
+    	// Quick jump rehash...
+    	//-----------------------------------------
+    	
+    	if ( $ibforums->input['qjbutton'] and $ibforums->input['quickjump'] )
+    	{
+    		$ibforums->input['name_box'] = 'begins';
+    		$ibforums->input['name']     = $ibforums->input['quickjump'];
+    	}
+    	
+    	//-----------------------------------------
+    	// Member Groups...
+    	//-----------------------------------------
+    	
+    	if ($this->filter != 'ALL')
+    	{
+    		if ( ! preg_match( "/(^|,)".$this->filter."(,|$)/", $group_string ) )
+    		{
+    			$query[] = "m.mgroup IN($group_string)";
+    		}
+    		else
+    		{
+    			$query[] = "m.mgroup='".$this->filter."' ";
+    		}
+    	}
+    	
+    	//-----------------------------------------
+    	// Build query
+    	//-----------------------------------------
+    	
+    	$dates = array( 'lastpost', 'lastvisit', 'joined' );
+    	
+    	$mapit = array( 'aim'       => 'me.aim_name',
+    					'yahoo'     => 'me.yahoo',
+    					'icq'       => 'me.icq_number',
+    					'msn'       => 'me.msnname',
+    					'posts'     => 'm.posts',
+    					'joined'    => 'm.joined',
+    					'lastpost'  => 'm.last_post',
+    					'lastvisit' => 'm.last_visit',
+    					'signature' => 'me.signature',
+    					'homepage'  => 'me.website',
+    					'name'      => 'm.name',
+    					'photoonly' => 'me.photo_location',
+    				  );
+    	
+    	//-----------------------------------------
+    	// Do search
+    	//-----------------------------------------
+    	
+    	foreach( $mapit as $in => $tbl )
+    	{
+    		$inbit = $std->clean_value(trim(urldecode(stripslashes($ibforums->input[ $in ]))));
+    		
+    		$url[] = $in.'='.$ibforums->input[ $in ];
+    		
+    		//-----------------------------------------
+    		// Name...
+    		//-----------------------------------------
+    		
+    		if ( $in == 'name' and $inbit != "" )
+			{
+				if ( $ibforums->input['name_box'] == 'begins' )
+				{
+					$query[] = "m.name LIKE '".$inbit."%'";
+				}
+				else
+				{
+					$query[] = "m.name LIKE '%".$inbit."%'";
+				}
+			}
+			else if ( $in == 'posts' and intval($inbit) > 0 )
+			{
+				$ltmt = $ibforums->input[ $in .'_ltmt' ] == 'lt' ? '<' : '>';
+				$query[]  = $tbl. ' '.$ltmt.' '.intval($inbit);
+				$url[]    = $in .'_ltmt=' . $ibforums->input[ $in .'_ltmt' ];
+			}
+			else if ( in_array( $in, $dates ) and $inbit )
+			{
+				list( $month, $day, $year ) = explode( '-', $ibforums->input[ $in ] );
+				
+				$month = intval($month);
+				$day   = intval($day);
+				$year  = intval($year);
+				
+				if ( ! checkdate( $month, $day, $year ) )
+				{
+					continue;
+				}
+				
+				$time_int = mktime( 0, 0 ,0,$month, $day, $year );
+				
+				$ltmt = $ibforums->input[ $in .'_ltmt' ] == 'lt' ? '<' : '>';
+				
+				$query[]  = $tbl. ' '.$ltmt.' '.$time_int;
+				$url[]    = $in .'_ltmt=' . $ibforums->input[ $in .'_ltmt' ];
+			}
+			else if ( $in == 'photoonly' )
+			{
+				if ( $ibforums->input['photoonly'] == 1 )
+				{
+					$query[] = $tbl. "<> ''";
+				}
+			}
+			else if ( $inbit != "" )
+			{
+				$query[] = $tbl. " LIKE '%{$inbit}%'";
+			}	
+    	}
+    	
+    	//-----------------------------------------
+    	// Custom fields?
+    	//-----------------------------------------
+    	
+    	if ( count( $this->topic->custom_fields->out_fields ) )
+    	{
+    		foreach( $this->topic->custom_fields->out_fields as $id => $data )
+    		{
+    			if ( $ibforums->input['field_'.$id] )
+    			{
+    				$query[] = "p.field_{$id} LIKE '{$ibforums->input['field_'.$id]}%'";
+    				$url[]   = "field_{$id}=".$ibforums->input['field_'.$id];
+    			}
+    		}
+    	}
+    	
+    	//-----------------------------------------
+    	// Finish query
+    	//-----------------------------------------
+    	
+    	if ( count($query) )
+    	{
+    		$query_string = "AND ".implode( " AND ", $query );
+    	}
+    	
+    	//-----------------------------------------
+    	// Count...
+    	//-----------------------------------------
+    	
+    	$DB->cache_add_query( 'mlist_count', array( 'query' => $query_string ) );
+    	$DB->cache_exec_query();
+    	
+    	$max = $DB->fetch_row();
+		
+		$links = $std->build_pagelinks(  array( 'TOTAL_POSS'  => $max['total_members'],
+												'PER_PAGE'    => $this->max_results,
+												'CUR_ST_VAL'  => $this->first,
+												'L_SINGLE'     => "",
+												'L_MULTI'      => $ibforums->lang['pages'],
+												'BASE_URL'     => $ibforums->base_url."&amp;name_box={$ibforums->input['name_box']}&amp;sort_key={$this->sort_key}&amp;sort_order={$this->sort_order}&amp;filter={$this->filter}&amp;act=members&amp;max_results={$this->max_results}&amp;".implode( '&amp;', $url )
+											  )
+									   );
+									   
+		$this->output = $this->html->mlist_start();
+									   
+		$this->output .= $this->html->mlist_page_header( $pages, $quick_jump );  
+		
+		//-----------------------------------------
+    	// Get custom profile information
+    	//-----------------------------------------
+    	
+    	$custom_fields = "";
+    	
+    	if ( count( $this->topic->custom_fields->out_fields ) )
+    	{
+			foreach( $this->topic->custom_fields->out_fields as $id => $data )
+			{
+				if ( $this->topic->custom_fields->cache_data[ $id ]['pf_type'] == 'drop' )
+				{
+					$tmp = $this->html->mlist_custom_field_dropdown( 'field_'.$id, $data );
+				}
+				else
+				{
+					$tmp = $this->html->mlist_custom_field_textinput( 'field_'.$id );
+ 				}
+ 				
+ 				$custom_fields .= $this->html->mlist_custom_field_entry( $this->topic->custom_fields->field_names[ $id ], $tmp );
+			}
+		}
+		
+		//-----------------------------------------
+		// START THE LISTING
+		//-----------------------------------------
+		
+		if ( $max['total_members'] > 0 )
+		{
+			$DB->cache_add_query( 'mlist_get_members', array( 'query'   => $query_string,
+															  'sort'    => $this->sort_key,
+															  'order'   => $this->sort_order,
+															  'limit_a' => $this->first,
+															  'limit_b' => $this->max_results ) );
+			$DB->cache_exec_query();
+			
+			while ($member = $DB->fetch_row() )
+			{
+				$member = $this->topic->parse_member( $member );
+									   
+				$member['joined'] = $std->get_date( $member['joined'], 'JOINED' );
+				
+				$member['group']  = $this->mem_groups[ $member['mgroup'] ]['TITLE'];
+				
+				if ($member['photo_type'] and $member['photo_location'])
+				{
+					$member['camera'] = "<a href=\"javascript:PopUp('{$ibforums->base_url}act=Profile&amp;CODE=showphoto&amp;MID={$member['id']}','Photo','200','250','0','1','1','1')\"><{CAMERA}></a>";
+				}
+				
+				$member['posts'] = $std->do_number_format($member['posts']);
+				
+				//-----------------------------------------
+				// Bug fix... name-- breaks formatting
+				// xhmlt invalid..
+				//-----------------------------------------
+				
+				$member['name'] = str_replace( '--', '&#45;&#45;', $member['name'] );
+				
+				$this->output .= $this->html->mlist_show_row($member);
+				
+			}
+		}
+		else
+		{
+			$this->output .= $this->html->mlist_no_results();
+		}
+		
+		$checked = $ibforums->input['photoonly'] == 1 ? 'checked="checked"' : "";
+		
+		//-----------------------------------------
+		// Print bottom...
+		//-----------------------------------------
+		
+		$this->output .= $this->html->mlist_page_end( $checked );
+		
+		$this->output .= $this->html->mlist_end( array( 'SHOW_PAGES' => $links) );
+		
+		if ( $custom_fields )
+		{
+			$this->output = str_replace( '<!--CUSTOM_FIELDS-->', $this->html->mlist_custom_field_wrap($custom_fields), $this->output );
+		}
+    	
+    	//-----------------------------------------
+    	// Push to print handler
+    	//-----------------------------------------
+    	
+    	$print->add_output( $this->output );
+        $print->do_output( array( 'TITLE' => $ibforums->lang['page_title'], 'JS' => 0, 'NAV' => array( $ibforums->lang['page_title'] ) ) );
+ 	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/messenger.php b/upload/sources/messenger.php
new file mode 100644
index 00000000..6397af4a
--- /dev/null
+++ b/upload/sources/messenger.php
@@ -0,0 +1,1805 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Messenger functions
+|   > Module written by Matt Mecham
+|   > Date started: 26th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class messenger
+{
+    var $output     = "";
+    var $page_title = "";
+    var $nav        = array();
+    var $html       = "";
+    var $email      = "";
+    
+    var $msg_stats  = array();
+    var $prefs      = "";
+    
+    var $member     = array();
+    var $m_group    = array();
+    
+    var $to_mem     = array();
+    
+    var $jump_html  = "";
+    
+    var $vid        = "in";
+    var $mem_groups = array();
+    var $mem_titles = array();
+    
+    var $topiclib   = "";
+    var $postlib    = "";
+    
+    var $parser     = "";
+    
+    var $cp_html    = "";
+    var $edit_saved = "";
+    
+    /*-------------------------------------------------------------------------*/
+    // Auto-run
+    /*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	//-----------------------------------------
+    	// Require the HTML and language modules
+    	//-----------------------------------------
+    	
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_msg', $ibforums->lang_id);
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_ucp', $ibforums->lang_id);
+    	
+    	//-----------------------------------------
+    	
+    	$this->html = $std->load_template('skin_msg');
+    	
+    	//-----------------------------------------
+    	
+    	$this->cp_html = $std->load_template('skin_ucp');
+    	
+    	//-----------------------------------------
+    	
+    	require_once( ROOT_PATH.'sources/lib/msg_functions.php' );
+ 		
+ 		$this->lib = new msg_functions();
+    	
+    	//-----------------------------------------
+    	
+    	$this->base_url        = $ibforums->base_url;
+    	$this->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
+    	
+    	//-----------------------------------------
+    	// Check viewing permissions, etc
+		//-----------------------------------------
+		
+		if ( ! $ibforums->member['g_use_pm'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_use_messenger' ) );
+		}
+		
+		if ( ! $ibforums->member['id'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
+		}
+		
+    	//-----------------------------------------
+		// Get all member info..
+    	//-----------------------------------------
+    	
+    	$DB->cache_add_query( 'generic_get_all_member', array( 'mid' => $ibforums->member['id'] ) );
+		$DB->cache_exec_query();
+		
+    	if ( ! $member = $DB->fetch_row() )
+    	{
+    		$DB->do_insert( 'member_extra', array( 'id' => $ibforums->member['id'] ) );
+    	}
+    	else
+    	{
+    		$ibforums->member = array_merge( $member, $ibforums->member );
+    	}
+		
+    	//-----------------------------------------
+    	// Do a little set up, do a litle dance, get
+    	// down tonight! *boogie*
+    	//-----------------------------------------
+    	
+    	$this->jump_html = "<select name='VID' class='forminput'>\n";
+    	
+    	$ibforums->member['dir_data'] = array();
+    	
+    	//-----------------------------------------
+    	// Do we have VID?
+    	// No, it's just the way we walk! Haha, etc.
+    	//-----------------------------------------
+    	
+    	if ($ibforums->input['VID'])
+    	{
+    		$this->vid = $ibforums->input['VID'];
+    	}
+    	
+    	if ( ! $ibforums->member['vdirs'] )
+    	{
+    		$ibforums->member['vdirs'] = "in:Inbox;0|sent:Sent Items;0";
+    	}
+    	
+    	$folder_links = "";
+    	
+    	foreach( explode( "|", $ibforums->member['vdirs'] ) as $dir )
+    	{
+    		list ($id  , $data)  = explode( ":", $dir );
+    		list ($real, $count) = explode( ";", $data );
+    		
+    		if ( ! $id )
+    		{
+    			continue;
+    		}
+    		
+    		$ibforums->member['dir_data'][$id] = array( 'id' => $id, 'real' => $real, 'count' => $count );
+    		
+    		if ($this->vid == $id)
+    		{
+    			$ibforums->member['current_dir'] = $real;
+    			$ibforums->member['current_id']  = $id;
+    			$this->jump_html .= "<option value='$id' selected='selected'>$real</option>\n";
+    		}
+    		else
+    		{
+    			$this->jump_html .= "<option value='$id'>$real</option>\n";
+    		}
+    		
+    		if ( $count )
+    		{
+    			$real .= " ({$count})";
+    		}
+    		
+    		$folder_links .= $this->cp_html->menu_bar_msg_folder_link($id, $real);
+    		
+    	}
+    	
+    	$this->jump_html .= "<!--EXTRA--></select>\n\n";
+    	
+    	$menu_html = $this->cp_html->Menu_bar($this->base_url);
+    	
+    	if ( $folder_links != "" )
+		{
+			$menu_html = str_replace( "<!--IBF.FOLDER_LINKS-->", $folder_links, $menu_html );
+		}
+		
+		//-----------------------------------------
+    	// Using Sub Manager?
+    	//-----------------------------------------
+    	
+		if ( @is_dir( ROOT_PATH.'/modules/subsmanager' ) )
+		{
+			$url  = $ibforums->base_url."act=module&amp;module=subscription&amp;CODE=index";
+			$name = $ibforums->lang['new_sub_link'];
+			
+			$menu_html = str_replace( "<!--IBF.OPTION_LINKS-->", $this->cp_html->menu_bar_new_link( $url, $name ), $menu_html );
+		}
+		
+    	$print->add_output( $menu_html );
+    	
+    	//-----------------------------------------
+    	// What to do?
+    	//-----------------------------------------
+    	
+    	switch($ibforums->input['CODE'])
+    	{
+    		case '01':
+    			$this->msg_list();
+    			break;
+    		case '02':
+    			$this->contact();
+    			break;
+    		case '03':
+    			$this->view_msg();
+    			break;
+    		case '04';
+    			$this->send();
+    			break;
+    		case '05':
+    			$this->delete();
+    			break;
+    		case '06':
+    			$this->multi_act();
+    			break;
+    		case '07':
+    			$this->prefs();
+    			break;
+    		case '08':
+    			$this->do_prefs();
+    			break;
+    		case '09':
+    			$this->add_member();
+    			break;
+    		case '10':
+    			$this->del_member();
+    			break;
+    		case '11':
+    			$this->edit_member();
+    			break;
+    		case '12':
+    			$this->do_edit();
+    			break;
+    		case '14':
+    			$this->archive();
+    			break;
+    		case '15':
+    			$this->do_archive();
+    			break;
+    			
+    		case '20':
+    			$this->view_saved();
+    			break;
+    			
+    		case '21':
+    			$this->edit_saved = 1;
+    			$this->send();
+    			break;
+    			
+    		case '30':
+    			$this->show_tracking();
+    			break;
+    			
+    		case '31':
+    			$this->end_tracking();
+    			break;
+    			
+    		case '32':
+    			$this->del_tracked();
+    			break;
+    			
+    		case 'delete':
+    			$this->start_empty_folders();
+    			break;
+    		case 'dofolderdelete':
+    			$this->end_empty_folders();
+    			break;
+    			
+    		default:
+    			$this->msg_list();
+    			break;
+    	}
+    	
+    	// If we have any HTML to print, do so...
+    	
+    	$fj = $std->build_forum_jump();
+		$fj = preg_replace( "!#Forum Jump#!", $ibforums->lang['forum_jump'], $fj);
+		
+		$this->output .= $this->cp_html->CP_end();
+		
+		$this->output .= $this->cp_html->forum_jump($fj);
+    	
+    	$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Empty PM folders:
+ 	//
+ 	// Interface for removing PM's on a folder by folder basis
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function start_empty_folders()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$this->output .= $this->html->empty_folder_header();
+ 		
+ 		//-----------------------------------------
+ 		// Get the PM count - 1 query?
+ 		//-----------------------------------------
+ 		
+ 		$count = array( 'unsent' => 0 );
+ 		$names = array( 'unsent' => $ibforums->lang['fd_unsent'] );
+ 		
+ 		foreach( $ibforums->member['dir_data'] as $k => $v )
+ 		{
+ 			$count[ $v['id'] ] = 0;
+ 			$names[ $v['id'] ] = $v['real'];
+ 		}
+ 		
+ 		$DB->simple_construct( array( 'select' => 'mt_id, mt_vid_folder, mt_msg_id', 'from' => 'message_topics', 'where' => 'mt_owner_id='.$ibforums->member['id'] ) );
+ 		$DB->simple_exec();
+ 		
+ 		while( $r = $DB->fetch_row() )
+ 		{
+ 			if ( $r['mt_vid_folder'] == "" )
+ 			{
+ 				$count['in']++;
+ 			}
+ 			else
+ 			{
+ 				$count[ $r['mt_vid_folder'] ]++;
+ 			}
+ 		}
+ 		
+ 		foreach( $names as $vid => $name )
+ 		{
+ 			$this->output .= $this->html->empty_folder_row( $name, $vid, $count[$vid] );
+ 		}
+ 		
+ 		$this->output .= $this->html->empty_folder_save_unread();
+ 		$this->output .= $this->html->empty_folder_footer();
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// DELETE emptied PMS
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function end_empty_folders()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$names = array( 'unsent' => $ibforums->lang['fd_unsent'] );
+ 		$ids   = array();
+ 		$qe = "";
+ 		
+ 		foreach( $ibforums->member['dir_data'] as $k => $v )
+ 		{
+ 			$names[ $v['id'] ] = $v['real'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Did we check any boxes?
+ 		//-----------------------------------------
+ 		
+ 		foreach( $names as $vid => $name )
+ 		{
+ 			if ( $ibforums->input['its_'.$vid] == 1 )
+ 			{
+ 				$ids[] = $vid;
+ 			}
+ 		}
+ 		
+ 		if ( count($ids) < 1 )
+ 		{
+ 			$std->Error( array(  'LEVEL' => 1, 'MSG' => 'fd_noneselected' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Delete em!
+ 		//-----------------------------------------
+ 		
+ 		if ( $ibforums->input['save_unread'] )
+ 		{
+ 			$qe = ' AND mt_read=1';
+ 		}
+ 		
+ 		$mtids = array();
+ 		
+ 		$DB->simple_construct( array( 'select' => 'mt_id', 'from' => 'message_topics', 'where' => 'mt_owner_id='.$ibforums->member['id']." AND mt_vid_folder IN('".implode("','", $ids)."')".$qe ) );
+ 		$DB->simple_exec();
+ 		
+ 		while( $d = $DB->fetch_row() )
+ 		{
+ 			$mtids[] = $d['mt_id'];
+ 		}
+ 		
+ 		$this->lib->delete_messages( $mtids, $ibforums->member['id'] );
+ 		
+ 		$DB->simple_construct( array ( 'select' => 'COUNT(*) as msg_total', 'from' => 'message_topics', 'where' => "mt_owner_id=".$ibforums->member['id']." AND mt_vid_folder <> 'unsent'" ) );
+ 		$DB->simple_exec();
+ 		
+ 		$total = $DB->fetch_row();
+ 		
+ 		$total['msg_total'] = intval($total['msg_total']);
+ 		
+ 		$DB->simple_construct( array ( 'update'=> 'members', 'set' => "msg_total=".$total['msg_total'], 'where' => "id=".$ibforums->member['id'] ) ) ;
+ 		$DB->simple_exec();
+ 		
+ 		$std->boink_it($ibforums->base_url."act=Msg&CODE=delete");
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// ARCHIVE:
+ 	//
+ 	// Allows a user to archive and email a HTML file
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function archive() 
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$this->jump_html = preg_replace("/<!--EXTRA-->/", "<option value='all'>".$ibforums->lang['all_folders']."</option>", $this->jump_html );
+ 		
+ 		$this->output .= $this->html->archive_form( $this->jump_html );
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Process archive
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function do_archive()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		require ROOT_PATH."sources/classes/class_email.php";
+		
+		$this->email = new emailer();
+ 		
+ 		//-----------------------------------------
+ 		// Did we specify a folder, or choose all?
+ 		//-----------------------------------------
+ 		
+ 		$folder_query  = "";
+ 		$msg_ids       = array();
+ 		$older_newer   = '>';
+ 		
+ 		if ( $ibforums->input['oldnew'] == 'older' )
+ 		{
+ 			$older_newer = '<';
+ 		}
+ 		
+ 		if ($ibforums->input['VID'] != 'all')
+ 		{
+ 			$folder_query = " AND mt.mt_vid_folder='".$ibforums->input['VID']."'";
+ 		}
+ 		
+ 		if ( $ibforums->input['dateline'] == 'all' )
+ 		{
+ 			$time_cut    = 0;
+ 			$older_newer = '>';
+ 		}
+ 		else
+ 		{
+ 			$time_cut = time() - ($ibforums->input['dateline'] * 60 * 60 *24);
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Check the input...
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->input['number'] = intval( $ibforums->input['number'] );
+ 		
+ 		if ($ibforums->input['number'] < 5)
+ 		{
+ 			$ibforums->input['number'] = 5;
+ 		}
+ 		
+ 		if ($ibforums->input['number'] > 50)
+ 		{
+ 			$ibforums->input['number'] = 50;
+ 		}
+ 		
+ 		$type      = 'html';
+ 		$file_name = "pm_archive.html";
+ 		$ctype     = "text/html";
+ 		
+ 		if ($ibforums->input['type'] == 'xls')
+ 		{
+ 			$type      = 'xls';
+ 			$file_name = "xls_importable.txt";
+ 			$ctype     = "text/plain";
+ 		}
+ 		
+ 		$output = "";
+ 		
+ 		//-----------------------------------------
+ 		// Start the datafile..
+ 		//-----------------------------------------
+ 		
+ 		if ($type == 'html')
+ 		{
+ 			$output .= $this->html->archive_html_header();
+ 		}
+ 		
+ 		require ROOT_PATH."sources/lib/post_parser.php";
+        
+        $this->parser = new post_parser();
+ 		
+ 		//-----------------------------------------
+ 		// Get the messages...
+ 		//-----------------------------------------
+ 		
+ 		$DB->cache_add_query( 'msg_get_msg_archive', array( 'mid' => $ibforums->member['id'], 'limit_b' => $ibforums->input['number'], 'older_newer' => $older_newer, 'time_cut' => $time_cut, 'folder_query' => $folder_query ) );
+ 		$DB->cache_exec_query();
+ 		
+ 		//-----------------------------------------
+ 		// Repeat after me..
+ 		//-----------------------------------------
+ 		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			while ( $r = $DB->fetch_row() )
+ 			{
+ 				$info = array();
+ 				
+ 				$msg_ids[] = $r['mt_id'];
+ 				
+ 				$info['msg_date']    = $std->get_date( $r['mt_date'], 'LONG' );
+ 				$info['msg_title']   = $r['mt_title'];
+ 				$info['msg_sender']  = $r['name'];
+				$info['msg_content'] = $this->parser->convert( array( 'TEXT'    => $r['msg_post'],
+																	  'SMILIES' => 0,
+																	  'CODE'    => $ibforums->vars['msg_allow_code'],
+																	  'HTML'    => $ibforums->vars['msg_allow_html']
+																	)
+															 );
+ 				
+ 				if ($type == 'xls')
+ 				{
+ 					$output .= '"'.$this->strip_quotes($info['msg_title']).'","'.$this->strip_quotes($info['msg_date']).'","'.$this->strip_quotes($info['msg_sender']).'","'.$this->strip_quotes($info['msg_content']).'"'."\r";
+ 				}
+ 				else
+ 				{
+ 					if ( $r['vid'] == 'sent' )
+ 					{
+ 						$info['msg_sender']  = $r['rec_name'];
+ 						$output .= $this->html->archive_html_entry_sent($info);
+ 					}
+ 					else
+ 					{
+ 						$output .= $this->html->archive_html_entry($info);
+ 					}
+ 				}
+ 			}
+ 			
+ 			if ($type == 'html')
+			{
+				$output .= $this->html->archive_html_footer();
+			}
+			
+			$num_msg = count( $msg_ids );
+			
+			//-----------------------------------------
+			// Delete?
+			//-----------------------------------------
+			
+			if ($ibforums->input['delete'] == 'yes')
+			{
+				$this->lib->delete_messages( $msg_ids, $ibforums->member['id'] );
+				
+				$DB->simple_construct( array ( 'select' => 'COUNT(*) as msg_total', 'from' => 'message_topics', 'where' => "mt_owner_id=".$ibforums->member['id']." AND mt_vid_folder <> 'unsent'" ) );
+				$DB->simple_exec();
+				
+				$total = $DB->fetch_row();
+				
+				$total['msg_total'] = intval($total['msg_total']);
+				
+				$DB->simple_construct( array ( 'update'=> 'members', 'set' => "msg_total=".$total['msg_total'], 'where' => "id=".$ibforums->member['id'] ) ) ;
+				$DB->simple_exec();
+			}
+			
+			//-----------------------------------------
+			// Process & Print
+			//-----------------------------------------
+			
+			$output = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $output );
+			
+			$this->email->get_template("pm_archive");
+			
+			$this->email->build_message( array( 'NAME' => $ibforums->member['name'] ) );
+										
+			$this->email->subject = $ibforums->lang['arc_email_subject'];
+			$this->email->to      = $ibforums->member['email'];
+			$this->email->add_attachment( $output, $file_name, $ctype );
+			$this->email->send_mail();
+			
+			//-----------------------------------------
+			// Done..
+			//-----------------------------------------
+			
+			$ibforums->lang['arc_complete'] = str_replace( "<#NUM#>", $num_msg, $ibforums->lang['arc_complete'] );
+			
+			$this->output .= $this->html->archive_complete();
+ 		
+			$this->page_title = $ibforums->lang['t_welcome'];
+			$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+			
+		}
+		else
+		{
+			$std->Error( array(  'LEVEL' => 1, 'MSG' => 'no_archive_messages' ) );
+		}
+ 	}
+
+	/*-------------------------------------------------------------------------*/
+	// Strip Quotes
+	/*-------------------------------------------------------------------------*/
+	
+	function strip_quotes($text) {
+ 	
+ 		return preg_replace( "/\"/", '\\\"', $text );
+ 	}	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// PREFS:
+ 	//
+ 	// Create/delete/edit messenger folders
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function prefs()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$this->output .= $this->html->prefs_header();
+ 		
+ 		$max = 1;
+ 		
+ 		foreach( $ibforums->member['dir_data'] as $k => $v )
+ 		{
+ 			$extra = "";
+ 			if ($v['id'] == 'in' or $v['id'] == 'sent')
+ 			{
+ 				$extra = "&nbsp;&nbsp;( ".$v['real']." - ".$ibforums->lang['cannot_remove']." )";
+ 			}
+ 			
+ 			$this->output .= $this->html->prefs_row( array( 'ID' => $v['id'], 'REAL' => $v['real'], 'EXTRA' => $extra ) );
+ 			
+ 			if ( stristr( $v['id'], 'dir_' ) )
+ 			{
+ 				$max = intval( str_replace( 'dir_', "", $v['id'] ) ) + 1;
+ 			}
+ 		}
+ 		
+ 		$count = $max + 1;
+ 		
+ 		$this->output .= $this->html->prefs_add_dirs();
+ 		
+ 		for ($i = $count; $i < $count+3; $i++)
+ 		{
+ 			$this->output .= $this->html->prefs_row( array( 'ID' => 'dir_'.$i, 'REAL' => '', 'EXTRA' => '' ) );
+ 		}
+ 		
+ 		$this->output .= $this->html->prefs_footer();
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SAVE FOLDERS
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function do_prefs()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Check to ensure than we've not tried to
+ 		// remove the inbox and sent items directories.
+ 		//-----------------------------------------
+ 		
+ 		if ( ($ibforums->input['sent'] == "") or ($ibforums->input['in'] == "") )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cannot_remove_dir' ) );
+ 		}
+ 		
+ 		
+ 		$v_dir = 'in:'.$ibforums->input['in'].'|sent:'.$ibforums->input['sent'];
+ 		
+ 		//-----------------------------------------
+ 		// Fetch the rest of the dirs
+ 		//-----------------------------------------
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^dir_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$v_dir .= '|'.$match[0].':'.trim(str_replace( '|', '', str_replace( ";", "", $ibforums->input[$match[0]] ) ) );
+ 				}
+ 			}
+ 		}
+ 		
+ 		$DB->simple_construct( array('update' => 'member_extra', 'set' => "vdirs='$v_dir'", 'where' => 'id='.$ibforums->member['id']) );
+ 		$DB->simple_exec();
+ 		
+ 		$std->boink_it($ibforums->base_url."act=Msg&CODE=07");
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// DELETE_MEMBER:
+ 	//
+ 	// Removes a member from address book.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function del_member()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		if (!$ibforums->input['MID'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		if (! preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		$DB->simple_exec_query( array( 'delete' => 'contacts', 'where' => "member_id={$ibforums->member['id']} AND contact_id={$ibforums->input['MID']}" ) );
+ 		
+ 		$std->boink_it($this->base_url."act=Msg&CODE=02");
+	}
+	
+	/*-------------------------------------------------------------------------*/
+ 	// EDIT_MEMBER:
+ 	//
+ 	// Edit a member from address book.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function edit_member()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		if (!$ibforums->input['MID'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		if (! preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		$DB->simple_construct( array( 'select' => '*', 'from' => 'contacts', 'where' => "member_id={$ibforums->member['id']} AND contact_id={$ibforums->input['MID']}" ) );
+		$DB->simple_exec();
+
+ 		$memb = $DB->fetch_row();
+ 		
+ 		if (!$memb['contact_id'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		$html = "<select name='allow_msg' class='forminput'>";
+ 		
+ 		if ($memb['allow_msg'])
+ 		{
+ 			$html .= "<option value='yes' selected>{$ibforums->lang['yes']}</option><option value='no'>{$ibforums->lang['no']}";
+ 		}
+ 		else
+ 		{
+ 			$html .= "<option value='yes'>{$ibforums->lang['yes']}</option><option value='no' selected>{$ibforums->lang['no']}";
+ 		}
+ 		
+ 		$html .= "</select>";
+ 		
+ 		$this->output .= $this->html->address_edit( array( 'SELECT' => $html, 'MEMBER' => $memb ) );
+ 		
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."&amp;act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>",
+ 								   "<a href='".$this->base_url."act=Msg&CODE=02'>".$ibforums->lang['t_book']."</a>"  );
+ 	}
+ 	
+	/*-------------------------------------------------------------------------*/
+ 	// DO_EDIT_MEMBER:
+ 	//
+ 	// Edit a member from address book.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function do_edit()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		if (!$ibforums->input['MID'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		if (! preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		$ibforums->input['allow_msg'] = $ibforums->input['allow_msg'] == 'yes' ? 1 : 0;
+ 		
+ 		$DB->simple_construct( array( 'select' => '*', 'from' => 'contacts', 'where' => "member_id={$ibforums->member['id']} AND contact_id={$ibforums->input['MID']}" ) );
+		$DB->simple_exec();
+		
+ 		$memb = $DB->fetch_row();
+ 		
+ 		if (!$memb['contact_id'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		$DB->do_update( 'contacts', array( 'contact_desc' => $ibforums->input['mem_desc'],
+ 										   'allow_msg'    => $ibforums->input['allow_msg'],
+ 										 ), 'id='.$memb['id'] );
+ 		
+ 		$std->boink_it($this->base_url."act=Msg&CODE=02");
+ 	}
+ 		
+ 	/*-------------------------------------------------------------------------*/
+ 	// CONTACT:
+ 	//
+ 	// Shows the address book.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function contact()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$this->output .= $this->html->Address_header();
+ 		
+ 		$DB->simple_construct( array( 'select' => '*',
+ 									  'from'   => 'contacts',
+ 									  'where'  => "member_id={$ibforums->member['id']}",
+ 									  'order'  =>  "contact_name ASC" ) );
+		$DB->simple_exec();
+		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 		
+ 			$this->output .= $this->html->Address_table_header();
+ 			while ( $row = $DB->fetch_row() )
+ 			{
+ 				$row['text'] = $row['allow_msg']
+ 							 ? $ibforums->lang['can_contact']
+ 							 : $ibforums->lang['cannot_contact'];
+ 							 
+ 				$this->output .= $this->html->render_address_row($row);
+ 			}
+ 			
+ 			$this->output .= $this->html->end_address_table();
+ 		}
+ 		else
+ 		{
+ 			$this->output .= $this->html->Address_none();
+ 			
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Do we have a name to enter?
+ 		//-----------------------------------------
+ 		
+ 		$name_to_enter = "";
+ 		
+ 		if ($ibforums->input['MID'])
+ 		{
+ 			if ( preg_match( "/^(\d+)$/", $ibforums->input['MID'] ) )
+ 			{
+ 				$DB->simple_construct( array( 'select' => 'name,id', 'from' => 'members', 'where' => "id={$ibforums->input['MID']}" ) );
+				$DB->simple_exec();
+
+ 				$memb = $DB->fetch_row();
+ 				
+ 				if ($memb['id'])
+ 				{
+ 					$name_to_enter = $memb['name'];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$this->output .= $this->html->address_add($name_to_enter);
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// ADD MEMBER:
+ 	//
+ 	// Adds a member to the addy book.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function add_member()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		if (! $ibforums->input['mem_name'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		$DB->simple_construct( array( 'select' => 'name,id', 'from' => 'members', 'where' => "LOWER(name)='".$ibforums->input['mem_name']."'" ) );
+		$DB->simple_exec();
+ 		
+ 		$memb = $DB->fetch_row();
+ 		
+ 		if (! $memb['id'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_user' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Do we already have this member in our
+ 		// address book?
+ 		//-----------------------------------------
+ 		
+ 		$DB->simple_construct( array( 'select' => '*', 'from' => 'contacts', 'where' => "member_id={$ibforums->member['id']} AND contact_id={$memb['id']}" ) );
+		$DB->simple_exec();
+ 		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'member_in_add_book' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Insert it into the DB
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->input['allow_msg'] = $ibforums->input['allow_msg'] == 'yes' ? 1 : 0;
+ 		
+ 		$DB->do_insert( 'contacts', array( 
+										  'member_id'      => $ibforums->member['id'],
+										  'contact_name'   => $memb['name'],
+										  'allow_msg'      => $ibforums->input['allow_msg'],
+										  'contact_desc'   => $ibforums->input['mem_desc'],
+										  'contact_id'     => $memb['id']
+								 )      );
+		
+		$std->boink_it($this->base_url."act=Msg&CODE=02");
+	}
+ 		
+ 	/*-------------------------------------------------------------------------*/
+ 	// Mutli Act:
+ 	//
+ 	// Removes or moves messages.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function multi_act()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Get the ID's to delete
+ 		//-----------------------------------------
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^msgid_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$affected_ids = count($ids);
+ 		
+ 		if ( $affected_ids > 0 )
+ 		{
+ 			$id_string = implode( ",", $ids );
+ 			
+ 			if ($ibforums->input['delete'])
+ 			{
+ 				$this->lib->delete_messages( $ids, $ibforums->member['id'] );
+ 				
+ 				if ($ibforums->input['saved'])
+ 				{
+ 					//-----------------------------------------
+ 					// Did we delete from the saved folder? If so, don't update the msg stats and
+ 					// redirect back to the saved folder.
+ 					//-----------------------------------------
+ 					
+ 					$std->boink_it($this->base_url."act=Msg&CODE=20");
+ 				}
+ 				else
+ 				{
+ 					$this->lib->rebuild_dir_count( $ibforums->member['id'],
+												   $ibforums->member['vdirs'],
+												   $this->vid,
+												   $ibforums->member['dir_data'][ $this->vid ]['count'] - $affected_ids,
+												   'save',
+												   "msg_total=msg_total-$affected_ids"
+												 );
+					
+					$std->boink_it($this->base_url."act=Msg&CODE=01&VID={$this->vid}");
+					
+ 				}
+ 				
+ 			}
+ 			else if ($ibforums->input['move'])
+ 			{
+ 				$DB->simple_construct( array( 'update' => 'message_topics', 'set' => "mt_vid_folder='{$this->vid}'", 'where' => "mt_vid_folder != '{$this->vid}' AND mt_owner_id=".$ibforums->member['id']." AND mt_id IN ($id_string)" ) );
+ 				$DB->simple_exec();
+				
+				if ( $DB->get_affected_rows() )
+				{			   
+					$this->lib->rebuild_dir_count( $ibforums->member['id'],
+												   $this->lib->rebuild_dir_count( $ibforums->member['id'],
+																				  $ibforums->member['vdirs'],
+																				  $ibforums->input['curvid'],
+																				  $ibforums->member['dir_data'][ $ibforums->input['curvid'] ]['count'] - $affected_ids,
+																				  'nosave'
+																				),
+												   $this->vid,
+												   $ibforums->member['dir_data'][ $this->vid ]['count'] + $affected_ids,
+												   'save'
+												 );
+				}
+												 	
+ 				$std->boink_it($this->base_url."act=Msg&CODE=01&VID={$this->vid}");
+ 				
+ 			}
+ 			else
+ 			{
+ 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// END TRACKING
+ 	//
+ 	// Removes read tracked messages
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function end_tracking()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Get the ID's to delete
+ 		//-----------------------------------------
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^msgid_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$affected_ids = count($ids);
+ 		
+ 		if ( $affected_ids > 0 )
+ 		{
+ 			$id_string = implode( ",", $ids );
+ 			
+ 			$DB->simple_construct( array( 'update' => 'message_topics', 'set' => 'mt_tracking=0', 'where' => "mt_tracking=1 AND mt_read=1 AND mt_from_id={$ibforums->member['id']} AND mt_id IN ($id_string)" ) );
+ 			$DB->simple_exec();
+ 			 					
+ 			$std->boink_it($this->base_url."act=Msg&CODE=30");
+ 		}
+ 		else
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Delete tracked messages
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function del_tracked()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Get the ID's to delete
+ 		//-----------------------------------------
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^msgid_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$affected_ids = count($ids);
+ 		
+ 		if ( $affected_ids > 0 )
+ 		{
+ 			$id_string = implode( ",", $ids );
+ 			
+ 			$this->lib->delete_messages( $ids, $ibforums->member['id'], "mt_read=0 and mt_tracking=1 AND mt_from_id=".$ibforums->member['id'] );
+ 			
+ 			$std->boink_it($this->base_url."act=Msg&CODE=30");
+ 		}
+ 		else
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// DELETE MESSAGE:
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function delete()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 	
+ 		//-----------------------------------------
+ 		// check for a msg ID
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->input['MSID'] = intval($ibforums->input['MSID']);
+ 		
+ 		if ( ! $ibforums->input['MSID'] )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msg_chosen' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Delete it from the DB
+ 		//-----------------------------------------
+ 		
+ 		$this->lib->delete_messages( $ibforums->input['MSID'], $ibforums->member['id'] );
+ 		
+ 		$this->lib->rebuild_dir_count( $ibforums->member['id'],
+ 									   $ibforums->member['vdirs'],
+ 									   $this->vid,
+ 									   $ibforums->member['dir_data'][ $this->vid ]['count'] - 1,
+ 									   'save',
+ 									   "msg_total=msg_total-1"
+ 									 );
+ 		
+ 		$std->boink_it($this->base_url."act=Msg&CODE=01&VID={$this->vid}");
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// VIEW MESSAGE:
+ 	//
+ 	// Views a message, thats it. No, it doesn't do anything else
+ 	// I don't know why. It just does. Accept it and move on dude.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function view_msg()
+ 	{
+		global $ibforums, $DB, $std, $print, $skin_universal;
+ 		
+ 		//-----------------------------------------
+ 		// Get extra LIBBIES
+ 		//-----------------------------------------
+ 		
+ 		require_once( ROOT_PATH.'sources/topics.php' );
+ 		
+ 		$this->topiclib = new topics();
+ 		$this->topiclib->topic_init();
+ 		
+ 		//-----------------------------------------
+ 		// check for a msg ID
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->input['MSID'] = intval($ibforums->input['MSID']);
+ 		
+ 		if (! $ibforums->input['MSID'] )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_msg' ) );
+ 		}
+ 		
+ 		$DB->cache_add_query( 'msg_get_msg_to_show', array( 'msgid' => $ibforums->input['MSID'], 'mid' => $ibforums->member['id'] ) );
+ 		$DB->simple_exec();
+ 		
+ 		if ( ! $msg = $DB->fetch_row() )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_msg' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Did we read this in the pop up?
+ 		// If so, reduce new count by 1 (this msg)
+ 		// 'cos if we went via inbox, we'd have
+ 		// no new msg
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->member['new_msg'] >= 1)
+ 		{
+ 			$DB->simple_construct( array( 'update' => 'members', 'set' => "new_msg=new_msg-1", 'where' => "id=".$ibforums->member['id'] ) );
+ 			$DB->simple_exec();
+ 		}
+ 		
+		//-----------------------------------------
+ 		// Is this an unread message?
+ 		//-----------------------------------------
+ 		
+ 		if ($msg['mt_read'] < 1)
+ 		{
+ 			$DB->simple_construct( array( 'update' => 'message_topics', 'set' => "mt_read=1, mt_user_read=".time(), 'where' => "mt_id=".$ibforums->input['MSID'] ) );
+ 			$DB->simple_exec();
+ 		}
+ 		
+ 		$msg['msg_date'] = $std->get_date( $msg['msg_date'], 'LONG' );
+ 		
+ 		
+ 		$member = $this->topiclib->parse_member( $msg );
+ 		
+ 		$msg['msg_post'] = $this->topiclib->parser->convert( array( 'TEXT'    => $msg['msg_post'],
+																	'SMILIES' => 1,
+																	'CODE'    => $ibforums->vars['msg_allow_code'],
+																	'HTML'    => $ibforums->vars['msg_allow_html']
+														   )      );
+														 
+		$this->topiclib->parser->pp_do_html  = intval($ibforums->vars['msg_allow_html']);
+		$this->topiclib->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+		$this->topiclib->parser->pp_nl2br    = 1;
+			
+		$msg['msg_post'] = $this->topiclib->parser->post_db_parse($msg['msg_post']);
+			
+		if ( $ibforums->member['view_sigs'] and $member['signature'] )
+		{
+			$member['signature'] = $this->topiclib->parser->convert( array( 'TEXT'    => $member['signature'],
+																			'SMILIES' => 0,
+																			'CODE'    => $ibforums->vars['sig_allow_ibc'],
+																			'HTML'    => $ibforums->vars['sig_allow_html'],
+																			'SIGNATURE'=> 1,
+																   )      );
+			
+			$this->topiclib->parser->pp_do_html  = intval($ibforums->vars['sig_allow_html']);
+			$this->topiclib->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+			$this->topiclib->parser->pp_nl2br    = 1;
+			
+			$member['signature'] = $this->topiclib->parser->post_db_parse($member['signature']);
+			$member['signature'] = $ibforums->skin_global->signature_separator($member['signature']);
+		}
+		else
+		{
+			$member['signature'] = "";
+		}
+		
+		$member['VID'] = $ibforums->member['current_id'];
+		
+		//-----------------------------------------
+		// To , CC, etc?
+		//-----------------------------------------
+		
+		if ( ! $msg['mt_hide_cc'] )
+		{
+			$cc_users = $this->lib->format_cc_string( $msg['msg_cc_users'], $ibforums->member['id'] );
+			
+			if ( $cc_users )
+			{
+				$msg['show_cc_users'] = $this->html->render_msg_show_cc( $cc_users );
+			}
+		}
+		
+		$html = $this->html->Render_msg( $msg, $member, $this->jump_html );
+		
+		//-----------------------------------------
+		// Attachments?
+		//-----------------------------------------
+		
+		if ( $msg['mt_hasattach'] )
+		{
+			$html = $this->topiclib->parse_attachments( $html, array( $msg['msg_id'] ), 'attach_msg', 'msg', 'msg' );
+		}
+		
+		$this->output .= $html;
+		
+		$this->page_title = $ibforums->lang['t_welcome'];
+		
+		$this->nav        = array( "<a href='".$this->base_url."&amp;act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>",
+								   "<a href='".$this->base_url."act=Msg&CODE=01&VID={$member['VID']}'>".$ibforums->member['current_dir']."</a>",
+								   $msg['mt_title']
+								 );						   
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SEND MESSAGE:
+ 	//
+ 	// Sends a message. Yes, it's that simple. Why so much code?
+ 	// Because typing "send a message to member X" doesnt actually
+ 	// do anything.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function send()
+ 	{
+		global $ibforums, $DB, $std, $forums;
+ 		
+ 		//-----------------------------------------
+ 		// Set up and stuff
+ 		//-----------------------------------------
+ 		
+ 		$this->post_key = $ibforums->input['post_key'] ? $ibforums->input['post_key'] : md5(microtime());
+ 		
+ 		$this->lib->init();
+ 		$this->lib->register_class( &$this );
+ 		
+ 		$show_form = 0;
+ 		
+ 		//-----------------------------------------
+		// Did we remove an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['removeattachid'] )
+		{
+			if ( $ibforums->input[ 'removeattach_'. $ibforums->input['removeattachid'] ] )
+			{
+				$this->lib->postlib->pf_remove_attachment( intval($ibforums->input['removeattachid']), $this->post_key );
+				$this->show_form = 1;
+			}
+		}
+		
+		//-----------------------------------------
+		// Did we add an attachment?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['attachgo'] )
+		{
+			$this->upload_id = $this->lib->postlib->process_upload();
+			$this->show_form = 1;
+		}
+		
+		//-----------------------------------------
+		// Did we preview?
+		//-----------------------------------------
+		
+		if ($ibforums->input['preview'] != "")
+ 		{
+ 			$this->show_form = 1;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Show form or...
+ 		//-----------------------------------------
+ 		
+ 		if ( $ibforums->input['MODE'] and $this->show_form != 1 )
+ 		{
+ 			$this->send_msg();
+ 		}
+ 		else
+ 		{
+ 			$this->lib->send_form($ibforums->input['preview']);
+ 			
+ 			$this->output .= $this->lib->output;
+ 		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SEND MESSAGE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function send_msg()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_error'   , $ibforums->lang_id);
+ 		
+ 		$ibforums->input['from_contact'] = $ibforums->input['from_contact'] ? $ibforums->input['from_contact'] : '-';
+ 		
+ 		//-----------------------------------------
+ 		// Error checking
+ 		//-----------------------------------------
+ 		
+ 		if ( strlen($ibforums->input['msg_title']) < 2 )
+ 		{
+ 			$this->lib->send_form( 0, $ibforums->lang['err_no_title'] );
+ 			$this->output .= $this->lib->output;
+ 			return;
+ 		}
+ 		
+ 		if ( strlen($ibforums->input['Post']) < 2 )
+ 		{
+ 			$this->lib->send_form( 0, $ibforums->lang['err_no_msg'] );
+ 			$this->output .= $this->lib->output;
+ 			return;
+ 		}
+ 		
+ 		if ($ibforums->input['from_contact'] == '-' and $ibforums->input['entered_name'] == "")
+ 		{
+ 			$this->lib->send_form( 0, $ibforums->lang['err_no_chosen_member'] );
+ 			$this->output .= $this->lib->output;
+ 			return;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// TO:
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->input['from_contact'] == '-')
+ 		{
+ 			$this->lib->to = $ibforums->input['entered_name'];
+ 		}
+ 		else
+ 		{
+ 			$this->lib->to_by_id = $ibforums->input['from_contact'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// SEND
+ 		//-----------------------------------------
+ 		
+ 		$this->lib->cc_users    = $std->clean_value( $std->txt_UNhtmlspecialchars($_POST['carbon_copy']) );
+ 		$this->lib->from_member = $ibforums->member;
+ 		$this->lib->msg_title   = $ibforums->input['msg_title'];
+ 		$this->lib->msg_post    = $ibforums->input['Post'];
+ 		
+ 		$this->lib->send_pm( array( 'save_only' => $ibforums->input['save'],
+							        'orig_id'   => intval($ibforums->input['OID']),
+							        'preview'   => $ibforums->input['preview'],
+							        'track'     => $ibforums->input['add_tracking'],
+							        'add_sent'  => $ibforums->input['add_sent'],
+							        'hide_cc'   => $ibforums->input['mt_hide_cc']
+						   )     );
+ 		
+ 		if ( $this->lib->error != "" )
+ 		{
+ 			$this->lib->send_form( 0,$this->lib->error );
+ 			$this->output .= $this->lib->output;
+ 			return;
+ 		}
+		
+		if ( $this->lib->redirect_url )
+		{
+			$print->redirect_screen( $this->lib->redirect_lang, $this->lib->redirect_url );
+		}
+		
+		//-----------------------------------------
+		// Swap and serve...
+		//-----------------------------------------
+		
+		$text = preg_replace( "/<#FROM_MEMBER#>/"   , $ibforums->member['name'] , $ibforums->lang['sent_text'] );
+		$text = preg_replace( "/<#MESSAGE_TITLE#>/" , $ibforums->input['msg_title'], $text );
+		
+		$print->redirect_screen( $text , "&act=Msg&CODE=01" );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// MSG LIST:
+ 	//
+ 	// Views the inbox / folder of choice
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function msg_list()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$sort_key = "";
+ 		
+ 		switch ($ibforums->input['sort'])
+ 		{
+ 			case 'rdate':
+ 				$sort_key = 'mt_date ASC';
+ 				break;
+ 			case 'title':
+ 				$sort_key = 'mt_title ASC';
+ 				break;
+ 			case 'name':
+ 				$sort_key = 'mt_from_id ASC';
+ 				break;
+ 			default:
+ 				$sort_key = 'mt_date DESC';
+ 				break;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Get the number of messages we have in total.
+ 		//-----------------------------------------
+ 		
+ 		$DB->simple_construct( array ( 'select' => 'COUNT(*) as msg_total', 'from' => 'message_topics', 'where' => "mt_owner_id=".$ibforums->member['id']." AND mt_vid_folder != 'unsent'" ) );
+ 		$DB->simple_exec();
+ 		
+ 		$total = $DB->fetch_row();
+ 		
+ 		$total['msg_total'] = intval($total['msg_total']);
+ 		
+ 		if ( $total['msg_total'] != $ibforums->member['msg_total'] )
+ 		{
+ 			$DB->simple_construct( array ( 'update'=> 'members', 'set' => "msg_total=".$total['msg_total'], 'where' => "id=".$ibforums->member['id'] ) ) ;
+ 			$DB->simple_exec();
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Get the number of messages in our curr folder.
+ 		//-----------------------------------------
+ 		
+ 		$DB->simple_construct( array ( 'select' => 'COUNT(*) as msg_total', 'from' => 'message_topics', 'where' => "mt_owner_id=".$ibforums->member['id']." AND mt_vid_folder='{$this->vid}'" ) );
+ 		$DB->simple_exec();
+ 		
+ 		$total_current = $DB->fetch_row();
+ 		
+ 		$total_current['msg_total'] = intval($total_current['msg_total']);
+ 		
+ 		if ( $total_current['msg_total'] != $ibforums->member['dir_data'][ $this->vid ]['count'] )
+ 		{
+ 			$this->lib->rebuild_dir_count( $ibforums->member['id'], $ibforums->member['vdirs'], $this->vid, $total_current['msg_total'] );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Make sure we've not exceeded our alloted allowance.
+ 		//-----------------------------------------
+ 		
+ 		$info['full_messenger'] = "<br />";
+ 		$info['full_text']      = "";
+ 		$info['total_messages'] = $total['msg_total'];
+ 		$info['img_width']      = 1;
+ 		$info['vid']            = $this->vid;
+ 		$info['date_order']     = $sort_key == 'm.msg_date DESC' ? 'rdate' : 'msg_date';
+ 		
+ 		$amount_info            = sprintf( $ibforums->lang['pmpc_info_string'], $total['msg_total'] ,$ibforums->lang['pmpc_unlimited'] );
+ 		
+ 		if ($ibforums->member['g_max_messages'] > 0)
+ 		{
+ 			$amount_info          = sprintf( $ibforums->lang['pmpc_info_string'], $total['msg_total'] ,$ibforums->member['g_max_messages'] );
+ 			
+ 			$info['full_percent'] = $total['msg_total'] ? sprintf( "%.0f", ( ($total['msg_total'] / $ibforums->member['g_max_messages']) * 100) ) : 0;
+ 			$info['img_width']    = $info['full_percent'] > 0 ? intval($info['full_percent']) * 2.4 : 1;
+ 			
+ 			if ($info['img_width'] > 300)
+ 			{
+ 				$info['img_width'] = 300;
+ 			}
+ 			
+ 			if ($total['msg_total'] >=$ibforums->member['g_max_messages'])
+ 			{
+ 				$info['full_messenger'] = "<span class='highlight'>".$ibforums->lang['folders_full']."</span>";
+ 			}
+ 			else
+ 			{
+ 				$info['full_messenger'] = str_replace( "<#PERCENT#>", $info['full_percent'], $ibforums->lang['pmpc_full_string'] );
+ 			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Generate Pagination
+ 		//-----------------------------------------
+ 		
+ 		$start = intval($ibforums->input['st']) > 0 ? intval($ibforums->input['st']) : 0;
+ 		$p_end = $ibforums->vars['show_max_msg_list'] > 0 ? $ibforums->vars['show_max_msg_list'] : 50;
+ 	
+ 		
+ 		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_current['msg_total'],
+											   'PER_PAGE'    => $p_end,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "",
+											   'L_MULTI'     => $ibforums->lang['msg_pages'],
+											   'BASE_URL'    => $ibforums->base_url."act=Msg&amp;CODE=1&amp;VID=".$this->vid."&amp;sort=".$ibforums->input['sort'],
+									  )      );
+ 		
+ 		//-----------------------------------------
+ 		// Print the header
+ 		//-----------------------------------------
+ 		
+ 		if ($this->vid == 'sent')
+ 		{
+ 			$ibforums->lang['message_from'] = $ibforums->lang['message_to'];
+ 			
+ 			$DB->cache_add_query( 'msg_get_sent_list', array( 'mid' => $ibforums->member['id'], 'vid' => $this->vid, 'sort' => $sort_key, 'limita' => $start, 'limitb' => $p_end ) );
+ 			$DB->simple_exec();
+  		}
+ 		else
+ 		{
+ 			$DB->cache_add_query( 'msg_get_folder_list', array( 'mid' => $ibforums->member['id'], 'vid' => $this->vid, 'sort' => $sort_key, 'limita' => $start, 'limitb' => $p_end ) );
+ 			$DB->simple_exec();
+  		}
+ 		
+ 		$this->output .= $this->html->inbox_table_header( $ibforums->member['current_dir'], $info, $this->jump_html, $pages, $this->vid );
+ 		
+ 		//-----------------------------------------
+ 		// Get the messages
+ 		//-----------------------------------------
+ 		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			while( $row = $DB->fetch_row() )
+ 			{
+ 				if ( $row['mt_hasattach'] )
+				{
+					$row['attach_img'] = '<{ATTACH_ICON}>';
+				}
+			
+ 				if ($this->vid == 'sent')
+ 				{
+ 					$row['icon'] = "<{M_READ}>";
+ 				}
+ 				else
+ 				{
+ 					$row['icon'] = $row['mt_read'] == 1 ? "<{M_READ}>" : "<{M_UNREAD}>";
+ 				}
+ 				
+ 				$row['date'] = $std->get_date( $row['mt_date'] , 'LONG' );
+ 				
+ 				if ($this->vid != 'sent')
+ 				{
+ 					$row['add_to_contacts'] = "[ <a href='{$ibforums->base_url}act=Msg&amp;CODE=02&amp;MID={$row['from_id']}'>{$ibforums->lang[add_to_book]}</a> ]";
+ 				}
+ 				else
+ 				{
+ 					//$row['from_id'] = $row['mt_from_id'];
+ 				}
+ 				
+ 				$this->output .= $this->html->inbox_row( $row );
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$this->output .= $this->html->No_msg_inbox();
+ 		}
+ 		
+ 		
+ 		$this->output .= $this->html->end_inbox($this->jump_html, $amount_info, $pages);
+ 		
+ 		//-----------------------------------------
+ 		// Update the message stats if we have to
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->member['current_id'] == 'in' and $ibforums->member['new_msg'] > 0 )
+ 		{
+ 			$DB->simple_construct( array( 'update' => 'members', 'set' => 'new_msg=0', 'where' => 'id='.$ibforums->member['id'] ) );
+ 			$DB->simple_exec();
+ 		}
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 	}
+
+	/*-------------------------------------------------------------------------*/
+ 	// VIEW SAVED:
+ 	//
+ 	// View the saved folder stuff.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function view_saved()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Print the header
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->html->unsent_table_header();
+ 		
+ 		$DB->cache_add_query( 'msg_get_sent_list', array( 'mid' => $ibforums->member['id'], 'vid' => 'unsent', 'sort' => 'mt_date DESC', 'limita' => 0, 'limitb' => 5000 ) );
+ 		$DB->simple_exec();
+ 			
+ 		//-----------------------------------------
+ 		// Get the messages
+ 		//-----------------------------------------
+ 		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			while( $row = $DB->fetch_row() )
+ 			{
+ 				if ( $row['mt_hasattach'] )
+				{
+					$row['attach_img'] = '<{ATTACH_ICON}>';
+				}
+				
+ 				$row['icon']     = "<{M_READ}>";
+ 				$row['date']     = $std->get_date( $row['mt_date'] , 'LONG' );
+ 				$row['cc_users'] = $row['cc_users'] == "" ? $ibforums->lang['no'] : $ibforums->lang['yes'];
+ 				
+ 				$d_array = array( 'msg' => $row, 'member' => $ibforums->member );
+ 				
+ 				$this->output .= $this->html->unsent_row( $d_array );
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$this->output .= $this->html->No_msg_inbox();
+ 		}
+ 		
+ 		$this->output .= $this->html->unsent_end();
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SHOW TRACKED MESSAGE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function show_tracking()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Get all tracked and read messages
+ 		//-----------------------------------------
+ 		
+ 		$DB->cache_add_query( 'msg_get_tracking', array( 'mid' => $ibforums->member['id'] ) );
+		$DB->simple_exec();
+		
+		$read = array();
+		$unread = array();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $r['mt_read'] )
+			{
+				$read[ $r['mt_user_read'].','.$r['mt_id'] ] = $r;
+			}
+			else
+			{
+				$unread[ $r['mt_user_read'].','.$r['mt_id'] ] = $r;
+			}
+		}
+		
+		krsort( $read );
+		krsort( $unread );
+		
+		//-----------------------------------------
+ 		// READ MESSAGES
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->html->trackread_table_header();	
+
+ 		if ( count($read) )
+ 		{
+ 			foreach( $read as $id => $row )
+ 			{
+ 				$row['icon']     = "<{M_READ}>";
+ 				$row['date']     = $std->get_date( $row['mt_user_read'] , 'LONG' );
+ 				$this->output .= $this->html->trackread_row( $row );
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$this->output .= $this->html->No_msg_inbox();
+ 		}
+ 		
+ 		$this->output .= $this->html->trackread_end();
+ 		
+ 		//-----------------------------------------
+ 		// UNREAD MESSAGES
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->html->trackUNread_table_header();
+ 		
+ 		if ( count($unread) )
+ 		{
+ 			foreach( $unread as $id => $row )
+ 			{
+ 				$row['icon']     = "<{M_UNREAD}>";
+ 				$row['date']     = $std->get_date( $row['mt_date'] , 'LONG' );
+ 				$this->output .= $this->html->trackUNread_row( $row );
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$this->output .= $this->html->No_msg_inbox();
+ 		}
+ 		
+ 		$this->output .= $this->html->trackUNread_end();
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$this->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 	}
+        
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/misc/attach.php b/upload/sources/misc/attach.php
index 10c2a28a..6fc88ad6 100644
--- a/upload/sources/misc/attach.php
+++ b/upload/sources/misc/attach.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,69 +19,245 @@
 |   > Date started: 10th March 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
-
-$idx = new attach;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
 class attach {
 
-    
-    function attach()
+	/*-------------------------------------------------------------------------*/
+	//
+	// AUTO RUN
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function auto_run()
     {
-        global $ibforums, $DB, $std, $print, $skin_universal;
+		global $ibforums, $DB, $std, $print, $forums;
         
-        $ibforums->input['id'] = preg_replace( "/^(\d+)$/", "\\1", $ibforums->input['id'] );
+        $ibforums->input['id']  = intval($ibforums->input['id']);
+        $ibforums->input['tid'] = intval($ibforums->input['tid']);
         
-        if ($ibforums->input['id'] == "")
+        //-----------------------------------------
+		// Got attachment types?
+		//-----------------------------------------
+		
+		$ibforums->cache['attachtypes'] = array();
+			
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// What to do..
+		//-----------------------------------------
+		
+        switch( $ibforums->input['code'] )
+        {
+        	case 'showtopic':
+        		$this->show_topic_attachments();
+        		break;
+        	default:
+        		$this->show_post_attachment();
+        		break;
+        }
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// SHOW TOPIC ATTACHMENTS ( MULTIPLE )
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function show_topic_attachments()
+	{
+		global $DB, $ibforums, $std, $forums, $print;
+		
+        if ( ! $ibforums->input['tid'] )
         {
         	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
         }
         
-        if ($ibforums->input['type'] == 'post')
+        //-----------------------------------------
+        // get topic..
+        //-----------------------------------------
+        
+        $topic = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.$ibforums->input['tid'] ) );
+        
+        if ( ! $topic['topic_hasattach'] )
         {
-        	// Handle post attachments.
+        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        }
+        
+        //-----------------------------------------
+        // Check forum..
+        //-----------------------------------------
+        
+        if ( ! $forums->forum_by_id[ $topic['forum_id'] ] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
+		}
+		
+		//-----------------------------------------
+		// Get forum skin and lang
+		//-----------------------------------------
+		
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_forum', $ibforums->lang_id);
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_topic', $ibforums->lang_id);
+		
+        $this->html     = $std->load_template('skin_forum');
+		
+		//-----------------------------------------
+		// aight.....
+		//-----------------------------------------
+		
+		$this->output .= $this->html->forums_attachments_top($topic['title']);
+		
+		$DB->cache_add_query( 'forum_get_attachments', array( 'tid' => $ibforums->input['tid'] ) );
+    	
+    	$DB->cache_exec_query();
+    	
+		while ( $row = $DB->fetch_row() )
+		{
+			if ( $std->check_perms($forums->forum_by_id[ $row['forum_id'] ]['read_perms']) != TRUE )
+			{
+				continue;
+			}
+			
+			$row['image']       = $ibforums->cache['attachtypes'][ $row['attach_ext'] ]['atype_img'];
+			
+			$row['short_name']  = $std->txt_truncate( $row['attach_file'], 30 );
+															  
+			$row['attach_date'] = $std->get_date( $row['attach_date'], 'SHORT' );
+			
+			$row['real_size']   = $std->size_format( $row['attach_filesize'] );
+			
+			$this->output .= $this->html->forums_attachments_row( $row );
+		}
+		
+		$this->output .= $this->html->forums_attachments_bottom();
+		
+		$print->pop_up_window($ibforums->lang['attach_title'], $this->output);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// SHOW POST ATTACHMENT ( SINGLE )
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function show_post_attachment()
+	{
+		global $DB, $ibforums, $std, $forums, $print;
+		
+        if ( ! $ibforums->input['id'] )
+        {
+        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        }
+        
+        //-----------------------------------------
+        // get attachment
+        //-----------------------------------------
+        
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'attachments', 'where' => "attach_id=".$ibforums->input['id'] ) );
+        $DB->simple_exec();
+        
+        if ( ! $attach = $DB->fetch_row() )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+		}
+        
+        //-----------------------------------------
+        // Handle post attachments.
+        //-----------------------------------------
+        
+        if ( $ibforums->input['type'] == 'post' )
+        {
+        	//-----------------------------------------
+        	// Get post thingy majiggy to check perms
+        	//-----------------------------------------
         	
-        	$DB->query("SELECT pid, attach_id, attach_type, attach_file FROM ibf_posts WHERE pid='".$ibforums->input['id']."'");
+        	$DB->cache_add_query( 'attach_get_perms', array( 'apid' => $attach['attach_pid'] ) );
+        	$DB->cache_exec_query();
         	
-        	if ( !$DB->get_num_rows() )
+        	if ( ! $post = $DB->fetch_row() )
         	{
         		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
-        	}
+			}
         	
-        	$post = $DB->fetch_row();
-        	
-        	if ( $post['attach_id'] == "" )
+        	if ( ! $forums->forum_by_id[ $post['forum_id'] ] )
         	{
-        		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
-        	}
-        	
-        	$file = $ibforums->vars['upload_dir']."/".$post['attach_id'];
-        	
-        	if ( file_exists( $file ) and ( $post['attach_type'] != "" ) )
-        	{
-        		// Update the "hits"..
-        		
-        		$DB->query("UPDATE ibf_posts SET attach_hits=attach_hits+1 WHERE pid='".$post['pid']."'");
-        		
-        		// Set up the headers..
-        		
-        		@header( "Content-Type: ".$post['attach_type']."\nContent-Disposition: inline; filename=\"".$post['attach_file']."\"\nContent-Length: ".(string)(filesize( $file ) ) );
-        		
-        		// Open and display the file..
-        		
-        		$fh = fopen( $file, 'rb' );  // Set binary for Win even if it's an ascii file, it won't hurt.
-        		fpassthru( $fh );
-        		@fclose( $fh );
-        		exit();
-        	}
-        	else
-        	{
-        		// File does not exist..
-        		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
         	}
         }
+        else if ( $ibforums->input['type'] == 'msg' and $attach['attach_msg'] )
+        {
+        	$DB->simple_construct( array( 'select' => 'mt_id, mt_owner_id', 'from' => 'message_topics', 'where' => 'mt_owner_id='.$ibforums->member['id'].' AND mt_msg_id='.$attach['attach_msg'] ) );
+        	$DB->simple_exec();
+        	
+        	if ( ! $post = $DB->fetch_row() )
+        	{
+        		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+			}
+			
+        }
+        else
+        {
+        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+        }
+        
+        //-----------------------------------------
+        // Show attachment
+        //-----------------------------------------
+        
+        $file = $ibforums->vars['upload_dir']."/".$attach['attach_location'];
+        	
+		if ( file_exists( $file ) and ( $ibforums->cache['attachtypes'][ $attach['attach_ext'] ]['atype_mimetype'] != "" ) )
+		{
+			//-----------------------------------------
+			// Update the "hits"..
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'update' => 'attachments', 'set' =>"attach_hits=attach_hits+1", 'where' => "attach_id=".$ibforums->input['id'] ) );
+			$DB->simple_exec();
+			
+			//-----------------------------------------
+			// Set up the headers..
+			//-----------------------------------------
+			
+			//flush();
+			
+			@header( "Content-Type: ".$ibforums->cache['attachtypes'][ $attach['attach_ext'] ]['atype_mimetype'].
+					 "\nContent-Disposition: inline; filename=\"".$attach['attach_file']
+					 ."\"\nContent-Length: ".(string)(filesize( $file ) ) );
+			
+			//-----------------------------------------
+			// Open and display the file..
+			//-----------------------------------------
+			
+			$fh = fopen( $file, 'rb' );  // Set binary for Win even if it's an ascii file, it won't hurt.
+			fpassthru( $fh );
+			@fclose( $fh );
+			exit();
+		}
+		else
+		{
+			//-----------------------------------------
+			// File does not exist..
+			//-----------------------------------------
+			
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files' ) );
+		}
         
     }
         
diff --git a/upload/sources/misc/contact_member.php b/upload/sources/misc/contact_member.php
index 82301feb..a9f54bda 100644
--- a/upload/sources/misc/contact_member.php
+++ b/upload/sources/misc/contact_member.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,13 +19,18 @@
 |   > Date started: 28th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-$idx = new Contact;
-
-class Contact {
+class contactmember
+{
 
     var $output    = "";
     var $base_url  = "";
@@ -36,34 +40,30 @@ class Contact {
     var $page_title= "";
     var $email     = "";
     var $forum     = "";
-    var $email     = "";
 
 	var $int_error  = "";
 	var $int_extra  = "";
 	
-    /***********************************************************************************/
+    /*-------------------------------------------------------------------------*/
 	//
 	// Our constructor, load words, load skin
 	//
-	/***********************************************************************************/
+	/*-------------------------------------------------------------------------*/
     
-    function Contact() {
-    
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
+    function contactmember()
+    {
+		global $ibforums, $DB, $std, $print;
         
         // What to do?
         
-        switch($ibforums->input['act']) {
+        switch($ibforums->input['act'])
+        {
         	case 'Mail':
         		$this->mail_member();
         		break;
         	case 'AOL':
         		$this->show_aim();
         		break;
-        	case 'integ':
-        		$this->show_integ();
-        		break;
         	case 'ICQ':
         		$this->show_icq();
         		break;
@@ -78,7 +78,14 @@ class Contact {
         		break;
         		
         	case 'chat':
-        		$this->chat_display();
+        		if ( $ibforums->vars['chat_account_no'] )
+				{
+					$this->chat_display();
+				}
+				else if ( $ibforums->vars['chat04_account_no'] )
+				{
+					$this->chat04_display();
+				}
         		break;
         	
         	case 'report':
@@ -106,94 +113,208 @@ class Contact {
         
 	}
 	
-	//****************************************************************/
-	// INTEGRITY MESSENGER
-	//
-	//****************************************************************/
-        
-        
-	function show_integ()
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		//----------------------------------
-	
-		if (empty($ibforums->member['id']))
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
-		}
-	
-		if ( empty($ibforums->input['MID']) )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
-		}
-		
-		//----------------------------------
-		
-		if (! preg_match( "/^(\d+)$/" , $ibforums->input['MID'] ) )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
-		}
-		
-		//----------------------------------
-		
-		$DB->query("SELECT name, id, integ_msg from ibf_members WHERE id='".$ibforums->input['MID']."'");
-
-		$member = $DB->fetch_row();
-		
-		//----------------------------------
-		
-		if (! $member['id'] )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
-		}
-		
-		//----------------------------------
-		
-		if (! $member['integ_msg'] )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_integ' ) );
-		}
-		
-		//----------------------------------
-		
-		$std->boink_it( "http://www.integritymessenger.com/WebIM/send.php?to=".urlencode($member['integ_msg']) );
-		exit();
-		
-	}
-	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// BOARD RULES
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
         
         
 	function board_rules()
 	{
 		global $ibforums, $DB, $std, $print;
 		
+		//-----------------------------------------
+		// Get board rule (not cached)
+		//-----------------------------------------
+		
+		$row = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings', 'where' => "conf_key='gl_guidelines'" ) );
+		
+		$ibforums->lang  = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
+
+		$this->html      = $std->load_template('skin_emails');
+		
+		$row['conf_value'] = $std->my_nl2br(stripslashes($row['conf_value']));
+		
+		$this->nav[] = $ibforums->vars['gl_title'];
+        
+        $this->page_title = $ibforums->vars['gl_title'];
+        
+        $this->output .= $this->html->board_rules( $ibforums->vars['gl_title'], $row['conf_value'] );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// IP CHAT04:
+	//
+	/*-------------------------------------------------------------------------*/
+        
+	function chat04_display()
+	{
+		global $ibforums, $DB, $std, $print;
+		
 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
 
 		$this->html     = $std->load_template('skin_emails');
 		
-		$DB->query("SELECT * FROM ibf_cache_store WHERE cs_key='boardrules'");
+		if ( ! $ibforums->vars['chat04_account_no'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+		}
 		
-		$row = $DB->fetch_row();
+		//-----------------------------------------
+		// Get extra settings
+		//-----------------------------------------
 		
-		$row['cs_value'] = $std->my_nl2br(stripslashes($row['cs_value']));
+		$DB->simple_construct( array( 'select' => 'conf_key,conf_value,conf_default', 'from' => 'conf_settings', 'where' => "conf_key LIKE 'chat04%'" ) );
+    	$DB->simple_exec();
+    	
+    	while( $r = $DB->fetch_row() )
+    	{
+    		$value = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+    		
+    		$ibforums->vars[ $r['conf_key'] ] = $value;
+    	}
 		
-		$this->nav[] = $ibforums->vars['gl_title'];
+		//-----------------------------------------
+		// Got room?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->vars['chat04_default_room'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+		}
+		
+		//-----------------------------------------
+		// Got service type?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->vars['chat04_servicetype'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+		}
+		
+		//-----------------------------------------
+		// Make sure it has #
+		//-----------------------------------------
+		
+		$ibforums->vars['chat04_default_room'] = '#'.str_replace( '#', '', $ibforums->vars['chat04_default_room'] );
+		
+		//-----------------------------------------
+		// Get service library
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'retail/chatservice.php' );
+		
+		$server = 'http://'. $CHAT_SERVER[ $ibforums->vars['chat04_servicetype'] ].'/'. $CHAT_FOLDER[ $ibforums->vars['chat04_servicetype'] ];
+		
+		$width  = $ibforums->vars['chat04_width']    ? $ibforums->vars['chat04_width']  : 600;
+		$height = $ibforums->vars['chat04_height']   ? $ibforums->vars['chat04_height'] : 350;
+		
+		//-----------------------------------------
+		// Lang?
+		//-----------------------------------------
+		
+		$ibforums->vars['chat04_default_lang'] = ( $ibforums->vars['chat04_default_lang'] == "" ) ? 'english.conf' : $ibforums->vars['chat04_default_lang'];
+		
+		//-----------------------------------------
+		// Text mode
+		//-----------------------------------------
+		
+		$ibforums->vars['chat04_plainmode'] = ( $ibforums->vars['chat04_plainmode'] ) ? 'PlainText' : 'MegaText';
+		
+		//-----------------------------------------
+		// Style options..
+		//-----------------------------------------
+		
+		$style = array(
+						'applet_bg' => $ibforums->vars['chat04_style_applet_bg'] ? str_replace( '#', '', $ibforums->vars['chat04_style_applet_bg'] ) : 'BCD0ED',
+						'applet_fg' => $ibforums->vars['chat04_style_applet_fg'] ? str_replace( '#', '', $ibforums->vars['chat04_style_applet_fg'] ) : '345487',
+						'window_bg' => $ibforums->vars['chat04_style_window_bg'] ? str_replace( '#', '', $ibforums->vars['chat04_style_window_bg'] ) : 'F5F9FD',
+						'window_fg' => $ibforums->vars['chat04_style_window_fg'] ? str_replace( '#', '', $ibforums->vars['chat04_style_window_fg'] ) : '345487',
+						'font_size' => $ibforums->vars['chat04_style_font_size'] ? str_replace( '#', '', $ibforums->vars['chat04_style_font_size'] ) : '11',
+					  );
+		
+		//-----------------------------------------
+		// Show chat..
+		//-----------------------------------------
+		
+		if ( $ibforums->input['pop'] )
+		{
+			$html = $this->html->chat04_pop( $server, $ibforums->vars['chat04_account_no'], $ibforums->vars['chat04_default_room'], $width, $height, $ibforums->vars['chat04_default_lang'], $ibforums->vars['chat04_plainmode'], $style );
+			
+			$html = str_replace( '<!--AUTOLOGIN-->'  , $this->ipchat_auto_login()            , $html );
+			$html = str_replace( '<!--CUSTOMPARAM-->', $ibforums->vars['chat04_customparams'], $html );
+			
+			$print->pop_up_window( "CHAT", $html );
+			
+			exit();
+		}
+		else
+		{
+			$this->output .= $this->html->chat04_inline( $server, $ibforums->vars['chat04_account_no'], $ibforums->vars['chat04_default_room'], $width, $height, $ibforums->vars['chat04_default_lang'], $ibforums->vars['chat04_plainmode'], $style );
+			$this->output = str_replace( '<!--AUTOLOGIN-->'  , $this->ipchat_auto_login()            , $this->output );
+			$this->output = str_replace( '<!--CUSTOMPARAM-->', $ibforums->vars['chat04_customparams'], $this->output );
+		}
+		
+        $this->nav[] = $ibforums->lang['live_chat'];
         
-        $this->page_title = $ibforums->vars['gl_title'];
-        
-        $this->output .= $this->html->board_rules( $ibforums->vars['gl_title'],$row['cs_value'] );
+        $this->page_title = $ibforums->lang['live_chat'];
 		
 	}
 	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
+	// IPCHAT (NEW) Auto_login
+	/*-------------------------------------------------------------------------*/
+	
+	function ipchat_auto_login()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $ibforums->member['id'] )
+		{
+			$converge_member = $ibforums->converge->converge_load_member_by_id($ibforums->member['id']);
+			$pass = $ibforums->converge->member['converge_pass_hash'];
+			
+			$tmpname   = $ibforums->member['name'];
+			$namearray = array();
+			$name      = "";
+			
+			//-----------------------------------------
+			// Okay, we need to safe format this name
+			// So we use ordinal numeric values separated
+			// by underscores as ParaChat allows alphanumerics
+			// and underscores. We pass this in the cookie
+			// field so we don't convert the nickname
+			//-----------------------------------------
+			
+			foreach( preg_split('//', $tmpname, -1, PREG_SPLIT_NO_EMPTY) as $chr )
+			{
+				$namearray[] = ord($chr);
+			}
+			
+			$name = implode( '_', $namearray );
+			
+			$tmpname = preg_replace( "#\s#", "_", $tmpname );
+			$tmpname = preg_replace( "#(?:[^\w\d\_])#is", "-", $tmpname );
+			
+			$return = "<param name='ctrl.LoginOnLoad' value='true'>\n".
+      				  "<param name='ctrl.Nickname' value='".$tmpname."'>\n".
+      				  "<param name='ctrl.Cookie' value='".$name."'>\n".
+      				  "<param name='ctrl.RealName' value='".$ibforums->member['name']."'>\n".
+      				  "<param name='ctrl.Password' value='".urlencode("md5pass({$pass})")."'>\n";
+      				   
+      		return $return;
+		}
+		else
+		{
+			return;
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
 	// IP CHAT:
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
         
         
 	function chat_display()
@@ -209,6 +330,13 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
 		}
 		
+		if ( ! $ibforums->vars['chat_server_addr'] )
+		{
+			$ibforums->vars['chat_server_addr'] = 'client1.invisionchat.com';
+		}
+		
+		$ibforums->vars['chat_server_addr'] = str_replace( 'http://', '', $ibforums->vars['chat_server_addr'] );
+		
 		$width  = $ibforums->vars['chat_width']    ? $ibforums->vars['chat_width']  : 600;
 		$height = $ibforums->vars['chat_height']   ? $ibforums->vars['chat_height'] : 350;
 		
@@ -220,12 +348,14 @@ class Contact {
 		if ( $ibforums->member['id'] )
 		{
 			$user = $ibforums->member['name'];
-			$pass = $ibforums->member['password'];
+			
+			$converge_member = $ibforums->converge->converge_load_member_by_id($ibforums->member['id']);
+			$pass = $ibforums->converge->member['converge_pass_hash'];
 		}
 		
 		if ( $ibforums->input['pop'] )
 		{
-			$html = $this->html->chat_pop( $ibforums->vars['chat_account_no'], $lang, $width, $height, $user, $pass );
+			$html = $this->html->chat_pop( $ibforums->vars['chat_server_addr'], $ibforums->vars['chat_account_no'], $lang, $width, $height, $user, $pass );
 			
 			$print->pop_up_window( "CHAT", $html );
 			
@@ -233,7 +363,7 @@ class Contact {
 		}
 		else
 		{
-			$this->output .= $this->html->chat_inline( $ibforums->vars['chat_account_no'], $lang, $width, $height, $user, $pass);
+			$this->output .= $this->html->chat_inline( $ibforums->vars['chat_server_addr'], $ibforums->vars['chat_account_no'], $lang, $width, $height, $user, $pass);
 		}
 		
         $this->nav[] = $ibforums->lang['live_chat'];
@@ -245,10 +375,10 @@ class Contact {
 	
 	
 	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// REPORT POST FORM:
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
         
         
 	function report_form()
@@ -259,6 +389,37 @@ class Contact {
 
 		$this->html     = $std->load_template('skin_emails');
 		
+		$pid = intval($ibforums->input['p']);
+		$tid = intval($ibforums->input['t']);
+		$st  = intval($ibforums->input['st']);
+		
+		if ( (!$pid) and (!$tid) )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+		}
+		
+		// Do we have permission to do stuff in this forum? Lets hope so eh?!
+		
+		$this->check_access($tid);
+		
+		$this->output .= $this->html->report_form($tid, $pid, $st, $this->topic['topic_title']);
+		
+        $this->nav[] = "<a href='".$ibforums->base_url."act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>";
+        $this->nav[] = $ibforums->lang['report_title'];
+        
+        $this->page_title = $ibforums->lang['report_title'];
+		
+	}
+	
+	
+	function send_report()
+	{
+		global $ibforums, $DB, $std, $print;
+		
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
+
+		$this->html     = $std->load_template('skin_emails');
+		
 		$pid = intval($ibforums->input['p']);
 		$tid = intval($ibforums->input['t']);
 		$fid = intval($ibforums->input['f']);
@@ -269,53 +430,21 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
 		}
 		
-		// Do we have permission to do stuff in this forum? Lets hope so eh?!
-		
-		$this->check_access($fid, $tid);
-		
-		$this->output .= $this->html->report_form($fid, $tid, $pid, $st, $this->forum['topic_title']);
-		
-		$this->nav[] = "<a href='".$ibforums->base_url."act=SC&c={$this->forum['cat_id']}'>{$this->forum['cat_name']}</a>";
-        $this->nav[] = "<a href='".$ibforums->base_url."act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>";
-        $this->nav[] = $ibforums->lang['report_title'];
-        
-        $this->page_title = $ibforums->lang['report_title'];
-		
-	}
-	
-	
-	function send_report()
-	{
-		global $ibforums, $DB, $std, $print, $HTTP_POST_VARS;
-		
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
-
-		$this->html     = $std->load_template('skin_emails');
-		
-		$pid = intval($ibforums->input['p']);
-		$tid = intval($ibforums->input['t']);
-		$fid = intval($ibforums->input['f']);
-		$st  = intval($ibforums->input['st']);
-		
-		if ( (!$pid) and (!$tid) and (!$fid) )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
-		}
-		
-		//--------------------------------------------
+		//-----------------------------------------
 		// Make sure we came in via a form.
-		//--------------------------------------------
+		//-----------------------------------------
 		
-		if ($HTTP_POST_VARS['message'] == "")
+		if ( $_POST['message'] == "" )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form') );
 		}
 		
-		//--------------------------------------------
+		//-----------------------------------------
 		// Get the topic title
-		//--------------------------------------------
+		//-----------------------------------------
 		
-		$DB->query("SELECT title FROM ibf_topics WHERE tid='$tid'");
+		$DB->simple_construct( array( 'select' => 'title', 'from' => 'topics', 'where' => "tid=".$tid ) );
+		$DB->simple_exec();
 		
 		$topic = $DB->fetch_row();
 		
@@ -324,62 +453,80 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
 		}
 		
-		//--------------------------------------------
-		// Do we have permission to do stuff in this forum? Lets hope so eh?!
-		//--------------------------------------------
+		//-----------------------------------------
+		// Do we have permission to do stuff in this
+		// forum? Lets hope so eh?!
+		//-----------------------------------------
 		
-		$this->check_access($fid, $tid);
+		$this->check_access($tid);
 		
 		$mods = array();
+		$fid  = $this->forum['id'];
 		
+		//-----------------------------------------
 		// Check for mods in this forum
+		//-----------------------------------------
 		
-		$DB->query("SELECT m.name, m.email, mod.member_id FROM ibf_moderators mod, ibf_members m WHERE mod.forum_id='$fid' and mod.member_id=m.id");
+		$DB->cache_add_query( 'contact_member_report_get_mods', array( 'fid' => $fid ) );
+		$DB->cache_exec_query();
 		
 		if ( $DB->get_num_rows() )
 		{
 			while( $r = $DB->fetch_row() )
 			{
-				$mods[] = array(
-								 'name'  => $r['name'],
-								 'email' => $r['email']
-							   );
+				$mods[] = $r;
 			}
 		}
 		else
 		{
-			//--------------------------------------------
-			// No mods? Get those with control panel access
-			//--------------------------------------------
+			//-----------------------------------------
+			// No mods? Get those super moderators
+			//-----------------------------------------
 			
-			$DB->query("SELECT m.id, m.name, m.email FROM ibf_members m, ibf_groups g WHERE g.g_access_cp=1 AND m.mgroup=g.g_id");
+			$DB->cache_add_query( 'contact_member_report_get_supmod', array() );
+			$DB->cache_exec_query();
 			
-			while( $r = $DB->fetch_row() )
+			if ( $DB->get_num_rows() )
 			{
-				$mods[] = array(
-								 'name'  => $r['name'],
-								 'email' => $r['email']
-							   );
+				while( $r = $DB->fetch_row() )
+				{
+					$mods[] = $r;
+				}
+			}
+			else
+			{
+				//-----------------------------------------
+				// No supmods? Get those with control panel access
+				//-----------------------------------------
+				
+				$DB->cache_add_query( 'contact_member_report_get_cpaccess', array() );
+				$DB->cache_exec_query();
+				
+				while( $r = $DB->fetch_row() )
+				{
+					$mods[] = $r;
+				}
 			}
 		}
 		
-		//--------------------------------------------
+		//-----------------------------------------
     	// Get the emailer module
-		//--------------------------------------------
+		//-----------------------------------------
 		
-		require "./sources/lib/emailer.php";
+		require "./sources/classes/class_email.php";
 		
 		$this->email = new emailer();
 		
-		//--------------------------------------------
+		require_once( ROOT_PATH.'sources/lib/msg_functions.php' );
+ 		
+		$this->lib = new msg_functions();
+		$this->lib->init();
+ 				
+		//-----------------------------------------
 		// Loop and send the mail
-		//--------------------------------------------
+		//-----------------------------------------
 		
-		$report = trim(stripslashes($HTTP_POST_VARS['message']));
-		
-		$report = str_replace( "<!--"    , "" , $report );
-		$report = str_replace( "-->"     , "" , $report );
-		$report = str_replace( "<script" , "" , $report );
+		$report = trim(stripslashes($ibforums->input['message']));
 		
 		foreach( $mods as $idx => $data )
 		{
@@ -392,36 +539,65 @@ class Contact {
 												'LINK_TO_POST' => "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}"."?act=ST&f=$fid&t=$tid&st=$st&#entry$pid",
 												'REPORT'       => $report,
 											  )
-										);
-										
-			$this->email->subject = $ibforums->lang['report_subject'].' '.$ibforums->vars['board_name'];
-			$this->email->to      = $data['email'];
+			        					);
+			        					
+			//-----------------------------------------
+			// Email?
+			//-----------------------------------------
 			
-			$this->email->send_mail();
-		
+			if ( $ibforums->vars['reportpost_method'] == 'email' )
+			{
+				$this->email->subject = $ibforums->lang['report_subject'].' '.$ibforums->vars['board_name'];
+				$this->email->to      = $data['email'];
+				
+				$this->email->send_mail();
+			}
+			
+			//-----------------------------------------
+			// PM?
+			//-----------------------------------------
+			
+			else
+			{
+				$this->lib->to_by_id    = $data['id'];
+ 				$this->lib->from_member = $ibforums->member;
+ 				$this->lib->msg_title   = $ibforums->lang['report_subject'].' '.$topic['title'];
+ 				$this->lib->msg_post    = $this->email->message;
+				$this->lib->force_pm    = 1;
+				
+				$this->lib->send_pm();
+				
+				if ( $this->lib->error )
+				{
+					print $this->error;
+					exit();
+				}
+			}
 		}
 			
 		$print->redirect_screen( $ibforums->lang['report_redirect'], "act=ST&f=$fid&t=$tid&st=$st&#entry$pid");					   
-		
 	}
 	
-	//--------------------------------------------
+	//-----------------------------------------
 	
      
-    function check_access($fid, $tid)
+    function check_access($tid)
     {
-		global $ibforums, $DB, $std, $HTTP_COOKIE_VARS;
+		global $ibforums, $DB, $std, $forums, $HTTP_COOKIE_VARS;
 		
 		if ( ! $ibforums->member['id'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission') );
 		}
 		
-		//--------------------------------
+		//-----------------------------------------
 		
-		$DB->query("SELECT t.title as topic_title, f.*, c.id as cat_id, c.name as cat_name from ibf_forums f, ibf_categories c, ibf_topics t WHERE f.id=".$fid." and c.id=f.category and t.tid=$tid");
+		$DB->simple_construct( array( 'select' => '*,title as topic_title', 'from' => 'topics', 'where' => "tid=".$tid ) );
+		$DB->simple_exec();
         
-        $this->forum = $DB->fetch_row();
+        $this->topic = $DB->fetch_row();
+        
+        $this->forum = $forums->forum_by_id[ $this->topic['forum_id'] ];
 		
 		$return = 1;
 		
@@ -445,19 +621,20 @@ class Contact {
 	
 	}
 	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// MSN CONSOLE:
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function show_msn() {
+	function show_msn()
+	{
 		global $ibforums, $DB, $std, $print;
 		
 		$this->html    = $std->load_template('skin_emails');
 
 		$ibforums->lang    = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
 		
-		//----------------------------------
+		//-----------------------------------------
 	
 		if (empty($ibforums->member['id']))
 		{
@@ -469,34 +646,34 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! preg_match( "/^(\d+)$/" , $ibforums->input['MID'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT name, id, msnname from ibf_members WHERE id='".$ibforums->input['MID']."'");
 
 		$member = $DB->fetch_row();
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['id'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['msnname'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_msn' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$html  = $this->html->pager_header( array( 'TITLE' => 'MSN' ) );
 		
@@ -508,19 +685,20 @@ class Contact {
 	
 	}
 	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// Yahoo! CONSOLE:
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function show_yahoo() {
+	function show_yahoo()
+	{
 		global $ibforums, $DB, $std, $print;
 		
 		$this->html    = $std->load_template('skin_emails');
 
 		$ibforums->lang    = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
 		
-		//----------------------------------
+		//-----------------------------------------
 	
 		if (empty($ibforums->member['id']))
 		{
@@ -532,34 +710,34 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! preg_match( "/^(\d+)$/" , $ibforums->input['MID'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT name, id, yahoo from ibf_members WHERE id='".$ibforums->input['MID']."'");
 
 		$member = $DB->fetch_row();
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['id'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['yahoo'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_yahoo' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$html  = $this->html->pager_header( array( 'TITLE' => "Yahoo!" ) );
 		
@@ -571,20 +749,21 @@ class Contact {
 	
 	}
      
-    //****************************************************************/
+    /*-------------------------------------------------------------------------*/
 	// AOL CONSOLE:
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
         
         
-	function show_aim() {
+	function show_aim()
+	{
 		global $ibforums, $DB, $std, $print;
 		
 		$ibforums->lang    = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
 
 		$this->html    = $std->load_template('skin_emails');
 		
-		//----------------------------------
+		//-----------------------------------------
 	
 		if (empty($ibforums->member['id']))
 		{
@@ -596,27 +775,27 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! preg_match( "/^(\d+)$/" , $ibforums->input['MID'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT name, id, aim_name from ibf_members WHERE id='".$ibforums->input['MID']."'");
 
 		$member = $DB->fetch_row();
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['id'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['aim_name'] )
 		{
@@ -625,26 +804,27 @@ class Contact {
 		
 		$member['aim_name'] = str_replace(" ", "", $member['aim_name']);
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$print->pop_up_window( "AOL CONSOLE", $this->html->aol_body( array( 'AOLNAME' => $member['aim_name'] ) ) );
 	
 	}
 	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// ICQ CONSOLE:
 	//
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	
-	function show_icq() {
+	function show_icq()
+	{
 		global $ibforums, $DB, $std, $print;
 		
 		$ibforums->lang    = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id);
 
 		$this->html    = $std->load_template('skin_emails');
 		
-		//----------------------------------
+		//-----------------------------------------
 	
 		if (empty($ibforums->member['id'])) {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
@@ -655,34 +835,34 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! preg_match( "/^(\d+)$/" , $ibforums->input['MID'] ) )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$DB->query("SELECT name, id, icq_number from ibf_members WHERE id='".$ibforums->input['MID']."'");
 
 		$member = $DB->fetch_row();
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['id'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['icq_number'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_icq' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$html  = $this->html->pager_header( array( $ibforums->lang['icq_title'] ) );
 		
@@ -695,27 +875,27 @@ class Contact {
 	
 	}
 	
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	// MAIL MEMBER:
 	//
 	// Handles the routines called by clicking on the "email" button when
 	// reading topics
-	//****************************************************************/
+	/*-------------------------------------------------------------------------*/
 	
 	function mail_member()
 	{
 		global $ibforums, $DB, $std, $print;
 	
-		require "./sources/lib/emailer.php";
+		require "./sources/classes/class_email.php";
 		$this->email = new emailer();
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id );
 
 		$this->html     = $std->load_template('skin_emails');
 		
-		//----------------------------------
+		//-----------------------------------------
 	
 		if (empty($ibforums->member['id']))
 		{
@@ -727,7 +907,7 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_member_mail' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if ($ibforums->input['CODE'] == '01')
 		{
@@ -756,13 +936,14 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'name, id, email, hide_email', 'from' => 'members', 'where' => "id=".$ibforums->input['MID'] ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT name, id, email, hide_email from ibf_members WHERE id=".$ibforums->input['MID']);
-
 		$member = $DB->fetch_row();
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['id'] )
 		{
@@ -774,7 +955,7 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'private_email' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if ( $errors != "" )
 		{
@@ -788,7 +969,7 @@ class Contact {
 			$this->output .= $this->html->errors( $msg );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		$this->output .= $ibforums->vars['use_mail_form']
 					  ? $this->html->send_form(
@@ -812,7 +993,7 @@ class Contact {
 		
 	}
 	
-	//----------------------------------
+	//-----------------------------------------
 	
 	function mail_member_send()
 	{
@@ -825,31 +1006,32 @@ class Contact {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_use' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'name, id, email, hide_email', 'from' => 'members', 'where' => "id=".$ibforums->input['to'] ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT name, id, email, hide_email from ibf_members WHERE id=".$ibforums->input['to']);
-
 		$member = $DB->fetch_row();
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Check for schtuff
-		//----------------------------------
+		//-----------------------------------------
 		
 		if (! $member['id'] )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		
 		if ($member['hide_email'] == 1)
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'private_email' ) );
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Check for blanks
-		//----------------------------------
+		//-----------------------------------------
 		
 		$check_array = array ( 
 							   'message'   =>  'no_message',
@@ -866,9 +1048,9 @@ class Contact {
 			}
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Check for spam / delays
-		//----------------------------------
+		//-----------------------------------------
 		
 		$email_check = $this->_allow_to_email( $ibforums->member['id'], $ibforums->member['g_email_limit'] );
 		
@@ -879,9 +1061,9 @@ class Contact {
 			return;
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Send the email
-		//----------------------------------
+		//-----------------------------------------
 		
 		$this->email->get_template("email_member");
 			
@@ -897,29 +1079,24 @@ class Contact {
 		$this->email->from    = $ibforums->member['email'];
 		$this->email->send_mail();
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Store email in the database
-		//----------------------------------
+		//-----------------------------------------
 		
-		$dbs = array( 
-						'email_subject'      => $ibforums->input['subject'],
-						'email_content'      => $ibforums->input['message'],
-						'email_date'         => time(),
-						'from_member_id'     => $ibforums->member['id'],
-						'from_email_address' => $ibforums->member['email'],
-						'from_ip_address'	 => $ibforums->input['IP_ADDRESS'],
-						'to_member_id'		 => $member['id'],
-						'to_email_address'	 => $member['email'],
-					);
+		$DB->do_insert( 'email_logs', array( 
+											'email_subject'      => $ibforums->input['subject'],
+											'email_content'      => $ibforums->input['message'],
+											'email_date'         => time(),
+											'from_member_id'     => $ibforums->member['id'],
+											'from_email_address' => $ibforums->member['email'],
+											'from_ip_address'	 => $ibforums->input['IP_ADDRESS'],
+											'to_member_id'		 => $member['id'],
+											'to_email_address'	 => $member['email'],
+					  )                   );
 					
-					
-		$db_string = $DB->compile_db_insert_string($dbs);
-						
-		$DB->query("INSERT INTO ibf_email_logs ({$db_string['FIELD_NAMES']}) VALUES({$db_string['FIELD_VALUES']})");	
-		
-		//----------------------------------
+		//-----------------------------------------
 		// Print the success page
-		//----------------------------------
+		//-----------------------------------------
 		
 		$forum_jump = $std->build_forum_jump();
 		
@@ -932,11 +1109,11 @@ class Contact {
 	}
 	
 	
-	//----------------------------------
+	//-----------------------------------------
 	// CHECK FLOOD LIMIT
 	// Returns TRUE if able to email
 	// FALSE if not
-	//----------------------------------
+	//-----------------------------------------
 	
 	function _allow_to_email($member_id, $email_limit)
 	{
@@ -957,14 +1134,19 @@ class Contact {
 			return TRUE;
 		}
 		
-		//----------------------------------
+		//-----------------------------------------
 		// Get some stuff from the DB!
 		// 1) FLOOD?
-		//----------------------------------
+		//-----------------------------------------
 		
 		if ( $flood )
 		{
-			$DB->query("SELECT * FROM ibf_email_logs WHERE from_member_id=$member_id ORDER BY email_date DESC LIMIT 0,1");
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'email_logs',
+										  'where'  => "from_member_id=$member_id",
+										  'order'  => 'email_date DESC',
+										  'limit'  => array(0,1) ) );
+			$DB->simple_exec();
 		
 			$last_email = $DB->fetch_row();
 
@@ -980,7 +1162,11 @@ class Contact {
 		{
 			$time_range = time() - 86400;
 			
-			$DB->query("SELECT count(email_id) as cnt FROM ibf_email_logs WHERE from_member_id=$member_id AND email_date > $time_range");
+			$DB->simple_construct( array( 'select' => 'count(email_id) as cnt',
+										  'from'   => 'email_logs',
+										  'where'  => "from_member_id=$member_id AND email_date > $time_range",
+								 )      );
+			$DB->simple_exec();
 			
 			$quota_sent = $DB->fetch_row();
 			
diff --git a/upload/sources/misc/forward_page.php b/upload/sources/misc/forward_page.php
index e46c33bd..f5951606 100644
--- a/upload/sources/misc/forward_page.php
+++ b/upload/sources/misc/forward_page.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,13 +19,18 @@
 |   > Date started: 21st March 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new Forward;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-class Forward {
+class forwardpage {
 
     var $output    = "";
     var $base_url  = "";
@@ -37,69 +41,59 @@ class Forward {
     var $category  = array();
 
     
-    /***********************************************************************************/
+    /*-------------------------------------------------------------------------*/
 	//
 	// Our constructor, load words, load skin, print the topic listing
 	//
-	/***********************************************************************************/
+	/*-------------------------------------------------------------------------*/
     
-    function Forward() {
-    
-    
-        global $ibforums, $DB, $std, $print, $skin_universal;
+    function forwardpage()
+    {
+		global $ibforums, $DB, $std, $print, $forums;
         
-        //-------------------------------------
+        //-----------------------------------------
 		// Compile the language file
-		//-------------------------------------
+		//-----------------------------------------
 		
         $ibforums->lang = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id);
 
         $this->html     = $std->load_template('skin_emails');
         
-        //-------------------------------------
+        //-----------------------------------------
         // Check the input
-        //-------------------------------------
+        //-----------------------------------------
         
-        $ibforums->input['t'] = $std->is_number($ibforums->input['t']);
-        $ibforums->input['f'] = $std->is_number($ibforums->input['f']);
+        $ibforums->input['t'] = intval($ibforums->input['t']);
+        $ibforums->input['f'] = intval($ibforums->input['f']);
         
-        if ($ibforums->input['t'] < 0 or $ibforums->input['f'] < 0)
+        if ( !$ibforums->input['t'] )
         {
             $std->Error( array( LEVEL => 1, MSG => 'missing_files') );
         }
         
-        //-------------------------------------
-        // Get the forum info based on the forum ID, get the category name, ID, and get the topic details
-        //-------------------------------------
+        //-----------------------------------------
+        // Get the topic details
+        //-----------------------------------------
         
-       $DB->query("SELECT t.*, f.name as forum_name, f.id as forum_id, f.read_perms, f.reply_perms, f.start_perms, f.allow_poll, f.posts as forum_posts, f.topics as forum_topics, c.name as cat_name, c.id as cat_id FROM ibf_topics t, ibf_forums f , ibf_categories c where t.tid='".$ibforums->input[t]."' and f.id = t.forum_id and f.category=c.id");
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "tid=".intval($ibforums->input['t']) ) );
+		$DB->simple_exec();
         
         $this->topic = $DB->fetch_row();
         
-        $this->forum = array( 'id'           => $this->topic['forum_id']          ,
-        					  'name'         => $this->topic['forum_name']        ,
-        					  'posts'        => $this->topic['forum_posts']       ,
-        					  'topics'       => $this->topic['forum_topics']      ,
-        					  'read_perms'   => $this->topic['read_perms']        ,
-        					  'allow_poll'   => $this->topic['allow_poll']        ,
-        					);
-        					
-        $this->category = array( 'name'   => $this->topic['cat_name'],
-        						 'id'     => $this->topic['cat_id']  ,
-        				       );
+        $this->forum = $forums->forum_by_id[ $this->topic['forum_id'] ];
         
-        //-------------------------------------
+        //-----------------------------------------
         // Error out if we can not find the forum
-        //-------------------------------------
+        //-----------------------------------------
         
-        if (!$this->forum['id'])
+        if ( ! $this->forum['id'] )
         {
         	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Error out if we can not find the topic
-        //-------------------------------------
+        //-----------------------------------------
         
         if (!$this->topic['tid'])
         {
@@ -110,24 +104,21 @@ class Forward {
         
         $this->base_url_NS = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
 		
-        //-------------------------------------
+        //-----------------------------------------
         // Check viewing permissions, private forums,
         // password forums, etc
-        //-------------------------------------
+        //-----------------------------------------
         
         if (! $ibforums->member['id'] )
         {
         	$std->Error( array( LEVEL => 1, MSG => 'no_guests') );
         }
         
-        $bad_entry = $this->check_access();
-        
-        if ($bad_entry == 1)
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
-        }      
+        $forums->forums_check_access( $this->forum['id'] );
         
+        //-----------------------------------------
 		// What to do?
+		//-----------------------------------------
 		
 		if ($ibforums->input['CODE'] == '01')
 		{
@@ -137,15 +128,14 @@ class Forward {
 		{
 			$this->show_form();
 		}
-
-		
 	}
 	
 
-	function send_email() {
+	function send_email()
+	{
 		global $std, $ibforums, $DB, $print;
 		
-		require "./sources/lib/emailer.php";
+		require ROOT_PATH."sources/classes/class_email.php";
 		
 		$this->email = new emailer();
 		
@@ -182,11 +172,10 @@ class Forward {
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_email' ) );
 		}
 		
-		
 		$this->email->get_template("forward_page", $lang_to_use);
 			
 		$this->email->build_message( array(
-											'THE_MESSAGE'     => str_replace( "<br>", "\n", $ibforums->input['message'] ),
+											'THE_MESSAGE'     => str_replace( "<br />", "\n", $ibforums->input['message'] ),
 											'TO_NAME'         => $ibforums->input['to_name'],
 											'FROM_NAME'       => $ibforums->member['name'],
 										  )
@@ -197,7 +186,7 @@ class Forward {
 		$this->email->from    = $ibforums->member['email'];
 		$this->email->send_mail();
 		
-		$print->redirect_screen( $ibforums->lang['redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+		$print->redirect_screen( $ibforums->lang['redirect'], "showtopic=".$this->topic['tid']."&st=".$ibforums->input['st'] );
 	
 	}
 	
@@ -205,12 +194,13 @@ class Forward {
 	
 	
 	
-	function show_form() {
+	function show_form()
+	{
 		global $std, $ibforums, $DB, $print;
 		
-		require ROOT_PATH."lang/".$ibforums->lang_id."/email_content.php";
+		require ROOT_PATH."lang/".$ibforums->lang_id."/lang_email_content.php";
 		
-		$ibforums->lang['send_text'] = $EMAIL['send_text'];
+		$ibforums->lang['send_text'] = $lang['send_text'];
 		
 		$lang_array = unserialize(stripslashes($ibforums->vars['languages']));
 		
@@ -229,7 +219,7 @@ class Forward {
 		$ibforums->lang['send_text'] = preg_replace( "/<#THE LINK#>/" , $this->base_url_NS."?act=ST&f=".$this->forum['id']."&t=".$this->topic['tid'], $ibforums->lang['send_text'] );
 		$ibforums->lang['send_text'] = preg_replace( "/<#USER NAME#>/", $ibforums->member['name'], $ibforums->lang['send_text'] );
 		
-		$this->output = $this->html->forward_form( $this->topic['title'], $ibforums->lang ['send_text'], $lang_select  );
+		$this->output = $this->html->forward_form( $this->topic['title'], $ibforums->lang['send_text'], $lang_select  );
 		
 		$this->page_title  = $ibforums->lang['title'];
 		
@@ -246,7 +236,7 @@ class Forward {
 
 
 
-//+----------------------------------------------------------------------------------
+//-----------------------------------------
 	
 	
 	function check_access()
@@ -274,9 +264,4 @@ class Forward {
 	}
 }
 
-?>
-
-
-
-
-
+?>
\ No newline at end of file
diff --git a/upload/sources/misc/ib3.php b/upload/sources/misc/ib3.php
deleted file mode 100644
index 7d6c8475..00000000
--- a/upload/sources/misc/ib3.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Log in / log out module
-|   > Module written by Matt Mecham
-|   > Date started: 12th December 2001
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Login;
-
-class Login {
-
-    var $output     = "";
-    var $page_title = "";
-    var $nav        = array();
-    var $login_html = "";
-    
-    function Login() {
-    	global $ibforums, $DB, $std, $print;
-    	
-    	// Make sure our code number is numerical only
-    	
-    	//$ibforums->input[CODE] = preg_replace("/^([0-9]+)$/", "$1", $ibforums->input[CODE]);
-    	
-    	// Require the HTML and language modules
-    	
-		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_login', $ibforums->lang_id);
-    	
-    	$this->login_html = $std->load_template('skin_login');
-    	
-    	// What to do?
-    	
-    	switch($ibforums->input[CODE]) {
-    		case '01':
-    			$this->do_log_in();
-    			break;
-    		case '02':
-    			$this->log_in_form();
-    			break;
-    		case '03':
-    			$this->do_log_out();
-    			break;
-    		default:
-    			$this->log_in_form();
-    			break;
-    	}
-    	
-    	// If we have any HTML to print, do so...
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
- 	}   
-    
-    
-    
-    
-    
-    function log_in_form($message="") {
-        global $ibforums, $DB, $std, $print, $HTTP_REFERER;
-        
-        //+--------------------------------------------
-		//| Are they banned?
-		//+--------------------------------------------
-		
-		if ($message != "")
-		{
-			$this->output .= $this->login_html->errors( $ibforums->lang[ $message ] );
-		}
-		
-$html = <<<EOF
-
-    <script language='JavaScript'>
-    <!--
-    function ValidateForm() {
-        var Check = 0;
-        if (document.LOGIN.UserName.value == '') { Check = 1; }
-        if (document.LOGIN.PassWord.value == '') { Check = 1; }
-
-        if (Check == 1) {
-            alert("{$ibforums->lang[blank_fields]}");
-            return false;
-        } else {
-            document.LOGIN.submit.disabled = true;
-            return true;
-        }
-    }
-    //-->
-    </script>     
-     <br>
-     <table cellpadding='3' cellspacing='1' border='0' align='center' width='{$ibforums->skin['tbl_width']}'>
-     <tr>
-     <td align='left'>{$ibforums->lang['login_text']}</td>
-     </tr>
-     <tr>
-     <td align='left'><b>{$ibforums->lang[forgot_pass]} <a href='{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?act=Reg&CODE=10'>{$ibforums->lang[pass_link]}</a></b></td>
-     </tr>
-     </table>
-     <form action="{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}" method="post" name='LOGIN' onSubmit='return ValidateForm()'>
-     <input type='hidden' name='act' value='ib3'>
-     <input type='hidden' name='CODE' value='01'>
-     <input type='hidden' name='s' value='{$ibforums->session_id}'>
-     <input type='hidden' name='referer' value="">
-     <table cellpadding='0' cellspacing='0' border='0' width='{$ibforums->skin['tbl_width']}' bgcolor='{$ibforums->skin['tbl_border']}' align='center'>
-        <tr>
-            <td>
-                <table cellpadding='3' cellspacing='1' border='0' width='100%'>
-                <tr>
-                <td align='left' colspan='2' id='titlemedium'>Please enter your old Ikonboard 3 Username and Password</td>
-                </tr>
-                <tr>
-                <td id='row1' width='40%'>Your Ikonboard 3 Username</td>
-                <td id='row1'><input type='text' size='20' maxlength='64' name='UserName' class='forminput'></td>
-                </tr>
-                <tr>
-                <td id='row1' width='40%'>Your Ikonboard 3 Password</td>
-                <td id='row1'><input type='password' size='20' name='PassWord' class='forminput'></td>
-                </tr>
-                </table>
-             </td>
-         </tr>
-     </table>
-     <br>
-     <table cellpadding='0' cellspacing='0' border='0' width='{$ibforums->skin['tbl_width']}' bgcolor='{$ibforums->skin['tbl_border']}' align='center'>
-        <tr>
-            <td>
-                <table cellpadding='3' cellspacing='1' border='0' width='100%'>
-                <tr>
-                <td align='left' colspan='2' id='titlemedium'>{$ibforums->lang[options]}</td>
-                </tr>
-                <tr>
-                <td id='row1' width='40%' align='left' valign='top'>{$ibforums->lang[cookies]}</td>
-                <td id='row1' width='40%'><input type="radio" name="CookieDate" value="1" checked>{$ibforums->lang[cookie_yes]}<br><input type="radio" name="CookieDate" value="0">{$ibforums->lang[cookie_no]}</td>
-                </tr>
-                <tr>
-                <td id='row1' width='40%' align='left' valign='top'>{$ibforums->lang[privacy]}</td>
-                <td id='row1' width='40%'><input type="checkbox" name="Privacy" value="1">{$ibforums->lang[anon_name]}</td>
-                </tr>
-                <tr>
-                <td id='row2' align='center' colspan='2'>
-                <input type="submit" name='submit' value="{$ibforums->lang[log_in_submit]}" class='forminput'>
-                </td></tr></table>
-                </td></tr></table>
-                </form>
-
-
-EOF;
-		
-		$this->output .= $html;
-		
-		$this->nav        = array( "Upgrade my old Ikonboard Account" );
-	 	$this->page_title = "Upgrade my old Ikonboard Account";
-		
-		$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-        
-        exit();
-        
-    }
-    
-    function do_log_in() {
-    	global $DB, $ibforums, $std, $print, $sess, $HTTP_USER_AGENT, $HTTP_POST_VARS;
-    	
-    	$url = "";
-    	
-    	//-------------------------------------------------
-    	// Make sure the username and password were entered
-    	//-------------------------------------------------
-    	
-    	if ($HTTP_POST_VARS['UserName'] == "")
-    	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
-    	}
-    
-     	if ($HTTP_POST_VARS['PassWord'] == "")
-     	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_blank' ) );
-    	}   
-
-		
-		//-------------------------------------------------
-		// Check for input length
-		//-------------------------------------------------
-		
-		if (strlen($ibforums->input['UserName']) > 32)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'username_long' ) );
-		}
-		
-		if (strlen($ibforums->input['PassWord']) > 32)
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'pass_too_long' ) );
-		}
-		
-		$username    = strtolower($ibforums->input['UserName']);
-		$password    = crypt( $ibforums->input['PassWord'], substr( strtolower($ibforums->input['UserName']), 0, 2) );
-		
-		//-------------------------------------------------
-		// Attempt to get the user details
-		//-------------------------------------------------
-		
-		$DB->query("SELECT id, name, mgroup, password, new_pass FROM ibf_members WHERE LOWER(name)='$username'");
-		
-		if ($DB->get_num_rows())
-		{
-			$member = $DB->fetch_row();
-			
-			if ( empty($member['id']) or ($member['id'] == "") )
-			{
-				$this->log_in_form( 'wrong_name' );
-			}
-			
-			if ($member['password'] != $password)
-			{
-				$this->log_in_form( 'wrong_pass' );
-			}
-			
-			// SET REAL PASSY
-			
-			$real_pass = md5($ibforums->input['PassWord']);
-			
-			//------------------------------
-			
-			if ($ibforums->input['s'])
-			{
-				$session_id = $ibforums->input['s'];
-				
-				// Delete any old sessions with this users IP addy that doesn't match our
-				// session ID.
-				
-				$DB->query("DELETE FROM ibf_sessions WHERE ip_address='".$ibforums->input['IP_ADDRESS']."' AND id <> '$session_id'");
-				
-				$db_string = $DB->compile_db_update_string( array (
-																	 'member_name'  => $member['name'],
-																	 'member_id'    => $member['id'],
-																	 'running_time' => time(),
-																	 'member_group' => $member['mgroup'],
-																	 'login_type'   => $ibforums->input['Privacy'] ? 1 : 0
-														  )       );
-														  
-				$db_query = "UPDATE ibf_sessions SET $db_string WHERE id='".$ibforums->input['s']."'";
-			}
-			else
-			{
-				$session_id = md5( uniqid(microtime()) );
-				
-				// Delete any old sessions with this users IP addy.
-				
-				$DB->query("DELETE FROM ibf_sessions WHERE ip_address='".$ibforums->input['IP_ADDRESS']."'");
-				
-				$db_string = $DB->compile_db_insert_string( array (
-																	 'id'           => $session_id,
-																	 'member_name'  => $member['name'],
-																	 'member_id'    => $member['id'],
-																	 'running_time' => time(),
-																	 'member_group' => $member['mgroup'],
-																	 'ip_address'   => substr($ibforums->input['IP_ADDRESS'], 0, 50),
-																	 'browser'      => substr($HTTP_USER_AGENT, 0, 50),
-																	 'login_type'   => $ibforums->input['Privacy'] ? 1 : 0
-														  )       );
-														 
-				$db_query = "INSERT INTO ibf_sessions (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
-			}
-			
-			$DB->query( $db_query );
-			
-			//-----------------------------------
-			// RESET PASS IN MD5
-			//-----------------------------------
-			
-			$DB->query("UPDATE ibf_members SET password='$real_pass' WHERE id='".$member['id']."'");
-			
-			$ibforums->member           = $member;
-			$ibforums->session_id       = $session_id;
-			
-			//------------------------------
-			
-			if ($ibforums->input['CookieDate'])
-			{
-				$std->my_setcookie("pass_hash"   , $real_pass, 1);
-				$std->my_setcookie("member_id"   , $member['id'], 1);
-			}
-			
-			//-----------------------------------
-			// set our privacy cookie
-			//-----------------------------------
-			
-			if ($ibforums->input[Privacy] == 1)
-			{
-				$std->my_setcookie( "anonlogin", 1 );
-			}
-			
-			//-----------------------------------
-			// Redirect them to either the board
-			// index, or where they came from
-			//-----------------------------------
-			
-			$print->redirect_screen( "{$ibforums->lang[thanks_for_login]} {$ibforums->member['name']}", $url );
-			
-			
-		}
-		else
-		{
-			$this->log_in_form( 'wrong_name' );
-		}
-		
-	}
-	
-	
-	
-	
-	
-
-	function do_log_out() {
-		global $std, $ibforums, $DB, $print;
-		
-		if(! $ibforums->member['id'])
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'no_guests') );
-		}
-		
-		// Update the DB
-		
-		$DB->query("UPDATE ibf_sessions SET ".
-				     "member_name='NULL',".
-				     "member_id='0',".
-				     "member_pass='NULL',".
-				     "login_type='0' ".
-				     "WHERE id='". $ibforums->session_id ."'");
-				     
-		// Set some cookies
-		
-		$std->my_setcookie( "member_id" , "0"  );
-		$std->my_setcookie( "pass_hash" , "0"  );
-		$std->my_setcookie( "skin"       , "-1" );
-		
-		// Redirect...
-		
-		$print->redirect_screen( $ibforums->lang['thanks_for_logout'], "" );
-		
-	}
-
-
-
-
-        
-}
-
-?>
diff --git a/upload/sources/misc/legends.php b/upload/sources/misc/legends.php
index 3031480b..d587493d 100644
--- a/upload/sources/misc/legends.php
+++ b/upload/sources/misc/legends.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,11 +19,16 @@
 |   > Date started: 18th April 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new legends;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
 class legends {
 
@@ -32,16 +36,16 @@ class legends {
     var $base_url  = "";
     var $html      = "";
 
-    function legends() {
+    function auto_run() {
     
-    	//------------------------------------------------------
+    	//-----------------------------------------
     	// $is_sub is a boolean operator.
     	// If set to 1, we don't show the "topic subscribed" page
     	// we simply end the subroutine and let the caller finish
     	// up for us.
-    	//------------------------------------------------------
+    	//-----------------------------------------
     
-        global $ibforums, $DB, $std, $print, $skin_universal;
+        global $ibforums, $DB, $std, $print;
         
         $ibforums->lang    = $std->load_words($ibforums->lang, 'lang_legends', $ibforums->lang_id );
 
@@ -51,9 +55,9 @@ class legends {
     	
     	
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// What to do?
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	switch($ibforums->input['CODE'])
     	{
@@ -84,11 +88,11 @@ class legends {
     		
  	}
  	
- 	//--------------------------------------------------------------
+ 	//-----------------------------------------
  	
  	function find_user_one()
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std;
  		
  		// entry=textarea&name=carbon_copy&sep=comma
  		
@@ -102,11 +106,11 @@ class legends {
  		
  	}
  	
- 	//--------------------------------------------------------------
+ 	//-----------------------------------------
  	
  	function find_user_two()
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std;
  		
  		$entry = (isset($ibforums->input['entry'])) ? $ibforums->input['entry'] : 'textarea';
  		$name  = (isset($ibforums->input['name']))  ? $ibforums->input['name']  : 'carbon_copy';
@@ -128,8 +132,12 @@ class legends {
  		// Attempt a match
  		//-----------------------------------------
  		
- 		$DB->query("SELECT id, name FROM ibf_members WHERE LOWER(name) LIKE '".$ibforums->input['username']."%' LIMIT 0,101");
- 		
+ 		$DB->simple_construct( array( 'select' => 'id, name',
+ 									  'from'   => 'members',
+ 									  'where'  => "LOWER(name) LIKE '".$ibforums->input['username']."%'",
+ 									  'limit'  => array( 0,101) ) );
+		$DB->simple_exec();
+		
  		if ( ! $DB->get_num_rows() )
  		{
  			$this->find_user_error('fu_no_match');
@@ -161,11 +169,11 @@ class legends {
  	}
  	
  	
- 	//--------------------------------------------------------------
+ 	//-----------------------------------------
  	
  	function find_user_error($error)
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std;
  		
  		$this->page_title = $ibforums->lang['fu_title'];
  		
@@ -176,11 +184,11 @@ class legends {
  	}
  	
  	
- 	//--------------------------------------------------------------
+ 	//-----------------------------------------
  	
  	function show_emoticons()
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std;
  		
  		$this->page_title = $ibforums->lang['emo_title'];
  		
@@ -188,8 +196,9 @@ class legends {
  		
  		$this->output .= $this->html->page_header( $ibforums->lang['emo_title'], $ibforums->lang['emo_type'], $ibforums->lang['emo_img'] );
  		
- 		$DB->query("SELECT typed, image from ibf_emoticons");
-			
+ 		$DB->simple_construct( array( 'select' => 'typed, image', 'from' => 'emoticons', 'where' => "emo_set='".$ibforums->skin['_emodir']."'" ) );
+		$DB->simple_exec();
+		
 		if ( $DB->get_num_rows() )
 		{
 			while ( $r = $DB->fetch_row() )
@@ -214,53 +223,49 @@ class legends {
     	
  	}
  	
- 	//--------------------------------------------------------------
+ 	//-----------------------------------------
  	// Show BBCode Helpy file
- 	//--------------------------------------------------------------
+ 	//-----------------------------------------
  	
  	function show_bbcode()
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std;
  		
  		require './sources/lib/post_parser.php';
  		
  		$this->parser = new post_parser();
  		
- 		//-------------------------------------------
+ 		//-----------------------------------------
  		// Array out or stuff here
- 		//-------------------------------------------
+ 		//-----------------------------------------
  		
  		$bbcode = array(
- 		
- 		0  => array( '[b]', '[/b]', $ibforums->lang['bbc_ex1'] ),
- 		1  => array('[s]', '[/s]', $ibforums->lang['bbc_ex1'] ),
- 		2  => array('[i]', '[/i]', $ibforums->lang['bbc_ex1'] ),
- 		3  => array('[u]', '[/u]', $ibforums->lang['bbc_ex1'] ),
- 		4  => array('[email]', '[/email]', 'user@domain.com' ),
- 		5  => array('[email=user@domain.com]', '[/email]', $ibforums->lang['bbc_ex2'] ),
- 		6  => array('[url]', '[/url]', 'http://www.domain.com' ),
- 		7  => array('[url=http://www.domain.com]', '[/url]', $ibforums->lang['bbc_ex2'] ),
- 		8  => array('[size=7]', '[/size]'    , $ibforums->lang['bbc_ex1'] ),
- 		9  => array('[font=times]', '[/font]', $ibforums->lang['bbc_ex1'] ),
- 		10 => array('[color=red]', '[/color]', $ibforums->lang['bbc_ex1'] ),
- 		11 => array('[img]', '[/img]', $ibforums->vars['board_url'].'/'.$ibforums->vars['img_url'].'/icon11.gif' ),
- 		12 => array('[list]', '[/list]', '[*]List Item [*]List Item' ),
- 		13 => array('[list=1]', '[/list]', '[*]List Item [*]List Item' ),
- 		14 => array('[list=a]', '[/list]', '[*]List Item [*]List Item' ),
- 		15 => array('[list=i]', '[/list]', '[*]List Item [*]List Item' ),
- 		16 => array('[quote]', '[/quote]', $ibforums->lang['bbc_ex1'] ),
- 		17 => array('[code]', '[/code]', '$this_var = "Hello World!";' ),
- 		18 => array('[sql]', '[/sql]', 'SELECT t.tid FROM a_table t WHERE t.val="This Value"' ),
- 		19 => array('[html]', '[/html]', '&lt;a href=&quot;test/page.html&quot;&gt;A Test Page&lt;/a&gt;' ),
- 		
- 		);
+						0  => array('[b]', '[/b]', $ibforums->lang['bbc_ex1'] ),
+						1  => array('[s]', '[/s]', $ibforums->lang['bbc_ex1'] ),
+						2  => array('[i]', '[/i]', $ibforums->lang['bbc_ex1'] ),
+						3  => array('[u]', '[/u]', $ibforums->lang['bbc_ex1'] ),
+						4  => array('[email]', '[/email]', 'user@domain.com' ),
+						5  => array('[email=user@domain.com]', '[/email]', $ibforums->lang['bbc_ex2'] ),
+						6  => array('[url]', '[/url]', 'http://www.domain.com' ),
+						7  => array('[url=http://www.domain.com]', '[/url]', $ibforums->lang['bbc_ex2'] ),
+						8  => array('[size=7]', '[/size]'    , $ibforums->lang['bbc_ex1'] ),
+						9  => array('[font=times]', '[/font]', $ibforums->lang['bbc_ex1'] ),
+						10 => array('[color=red]', '[/color]', $ibforums->lang['bbc_ex1'] ),
+						11 => array('[img]', '[/img]', $ibforums->vars['board_url'].'/'.$ibforums->vars['img_url'].'/folder_post_icons/icon11.gif' ),
+						12 => array('[list]', '[/list]', '[*]List Item [*]List Item' ),
+						13 => array('[list=1]', '[/list]', '[*]List Item [*]List Item' ),
+						14 => array('[list=a]', '[/list]', '[*]List Item [*]List Item' ),
+						15 => array('[list=i]', '[/list]', '[*]List Item [*]List Item' ),
+						16 => array('[quote]', '[/quote]', $ibforums->lang['bbc_ex1'] ),
+						17 => array('[code]', '[/code]', '$this_var = "Hello World!";' ),
+						18 => array('[sql]', '[/sql]', 'SELECT t.tid FROM a_table t WHERE t.val="This Value"' ),
+						19 => array('[html]', '[/html]', '&lt;a href=&quot;test/page.html&quot;&gt;A Test Page&lt;/a&gt;' ),
+					  );
  		
  		$this->page_title = $ibforums->lang['bbc_title'];
  		
  		$this->output .= $this->html->bbcode_header();
  		
- 		$this->output .= $this->html->page_header( $ibforums->lang['bbc_title'], $ibforums->lang['bbc_before'], $ibforums->lang['bbc_after'] );
- 		
 		foreach( $bbcode as $bbc )
 		{
 			$open    = $bbc[0];
@@ -270,22 +275,50 @@ class legends {
 			$before = $this->html->wrap_tag($open) . $content . $this->html->wrap_tag($close);
 			
 			$after = $this->parser->convert( array( 'TEXT' => $open.$content.$close, 'CODE' => 1 ) );
-		
+			
+			$this->output .= $this->html->bbcode_row_header( $ibforums->lang['bbc_title']);
+			
 			$this->output .= $this->html->bbcode_row( $before, stripslashes($after) );
-										
+			
+			$this->output .= $this->html->bbcode_row_footer();
 		}
 		
-		$this->output .= $this->html->page_footer();
-    	
+		//-----------------------------------------
+ 		// Add in custom bbcode
+ 		//-----------------------------------------
+ 		
+ 		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode' ) );
+		$DB->simple_exec();
+			
+		while ( $row = $DB->fetch_row() )
+		{
+			$before  = $row['bbcode_example'];
+			
+			$t       = $before;
+			
+			$replace = explode( '{content}', $row['bbcode_replace'] );
+			
+			if ( $row['bbcode_useoption'] )
+			{
+				$t = preg_replace( "#\[".$row['bbcode_tag']."=(?:&quot;|&\#39;)?(.+?)(?:&quot;|&\#39;)?\]#si", str_replace( '{option}', "\\1", $replace[0] ), $t );
+			}
+			else
+			{
+				$t = str_replace( '['.$row['bbcode_tag'].']' , $replace[0], $t );
+			}
+			
+			$t = str_replace( '[/'.$row['bbcode_tag'].']', $replace[1], $t );
+			
+			$before = preg_replace( "#(\[".$row['bbcode_tag']."(?:[^\]]+)?\])#is", $this->html->wrap_tag("\\1"), $before );
+			$before = preg_replace( "#(\[/".$row['bbcode_tag']."\])#is"          , $this->html->wrap_tag("\\1"), $before );
+			
+			$this->output .= $this->html->bbcode_row_header( $row['bbcode_title'], $row['bbcode_desc'] );
+			
+			$this->output .= $this->html->bbcode_row( $before, $t );
+			
+			$this->output .= $this->html->bbcode_row_footer();
+		}
  	}
- 	
- 	
-        
 }
 
-?>
-
-
-
-
-
+?>
\ No newline at end of file
diff --git a/upload/sources/misc/multi_moderate.php b/upload/sources/misc/multi_moderate.php
index 42e98459..dc2f2547 100644
--- a/upload/sources/misc/multi_moderate.php
+++ b/upload/sources/misc/multi_moderate.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,13 +19,18 @@
 |   > Date started: 16th May 2003
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new multi_mod;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-class  multi_mod {
+class  mmod {
 
     var $output    = "";
     var $topic     = array();
@@ -39,17 +43,17 @@ class  multi_mod {
     var $mm_data   = "";
     var $parser    = "";
     
-    //------------------------------------------------------
+    //-----------------------------------------
 	// @constructor (no, not bob the builder)
-	//------------------------------------------------------
+	//-----------------------------------------
     
-    function multi_mod()
+    function auto_run()
     {
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print, $forums;
         
-        //-------------------------------------
+        //-----------------------------------------
         // Load modules...
-        //-------------------------------------
+        //-----------------------------------------
         
         $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_mod', $ibforums->lang_id);
         
@@ -61,9 +65,9 @@ class  multi_mod {
         
         $this->parser  = new post_parser(1);
 		
-        //----------------------------------------
+        //-----------------------------------------
 		// Clean the incoming
-		//----------------------------------------
+		//-----------------------------------------
         
         $ibforums->input['t'] = intval($ibforums->input['t']);
         $this->mm_id          = intval($ibforums->input['mm_id']);
@@ -73,94 +77,91 @@ class  multi_mod {
             $std->Error( array( LEVEL => '1', MSG => 'missing_files') );
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Get the topic id / forum id
-        //-------------------------------------
-        
-        $DB->query("SELECT t.*, f.*
-                    FROM ibf_topics t, ibf_forums f
-                    WHERE t.tid={$ibforums->input['t']} and f.id=t.forum_id");
+        //-----------------------------------------
         
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "tid=".intval($ibforums->input['t']) ) );
+		$DB->simple_exec();
+		
         $this->topic = $DB->fetch_row();
         
-        $this->forum = array( 
-        					 'id'            => $this->topic['id'],
-        					 'name'          => $this->topic['name'],
-        					 'topic_mm_id'   => $this->topic['topic_mm_id'],
-        					 'inc_postcount' => $this->topic['inc_postcount']
-        					);
+        $this->forum = $forums->forum_by_id[ $this->topic['forum_id'] ];
         					
-        //-------------------------------------
+        //-----------------------------------------
         // Error out if we can not find the forum
-        //-------------------------------------
+        //-----------------------------------------
         
         if (! $this->forum['id'])
         {
         	$std->Error( array( 'LEVEL' => 1,'MSG' => 'missing_files') );
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Error out if we can not find the topic
-        //-------------------------------------
+        //-----------------------------------------
         
         if (! $this->topic['tid'])
         {
         	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Are we a moderator?
-        //-------------------------------------
+        //-----------------------------------------
 		
 		if ( ($ibforums->member['id']) and ($ibforums->member['g_is_supmod'] != 1) )
 		{
-			$DB->query("SELECT * FROM ibf_moderators
-						WHERE forum_id={$this->forum['id']} AND (member_id={$ibforums->member['id']}
-						  OR (is_group=1 AND group_id={$ibforums->member['mgroup']}))");
-						  
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'moderators',
+										  'where'  => "forum_id=".$this->forum['id']." AND (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))" ) );
+										  
+			$DB->simple_exec();
+		
 			$this->moderator = $DB->fetch_row();
 		}
         
-        //----------------------------------------
+        //-----------------------------------------
 		// Init modfunc module
-		//----------------------------------------
+		//-----------------------------------------
 		
 		$this->modfunc->init( $this->forum, $this->topic, $this->moderator );
         
-        //----------------------------------------
+        //-----------------------------------------
 		// Do we have permission?
-		//----------------------------------------
+		//-----------------------------------------
 		
 		if ( $this->modfunc->mm_authorize() != TRUE )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'is_broken_link') );
 		}
-        
-		//-------------------------------------
-        // Does this forum have this mm_id
-        //-------------------------------------
 		
-		if ( $this->modfunc->mm_check_id_in_forum( $this->forum['topic_mm_id'], $this->mm_id ) != TRUE )
+		//-----------------------------------------
+		// Get MM data
+		//-----------------------------------------
+        
+        $this->mm_data = $ibforums->cache['multimod'][ $this->mm_id ];
+        
+        if ( ! $this->mm_data['mm_id'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'is_broken_link') );
+		}
+		
+		//-----------------------------------------
+        // Does this forum have this mm_id
+        //-----------------------------------------
+		
+		if ( $this->modfunc->mm_check_id_in_forum( $this->forum['id'], $this->mm_data ) != TRUE )
 		{
 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
 		}
 		
-		//-------------------------------------
-        // Still here? We're damn good to go sir!
-        //-------------------------------------
-        
-        $DB->query("SELECT * FROM ibf_topic_mmod WHERE mm_id={$this->mm_id}");
-        
-        if ( ! $this->mm_data = $DB->fetch_row() )
-        {
-        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'is_broken_link') );
-        }
-        
+		
         $this->modfunc->stm_init();
         
-        //-------------------------------------
+        //-----------------------------------------
         // Open close?
-        //-------------------------------------
+        //-----------------------------------------
         
         if ( $this->mm_data['topic_state'] != 'leave' )
         {
@@ -174,9 +175,9 @@ class  multi_mod {
         	}
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // pin no-pin?
-        //-------------------------------------
+        //-----------------------------------------
         
         if ( $this->mm_data['topic_pin'] != 'leave' )
         {
@@ -190,9 +191,25 @@ class  multi_mod {
         	}
         }
         
-        //-------------------------------------
+        //-----------------------------------------
+        // Approve / Unapprove
+        //-----------------------------------------
+        
+        if ( $this->mm_data['topic_approve'] )
+        {
+        	if ( $this->mm_data['topic_approve'] == 1 )
+        	{
+        		$this->modfunc->stm_add_approve();
+        	}
+        	else if ( $this->mm_data['topic_approve'] == 2 )
+        	{
+        		$this->modfunc->stm_add_unapprove();
+        	}
+        }
+        
+        //-----------------------------------------
         // Topic title
-        //-------------------------------------
+        //-----------------------------------------
         
         $title = $this->topic['title'];
         
@@ -212,15 +229,15 @@ class  multi_mod {
         
         $this->modfunc->stm_add_title($this->mm_data['topic_title_st'].$title.$this->mm_data['topic_title_end']);
         
-        //-------------------------------------
+        //-----------------------------------------
         // Update what we have so far...
-        //-------------------------------------
+        //-----------------------------------------
         
         $this->modfunc->stm_exec( $this->topic['tid'] );
         
-        //-------------------------------------
+        //-----------------------------------------
         // Add reply?
-        //-------------------------------------
+        //-----------------------------------------
         
         if ( $this->mm_data['topic_reply'] and $this->mm_data['topic_reply_content'] )
         {
@@ -238,23 +255,24 @@ class  multi_mod {
 										   );
 		}
 		
-		//-------------------------------------
+		//-----------------------------------------
         // Move topic?
-        //-------------------------------------
+        //-----------------------------------------
         
         if ( $this->mm_data['topic_move'] )
         {
-        	//-------------------------------------
+        	//-----------------------------------------
         	// Move to forum still exist?
-        	//-------------------------------------
-        	
-        	$DB->query("SELECT id, name, subwrap, sub_can_post FROM ibf_forums WHERE id=".$this->mm_data['topic_move']);
+        	//-----------------------------------------
         	
+        	$DB->simple_construct( array( 'select' => 'id, name, sub_can_post', 'from' => 'forums', 'where' => "id=".$this->mm_data['topic_move'] ) );
+			$DB->simple_exec();
+		
         	if ( $r = $DB->fetch_row() )
         	{
-        		if ( $r['subwrap'] == 1 AND $r['sub_can_post'] != 1 )
+        		if ( $r['sub_can_post'] != 1 )
         		{
-        			$DB->query("UPDATE ibf_topic_mmod SET topic_move=0 WHERE mm_id=".$this->mm_id);
+        			$DB->do_update( 'topic_mmod', array( 'topic_move' => 0 ), 'mm_id='.$this->mm_id );
         		}
         		else
         		{
@@ -268,25 +286,25 @@ class  multi_mod {
         	}
         	else
         	{
-        		$DB->query("UPDATE ibf_topic_mmod SET topic_move=0 WHERE mm_id=".$this->mm_id);
+        		$DB->do_update( 'topic_mmod', array( 'topic_move' => 0 ), 'mm_id='.$this->mm_id );
         	}
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Recount root forum
-        //-------------------------------------
+        //-----------------------------------------
         
         $this->modfunc->forum_recount( $this->forum['id'] );
         
-        //-------------------------------------
+        //-----------------------------------------
         // Add mod log
-        //-------------------------------------
+        //-----------------------------------------
         
         $this->modfunc->add_moderate_log( $this->forum['id'], $this->topic['tid'], "", $this->topic['title'], "Applied multi-mod: ".$this->mm_data['mm_title'] );
         
-        //-------------------------------------
+        //-----------------------------------------
         // Redirect back with nice fluffy message
-        //-------------------------------------
+        //-----------------------------------------
         
         $print->redirect_screen( sprintf($ibforums->lang['mm_applied'], $this->mm_data['mm_title'] ), "showforum=".$this->forum['id'] );
 		          
@@ -301,4 +319,3 @@ class  multi_mod {
 
 
 
-
diff --git a/upload/sources/misc/print_page.php b/upload/sources/misc/print_page.php
index 9bb5e82e..34e92b9c 100644
--- a/upload/sources/misc/print_page.php
+++ b/upload/sources/misc/print_page.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,13 +19,18 @@
 |   > Date started: 25th March 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new Printable;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-class Printable {
+class printpage {
 
     var $output    = "";
     var $base_url  = "";
@@ -41,20 +45,19 @@ class Printable {
     var $poll_html  = "";
     var $parser     = "";
     
-    /***********************************************************************************/
+    /*-------------------------------------------------------------------------*/
 	//
 	// Our constructor, load words, load skin, print the topic listing
 	//
-	/***********************************************************************************/
+	/*-------------------------------------------------------------------------*/
     
-    function Printable() {
-    
-    
-        global $ibforums, $DB, $std, $print, $skin_universal;
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print, $forums;
         
-        /***********************************/
+        //-----------------------------------------
 		// Compile the language file
-		/***********************************/
+		//-----------------------------------------
 		
         $ibforums->lang      = $std->load_words($ibforums->lang, 'lang_printpage', $ibforums->lang_id);
 
@@ -64,84 +67,70 @@ class Printable {
         
         $this->parser = new post_parser();
         
-        /***********************************/
+        //-----------------------------------------
         // Check the input
-        /***********************************/
+        //-----------------------------------------
         
         $ibforums->input['t'] = intval($ibforums->input['t']);
         $ibforums->input['f'] = intval($ibforums->input['f']);
         
-        if ($ibforums->input['t'] < 0 or $ibforums->input['f'] < 0)
+        if ( ! $ibforums->input['t'] or ! $ibforums->input['f'] )
         {
             $std->Error( array( LEVEL => 1, MSG => 'missing_files') );
         }
         
-        //-------------------------------------
-        // Get the forum info based on the forum ID, get the category name, ID, and get the topic details
-        //-------------------------------------
+        //-----------------------------------------
+        // Get the forum info based on the
+        // forum ID, get the category name, ID,
+        // and get the topic details
+        //-----------------------------------------
         
-        $DB->query("SELECT t.*, f.name as forum_name, f.id as forum_id, f.read_perms, f.password, f.reply_perms, f.start_perms, f.allow_poll, f.posts as forum_posts, f.topics as forum_topics, f.use_html, c.name as cat_name, c.id as cat_id FROM ibf_topics t, ibf_forums f , ibf_categories c where t.tid='".$ibforums->input[t]."' and f.id = t.forum_id and f.category=c.id");
+        $DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => "tid=".$ibforums->input['t'] ) );
+		$DB->simple_exec();
         
         $this->topic = $DB->fetch_row();
         
-        $this->forum = array( 'id'           => $this->topic['forum_id']          ,
-        					  'name'         => $this->topic['forum_name']        ,
-        					  'posts'        => $this->topic['forum_posts']       ,
-        					  'topics'       => $this->topic['forum_topics']      ,
-        					  'read_perms'   => $this->topic['read_perms']        ,
-        					  'allow_poll'   => $this->topic['allow_poll']        ,
-        					  'password'     => $this->topic['password']          ,
-        					  'use_html'     => $this->topic['use_html']
-        					);
+        $this->forum = $forums->forum_by_id[ $this->topic['forum_id'] ];
         					
-        $this->category = array( 'name'   => $this->topic['cat_name'],
-        						 'id'     => $this->topic['cat_id']  ,
-        				       );
-        
-        //-------------------------------------
+        //-----------------------------------------
         // Error out if we can not find the forum
-        //-------------------------------------
+        //-----------------------------------------
         
-        if (!$this->forum['id'])
+        if ( ! $this->forum['id'])
         {
         	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Error out if we can not find the topic
-        //-------------------------------------
+        //-----------------------------------------
         
         if (!$this->topic['tid'])
         {
         	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
         }
         
-        
-        $this->base_url = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?s={$ibforums->session_id}";
-        
-		
-        /***********************************/
+        //-----------------------------------------
         // Check viewing permissions, private forums,
         // password forums, etc
-        /***********************************/
+        //-----------------------------------------
         
         if ( (!$this->topic['pin_state']) and (!$ibforums->member['g_other_topics']) )
         {
         	$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
         }
         
-        $bad_entry = $this->check_access();
+        //-----------------------------------------
+        // Check access
+        //-----------------------------------------
         
-        if ($bad_entry == 1)
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
-        }
+        $forums->forums_check_access( $this->forum['id'], 1 );
         
-        //------------------------------------------------------------
+        //-----------------------------------------
         //
         // Main logic engine
         //
-        //------------------------------------------------------------
+        //-----------------------------------------
         
         if ($ibforums->input['client'] == 'choose')
         {
@@ -149,8 +138,8 @@ class Printable {
         	
         	$this->page_title = $this->topic['title'];
 		
-			$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
-							 	 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+			$this->nav = array ( "<a href='{$ibforums->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 	 "<a href='{$ibforums->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
 						       );
 						       
 						       
@@ -187,7 +176,6 @@ class Printable {
         
 		//$this->output .= "<br><br><font size='1'><center>Powered by Invision Power Board<br>&copy; 2002 Invision PS</center></font></body></html>";
 		
-		@flush();
 		@header("Content-type: $header");
 		
 		if ($ibforums->input['client'] != 'printer')
@@ -202,33 +190,45 @@ class Printable {
 				        
 	}
 	
+	/*-------------------------------------------------------------------------*/
+	// GET POSTS
+	/*-------------------------------------------------------------------------*/
+	
 	function get_posts()
 	{
-		global $ibforums, $DB, $std, $skin_universal;
+		global $ibforums, $DB, $std, $print;
 		
-		/***********************************/
+		//-----------------------------------------
 		// Render the page top
-		/***********************************/
+		//-----------------------------------------
 		
 		$posts_html = $this->html->pp_header( $this->forum['name'], $this->topic['title'], $this->topic['starter_name'] , $this->forum['id'], $this->topic['tid']);
 
 		$max_posts = 300;
 
-		$DB->query( "SELECT * FROM ibf_posts WHERE topic_id='".$this->topic['tid']."'".
-				    " and queued !='1' ORDER BY pid LIMIT 0, ".$max_posts);
-				    
+		$DB->simple_construct( array ( 'select' => '*',
+									   'from' => 'posts',
+									   'where' => "topic_id='{$this->topic['tid']}' and queued !='1'",
+									   'order' => 'pid',
+									   'limit' => array(0, $max_posts)
+								   )   );
+		$DB->simple_exec();
+		
+		//-----------------------------------------    
 		// Loop through to pick out the correct member IDs.
 		// and push the post info into an array - maybe in the future
 		// we can add page spans, or maybe save to a PDF file?
+		//-----------------------------------------
 		
 		$the_posts      = array();
 		$mem_ids        = "";
 		$member_array   = array();
 		$cached_members = array();
 		
-		while ($i = $DB->fetch_row() )
+		while ( $i = $DB->fetch_row() )
 		{
 			$the_posts[] = $i;
+			
 			if ($i['author_id'] != 0)
 			{
 				if (preg_match( "/'".$i['author_id']."',/", $mem_ids) )
@@ -242,15 +242,21 @@ class Printable {
 			}
 		}
 		
+		//-----------------------------------------
 		// Fix up the member_id string
+		//-----------------------------------------
+		
 		$mem_ids = preg_replace( "/,$/", "", $mem_ids);
 		
+		//-----------------------------------------
 		// Get the member profiles needed for this topic
+		//-----------------------------------------
 		
 		if ($mem_ids != "")
 		{
-			$DB->query("SELECT g.*, m.* FROM ibf_members m, ibf_groups g WHERE m.id in ($mem_ids) AND m.mgroup=g.g_id");
-	
+			$DB->cache_add_query( 'print_page_get_members', array( 'mem_ids' => $mem_ids ) );
+			$DB->cache_exec_query();
+		
 			while ( $m = $DB->fetch_row() )
 			{
 				if ($m['id'] and $m['name'])
@@ -267,44 +273,62 @@ class Printable {
 			}
 		}
 		
-		/***********************************/
+		//-----------------------------------------
 		// Format and print out the topic list
-		/***********************************/
+		//-----------------------------------------
 		
 		$td_col_cnt = 0;
 		
 		foreach ($the_posts as $row) {
 		
 			$poster = array();
-		
+			
+			//-----------------------------------------
 			// Get the member info. We parse the data and cache it.
 			// It's likely that the same member posts several times in
 			// one page, so it's not efficient to keep parsing the same
 			// data
+			//-----------------------------------------
 			
 			if ($row['author_id'] != 0)
 			{
+				//-----------------------------------------
 				// Is it in the hash?
+				//-----------------------------------------
+				
 				if ( isset($cached_members[ $row['author_id'] ]) )
 				{
+					//-----------------------------------------
 					// Ok, it's already cached, read from it
+					//-----------------------------------------
+					
 					$poster = $cached_members[ $row['author_id'] ];
 					$row['name_css'] = 'normalname';
 				}
 				else
 				{
+					//-----------------------------------------
 					// Ok, it's NOT in the cache, is it a member thats
 					// not been deleted?
+					//-----------------------------------------
+					
 					if ($member_array[ $row['author_id'] ])
 					{
 						$row['name_css'] = 'normalname';
 						$poster = $member_array[ $row['author_id'] ];
+						
+						//-----------------------------------------
 						// Add it to the cached list
+						//-----------------------------------------
+						
 						$cached_members[ $row['author_id'] ] = $poster;
 					}
 					else
 					{
+						//-----------------------------------------
 						// It's probably a deleted member, so treat them as a guest
+						//-----------------------------------------
+						
 						$poster = $std->set_up_guest( $row['author_id'] );
 						$row['name_css'] = 'unreg';
 					}
@@ -312,31 +336,34 @@ class Printable {
 			}
 			else
 			{
+				//-----------------------------------------
 				// It's definately a guest...
+				//-----------------------------------------
+				
 				$poster = $std->set_up_guest( $row['author_name'] );
 				$row['name_css'] = 'unreg';
 			}
 			
-			//--------------------------------------------------------------
+			//-----------------------------------------
 			
 			$row['post_css'] = $td_col_count % 2 ? 'post1' : 'post2';
 			
 			++$td_col_count;
 			
-			//--------------------------------------------------------------
+			//-----------------------------------------
 			
 			$row['post'] = preg_replace( "/<!--EDIT\|(.+?)\|(.+?)-->/", "", $row['post'] );
 			
-			//--------------------------------------------------------------
+			//-----------------------------------------
 		
 			$row['post_date']   = $std->get_date( $row['post_date'], 'LONG' );
 			
 			$row['post'] = $this->parse_message($row['post']);
 			
 							  
-			//--------------------------------------------------------------
+			//-----------------------------------------
 			// Siggie stuff
-			//--------------------------------------------------------------
+			//-----------------------------------------
 			
 			$row['signature'] = "";
 			
@@ -344,113 +371,77 @@ class Printable {
 			{
 				if ($row['use_sig'] == 1)
 				{
-					if ( $ibforums->vars['sig_allow_html'] == 1 )
-					{
-						$poster['signature'] = $this->parser->parse_html($poster['signature'], 0);
-					}
+					$this->parser->pp_do_html  = intval($ibforums->vars['sig_allow_html']);
+					$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+					$this->pp_nl2br            = 1;
 					
-					if ( $ibforums->vars['post_wordwrap'] > 0 )
-					{
-						$poster['signature'] = $this->parser->my_wordwrap( $poster['signature'], $ibforums->vars['post_wordwrap']) ;
-					}
-					
-					$row['signature'] = $skin_universal->signature_separator($poster['signature']);
+					$row['signature'] = $ibforums->skin_global->signature_separator( $this->parser->post_db_parse($poster['signature']) );
 				}
 			}
 			
-			//--------------------------------------------------------------
+			//-----------------------------------------
 			// Parse HTML tag on the fly
-			//--------------------------------------------------------------
+			//-----------------------------------------
 			
-			if ( $this->forum['use_html'] == 1 )
-			{
-				// So far, so good..
-				
-				if ( stristr( $row['post'], '[dohtml]' ) )
-				{
-					// [doHTML] tag found..
-					
-					$parse = ($this->forum['use_html'] AND $poster['g_dohtml']) ? 1 : 0;
-					
-					$row['post'] = $this->parser->post_db_parse($row['post'], $parse );
-				}
-			}
+			$this->parser->pp_do_html  = ( $this->forum['use_html'] and $ibforums->cache['group_cache'][ $ibforums->member['mgroup'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+			$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+			$this->parser->pp_nl2br    = $row['post_htmlstate'] == 2 ? 1 : 0;
+			
+			$row['post'] = $this->parser->post_db_parse( $row['post'] );
 			
 			$posts_html .= $this->html->pp_postentry( $poster, $row );
 			
 		}
 		
-		/***********************************/
+		//-----------------------------------------
 		// Print the footer
-		/***********************************/
+		//-----------------------------------------
 		
 		$posts_html .= $this->html->pp_end();
 		
+		//-----------------------------------------
+		// Macros
+		//-----------------------------------------
+		
+		$print->_unpack_macros();
+		
+		if ( is_array( $print->macros ) )
+      	{
+			foreach( $print->macros as $i => $row )
+			{
+				if ( $row['macro_value'] != "" )
+				{
+					$posts_html = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $posts_html );
+				}
+			}
+		}
+		
+		$posts_html = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $posts_html );
+		$posts_html = str_replace( "<#EMO_DIR#>", $ibforums->skin['_emodir']  , $posts_html );
+		
+		//-----------------------------------------
+        // CSS
+        //-----------------------------------------
+        
+        $ibforums->skin['_usecsscache'] = 0;
+        
+        $css = $print->_get_css();
+        
+        $posts_html = str_replace( '<!--IPB.CSS-->', $css, $posts_html );
+        
 		return $posts_html;
 	}
 	
 
-	function parse_message($message="") {
-	
-		//$message = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $message );
-		
-		//$message = preg_replace( "#<!--c1-->(.+?)<!--ec1-->#", "\n\n------------ CODE SAMPLE ----------\n"  , $message );
-		//$message = preg_replace( "#<!--c2-->(.+?)<!--ec2-->#", "\n-----------------------------------\n\n"  , $message );
-		
-		//$message = preg_replace( "#<!--QuoteBegin-->(.+?)<!--QuoteEBegin-->#"                       , "\n\n------------ QUOTE ----------\n" , $message );
-		//$message = preg_replace( "#<!--QuoteBegin--(.+?)\+(.+?)-->(.+?)<!--QuoteEBegin-->#"         , "\n\n------------ QUOTE ----------\n" , $message );
-		//$message = preg_replace( "#<!--QuoteEnd-->(.+?)<!--QuoteEEnd-->#"                           , "\n-----------------------------\n\n" , $message );
-		
-		$message = preg_replace( "#<!--Flash (.+?)-->.+?<!--End Flash-->#e"                         , "(FLASH MOVIE)" , $message );
-		//$message = preg_replace( "#<img src=[\"'](\S+?)['\"].+"."?".">#"                            , "(IMAGE: \\1)"   , $message );
+	function parse_message($message="")
+	{
+		$message = preg_replace( "#<!--Flash (.+?)-->.+?<!--End Flash-->#e"                            , "(FLASH MOVIE)" , $message );
 		$message = preg_replace( "#<a href=[\"'](http|https|ftp|news)://(\S+?)['\"].+?".">(.+?)</a>#"  , "\\1://\\2"     , $message );
-		//$message = preg_replace( "#<a href=[\"']mailto:(.+?)['\"]>(.+?)</a>#"                       , "(EMAIL: \\2)"   , $message );
-		
-		//$message = preg_replace( "#<!--sql-->(.+?)<!--sql1-->(.+?)<!--sql2-->(.+?)<!--sql3-->#e"    , "\n\n--------------- SQL -----------\n\\2\n----------------\n\n", $message);
-		//$message = preg_replace( "#<!--html-->(.+?)<!--html1-->(.+?)<!--html2-->(.+?)<!--html3-->#e", "\n\n-------------- HTML -----------\n\\2\n----------------\n\n", $message);
 		
 		return $message;
 		
 	}
-	
-	function check_access() {
-		global $ibforums, $std, $HTTP_COOKIE_VARS;
-		
-		$return = 1;
-		
-		$this->m_group = $ibforums->member['mgroup'];
-		
-		if ( $std->check_perms($this->forum['read_perms']) == TRUE )
-		{
-			$return = 0;
-		}
-		
-		if ($this->forum['password'] != "")
-		{
-		
-			if ( ! $c_pass = $std->my_getcookie('iBForum'.$this->forum['id']) )
-			{
-				return 1;
-			}
-		
-			if ( $c_pass == $this->forum['password'] )
-			{
-				return 0;
-			}
-			else
-			{
-			    return 1;
-			}
-		}
-		
-		return $return;
-	
-	}
+
 }
 
-?>
-
-
-
-
-
+?>
\ No newline at end of file
diff --git a/upload/sources/misc/stats.php b/upload/sources/misc/stats.php
index 51598925..324e5cc7 100644
--- a/upload/sources/misc/stats.php
+++ b/upload/sources/misc/stats.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,11 +19,16 @@
 |   > Date started: 6th March 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new stats;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
 class stats {
 
@@ -33,14 +37,14 @@ class stats {
     var $html      = "";
 	var $forum     = "";
 	
-    function stats() {
+    function auto_run() {
     
-    	//------------------------------------------------------
+    	//-----------------------------------------
     	// $is_sub is a boolean operator.
     	// If set to 1, we don't show the "topic subscribed" page
     	// we simply end the subroutine and let the caller finish
     	// up for us.
-    	//------------------------------------------------------
+    	//-----------------------------------------
     
         global $ibforums, $DB, $std, $print, $skin_universal;
         
@@ -50,9 +54,9 @@ class stats {
     	
     	$this->base_url = $ibforums->base_url;
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// What to do?
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	switch($ibforums->input['CODE'])
     	{
@@ -84,7 +88,7 @@ class stats {
  	
  	function who_posted()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		$tid = intval(trim($ibforums->input['t']));
  		
@@ -92,8 +96,8 @@ class stats {
  		
  		$this->check_access($tid);
  		
- 		$DB->query("SELECT COUNT(p.pid) as pcount, p.author_id, p.author_name FROM ibf_posts p
- 				    WHERE p.topic_id=$tid AND queued <> 1 GROUP BY p.author_name ORDER BY pcount DESC");
+ 		$DB->cache_add_query( 'stats_who_posted', array( 'tid' => $tid ) );
+		$DB->cache_exec_query();
  		
  		if ( $DB->get_num_rows() )
  		{
@@ -122,11 +126,11 @@ class stats {
  		exit();
  	}
  	
- 	//--------------------------------
+ 	//-----------------------------------------
  	
  	function check_access($tid)
     {
-		global $ibforums, $DB, $std, $HTTP_COOKIE_VARS;
+		global $ibforums, $DB, $std, $HTTP_COOKIE_VARS, $forums;
 		
 		// check for faked session ID's :D
  		
@@ -149,11 +153,14 @@ class stats {
 		//	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission') );
 		//}
 		
-		//--------------------------------
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*,title as topic_title', 'from' => 'topics', 'where' => "tid=".$tid ) );
+		$DB->simple_exec();
 		
-		$DB->query("SELECT t.title as topic_title, f.read_perms, f.password, f.id from ibf_forums f, ibf_topics t WHERE t.tid=$tid and f.id=t.forum_id");
-        
         $this->forum = $DB->fetch_row();
+        
+        $this->forum = array_merge( $this->forum, $forums->forum_by_id[ $this->forum['forum_id'] ] );
 		
 		$return = 1;
 		
@@ -177,140 +184,177 @@ class stats {
 	
 	}
  	
- 	//--------------------------------
+ 	/*-------------------------------------------------------------------------*/
+ 	// SHOW FORUM LEADERS
+ 	/*-------------------------------------------------------------------------*/
  	
  	function show_leaders()
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std, $forums;
  		
- 		//$this->output .= $this->html->page_title( $ibforums->lang['forum_leaders'] );
- 		
- 		//--------------------------------------------
-    	// Work out where our super mods are at
-    	//--------------------------------------------
+ 		//-----------------------------------------
+    	// Work out where our super mods / admins/ mods
+    	// are.....
+    	//-----------------------------------------
     	
-    	$sup_ids = array();
+    	$group_ids  = array();
+    	$member_ids = array();
+    	$used_ids   = array();
+    	$members    = array();
+    	$moderators = array();
     	
-    	$DB->query("SELECT g_id from ibf_groups WHERE g_is_supmod = 1");
+		foreach( $ibforums->cache['group_cache'] as $d => $i )
+		{
+			if ( $i['g_is_supmod'] )
+			{
+				$group_ids[ $i['g_id'] ] = $i['g_id'];
+			}
+			
+			if ( $i['g_access_cp'] )
+			{
+				$group_ids[ $i['g_id'] ] = $i['g_id'];
+			}
+		}
+		
+		foreach( $ibforums->cache['moderators'] as $d => $i )
+		{
+			if ( $i['is_group'] )
+			{
+				$group_ids[ $i['group_id'] ] = $i['group_id'];
+			}
+			else
+			{
+				$member_ids[ $i['member_id'] ] = $i['member_id'];
+			}
+		}
     	
-    	if ( $DB->get_num_rows() )
+    	//-----------------------------------------
+    	// Get all members.. (two is more eff. than 1)
+    	//-----------------------------------------
+    	
+    	if ( count( $member_ids ) )
     	{
-    		while ( $i = $DB->fetch_row() )
-    		{
-    			$sup_ids[] = $i['g_id'];
-    		}
+			$DB->cache_add_query( 'stats_get_all_members', array( 'member_ids' => $member_ids ) );
+			$DB->cache_exec_query();
+			
+			while( $r = $DB->fetch_row() )
+			{
+				$members[ $r['id'] ] = $r;
+			}
     	}
     	
-    	//--------------------------------------------
-    	// Get our admins
-    	//--------------------------------------------
+    	//-----------------------------------------
+    	// Get all groups.. (two is more eff. than 1)
+    	//-----------------------------------------
     	
-    	$admin_ids = array();
+    	$DB->cache_add_query( 'stats_get_all_members_groups', array( 'group_ids' => $group_ids ) );
+    	$DB->cache_exec_query();
     	
-    	$DB->query("SELECT m.id, m.name, m.email, m.hide_email, m.location, m.aim_name, m.icq_number, g.g_access_cp
-    			    FROM ibf_members m, ibf_groups g
-    			    WHERE g.g_access_cp=1 AND m.mgroup=g.g_id ORDER BY m.name");
+    	while( $r = $DB->fetch_row() )
+    	{
+    		$members[ $r['id'] ] = $r;
+    	}
+    	
+    	//-----------------------------------------
+    	// PRINT: Admins
+    	//-----------------------------------------
     	
     	$this->output .= $this->html->group_strip( $ibforums->lang['leader_admins'] );
     	
-    	while ( $member = $DB->fetch_row() )
+    	foreach( $members as $id => $member )
     	{
-    		$this->output .= $this->html->leader_row( $this->parse_member( $member ), $ibforums->lang['leader_all_forums'] );
-    		
-    		$admin_ids[] = $member['id'];
+    		if ( $ibforums->cache['group_cache'][ $member['mgroup'] ]['g_access_cp'] )
+    		{
+    			$this->output .= $this->html->leader_row( $this->parse_member( $member ), $ibforums->lang['leader_all_forums'] );
+    			
+    			//-----------------------------------------
+    			// Used...
+    			//-----------------------------------------
+    			
+    			$used_ids[] = $id;
+    		}
     	}
     	
     	$this->output .= $this->html->close_strip();
     	
-    	//--------------------------------------------
-    	// Do the bizz with the super men, er mods.
-    	//--------------------------------------------
+    	//-----------------------------------------
+    	// PRINT: Super Moderators
+    	//-----------------------------------------
     	
-    	$admin_ids[] = '0';
+    	$tmp_html = "";
     	
-    	if ( count($sup_ids) > 0 )
+    	foreach( $members as $id => $member )
     	{
-    		
-    		$DB->query("SELECT id, name, email, hide_email, location, aim_name, icq_number from ibf_members WHERE mgroup IN (".implode( ',', $sup_ids ).") and id NOT IN(".implode(',', $admin_ids).") ORDER BY name");
-    	
-    		if ( $DB->get_num_rows() )
+    		if ( $ibforums->cache['group_cache'][ $member['mgroup'] ]['g_is_supmod'] and ( ! in_array( $id, $used_ids) ) )
     		{
-    			$this->output .= $this->html->group_strip( $ibforums->lang['leader_global'] );
+    			$tmp_html .= $this->html->leader_row( $this->parse_member( $member ), $ibforums->lang['leader_all_forums'] );
     			
-    			while ( $member = $DB->fetch_row() )
-				{
-					$this->output .= $this->html->leader_row( $this->parse_member( $member ), $ibforums->lang['leader_all_forums'] );
-				}
-				
-				$this->output .= $this->html->close_strip();
-			}
-			
+    			//-----------------------------------------
+    			// Used...
+    			//-----------------------------------------
+    			
+    			$used_ids[] = $id;
+    		}
+    	}
+    	
+		if ( $tmp_html )
+		{
+			$this->output .= $this->html->group_strip( $ibforums->lang['leader_global'] );
+			$this->output .= $tmp_html;
+			$this->output .= $this->html->close_strip();
 		}
 		
-		//--------------------------------------------
-    	// Do we have any moderators? NORMAL MODS 1st
-    	//--------------------------------------------
+		//-----------------------------------------
+    	// GET MODERATORS: Normal
+    	//-----------------------------------------
     	
-    	$DB->query("SELECT m2.id, m2.name, m2.email, m2.hide_email, m2.location, m2.aim_name, m2.icq_number,
-    	                   f.id as forum_id, f.read_perms, f.name as forum_name, c.state
-    	            FROM ibf_moderators mod
-    	              LEFT JOIN ibf_forums f ON(f.id=mod.forum_id)
-    	              LEFT JOIN ibf_categories c ON(c.id=f.category AND c.state != 0)
-    	              LEFT JOIN ibf_members m2 ON (mod.member_id=m2.id)
-    	            ");
+    	$tmp_html = "";
     	
-    	
-    	$data = array();
-    	
-    	while ( $i = $DB->fetch_row() )
+    	foreach( $members as $id => $member )
     	{
-    		if ( ! $i['name'] )
+    		if ( ! in_array( $id, $used_ids) ) 
     		{
-    			continue;
-    		}
-    		if ( $std->check_perms($i['read_perms']) == TRUE )
-    		{
-    			$data[] = $i;
+    			foreach( $ibforums->cache['moderators'] as $idx => $data )
+    			{
+    				if ( $data['is_group'] and $data['group_id'] == $member['mgroup'] )
+    				{
+    					if ( $std->check_perms( $forums->forum_by_id[ $data['forum_id'] ]['read_perms'] ) == TRUE )
+    					{
+    						$moderators[] = array_merge( $member, array( 'forum_id' => $data['forum_id'] ) );
+    					}
+    					
+    					$used_ids[] = $id;
+    				}
+    				else if ( $data['member_id'] == $member['id'] )
+    				{
+    					if ( $std->check_perms( $forums->forum_by_id[ $data['forum_id'] ]['read_perms'] ) == TRUE )
+    					{
+    						$moderators[] = array_merge( $member, array( 'forum_id' => $data['forum_id'] ) );
+    					}
+    					
+    					$used_ids[] = $id;
+    				}
+    			}
     		}
     	}
     	
-    	//--------------------------------------------
-    	// Do we have any moderators? GROUP MODS 1st
-    	//--------------------------------------------
+		//-----------------------------------------
+		// Parse moderators
+		//-----------------------------------------
     	
-    	$DB->query("SELECT m.id, m.name, m.email, m.hide_email, m.location, m.aim_name, m.icq_number,
-    	                   f.id as forum_id, f.read_perms, f.name as forum_name, c.state
-    	            FROM ibf_moderators mod
-    	              LEFT JOIN ibf_forums f ON(f.id=mod.forum_id)
-    	              LEFT JOIN ibf_categories c ON(c.id=f.category AND c.state != 0)
-    	              LEFT JOIN ibf_members m ON ((mod.is_group=1 and mod.group_id=m.mgroup))
-    	            ");
-    	
-    	while ( $i = $DB->fetch_row() )
-    	{
-    		if ( ! $i['name'] )
-    		{
-    			continue;
-    		}
-    		if ( $std->check_perms($i['read_perms']) == TRUE )
-    		{
-    			$data[] = $i;
-    		}
-    	}
-    	
-    	//------------------------
-    	          
-    	if ( count($data) > 0 )
+    	if ( count($moderators) > 0 )
     	{
     		$mod_array = array();
     		
     		$this->output .= $this->html->group_strip( $ibforums->lang['leader_mods'] );
     		
-    		foreach ( $data as $idx => $i )
+    		foreach ( $moderators as $idx => $i )
     		{
-    			if ( !isset( $mod_array['member'][ $i['id'] ][ 'name' ] ) )
+    			if ( ! isset( $mod_array['member'][ $i['id'] ][ 'name' ] ) )
     			{
+    				//-----------------------------------------
     				// Member is not already set, lets add the member...
+    				//-----------------------------------------
     				
     				$mod_array['member'][ $i['id'] ] = array( 'name'       => $i['name'],
     														  'email'      => $i['email'],
@@ -323,9 +367,11 @@ class stats {
     														
     			}
     			
+    			//-----------------------------------------
     			// Add forum..	
-    				
-    			$mod_array['forums'][ $i['id'] ][] = array($i['forum_id'], $i['forum_name']);
+    			//-----------------------------------------
+    			
+    			$mod_array['forums'][ $i['id'] ][] = array( $i['forum_id'] , $forums->forum_by_id[ $i['forum_id'] ]['name'] );
     		}
     		
     		foreach( $mod_array['member'] as $id => $data )
@@ -354,7 +400,6 @@ class stats {
 														   $this->parse_member( $mod_array['member'][ $id ] ),
 														   $fhtml
 														);
-    														  
     		}
     		
     		$this->output .= $this->html->close_strip();
@@ -363,12 +408,11 @@ class stats {
     	
     	$this->page_title = $ibforums->lang['forum_leaders'];
     	$this->nav        = array( $ibforums->lang['forum_leaders'] );
-    	
  	}
  	
  	function show_queries()
  	{
- 		global $ibforums, $DB, $std;
+		global $ibforums, $DB, $std;
  		
  		// show DB queries in graphic format(depreciated)
  		// left here to stop other functions breaking
@@ -378,65 +422,79 @@ class stats {
 		exit();
  	}
  	
- 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Top 10 Posters
+ 	/*-------------------------------------------------------------------------*/
  	
  	function show_today_posters()
  	{
- 		global $ibforums, $DB, $std;
- 		
- 		//$this->output .= $this->html->page_title( $ibforums->lang['todays_posters'] );
+		global $ibforums, $DB, $std, $forums;
  		
  		$this->output .= $this->html->top_poster_header();
  		
  		$time_high = time();
+ 		$ids       = array();
+ 		$time_low  = $time_high - (60*60*24);
  		
- 		$time_low = $time_high - (60*60*24);
- 		
- 		//--------------------------------------------
+ 		//-----------------------------------------
     	// Query the DB
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
-    	$DB->query("SELECT COUNT(pid) as count FROM ibf_posts WHERE post_date < $time_high and post_date > $time_low");
-    	$todays_posts = $DB->fetch_row();
-    	
-    	if ($todays_posts['count'] > 0)
+    	foreach( $forums->forum_by_id as $id => $data )
     	{
+    		if ( ! $data['inc_postcount'] )
+    		{
+    			continue;
+    		}
+    		
+    		$ids[] = $id;
+    	}
     	
-			$DB->query("SELECT COUNT(p.pid) as tpost, m.id, m.name, m.joined, m.posts FROM ibf_posts p, ibf_members m "
-					  ."WHERE m.id > 0 AND m.id=p.author_id and post_date < $time_high and post_date > $time_low GROUP BY p.author_id ORDER BY tpost DESC LIMIT 0,10");
-					  
-			if ( $DB->get_num_rows() )
-			{
+    	$todays_posts = 0;
+    	
+    	$store = array();
+    	
+    	$DB->simple_construct( array( 'select' => 'count(*) as cnt', 'from' => 'posts', 'where' => "post_date > $time_low" ) );
+    	$DB->simple_exec();
+    	
+    	$total_today = $DB->fetch_row();
+    	
+    	$DB->cache_add_query( 'stats_get_todays_posters', array( 'ids' => $ids, 'time_low' => $time_low ) );
+    	$DB->cache_exec_query();
+    	
+		while ($r = $DB->fetch_row())
+		{
+			$todays_posts += $r['tpost'];
 			
-				while ($info = $DB->fetch_row())
+			$store[] = $r;
+		}
+		
+		if ( $todays_posts )
+		{
+			foreach( $store as $idx => $info )
+			{		
+				$info['total_today_posts'] = $todays_posts;
+				
+				if ($todays_posts > 0 and $info['tpost'] > 0)
 				{
-					
-					$info['total_today_posts'] = $todays_posts['count'];
-					
-					if ($todays_posts['count'] > 0 and $info['tpost'] > 0)
-					{
-						$info['today_pct']     = sprintf( '%.2f',  ( $info['tpost'] / $todays_posts['count'] ) * 100  );
-					}
-					
-					$info['joined']            = $std->get_date( $info['joined'], 'JOINED' );
-					
-					$info['posts'] = $std->do_number_format($info['posts']);
-					$info['tpost'] = $std->do_number_format($info['tpost']);
-					
-					$this->output .= $this->html->top_poster_row( $info );
+					$info['today_pct'] = sprintf( '%.2f',  ( $info['tpost'] / $total_today['cnt'] ) * 100  );
 				}
+				
+				$info['joined']  = $std->get_date( $info['joined'], 'JOINED' );
+				
+				$info['posts'] = $std->do_number_format($info['posts']);
+				$info['tpost'] = $std->do_number_format($info['tpost']);
+				
+				$this->output .= $this->html->top_poster_row( $info );
 			}
-			else
-			{
-				$this->output .= $this->html->top_poster_no_info();
-			}
+			
 		}
 		else
 		{
 			$this->output .= $this->html->top_poster_no_info();
 		}
 		
-		$this->output .= $this->html->top_poster_footer( $std->do_number_format($todays_posts['count']) );
+		$this->output .= $this->html->top_poster_footer();
 		
 		$this->page_title = $ibforums->lang['top_poster_title'];
 		
@@ -474,7 +532,7 @@ class stats {
 		
 		
 	
-//------------------------------------------------------------------------------------------------
+//-----------------------------------------
 
 	function parse_member( $member )
 	{
@@ -544,9 +602,4 @@ class stats {
 	
 }
 
-?>
-
-
-
-
-
+?>
\ No newline at end of file
diff --git a/upload/sources/misc/tracker.php b/upload/sources/misc/tracker.php
index e1252f28..fd853171 100644
--- a/upload/sources/misc/tracker.php
+++ b/upload/sources/misc/tracker.php
@@ -1,244 +1,261 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Topic Tracker module
-|   > Module written by Matt Mecham
-|   > Date started: 5th March 2002
-|
-|	> Module Version Number: 1.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new tracker;
-
-class tracker {
-
-    var $output    = "";
-    var $base_url  = "";
-    var $html      = "";
-
-    var $forum     = array();
-    var $topic     = array();
-    var $category  = array();
-    var $type      = 'topic';
-
-    
-    function tracker($is_sub=0) {
-    
-    	//------------------------------------------------------
-    	// $is_sub is a boolean operator.
-    	// If set to 1, we don't show the "topic subscribed" page
-    	// we simply end the subroutine and let the caller finish
-    	// up for us.
-    	//------------------------------------------------------
-    
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
-        $ibforums->lang    = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id);
-
-        
-        
-        //------------------------------------------------------
-        // Check the input
-        //------------------------------------------------------
-        
-        if ($ibforums->input['type'] == 'forum')
-        {
-        	$this->type = 'forum';
-        }
-        
-        $ibforums->input['t'] = intval($ibforums->input['t']);
-        $ibforums->input['f'] = intval($ibforums->input['f']);
-        
-        //------------------------------------------------------
-        // Get the forum info based on the forum ID, get the category name, ID, and get the topic details
-        //------------------------------------------------------
-        
-        if ($this->type == 'forum')
-        {
-        	$DB->query("SELECT f.id as fid, f.read_perms, f.password FROM ibf_forums f WHERE f.id='".$ibforums->input['f']."'");
-        }
-        else
-        {
-        	$DB->query("SELECT t.tid, f.id as fid, f.read_perms, f.password FROM ibf_topics t, ibf_forums f WHERE t.tid='".$ibforums->input['t']."' AND t.forum_id=f.id");
-        }
-        
-        $this->topic = $DB->fetch_row();
-        
-       
-        
-        //------------------------------------------------------
-        // Error out if we can not find the forum
-        //------------------------------------------------------
-        
-        if (!$this->topic['fid'])
-        {
-        	if ($is_sub != 1)
-        	{
-            	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-            }
-            else
-            {
-            	return;
-            }
-        }
-        
-        //------------------------------------------------------
-        // Error out if we can not find the topic
-        //------------------------------------------------------
-        
-        if ($this->type != 'forum')
-        {
-			if (!$this->topic['tid'])
-			{
-				if ($is_sub != 1)
-				{
-					$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
-				}
-				else
-				{
-					return;
-				}
-			}
-        }
-        
-        $this->base_url    = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?s={$ibforums->session_id}";
-        
-        $this->base_url_NS = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
-		
-        //------------------------------------------------------
-        // Check viewing permissions, private forums,
-        // password forums, etc
-        //------------------------------------------------------
-        
-        if (! $ibforums->member['id'] )
-        {
-        	if ($is_sub != 1)
-        	{
-            	$std->Error( array( LEVEL => 1, MSG => 'no_guests') );
-            }
-            else
-            {
-            	return;
-            }
-        }
-        
-        if ( $std->check_perms($this->topic['read_perms']) != TRUE )
-        {
-			if ($is_sub != 1)
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'forum_no_access') );
-			}
-			else
-			{
-				return;
-			}
-		}
-		
-		if ($this->topic['password'] != "")
-		{
-		
-			if ( ! $c_pass = $std->my_getcookie('iBForum'.$this->topic['fid']) )
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'forum_no_access') );
-			}
-		
-			if ( $c_pass != $this->topic['password'] )
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'forum_no_access') );
-			}
-			
-		}
-		
-		//------------------------------------------------------
-		// Have we already subscribed?
-		//------------------------------------------------------
-		
-		if ($this->type == 'forum')
-		{
-			$DB->query("SELECT frid from ibf_forum_tracker WHERE forum_id='".$this->topic['fid']."' AND member_id='".$ibforums->member['id']."'");
-		}
-		else
-		{
-			$DB->query("SELECT trid from ibf_tracker WHERE topic_id='".$this->topic['tid']."' AND member_id='".$ibforums->member['id']."'");
-		}
-		
-		if ( $DB->get_num_rows() )
-		{
-			if ($is_sub != 1)
-			{
-				$std->Error( array( LEVEL => 1, MSG => 'already_sub') );
-			}
-			else
-			{
-				return;
-			}
-		}
-		
-		//------------------------------------------------------
-		// Add it to the DB
-		//------------------------------------------------------
-		
-		if ($this->type == 'forum')
-		{
-		
-			$db_string = $DB->compile_db_insert_string( array (
-																 'member_id'   => $ibforums->member['id'],
-																 'forum_id'    => $this->topic['fid'],
-																 'start_date'  => time(),
-													  )       );
-													  
-			$DB->query("INSERT INTO ibf_forum_tracker (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-		}
-		else
-		{
-			$db_string = $DB->compile_db_insert_string( array (
-																 'member_id'   => $ibforums->member['id'],
-																 'topic_id'    => $this->topic['tid'],
-																 'start_date'  => time(),
-													  )       );
-													  
-			$DB->query("INSERT INTO ibf_tracker (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-
-		}
-		
-		if ($is_sub != 1)
-		{
-			if ($this->type == 'forum')
-			{
-				$print->redirect_screen( $ibforums->lang['sub_added'], "act=SF&f={$this->topic['fid']}" );
-			}
-			else
-			{
-				$print->redirect_screen( $ibforums->lang['sub_added'], "act=ST&f={$this->topic['fid']}&t={$this->topic['tid']}&st={$ibforums->input['st']}" );
-			}
-		}
-		else
-		{
-			return;
-		}
-	}
-}
-
-?>
-
-
-
-
-
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Topic Tracker module
+|   > Module written by Matt Mecham
+|   > Date started: 5th March 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class tracker {
+
+    var $output    = "";
+    var $base_url  = "";
+    var $html      = "";
+
+    var $forum     = array();
+    var $topic     = array();
+    var $category  = array();
+    var $type      = 'topic';
+	var $method    = 'delayed';
+    
+    function auto_run($is_sub=0)
+    {
+    
+    	//-----------------------------------------
+    	// $is_sub is a boolean operator.
+    	// If set to 1, we don't show the "topic subscribed" page
+    	// we simply end the subroutine and let the caller finish
+    	// up for us.
+    	//-----------------------------------------
+    
+        global $ibforums, $DB, $std, $print, $forums;
+        
+        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_emails', $ibforums->lang_id);
+
+        //-----------------------------------------
+        // Check the input
+        //-----------------------------------------
+        
+        if ($ibforums->input['type'] == 'forum')
+        {
+        	$this->type = 'forum';
+        }
+        
+        //-----------------------------------------
+        // Method..
+        //-----------------------------------------
+        
+        switch ($ibforums->input['method'])
+        {
+        	case 'immediate':
+        		$this->method = 'immediate';
+        		break;
+        	case 'delayed':
+        		$this->method = 'delayed';
+        		break;
+        	case 'none':
+        		$this->method = 'none';
+        		break;
+        	case 'daily':
+        		$this->method = 'daily';
+        		break;
+        	case 'weekly':
+        		$this->method = 'weekly';
+        		break;
+        	default:
+        		$this->method = 'delayed';
+        		break;
+        }
+        
+        
+        $ibforums->input['t'] = intval($ibforums->input['t']);
+        $ibforums->input['f'] = intval($ibforums->input['f']);
+        
+        //-----------------------------------------
+        // Get the forum info based on the forum ID, get the category name, ID, and get the topic details
+        //-----------------------------------------
+        
+        if ($this->type == 'forum')
+        {
+        	$this->topic = $forums->forum_by_id[ $ibforums->input['f'] ];
+        }
+        else
+        {
+        	$row = $DB->simple_exec_query( array( 'select' => 'tid, forum_id', 'from' => 'topics', 'where' => 'tid='.$ibforums->input['t'] ) );
+        	$this->topic = array_merge( $row, $forums->forum_by_id[ $ibforums->input['f'] ] );
+        }
+        
+        //-----------------------------------------
+        // Error out if we can not find the forum
+        //-----------------------------------------
+        
+        if ( ! $forums->forum_by_id[ $ibforums->input['f'] ] )
+        {
+        	if ($is_sub != 1)
+        	{
+            	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+            }
+            else
+            {
+            	return;
+            }
+        }
+        
+        //-----------------------------------------
+        // Error out if we can not find the topic
+        //-----------------------------------------
+        
+        if ($this->type != 'forum')
+        {
+			if ( ! $this->topic['tid'] )
+			{
+				if ($is_sub != 1)
+				{
+					$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+				}
+				else
+				{
+					return;
+				}
+			}
+        }
+        
+        $this->base_url    = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}?s={$ibforums->session_id}";
+        
+        $this->base_url_NS = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
+		
+        //-----------------------------------------
+        // Check viewing permissions, private forums,
+        // password forums, etc
+        //-----------------------------------------
+        
+        if (! $ibforums->member['id'] )
+        {
+        	if ($is_sub != 1)
+        	{
+            	$std->Error( array( LEVEL => 1, MSG => 'no_guests') );
+            }
+            else
+            {
+            	return;
+            }
+        }
+        
+        if ( $std->check_perms( $forums->forum_by_id[ $ibforums->input['f'] ]['read_perms'] ) != TRUE )
+        {
+			if ($is_sub != 1)
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'forum_no_access') );
+			}
+			else
+			{
+				return;
+			}
+		}
+		
+		if ($this->topic['password'] != "")
+		{
+			if ( $forums->forums_compare_password($this->topic['fid']) != TRUE )
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'forum_no_access') );
+			}
+		}
+		
+		//-----------------------------------------
+		// Have we already subscribed?
+		//-----------------------------------------
+		
+		if ($this->type == 'forum')
+		{
+			$DB->simple_construct( array( 'select' => 'frid',
+										  'from'   => 'forum_tracker',
+										  'where'  => "forum_id='".$this->topic['id']."' AND member_id='".$ibforums->member['id']."'" ) );
+			$DB->simple_exec();
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => 'trid',
+										  'from'   => 'tracker',
+										  'where'  => "topic_id='".$this->topic['tid']."' AND member_id='".$ibforums->member['id']."'" ) );
+			$DB->simple_exec();
+		}
+		
+		if ( $DB->get_num_rows() )
+		{
+			if ($is_sub != 1)
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'already_sub') );
+			}
+			else
+			{
+				return;
+			}
+		}
+		
+		//-----------------------------------------
+		// Add it to the DB
+		//-----------------------------------------
+		
+		if ($this->type == 'forum')
+		{
+		
+			$DB->do_insert( 'forum_tracker', array (
+													  'member_id'        => $ibforums->member['id'],
+													  'forum_id'         => $ibforums->input['f'],
+													  'start_date'       => time(),
+													  'forum_track_type' => $this->method,
+										   )       );
+		}
+		else
+		{
+			$DB->do_insert( 'tracker', array (
+												'member_id'        => $ibforums->member['id'],
+												'topic_id'         => $this->topic['tid'],
+												'start_date'       => time(),
+												'topic_track_type' => $this->method,
+									 )       );
+		}
+		
+		if ($is_sub != 1)
+		{
+			if ($this->type == 'forum')
+			{
+				$print->redirect_screen( $ibforums->lang['sub_added'], "act=SF&f={$this->topic['id']}" );
+			}
+			else
+			{
+				$print->redirect_screen( $ibforums->lang['sub_added'], "act=ST&f={$this->topic['id']}&t={$this->topic['tid']}&st={$ibforums->input['st']}" );
+			}
+		}
+		else
+		{
+			return;
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/misc/warn.php b/upload/sources/misc/warn.php
index 4e9d16b2..9781d4e7 100644
--- a/upload/sources/misc/warn.php
+++ b/upload/sources/misc/warn.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,11 +19,16 @@
 |   > Date started: 16th May 2003
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Mon 24th May 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new warn;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
 class  warn {
 
@@ -46,17 +50,17 @@ class  warn {
     
     var $warn_member  = "";
     
-    //------------------------------------------------------
+    //-----------------------------------------
 	// @constructor (no, not bob the builder)
-	//------------------------------------------------------
+	//-----------------------------------------
     
-    function warn()
+    function auto_run()
     {
-        global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
         
-        //-------------------------------------
+        //-----------------------------------------
         // Load modules...
-        //-------------------------------------
+        //-----------------------------------------
         
         $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_mod', $ibforums->lang_id);
         
@@ -64,11 +68,11 @@ class  warn {
         
         require( ROOT_PATH.'sources/lib/post_parser.php');
         
-        $this->parser  = new post_parser(1);
+        $this->parser  = new post_parser();
         
-        //-------------------------------------
+        //-----------------------------------------
         // Make sure we're a moderator...
-        //-------------------------------------
+        //-----------------------------------------
         
         $pass = 0;
         
@@ -94,16 +98,24 @@ class  warn {
         	}
         	else if ($ibforums->member['is_mod'])
         	{
-        		$DB->query("SELECT * FROM ibf_moderators WHERE (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))");
-				
+        		
+        		$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'moderators',
+											  'where'  => "(member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))" ) );
+											  
+				$DB->simple_exec();
+        		
 				if ( $this->moderator = $DB->fetch_row() )
 				{
-					$pass               = 1;
-					$this->can_ban      = $ibforums->vars['warn_mod_ban'];
-    				$this->can_mod_q    = $ibforums->vars['warn_mod_modq'];
-    				$this->can_rem_post = $ibforums->vars['warn_mod_post'];
-    				$this->times_a_day  = intval($ibforums->vars['warn_mod_day']);
-    				$this->type         = 'mod';
+					if ( $this->moderator['allow_warn'] )
+					{
+						$pass               = 1;
+						$this->can_ban      = $ibforums->vars['warn_mod_ban'];
+						$this->can_mod_q    = $ibforums->vars['warn_mod_modq'];
+						$this->can_rem_post = $ibforums->vars['warn_mod_post'];
+						$this->times_a_day  = intval($ibforums->vars['warn_mod_day']);
+						$this->type         = 'mod';
+    				}
 				}
         	}
         	else if ( $ibforums->vars['warn_show_own'] and $ibforums->member['id'] == $ibforums->input['mid'] )
@@ -131,9 +143,9 @@ class  warn {
         	$std->Error( array( LEVEL => 1, MSG => 'no_permission') );
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Ensure we have a valid member id
-        //-------------------------------------
+        //-----------------------------------------
         
         $mid = intval($ibforums->input['mid']);
         
@@ -142,10 +154,9 @@ class  warn {
         	$std->Error( array( LEVEL => 1, MSG => 'no_such_user') );
         }
         
-        $DB->query("SELECT m.*, g.* FROM ibf_members m
-        			 LEFT JOIN ibf_groups g on (m.mgroup=g.g_id)
-        			WHERE id=$mid");
-        
+        $DB->cache_add_query( 'generic_get_all_member', array( 'mid' => $mid ) );
+		$DB->cache_exec_query();
+		
         $this->warn_member = $DB->fetch_row();
         
         if ( ! $this->warn_member['id'] )
@@ -153,27 +164,27 @@ class  warn {
         	$std->Error( array( LEVEL => 1, MSG => 'no_such_user') );
         }
         
-        
         if ( $ibforums->input['CODE'] == "" OR $ibforums->input['CODE'] == "dowarn" )
         {
-			//-------------------------------------
+			//-----------------------------------------
 			// Protected member? Really? o_O
-			//-------------------------------------
+			//-----------------------------------------
 			
-			if ( stristr( $ibforums->vars['warn_protected'], ','.$this->warn_member['mgroup'].',' ) )
+			if ( strstr( ','.$ibforums->vars['warn_protected'].',', ','.$this->warn_member['mgroup'].',' ) )
 			{
 				$std->Error( array( LEVEL => 1, MSG => 'protected_user') );
 			}
 			
-			//-------------------------------------
+			//-----------------------------------------
 			// I've already warned you!!
-			//-------------------------------------
+			//-----------------------------------------
 			
 			if ( $this->times_a_day > 0 )
 			{
 				$time_to_check = time() -  86400;
 				
-				$DB->query("SELECT * FROM ibf_warn_logs WHERE wlog_mid={$this->warn_member['id']} AND wlog_date > $time_to_check");
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'warn_logs', 'where' => "wlog_mid={$this->warn_member['id']} AND wlog_date > $time_to_check" ) );
+				$DB->simple_exec();
 				
 				if ( $DB->get_num_rows() >= $this->times_a_day )
 				{
@@ -182,12 +193,12 @@ class  warn {
 			}
         }
         
-        //-------------------------------------
+        //-----------------------------------------
         // Bouncy, bouncy!
-        //-------------------------------------
+        //-----------------------------------------
 		
-		switch ($ibforums->input['CODE']) {
-        
+		switch ($ibforums->input['CODE'])
+		{
         	case 'dowarn':
         		$this->do_warn();
         		break;
@@ -218,17 +229,17 @@ class  warn {
 	
 	
 	
-	//-------------------------------------------------
+	//-----------------------------------------
 	// Show logs
-	//-------------------------------------------------
+	//-----------------------------------------
 	
 	function view_log()
 	{
 		global $std, $ibforums, $DB, $print;
 		
-		//-------------------------------------
+		//-----------------------------------------
 		// Protected member? Really? o_O
-		//-------------------------------------
+		//-----------------------------------------
 		
 		if ( stristr( $ibforums->vars['warn_protected'], ','.$this->warn_member['mgroup'].',' ) )
 		{
@@ -239,7 +250,8 @@ class  warn {
 		
 		$start   = intval($ibforums->input['st']);
 		
-		$DB->query("SELECT count(*) as cnt FROM ibf_warn_logs WHERE wlog_mid={$this->warn_member['id']}");
+		$DB->simple_construct( array( 'select' => 'count(*) as cnt', 'from' => 'warn_logs', 'where' => "wlog_mid={$this->warn_member['id']}" ) );
+		$DB->simple_exec();
 		
 		$row = $DB->fetch_row();
 		
@@ -260,11 +272,9 @@ class  warn {
 		}
 		else
 		{
-			$DB->query("SELECT l.*,  p.id as punisher_id, p.name as punisher_name
-					     FROM ibf_warn_logs l
-					      LEFT JOIN ibf_members p ON ( p.id=l.wlog_addedby )
-					    WHERE l.wlog_mid={$this->warn_member['id']} ORDER BY l.wlog_date DESC LIMIT $start, $perpage");
-			
+			$DB->cache_add_query( 'warn_get_data', array( 'mid' => $this->warn_member['id'], 'limit_a' => $start, 'limit_b' => $perpage ) );
+			$DB->cache_exec_query();
+		
 			while ( $r = $DB->fetch_row() )
 			{
 				$date = $std->get_date( $r['wlog_date'], 'LONG' );
@@ -301,15 +311,15 @@ class  warn {
 	
 	
 	
-	//-------------------------------------------------
+	//-----------------------------------------
 	// Do the actual warny-e-poos
-	//-------------------------------------------------
+	//-----------------------------------------
 	
 	function do_warn()
 	{
 		global $std, $ibforums, $DB, $print;
 		
-		require "./sources/lib/emailer.php";
+		require "./sources/classes/class_email.php";
 		$this->email = new emailer();
 		
 		$save = array();
@@ -349,18 +359,18 @@ class  warn {
 			}
         }
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Check security fang
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ( $ibforums->input['key'] != $std->return_md5_check() )
 		{
 			$std->Error( array( LEVEL => '1', MSG => 'del_post') );
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// As Celine Dion once squawked, "Show me the reason"
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ( trim($ibforums->input['reason']) == "" )
 		{
@@ -368,16 +378,16 @@ class  warn {
 			return;
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Plussy - minussy?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$save['wlog_type'] = ( $ibforums->input['level'] == 'add' ) ? 'neg' : 'pos';
 		$save['wlog_date'] = time();
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Contacting the member?
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		if ( $ibforums->input['contact'] != "" )
 		{
@@ -392,9 +402,9 @@ class  warn {
 			
 			if ( $ibforums->input['contactmethod'] == 'email' )
 			{
-				//----------------------------------
+				//-----------------------------------------
 				// Send the email
-				//----------------------------------
+				//-----------------------------------------
 				
 				$this->email->get_template("email_member");
 					
@@ -412,71 +422,34 @@ class  warn {
 			}
 			else
 			{
-				//----------------------------------
+				//-----------------------------------------
 				// PM :o
-				//----------------------------------
+				//-----------------------------------------
 				
-				$show_popup = $this->warn_member['view_pop'];
+				require_once( ROOT_PATH.'sources/lib/msg_functions.php' );
+ 		
+ 				$this->lib = new msg_functions();
+ 				$this->lib->init();
+ 				
+				$this->lib->to_by_id    = $this->warn_member['id'];
+ 				$this->lib->from_member = $ibforums->member;
+ 				$this->lib->msg_title   = $ibforums->input['subject'];
+ 				$this->lib->msg_post    = $std->remove_tags($ibforums->input['contact']);
+				$this->lib->force_pm    = 1;
 				
-				//--------------------------------------
-				// Enter the info into the DB
-				// Target user side.
-				//--------------------------------------
+				$this->lib->send_pm();
 				
-				$db_string = $std->compile_db_string( array( 
-															 'member_id'      => $this->warn_member['id'],
-															 'msg_date'       => time(),
-															 'read_state'     => '0',
-															 'title'          => $ibforums->input['subject'],
-															 'message'        => $std->remove_tags($ibforums->input['contact']),
-															 'from_id'        => $ibforums->member['id'],
-															 'vid'            => 'in',
-															 'recipient_id'   => $this->warn_member['id'],
-															 'tracking'       => 0,
-													)      );
-				
-				$DB->query("INSERT INTO ibf_messages (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-				$new_id = $DB->get_insert_id();
-				unset($db_string);
-				
-				//-----------------------------------------------------
-				
-				$DB->query("UPDATE ibf_members SET ".
-							"msg_total = msg_total + 1, "                    .
-							"new_msg = new_msg + 1, "                        .
-							"msg_from_id='"     . $ibforums->member['id']    .  "', ".
-							"msg_msg_id='"      . $new_id                    .  "', ".
-							"show_popup='"      . $show_popup                .  "' ".
-							"WHERE id='"        . $this->warn_member['id']   .  "'");
-							
-				//-----------------------------------------------------
-				// Has this member requested a PM email nofity?
-				//-----------------------------------------------------
-				
-				if ($this->warn_member['email_pm'] == 1)
+				if ( $this->lib->error )
 				{
-					$this->warn_member['language'] = $this->warn_member['language'] == "" ? 'en' : $this->warn_member['language'];
-					
-					$this->email->get_template("pm_notify", $this->warn_member['language']);
-				
-					$this->email->build_message( array(
-														'NAME'   => $this->warn_member['name'],
-														'POSTER' => $ibforums->member['name'],
-														'TITLE'  => $ibforums->input['subject'],
-														'LINK'   => "?act=Msg&CODE=03&VID=in&MSID=$new_id",
-													  )
-												);
-												
-					$this->email->subject = $ibforums->lang['pm_email_subject'];
-					$this->email->to      = $this->warn_member['email'];
-					$this->email->send_mail();
+					print $this->error;
+					exit();
 				}
 			}
 		}
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Right - is we banned or wha?
-		//-------------------------------------------------
+		//-----------------------------------------
 			
 		$restrict_post = '';
 		$mod_queue     = '';
@@ -514,17 +487,15 @@ class  warn {
 		$save['wlog_mid']     = $this->warn_member['id'];
 		$save['wlog_addedby'] = $ibforums->member['id'];
 		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Enter into warn loggy poos (eeew - poo)
-		//-------------------------------------------------
+		//-----------------------------------------
 		
-		$dbs = $DB->compile_db_insert_string( $save );
+		$DB->do_insert( 'warn_logs', $save );
 		
-		$DB->query("INSERT INTO ibf_warn_logs ({$dbs['FIELD_NAMES']}) VALUES({$dbs['FIELD_VALUES']})");
-		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Update member
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$warn_level = intval($this->warn_member['warn_level']);
 		
@@ -544,22 +515,20 @@ class  warn {
 		
 		if ( $warn_level < 1 )
 		{
-			$warn_level == 0;
+			$warn_level = 0;
 		}
 		
-		$dbs = $DB->compile_db_update_string( array (
-													 	'mod_posts'     => $mod_queue,
-													 	'restrict_post' => $restrict_post,
-													 	'temp_ban'      => $susp,
-													 	'warn_level'    => $warn_level,
-													 	'warn_lastwarn' => time(),
-										    )       );
+		$DB->do_update( 'members', array (
+										  'mod_posts'     => $mod_queue,
+										  'restrict_post' => $restrict_post,
+										  'temp_ban'      => $susp,
+										  'warn_level'    => $warn_level,
+										  'warn_lastwarn' => time(),
+					  ) , "id={$this->warn_member['id']}"  );
 		
-		$DB->query("UPDATE ibf_members SET $dbs WHERE id={$this->warn_member['id']}");
-		
-		//-------------------------------------------------
+		//-----------------------------------------
 		// Now what? Show success screen, that's what!!
-		//-------------------------------------------------
+		//-----------------------------------------
 		
 		$ibforums->lang['w_done_te'] = sprintf( $ibforums->lang['w_done_te'], $this->warn_member['name'] );
 		
@@ -571,17 +540,18 @@ class  warn {
 		
 		if ( $tid > 0 )
 		{
-			$DB->query("SELECT t.tid, t.title, f.id, f.name FROM ibf_topics t, ibf_forums f WHERE tid=$tid AND t.forum_id=f.id");
-			
+			$DB->cache_add_query( 'warn_get_forum', array( 'tid' => $tid ) );
+			$DB->cache_exec_query();
+		
 			$topic = $DB->fetch_row();
 		
 			$this->output = str_replace( "<!--IBF.FORUM_TOPIC-->", $this->html->warn_success_forum( $topic['id'], $topic['name'], $topic['tid'], $topic['title'], intval($ibforums->input['st']) ), $this->output );
 		}
 	}
 	
-	//-------------------------------------------------
+	//-----------------------------------------
 	// Show form
-	//-------------------------------------------------
+	//-----------------------------------------
 	
 	function show_form($errors="")
 	{
diff --git a/upload/sources/mod_cp.php b/upload/sources/mod_cp.php
deleted file mode 100644
index ebf5f480..00000000
--- a/upload/sources/mod_cp.php
+++ /dev/null
@@ -1,2882 +0,0 @@
-<?php
-
-/*
-+--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
-|   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
-|   http://www.invisionpower.com
-|   ========================================
-|   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
-|   Licence Info: http://www.invisionboard.com/?license
-+---------------------------------------------------------------------------
-|
-|   > Moderation Control Panel module
-|   > Module written by Matt Mecham
-|   > Date started: 19th February 2002 / Revised Start: 23rd September
-|
-|   > Module Version 2.0.0
-+--------------------------------------------------------------------------
-*/
-
-
-$idx = new Moderate;
-
-class Moderate {
-
-    var $output    = "";
-    var $base_url  = "";
-    var $html      = "";
-
-    var $moderator = array();
-    var $forum     = array();
-    var $topic     = array();
-    var $tids      = array();
-    
-    var $forums    = array();
-    var $children  = array();
-    var $cats      = array();
-    
-    var $upload_dir = "";
-    
-    var $topic_id   = "";
-    var $forum_id   = "";
-    var $post_id    = "";
-    var $start_val  = 0;
-    
-    var $modfunc    = "";
-    var $mm_id      = "";
-
-    
-    /***********************************************************************************/
-	//
-	// Our constructor, load words, load skin, print the topic listing
-	//
-	/***********************************************************************************/
-    
-    function Moderate()
-    {
-    
-        global $ibforums, $DB, $std, $print, $skin_universal;
-        
-        //-------------------------------------
-		// Compile the language file
-		//-------------------------------------
-		
-        $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_modcp', $ibforums->lang_id);
-        $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_topic', $ibforums->lang_id);
-
-        $this->html      = $std->load_template('skin_modcp');
-        
-        //--------------------------------------------
-    	// Get the sync module
-		//--------------------------------------------
-		
-		if ( USE_MODULES == 1 )
-		{
-			require ROOT_PATH."modules/ipb_member_sync.php";
-			
-			$this->modules = new ipb_member_sync();
-		}
-        
-        //-------------------------------------
-        // Check the input
-        //-------------------------------------
-        
-        if ( intval($ibforums->input['forum']) )
-        {
-        	$ibforums->input['f']    = intval($ibforums->input['forum']);
-        	$ibforums->input['CODE'] = 'showtopics';
-        }
-        
-        $this->forum_id  = intval($ibforums->input['f']);
-        $this->start_val = intval($ibforums->input['st']);
-        $this->topic_id  = intval($ibforums->input['t']);
-        $this->post_id   = intval($ibforums->input['p']);
-        
-        $this->base_url  = $ibforums->base_url;
-        
-        //-------------------------------------
-        // Make sure we're a moderator...
-        //-------------------------------------
-        
-        $pass = 0;
-        
-        if ($ibforums->member['id'])
-        {
-        	if ($ibforums->member['g_is_supmod'] == 1)
-        	{
-        		$pass = 1;
-        	}
-        	else if ($ibforums->member['is_mod'])
-        	{
-        		// Load mod..
-        		
-        		// If we're not just viewing the forum list, then check the incoming forum ID and
-        		// ensure that they have mod powers
-        
-        		if ($this->forum_id != "")
-        		{
-        			$qe = ' forum_id='.$this->forum_id.' AND ';
-        		}
-        		else
-        		{
-        			$qe = "";
-        		}
-        		
-        		$DB->query("SELECT * FROM ibf_moderators WHERE $qe (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))");
-				
-				if ( $this->moderator = $DB->fetch_row() )
-				{
-					$pass = 1;
-				}
-        	}
-        	else
-        	{
-        		$pass = 0;
-        	}
-        }
-        	
-        if ($pass == 0)
-        {
-        	$std->Error( array( LEVEL => 1, MSG => 'no_permission') );
-        }
-        
-        //-------------------------------------
-        // Load mod module...
-        //-------------------------------------
-        
-        require( ROOT_PATH.'sources/lib/modfunctions.php');
-        
-        $this->modfunc = new modfunctions();
-        
-        //-------------------------------------
-        // Finish up set_up
-        //-------------------------------------
-        
-        $this->upload_dir = $ibforums->vars['upload_dir'];
-        
-        $this->upload_dir = preg_replace( "!/$!", "", $this->upload_dir );
-        
-        // start the output
-        
-        $this->output = $this->html->mod_cp_start();
-        
-        //-------------------------------------
-        // Convert the code ID's into something
-        // use mere mortals can understand....
-        //-------------------------------------
-        
-        switch ($ibforums->input['CODE']) {
-        
-        	case 'members':
-        		$this->find_user_one();
-        		break;
-        	case 'edituser':
-        		$this->find_user_one(); // Left for backwards compatibility
-        		break;
-        	case 'dofinduser':
-        		$this->find_user_two();
-        		break;
-        	case 'doedituser':
-        		$this->edit_user();
-        		break;
-        	case 'compedit':
-        		$this->complete_user_edit();
-        		break;
-        	
-        	//-------------------------
-        	
-        	case 'prune':
-        		$this->prune_juice();
-        		break;
-        	case 'doprune':
-        		$this->drink_prune_juice();  // eew!
-        		break;
-        	case 'domove':
-        		$this->do_move();
-        		break;
-        		
-        	//-------------------------
-        	
-        	case 'modtopics':
-        		$this->mod_topics();
-        		break;
-        	case 'domodtopics':
-        		$this->domod_topics();
-        		break;
-        		
-        	case 'modposts':
-        		$this->mod_posts();
-        		break;
-        	case 'modtopicview':
-        		$this->mod_topicview();
-        		break;
-        		
-        	case 'domodposts':
-        		$this->mod_domodposts();
-        		break;
-        		
-        	case 'modtopicapprove':
-        		$this->approve_all();
-        		break;
-        		
-        	//-------------------------
-        		
-			case 'fchoice':
-				switch ( $ibforums->input['fact'] )
-				{
-					case 'mod_topic':
-						$this->mod_topics();
-						break;
-					case 'mod_post':
-						$this->mod_posts();
-						break;
-					case 'prune_move':
-						$this->prune_juice();
-						break;
-					default:
-						exit();
-						break; // Yeah, like it'll get here
-				}
-				break;
-				
-			case 'topicchoice':
-			
-				$this->tids  = $this->get_tids();
-				$this->load_forum();
-				
-				switch ( $ibforums->input['tact'] )
-				{
-					case 'close':
-						$this->alter_topics('close_topic', "state='closed'");
-						break;
-					case 'open':
-						$this->alter_topics('open_topic', "state='open'");
-						break;
-					case 'pin':
-						$this->alter_topics('pin_topic', "pinned=1");
-						break;
-					case 'unpin':
-						$this->alter_topics('unpin_topic', "pinned=0");
-						break;
-					case 'delete':
-						$this->delete_topics();
-						break;
-					case 'move':
-						$this->start_checked_move();
-						break;
-					case 'domove':
-						$this->complete_checked_move();
-						break;
-					default:
-						$this->topic_mmod();
-						break; // Yeah, like it'll get here (Added 21st May: Ooh, we will now!)
-				}
-				break;
-        		
-        	//-------------------------
-        	
-        	case 'showforums':
-        		$this->show_forums();
-        		break;
-        		
-        	case 'showtopics':
-        		$this->show_topics();
-        		break;
-        	case 'ip':
-        		$this->ip_start();
-        		break;
-        	case 'doip':
-        		$this->do_ip();
-        		break;
-        	
-        	default:
-        		$this->show_forums();
-        		break;
-        }
-		
-		if ( count($this->nav) < 1 )
-		{
-			$this->nav[] = "<a href='{$this->base_url}&act=modcp'>{$ibforums->lang['cp_modcp_home']}</a>";
-		}
-		
-		if (! $this->page_title )
-		{
-			$this->page_title = $ibforums->lang['cp_modcp_ptitle'];
-		}
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 1, 'NAV' => $this->nav ) );
-      
-	}
-	
-	//-------------------------------------------------
-	// MULTI-MOD!
-	//-------------------------------------------------
-	
-	function topic_mmod()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		//---------------------------------------
-		// Issit coz i is black?
-		//---------------------------------------
-		
-		if ( ! strstr( $ibforums->input['tact'], 't_' ) )
-		{
-			$this->mod_error('stupid_beggar');
-		}
-		
-		$this->mm_id = intval( str_replace( 't_', "", $ibforums->input['tact'] ) );
-		
-		//----------------------------------------
-		// Init modfunc module
-		//----------------------------------------
-		
-		$this->modfunc->init( $this->forum, "", $this->moderator );
-        
-        //----------------------------------------
-		// Do we have permission?
-		//----------------------------------------
-		
-		if ( $this->modfunc->mm_authorize() != TRUE )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cp_no_perms') );
-		}
-        
-		//-------------------------------------
-        // Does this forum have this mm_id
-        //-------------------------------------
-		
-		if ( $this->modfunc->mm_check_id_in_forum( $this->forum['topic_mm_id'], $this->mm_id ) != TRUE )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_mmid') );
-		}
-		
-		//-------------------------------------
-        // Still here? We're damn good to go sir!
-        //-------------------------------------
-        
-        require( ROOT_PATH.'sources/lib/post_parser.php');
-        
-        $this->parser  = new post_parser(1);
-        
-        $DB->query("SELECT * FROM ibf_topic_mmod WHERE mm_id={$this->mm_id}");
-        
-        if ( ! $this->mm_data = $DB->fetch_row() )
-        {
-        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_mmid') );
-        }
-        
-        $this->modfunc->stm_init();
-        
-        //-------------------------------------
-        // Open close?
-        //-------------------------------------
-        
-        if ( $this->mm_data['topic_state'] != 'leave' )
-        {
-        	if ( $this->mm_data['topic_state'] == 'close' )
-        	{
-        		$this->modfunc->stm_add_close();
-        	}
-        	else if ( $this->mm_data['topic_state'] == 'open' )
-        	{
-        		$this->modfunc->stm_add_open();
-        	}
-        }
-        
-        //-------------------------------------
-        // pin no-pin?
-        //-------------------------------------
-        
-        if ( $this->mm_data['topic_pin'] != 'leave' )
-        {
-        	if ( $this->mm_data['topic_pin'] == 'pin' )
-        	{
-        		$this->modfunc->stm_add_pin();
-        	}
-        	else if ( $this->mm_data['topic_pin'] == 'unpin' )
-        	{
-        		$this->modfunc->stm_add_unpin();
-        	}
-        }
-        
-        //-------------------------------------
-        // Update what we have so far...
-        //-------------------------------------
-        
-        $this->modfunc->stm_exec( $this->tids );
-        
-        //-------------------------------------
-        // Topic title (1337 - I am!)
-        //-------------------------------------
-        
-        $pre = "";
-		$end = "";
-        
-        if ( $this->mm_data['topic_title_st'] )
-        {
-        	$pre =  preg_replace( "/'/", "\\'", $this->mm_data['topic_title_st'] );
-        }
-        
-        if ( $this->mm_data['topic_title_end'] )
-        {
-        	$end =  preg_replace( "/'/", "\\'", $this->mm_data['topic_title_end'] );
-        	
-        }
-        
-        $DB->query("UPDATE ibf_topics SET title=CONCAT('$pre', title, '$end') WHERE tid IN(".implode( ",", $this->tids ).")");
-        
-        //-------------------------------------
-        // Add reply?
-        //-------------------------------------
-        
-        if ( $this->mm_data['topic_reply'] and $this->mm_data['topic_reply_content'] )
-        {
-       		$move_ids = array();
-       		
-       		foreach( $this->tids as $tid )
-       		{
-       			$move_ids[] = array( $tid, $this->forum['id'] );
-       		}
-       		
-        	$this->modfunc->auto_update = FALSE;  // Turn off auto forum re-synch, we'll manually do it at the end
-        
-        	$this->modfunc->topic_add_reply( 
-        									 $this->parser->convert( array(
-																		   'TEXT'    => $this->mm_data['topic_reply_content'],
-																		   'CODE'    => 1,
-																		   'SMILIES' => 1,
-															       )      )
-										    , $move_ids
-										    , $this->mm_data['topic_reply_postcount']
-										   );
-		}
-		
-		//-------------------------------------
-        // Move topic?
-        //-------------------------------------
-        
-        if ( $this->mm_data['topic_move'] )
-        {
-        	//-------------------------------------
-        	// Move to forum still exist?
-        	//-------------------------------------
-        	
-        	$DB->query("SELECT id, name, subwrap, sub_can_post FROM ibf_forums WHERE id=".$this->mm_data['topic_move']);
-        	
-        	if ( $r = $DB->fetch_row() )
-        	{
-        		if ( $r['subwrap'] == 1 AND $r['sub_can_post'] != 1 )
-        		{
-        			$DB->query("UPDATE ibf_topic_mmod SET topic_move=0 WHERE mm_id=".$this->mm_id);
-        		}
-        		else
-        		{
-        			if ( $r['id'] != $this->forum['id'] )
-        			{
-        				$this->modfunc->topic_move( $this->tids, $this->forum['id'], $r['id'], $this->mm_data['topic_move_link'] );
-        			
-        				$this->modfunc->forum_recount( $r['id'] );
-        			}
-        		}
-        	}
-        	else
-        	{
-        		$DB->query("UPDATE ibf_topic_mmod SET topic_move=0 WHERE mm_id=".$this->mm_id);
-        	}
-        }
-        
-        //-------------------------------------
-        // Recount root forum
-        //-------------------------------------
-        
-        $this->modfunc->forum_recount( $this->forum['id'] );
-        
-        $this->moderate_log("Applied multi-mod '{$this->mm_data['mm_title']}' on forum {$this->forum['name']}");
-	
-		$print->redirect_screen( $ibforums->lang['mm_redirect'], "act=modcp&CODE=showtopics&f=".$this->forum['id']);
-		
-		
-	}
-	
-	//-------------------------------------------------
-	// IP STUFF!
-	//-------------------------------------------------
-	
-	function ip_start()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['view_ip'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		$this->output .= $this->html->ip_start_form($ibforums->input['incoming']);
-	}
-	
-	//-------------------------------------------------------------------------------
-	
-	function do_ip()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['view_ip'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		// check to make sure we have enough input.
-		
-		$ip_array = array();
-		$ip_bit_count = 0;  // init var to count how many "real" IP bits we have
-		
-		foreach( explode( ".", $ibforums->input['ip'] ) as $ip_bit )
-		{
-			if ($ip_bit != '*')
-			{
-				$ip_bit = intval($ip_bit);
-				
-				if (!isset($ip_bit))
-				{
-					continue;
-				}
-				
-				if ($ip_bit < 1)
-				{
-					$ip_bit = 0;
-				}
-				
-				$ip_array[] = $ip_bit;
-				$ip_bit_count++;
-			}
-			else
-			{
-				$ip_array[] = '*';
-			}
-		}
-		
-		// ensure we have at least 127.*
-		
-		if ( count($ip_array) < 2 )
-		{
-			$this->mod_error('cp_error_ip');
-			return;
-		}
-		
-		// ensure we don't have *.*
-		
-		if ($ip_bit_count < 1)
-		{
-			$this->mod_error('cp_error_ip');
-			return;
-		}
-		
-		$test_ip_string = implode( '%', $ip_array );
-		
-		// Check to make sure we don't have 123%*%123%0%0 or similar (of course)
-		// Test for *%({numeric})  (*.127 for example...)
-		
-		if ( preg_match( "/\*%\d+(%|$)/", $test_ip_string) )
-		{
-			$this->mod_error('cp_error_ip');
-			return;
-		}
-		
-		// Ok, lets finalize the IP string, using the * as the stop character
-		
-		$final_ip_string = "";
-		$exact_match = 1;
-		
-		foreach( $ip_array as $final_bits)
-		{
-			if ($final_bits == '0')
-			{
-				$final_ip_string .= '0.';
-			}
-			else if ($final_bits == '*')
-			{
-				$final_ip_string .= "%"; //SQL find any
-				$exact_match = 0;
-				break; // break out of foreach as we're done
-			}
-			else
-			{
-				$final_ip_string .= $final_bits.'.';
-			}
-		}
-		
-		// Remove trailing periods
-		
-		$final_ip_string = preg_replace( "/\.$/", "", $final_ip_string );
-		
-		//print $final_ip_string."<br>".$test_ip_string."<br>".implode('.', $ip_array); exit();
-		
-		// See, a gazillion lines of code just to ensure that the user read the frikken manual.
-		
-		// H'okay, what have we been asked to do? (that's a metaphorical "we" in a rhetorical question)
-		
-		if ($ibforums->input['iptool'] == 'resolve')
-		{
-			// Attempt a trival gethostbyaddr
-			
-			if ( $ip_bit_count != 4 )
-			{
-				$this->mod_error('cp_error_resolveip');
-				return;
-			}
-			
-			$resolved = @gethostbyaddr($final_ip_string);
-			
-			if ($resolved == "")
-			{
-				$this->mod_error('cp_safe_fail');
-				return;
-			}
-			else
-			{
-				$ibforums->lang['ip_resolve_result'] = sprintf($ibforums->lang['ip_resolve_result'], $final_ip_string, $resolved);
-				
-				$this->output .= $this->html->mod_simple_page( $ibforums->lang['cp_results'], $ibforums->lang['ip_resolve_result'] );
-				
-				return TRUE;
-			
-			}
-		}
-		else if ($ibforums->input['iptool'] == 'members')
-		{
-			if ($exact_match == 0)
-			{
-				$sql = "ip_address LIKE '$final_ip_string'";
-			}
-			else
-			{
-				$sql = "ip_address='$final_ip_string'";
-			}
-			
-			$DB->query("SELECT count(id) as max FROM ibf_members WHERE $sql");
-			
-			$total_possible = $DB->fetch_row();
-			
-			if ($total_possible['max'] < 1)
-			{
-				$this->mod_error('cp_no_matches');
-				return;
-			}
-			
-			$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_possible['max'],
-												   'PER_PAGE'    => 50,
-												   'CUR_ST_VAL'  => $this->start_val,
-												   'L_SINGLE'    => $ibforums->lang['single_page_forum'],
-												   'L_MULTI'     => $ibforums->lang['multi_page_forum'],
-												   'BASE_URL'    => $this->base_url."act=modcp&CODE=doip&iptool=members&ip={$ibforums->input['ip']}",
-												 )
-										  );
-										  
-			$this->output .= $this->html->ip_member_start($pages);
-			
-			$DB->query("SELECT name, id, ip_address, posts, joined FROM ibf_members WHERE $sql ORDER BY joined DESC LIMIT {$this->start_val},50");
-			
-			while( $row = $DB->fetch_row() )
-			{
-				$row['joined'] = $std->get_date( $row['joined'], 'JOINED' );
-				$this->output .= $this->html->ip_member_row($row);
-			}
-			
-			$this->output .= $this->html->ip_member_end($pages);
-		}
-		else
-		{
-			// Find posts then!
-			
-			if ($exact_match == 0)
-			{
-				$sql = "ip_address LIKE '$final_ip_string'";
-			}
-			else
-			{
-				$sql = "ip_address='$final_ip_string'";
-			}
-			
-			// Get forums we're allowed to view
-			
-			$aforum = array();
-			
-			$DB->query("SELECT id, read_perms FROM ibf_forums");
-			
-			while ( $f = $DB->fetch_row() )
-			{
-				if ( $std->check_perms($f['read_perms']) == TRUE )
-				{
-					$aforum[] = $f['id'];
-				}
-			}
-			
-			if ( count($aforum) < 1)
-			{
-				$this->mod_error('cp_no_matches');
-				return;
-			}
-			
-			$forums = implode( ",", $aforum);
-			
-			$DB->query("SELECT pid FROM ibf_posts WHERE queued <> 1 AND forum_id IN($forums) AND $sql");
-			
-			$max_hits = $DB->get_num_rows();
-		
-			$posts  = "";
-			
-			while ($row = $DB->fetch_row() )
-			{
-				$posts .= $row['pid'].",";
-			}
-		
-			$DB->free_result();
-			
-			$posts  = preg_replace( "/,$/", "", $posts );
-			
-			//------------------------------------------------
-			// Do we have any results?
-			//------------------------------------------------
-			
-			if ($posts == "")
-			{
-				$this->mod_error('cp_no_matches');
-				return;
-			}
-			
-			//------------------------------------------------
-			// If we are still here, store the data into the database...
-			//------------------------------------------------
-			
-			$unique_id = md5(uniqid(microtime(),1));
-			
-			$str = $DB->compile_db_insert_string( array (
-															'id'         => $unique_id,
-															'search_date'=> time(),
-															'post_id'    => $posts,
-															'post_max'   => $max_hits,
-															'sort_key'   => 'p.post_date',
-															'sort_order' => 'desc',
-															'member_id'  => $ibforums->member['id'],
-															'ip_address' => $ibforums->input['IP_ADDRESS'],
-												   )        );
-			
-			$DB->query("INSERT INTO ibf_search_results ({$str['FIELD_NAMES']}) VALUES ({$str['FIELD_VALUES']})");
-			
-			$this->output .= $this->html->mod_simple_page( $ibforums->lang['cp_results'], $this->html->ip_post_results($unique_id, $max_hits) );
-				
-			return TRUE;
-			
-		}
-		
-		
-		
-	}
-	
-	//-------------------------------------------------
-	// Complete move dUdE
-	//-------------------------------------------------
-	
-	function complete_checked_move()
-	{
-		global $std, $ibforums, $DB, $print;
-
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['move_topic'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		$dest_id   = intval($ibforums->input['df']);
-		$source_id = $this->forum['id'];
-		
-		//----------------------------------
-		// Check for input..
-		//----------------------------------
-		
-		if ($source_id == "")
-		{
-			$this->mod_error('cp_error_move');
-			return;
-		}
-		
-		//----------------------------------
-		
-		if ($dest_id == "" or $dest_id == -1)
-		{
-			$this->mod_error('cp_error_move');
-			return;
-		}
-		
-		//----------------------------------
-		
-		if ($source_id == $dest_id)
-		{
-			$this->mod_error('cp_error_move');
-			return;
-		}
-		
-		//----------------------------------
-		
-		$DB->query("SELECT id, subwrap, sub_can_post, name FROM ibf_forums WHERE id IN(".$source_id.",".$dest_id.")");
-		
-		if ($DB->get_num_rows() != 2)
-		{
-			$this->mod_error('cp_error_move');
-			return;
-		}
-		
-		$source_name = "";
-		$dest_name   = "";
-		
-		//-----------------------------------
-		// Check for an attempt to move into a subwrap forum
-		//-----------------------------------
-		
-		while ( $f = $DB->fetch_row() )
-		{
-			if ($f['id'] == $source_id)
-			{
-				$source_name = $f['name'];
-			}
-			else
-			{
-				$dest_name = $f['name'];
-			}
-			
-			if ($f['subwrap'] == 1 and $f['sub_can_post'] != 1)
-			{
-				$this->mod_error('cp_error_move');
-				return;
-			}
-		}
-		
-		//---------------------------------
-		// God, I'm lazy....
-		//----------------------------------
-		
-		$source = $source_id;
-		$moveto = $dest_id;
-		
-		$this->modfunc->topic_move( $this->tids, $source, $moveto );
-		
-		//----------------------------------
-		// Resync the forums..
-		//----------------------------------
-		
-		$this->modfunc->forum_recount($source);
-		
-		$this->modfunc->forum_recount($moveto);
-		
-		$this->moderate_log("Moved topics from $source_name to $dest_name");
-	
-		$print->redirect_screen( $ibforums->lang['cp_redirect_topics'], "act=modcp&CODE=showtopics&f=".$source_id );
-		
-	}
-	
-	
-	//-------------------------------------------------
-	// Start move form
-	//-------------------------------------------------
-	
-	function start_checked_move()
-	{
-		global $std, $ibforums, $DB, $print;
-
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['move_topic'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		$jump_html = $std->build_forum_jump('no_html');
-		
-		$this->output .= $this->html->move_checked_form_start($this->forum['name'], $this->forum['id']);
-		
-		$DB->query("SELECT title, tid FROM ibf_topics WHERE forum_id=".$this->forum['id']." AND tid IN(".implode(",", $this->tids).")");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			$this->output .=  $this->html->move_checked_form_entry($row['tid'],$row['title']);
-		}
-		
-		$this->output .= $this->html->move_checked_form_end($jump_html);
-		
-	}
-	
-	
-	//-------------------------------------------------
-	// Delete topics, groovy.
-	//-------------------------------------------------
-	
-	function delete_topics()
-	{
-		global $std, $ibforums, $DB, $print;
-
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['delete_topic'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		$this->modfunc->topic_delete($this->tids);
-		
-		$this->moderate_log("Deleted topics from Mod CP (IDs: ".implode(",",$this->tids).")");
-		
-		$print->redirect_screen( $ibforums->lang['cp_redirect_topics'], "act=modcp&CODE=showtopics&f=".$this->forum['id'] );
-	
-	}
-	
-	//-------------------------------------------------
-	// Alter the topics, yay!
-	//-------------------------------------------------
-	
-	function alter_topics($mod_action="", $sql="")
-	{
-		global $std, $ibforums, $DB, $print;
-
-		if ($mod_action == "" or $sql == "")
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-	
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator[$mod_action] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		$DB->query("UPDATE ibf_topics SET $sql WHERE forum_id=".$this->forum['id']." AND tid IN(".implode(",",$this->tids).")");
-		
-		$this->moderate_log("Altered topics ($sql) (".implode(",",$this->tids).")");
-		
-		$print->redirect_screen( $ibforums->lang['cp_redirect_topics'], "act=modcp&CODE=showtopics&f=".$this->forum['id'] );
-	
-	}
-	
-	//-------------------------------------------------
-	// Display the topics, yay!
-	//-------------------------------------------------
-	
-	function show_topics()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$ibforums->lang  = $std->load_words($ibforums->lang, 'lang_forum', $ibforums->lang_id);
-		
-		$this->load_forum();
-		
-		//-------------------------------------------------
-		// Check we have permission to read this forum
-		//-------------------------------------------------
-		
-		$pass = 0;
-		
-		if ( $std->check_perms( $this->forum['read_perms'] ) == TRUE )
-		{
-			$pass = 1;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_err_no_p');
-			return;
-		}
-		
-		//+----------------------------------------------------------------
-		// Query the database to see how many topics there are in the forum
-		//+----------------------------------------------------------------
-		
-		$DB->query("SELECT COUNT(tid) as max FROM ibf_topics WHERE forum_id='".$this->forum['id']."' and approved='1'");
-		$total_possible = $DB->fetch_row();
-		
-		//+----------------------------------------------------------------
-		// Generate the forum page span links
-		//+----------------------------------------------------------------
-		
-		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_possible['max'],
-											   'PER_PAGE'    => $ibforums->vars['display_max_topics'],
-											   'CUR_ST_VAL'  => $ibforums->input['st'],
-											   'L_SINGLE'    => $ibforums->lang['single_page_forum'],
-											   'L_MULTI'     => $ibforums->lang['multi_page_forum'],
-											   'BASE_URL'    => $this->base_url."act=modcp&CODE=showtopics&f=".$this->forum['id'],
-											 )
-									  );
-		//+----------------------------------------------------------------
-		// Start printing the page
-		//+----------------------------------------------------------------
-		
-		$this->output .= $this->html->start_topics($pages, $this->forum);
-		
-		//+----------------------------------------------------------------
-		// Do we have any topics to show?
-		//+----------------------------------------------------------------
-		
-		if ($total_possible['max'] < 1)
-		{
-			$this->output .= $this->html->show_no_topics();
-		}
-		
-		$first = intval($ibforums->input['st']);
-		
-		if ($first < 1) $first = 0;
-		
-		$query = "SELECT * from ibf_topics WHERE forum_id='".$this->forum['id']."' and approved=1 ORDER BY pinned DESC, last_post DESC LIMIT $first,".$ibforums->vars['display_max_topics'];
-		
-		$DB->query($query);
-		
-		//+----------------------------------------------------------------
-		// Grab the rest of the topics and print them
-		//+----------------------------------------------------------------
-		
-		while ( $topic = $DB->fetch_row() )
-		{
-			$topic['last_text']   = $ibforums->lang['last_post_by'];
-		
-			$topic['last_poster'] = ($topic['last_poster_id'] != 0)
-									? "<b><a href='{$this->base_url}showuser={$topic['last_poster_id']}'>{$topic['last_poster_name']}</a></b>"
-									: "-".$topic['last_poster_name']."-";
-									
-			$topic['starter']     = ($topic['starter_id']     != 0)
-									? "<a href='{$this->base_url}showuser={$topic['starter_id']}'>{$topic['starter_name']}</a>"
-									: "-".$topic['starter_name']."-";
-		 
-			if ($topic['poll_state'])
-			{
-				$topic['prefix']     = $ibforums->vars['pre_polls'].' ';
-			}
-			
-			$topic['folder_img']     = $std->folder_icon($topic);
-			
-			$topic['topic_icon']     = $topic['icon_id']  ? '<img src="'.$ibforums->vars['img_url'] . '/icon' . $topic['icon_id'] . '.gif" border="0" alt="">'
-														  : '&nbsp;';
-			
-			$topic['start_date'] = $std->get_date( $topic['start_date'], 'LONG' );
-		
-			if ($topic['posts'] < 0) $topic['posts'] = 0;
-			
-			$topic['last_post']  = $std->get_date( $topic['last_post'], 'SHORT' );
-			
-			//+----------------------------------------------------------------
-			
-			// As "linked" move topics change the TID, we need to get a "real" value
-			// for it, or you won't be able to moderate link topics.
-			
-			$topic['real_tid'] = $topic['tid'];
-				
-			if ($topic['state'] == 'link')
-			{
-				$t_array = explode("&", $topic['moved_to']);
-				$topic['tid']       = $t_array[0];
-				$topic['forum_id']  = $t_array[1];
-				$topic['title']     = $topic['title'];
-				$topic['views']     = '--';
-				$topic['posts']     = '--';
-				$topic['prefix']    = $ibforums->vars['pre_moved']." ";
-				$topic['go_new_post'] = "";
-			}
-			
-			if ($topic['pinned'] == 1)
-			{
-				$topic['prefix']     = $ibforums->vars['pre_pinned'];
-				$topic['topic_icon'] = "<{B_PIN}>";
-			}
-			
-			$this->output .= $this->html->topic_row( $topic );
-		}
-		
-		$this->output .= $this->html->topics_end($this->forum);
-		
-		//-------------------------------------------------
-		// Can we MMOD baby?!
-		//-------------------------------------------------
-		
-		$this->modfunc->init( $this->forum, "", $this->moderator );
-        
-        //----------------------------------------
-		// Do we have permission?
-		//----------------------------------------
-		
-		if ( $this->modfunc->mm_authorize() != TRUE )
-		{
-			return;
-		}
-		
-		$this->forum['topic_mm_id'] = $std->clean_perm_string($this->forum['topic_mm_id']);
-		
-		if ( $this->forum['topic_mm_id'] == "" )
-		{
-			return "";
-		}
-		
-		//----------------------------------------
-		// Get the topic mod thingies
-		//----------------------------------------
-		
-		$mm_html = "";
-		
-		$DB->query("SELECT mm_id, mm_title FROM ibf_topic_mmod WHERE mm_id IN(".implode( ",", explode( ",", $this->forum['topic_mm_id'] ) ).")");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$mm_html = $this->html->mm_start();
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$mm_html .= $this->html->mm_entry( $r['mm_id'], $r['mm_title'] );
-			}
-			
-			$mm_html .= $this->html->mm_end();
-		}
-		
-		$this->output = str_replace( "<!--IBF.MMOD-->", $mm_html, $this->output );
-		
-	}
-	
-	
-	//-------------------------------------------------
-	// Display the forums we're allowed to manage, yay!
-	//--------------------------------------------------
-	
-	function show_forums()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$ibforums->lang  = $std->load_words($ibforums->lang, 'lang_boards', $ibforums->lang_id);
-	
-		//-------------------------------------------------
-		// Get the id's of the forums we manage.
-		//--------------------------------------------------
-		
-		$forum_ids = array();
-		
-		// If we're not a super mod, get the forums we mod.
-		
-		if ( ! $ibforums->member['g_is_supmod'] )
-		{
-			$DB->query("SELECT forum_id FROM ibf_moderators WHERE member_id={$ibforums->member['id']} OR group_id={$ibforums->member['mgroup']}");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				$forum_ids[] = $r['forum_id'];
-			}
-		}
-		else
-		{
-			// We're a super mod, get all the forums we've got read access too
-			
-			$DB->query("SELECT id, read_perms FROM ibf_forums");
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				if ( $std->check_perms($r['read_perms']) == TRUE )
-				{
-					$forum_ids[] = $r['id'];
-				}
-			}
-		}
-		
-		//--------------------------------------------------
-		// Ensure that we have some forums...
-		//--------------------------------------------------
-		
-		if ( count($forum_ids) < 1 )
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'me_no_forum') );
-		}
-		
-		$fids = implode( ",", $forum_ids );
-		
-		//--------------------------------------------------
-		// Get number of queued posties :D
-		//--------------------------------------------------
-		
-		$queued_posts = array();
-		
-		$DB->query("SELECT COUNT(pid) as qued, forum_id FROM ibf_posts
-					WHERE queued=1 AND new_topic <> 1 AND forum_id IN ($fids)
-					GROUP BY forum_id ORDER BY forum_id");
-					
-		while ( $q = $DB->fetch_row() )
-		{
-			$this->queued_posts[ $q['forum_id'] ] = intval($q['qued']);
-		}
-		
-		//--------------------------------------------------
-		// Get number of queued Topics :D
-		//--------------------------------------------------
-		
-		$queued_topics = array();
-		
-		$DB->query("SELECT COUNT(tid) as qued, forum_id FROM ibf_topics
-					WHERE approved <> 1 AND forum_id IN ($fids)
-					GROUP BY forum_id ORDER BY forum_id");
-					
-		while ( $q = $DB->fetch_row() )
-		{
-			$this->queued_topics[ $q['forum_id'] ] = intval($q['qued']);
-		}
-		
-		//--------------------------------------------------
-		// Get the forum data
-		//--------------------------------------------------
-		
-		$DB->query("SELECT f.*, c.id as cat_id, c.name as cat_name
-		            FROM ibf_forums f
- 		             LEFT JOIN ibf_categories c ON (c.id=f.category)
- 		            WHERE f.id IN ($fids)
- 		            ORDER BY c.position, f.position");
- 		            
- 		$last_c_id = -1;
- 		
- 		while ( $r = $DB->fetch_row() )
-        {
-        	if ($last_c_id != $r['cat_id'])
-        	{
-        		$this->cats[ $r['cat_id'] ] = array( 'id'          => $r['cat_id'],
-        											 'position'    => $r['cat_position'],
-        											 'state'       => $r['cat_state'],
-        											 'name'        => $r['cat_name'],
-        										   );
-        										   
-        		$last_c_id = $r['cat_id'];
-        	}
-        	
-        	if ($r['parent_id'] > 0)
-			{
-				$this->children[ $r['parent_id'] ][$r['id']] = $r;
-			}
-			else
-			{
-				$this->forums[ $r['id'] ] = $r;
-			}
-        }
-        
-        // Grab any sub forum wrappers to ensure we print all rows that this
-        // mod has access too.
-        
-        $cid = array();
-        
-        if ( count($this->children) > 0 )
-        {
-        	foreach ( $this->children as $id => $d )
-        	{
-        		$cid[] = $id;
-        	}
-        }
-        
-        if ( count($cid) > 0 )
-        {
-        	$DB->query("SELECT f.*, c.id as cat_id, c.name as cat_name
-						FROM ibf_forums f
-						 LEFT JOIN ibf_categories c ON (c.id=f.category)
-						WHERE f. id IN (".implode( ",", $cid).") AND f.id NOT IN ($fids)
-						ORDER BY c.position, f.position");
- 		            
-        	while ( $c_q = $DB->fetch_row() )
-        	{
-        		$this->forums[ $c_q['id'] ] = $c_q;
-        		$this->forums[ $c_q['id'] ]['no_mod'] = 1;
-        		
-        		$this->cats[ $c_q['cat_id'] ] = array( 'id'          => $r['cat_id'],
-													   'position'    => $r['cat_position'],
-													   'state'       => $r['cat_state'],
-													   'name'        => $r['cat_name'],
-													 );
-        	}
-        }
-        
- 		
- 		$this->output .= $this->html->forum_page_start();
- 		
- 		foreach ($this->cats as $cat_id => $cat_data)
-        {
-        	$this->output .= $this->html->cat_row($cat_data['name']);
-        	
-            foreach ($this->forums as $forum_id => $forum)
-            {
-                if ($forum['category'] == $cat_id)
-                {
-                	
-					$this->output .= $this->html->forum_row($this->do_forum($forum));
-					
-					if ( count($this->children[ $forum['id'] ]) > 0 )
-					{
-						foreach( $this->children[ $forum['id'] ] as $idx => $subforum )
-						{
-							$this->output .= $this->html->subforum_row($this->do_forum($subforum));
-						}
-					}
-                }
-            }
-		}
-	
-		$this->output .= $this->html->forum_page_end();
-		
-		$this->nav[] = "<a href='{$this->base_url}&act=modcp'>{$ibforums->lang['cp_modcp_home']}</a>";
-		$this->nav[] = $ibforums->lang['menu_forums'];
-	
-	}
-	
-	// Lil' function to process a single forum
-	
-	function do_forum($forum)
-	{
-		global $DB, $std, $ibforums, $print;
-		
-		$forum['q_posts'] = 0;
-			
-		if ( $this->queued_posts[ $forum['id'] ] )
-		{
-			$forum['q_posts'] = "<span class='highlight'>".$this->queued_posts[ $forum['id'] ]."</span>";
-		}
-		
-		$forum['q_topics'] = 0;
-		
-		if ( $this->queued_topics[ $forum['id'] ] )
-		{
-			$forum['q_topics'] = "<span class='highlight'>".$this->queued_topics[ $forum['id'] ]."</span>";
-		}
-		
-		$forum['n_posts'] = $forum['posts'] + $forum['topics'];
-		
-		$forum['last_topic'] = $ibforums->lang['f_none'];
-		
-		$forum['last_title'] = str_replace( "&#33;" , "!", $forum['last_title'] );
-		$forum['last_title'] = str_replace( "&quot;", "\"", $forum['last_title'] );
-			
-		if (strlen($forum['last_title']) > 30)
-		{
-			$forum['last_title'] = substr($forum['last_title'],0,27) . "...";
-			$forum['last_title'] = preg_replace( '/&(#(\d+;?)?)?\.\.\.$/', '...', $forum['last_title'] );
-		}
-		
-		if ($forum['password'] != "")
-		{
-			$forum['last_topic'] = $ibforums->lang['f_none'];
-		}
-		else
-		{
-			$forum['last_topic'] = "<a href='{$ibforums->base_url}&act=ST&f={$forum['id']}&t={$forum['last_id']}&view=getlastpost'>{$forum['last_title']}</a>";
-		}
-	 
-					
-		if ( isset($forum['last_poster_name']))
-		{
-			$forum['last_poster'] = $forum['last_poster_id'] ? "<a href='{$ibforums->base_url}&act=Profile&CODE=03&MID={$forum['last_poster_id']}'>{$forum['last_poster_name']}</a>"
-															 : $forum['last_poster_name'];
-		}
-		else
-		{
-			$forum['last_poster'] = $ibforums->lang['f_none'];
-		}
-		
-		$forum['folder_icon'] = $std->forum_new_posts($forum);
-		
-		$forum['last_post'] = $std->get_date($forum['last_post'], 'LONG');
-		
-		if ($forum['no_mod'] == 1)
-		{
-			$forum['select_button'] = '&nbsp;';
-		}
-		else
-		{
-			$forum['select_button'] = "<input type='radio' name='f' value='{$forum['id']}'>";
-		}
-		
-		
-		return $forum;
-					
-	}
-	
-	
-	
-	//-------------------------------------------------
-	// MODERATE NEW POSTS AND STUFF
-	//--------------------------------------------------
-	
-	function approve_all()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		// Sort out the approved bit
-		
-		$DB->query("UPDATE ibf_posts SET queued=0 WHERE topic_id='".$ibforums->input['tid']."'");
-		
-		$DB->query("SELECT COUNT(pid) as posts FROM ibf_posts WHERE new_topic <> 1 and topic_id='".$ibforums->input['tid']."'");
-		$count = $DB->fetch_row();
-		
-		$DB->query("UPDATE ibf_topics SET posts=".$count['posts']." WHERE tid='".$ibforums->input['tid']."'");
-		
-		// Update the posters ..er.. post count.
-			
-		$DB->query("SELECT author_id FROM ibf_posts WHERE topic_id='".$ibforums->input['tid']."'");
-		
-		$mems = array();
-		
-		while ( $r = $DB->fetch_row() )
-		{
-			if ($r['author_id'] > 0)
-			{
-				$mems[] = $r['author_id'];
-			}
-		}
-		
-		if ( count($mems) > 0 )
-		{
-			if ( $this->forum['inc_postcount'] )
-			{
-				$mstring = implode( ",", $mems );
-				
-				//-----------------------------------
-				// Get the groups..
-				//-----------------------------------
-				
-				$groups = array();
-				
-				$DB->query("SELECT * FROM ibf_groups");
-				
-				while ( $g = $DB->fetch_row() )
-				{
-					$groups[ $g['g_id'] ] = $g;
-				}
-				
-				$loopy_loo = $DB->query("SELECT id, mgroup, posts FROM ibf_members WHERE id IN ($mstring)");
-				
-				while ( $member = $DB->fetch_row($loopy_loo) )
-				{
-					//-----------------------------------
-					// Are we auto_promoting?
-					//-----------------------------------
-					
-					if ( $groups[ $member['mgroup'] ]['g_promotion'] != '-1&-1' )
-					{
-						list($gid, $gposts) = explode( '&', $groups[ $member['mgroup'] ]['g_promotion'] );
-						
-						if ( $gid > 0 and $gposts > 0 )
-						{
-							if ( $member['posts'] + 1 >= $gposts )
-							{
-								$mgroup = "mgroup='$gid', ";
-								
-								if ( USE_MODULES == 1 )
-								{
-									$this->modules->register_class(&$class);
-									$this->modules->on_group_change($ibforums->member['id'], $gid);
-								}
-							}
-						}
-					}
-				
-					$newbie = $DB->query("UPDATE ibf_members SET ".$mgroup."posts=posts+1 WHERE id={$member['id']}");
-				}
-			}
-		}
-		
-		// Update the last topic poster, time and number of posts.
-			
-		$DB->query("SELECT author_id, author_name, post_date FROM ibf_posts WHERE topic_id='".$ibforums->input['tid']."' AND queued <> 1 ORDER BY pid DESC LIMIT 0,1");
-		
-		if ($last = $DB->fetch_row())
-		{
-			$db_string = $DB->compile_db_update_string( array (
-																 'last_post'        => $last['post_date'],
-																 'last_poster_id'   => $last['author_id'],
-																 'last_poster_name' => $last['author_name'],
-													  )       );
-													  
-			$DB->query("UPDATE ibf_topics SET $db_string WHERE tid='".$ibforums->input['tid']."'");
-		}
-		
-		// recount...
-		
-		$this->modfunc->forum_recount_queue($this->forum['id']);
-		$this->modfunc->forum_recount();
-		$this->modfunc->stats_recount();
-		
-		// Boink
-		
-		$print->redirect_screen( $ibforums->lang['cp_redirect_mod_topics'], "act=modcp&CODE=modposts&f=".$this->forum['id'] );
-		
-	}
-	
-	//--------------------------------------------------
-	
-	function mod_domodposts()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		//--------------------------------------------------
-		// Which TID's are we playing with?
-		//--------------------------------------------------
-		
-		$delete_ids  = array();
-		$approve_ids = array();
-		
-		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^PID_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]] == 'approve')
- 				{
- 					$approve_ids[] = $match[1];
- 				}
- 				else if ($ibforums->input[$match[0]] == 'remove')
- 				{
- 					$delete_ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		//--------------------------------------------------
-		// Did we actually select anyfink?
-		//--------------------------------------------------
-		
-		$total = count($delete_ids) + count($approve_ids);
-		
-		if ( $total < 1 )
-		{
-			$this->mod_error('cp_error_no_topics');
-			return;
-		}
-		
-		//--------------------------------------------------
-		// What did we do?
-		//--------------------------------------------------
-		
-		if ( count($approve_ids) > 0 )
-		{
-			// Sort out the approved bit
-			
-			$pids = implode( ",", $approve_ids );
-			
-			$pid_count = count($approve_ids);
-			
-			$DB->query("UPDATE ibf_topics SET posts=posts+$pid_count WHERE tid='".$ibforums->input['tid']."'");
-			
-			$DB->query("UPDATE ibf_posts SET queued=0 WHERE pid IN ($pids)");
-			
-			// Update the posters ..er.. post count.
-			
-			$DB->query("SELECT author_id FROM ibf_posts WHERE queued <> 1 and pid IN ($pids)");
-			
-			$mems = array();
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				if ($r['author_id'] > 0)
-				{
-					$mems[] = $r['author_id'];
-				}
-			}
-			
-			if ( count($mems) > 0 )
-			{
-				if ( $this->forum['inc_postcount'] )
-				{
-					$mstring = implode( ",", $mems );
-					
-					//-----------------------------------
-					// Get the groups..
-					//-----------------------------------
-					
-					$groups = array();
-					
-					$DB->query("SELECT * FROM ibf_groups");
-					
-					while ( $g = $DB->fetch_row() )
-					{
-						$groups[ $g['g_id'] ] = $g;
-					}
-					
-					$loopy_loo = $DB->query("SELECT id, mgroup, posts FROM ibf_members WHERE id IN ($mstring)");
-					
-					while ( $member = $DB->fetch_row($loopy_loo) )
-					{
-						//-----------------------------------
-						// Are we auto_promoting?
-						//-----------------------------------
-						
-						if ( $groups[ $member['mgroup'] ]['g_promotion'] != '-1&-1' )
-						{
-							list($gid, $gposts) = explode( '&', $groups[ $member['mgroup'] ]['g_promotion'] );
-							
-							if ( $gid > 0 and $gposts > 0 )
-							{
-								if ( $member['posts'] + 1 >= $gposts )
-								{
-									$mgroup = "mgroup='$gid', ";
-									
-									if ( USE_MODULES == 1 )
-									{
-										$this->modules->register_class(&$class);
-										$this->modules->on_group_change($ibforums->member['id'], $gid);
-									}
-								}
-							}
-						}
-					
-						$newbie = $DB->query("UPDATE ibf_members SET ".$mgroup."posts=posts+1 WHERE id={$member['id']}");
-					}
-				}
-			}
-			
-			// Update the last topic poster, time and number of posts.
-			
-			$DB->query("SELECT author_id, author_name, post_date FROM ibf_posts WHERE topic_id='".$ibforums->input['tid']."' AND queued <> 1 ORDER BY pid DESC LIMIT 0,1");
-			
-			if ($last = $DB->fetch_row())
-			{
-				$db_string = $DB->compile_db_update_string( array (
-																	 'last_post'        => $last['post_date'],
-																	 'last_poster_id'   => $last['author_id'],
-																     'last_poster_name' => $last['author_name'],
-														  )       );
-														  
-				$DB->query("UPDATE ibf_topics SET $db_string WHERE tid='".$ibforums->input['tid']."'");
-			}
-			
-		}
-		
-		if ( count($delete_ids) > 0 )
-		{
-			// Sort out the approved bit
-			
-			$pids = implode( ",", $delete_ids );
-			
-			// Delete 'dem postings
-			
-			$DB->query("DELETE FROM ibf_posts WHERE pid IN ($pids)");
-			
-		}
-		
-		// Recount..
-		
-		$this->modfunc->forum_recount_queue($this->forum['id']);
-		$this->modfunc->forum_recount();
-		$this->modfunc->stats_recount();
-		
-		// Boink
-		
-		$print->redirect_screen( $ibforums->lang['cp_redirect_mod_topics'], "act=modcp&CODE=modposts&f=".$this->forum['id'] );
-
-	}
-	
-	//**-------------------------------------------------------
-	
-	function mod_topicview()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		$DB->query("SELECT tid, title FROM ibf_topics WHERE tid='".$ibforums->input['tid']."'");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$this->mod_error('cp_error_no_topics');
-			return;
-		}
-		
-		$topic = $DB->fetch_row();
-		
-		$this->output .= $this->html->modtopicview_start($ibforums->input['tid'], $this->forum['name'], $this->forum['id'], $topic['title']);
-		
-		
-		//+----------------------------------------------------------------
-		// Get the topics to work on
-		//+----------------------------------------------------------------
-		
-		$DB->query( "SELECT p.*, ".
-				    "m.id,m.name,m.mgroup,m.email,m.joined,m.avatar,m.avatar_size,m.posts as member_posts,m.aim_name,m.icq_number,m.signature, m.website,m.yahoo,m.title,m.hide_email,m.msnname, ".
-				    "g.g_id, g.g_title, g.g_icon, t.* ".
-				    "FROM ibf_posts p, ibf_members m, ibf_groups g, ibf_topics t ".
-				    "WHERE t.tid='".$ibforums->input['tid']."' AND t.approved=1 AND p.topic_id=t.tid AND p.queued=1 AND p.author_id=m.id AND g.g_id=m.mgroup ".
-				    "ORDER BY p.pid ASC");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			$member = $this->parse_member($r);
-			
-			$r['post_date'] = $std->get_date( $r['post_date'], 'LONG' );
-			
-			$this->output .= $this->html->mod_postentry_checkbox($r['pid']);
-			$this->output .= $this->html->mod_postentry( array( 'msg' => $r, 'member' => $member ) );
-			
-		}
-		$this->output .= $this->html->mod_topic_spacer();
-		$this->output .= $this->html->modtopics_end();
-		
-	}
-	
-	//+----------------------------------------------------------------
-	//+----------------------------------------------------------------
-	
-	function mod_posts()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		$DB->query("SELECT t.*, COUNT(p.pid) as reply_count FROM ibf_topics t, ibf_posts p WHERE p.queued=1 AND p.new_topic <> 1 AND t.tid=p.topic_id AND t.forum_id='".$this->forum['id']."' GROUP BY t.tid ORDER BY p.post_date ASC");
-		
-		if ( ! $DB->get_num_rows() )
-		{
-			$this->mod_error('cp_error_no_topics');
-			return;
-		}
-		
-		$this->output .= $this->html->modpost_topicstart($this->forum['name'], $this->forum['id']);
-		
-		//+----------------------------------------------------------------
-		// Get the topics to work on
-		//+----------------------------------------------------------------
-		
-		while( $r = $DB->fetch_row() )
-		{
-			$this->output .= $this->html->modpost_topicentry($r['title'], $r['tid'], $r['reply_count'], $this->forum['id']);
-		}
-		
-		$this->output .= $this->html->modpost_topicend();
-		
-	}
-	
-	//--------------------------------------------------
-	// MODERATE NEW TOPICS AND STUFF
-	//--------------------------------------------------
-	
-	function domod_topics()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		//--------------------------------------------------
-		// Which TID's are we playing with?
-		//--------------------------------------------------
-		
-		$this->load_forum();
-		
-		$delete_ids  = array();
-		$approve_ids = array();
-		
-		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^TID_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]] == 'approve')
- 				{
- 					$approve_ids[] = $match[1];
- 				}
- 				else if ($ibforums->input[$match[0]] == 'remove')
- 				{
- 					$delete_ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		//--------------------------------------------------
-		// Did we actually select anyfink?
-		//--------------------------------------------------
-		
-		$total = count($delete_ids) + count($approve_ids);
-		
-		if ( $total < 1 )
-		{
-			$this->mod_error('cp_error_no_topics');
-			return;
-		}
-		
-		//--------------------------------------------------
-		// What did we do?
-		//--------------------------------------------------
-		
-		if ( count($approve_ids) > 0 )
-		{
-			// Sort out the approved bit
-			
-			$tids = implode( ",", $approve_ids );
-			
-			// Sort out the approved bit
-			
-			$DB->query("UPDATE ibf_topics SET approved=1 WHERE tid IN ($tids)");
-			
-			$DB->query("UPDATE ibf_posts SET queued=0 WHERE topic_id IN ($tids)");
-			
-			// Update the posters ..er.. post count.
-			
-			$DB->query("SELECT starter_id FROM ibf_topics WHERE tid IN ($tids)");
-			
-			$mems = array();
-			
-			while ( $r = $DB->fetch_row() )
-			{
-				if ($r['starter_id'] > 0)
-				{
-					$mems[] = $r['starter_id'];
-				}
-			}
-			
-			if ( count($mems) > 0 )
-			{
-				if ( $this->forum['inc_postcount'] )
-				{
-					$mstring = implode( ",", $mems );
-					
-					//-----------------------------------
-					// Get the groups..
-					//-----------------------------------
-					
-					$groups = array();
-					
-					$DB->query("SELECT * FROM ibf_groups");
-					
-					while ( $g = $DB->fetch_row() )
-					{
-						$groups[ $g['g_id'] ] = $g;
-					}
-					
-					$loopy_loo = $DB->query("SELECT id, mgroup, posts FROM ibf_members WHERE id IN ($mstring)");
-					
-					while ( $member = $DB->fetch_row($loopy_loo) )
-					{
-						//-----------------------------------
-						// Are we auto_promoting?
-						//-----------------------------------
-						
-						if ( $groups[ $member['mgroup'] ]['g_promotion'] != '-1&-1' )
-						{
-							list($gid, $gposts) = explode( '&', $groups[ $member['mgroup'] ]['g_promotion'] );
-							
-							if ( $gid > 0 and $gposts > 0 )
-							{
-								if ( $member['posts'] + 1 >= $gposts )
-								{
-									$mgroup = "mgroup='$gid', ";
-									
-									if ( USE_MODULES == 1 )
-									{
-										$this->modules->register_class(&$class);
-										$this->modules->on_group_change($ibforums->member['id'], $gid);
-									}
-								}
-							}
-						}
-					
-						$newbie = $DB->query("UPDATE ibf_members SET ".$mgroup."posts=posts+1 WHERE id={$member['id']}");
-					}
-				}
-			}
-			
-		}
-		
-		if ( count($delete_ids) > 0 )
-		{
-			// Sort out the approved bit
-			
-			$tids = implode( ",", $delete_ids );
-			// Delete 'dem postings
-			
-			$DB->query("DELETE FROM ibf_topics WHERE tid IN ($tids)");
-			
-			$DB->query("DELETE FROM ibf_posts WHERE topic_id IN ($tids)");
-			
-			
-		}
-		
-		// Recount..
-		
-		$this->modfunc->forum_recount_queue($this->forum['id']);
-		$this->modfunc->forum_recount();
-		$this->modfunc->stats_recount();
-		
-		// Boink
-		
-		$print->redirect_screen( $ibforums->lang['cp_redirect_mod_topics'], "act=modcp&CODE=modtopics&f=".$this->forum['id'] );
-		
-	}
-	
-	//**-------------------------------------------------------
-	
-	function mod_topics()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$perpage = 10;
-		
-		$start   = $ibforums->input['st'] ? $ibforums->input['st'] : 0;
-		
-		$this->load_forum();
-		
-		//--------------------------------------------------
-		// How many topics must a man write down, before he is considered a man?
-		//--------------------------------------------------
-		
-		$DB->query("SELECT COUNT(tid) as tcount FROM ibf_topics WHERE approved=0 and forum_id='".$this->forum['id']."'");
-		$count = $DB->fetch_row();
-		
-		if ($count['tcount'] < 1)
-		{
-			$this->mod_error('cp_error_no_topics');
-			return;
-		}
-		
-		//+----------------------------------------------------------------
-		// Generate the forum page span links
-		//+----------------------------------------------------------------
-		
-		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $count['tcount'],
-											   'PER_PAGE'    => $perpage,
-											   'CUR_ST_VAL'  => $start,
-											   'L_SINGLE'    => "",
-											   'L_MULTI'     => $ibforums->lang['cp_pages'],
-											   'BASE_URL'    => $this->base_url."act=modcp&CODE=modtopics&f=".$this->forum['id'],
-									  )      );
-									  
-		$this->output .= $this->html->modtopics_start($pages, $this->forum['name'], $this->forum['id']);
-		
-		//+----------------------------------------------------------------
-		// Get the topics to work on
-		//+----------------------------------------------------------------
-		
-		$DB->query( "SELECT p.*, ".
-				    "m.id,m.name,m.mgroup,m.email,m.joined,m.avatar,m.avatar_size,m.posts as member_posts,m.aim_name,m.icq_number,m.signature, m.website,m.yahoo,m.title,m.hide_email,m.msnname, ".
-				    "g.g_id, g.g_title, g.g_icon, t.* ".
-				    "FROM ibf_posts p, ibf_members m, ibf_groups g, ibf_topics t ".
-				    "WHERE t.forum_id='".$this->forum['id']."' and t.approved=0 AND p.topic_id=t.tid AND p.new_topic=1 AND p.author_id=m.id AND g.g_id=m.mgroup ".
-				    "ORDER BY t.tid ASC LIMIT $start, $perpage");
-		
-		while( $r = $DB->fetch_row() )
-		{
-			$member = $this->parse_member($r);
-			
-			$r['post_date'] = $std->get_date( $r['post_date'], 'LONG' );
-			
-			$this->output .= $this->html->mod_topic_title($r['title'], $r['tid']);
-			$this->output .= $this->html->mod_postentry( array( 'msg' => $r, 'member' => $member ) );
-			$this->output .= $this->html->mod_topic_spacer();
-		}
-		
-		$this->output .= $this->html->modtopics_end();
-		
-	}
-	
-	//--------------------------------------------------
-	// Do Pruney wooney
-	//--------------------------------------------------
-	
-	function drink_prune_juice()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['mass_prune'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		//-----------------------------------------------
-		// Check auth key
-		//-----------------------------------------------
-		
-		if ( $ibforums->input['key'] != $std->return_md5_check() )
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'del_post') );
-		}
-		
-		//-----------------------------------------------
-		// Carry on...
-		//-----------------------------------------------
-		
-		$db_query = $this->modfunc->sql_prune_create( $this->forum['id'], $ibforums->input['starter'], $ibforums->input['state'], $ibforums->input['posts'], $ibforums->input['dateline'], $ibforums->input['ignore_pin'] );
-		
-		$batch = $DB->query($db_query);
-		
-		if ( ! $num_rows = $DB->get_num_rows() )
-		{
-			$this->mod_error('cp_error_no_topics');
-			return;
-		}
-		
-		$tid_array = array();
-		
-		while ( $tid = $DB->fetch_row() )
-		{
-			$tid_array[] = $tid['tid'];
-		}
-		
-		$this->modfunc->topic_delete($tid_array);
-		
-		$this->moderate_log("Pruned Forum");
-		
-		// Show results..
-		
-		$this->output .= $this->html->mod_simple_page( $ibforums->lang['cp_results'], $ibforums->lang['cp_result_del'].$num_rows );
-		
-	}
-	
-	
-	//--------------------------------------------------
-	// Prune Forum start
-	//--------------------------------------------------
-	
-	function prune_juice()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['mass_prune'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		//-----------------------------------------------
-		
-		if ($ibforums->input['check'] == 1)
-		{
-		
-			$link = "";
-			$link_text = $ibforums->lang['cp_prune_dorem'];
-			
-			$DB->query("SELECT COUNT(tid) as tcount FROM ibf_topics WHERE approved=1 and forum_id='".$this->forum['id']."'");
-			$tcount = $DB->fetch_row();
-			
-			$db_query = "SELECT COUNT(*) as count FROM ibf_topics WHERE approved=1 and forum_id='".$this->forum['id']."'";
-			
-			if ($ibforums->input['dateline'])
-			{
-				$date     = time() - $ibforums->input['dateline']*60*60*24;
-				$db_query .= " AND last_post < $date";
-				
-				$link .= "&dateline=$date";
-			}
-			
-			if ($ibforums->input['member'])
-			{
-				$DB->query("SELECT id FROM ibf_members WHERE name='".$ibforums->input['member']."'");
-				
-				if (! $mem = $DB->fetch_row() )
-				{
-					$this->mod_error('cp_error_no_mem');
-					return;
-				}
-				else
-				{
-					$db_query .= " AND starter_id='".$mem['id']."'";
-					$link     .= "&starter={$mem['id']}";
-				}
-			}
-			
-			if ($ibforums->input['posts'])
-			{
-				$db_query .= " AND posts < '".$ibforums->input['posts']."'";
-				$link     .= "&posts={$ibforums->input['posts']}";
-			}
-			
-			if ($ibforums->input['topic_type'] != 'all')
-			{
-				$db_query .= " AND state='".$ibforums->input['topic_type']."'";
-				$link     .= "&state={$ibforums->input['topic_type']}";
-			}
-			
-			if ($ibforums->input['ignore_pin'] == 1)
-			{
-				$db_query .= " AND pinned <> 1";
-				$link     .= "&ignore_pin=1";
-			}
-			
-			$DB->query($db_query);
-			$count = $DB->fetch_row();
-			
-			if ($ibforums->input['df'] == 'prune')
-			{
-				$link = "&act=modcp&f={$this->forum['id']}&CODE=doprune&".$link;
-			}
-			else
-			{
-				if ($ibforums->input['df'] == $this->forum['id'])
-				{
-					$this->mod_error('cp_same_forum');
-					return;
-				}
-				else if ($ibforums->input['df'] == -1)
-				{
-					$this->mod_error('cp_no_forum');
-					return;
-				}
-				
-				$link = "&act=modcp&f={$this->forum['id']}&CODE=domove&df=".$ibforums->input['df'].$link;
-				$link_text = $ibforums->lang['cp_prune_domove'];
-			}
-			
-			$confirm_html = $this->html->prune_confirm( $tcount['tcount'], $count['count'], $link, $link_text, $std->return_md5_check() );
-			
-		}
-		
-		
-		$select = "<select name='topic_type' class='forminput'>";
-		
-		foreach( array( 'open', 'closed', 'link', 'all' ) as $type )
-		{
-			if ($ibforums->input['topic_type'] == $type)
-			{
-				$selected = ' selected';
-			}
-			else
-			{
-				$selected = '';
-			}
-			
-			$select .= "<option value='$type'".$selected.">".$ibforums->lang['cp_pday_'.$type]."</option>";
-		}
-		
-		$select .= "</select>\n";
-		
-		$forums = "<option value='prune'>{$ibforums->lang['cp_ac_prune']}</option>";
-		
-		$forums .= $std->build_forum_jump(0,0,1);
-		
-		
-		if ($ibforums->input['df'])
-		{
-			$forums = preg_replace( "/<option value=\"".$ibforums->input['df']."\"/", "<option value=\"".$ibforums->input['df']."\" selected", $forums );
-		}
-		
-		$this->output .= $this->html->prune_splash($this->forum, $forums, $select, $button, $confirm);
-		
-		if ($confirm_html)
-		{
-			$this->output = preg_replace( "/<!-- IBF\.CONFIRM -->/", "$confirm_html", $this->output );
-		}
-		
-	}
-	
-	
-	
-	//--------------------------------------------------
-	// Find a user to edit, dude.
-	//--------------------------------------------------
-	
-	function find_user_one()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['edit_user'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		$this->output .= $this->html->find_user();
-	}
-	
-	function find_user_two()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		if ($ibforums->input['name'] == "")
-		{
-			$this->mod_error('cp_no_matches');
-			return;
-		}
-		
-		//---------------------------------
-		// Query the DB for possible matches
-		//---------------------------------
-		
-		$DB->query("SELECT id, name FROM ibf_members WHERE name LIKE '".$ibforums->input['name']."%' LIMIT 0,100");
-		
-		if ( $DB->get_num_rows() )
-		{
-			$select = "<select name='memberid' class='forminput'>";
-			
-			while ( $member = $DB->fetch_row() )
-			{
-				$select .= "\n<option value='".$member['id']."'>".$member['name']."</option>";
-			}
-			
-			$select .= "</select>";
-			
-			$this->output .= $this->html->find_two($select);
-		}
-		else
-		{
-			$this->mod_error('cp_no_matches');
-			return;
-		}
-	}
-	
-	function edit_user()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['edit_user'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		if ($ibforums->input['memberid'] == "")
-		{
-			$this->mod_error('cp_no_matches');
-			return;
-		}
-		
-		//--------------------------------------------------
-		
-		$DB->query("SELECT m.*, g.* FROM ibf_members m, ibf_groups g WHERE m.id='".$ibforums->input['memberid']."' AND m.mgroup=g.g_id");
-		
-		if (! $member = $DB->fetch_row() )
-		{
-			$this->mod_error('cp_no_matches');
-			return;
-		}
-		
-		//--------------------------------------------------
-		// No editing of admins!
-		//--------------------------------------------------
-		
-		if ($ibforums->member['g_access_cp'] != 1)
-		{
-			if ($member['g_access_cp'] == 1)
-			{
-				$this->mod_error('cp_admin_user');
-				return;
-			}
-		}
-		
-		require ROOT_PATH."sources/lib/post_parser.php";
-		
-		$parser = new post_parser();
-		
-		$editable['signature'] = $parser->unconvert($member['signature']);
-		$editable['location']  = $member['location'];
-		$editable['interests'] = $member['interests'];
-		$editable['website']   = $member['website'];
-		$editable['id']        = $member['id'];
-		$editable['name']      = $member['name'];
-		
-		$this->output .= $this->html->edit_user_form($editable);
-	}
-	
-	//--------------------------------------------------
-	
-	function complete_user_edit()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['edit_user'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		if ($ibforums->input['memberid'] == "")
-		{
-			$this->mod_error('cp_no_matches');
-			return;
-		}
-		
-		//--------------------------------------------------
-		
-		$DB->query("SELECT m.*, g.* FROM ibf_members m, ibf_groups g WHERE m.id='".$ibforums->input['memberid']."' AND m.mgroup=g.g_id");
-		
-		if (! $member = $DB->fetch_row() )
-		{
-			$this->mod_error('cp_no_matches');
-			return;
-		}
-		
-		//--------------------------------------------------
-		// No editing of admins!
-		//--------------------------------------------------
-		
-		if ($ibforums->member['g_access_cp'] != 1)
-		{
-			if ($member['g_access_cp'] == 1)
-			{
-				$this->mod_error('cp_admin_user');
-				return;
-			}
-		}
-		
-		require ROOT_PATH."sources/lib/post_parser.php";
-		
-		$parser = new post_parser();
-		
-		$ibforums->input['signature'] = $parser->convert(  array( 'TEXT'      => $ibforums->input['signature'],
-																  'SMILIES'   => 0,
-																  'CODE'      => $ibforums->vars['sig_allow_ibc'],
-																  'HTML'      => 0,
-																  'SIGNATURE' => 1
-														)       );
-									   
-		if ($parser->error != "")
-		{
-			$std->Error( array( 'LEVEL' => 1, 'MSG' => $parser->error) );
-		}
-		
-		
-		$profile = array (
-						   'signature'   => $ibforums->input['signature'],
-						   'location'    => $ibforums->input['location'],
-						   'interests'   => $ibforums->input['interests'],
-						   'website'     => $ibforums->input['website']
-						 );
-		
-		
-		if ($ibforums->input['avatar'] == 1)
-		{
-			$profile['avatar']      = "";
-			$profile['avatar_size'] = "";
-			$this->bash_uploaded_avatars($member['id']);
-		}
-		
-		if ($ibforums->input['photo'] == 1)
-		{
-			$this->bash_uploaded_photos($member['id']);
-			
-			$DB->query("SELECT id FROM ibf_member_extra WHERE id={$member['id']}");
-		
-			if ( $DB->get_num_rows() )
-			{
-				$DB->query("UPDATE ibf_member_extra SET photo_location='', photo_type='', photo_dimensions='' WHERE id={$member['id']}");
-			}
-			else
-			{
-				$DB->query("INSERT INTO ibf_member_extra SET photo_location='', photo_type='', photo_dimensions='', id={$member['id']}");
-			}
-			
-			//$this->bash_uploaded_avatars($member['id']);
-		}
-		
-		$db_string = $DB->compile_db_update_string($profile);
-		
-		$DB->query("UPDATE ibf_members SET $db_string WHERE id='".$ibforums->input['memberid']."'");
-		
-		$this->moderate_log("Edited Profile for: {$member['name']}");
-		
-		$std->boink_it($ibforums->base_url."act=modcp&f={$ibforums->input['f']}&CODE=doedituser&memberid={$ibforums->input['memberid']}");
-		exit();
-	}
-	
-	//--------------------------------------------------
-	// Faster Pussycat, Kill, Kill!
-	//--------------------------------------------------
-	
-	function bash_uploaded_photos($id)
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
-		{
-			if ( @file_exists( $ibforums->vars['upload_dir']."/photo-".$id.".".$ext ) )
-			{
-				@unlink( $ibforums->vars['upload_dir']."/photo-".$id.".".$ext );
-			}
-		}
-	}
-	
-	function bash_uploaded_avatars($id)
-	{
-		global $ibforums, $DB, $std, $print;
-		
-		foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
-		{
-			if ( @file_exists( $ibforums->vars['upload_dir']."/av-".$id.".".$ext ) )
-			{
-				@unlink( $ibforums->vars['upload_dir']."/av-".$id.".".$ext );
-			}
-		}
-	}
-
-	
-	//--------------------------------------------------
-	// Show default ModCP screen
-	//--------------------------------------------------
-	
-	function splash()
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		// Get the counts for pending topics and posts and other assorted stuff etc and ok.
-		
-		$DB->query("SELECT COUNT(tid) as count FROM ibf_topics WHERE approved <> 1 and forum_id='".$this->forum['id']."'");
-		$row = $DB->fetch_row();
-		
-		$tcount = $row['count'] ? $row['count'] : 0;
-		
-		//-------------------------------
-		
-		$DB->query("SELECT COUNT(pid) as pcount FROM ibf_posts WHERE queued=1 and new_topic <> 1 and forum_id='".$this->forum['id']."'");
-		$row = $DB->fetch_row();
-		
-		$pcount = $row['pcount'] ? $row['pcount'] : 0;
-		
-		//-------------------------------
-	
-		$this->output .= $this->html->splash($tcount, $pcount, $this->forum['name']);
-	}
-	
-	
-	
-
-	
-	/*************************************************/
-	
-	function do_move() {
-		global $std, $ibforums, $DB, $print;
-		
-		$this->load_forum();
-		
-		$pass = 0;
-		
-		if ($ibforums->member['g_is_supmod'] == 1)
-		{
-			$pass = 1;
-		}
-		else if ($this->moderator['mass_move'] == 1)
-		{
-			$pass = 1;
-		}
-		else
-		{
-			$pass = 0;
-		}
-		
-		if ($pass == 0)
-		{
-			$this->mod_error('cp_no_perms');
-			return;
-		}
-		
-		//-----------------------------------------------
-		// Check auth key
-		//-----------------------------------------------
-		
-		if ( $ibforums->input['key'] != $std->return_md5_check() )
-		{
-			$std->Error( array( LEVEL => 1, MSG => 'del_post') );
-		}
-		
-		//-----------------------------------------------
-		// Carry on...
-		//-----------------------------------------------
-		
-		$db_query = $this->modfunc->sql_prune_create( $this->forum['id'], $ibforums->input['starter'], $ibforums->input['state'], $ibforums->input['posts'], $ibforums->input['dateline'], $ibforums->input['ignore_pin'] );
-		
-		
-		$DB->query($db_query);
-		
-		if ( ! $num_rows = $DB->get_num_rows() )
-		{
-			$this->mod_error('cp_error_no_topics'); 
-			return;
-		}
-		
-		$tid_array = array();
-		
-		while ($row = $DB->fetch_row())
-		{
-			$tid_array[] = $row['tid'];
-		}
-		
-		//----------------------------------
-		
-		$source = $this->forum['id'];
-		$moveto = $ibforums->input['df'];
-		
-		//-----------------------------------
-		// Check for an attempt to move into a subwrap forum
-		//-----------------------------------
-		
-		$DB->query("SELECT subwrap, id, sub_can_post FROM ibf_forums WHERE id='$moveto'");
-		
-		$f = $DB->fetch_row();
-		
-		if ($f['subwrap'] == 1 and $f['sub_can_post'] != 1)
-		{
-			$this->mod_error('cp_error_no_subforum');
-			return;
-		}
-		
-		
-		$this->modfunc->topic_move( $tid_array, $source, $moveto );
-		
-		$this->moderate_log("Mass moved topics");
-		
-		//----------------------------------
-		// Resync the forums..
-		//----------------------------------
-		
-		$this->modfunc->forum_recount($source);
-		
-		$this->modfunc->forum_recount($moveto);
-		
-		//----------------------------------
-		// Show results..
-		//----------------------------------
-		
-		$this->output .= $this->html->mod_simple_page( $ibforums->lang['cp_results'], $ibforums->lang['cp_result_move'].$num_rows );
-		
-	}
-	
-	
-	
-
-	
-//+---------------------------------------------------------------------------------------------
-	
-	
-	/*************************************************/
-	// MODERATE LOG:
-	// ---------------
-	//
-	// Function for adding the mod action to the DB
-	//
-	/*************************************************/
-	
-	function moderate_log($title = 'unknown') {
-		global $std, $ibforums, $DB, $HTTP_REFERER, $QUERY_STRING;
-		
-		$db_string = $std->compile_db_string( array (
-														'forum_id'    => $ibforums->input['f'],
-														'topic_id'    => $ibforums->input['t'],
-														'post_id'     => $ibforums->input['p'],
-														'member_id'   => $ibforums->member['id'],
-														'member_name' => $ibforums->member['name'],
-														'ip_address'  => $ibforums->input['IP_ADDRESS'],
-														'http_referer'=> $HTTP_REFERER,
-														'ctime'       => time(),
-														'topic_title' => "<i>Via Moderators CP</i>",
-														'action'      => $title,
-														'query_string'=> $QUERY_STRING,
-													)
-										    );
-		
-		$DB->query("INSERT INTO ibf_moderator_logs (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")");
-		
-	}
-	
-	
-	
-	/*************************************************/
-	
-	function load_forum($fid="")
-	{
-		global $std, $ibforums, $DB;
-		
-		if ($fid == "")
-		{
-			$fid = intval($ibforums->input['f']);
-		}
-		
-		$DB->query("SELECT * FROM ibf_forums WHERE id=$fid");
-		
-		if ( ! $this->forum = $DB->fetch_row() )
-		{
-			$this->mod_error('cp_err_no_f');
-			return;
-		}
-		
-		$this->modfunc->init($this->forum);
-		
-		return TRUE;
-		
-	}
-	
-	/*************************************************/
-	
-	function get_tids()
-	{
-		global $std, $ibforums, $DB;
-		
-		$ids = array();
- 		
- 		foreach ($ibforums->input as $key => $value)
- 		{
- 			if ( preg_match( "/^TID_(\d+)$/", $key, $match ) )
- 			{
- 				if ($ibforums->input[$match[0]])
- 				{
- 					$ids[] = $match[1];
- 				}
- 			}
- 		}
- 		
- 		if ( count($ids) < 1 )
- 		{
- 			$this->mod_error('cp_err_no_topics');
- 			return;
- 		}
- 		
- 		return $ids;
-	}
-	
-		
-	/*************************************************/
-	
-	function mod_error($error)
-	{
-		global $std, $ibforums, $DB, $print;
-		
-		$error = $ibforums->lang[$error];
-	
-		$this->output .= $this->html->mod_simple_page($ibforums->lang['cp_error'],$error);
-		
-		if ( count($this->nav) < 1 )
-		{
-			$this->nav[] = "<a href='{$this->base_url}&act=modcp'>{$ibforums->lang['cp_modcp_home']}</a>";
-		}
-		
-		if (! $this->page_title )
-		{
-			$this->page_title = $ibforums->lang['cp_modcp_ptitle'];
-		}
-    	
-    	$print->add_output("$this->output");
-        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 1, NAV => $this->nav ) );
-        
-        exit();
-	}
-	
-	/*************************************************/
-	
-	function parse_member($member=array()) {
-		global $ibforums, $std, $DB;
-		
-		$member['name'] = "<a href='{$this->base_url}&act=Profile&CODE=03&MID={$member['id']}'>{$member['name']}</a>";
-	
-		$member['avatar'] = $std->get_avatar( $member['avatar'], $ibforums->member['view_avs'], $member['avatar_size'] );
-		
-		$member['MEMBER_JOINED'] = $ibforums->lang['m_joined'].' '.$std->get_date( $member['joined'], 'JOINED' );
-		
-		$member['MEMBER_GROUP'] = $ibforums->lang['m_group'].' '.$member['g_title'];
-		
-		$member['MEMBER_POSTS'] = $ibforums->lang['m_posts'].' '.$member['member_posts'];
-		
-		$member['PROFILE_ICON'] = "<a href='{$this->base_url}&act=Profile&CODE=03&MID={$member['id']}'><{P_PROFILE}></a>&nbsp;";
-		
-		$member['MESSAGE_ICON'] = "<a href='{$this->base_url}&act=Msg&CODE=04&MID={$member['id']}'><{P_MSG}></a>&nbsp;";
-		
-		if (!$member['hide_email']) {
-			$member['EMAIL_ICON'] = "<a href='{$this->base_url}&act=Mail&CODE=00&MID={$member['id']}'><{P_EMAIL}></a>&nbsp;";
-		}
-		
-		if ( $member['website'] and $member['website'] = preg_match( "/^http:\/\/\S+$/", $member['WEBSITE'] ) ) {
-			$member['WEBSITE_ICON'] = "<a href='{$member['website']}' target='_blank'><{P_WEBSITE}></a>&nbsp;";
-		}
-		
-		if ($member['icq_number']) {
-			$member['ICQ_ICON'] = "<a href=\"javascript:PopUp('{$this->base_url}&act=ICQ&MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_ICQ}></a>&nbsp;";
-		}
-		
-		if ($member['aim_name']) {
-			$member['AOL_ICON'] = "<a href=\"javascript:PopUp('{$this->base_url}&act=AOL&MID={$member['id']}','Pager','450','330','0','1','1','1')\"><{P_AOL}></a>&nbsp;";
-		}
-		
-		//-----------------------------------------------------
-		
-		return $member;
-	
-	}
-	
-	//-----------------------------------------------------
-	// Prints the index
-	//-----------------------------------------------------
-	
-
-	
-	function print_index() {
-		global $ibforums, $std, $DB, $print;
-		
-		$this->output .= $this->html->cp_index();
-		
-	}
-
-    
-}
-
-?>
diff --git a/upload/sources/moderate.php b/upload/sources/moderate.php
new file mode 100644
index 00000000..b64c24c0
--- /dev/null
+++ b/upload/sources/moderate.php
@@ -0,0 +1,4028 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Moderation core module
+|   > Module written by Matt Mecham
+|   > Date started: 19th February 2002
+|
+|   > Module Version 1.0.0
+|   > DBA Checked: Wed 19 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class moderate
+{
+    var $output    = "";
+    var $base_url  = "";
+    var $html      = "";
+
+    var $moderator = "";
+    var $modfunc   = "";
+    var $forum     = array();
+    var $topic     = array();
+    
+    var $upload_dir  = "";
+	var $trash_forum = 0;
+	var $trash_inuse = 0;
+    
+    /*-------------------------------------------------------------------------*/
+	// Our constructor, load words, load skin, print the topic listing
+	/*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $forums, $DB, $std, $print;
+        
+        $post_array      = array( '04', '02', '20', '22', 'resync', 'prune_start', 'prune_finish', 'prune_move', 'editmember' );
+        $not_forum_array = array( 'editmember' );
+        
+        //-----------------------------------------
+        // Make sure this is a POST request
+        // not a naughty IMG redirect
+        //-----------------------------------------
+        
+        if ( ! in_array( $ibforums->input['CODE'], $post_array ) )
+        {
+			if ($_POST['act'] == '')
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'incorrect_use') );
+			}
+		}
+		
+		//-----------------------------------------
+        // Nawty, Nawty!
+        //-----------------------------------------
+        
+        if ($ibforums->input['CODE'] != '02' and $ibforums->input['CODE'] != '05')
+        {
+			if ($ibforums->input['auth_key'] != $std->return_md5_check() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
+			}
+		}
+        
+        //-----------------------------------------
+		// Compile the language file
+		//-----------------------------------------
+		
+        $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_mod', $ibforums->lang_id);
+
+        $this->html      = $std->load_template('skin_mod');
+        
+        //-----------------------------------------
+        // Check the input
+        //-----------------------------------------
+        
+        if ( ! in_array( $ibforums->input['CODE'], $not_forum_array ) )
+        {
+        	//-----------------------------------------
+        	// t
+        	//-----------------------------------------
+        	
+			if ($ibforums->input['t'])
+			{
+				$ibforums->input['t'] = intval($ibforums->input['t']);
+				
+				if ( ! $ibforums->input['t'] )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+				}
+				else
+				{
+					$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.intval($ibforums->input['t']) ) );
+					$DB->simple_exec();
+					
+					$this->topic = $DB->fetch_row();
+					
+					if (empty($this->topic['tid']))
+					{
+						$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// p
+			//-----------------------------------------
+			
+			if ($ibforums->input['p'])
+			{
+				$ibforums->input['p'] = intval($ibforums->input['p']);
+				
+				if (! $ibforums->input['p'] )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'missing_files') );
+				}
+			}
+			
+			//-----------------------------------------
+			// F?
+			//-----------------------------------------
+			
+			$ibforums->input['f'] = intval($ibforums->input['f']);
+			
+			if ( ! $ibforums->input['f'] )
+			{
+				$std->Error( array( 'LEVEL' => 1,'MSG' => 'missing_files') );
+			}
+			
+			$ibforums->input['st'] = intval($ibforums->input['st']);
+			
+			//-----------------------------------------
+			// Get the forum info based on the forum ID,
+			//-----------------------------------------
+			
+			$this->forum = $forums->forum_by_id[ $ibforums->input['f'] ];
+			
+			$this->base_url = $ibforums->base_url;
+			
+			//-----------------------------------------
+			// Are we a moderator?
+			//-----------------------------------------
+			
+			if ( $ibforums->member['_moderator'][ $ibforums->input['f'] ] )
+			{
+				$this->moderator = $ibforums->member['_moderator'][ $ibforums->input['f'] ];
+			}
+        }
+        
+        //-----------------------------------------
+        // Load mod module...
+        //-----------------------------------------
+        
+        require( ROOT_PATH.'sources/lib/modfunctions.php');
+        
+        $this->modfunc = new modfunctions();
+        
+        $this->modfunc->init($this->forum);
+        
+        $this->upload_dir = $ibforums->vars['upload_dir'];
+        
+        //-----------------------------------------
+        // Trash-can set up
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['forum_trash_can_enable'] and $ibforums->vars['forum_trash_can_id'] )
+        {
+        	if ( $ibforums->cache['forum_cache'][ $ibforums->vars['forum_trash_can_id'] ]['sub_can_post'] )
+        	{
+        		if ( $ibforums->member['mgroup'] == $ibforums->vars['admin_group'] )
+        		{
+        			$this->trash_forum = $ibforums->vars['forum_trash_can_use_radmin'] ? $ibforums->vars['forum_trash_can_id'] : 0;
+        		}
+        		else if ( $ibforums->member['g_access_cp'] )
+        		{
+        			$this->trash_forum = $ibforums->vars['forum_trash_can_use_admin'] ? $ibforums->vars['forum_trash_can_id'] : 0;
+        		}
+        		else if ( $ibforums->member['g_is_supmod'] )
+        		{
+        			$this->trash_forum = $ibforums->vars['forum_trash_can_use_smod'] ? $ibforums->vars['forum_trash_can_id'] : 0;
+        		}
+        		else if ( $ibforums->member['is_mod'] )
+        		{
+        			$this->trash_forum = $ibforums->vars['forum_trash_can_use_mod'] ? $ibforums->vars['forum_trash_can_id'] : 0;
+        		}
+        	}
+        }
+      
+        //-----------------------------------------
+        // Convert the code ID's into something
+        // use mere mortals can understand....
+        //-----------------------------------------
+        
+        switch ($ibforums->input['CODE'])
+        {
+        	case '02':
+        		$this->move_form();
+        		break;
+        	case '03':
+        		$this->delete_form();
+        		break;
+        	case '04':
+        		$this->delete_post();
+        		break;
+        	case '05':
+        		$this->edit_form();
+        		break;
+        	case '00':
+        		$this->close_topic();
+        		break;
+        	case '01':
+        		$this->open_topic();
+        		break;
+        	case '08':
+        		$this->delete_topic();
+        		break;
+        	case '12':
+        		$this->do_edit();
+        		break;
+        	case '14':
+        		$this->do_move();
+        		break;
+        	case '15':
+        		$this->pin_topic();
+        		break;
+        	case '16':
+        		$this->unpin_topic();
+        		break;
+        	case '17':
+        		$this->rebuild_topic();
+        		break;
+        	//-----------------------------------------
+        	// Poll Edit
+        	//-----------------------------------------
+        	case '20':
+        		$this->poll_edit_form();
+        		break;
+        	case '21':
+        		$this->poll_edit_do();
+        		break;
+        	//-----------------------------------------
+        	// Poll Delete
+        	//-----------------------------------------
+        	case '22':
+        		$this->poll_delete_form();
+        		break;
+        	case '23':
+        		$this->poll_delete_do();
+        		break;
+        	//-----------------------------------------
+        	// Unsubscribe
+        	//-----------------------------------------
+        	case '30':
+        		$this->unsubscribe_all_form();
+        		break;
+        	case '31':
+        		$this->unsubscribe_all();
+        		break;
+        	//-----------------------------------------
+        	// Merge Start
+        	//-----------------------------------------
+        	case '60':
+        		$this->merge_start();
+        		break;
+        	case '61':
+        		$this->merge_complete();
+        		break;
+        	//-----------------------------------------
+        	// Topic History
+        	//-----------------------------------------
+        	case '90':
+        		$this->topic_history();
+        		break;
+        	//-----------------------------------------
+        	// Multi---
+        	//-----------------------------------------	
+        	case 'topicchoice':
+        		$this->multi_topic_modify();
+        		break;
+        	//-----------------------------------------
+        	// Multi---
+        	//-----------------------------------------	
+        	case 'postchoice':
+        		$this->multi_post_modify();
+        		break;
+        	//-----------------------------------------
+        	// Resynchronize Forum
+        	//-----------------------------------------
+        	case 'resync':
+        		$this->resync_forum();
+        		break;
+        	//-----------------------------------------
+        	// Prune / Move Topics
+        	//-----------------------------------------
+        	case 'prune_start':
+        		$this->prune_start();
+        		break;
+        	case 'prune_finish':
+        		$this->prune_finish();
+        		break;
+        	case 'prune_move':
+        		$this->prune_move();
+        		break;
+        	//-----------------------------------------
+        	// Add. topic view func.
+        	//-----------------------------------------
+        	case 'topic_approve':
+        		$this->topic_approve_alter('approve');
+        		break;
+        	case 'topic_unapprove':
+        		$this->topic_approve_alter('unapprove');
+        		break;
+        	//-----------------------------------------
+        	// Edit member
+        	//-----------------------------------------
+        	case 'editmember':
+        		$this->edit_member();
+        		break;
+        	default:
+        		$this->moderate_error();
+        		break;
+        }
+        
+        // If we have any HTML to print, do so...
+    	
+    	$print->add_output( $this->output );
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Edit member
+	/*-------------------------------------------------------------------------*/
+	
+	function edit_member()
+	{
+		global $DB, $std, $forums, $ibforums;
+		
+		$mid = intval($ibforums->input['mid']);
+		
+		//-----------------------------------------
+		// Check Permissions
+		//-----------------------------------------
+		
+		if ( ! $ibforums->member['g_is_supmod'] )
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Get post parser
+		//-----------------------------------------
+		
+		require_once ( ROOT_PATH."sources/lib/post_parser.php");
+        
+        $parser = new post_parser();
+		
+		//-----------------------------------------
+		// Got anyfink?
+		//-----------------------------------------
+		 
+		if ( ! $mid )
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Get member
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'profile_get_all' , array( 'mid' => $mid ) );
+		
+		$DB->cache_exec_query();
+	
+		$member = $DB->fetch_row();
+		
+		//-----------------------------------------
+		// Show Form?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['checked'] )
+		{
+			$this->output .= $this->html_start_form( array( 1 => array( 'CODE'   , 'editmember'),
+															4 => array( 'mid'    , $mid        ),
+															5 => array( 'checked', 1           ),
+												   )      );
+												   
+    		//-----------------------------------------
+			// No editing of admins!
+			//-----------------------------------------
+			
+			if ($ibforums->member['g_access_cp'] != 1)
+			{
+				if ($member['g_access_cp'] == 1)
+				{
+					$this->moderate_error('cp_admin_user');
+					return;
+				}
+			}
+			
+			$editable['signature']  = $parser->unconvert($member['signature']);
+			$editable['location']   = $member['location'];
+			$editable['interests']  = $std->my_br2nl($member['interests']);
+			$editable['website']    = $member['website'];
+			$editable['id']         = $member['id'];
+			$editable['name']       = $member['name'];
+			$editable['aim_name']   = $member['aim_name'];
+			$editable['icq_number'] = $member['icq_number'];
+			$editable['msnname']    = $member['msnname'];
+			$editable['yahoo']      = $member['yahoo'];
+			
+			$optional_output = "";
+			
+			//-----------------------------------------
+			// Profile fields
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+			$fields = new custom_fields( $DB );
+			
+			$fields->member_id   = $ibforums->member['id'];
+			$fields->mem_data_id = $member['id'];
+			$fields->admin       = intval($ibforums->member['g_access_cp']);
+			$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+			
+			$fields->init_data();
+			$fields->parse_to_edit();
+			
+			foreach( $fields->out_fields as $id => $data )
+			{
+				if ( $fields->cache_data[ $id ]['pf_type'] == 'drop' )
+				{
+					$form_element = $this->html->field_dropdown( 'field_'.$id, $data );
+				}
+				else if ( $fields->cache_data[ $id ]['pf_type'] == 'area' )
+				{
+					$form_element = $this->html->field_textarea( 'field_'.$id, $data );
+				}
+				else
+				{
+					$form_element = $this->html->field_textinput( 'field_'.$id, $data );
+				}
+				
+				$optional_output .= $this->html->field_entry( $fields->field_names[ $id ], $fields->field_desc[ $id ], $form_element );
+			}
+			
+			//-----------------------------------------
+			// Show?
+			//-----------------------------------------
+			
+			$this->output .= $this->html->edit_user_form($editable, $optional_output);
+    	
+			$this->page_title = $ibforums->lang['cp_em_title'];
+			$this->nav[]      = "<a href='{$ibforums->base_url}showuser={$mid}'>{$ibforums->lang['cp_vp_title']}</a>";
+			$this->nav[]      = $ibforums->lang['cp_em_title'];
+			
+		}
+		//-----------------------------------------
+		// Do edit
+		//-----------------------------------------
+		else
+		{
+			$ibforums->input['signature'] = $parser->convert(  array( 'TEXT'      => $ibforums->input['signature'],
+																	  'SMILIES'   => 0,
+																	  'CODE'      => $ibforums->vars['sig_allow_ibc'],
+																	  'HTML'      => $ibforums->vars['sig_allow_html'],
+																	  'SIGNATURE' => 1
+															)       );
+										   
+			if ($parser->error != "")
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => $parser->error) );
+			}
+			
+			$bet = array(  'website'     => $ibforums->input['website'],
+						   'icq_number'  => $ibforums->input['icq_number'],
+						   'aim_name'    => $ibforums->input['aim_name'],
+						   'yahoo'       => $ibforums->input['yahoo'],
+						   'msnname'     => $ibforums->input['msnname'],
+						   'location'    => $ibforums->input['location'],
+						   'interests'   => $ibforums->input['interests'],
+						   'signature'   => $ibforums->input['signature'],
+						);
+			
+			if ($ibforums->input['avatar'] == 1)
+			{
+				$bet['avatar_location'] = "";
+				$bet['avatar_size']     = "";
+				$this->bash_uploaded_avatars($mid);
+			}
+			
+			if ($ibforums->input['photo'] == 1)
+			{
+				$this->bash_uploaded_photos($mid);
+				$bet['photo_type']       = '';
+				$bet['photo_location']   = '';
+				$bet['photo_dimensions'] = '';
+			}
+			
+			//-----------------------------------------
+			// Write it to the DB.
+			//-----------------------------------------
+			
+			if ( $mem = $DB->simple_exec_query( array( 'select' => 'id', 'from' => 'member_extra', 'where' => 'id='.$mid ) ) )
+			{
+				$DB->do_update( 'member_extra', $bet, 'id='.$mid );
+			}
+			else
+			{
+				$bet['id'] = $mid;
+				$DB->do_insert( 'member_extra', $bet );
+			}
+			
+			//-----------------------------------------
+			// Custom profile field stuff
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+			$fields = new custom_fields( $DB );
+			
+			$fields->member_id   = $ibforums->member['id'];
+	
+			$fields->admin       = intval($ibforums->member['g_access_cp']);
+			$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+			
+			$fields->init_data();
+			$fields->parse_to_save();
+			
+			//-----------------------------------------
+			// Custom profile field stuff
+			//-----------------------------------------
+			
+			if ( count( $fields->out_fields ) )
+			{
+				//-----------------------------------------
+				// Do we already have an entry in
+				// the content table?
+				//-----------------------------------------
+				
+				$test = $DB->simple_exec_query( array( 'select' => 'member_id', 'from' => 'pfields_content', 'where' => 'member_id='.$mid ) );
+				
+				if ( $test['member_id'] )
+				{
+					//-----------------------------------------
+					// We have it, so simply update
+					//-----------------------------------------
+					
+					$DB->do_update( 'pfields_content', $fields->out_fields, 'member_id='.$mid );
+				}
+				else
+				{
+					$fields->out_fields['member_id'] = $mid;
+					
+					$DB->do_insert( 'pfields_content', $fields->out_fields );
+				}
+			}
+			
+			//-----------------------------------------
+			// Member sync?
+			//-----------------------------------------
+			
+			if ( USE_MODULES == 1 )
+			{
+				require ROOT_PATH."modules/ipb_member_sync.php";
+			
+				$this->modules = new ipb_member_sync();
+			
+				$bet['id'] = $mid;
+				$this->modules->register_class(&$this);
+				$this->modules->on_profile_update($bet, $custom_fields);
+			}
+			
+			$this->moderate_log("Edited Profile for: {$member['name']}");
+			
+			$std->boink_it( $ibforums->base_url.'act=mod&CODE=editmember&auth_key='.$std->return_md5_check().'&mid='.$mid.'&tid='.time() );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Post act
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_post_modify()
+	{
+		global $DB, $std, $forums, $ibforums, $print;
+		
+		$this->pids  = $this->get_pids();
+		
+		if ( count( $this->pids ) )
+		{
+			switch ( $ibforums->input['tact'] )
+			{
+				case 'approve':
+					$this->multi_approve_post(1);
+					break;
+				case 'unapprove':
+					$this->multi_approve_post(0);
+					break;
+				case 'delete':
+					$this->multi_delete_post();
+					break;
+				case 'merge':
+					$this->multi_merge_post();
+					break;
+				case 'split':
+					$this->multi_split_topic();
+					break;
+				case 'move':
+					$this->multi_move_post();
+					break;
+				default:
+					
+					break;
+			}
+		}
+		
+		$std->my_setcookie('modpids', '', 0);
+		
+		if ( $this->topic['tid'] )
+		{
+			$print->redirect_screen( $ibforums->lang['cp_redirect_posts'], "showtopic=".$this->topic['tid'].'&st='.intval($ibforums->input['st']) );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Move Posts
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_move_post()
+	{
+		global $std, $ibforums, $DB, $print, $forums;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['split_merge'] == 1)
+		{
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		 
+		if ( ! $this->topic['tid'] )
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Get post parser
+		//-----------------------------------------
+		
+		require_once ( ROOT_PATH."sources/lib/post_parser.php");
+        
+        $this->parser = new post_parser();
+        
+		if ( $ibforums->input['checked'] != 1 )
+		{
+			$jump_html = $std->build_forum_jump(0,1);
+		
+			$this->output .= $this->html_start_form( array( 1 => array( 'CODE'   , 'postchoice'        ),
+															2 => array( 't'      , $this->topic['tid'] ),
+															3 => array( 'f'      , $this->forum['id']  ),
+															4 => array( 'tact'   , 'move' ),
+															5 => array( 'checked', 1      ),
+												   )      );
+												  
+			$this->output .= $this->html->table_top( $ibforums->lang['cmp_title'].": ".$this->forum['name']." -&gt; ".$this->topic['title'] );
+			
+			$this->output .= $this->html->move_post_body();
+			
+			//-----------------------------------------
+			// Display the posty wosty's
+			//-----------------------------------------
+			
+			$DB->simple_construct( array(
+										  'select' => 'post, pid, post_date, author_id, author_name',
+										  'from'   => 'posts',
+										  'where'  => "pid IN (".implode(",", $this->pids).")",
+										  'order'  => 'post_date'
+								 )      );
+								 
+			$post_query = $DB->simple_exec();
+			
+			$post_count = 0;
+			
+			while ( $row = $DB->fetch_row($post_query) )
+			{
+				//-----------------------------------------
+				// Limit posts to 200 chars to stop shite
+				// loads of pages
+				//-----------------------------------------
+				
+				if ( strlen($row['post']) > 800 )
+				{
+					$row['post']   = $this->parser->unconvert($row['post']);
+					$row['post']   = substr($row['post'], 0, 800) . '...';
+				}
+				
+				$row['date']   = $std->get_date( $row['post_date'], 'LONG' );
+				
+				$row['st_top_bit'] = sprintf( $ibforums->lang['st_top_bit'], $row['author_name'], $row['date'] );
+					
+				$row['post_css'] = $post_count % 2 ? 'row1' : 'row2';
+					
+				$this->output .= $this->html->split_row( $row );
+				
+				$post_count++;
+			}
+			
+			//-----------------------------------------
+			// print my bottom, er, the bottom
+			//-----------------------------------------
+					
+			$this->output .= $this->html->split_end_form( $ibforums->lang['cmp_submit'] );
+			
+			$this->page_title = $ibforums->lang['cmp_title'].": ".$this->topic['title'];
+			
+			$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+								 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+							   );
+							   
+			$print->add_output( $this->output );
+        	$print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+		}
+		else
+		{
+			//-----------------------------------------
+			// PROCESS Check the input
+			//-----------------------------------------
+			
+			if ( ! intval($ibforums->input['topic_url']) )
+			{
+				preg_match( "/(\?|&amp;)(t|showtopic)=(\d+)($|&amp;)/", $ibforums->input['topic_url'], $match );
+		
+				$old_id = intval(trim($match[3]));
+			}
+			else
+			{
+				$old_id = intval($ibforums->input['topic_url']);
+			}
+			
+			if ($old_id == "")
+			{
+				$ibforums->input['checked'] = 0;
+				$this->output = $this->html->warn_errors( $ibforums->lang['cmp_notopic'] );
+				$this->multi_move_post();
+			}
+			
+			//-----------------------------------------
+			// Grab topic
+			//-----------------------------------------
+			
+			$move_to_topic = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.$old_id ) );
+			
+			if ( ! $move_to_topic['tid'] or ! $forums->forum_by_id[ $move_to_topic['forum_id'] ]['id'] )
+			{
+				$ibforums->input['checked'] = 0;
+				$this->output = $this->html->warn_errors( $ibforums->lang['cmp_notopic'] );
+				$this->multi_move_post();
+			}
+			
+			//-----------------------------------------
+			// Get the post ID's to split
+			//-----------------------------------------
+	
+			$ids = array();
+			
+			foreach ($ibforums->input as $key => $value)
+			{
+				if ( preg_match( "/^post_(\d+)$/", $key, $match ) )
+				{	
+					if ($ibforums->input[$match[0]])
+					{
+						$ids[] = $match[1];
+					}
+				}
+			}
+			
+			$affected_ids = count($ids);
+			
+			//-----------------------------------------
+			// Do we have enough?
+			//-----------------------------------------
+			
+			if ($affected_ids < 1)
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'split_not_enough' ) );
+			}
+			
+			//-----------------------------------------
+			// Do we choose too many?
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => 'count(pid) as cnt', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']}" ) );
+			$DB->simple_exec();
+			
+			$count = $DB->fetch_row();
+			
+			if ( $affected_ids >= $count['cnt'] )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'split_too_much' ) );
+			}
+			
+			//-----------------------------------------
+			// Complete the PID string
+			//-----------------------------------------
+			
+			$pid_string = implode( ",", $ids );
+			
+			//-----------------------------------------
+			// Move the posts
+			//-----------------------------------------
+			
+			$DB->do_update( 'posts', array( 'topic_id' => $move_to_topic['tid'], 'new_topic' => 0 ), "pid IN($pid_string)" ); 
+			
+			//-----------------------------------------
+			// Move the posts
+			//-----------------------------------------
+			
+			$DB->do_update( 'posts', array( 'new_topic' => 0 ), "topic_id={$this->topic['tid']}" ); 
+			
+			//-----------------------------------------
+			// Rebuild the topics
+			//-----------------------------------------
+			
+			$this->modfunc->rebuild_topic($move_to_topic['tid']);
+			$this->modfunc->rebuild_topic($this->topic['tid']);
+			
+			//-----------------------------------------
+			// Update the forum(s)
+			//-----------------------------------------
+			
+			$this->modfunc->forum_recount($this->topic['forum_id']);
+			
+			if ($this->topic['forum_id'] != $move_to_topic['forum_id'])
+			{
+				$this->modfunc->forum_recount($move_to_topic['forum_id']);
+			}
+			
+			$this->moderate_log("Moved posts from '{$this->topic['title']}' to '{$move_to_topic['title']}'");
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Split topic
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_approve_post($approve=1)
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$approve_topic = 1;
+		$queued_post   = 0;
+		
+		if ( $approve != 1 )
+		{
+			$approve_topic = 0;
+			$queued_post   = 1;
+		}
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['post_q'] == 1)
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1)
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Did we get the first post too?
+		//-----------------------------------------
+		
+		if ( strstr( ",".implode(",",$this->pids).",", ",".$this->topic['topic_firstpost']."," ) )
+		{
+			$DB->do_update( 'topics', array( 'approved' => $approve_topic ), 'tid='.$this->topic['tid'] );
+			
+			$tmp = $this->pids;
+			
+			$this->pids = array();
+			
+			foreach( $tmp as $t )
+			{
+				if ( $t != $this->topic['topic_firstpost'] )
+				{
+					$this->pids[] = $t;
+				}
+			}
+		}
+		
+		if ( count($this->pids) )
+		{
+			$DB->do_update( 'posts', array( 'queued' => $queued_post ), 'pid IN ('. implode(",", $this->pids) .')' );
+		}
+		
+		$this->modfunc->rebuild_topic( $this->topic['tid'] );
+		$this->modfunc->forum_recount( $this->topic['forum_id'] );
+		$this->modfunc->stats_recount();
+	}
+		
+	/*-------------------------------------------------------------------------*/
+	// Split topic
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_split_topic()
+	{
+		global $std, $ibforums, $DB, $print, $forums;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ( $this->moderator['split_merge'] == 1 or $this->trash_inuse == 1 )
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1)
+		{
+			$this->moderate_error();
+		}
+		 
+		if ( ! $this->topic['tid'] )
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Get post parser
+		//-----------------------------------------
+		
+		require "./sources/lib/post_parser.php";
+        
+        $this->parser = new post_parser();
+        
+		if ( $ibforums->input['checked'] != 1 )
+		{
+			$jump_html = $std->build_forum_jump(0,1);
+		
+			$this->output = $this->html_start_form( array( 1 => array( 'CODE', 'postchoice' ),
+														   2 => array( 't' , $this->topic['tid'] ),
+														   3 => array( 'f' , $this->forum['id']  ),
+														   4 => array( 'tact', 'split' ),
+														   5 => array( 'checked', 1    ),
+														   
+												  )      );
+												  
+			$this->output .= $this->html->table_top( $ibforums->lang['st_top'].": ".$this->forum['name']." -&gt; ".$this->topic['title'] );
+			
+			$this->output .= $this->html->split_body( $jump_html );
+			
+			//-----------------------------------------
+			// Display the posty wosty's
+			//-----------------------------------------
+			
+			$DB->simple_construct( array(
+										  'select' => 'post, pid, post_date, author_id, author_name',
+										  'from'   => 'posts',
+										  'where'  => "pid IN (".implode(",", $this->pids).")",
+										  'order'  => 'post_date'
+								 )      );
+								 
+			$post_query = $DB->simple_exec();
+			
+			$post_count = 0;
+			
+			while ( $row = $DB->fetch_row($post_query) )
+			{
+				// Limit posts to 800 chars to stop shite loads of pages
+				
+				if ( strlen($row['post']) > 800 )
+				{
+					$row['post']   = $this->parser->unconvert($row['post']);
+					$row['post']   = substr($row['post'], 0, 800) . '...';
+				}
+				
+				$row['date']   = $std->get_date( $row['post_date'], 'LONG' );
+				
+				$row['st_top_bit'] = sprintf( $ibforums->lang['st_top_bit'], $row['author_name'], $row['date'] );
+					
+				$row['post_css'] = $post_count % 2 ? 'row1' : 'row2';
+					
+				$this->output .= $this->html->split_row( $row );
+				
+				$post_count++;
+			}
+			
+			//-----------------------------------------
+			// print my bottom, er, the bottom
+			//-----------------------------------------
+					
+			$this->output .= $this->html->split_end_form( $ibforums->lang['st_submit'] );
+			
+			$this->page_title = $ibforums->lang['st_top']." ".$this->topic['title'];
+			
+			$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+								 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+							   );
+							   
+			$print->add_output( $this->output );
+        	$print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+		}
+		else
+		{
+			//-----------------------------------------
+			// PROCESS Check the input
+			//-----------------------------------------
+			
+			if ($ibforums->input['title'] == "")
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+			}
+			
+			//-----------------------------------------
+			// Get the post ID's to split
+			//-----------------------------------------
+	
+			$ids = array();
+			
+			foreach ($ibforums->input as $key => $value)
+			{
+				if ( preg_match( "/^post_(\d+)$/", $key, $match ) )
+				{	
+					if ($ibforums->input[$match[0]])
+					{
+						$ids[] = $match[1];
+					}
+				}
+			}
+			
+			$affected_ids = count($ids);
+			
+			//-----------------------------------------
+			// Do we have enough?
+			//-----------------------------------------
+			
+			if ($affected_ids < 1)
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'split_not_enough' ) );
+			}
+			
+			//-----------------------------------------
+			// Do we choose too many?
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => 'count(pid) as cnt', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']}" ) );
+			$DB->simple_exec();
+		
+			$count = $DB->fetch_row();
+			
+			if ( $affected_ids >= $count['cnt'] )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'split_too_much' ) );
+			}
+			
+			//-----------------------------------------
+			// Complete the PID string
+			//-----------------------------------------
+			
+			$pid_string = implode( ",", $ids );
+			
+			//-----------------------------------------
+			// Check the forum we're moving this too
+			//-----------------------------------------
+			
+			$ibforums->input['fid'] = intval($ibforums->input['fid']);
+			
+			if ($ibforums->input['fid'] != $this->forum['id'])
+			{
+				if ( $this->trash_inuse )
+				{
+					$f = $ibforums->cache['forum_cache'][ $ibforums->input['fid'] ];
+				}
+				else
+				{
+					$f = $forums->forum_by_id[ $ibforums->input['fid'] ];
+				}
+				
+				if ( ! $f['id'] )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
+				}
+			
+				if ($f['sub_can_post'] != 1)
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'forum_no_post_allowed' ) );
+				}
+			}
+			
+			//-----------------------------------------
+			// Complete a new dummy topic
+			//-----------------------------------------
+			
+			$DB->do_insert( 'topics',  array(
+											 'title'            => $ibforums->input['title'],
+											 'description'      => $ibforums->input['desc'] ,
+											 'state'            => 'open',
+											 'posts'            => 0,
+											 'starter_id'       => 0,
+											 'starter_name'     => 0,
+											 'start_date'       => time(),
+											 'last_poster_id'   => 0,
+											 'last_poster_name' => 0,
+											 'last_post'        => time(),
+											 'icon_id'          => 0,
+											 'author_mode'      => 1,
+											 'poll_state'       => 0,
+											 'last_vote'        => 0,
+											 'views'            => 0,
+											 'forum_id'         => $ibforums->input['fid'],
+											 'approved'         => 1,
+											 'pinned'           => 0,
+							)               );
+								
+			$new_topic_id = $DB->get_insert_id();
+	
+			//-----------------------------------------
+			// Move the posts
+			//-----------------------------------------
+			
+			$DB->do_update( 'posts', array( 'topic_id' => $new_topic_id, 'new_topic' => 0 ), "pid IN($pid_string)" ); 
+			
+			//-----------------------------------------
+			// Move the posts
+			//-----------------------------------------
+			
+			if ( $this->trash_inuse )
+			{
+				$DB->do_update( 'posts', array( 'queued' => 0 ), "topic_id=$new_topic_id" );
+			}
+			
+			$DB->do_update( 'posts', array( 'new_topic' => 0 ), "topic_id={$this->topic['tid']}" );
+			
+			//-----------------------------------------
+			// Rebuild the topics
+			//-----------------------------------------
+			
+			$this->modfunc->rebuild_topic($new_topic_id);
+			$this->modfunc->rebuild_topic($this->topic['tid']);
+			
+			//-----------------------------------------
+			// Update the forum(s)
+			//-----------------------------------------
+			
+			$this->modfunc->forum_recount($this->topic['forum_id']);
+			
+			if ($this->topic['forum_id'] != $ibforums->input['fid'])
+			{
+				$this->modfunc->forum_recount($ibforums->input['fid']);
+			}
+			
+			if ( $this->trash_inuse )
+			{
+				$this->moderate_log("Applied trash can for deleted post '{$this->topic['title']}'");
+			}
+			else
+			{
+				$this->moderate_log("Split topic '{$this->topic['title']}'");
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Multi merge post
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_merge_post()
+	{
+		global $std, $ibforums, $DB, $print, $forums;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ($this->moderator['delete_post'] == 1)
+		{
+			$passed = 1;
+		}
+		else 
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if ( ! count( $this->pids ) )
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Load LIB
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/lib/post_parser.php' );
+		$parser = new post_parser();
+		
+		//-----------------------------------------
+		// Form or print?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['checked'] )
+		{
+			//-----------------------------------------
+			// Get post data
+			//-----------------------------------------
+			
+			$master_post = "";
+			$dropdown    = "";
+			$author      = "";
+			$seen_author = array();
+			$upload_html = "";
+			
+			//-----------------------------------------
+			// MOVE INTO DB CLASS
+			//-----------------------------------------
+			
+			$DB->cache_add_query( 'moderate_get_topics', array( 'pids' => $this->pids ) );
+			$DB->cache_exec_query();
+		
+			while ( $p = $DB->fetch_row() )
+			{
+				if ( $std->check_perms( $forums->forum_by_id[ $p['forum_id'] ]['read_perms']) == TRUE )
+				{
+					$master_post  .= "\n\n".$parser->unconvert( trim($p['post']) );
+					
+					$dropdown     .= "\n<option value='{$p['pid']}'>".$std->get_date( $p['post_date'], 'LONG') ." (#{$p['pid']})</option>";
+					
+					if ( ! $seen_author[ $p['author_id'] ] )
+					{
+						$author .= "\n<option value='{$p['author_id']}'>{$p['author_name']} (#{$p['pid']})</option>";
+						$seen_author[ $p['author_id'] ] = 1;
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Get Attachment Data
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( "select" => '*', 'from' => 'attachments', 'where' => "attach_pid IN (".implode(",", $this->pids).")" ) );
+			$DB->simple_exec();
+			
+			while( $row = $DB->fetch_row() )
+			{
+				$row['image'] = $ibforums->cache['attachtypes'][ $row['attach_ext'] ]['atype_img'];
+				$row['size']  = $std->size_format( $row['attach_filesize'] );
+				
+				if ( strlen( $row['attach_file'] ) > 40 )
+				{
+					$row['attach_file'] = substr( $row['attach_file'], 0, 35 ) .'...';
+				}
+				
+				$upload_html .= $this->html->uploadbox_entry($row);
+			}
+			
+			//-----------------------------------------
+			// Print form
+			//-----------------------------------------
+			
+			$this->output .= $this->html->merge_post_form( trim($master_post), $dropdown, $author, $std->return_md5_check(), $upload_html );
+			
+			if ( $this->topic['tid'] )
+			{
+				$this->nav[] = "<a href='{$ibforums->base_url}showtopic={$this->topic['tid']}'>{$this->topic['title']}</a>";
+			}
+			
+			$this->nav[]      = $ibforums->lang['cm_title'];
+			
+			$this->page_title = $ibforums->lang['cm_title'];
+			
+			$print->add_output( $this->output );
+        	$print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+		}
+		else
+		{
+			//-----------------------------------------
+			// DO THE THING, WITH THE THING!!
+			//-----------------------------------------
+			
+			$ibforums->input['postdate'] = intval($ibforums->input['postdate']);
+			
+			if ( ! $ibforums->input['selectedpids'] and ! $ibforums->input['postdate'] and ! $ibforums->input['postauthor'] and ! $ibforums->input['Post'] )
+			{
+				$this->moderate_error();
+			}
+			
+			$post = $parser->convert( array( 'TEXT'    => $ibforums->input['Post'],
+											 'SMILIES' => 1,
+											 'CODE'    => 1,
+											 'HTML'    => 0
+								    )      );
+								    
+			//-----------------------------------------
+			// Post to keep...
+			//-----------------------------------------
+			
+			$posts          = array();
+			$author         = array();
+			$post_to_delete = array();
+			$new_post_key   = md5(time());
+			$topics         = array();
+			$forums         = array();
+			
+			$DB->cache_add_query( 'moderate_get_topics', array( 'pids' => $this->pids ) );
+			$DB->cache_exec_query();
+			
+			while ( $p = $DB->fetch_row() )
+			{
+				$posts[ $p['pid'] ] = $p;
+				
+				$topics[ $p['topic_id'] ] = $p['topic_id'];
+				$forums[ $p['forum_id'] ] = $p['forum_id'];
+				
+				if ( $p['author_id'] == $ibforums->input['postauthor'] )
+				{
+					$author = array( 'id' => $p['author_id'], 'name' => $p['author_name'] );
+				}
+				
+				if ( $p['pid'] != $ibforums->input['postdate'] )
+				{
+					$post_to_delete[] = $p['pid'];
+				}
+			}
+			
+			//-----------------------------------------
+			// Update main post...
+			//-----------------------------------------
+			
+			$DB->do_update( 'posts', array( 'author_id'   => $author['id'],
+											'author_name' => $author['name'],
+											'post'        => $post,
+											'post_key'    => $new_post_key,
+											'post_parent' => 0
+										  ), 'pid='.$ibforums->input['postdate']
+						 );
+						 
+			//-----------------------------------------
+			// Fix attachments
+			//-----------------------------------------
+			
+			$attach_keep = array();
+			$attach_kill = array();
+			
+			foreach ($ibforums->input as $key => $value)
+			{
+				if ( preg_match( "/^attach_(\d+)$/", $key, $match ) )
+				{
+					if ( $ibforums->input[$match[0]] == 'keep' )
+					{
+						$attach_keep[] = $match[1];
+					}
+					else
+					{
+						$attach_kill[] = $match[1];
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Keep
+			//-----------------------------------------
+			
+			if ( count( $attach_keep ) )
+			{
+				$DB->do_update( 'attachments',
+								array( 'attach_pid' => $ibforums->input['postdate'], 'attach_post_key' => $new_post_key, 'attach_member_id' => $author['id'] ),
+								'attach_id IN('.implode(",",$attach_keep).')' );
+			}
+			
+			//-----------------------------------------
+			// Kill
+			//-----------------------------------------
+			
+			if ( count( $attach_kill ) )
+			{
+				$DB->simple_construct( array( "select" => '*', 'from' => 'attachments',  'where' => 'attach_id IN('.implode(",",$attach_kill).')') );
+				$DB->simple_exec();
+				
+				while ( $killmeh = $DB->fetch_row() )
+				{
+					if ( $killmeh['attach_location'] )
+					{
+						@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
+					}
+					if ( $killmeh['attach_thumb_location'] )
+					{
+						@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+					}
+				}
+				
+				$DB->simple_construct( array( 'delete' => 'attachments', 'where' => 'attach_id IN('.implode(",",$attach_kill).')' ) );
+				$DB->simple_exec();
+			}
+			
+			//-----------------------------------------
+			// Kill old posts
+			//-----------------------------------------
+			
+			if ( count($post_to_delete) )
+			{
+				$DB->simple_construct( array( 'delete' => 'posts', 'where' => 'pid IN('.implode(",",$post_to_delete).')' ) );
+				$DB->simple_exec();
+			}
+			
+			foreach( $topics as $t )
+			{
+				$this->modfunc->rebuild_topic($t, 0);
+			}
+			
+			foreach( $forums as $f )
+			{
+				$this->modfunc->forum_recount($f);
+			}
+			
+			$this->modfunc->stats_recount();
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Multi delete post
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_delete_post()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ($this->moderator['delete_post'] == 1)
+		{
+			$passed = 1;
+		}
+		else 
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		//-----------------------------------------
+		// Check to make sure that this isn't the first post in the topic..
+		//-----------------------------------------
+		
+		foreach( $this->pids as $p )
+		{
+			if ( $this->topic['topic_firstpost'] == $p )
+			{ 
+				$this->moderate_error('no_delete_post');
+			}
+		}
+		
+		if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
+		{
+			//-----------------------------------------
+			// Set up and pass to split topic handler
+			//-----------------------------------------
+			
+			$ibforums->input['checked'] = 1;
+			$ibforums->input['fid']     = $this->trash_forum;
+			$ibforums->input['title']   = "From: ".$this->topic['title'];
+			$ibforums->input['desc']    = "From Topic ID: ".$this->topic['tid'];
+			
+			foreach( $this->pids as $p )
+			{
+				$ibforums->input[ 'post_'.$p ] = 1;
+			}
+			
+			$this->trash_inuse = 1;
+			
+			$this->multi_split_topic();
+			
+			$this->trash_inuse = 0;
+		}
+		else
+		{
+			$this->modfunc->post_delete( $this->pids );
+			$this->modfunc->forum_recount( $this->topic['forum_id'] );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Alter approved thingy
+	/*-------------------------------------------------------------------------*/
+	
+	function topic_approve_alter($type='approve')
+	{
+		global $std, $ibforums, $DB, $print;
+
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['post_q'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		$approve_int = $type == 'approve' ? 1 : 0;
+		
+		$DB->do_update( 'topics', array( 'approved' => $approve_int ), 'tid='.$this->topic['tid'] );
+		
+		$this->modfunc->forum_recount( $this->forum['id'] );
+		$this->modfunc->stats_recount();
+		
+		$this->moderate_log("Approved a topic (tid: ".$this->topic['tid'].")");
+		
+		$print->redirect_screen( $ibforums->lang['redirect_modified'], "showtopic=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Prune move
+	/*-------------------------------------------------------------------------*/
+	
+	function prune_move()
+	{
+		global $std, $ibforums, $DB, $print, $forums;
+		
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['mass_move'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		//-----------------------------------------
+		// Carry on...
+		//-----------------------------------------
+		
+		$db_query = $this->modfunc->sql_prune_create( $this->forum['id'], $ibforums->input['starter'], $ibforums->input['state'], $ibforums->input['posts'], $ibforums->input['dateline'], $ibforums->input['ignore_pin'] );
+		
+		$DB->query($db_query);
+		
+		if ( ! $num_rows = $DB->get_num_rows() )
+		{
+			$this->moderate_error('cp_error_no_topics'); 
+			return;
+		}
+		
+		$tid_array = array();
+		
+		while ($row = $DB->fetch_row())
+		{
+			$tid_array[] = $row['tid'];
+		}
+		
+		//-----------------------------------------
+		
+		$source = $this->forum['id'];
+		$moveto = $ibforums->input['df'];
+		
+		//-----------------------------------------
+		// Check for an attempt to move into a subwrap forum
+		//-----------------------------------------
+		
+		$f = $forums->forum_by_id[ $moveto ];
+		
+		if ( $f['sub_can_post'] != 1 )
+		{
+			$this->moderate_error('cp_error_no_subforum');
+			return;
+		}
+		
+		$this->modfunc->topic_move( $tid_array, $source, $moveto );
+		
+		$this->moderate_log("Mass moved topics");
+		
+		//-----------------------------------------
+		// Resync the forums..
+		//-----------------------------------------
+		
+		$this->modfunc->forum_recount($source);
+		
+		$this->modfunc->forum_recount($moveto);
+		
+		//-----------------------------------------
+		// Show results..
+		//-----------------------------------------
+		
+		$this->output .= $this->html->mod_simple_page( $ibforums->lang['cp_results'], $ibforums->lang['cp_result_move'].$num_rows );
+		
+		$print->pop_up_window( "", $this->output );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Do prune
+	/*-------------------------------------------------------------------------*/
+	
+	function prune_finish()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['mass_prune'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		//-----------------------------------------
+		// Carry on...
+		//-----------------------------------------
+		
+		$db_query = $this->modfunc->sql_prune_create( $this->forum['id'], $ibforums->input['starter'], $ibforums->input['state'], $ibforums->input['posts'], $ibforums->input['dateline'], $ibforums->input['ignore_pin'] );
+		
+		$batch = $DB->query($db_query);
+		
+		if ( ! $num_rows = $DB->get_num_rows() )
+		{
+			$this->moderate_error('cp_error_no_topics');
+			return;
+		}
+		
+		$tid_array = array();
+		
+		while ( $tid = $DB->fetch_row() )
+		{
+			$tid_array[] = $tid['tid'];
+		}
+		
+		$this->modfunc->topic_delete($tid_array);
+		
+		$this->moderate_log("Pruned Forum");
+		
+		// Show results..
+		
+		$this->output .= $this->html->mod_simple_page( $ibforums->lang['cp_results'], $ibforums->lang['cp_result_del'].$num_rows );
+		
+		$print->pop_up_window( "", $this->output );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Prune / Move Start
+	/*-------------------------------------------------------------------------*/
+	
+	function prune_start()
+	{
+		global $DB, $std, $forums, $ibforums, $print;
+		
+		//-----------------------------------------
+		// Check permissions
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['mass_prune'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		//-----------------------------------------
+		// Are we checking first?
+		//-----------------------------------------
+		
+		if ($ibforums->input['check'] == 1)
+		{
+			$link      = "";
+			$link_text = $ibforums->lang['cp_prune_dorem'];
+			
+			$tcount = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as tcount', 'from' => 'topics', 'where' => "approved=1 and forum_id={$this->forum['id']}" ) );
+			
+			//-----------------------------------------
+			// date...
+			//-----------------------------------------
+		
+			if ($ibforums->input['dateline'])
+			{
+				$date      = time() - $ibforums->input['dateline']*60*60*24;
+				$db_query .= " AND last_post < $date";
+				
+				$link .= "&dateline=$date";
+			}
+			
+			//-----------------------------------------
+			// Member...
+			//-----------------------------------------
+			
+			if ( $ibforums->input['member'] )
+			{
+				$DB->query("SELECT id FROM ibf_members WHERE name='".$ibforums->input['member']."'");
+				
+				if (! $mem = $DB->fetch_row() )
+				{
+					$this->moderate_error('cp_error_no_mem');
+					return;
+				}
+				else
+				{
+					$db_query .= " AND starter_id='".$mem['id']."'";
+					$link     .= "&starter={$mem['id']}";
+				}
+			}
+			
+			//-----------------------------------------
+			// Posts / Topic type
+			//-----------------------------------------
+			
+			if ($ibforums->input['posts'])
+			{
+				$db_query .= " AND posts < '".$ibforums->input['posts']."'";
+				$link     .= "&posts={$ibforums->input['posts']}";
+			}
+			
+			if ($ibforums->input['topic_type'] != 'all')
+			{
+				$db_query .= " AND state='".$ibforums->input['topic_type']."'";
+				$link     .= "&state={$ibforums->input['topic_type']}";
+			}
+			
+			if ($ibforums->input['ignore_pin'] == 1)
+			{
+				$db_query .= " AND pinned <> 1";
+				$link     .= "&ignore_pin=1";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'COUNT(*) as count',
+										  'from'   => 'topics',
+										  'where'  => "approved=1 and forum_id='".$this->forum['id']."'" . $db_query ) );
+			
+			$DB->simple_exec();
+			
+			$count = $DB->fetch_row();
+			
+			//-----------------------------------------
+			// Prune?
+			//-----------------------------------------
+			
+			if ($ibforums->input['df'] == 'prune')
+			{
+				$link = "act=mod&f={$this->forum['id']}&CODE=prune_finish&".$link;
+			}
+			else
+			{
+				if ( $ibforums->input['df'] == $this->forum['id'] )
+				{
+					$this->moderate_error('cp_same_forum');
+					return;
+				}
+				else if ($ibforums->input['df'] == -1)
+				{
+					$this->moderate_error('cp_no_forum');
+					return;
+				}
+				
+				$link      = "act=mod&f={$this->forum['id']}&CODE=prune_move&df=".$ibforums->input['df'].$link;
+				$link_text = $ibforums->lang['cp_prune_domove'];
+			}
+			
+			//-----------------------------------------
+			// Build data
+			//-----------------------------------------
+			
+			$confirm_data = array( 'tcount'    => $tcount['tcount'],
+								   'count'     => $count['count'],
+								   'link'      => $link,
+								   'link_text' => $link_text,
+								   'show'      => 1 );
+		}
+		
+		$select = "<select name='topic_type' class='forminput'>";
+		
+		foreach( array( 'open', 'closed', 'link', 'all' ) as $type )
+		{
+			if ($ibforums->input['topic_type'] == $type)
+			{
+				$selected = ' selected';
+			}
+			else
+			{
+				$selected = '';
+			}
+			
+			$select .= "<option value='$type'".$selected.">".$ibforums->lang['cp_pday_'.$type]."</option>";
+		}
+		
+		$select .= "</select>\n";
+		
+		$html_forums  = "<option value='prune'>{$ibforums->lang['cp_ac_prune']}</option>";
+		
+		$html_forums .= $std->build_forum_jump(0,0,1);
+		
+		//-----------------------------------------
+		// Make current destination forum this one if selected
+		// before
+		//-----------------------------------------
+		
+		if ($ibforums->input['df'])
+		{
+			$html_forums = preg_replace( "/<option value=\"".$ibforums->input['df']."\"/", "<option value=\"".$ibforums->input['df']."\" selected", $html_forums );
+		}
+		
+		$this->output .= $this->html->prune_splash($this->forum, $html_forums, $select, $std->return_md5_check(), $confirm_data );
+		
+		$print->pop_up_window( "", $this->output );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Resynchronise Forum
+	/*-------------------------------------------------------------------------*/
+	
+	function resync_forum()
+	{
+		global $DB, $std, $forums, $ibforums, $print;
+		
+		$this->modfunc->forum_recount( $this->forum['id'] );
+		$this->modfunc->stats_recount();
+		
+		$print->redirect_screen( $ibforums->lang['cp_resync'], "showforum=".$this->forum['id'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Topic act
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_topic_modify()
+	{
+		global $DB, $std, $forums, $ibforums, $print;
+		
+		$this->tids  = $this->get_tids();
+		
+		if ( count( $this->tids ) )
+		{
+			switch ( $ibforums->input['tact'] )
+			{
+				case 'close':
+					$this->multi_alter_topics('close_topic', "state='closed'");
+					break;
+				case 'open':
+					$this->multi_alter_topics('open_topic', "state='open'");
+					break;
+				case 'pin':
+					$this->multi_alter_topics('pin_topic', "pinned=1");
+					break;
+				case 'unpin':
+					$this->multi_alter_topics('unpin_topic', "pinned=0");
+					break;
+				case 'approve':
+					$this->multi_alter_topics('topic_q', "approved=1");
+					break;
+				case 'unapprove':
+					$this->multi_alter_topics('topic_q', "approved=0");
+					break;
+				case 'delete':
+					$this->multi_alter_topics('delete_topic');
+					break;
+				case 'move':
+					$this->multi_start_checked_move();
+					return;
+					break;
+				case 'domove':
+					$this->multi_complete_checked_move();
+					break;
+				case 'merge':
+					$this->multi_topic_merge();
+					break;
+				default:
+					$this->multi_topic_mmod();
+					break;
+			}
+		}
+		
+		$std->my_setcookie('modtids', '', 0);
+		
+		if ( $this->forum['id'] )
+		{
+			$print->redirect_screen( $ibforums->lang['cp_redirect_topics'], "showforum=".$this->forum['id'] );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Multi Merge Topics
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_topic_merge()
+	{
+		global $std, $ibforums, $DB, $print;
+
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['delete_topic'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		if ( count($this->tids) < 2 )
+		{
+			$this->moderate_error();  ### NEEDS CUSTOM MESSAGE
+			return;
+		}
+		
+		//-----------------------------------------
+		// Get the topics in ascending date order
+		//-----------------------------------------
+		
+		$topics = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid IN ('.implode( ",",$this->tids ).')', 'order' => 'start_date asc' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$topics[] = $r;
+		}
+		
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
+		
+		if ( count($topics) < 2 )
+		{
+			$this->moderate_error();  ### NEEDS CUSTOM MESSAGE
+			return;
+		}
+		
+		//-----------------------------------------
+		// Get topic ID for first topic 'master'
+		//-----------------------------------------
+		
+		$first_topic = array_shift( $topics );
+		
+		$main_topic_id = $first_topic['tid'];
+		
+		$merge_ids = array();
+		
+		foreach( $topics as $t )
+		{
+			$merge_ids[] = $t['tid'];
+		}
+		
+		//-----------------------------------------
+		// Update the posts, remove old polls, subs and topic
+		//-----------------------------------------
+		
+		$DB->do_update( 'posts', array( 'topic_id' => $main_topic_id ), 'topic_id IN ('.implode(",",$merge_ids).")" );
+		
+		$DB->simple_exec_query( array( 'delete' => 'polls', 'where' => "tid IN (".implode(",",$merge_ids).")") );
+		
+		$DB->simple_exec_query( array( 'delete' => 'voters', 'where' => "tid IN (".implode(",",$merge_ids).")") );
+		
+		$DB->simple_exec_query( array( 'delete' => 'tracker', 'where' => "topic_id IN (".implode(",",$merge_ids).")") );
+		
+		$DB->simple_exec_query( array( 'delete' => 'topics', 'where' => "tid IN (".implode(",",$merge_ids).")") );
+		
+		//-----------------------------------------
+		// Update the newly merged topic
+		//-----------------------------------------
+		
+		$this->modfunc->rebuild_topic( $main_topic_id );
+		$this->modfunc->forum_recount( $this->forum['id'] );
+		$this->modfunc->stats_recount();
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// Complete move dUdE
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_complete_checked_move()
+	{
+		global $std, $ibforums, $DB, $print;
+
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['move_topic'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		$dest_id   = intval($ibforums->input['df']);
+		$source_id = $this->forum['id'];
+		
+		$this->tids = array();
+		
+		//-----------------------------------------
+		// Check for input..
+		//-----------------------------------------
+		
+		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^TID_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ( $ibforums->input[$match[0]] )
+ 				{
+ 					$this->tids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 			
+		//-----------------------------------------
+		// Check for input..
+		//-----------------------------------------
+		
+		if ($source_id == "")
+		{
+			$this->moderate_error('cp_error_move');
+			return;
+		}
+		
+		//-----------------------------------------
+		
+		if ($dest_id == "" or $dest_id == -1)
+		{
+			$this->moderate_error('cp_error_move');
+			return;
+		}
+		
+		//-----------------------------------------
+		
+		if ($source_id == $dest_id)
+		{
+			$this->moderate_error('cp_error_move');
+			return;
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, sub_can_post, name', 'from' => 'forums', 'where' => "id IN(".$source_id.",".$dest_id.")" ) );
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() != 2 )
+		{
+			$this->moderate_error('cp_error_move');
+			return;
+		}
+		
+		$source_name = "";
+		$dest_name   = "";
+		
+		//-----------------------------------------
+		// Check for an attempt to move into a subwrap forum
+		//-----------------------------------------
+		
+		while ( $f = $DB->fetch_row() )
+		{
+			if ($f['id'] == $source_id)
+			{
+				$source_name = $f['name'];
+			}
+			else
+			{
+				$dest_name = $f['name'];
+			}
+			
+			if ( ( $f['sub_can_post'] != 1 ) OR $f['redirect_on'] == 1 )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'forum_no_post_allowed' ) );
+			}
+		}
+		
+		$this->modfunc->topic_move( $this->tids, $source_id, $dest_id );
+		
+		//-----------------------------------------
+		// Resync the forums..
+		//-----------------------------------------
+		
+		$this->modfunc->forum_recount($source_id);
+		
+		$this->modfunc->forum_recount($dest_id);
+		
+		$this->moderate_log("Moved topics from $source_name to $dest_name");
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// Start move form
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_start_checked_move()
+	{
+		global $std, $ibforums, $DB, $print;
+
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator['move_topic'] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		$jump_html = $std->build_forum_jump('no_html');
+		
+		$this->output .= $this->html_start_form( array( 1 => array( 'CODE', 'topicchoice'     ),
+														2 => array( 'f' , $this->forum['id']  ),
+														3 => array( 'tact', 'domove'          ),
+											   )      );
+		 								      
+		$this->output .= $this->html->move_checked_form_start( $this->forum['name'] );
+		
+		$DB->simple_construct( array( 'select' => 'title, tid', 'from' => 'topics', 'where' => "forum_id=".$this->forum['id']." AND tid IN(".implode(",", $this->tids).")" ) );
+		$DB->simple_exec();
+		
+		while( $row = $DB->fetch_row() )
+		{
+			$this->output .=  $this->html->move_checked_form_entry($row['tid'],$row['title']);
+		}
+		
+		$this->output .= $this->html->move_checked_form_end($jump_html);
+		
+		$this->page_title = $ibforums->lang['cp_ttitle'];
+		
+		$this->nav = array ( "<a href='{$ibforums->base_url}act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>" );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MULTI-MOD!
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_topic_mmod()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		//-----------------------------------------
+		// Issit coz i is black?
+		//-----------------------------------------
+		
+		if ( ! strstr( $ibforums->input['tact'], 't_' ) )
+		{
+			$this->moderate_error('stupid_beggar');
+		}
+		
+		$this->mm_id = intval( str_replace( 't_', "", $ibforums->input['tact'] ) );
+		
+		//-----------------------------------------
+		// Init modfunc module
+		//-----------------------------------------
+		
+		$this->modfunc->init( $this->forum, "", $this->moderator );
+        
+        //-----------------------------------------
+		// Do we have permission?
+		//-----------------------------------------
+		
+		if ( $this->modfunc->mm_authorize() != TRUE )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cp_no_perms') );
+		}
+        
+        require( ROOT_PATH.'sources/lib/post_parser.php');
+        
+        $this->parser  = new post_parser(1);
+        
+        $this->mm_data = $ibforums->cache['multimod'][ $this->mm_id ];
+        
+        if ( ! $this->mm_data )
+        {
+        	$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_mmid') );
+        }
+        
+		//-----------------------------------------
+        // Does this forum have this mm_id
+        //-----------------------------------------
+		
+		if ( $this->modfunc->mm_check_id_in_forum( $this->forum['id'], $this->mm_data ) != TRUE )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_mmid') );
+		}
+		
+		//-----------------------------------------
+        // Still here? We're damn good to go sir!
+        //-----------------------------------------
+        
+        $this->modfunc->stm_init();
+        
+        //-----------------------------------------
+        // Open close?
+        //-----------------------------------------
+        
+        if ( $this->mm_data['topic_state'] != 'leave' )
+        {
+        	if ( $this->mm_data['topic_state'] == 'close' )
+        	{
+        		$this->modfunc->stm_add_close();
+        	}
+        	else if ( $this->mm_data['topic_state'] == 'open' )
+        	{
+        		$this->modfunc->stm_add_open();
+        	}
+        }
+        
+        //-----------------------------------------
+        // pin no-pin?
+        //-----------------------------------------
+        
+        if ( $this->mm_data['topic_pin'] != 'leave' )
+        {
+        	if ( $this->mm_data['topic_pin'] == 'pin' )
+        	{
+        		$this->modfunc->stm_add_pin();
+        	}
+        	else if ( $this->mm_data['topic_pin'] == 'unpin' )
+        	{
+        		$this->modfunc->stm_add_unpin();
+        	}
+        }
+        
+        //-----------------------------------------
+        // Approve / Unapprove
+        //-----------------------------------------
+        
+        if ( $this->mm_data['topic_approve'] )
+        {
+        	if ( $this->mm_data['topic_approve'] == 1 )
+        	{
+        		$this->modfunc->stm_add_approve();
+        	}
+        	else if ( $this->mm_data['topic_approve'] == 2 )
+        	{
+        		$this->modfunc->stm_add_unapprove();
+        	}
+        }
+        
+        //-----------------------------------------
+        // Update what we have so far...
+        //-----------------------------------------
+        
+        $this->modfunc->stm_exec( $this->tids );
+        
+        //-----------------------------------------
+        // Topic title (1337 - I am!)
+        //-----------------------------------------
+        
+        $pre = "";
+		$end = "";
+        
+        if ( $this->mm_data['topic_title_st'] )
+        {
+        	$pre =  preg_replace( "/'/", "\\'", $this->mm_data['topic_title_st'] );
+        }
+        
+        if ( $this->mm_data['topic_title_end'] )
+        {
+        	$end =  preg_replace( "/'/", "\\'", $this->mm_data['topic_title_end'] );
+        }
+        
+        $DB->cache_add_query( 'moderate_concat_title', array( 'pre'  => $pre,
+															  'end'  => $end,
+															  'tids' => $this->tids ) );
+		$DB->cache_exec_query();
+		
+        //-----------------------------------------
+        // Add reply?
+        //-----------------------------------------
+        
+        if ( $this->mm_data['topic_reply'] and $this->mm_data['topic_reply_content'] )
+        {
+       		$move_ids = array();
+       		
+       		foreach( $this->tids as $tid )
+       		{
+       			$move_ids[] = array( $tid, $this->forum['id'] );
+       		}
+       		
+        	$this->modfunc->auto_update = FALSE;  // Turn off auto forum re-synch, we'll manually do it at the end
+        
+        	$this->modfunc->topic_add_reply( 
+        									 $this->parser->convert( array(
+																		   'TEXT'    => $this->mm_data['topic_reply_content'],
+																		   'CODE'    => 1,
+																		   'SMILIES' => 1,
+															       )      )
+										    , $move_ids
+										    , $this->mm_data['topic_reply_postcount']
+										   );
+		}
+		
+		//-----------------------------------------
+        // Move topic?
+        //-----------------------------------------
+        
+        if ( $this->mm_data['topic_move'] )
+        {
+        	//-----------------------------------------
+        	// Move to forum still exist?
+        	//-----------------------------------------
+        	
+        	$DB->simple_construct( array( 'select' => 'id, sub_can_post, name', 'from' => 'forums', 'where' => "id=".$this->mm_data['topic_move'] ) );
+			$outer = $DB->simple_exec();
+		
+        	if ( $r = $DB->fetch_row( $outer ) )
+        	{
+        		if ( $r['sub_can_post'] != 1 )
+        		{
+        			$DB->do_update( 'topic_mmod', array( 'topic_move' => 0 ), "mm_id=".$this->mm_id );
+        		}
+        		else
+        		{
+        			if ( $r['id'] != $this->forum['id'] )
+        			{
+        				$this->modfunc->topic_move( $this->tids, $this->forum['id'], $r['id'], $this->mm_data['topic_move_link'] );
+        			
+        				$this->modfunc->forum_recount( $r['id'] );
+        			}
+        		}
+        	}
+        	else
+        	{
+        		$DB->do_update( 'topic_mmod', array( 'topic_move' => 0 ), "mm_id=".$this->mm_id );
+        	}
+        }
+        
+        //-----------------------------------------
+        // Recount root forum
+        //-----------------------------------------
+        
+        $this->modfunc->forum_recount( $this->forum['id'] );
+        
+        $this->moderate_log("Applied multi-mod '{$this->mm_data['mm_title']}' on forum {$this->forum['name']}");
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Alter the topics, yay!
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_alter_topics($mod_action="", $sql="")
+	{
+		global $std, $ibforums, $DB, $print;
+
+		if ( ! $mod_action )
+		{
+			$this->moderate_error();
+			return;
+		}
+	
+		$pass = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$pass = 1;
+		}
+		else if ($this->moderator[$mod_action] == 1)
+		{
+			$pass = 1;
+		}
+		else
+		{
+			$pass = 0;
+		}
+		
+		if ($pass == 0)
+		{
+			$this->moderate_error();
+			return;
+		}
+		
+		if ( $mod_action != 'delete_topic' )
+		{
+			$DB->simple_exec_query( array( 'update' => 'topics', 'set' => $sql, 'where' => "tid IN(".implode(",",$this->tids).")" ) );
+			
+			$this->moderate_log("Altered topics ($sql) (".implode(",",$this->tids).")");
+			
+		}
+		else
+		{
+			if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
+			{
+				//-----------------------------------------
+				// Move, don't delete
+				//-----------------------------------------
+				
+				$this->modfunc->topic_move($this->tids, $this->forum['id'], $this->trash_forum);
+				$this->modfunc->forum_recount($this->trash_forum);
+				$this->moderate_log("Applied trash can for delete topic");
+			}
+			else
+			{
+				$this->modfunc->topic_delete($this->tids);
+				$this->moderate_log("Deleted topics (IDs: ".implode(",",$this->tids).")");
+			}
+		}
+		
+		if ( $mod_action == 'delete_topic' or $mod_action == 'topic_q' and $this->forum['id'] )
+		{
+			$this->modfunc->forum_recount( $this->forum['id'] );
+			$this->modfunc->stats_recount();
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// TOPIC HISTORY:
+	/*-------------------------------------------------------------------------*/
+	
+	function topic_history()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_access_cp'] == 1) {
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$tid = intval($ibforums->input['t']);
+		
+		//-----------------------------------------
+		// Get all info for this topic-y-poos
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.intval($tid) ) );
+		$DB->simple_exec();
+		
+		$topic = $DB->fetch_row();
+		
+		if ($topic['last_post'] == $topic['start_date'])
+		{
+			$avg_posts = 1;
+		}
+		else
+		{
+			$avg_posts = round( ($topic['posts'] + 1) / ((( $topic['last_post'] - $topic['start_date']) / 86400)), 1);
+		}
+		
+		if ($avg_posts < 0)
+		{
+			$avg_posts = 1;
+		}
+		
+		if ($avg_posts > ( $topic['posts'] + 1) )
+		{
+			$avg_posts = $topic['posts'] + 1;
+		}
+		
+		$data = array( 
+					   'th_topic'      => $topic['title'],
+					   'th_desc'       => $topic['description'],
+					   'th_start_date' => $std->get_date($topic['start_date'], 'LONG'),
+					   'th_start_name' => $std->make_profile_link($topic['starter_name'], $topic['starter_id'] ),
+					   'th_last_date'  => $std->get_date($topic['last_post'], 'LONG'),
+	    		 	   'th_last_name'  => $std->make_profile_link($topic['last_poster_name'], $topic['last_poster_id'] ),
+					   'th_avg_post'   => $avg_posts,
+					 );
+					 
+		$this->output .= $this->html->topic_history($data);
+		
+		$this->output .= $this->html->mod_log_start();
+		
+		// Do we have any logs in the mod-logs DB about this topic? eh? well?
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'moderator_logs',
+									  'where'  => 'topic_id='.intval($tid),
+									  'order'  => 'ctime DESC' ) );
+		$DB->simple_exec();
+		
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$this->output .= $this->html->mod_log_none();
+		}
+		else
+		{
+			while ($row = $DB->fetch_row())
+			{
+				$row['member'] = $std->make_profile_link($row['member_name'], $row['member_id'] );
+				$row['date']   = $std->get_date($row['ctime'], 'LONG');
+				$this->output .= $this->html->mod_log_row($row);
+			}
+		}
+		
+		$this->output .= $this->html->mod_log_end();
+		
+		$this->page_title = $this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MERGE TOPICS:
+	/*-------------------------------------------------------------------------*/
+	
+	function merge_start()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1) {
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['split_merge'] == 1) {
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		
+		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '61' ),
+												       2 => array( 't' , $this->topic['tid'] ),
+												       3 => array( 'f' , $this->forum['id']  ),
+		 								      )      );
+		 								      
+		$this->output .= $this->html->table_top( $ibforums->lang['mt_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		
+		$this->output .= $this->html->mod_exp( $ibforums->lang['mt_explain'] );
+		
+		$this->output .= $this->html->merge_body( $this->topic['title'], $this->topic['description'] );	
+        		
+		$this->output .= $this->html->end_form( $ibforums->lang['mt_submit'] );
+		
+		$this->page_title = $ibforums->lang['mt_top']." ".$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Merge complete
+	/*-------------------------------------------------------------------------*/
+	
+	function merge_complete()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['split_merge'] == 1)
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Check the input
+		//-----------------------------------------
+		
+		if ($ibforums->input['topic_url'] == "" or $ibforums->input['title'] == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+		}
+		
+		//-----------------------------------------
+		// Get the topic ID of the entered URL
+		//-----------------------------------------
+		
+		preg_match( "/(\?|&amp;)(t|showtopic)=(\d+)($|&amp;)/", $ibforums->input['topic_url'], $match );
+		
+		$old_id = intval(trim($match[3]));
+		
+		if ($old_id == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'mt_no_topic' ) );
+		}
+		
+		//-----------------------------------------
+		// Get the topic from the DB
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'tid, title, forum_id, last_post, last_poster_id, last_poster_name, posts, views', 'from' => 'topics', 'where' => 'tid='.intval($old_id) ) );
+		$DB->simple_exec();
+		
+		if ( ! $old_topic = $DB->fetch_row() )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'mt_no_topic' ) );
+		}
+		
+		//-----------------------------------------
+		// Did we try and merge the same topic?
+		//-----------------------------------------
+		
+		if ($old_id == $this->topic['tid'])
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'mt_same_topic' ) );
+		}
+		
+		//-----------------------------------------
+		// Do we have moderator permissions for this
+		// topic (ie: in the forum the topic is in)
+		//-----------------------------------------
+		
+		$pass = FALSE;
+		
+		if ( $this->topic['forum_id'] == $old_topic['forum_id'] )
+		{
+			$pass = TRUE;
+		}
+		else
+		{
+			if ( $ibforums->member['g_is_supmod'] == 1 )
+			{
+				$pass = TRUE;
+			}
+			else
+			{
+				$DB->simple_construct( array( 'select' => 'mid',
+											  'from'   => 'moderators',
+											  'where'  => "forum_id=".$old_topic['forum_id']." AND (member_id='".$ibforums->member['id']."' OR (is_group=1 AND group_id='".$ibforums->member['mgroup']."'))" ) );
+											  
+				$DB->simple_exec();
+				
+				if ( $DB->get_num_rows() )
+				{
+					$pass = TRUE;
+				}
+			}
+		}
+		
+		if ( $pass == FALSE )
+		{
+			// No, we don't have permission
+			
+			$this->moderate_error();
+		}
+		
+		//-----------------------------------------
+		// Update the posts, remove old polls, subs and topic
+		//-----------------------------------------
+		
+		$DB->do_update( 'posts', array( 'topic_id' => $this->topic['tid'] ), 'topic_id='.$old_topic['tid'] );
+		
+		$DB->simple_exec_query( array( 'delete' => 'polls', 'where' => "tid=".$old_topic['tid'] ) );
+		
+		$DB->simple_exec_query( array( 'delete' => 'voters', 'where' => "tid=".$old_topic['tid'] ) );
+		
+		$DB->simple_exec_query( array( 'delete' => 'tracker', 'where' => "topic_id=".$old_topic['tid'] ) );
+		
+		$DB->simple_exec_query( array( 'delete' => 'topics', 'where' => "tid=".$old_topic['tid'] ) );
+		
+		//-----------------------------------------
+		// Update the newly merged topic
+		//-----------------------------------------
+		
+		$updater = array(  'title'       => $ibforums->input['title'],
+						   'description' => $ibforums->input['desc']
+						);
+						
+		if ($old_topic['last_post'] > $this->topic['last_post'])
+		{
+			$updater['last_post']        = $old_topic['last_post'];
+			$updater['last_poster_name'] = $old_topic['last_poster_name'];
+			$updater['last_poster_id']   = $old_topic['last_poster_id'];
+		}
+		
+		// We need to now count the original post, which isn't in the "posts" field 'cos it was a new topic
+		
+		$old_topic['posts']++;
+		
+		$str = $DB->compile_db_update_string($updater);
+		
+		$DB->simple_exec_query( array( 'update' => 'topics', 'set' => "$str,views=views+{$old_topic['views']}", 'where' => 'tid='.$this->topic['tid'] ) );
+		
+		//-----------------------------------------
+		// Fix up the "new_topic" attribute.
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'pid, author_name, author_id, post_date',
+									  'from'   => 'posts',
+									  'where'  => "topic_id=".$this->topic['tid'],
+									  'order'  => 'post_date ASC',
+									  'limit'  => array( 0,1 ) ) );
+		
+		$DB->simple_exec();
+		
+		if ( $first_post = $DB->fetch_row() )
+		{
+			$DB->do_update( 'posts', array( 'new_topic' => 0 ), "topic_id={$this->topic['tid']}" );
+			$DB->do_update( 'posts', array( 'new_topic' => 1 ), "pid={$first_post['pid']}" );
+		}
+		
+		//-----------------------------------------
+		// Reset the post count for this topic
+		//-----------------------------------------
+		
+		$amode = $first_post['author_id'] ? 1 : 0;
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(*) as posts',
+									  'from'   => 'posts',
+									  'where'  => "queued <> 1 AND topic_id=".$this->topic['tid'] ) );
+		
+		$DB->simple_exec();
+		
+		if ( $post_count = $DB->fetch_row() )
+		{
+			$post_count['posts']--; //Remove first post
+			
+			$DB->do_update( 'topics', array( 'posts'         => $post_count['posts'],
+											 'starter_name' => $first_post['author_name'],
+					   						 'starter_id'   => $first_post['author_id'],
+					   						 'start_date'   => $first_post['post_date'],
+					   						 'author_mode'   => $amode
+					   	  ) , 'tid='.$this->topic['tid'] );
+		}
+		
+		//-----------------------------------------
+		// Update the forum(s)
+		//-----------------------------------------
+		
+		$this->recount($this->topic['forum_id']);
+		
+		if ($this->topic['forum_id'] != $old_topic['forum_id'])
+		{
+			$this->recount($old_topic['forum_id']);
+		}
+		
+		$this->moderate_log("Merged topic '{$old_topic['title']}' with '{$this->topic['title']}'");
+		
+		$print->redirect_screen( $ibforums->lang['mt_redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// UNSUBSCRIBE ALL FORM:
+	/*-------------------------------------------------------------------------*/
+	
+	function unsubscribe_all_form()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$DB->simple_construct( array( 'select' => 'COUNT(trid) as subbed', 'from' => 'tracker', 'where' => "topic_id=".$this->topic['tid'] ) );
+		$DB->simple_exec();
+		
+		$tracker = $DB->fetch_row();
+		
+        if ( $tracker['subbed'] < 1 )
+        {
+        	$text = $ibforums->lang['ts_none'];
+        }
+        else
+        {
+        	$text = sprintf($ibforums->lang['ts_count'], $tracker['subbed']);
+        }
+		
+		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '31' ),
+												       2 => array( 't' , $this->topic['tid'] ),
+												       3 => array( 'f' , $this->forum['id']  ),
+		 								      )      );
+		 								      
+		$this->output .= $this->html->table_top( $ibforums->lang['ts_title']." &gt; ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		
+		$this->output .= $this->html->mod_exp( $text );		
+        		
+		$this->output .= $this->html->end_form( $ibforums->lang['ts_submit'] );
+		
+		$this->page_title = $ibforums->lang['ts_title']." &gt; ".$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Unsub all
+	/*-------------------------------------------------------------------------*/
+	
+	function unsubscribe_all()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		// Delete the subbies based on this topic ID
+		
+		$DB->simple_exec_query( array( 'delete' => 'tracker', 'where' => "topic_id=".$this->topic['tid'] ) );
+		
+		$print->redirect_screen( $ibforums->lang['ts_redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// EDIT POLL FORM:
+	/*-------------------------------------------------------------------------*/
+	
+	function poll_delete_form()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['delete_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'polls', 'where' => "tid=".$this->topic['tid'] ) );
+		$DB->simple_exec();
+		
+        $poll_data = $DB->fetch_row();
+        
+        if (! $poll_data['pid'])
+        {
+        	$this->moderate_error();
+        }
+		
+		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '23' ),
+												       2 => array( 't' , $this->topic['tid'] ),
+												       3 => array( 'f' , $this->forum['id']  ),
+		 								      )      );
+		 								      
+		$this->output .= $this->html->table_top( $ibforums->lang['pd_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		
+		$this->output .= $this->html->mod_exp( $ibforums->lang['pd_text'] );		
+        		
+		$this->output .= $this->html->end_form( $ibforums->lang['pd_submit'] );
+		
+		$this->page_title = $ibforums->lang['pd_top'].$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Do delete poll
+	/*-------------------------------------------------------------------------*/
+	
+	function poll_delete_do()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1) {
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['delete_topic'] == 1) {
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$DB->simple_exec_query( array( 'delete' => 'polls', 'where' => "tid=".$this->topic['tid'] ) );
+		
+		$DB->simple_exec_query( array( 'delete' => 'voters', 'where' => "tid=".$this->topic['tid'] ) );
+		
+		$DB->do_update( 'topics', array( 'poll_state' => '', 'last_vote' => '', 'total_votes' => '' ), 'tid='.$this->topic['tid'] );
+		
+		// Boing!
+		
+		$print->redirect_screen( $ibforums->lang['pd_redirect'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Poll edit
+	/*-------------------------------------------------------------------------*/
+	
+	function poll_edit_do()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['edit_post'] == 1)
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'polls', 'where' => "tid=".$this->topic['tid'] ) );
+		$DB->simple_exec();
+		
+        $poll_data = $DB->fetch_row();
+        
+        if (! $poll_data['pid'])
+        {
+        	$this->moderate_error();
+        }
+        
+        $poll_answers = unserialize(stripslashes($poll_data['choices']));
+        
+		reset($poll_answers);
+		
+		$new_poll_array = array();
+		$ids            = array();
+		$rearranged     = array();
+		
+		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^POLL_(\d+)$/", $key, $match ) )
+ 			{
+ 				if (isset($ibforums->input[$match[0]]))
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		
+ 		foreach ($poll_answers as $entry)
+		{
+			$rearranged[ $entry[0] ] = array( $entry[0], $entry[1], $entry[2]);
+		}
+ 		
+ 		//-----------------------------------------
+ 		
+ 		$total_votes = 0;
+ 		
+ 		foreach( $ids as $nid )
+ 		{
+ 			//-----------------------------------------
+ 			// Is it a current poll thingy?
+ 			//-----------------------------------------
+ 		
+ 			if ( strlen($rearranged[ $nid ][1]) > 0 )
+ 			{
+ 				$new_poll_array[] = array( $rearranged[ $nid ][0], $ibforums->input['POLL_'.$nid], intval($ibforums->input['VOTES_'.$nid]) );
+ 				$total_votes += intval($ibforums->input['VOTES_'.$nid]);
+ 			}
+ 			else
+ 			{
+ 				if ( strlen($ibforums->input['POLL_'.$nid]) > 0 )
+ 				{
+ 					$new_poll_array[] = array( $nid, $ibforums->input['POLL_'.$nid], intval($ibforums->input['VOTES_'.$nid]) );
+ 					$total_votes += intval($ibforums->input['VOTES_'.$nid]);
+ 				}
+ 			}
+		}
+		
+		//-----------------------------------------
+		// Take care of any new ones...
+		//-----------------------------------------
+		
+		$poll_data['choices'] = addslashes(serialize($new_poll_array));
+		
+		$DB->do_update( 'polls', array( 'votes'         => $total_votes,
+										'choices'       => addslashes(serialize($new_poll_array)),
+										'poll_question' => $ibforums->input['poll_question'],
+									  ), 'tid='.$this->topic['tid']  );
+					 
+		// Update the topic table to change the poll_only value.
+		
+		$poll_state = $ibforums->input['pollonly'] == 1 ? 'closed' : 'open';
+		
+		$DB->do_update( 'topics', array( 'poll_state' => $poll_state ), 'tid='.$this->topic['tid'] );
+		
+		$this->moderate_log("Edited a Poll: Set total votes to $total_votes used to be {$poll_data['votes']}");
+	
+		$print->redirect_screen( $ibforums->lang['pe_done'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+    }
+    
+    
+    /*-------------------------------------------------------------------------*/
+	// Poll edit form
+	/*-------------------------------------------------------------------------*/
+	
+	function poll_edit_form()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$ibforums->vars['max_poll_choices'] = $ibforums->vars['max_poll_choices'] ? $ibforums->vars['max_poll_choices'] : 10;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['edit_post'] == 1)
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'polls', 'where' => "tid=".$this->topic['tid'] ) );
+		$DB->simple_exec();
+		
+        $poll_data = $DB->fetch_row();
+        
+        if (! $poll_data['pid'])
+        {
+        	$this->moderate_error();
+        }
+		
+		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '21' ),
+												       2 => array( 't' , $this->topic['tid'] ),
+												       3 => array( 'f' , $this->forum['id']  ),
+		 								      )      );
+		 								      
+		$this->output .= $this->html->table_top( $ibforums->lang['pe_top']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		
+		$this->output .= $this->html->poll_edit_top();
+		
+		$poll_answers = unserialize(stripslashes($poll_data['choices']));
+		
+		reset($poll_answers);
+		
+		foreach ($poll_answers as $entry)
+		{
+			$id     = $entry[0];
+			$choice = $entry[1];
+			$votes  = $entry[2];
+			
+			$this->output .= $this->html->poll_entry($id, $choice, $votes);
+			
+		}
+		
+		if ( count($poll_answers) < $ibforums->vars['max_poll_choices'] )
+		{
+			for ( $i = count($poll_answers) ; $i <= $ibforums->vars['max_poll_choices'] ; $i++ )
+			{
+				$this->output .= $this->html->poll_edit_new_entry($i);
+			}
+		}
+			
+        		
+        $this->output .= $this->html->poll_select_form($poll_data['poll_question']);		
+        		
+		$this->output .= $this->html->end_form( $ibforums->lang['pe_submit'] );
+		
+		$this->page_title = $ibforums->lang['pe_top'].$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MOVE FORM:
+	/*-------------------------------------------------------------------------*/
+	
+	function move_form()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1) {
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['move_topic'] == 1) {
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '14' ),
+												       2 => array( 'tid' , $this->topic['tid'] ),
+												       3 => array( 'sf'  , $this->forum['id']  ),
+		 								      )      );
+		 								      
+		$jump_html = $std->build_forum_jump(0,0,0);
+		 								
+		$this->output .= $this->html->table_top( $ibforums->lang['top_move']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		$this->output .= $this->html->mod_exp( $ibforums->lang['move_exp'] );
+		$this->output .= $this->html->move_form( $jump_html , $this->forum['name']);
+		$this->output .= $this->html->end_form( $ibforums->lang['submit_move'] );
+		
+		$this->page_title = $ibforums->lang['t_move'].": ".$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Complete move
+	/*-------------------------------------------------------------------------*/
+	
+	function do_move()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1) {
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['move_topic'] == 1) {
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		//-----------------------------------------
+		// Check for input..
+		//-----------------------------------------
+		
+		if ($ibforums->input['sf'] == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_source' ) );
+		}
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['move_id'] == "" or $ibforums->input['move_id'] == -1)
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
+		}
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['move_id'] == $ibforums->input['sf'])
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_same_forum' ) );
+		}
+		
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, sub_can_post, name, redirect_on', 'from' => 'forums', 'where' => "id IN(".$ibforums->input['sf'].",".$ibforums->input['move_id'].")" ) );
+		$DB->simple_exec();
+		
+		if ($DB->get_num_rows() != 2)
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
+		}
+		
+		$source = intval($ibforums->input['sf']);
+		$moveto = intval($ibforums->input['move_id']);
+		
+		$source_name = "";
+		$dest_name   = "";
+		
+		//-----------------------------------------
+		// Check for an attempt to move into a subwrap forum
+		//-----------------------------------------
+		
+		while ( $f = $DB->fetch_row() )
+		{
+			if ($f['id'] == $ibforums->input['sf'])
+			{
+				$source_name = $f['name'];
+			}
+			else
+			{
+				$dest_name = $f['name'];
+			}
+			
+			if ( ($f['sub_can_post'] != 1) OR $f['redirect_on'] == 1 )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'forum_no_post_allowed' ) );
+			}
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.intval($ibforums->input['tid']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $this->topic = $DB->fetch_row() )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_forum' ) );
+		}
+		
+		$ibforums->input['leave'] = $ibforums->input['leave'] == 'y' ? 1 : 0;
+		
+		$this->modfunc->topic_move($this->topic['tid'], $ibforums->input['sf'], $ibforums->input['move_id'], $ibforums->input['leave']);
+		
+		$ibforums->input['t'] = $this->topic['tid'];
+		
+		$this->moderate_log("Moved a topic from $source_name to $dest_name");
+		
+		// Resync the forums..
+		
+		$this->modfunc->forum_recount($source);
+		
+		$this->modfunc->forum_recount($moveto);
+	
+		$print->redirect_screen( $ibforums->lang['p_moved'], "act=SF&f=".$this->forum['id'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Delete post
+	/*-------------------------------------------------------------------------*/
+	
+	function delete_post()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		// Get this post id.
+		
+		$ibforums->input['p'] = intval($ibforums->input['p']);
+		
+		$DB->simple_construct( array( 'select' => 'pid, author_id, post_date, new_topic', 'from' => 'posts', 'where' => "topic_id={$this->topic['tid']} and pid={$ibforums->input['p']}" ) );
+		$DB->simple_exec();
+		
+		if ( ! $post = $DB->fetch_row() )
+		{
+			$this->moderate_error();
+		}
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ($this->moderator['delete_post'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ( ($ibforums->member['g_delete_own_posts'] == 1) and ( $ibforums->member['id'] == $post['author_id'] ) )
+		{
+			$passed = 1;
+		}
+		else 
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		//-----------------------------------------
+		// Check to make sure that this isn't the first post in the topic..
+		//-----------------------------------------
+		
+		if ($post['new_topic'] == 1)
+		{
+			$this->moderate_error('no_delete_post');
+		}
+		
+		if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
+		{
+			//-----------------------------------------
+			// Set up and pass to split topic handler
+			//-----------------------------------------
+			
+			$ibforums->input['checked'] = 1;
+			$ibforums->input['fid']     = $this->trash_forum;
+			$ibforums->input['title']   = "From: ".$this->topic['title'];
+			$ibforums->input['desc']    = "From Topic ID: ".$this->topic['tid'];
+			$ibforums->input[ 'post_'.$ibforums->input['p'] ] = 1;
+			
+			$this->trash_inuse = 1;
+			
+			$this->multi_split_topic();
+			
+			$this->trash_inuse = 0;
+		}
+		else
+		{
+			$this->modfunc->post_delete( $ibforums->input['p'] );
+			$this->modfunc->forum_recount( $this->forum['id'] );
+		}
+		
+		$print->redirect_screen( $ibforums->lang['post_deleted'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// DELETE TOPIC:
+	/*-------------------------------------------------------------------------*/
+	
+	function delete_form()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['delete_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->topic['starter_id'] == $ibforums->member['id'])
+		{
+			if ($ibforums->member['g_delete_own_topics'] == 1)
+			{
+				$passed = 1;
+			}
+		}
+		
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$this->output = $this->html->delete_js();
+		
+		$this->output .= $this->html_start_form( array( 1 => array( 'CODE', '08' ),
+												        2 => array( 't', $this->topic['tid'] )
+		 								       )      );
+		 								
+		$this->output .= $this->html->table_top( $ibforums->lang['top_delete']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		$this->output .= $this->html->mod_exp( $ibforums->lang['delete_topic'] );
+		$this->output .= $this->html->end_form( $ibforums->lang['submit_delete'] );
+		
+		$this->page_title = $ibforums->lang['t_delete'].": ".$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Do delete topic
+	/*-------------------------------------------------------------------------*/
+	
+	function delete_topic()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ($this->moderator['delete_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		else if ($this->topic['starter_id'] == $ibforums->member['id'])
+		{
+			if ($ibforums->member['g_delete_own_topics'] == 1)
+			{
+				$passed = 1;
+			}
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		// Do we have a linked topic to remove?
+		
+		$DB->simple_construct( array( 'select' => 'tid, forum_id', 'from' => 'topics', 'where' => "state='link' AND moved_to='".$this->topic['tid'].'&'.$this->forum['id']."'" ) );
+		$DB->simple_exec();
+		
+		if ( $linked_topic = $DB->fetch_row() )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'topics', 'where' => "tid=".$linked_topic['tid'] ) );
+			
+			$this->modfunc->forum_recount($linked_topic['forum_id']);
+		}
+		
+		if ( $this->trash_forum and $this->trash_forum != $this->forum['id'] )
+		{
+			//-----------------------------------------
+			// Move, don't delete
+			//-----------------------------------------
+			
+			$this->modfunc->topic_move($this->topic['tid'], $this->forum['id'], $this->trash_forum);
+			$this->modfunc->forum_recount($this->forum['id']);
+			$this->modfunc->forum_recount($this->trash_forum);
+			
+			$this->moderate_log("Applied trash can for delete topic");
+		}
+		else
+		{
+			$this->modfunc->topic_delete($this->topic['tid']);
+			$this->moderate_log("Deleted a topic");
+		}
+	
+		$print->redirect_screen( $ibforums->lang['p_deleted'], "act=SF&f=".$this->forum['id'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// EDIT TOPIC:
+	/*-------------------------------------------------------------------------*/
+	
+	function edit_form()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['edit_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		$this->output = $this->html_start_form( array( 1 => array( 'CODE', '12' ),
+												       2 => array( 't', $this->topic['tid'] )
+		 								      )      );
+		 								
+		$this->output .= $this->html->table_top( $ibforums->lang['top_edit']." ".$this->forum['name']." &gt; ".$this->topic['title'] );
+		$this->output .= $this->html->mod_exp( $ibforums->lang['edit_topic'] );
+		$this->output .= $this->html->topictitle_fields( $this->topic['title'], $this->topic['description'] );
+		$this->output .= $this->html->end_form( $ibforums->lang['submit_edit'] );
+		
+		$this->page_title = $ibforums->lang['t_edit'].": ".$this->topic['title'];
+		
+		$this->nav = array ( "<a href='{$this->base_url}&act=SF&f={$this->forum['id']}'>{$this->forum['name']}</a>",
+							 "<a href='{$this->base_url}&act=ST&f={$this->forum['id']}&t={$this->topic['tid']}'>{$this->topic['title']}</a>"
+						   );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// DO edit
+	/*-------------------------------------------------------------------------*/
+	
+	function do_edit()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['edit_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		if (empty($this->topic['tid']))
+		{
+			$this->moderate_error();
+		}
+		
+		if ( trim($ibforums->input['TopicTitle']) == "")
+		{
+			$std->Error( array( 'LEVEL' => 2, 'MSG' => 'no_topic_title' ) );
+		}
+		
+		$topic_title = preg_replace( "/'/", "/\\'/", $ibforums->input['TopicTitle'] );
+		$topic_desc  = preg_replace( "/'/", "/\\'/", $ibforums->input['TopicDesc']  );
+		
+		$DB->do_update( 'topics', array( 'title' => $topic_title, 'description' => $topic_desc ), 'tid='.$this->topic['tid'] );
+										 
+		if ($this->topic['tid'] == $this->forum['last_id'])
+		{
+			$DB->do_update( 'forums', array( 'last_title' => $topic_title ), 'id='.$this->forum['id'] );
+		}
+		
+		$std->update_forum_cache();
+		
+		$this->moderate_log("Moderator edited a topic title: (ID: {$this->topic['tid']}) From '{$this->topic['title']}' to '$topic_title'");
+	
+		$print->redirect_screen( $ibforums->lang['p_edited'], "act=SF&f=".$this->forum['id'] );
+	}
+		
+	/*-------------------------------------------------------------------------*/
+	// OPEN TOPIC:
+	/*-------------------------------------------------------------------------*/
+	
+	function open_topic()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		if ($this->topic['state'] == 'open')
+		{
+			$this->moderate_error();
+		}
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->topic['starter_id'] == $ibforums->member['id'])
+		{
+			if ($ibforums->member['g_open_close_posts'] == 1)
+			{
+				$passed = 1;
+			}
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($this->moderator['open_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		$this->modfunc->topic_open($this->topic['tid']);
+		
+		$this->moderate_log("Opened Topic");
+	
+		$print->redirect_screen( $ibforums->lang['p_opened'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// CLOSE TOPIC:
+	/*-------------------------------------------------------------------------*/
+	
+	function close_topic()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->topic['starter_id'] == $ibforums->member['id'])
+		{
+			if ($ibforums->member['g_open_close_posts'] == 1)
+			{
+				$passed = 1;
+			}
+		}
+		else
+		{
+			$passed = 0;
+		}
+		
+		if ($this->moderator['close_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		$this->modfunc->topic_close($this->topic['tid']);
+		
+		$this->moderate_log("Locked Topic");
+	
+		$print->redirect_screen( $ibforums->lang['p_closed'], "act=SF&f=".$this->forum['id'] );
+	}
+
+	/*-------------------------------------------------------------------------*/
+	// PIN TOPIC:
+	/*-------------------------------------------------------------------------*/
+	
+	function pin_topic()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		if ($this->topic['PIN_STATE'] == 1)
+		{
+			$this->moderate_error();
+		}
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['pin_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		$this->modfunc->topic_pin($this->topic['tid']);
+		
+		$this->moderate_log("Pinned Topic");
+	
+		$print->redirect_screen( $ibforums->lang['p_pinned'], "showtopic=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// UNPIN TOPIC:
+	/*-------------------------------------------------------------------------*/
+	
+	function unpin_topic()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		if ($this->topic['pinned'] == 0)
+		{
+			$this->moderate_error();
+		}
+		
+		$passed = 0;
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$passed = 1;
+		}
+		
+		else if ($this->moderator['unpin_topic'] == 1)
+		{
+			$passed = 1;
+		}
+		else {
+			$passed = 0;
+		}
+		
+		if ($passed != 1) $this->moderate_error();
+		
+		$this->modfunc->topic_unpin($this->topic['tid']);
+		
+		$this->moderate_log("Unpinned Topic");
+	
+		$print->redirect_screen( $ibforums->lang['p_unpinned'], "act=ST&f=".$this->forum['id']."&t=".$this->topic['tid']."&st=".$ibforums->input['st'] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// GET TOPIC IDS
+	/*-------------------------------------------------------------------------*/
+	
+	function get_tids()
+	{
+		global $std, $ibforums, $DB;
+		
+		$ids = array();
+ 		
+ 		$ids = explode( ',', $ibforums->input['selectedtids'] );
+ 		
+ 		if ( count($ids) < 1 )
+ 		{
+ 			$this->moderate_error('cp_err_no_topics');
+ 			return;
+ 		}
+ 		
+ 		return $ids;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get Pids
+	/*-------------------------------------------------------------------------*/
+	
+	function get_pids()
+	{
+		global $std, $ibforums, $DB;
+		
+		$ids = array();
+ 		
+ 		$ids = explode( ',', $ibforums->input['selectedpids'] );
+ 		
+ 		if ( count($ids) < 1 )
+ 		{
+ 			$this->moderate_error('cp_err_no_topics');
+ 			return;
+ 		}
+ 		
+ 		return $ids;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MODERATE ERROR:
+	/*-------------------------------------------------------------------------*/
+	
+	function moderate_error($msg = 'moderate_no_permission')
+	{
+		global $std;
+		
+		$std->Error( array( 'LEVEL' => 2, 'MSG' => $msg ) );
+		
+		// Make sure we exit..
+		
+		exit();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MODERATE LOG:
+	/*-------------------------------------------------------------------------*/
+	
+	function moderate_log($title = 'unknown')
+	{
+		global $std, $ibforums, $DB, $HTTP_REFERER, $QUERY_STRING;
+		
+		$this->modfunc->add_moderate_log( $ibforums->input['f'], $ibforums->input['t'], $ibforums->input['p'], $this->topic['title'], $title );
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// Re Count topics for the forums:
+	/*-------------------------------------------------------------------------*/
+	
+	function recount($fid="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ($fid == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'move_no_source' ) );
+		}
+		
+		$this->modfunc->forum_recount( $fid );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: start form.
+	/*-------------------------------------------------------------------------*/
+	
+	function html_start_form($additional_tags=array())
+	{
+		global $ibforums, $std;
+		
+		$form = "<form action='{$this->base_url}' method='POST' name='REPLIER'>".
+				"<input type='hidden' name='st' value='".$ibforums->input['st']."' />".
+				"<input type='hidden' name='act' value='mod' />".
+				"<input type='hidden' name='s' value='".$ibforums->session_id."' />".
+				"<input type='hidden' name='f' value='".$this->forum['id']."' />".
+				"<input type='hidden' name='selectedpids' value='".$ibforums->input['selectedpids']."' />".
+				"<input type='hidden' name='auth_key' value='".$std->return_md5_check()."' />";
+				
+		// Any other tags to add?
+		
+		if ( count( $additional_tags ) )
+		{
+			foreach( $additional_tags as $k => $v )
+			{
+				$form .= "\n<input type='hidden' name='{$v[0]}' value='{$v[1]}'>";
+			}
+		}
+		
+		return $form;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	// Faster Pussycat, Kill, Kill!
+	/*-------------------------------------------------------------------------*/
+	
+	function bash_uploaded_photos($id)
+	{
+		global $ibforums, $DB, $std, $print;
+		
+		foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
+		{
+			if ( @file_exists( $ibforums->vars['upload_dir']."/photo-".$id.".".$ext ) )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/photo-".$id.".".$ext );
+			}
+		}
+	}
+	
+	function bash_uploaded_avatars($id)
+	{
+		global $ibforums, $DB, $std, $print;
+		
+		foreach( array( 'swf', 'jpg', 'jpeg', 'gif', 'png' ) as $ext )
+		{
+			if ( @file_exists( $ibforums->vars['upload_dir']."/av-".$id.".".$ext ) )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/av-".$id.".".$ext );
+			}
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Online.php b/upload/sources/online.php
similarity index 62%
rename from upload/sources/Online.php
rename to upload/sources/online.php
index 254a2e74..afd09947 100644
--- a/upload/sources/Online.php
+++ b/upload/sources/online.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,13 +19,20 @@
 |   > Date started: 12th March 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
 
-$idx = new Online;
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-class Online {
+class online
+{
 
     var $output     = "";
     var $page_title = "";
@@ -42,12 +48,17 @@ class Online {
     
     var $seen_name  = array();
     
-    
-    
-    function Online() {
-    	global $ibforums, $DB, $std, $print;
+    /*-------------------------------------------------------------------------*/
+	// AUTO RUN
+	/*-------------------------------------------------------------------------*/
+
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
     	
+    	//-----------------------------------------
     	// Are we allowed to see the online list?
+    	//-----------------------------------------
     	
     	$ibforums->input['st'] = intval($ibforums->input['st']);
     	
@@ -56,12 +67,9 @@ class Online {
     		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission') );
     	}
     	
-    	
-    	if ($ibforums->input['CODE'] == "") $ibforums->input['CODE'] = 'listall';
-    	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Require the HTML and language modules
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
 		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_online', $ibforums->lang_id);
     	
@@ -69,23 +77,26 @@ class Online {
     	
     	$this->base_url        = $ibforums->base_url;
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Build up our language hash
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
-    	foreach ($ibforums->lang as $k => $v) {
-    		if ( preg_match( "/^WHERE_(\w+)$/", $k, $match ) ) {
+    	foreach ($ibforums->lang as $k => $v)
+    	{
+    		if ( preg_match( "/^WHERE_(\w+)$/", $k, $match ) )
+    		{
     			$this->where[ $match[1] ] = $ibforums->lang[$k];
     		}
     	}
     	
     	unset($match);
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// What to do?
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
-    	switch($ibforums->input['CODE']) {
+    	switch($ibforums->input['CODE'])
+    	{
     		case 'listall':
     			$this->list_all();
     			break;
@@ -97,29 +108,26 @@ class Online {
     			break;
     	}
     	
+    	//-----------------------------------------
     	// If we have any HTML to print, do so...
+    	//-----------------------------------------
     	
     	$print->add_output("$this->output");
         $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
-    		
  	}
  	
  	
-	/*****************************************************/
+	/*-------------------------------------------------------------------------*/
 	// list_all
 	// ------------------
 	// List all online users
-	/*****************************************************/
+	/*-------------------------------------------------------------------------*/
 	
-	function list_all() {
-		global $ibforums, $DB, $std;
+	function list_all()
+	{
+		global $ibforums, $DB, $std, $forums;
 		
-		$this->first = 0;
-		
-		if (!empty($ibforums->input['st']))
-		{
-			$this->first = $ibforums->input['st'];
-		}
+		$this->first   = intval($ibforums->input['st']);
 		
 		$show_mem      = array( 'reg', 'guest', 'all' );
 		$sort_order    = array( 'desc', 'asc' );
@@ -172,35 +180,13 @@ class Online {
 			$sort_key_html .= $oo.'value="'.$k.'"'.$s.'>'.$ibforums->lang['s_sort_key_'.$k].$oc;
 		}
 		
-		$last_cat_id = -1;
-		
-		$DB->query("SELECT f.id, f.name, f.read_perms, f.password, c.id as cat_id, c.name as cat_name from ibf_forums f, ibf_categories c where c.id=f.category ORDER BY c.position, f.position");
-		
-		
-		while ( $i = $DB->fetch_row() )
+		if ($ibforums->vars['au_cutoff'] == "")
 		{
-			if ($last_cat_id != $i['cat_id'])
-			{
-				// Print the category
-				
-				$last_cat_id = $i['cat_id'];
-				
-				$this->cats[ $i['cat_id'] ] = $this->cats['cat_name'];
-				
-			}
-			
-			$this->forums[ $i['id'] ] = array( 'name'         => $i['name'],
-											   'read_perms'   => $i['read_perms'],
-											   'password'     => $i['password'],
-											 );
-			
+			$ibforums->vars['au_cutoff'] = 15;
 		}
-		
-		$DB->free_result();
-		
-		$cut_off = ($ibforums->vars['au_cutoff'] != "") ? $ibforums->vars['au_cutoff'] * 60 : 900;
 			
-		$t_time = time() - $cut_off;
+		$cut_off = $ibforums->vars['au_cutoff'] * 60;
+		$t_time  = time() - $cut_off;
 		
 		$db_order = $sort_order_value == 'asc' ? 'asc' : 'desc';
 		$db_key   = $sort_key_value   == 'click' ? 'running_time' : 'member_name';
@@ -208,7 +194,7 @@ class Online {
 		switch ($show_mem_value)
 		{
 			case 'reg':
-				$db_mem = " AND (s.member_group <> {$ibforums->vars['guest_group']} OR s.id LIKE '%session' ) ";
+				$db_mem = " AND s.member_group <> {$ibforums->vars['guest_group']}";
 				break;
 			case 'guest':
 				$db_mem = " AND s.member_group = {$ibforums->vars['guest_group']} ";
@@ -218,17 +204,14 @@ class Online {
 				break;
 		}
 		
-		$DB->query("SELECT COUNT(id) as total_sessions FROM ibf_sessions s WHERE login_type <> 1 AND running_time > $t_time".$db_mem);
-		$max = $DB->fetch_row();
-		
-		$DB->free_result();
+		$max   = $DB->simple_exec_query( array( 'select' => 'COUNT(*) as total_sessions', 'from' => 'sessions s', 'where' => "running_time > $t_time".$db_mem ) );
 		
 		$links = $std->build_pagelinks(  array( 'TOTAL_POSS'  => $max['total_sessions'],
 												'PER_PAGE'    => 25,
 												'CUR_ST_VAL'  => $this->first,
 												'L_SINGLE'     => "",
 												'L_MULTI'      => $ibforums->lang['pages'],
-												'BASE_URL'     => $this->base_url."&amp;act=Online&amp;CODE=listall&amp;sort_key=$sort_key_value&amp;sort_order=$sort_order_value&amp;show_mem=$show_mem_value"
+												'BASE_URL'     => $this->base_url."act=Online&amp;CODE=listall&amp;sort_key=$sort_key_value&amp;sort_order=$sort_order_value&amp;show_mem=$show_mem_value"
 											  )
 									   );
 									   
@@ -238,21 +221,27 @@ class Online {
 		
 		$final      = array();
 		$tid_array  = array();
-		
 		$topics     = array();
 		
-		$DB->query("SELECT s.id, s.in_forum, s.in_topic, s.member_name, s.member_id, s.ip_address, s.running_time, s.location,
-						   s.login_type, s.member_group, g.prefix, g.suffix
-				    FROM ibf_sessions s, ibf_groups g
-				    WHERE s.running_time > $t_time AND s.member_group=g.g_id $db_mem ORDER BY $db_key $db_order LIMIT ".$this->first.",25");
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'sessions s',
+									  'where'  => "s.running_time > $t_time $db_mem",
+									  'order'  => "$db_key $db_order",
+									  'limit'  => array( $this->first, 25 )
+							)       );
+							
+		$DB->simple_exec();
 		
 		while( $r = $DB->fetch_row() )
 		{
+			$r['prefix'] = $ibforums->cache['group_cache'][ $r['member_group'] ]['prefix'];
+			$r['suffix'] = $ibforums->cache['group_cache'][ $r['member_group'] ]['suffix'];
+			
 			$final[] = $r;
 			
 			if ($r['in_topic'] != "")
 			{
-				$tid_array[] = $r['in_topic'];
+				$tid_array[ $r['in_topic'] ] = $r['in_topic'];
 			}
 		}
 		
@@ -260,24 +249,23 @@ class Online {
 		{
 			$tid_string = implode( ",", $tid_array );
 			
-			$DB->query("SELECT tid, title FROM ibf_topics WHERE tid IN ($tid_string)");
-			
+			$DB->simple_construct( array( 'select' => 'tid, title', 'from' => 'topics', 'where' => "tid IN ($tid_string)" ) );
+			$DB->simple_exec();
+		
 			while ( $t = $DB->fetch_row() )
 			{
 				$topics[ $t['tid'] ] = $t['title'];
 			}
 		}
 		
-		
 		foreach( $final as $idx => $sess )
 		{
-		
-			//----------------------------------------------------
+			//-----------------------------------------
 			// Is this a member, and have we seen them before?
 			// Proxy servers, etc can confuse the session handler,
 			// creating duplicate session IDs for the same user when
 			// their IP address changes.
-			//----------------------------------------------------
+			//-----------------------------------------
 			
 			$inv    = '';
 			
@@ -293,7 +281,9 @@ class Online {
 					}
 					else
 					{
-						continue;
+						$sess['member_id']   = '';
+						$sess['member_name'] = '';
+						$sess['in_error']    = 1;
 					}
 				}
 			}
@@ -305,15 +295,17 @@ class Online {
 				}
 				else
 				{
-					continue;
+					$sess['member_id']   = '';
+					$sess['member_name'] = '';
+					$sess['in_error']    = 1;
 				}
 			}
 			
-			//----------------------------------------------------
+			//-----------------------------------------
 			// ICheck for dupes
-			//----------------------------------------------------
+			//-----------------------------------------
 			
-			 if (! empty($sess['member_name']) )
+			 if ( ! empty($sess['member_name']) )
 			 {
 				 if (isset($this->seen_name[ $sess['member_name'] ]) )
 				 {
@@ -325,70 +317,44 @@ class Online {
 				 }
 			 }
 			
-			//----------------------------------------------------
+			//-----------------------------------------
 			// Figure out location
-			//----------------------------------------------------
+			//-----------------------------------------
 			
-			if (isset($sess['location']))
+			if ( $sess['in_error'] )
+			{
+				$line = " {$ibforums->lang['board_index']}";
+			}
+			else if (isset($sess['location']))
 			{
-			
 				$line = "";
 				
 				list($act, $pid) = explode( ",", $sess['location'] );
+				
 				$fid = $sess['in_forum'];
 				$tid = $sess['in_topic'];
+				$act = strtolower($act);
 				
 				if (isset($act))
 				{
 					$line = isset($this->where[ $act ]) ? $this->where[ $act ] : $ibforums->lang['board_index'];
-				
-				}
-				
-				
-				if ($fid != "" and ($act == 'SF' or $act == 'ST' or $act == 'Post'))
+ 				}
+ 				
+				if ($fid != "" and ($act == 'sf' or $act == 'st' or $act == 'post'))
 				{
-					$pass = 0;
+					$deny = 1;
 					
-					if ( $std->check_perms($this->forums[ $fid ]['read_perms']) == TRUE)
-					{
-						$pass = 1;
-					}
+					$deny = $forums->forums_quick_check_access( $fid );
 					
-					if ($pass == 1)
+					if ($deny != 1)
 					{
-						// Check cookie (monster)
-						
-						if ($this->forums[ $fid ]['password'] != "")
+						if ( ($tid > 0) and ($act != 'post') )
 						{
-							if ( ! $c_pass = $std->my_getcookie('iBForum'.$fid) )
-							{
-								$pass = 0;
-							}
-						
-							if ( $c_pass == $this->forums[ $fid ]['password'] )
-							{
-								$pass = 1;
-							}
-							else
-							{
-								$pass = 0;
-							}
+							$line .= " <a href='{$this->base_url}showtopic=$tid'>{$topics[$tid]}</a>";
 						}
 						else
 						{
-							$pass = 1;
-						}
-					}
-					
-					if ($pass == 1)
-					{
-						if ( ($tid > 0) and ($act != 'Post') )
-						{
-							$line .= " <a href='{$this->base_url}&act=ST&f=$fid&t=$tid'>{$topics[$tid]}</a>";
-						}
-						else
-						{
-							$line .= " <a href='{$this->base_url}&act=SF&f=$fid'>{$this->forums[ $fid ]['name']}</a>";
+							$line .= " <a href='{$this->base_url}showforum=$fid'>{$forums->forum_by_id[ $fid ]['name']}</a>";
 						}
 					}
 					else
@@ -400,10 +366,9 @@ class Online {
 			}
 			else
 			{
-				$line .= " {$ibforums->lang['board_index']}";
+				$line = " {$ibforums->lang['board_index']}";
 			}
 			
-			
 			$sess['where_line'] = $line;
 			
 			if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_online_ip'] != 1) )
@@ -430,10 +395,14 @@ class Online {
 		
 		$this->page_title = $ibforums->lang['page_title'];
 		$this->nav        = array( $ibforums->lang['page_title']);
-				
 	}
 	
-	function do_html_row($sess) {
+	/*-------------------------------------------------------------------------*/
+	// Process row
+	/*-------------------------------------------------------------------------*/
+	
+	function do_html_row($sess)
+	{
 		global $ibforums;
 		
 		if ($sess['member_name'] and $sess['member_id'])
@@ -458,12 +427,7 @@ class Online {
 	
 	
 	function list_forum() { }
-	
-		    
-    
-
-
         
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/upload/sources/post.php b/upload/sources/post.php
new file mode 100644
index 00000000..ddc1dd8d
--- /dev/null
+++ b/upload/sources/post.php
@@ -0,0 +1,2092 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Post core module
+|   > Module written by Matt Mecham
+|   > Date started: 14th February 2002
+|
+|   > Module Version 1.0.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class post {
+
+    var $output    = "";
+    var $base_url  = "";
+    var $html      = "";
+    var $parser    = "";
+    var $moderator = array();
+    var $forum     = array();
+    var $topic     = array();
+    var $category  = array();
+    var $mem_groups = array();
+    var $mem_titles = array();
+    var $obj        = array();
+    var $email      = "";
+    var $can_upload = 0;
+    var $md5_check  = "";
+    var $module     = "";
+    var $attach_sum = -1;
+    
+    
+    /*-------------------------------------------------------------------------*/
+    // INIT
+    /*-------------------------------------------------------------------------*/
+    
+    function init()
+    {
+		global $ibforums, $forums, $DB, $std, $print, $skin_universal;
+        
+        //-----------------------------------------
+        // Load and config the post parser
+        //-----------------------------------------
+        
+        require_once( ROOT_PATH."sources/lib/post_parser.php" );
+        
+        $this->parser = new post_parser(1);
+        
+        $this->parser->bypass_badwords = intval($ibforums->member['g_bypass_badwords']);
+        
+        //-----------------------------------------
+        // Load the email libby
+        //-----------------------------------------
+        
+        require_once( ROOT_PATH."sources/classes/class_email.php" );
+		
+		$this->email = new emailer();
+        
+        //-----------------------------------------
+		// Compile the language file
+		//-----------------------------------------
+		
+        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
+
+        $this->html     = $std->load_template('skin_post');
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	//
+	// Our constructor, load words, load skin, print the topic listing
+	//
+	/*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $forums, $DB, $std, $print, $skin_universal;
+        
+        $this->init();
+        
+        //-----------------------------------------
+    	// Get the sync module
+		//-----------------------------------------
+		
+		if ( USE_MODULES == 1 )
+		{
+			require ROOT_PATH."modules/ipb_member_sync.php";
+			
+			$this->modules = new ipb_member_sync();
+		}
+        
+        //-----------------------------------------
+        // Check the input
+        //-----------------------------------------
+        
+        $this->md5_check = $std->return_md5_check();
+        
+        if ($ibforums->input['t'])
+        {
+        	$ibforums->input['t'] = intval($ibforums->input['t']);
+        	if (! $ibforums->input['t'] )
+        	{
+        		$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+        	}
+        }
+        
+        if ($ibforums->input['p'])
+        {
+        	$ibforums->input['p'] = intval($ibforums->input['p']);
+        	if (! $ibforums->input['p'] )
+        	{
+        		$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+        	}
+        }
+        
+        $ibforums->input['f'] = intval($ibforums->input['f']);
+        if (! $ibforums->input['f'] )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+        }
+        
+        $ibforums->input['st'] = $ibforums->input['st'] ?intval($ibforums->input['st']) : 0;
+        
+        // Did the user press the "preview" button?
+        
+        $this->obj['preview_post'] = $ibforums->input['preview'];
+        
+        //-----------------------------------------
+        // Get the forum info based
+        //-----------------------------------------
+        
+        $this->forum = $forums->forum_by_id[ $ibforums->input['f'] ];
+        
+        //-----------------------------------------
+        // Can we upload stuff?
+        //-----------------------------------------
+        
+        if ( $std->check_perms($this->forum['upload_perms']) == TRUE )
+        {
+        	if ( $ibforums->member['g_attach_max'] != -1 )
+        	{
+        		$this->can_upload = 1;
+				$this->obj['form_extra']   = " enctype='multipart/form-data'";
+				$this->obj['hidden_field'] = "<input type='hidden' name='MAX_FILE_SIZE' value='".($ibforums->member['g_attach_max']*1024)."' />";
+        	}
+        }
+        
+        //-----------------------------------------
+        // Is this forum switched off?
+        //-----------------------------------------
+        
+        if ( ! $this->forum['status'] )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'forum_read_only') );
+        }
+        
+        //-----------------------------------------
+        // Check access
+        //-----------------------------------------
+        
+        $forums->forums_check_access( $this->forum['id'], 1 );
+        
+		//-----------------------------------------
+		// Get navigation station
+		//-----------------------------------------
+        
+        $this->nav = $forums->forums_breadcrumb_nav( $this->forum['id'] );
+        
+        //-----------------------------------------
+        // Error out if we can not find the forum
+        //-----------------------------------------
+        
+        if (!$this->forum['id'])
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+        }
+        
+        $this->base_url = $ibforums->base_url;
+        
+        //-----------------------------------------
+        // Is this forum moderated?
+        //-----------------------------------------
+        
+        $this->obj['moderate'] = intval($this->forum['preview_posts']);
+        
+        // Can we bypass it?
+        
+        if ($ibforums->member['g_avoid_q'])
+        {
+        	$this->obj['moderate'] = 0;
+        }
+        
+		//-----------------------------------------
+        // Does this member have mod_posts enabled?
+		//-----------------------------------------
+         
+        if ( $ibforums->member['mod_posts'] )
+		{
+			if ( $ibforums->member['mod_posts'] == 1 )
+			{
+				$this->obj['moderate'] = 1;
+			}
+			else
+			{
+				$mod_arr = $std->hdl_ban_line( $ibforums->member['mod_posts'] );
+				
+				if ( time() >= $mod_arr['date_end'] )
+				{
+					// Update this member's profile
+					
+					$DB->simple_construct( array( 'update' => 'members',
+												  'set'    => 'mod_posts=0',
+												  'where'  => "id=".intval($ibforums->member['id'])
+										)       );
+										
+					$DB->simple_exec();
+					
+					$this->obj['moderate'] = intval($this->forum['preview_posts']);
+				}
+				else
+				{
+					$this->obj['moderate'] = 1;
+				}
+			}
+		}
+        
+        //-----------------------------------------
+        // Are we allowed to post at all?
+        //-----------------------------------------
+        
+        if ($ibforums->member['id'])
+        {
+        	if ( $ibforums->member['restrict_post'] )
+        	{
+        		if ( $ibforums->member['restrict_post'] == 1 )
+        		{
+        			$std->Error( array( LEVEL => 1, MSG => 'posting_off') );
+        		}
+        		
+        		$post_arr = $std->hdl_ban_line( $ibforums->member['restrict_post'] );
+        		
+        		if ( time() >= $post_arr['date_end'] )
+        		{
+        			// Update this member's profile
+        			
+					$DB->simple_construct( array( 'update' => 'members',
+												  'set'    => 'restrict_post=0',
+												  'where'  => "id=".intval($ibforums->member['id'])
+										)       );
+										
+					$DB->simple_exec();
+        		}
+        		else
+        		{
+        			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'posting_off_susp', 'EXTRA' => $std->get_date($post_arr['date_end'], 'LONG') ) );
+        		}
+        	}
+        	
+        	// Flood check..
+        	
+        	if ( $ibforums->input['CODE'] != "08" and $ibforums->input['CODE'] != "09" and $ibforums->input['CODE'] != "14" and $ibforums->input['CODE'] != "15" )
+        	{
+				if ( $ibforums->vars['flood_control'] > 0 )
+				{
+					if ($ibforums->member['g_avoid_flood'] != 1)
+					{
+						if ( time() - $ibforums->member['last_post'] < $ibforums->vars['flood_control'] )
+						{
+							$std->Error( array( 'LEVEL' => 1, 'MSG' => 'flood_control' , 'EXTRA' => $ibforums->vars['flood_control'] ) );
+						}
+					}
+				}
+			}
+        }
+        else if ( $ibforums->is_bot == 1 )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'posting_off') );
+        }
+        
+        if ($ibforums->member['id'] != 0 and $ibforums->member['g_is_supmod'] == 0)
+        {
+        	$DB->cache_add_query('topics_check_for_mod',  array( 'fid' => $this->forum['id'], 'mid' => $ibforums->member['id'], 'gid' => $ibforums->member['mgroup'] ) );
+			$DB->simple_exec();
+			
+        	$this->moderator = $DB->fetch_row();
+        }
+        
+        //-----------------------------------------
+        // Convert the code ID's into something
+        // use mere mortals can understand....
+        //-----------------------------------------
+        
+        $this->obj['action_codes'] = array ( '00'  => array( '0'  , 'new_post'     ),
+        									 '01'  => array( '1'  , 'new_post'     ),
+        									 '02'  => array( '0'  , 'reply_post'   ),
+        									 '03'  => array( '1'  , 'reply_post'   ),
+        									 '08'  => array( '0'  , 'edit_post'    ),
+        									 '09'  => array( '1'  , 'edit_post'    ),
+        									 '10'  => array( '0'  , 'poll'         ),
+        									 '11'  => array( '1'  , 'poll'         ),
+        									 '14'  => array( '0'  , 'poll_after'   ),
+        									 '15'  => array( '1'  , 'poll_after'   ),
+        								   );
+        
+        //-----------------------------------------								   
+        // Make sure our input CODE element is legal.
+        //-----------------------------------------
+        
+        if (! isset($this->obj['action_codes'][ $ibforums->input['CODE'] ]) )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+        }
+        
+        //-----------------------------------------
+        // Require and run our associated library file for this action.
+        // this imports an extended class for this Post class.
+        //-----------------------------------------
+        
+        require ROOT_PATH."sources/lib/post_" . $this->obj['action_codes'][ $ibforums->input['CODE'] ][1] . ".php";
+        
+        $post_functions = new post_functions(&$this);
+        
+        //-----------------------------------------
+        // If the first CODE array bit is set to "0" - show the relevant form.
+        // If it's set to "1" process the input.
+        //
+        // We pass a reference to this classes object so we can manipulate this classes
+        // data from our sub class.
+        //-----------------------------------------
+        
+        if ($this->obj['action_codes'][ $ibforums->input['CODE'] ][0])
+        {
+        	//-----------------------------------------
+        	// Make sure we have a valid auth key
+        	//-----------------------------------------
+        	
+        	if ( $ibforums->input['auth_key'] != $this->md5_check )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'del_post') );
+			}
+        	
+        	//-----------------------------------------
+        	// Make sure we have a "Guest" Name..
+        	//-----------------------------------------
+        	
+        	if (!$ibforums->member['id'])
+        	{
+        	
+        		$ibforums->input['UserName'] = trim($ibforums->input['UserName']);
+        		$ibforums->input['UserName'] = str_replace( "<br>", "", $ibforums->input['UserName']);
+        		$ibforums->input['UserName'] = $ibforums->input['UserName'] ? $ibforums->input['UserName'] : 'Guest';
+        		
+        		if ($ibforums->input['UserName'] != 'Guest')
+        		{
+					$DB->cache_add_query( 'login_getmember', array( 'username' => trim(strtolower($ibforums->input['UserName'])) ) );
+					$DB->cache_exec_query();
+					
+        			if ( $DB->get_num_rows() )
+        			{
+        				$ibforums->input['UserName'] = $ibforums->vars['guest_name_pre'].$ibforums->input['UserName'].$ibforums->vars['guest_name_suf'];
+        			}
+        		}
+        	}
+        	
+        	//-----------------------------------------
+        	// Stop the user hitting the submit button in the hope that multiple topics
+        	// or replies will be added. Or if the user accidently hits the button
+        	// twice.
+        	//-----------------------------------------
+        	
+        	if ( $this->obj['preview_post'] == "" )
+        	{
+				if ( preg_match( "/Post,.*,(01|03|07|11)$/", $ibforums->location ) )
+				{
+					if ( time() - $ibforums->lastclick < 2 )
+					{
+						if ( $ibforums->input['CODE'] == '01' or $ibforums->input['CODE'] == '11' )
+						{
+							//-----------------------------------------
+							// Redirect to the newest topic in the forum
+							//-----------------------------------------
+							
+							$DB->simple_construct( array( 'select' => 'tid',
+														  'from'   => 'topics',
+														  'where'  => "forum_id='".$this->forum['id']."' AND approved=1",
+														  'order'  => 'last_post DESC',
+														  'limit'  => array( 0, 1 )
+												)       );
+												
+							$DB->simple_exec();
+					
+							$topic = $DB->fetch_row();
+					
+							$std->boink_it($ibforums->base_url."act=ST&f=".$this->forum['id']."&t=".$topic['tid']);
+							exit();
+						}
+						else
+						{
+							//-----------------------------------------
+							// It's a reply, so simply show the topic...
+							//-----------------------------------------
+							
+							$std->boink_it($ibforums->base_url."act=ST&f=".$this->forum['id']."&t=".$ibforums->input['t']."&view=getlastpost");
+							exit();
+						}
+					}
+				}
+        	}
+        	
+        	//-----------------------------------------
+       
+        	$post_functions->process(&$this);
+        }
+        else
+        {
+        	$post_functions->show_form(&$this);
+        }
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Notify new topic mod Q
+	// ----------------------
+	/*-------------------------------------------------------------------------*/
+	
+	function notify_new_topic_approval($tid, $title, $author, $pid=0, $type='new')
+	{
+		global $ibforums, $DB, $std;
+		
+		$tmp = $DB->simple_exec_query( array( 'select' => 'notify_modq_emails', 'from' => 'forums', 'where' => "id=".$this->forum['id']) );
+		
+		if ( $tmp['notify_modq_emails'] == "" )
+		{ 
+			return;
+		}
+		
+		if ( $type == 'new' )
+		{
+			$this->email->get_template("new_topic_queue_notify");
+		}
+		else
+		{
+			$this->email->get_template("new_post_queue_notify");
+		}
+		
+		$this->email->build_message( array(
+											'TOPIC'  => $title,
+											'FORUM'  => $this->forum['name'],
+											'POSTER' => $author,
+											'DATE'   => $std->get_date( time(), 'SHORT' ),
+											'LINK'   => $ibforums->vars['board_url'].'/index.'.$ibforums->vars['php_ext'].'?act=findpost&pid='.$pid,
+										  )
+									);
+		
+		foreach( explode( ",", $tmp['notify_modq_emails'] ) as $email )
+		{
+			$this->email->to = trim($email);
+			$this->email->send_mail();
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// topic tracker
+	// ------------------
+	// Checks and sends out the emails as needed.
+	/*-------------------------------------------------------------------------*/
+	
+	function topic_tracker($tid="", $post="", $poster="", $last_post="" )
+	{
+		global $ibforums, $DB, $std;
+		
+		if ($tid == "")
+		{
+			return TRUE;
+		}
+		
+		$count = 0;
+		
+		//-----------------------------------------
+		// Get the email addy's, topic ids and email_full stuff - oh yeah.
+		// We only return rows that have a member last_activity of greater than the post itself
+		// Ergo:
+		//  Last topic post: 8:50am
+		//  Last topic visit: 9:00am
+		//  Next topic reply: 9:10am
+		// if ( last.activity > last.topic.post ) { send.... }
+		//  Next topic reply: 9:20am
+		// if ( last.activity > last.topic.post ) { will fail as 9:10 > 8:50 }
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'post_topic_tracker', array( 'tid' => $tid, 'mid' => $ibforums->member['id'], 'last_post' => $last_post ) );
+		
+		$outer = $DB->simple_exec();
+		
+		if ( $DB->get_num_rows($outer) )
+		{
+			$trids = array();
+			
+			while ( $r = $DB->fetch_row($outer) )
+			{
+				$count++;
+				
+				$r['language'] = $r['language'] ? $r['language'] : 'en';
+				
+				if ($r['email_full'] == 1)
+				{
+					$this->email->get_template("subs_with_post", $r['language']);
+			
+					$this->email->build_message( array(
+														'TOPIC_ID'        => $r['topic_id'],
+														'FORUM_ID'        => $r['forum_id'],
+														'TITLE'           => $r['title'],
+														'NAME'            => $r['name'],
+														'POSTER'          => $poster,
+														'POST'            => $post,
+													  )
+												);
+					
+				}
+				else
+				{
+				
+					$this->email->get_template("subs_no_post", $r['language']);
+			
+					$this->email->build_message( array(
+														'TOPIC_ID'        => $r['topic_id'],
+														'FORUM_ID'        => $r['forum_id'],
+														'TITLE'           => $r['title'],
+														'NAME'            => $r['name'],
+														'POSTER'          => $poster,
+													  )
+												);
+					
+				}
+				
+				$trids[] = $r['trid'];
+				
+				//-----------------------------------------
+				// Add to mail queue
+				//-----------------------------------------
+				
+				$DB->do_insert( 'mail_queue', array( 'mail_to' => $r['email'], 'mail_date' => time(), 'mail_subject' => $ibforums->lang['tt_subject'], 'mail_content' => $this->email->message ) );
+			}
+			
+			$ibforums->cache['systemvars']['mail_queue'] += $count;
+			
+			//-----------------------------------------
+			// Update cache with remaning email count
+			//-----------------------------------------
+			
+			$DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($ibforums->cache['systemvars'])) ), "cs_key='systemvars'" );
+		}
+		
+		return TRUE;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Forum tracker
+	// ------------------
+	// Checks and sends out the new topic notification if
+	// needed
+	/*-------------------------------------------------------------------------*/
+	
+	function forum_tracker($fid="", $this_tid="", $title="", $forum_name="", $post="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ($this_tid == "")
+		{
+			return TRUE;
+		}
+		
+		if ($fid == "")
+		{
+			return TRUE;
+		}
+		
+		//-----------------------------------------
+		// Work out the time stamp needed to "guess"
+		// if the user is still active on the board
+		// We will base this guess on a period of
+		// non activity of time_now - 30 minutes.
+		//-----------------------------------------
+		
+		$time_limit = time() - (30*60);
+		
+		$count = 0;
+		
+		$gotem  = array();
+		
+		$DB->cache_add_query( 'post_forum_tracker', array( 'fid'       => $fid,
+														   'mid'       => $ibforums->member['id'],
+														   'last_post' => $time_limit ) );
+		
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$gotem[ $r['id'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Get "all" groups?
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['autoforum_sub_groups'] )
+		{
+			$DB->cache_add_query( 'post_forum_tracker_all', array( 'groups'    => $ibforums->vars['autoforum_sub_groups'],
+																   'last_post' => $time_limit,
+																   'mid'       => $ibforums->member['id'] ) );
+			
+			$DB->simple_exec();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$gotem[ $r['id'] ] = $r;
+			}
+		}
+		
+		//-----------------------------------------
+		// Row, row and parse, parse
+		//-----------------------------------------
+		
+		if ( count( $gotem ) )
+		{
+			foreach( $gotem as $mid => $r )
+			{
+				$count++;
+				
+				$perm_id = ( $r['org_perm_id'] ) ? $r['org_perm_id'] : $r['g_perm_id'];
+				
+				if ($this->forum['read_perms'] != '*')
+				{
+					if ( ! preg_match("/(^|,)".str_replace( ",", '|', $perm_id )."(,|$)/", $this->forum['read_perms'] ) )
+        			{
+        				continue;
+       				}
+				}
+        
+				$r['language'] = $r['language'] ? $r['language'] : 'en';
+				
+				$this->email->get_template("subs_new_topic", $r['language']);
+		
+				$this->email->build_message( array(
+													'TOPIC_ID'        => $this_tid,
+													'FORUM_ID'        => $fid,
+													'TITLE'           => $title,
+													'NAME'            => $r['name'],
+													'POSTER'          => $ibforums->member['name'],
+													'FORUM'           => $forum_name,
+													'POST'            => $post,
+												  )
+											);
+				
+				$DB->do_insert( 'mail_queue', array( 'mail_to' => $r['email'], 'mail_date' => time(), 'mail_subject' => $ibforums->lang['ft_subject'], 'mail_content' => $this->email->message ) );
+			}
+		}
+		
+		$ibforums->cache['systemvars']['mail_queue'] += $count;
+			
+		//-----------------------------------------
+		// Update cache with remaning email count
+		//-----------------------------------------
+		
+		$DB->do_update( 'cache_store', array( 'cs_array' => 1, 'cs_value' => addslashes(serialize($ibforums->cache['systemvars'])) ), "cs_key='systemvars'" );
+		
+		return TRUE;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// compile post
+	// ------------------
+	// Compiles all the incoming information into an array
+	// which is returned to the accessor
+	/*-------------------------------------------------------------------------*/
+	
+	function compile_post()
+	{
+		global $ibforums, $std;
+		
+		$ibforums->vars['max_post_length'] = $ibforums->vars['max_post_length'] ? $ibforums->vars['max_post_length'] : 2140000;
+		
+		//-----------------------------------------
+		// Sort out some of the form data, check for posting length, etc.
+		// THIS MUST BE CALLED BEFORE CHECKING ATTACHMENTS
+		//-----------------------------------------
+		
+		$ibforums->input['enablesig']   = $ibforums->input['enablesig']   == 'yes' ? 1 : 0;
+		$ibforums->input['enableemo']   = $ibforums->input['enableemo']   == 'yes' ? 1 : 0;
+		$ibforums->input['enabletrack'] = intval($ibforums->input['enabletrack']) != 0 ? 1 : 0;
+		
+		//-----------------------------------------
+		// Do we have a valid post?
+		//-----------------------------------------
+		
+		if (strlen( trim($_POST['Post']) ) < 1)
+		{
+			if ( ! $_POST['preview'] )
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'no_post') );
+			}
+		}
+		
+		if (strlen( $_POST['Post'] ) > ($ibforums->vars['max_post_length']*1024))
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'post_too_long') );
+		}
+		
+		$post = array(
+						'author_id'   => $ibforums->member['id'] ? $ibforums->member['id'] : 0,
+						'use_sig'     => $ibforums->input['enablesig'],
+						'use_emo'     => $ibforums->input['enableemo'],
+						'ip_address'  => $ibforums->input['IP_ADDRESS'],
+						'post_date'   => time(),
+						'icon_id'     => $ibforums->input['iconid'],
+						'post'        => $this->parser->convert( array( 'TEXT'    => $ibforums->input['Post'],
+																		'SMILIES' => $ibforums->input['enableemo'],
+																		'CODE'    => $this->forum['use_ibc'],
+																		'HTML'    => $this->forum['use_html']
+																	  )
+															   ),
+						'author_name' => $ibforums->member['id'] ? $ibforums->member['name'] : $ibforums->input['UserName'],
+						'topic_id'    => "",
+						'queued'      => ( $this->obj['moderate'] == 1 || $this->obj['moderate'] == 3 ) ? 1 : 0,
+						'post_htmlstate' => intval($ibforums->input['post_htmlstatus']),
+					 );
+					 
+	    // If we had any errors, parse them back to this class
+	    // so we can track them later.
+	    
+	    $this->obj['post_errors'] = $this->parser->error;
+					 
+		return $post;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: mod_options.
+	// ------------------
+	// Returns the HTML for the mod options drop down box
+	/*-------------------------------------------------------------------------*/
+	
+	function mod_options($is_reply=0)
+	{
+		global $ibforums, $DB;
+		
+		$can_close = 0;
+		$can_pin   = 0;
+		$can_move  = 0;
+		
+		$html = "<select id='forminput' name='mod_options' class='forminput'>\n<option value='nowt'>".$ibforums->lang['mod_nowt']."</option>\n";
+		
+		if ($ibforums->member['g_is_supmod'])
+		{
+			$can_close = 1;
+			$can_pin   = 1;
+			$can_move  = 1;
+		}
+		else if ($ibforums->member['id'] != 0)
+		{
+			if ($this->moderator['mid'] != "" )
+			{
+				if ($this->moderator['close_topic'])
+				{
+					$can_close = 1;
+				}
+				if ($this->moderator['pin_topic'])
+				{
+					$can_pin   = 1;
+				}
+				if ($this->moderator['move_topic'])
+				{
+					$can_move  = 1;
+				}
+			}
+		}
+		else
+		{
+			return "";
+		}
+		
+		if ($can_pin == 0 and $can_close == 0 and $can_move == 0)
+		{
+			return "";
+		}
+		
+		if ($can_pin)
+		{
+			$html .= "<option value='pin'>".$ibforums->lang['mod_pin']."</option>";
+		}
+		if ($can_close)
+		{
+			$html .= "<option value='close'>".$ibforums->lang['mod_close']."</option>";
+		}
+		
+		if ($can_close and $can_pin)
+		{
+			$html .= "<option value='pinclose'>".$ibforums->lang['mod_pinclose']."</option>";
+		}
+		
+		if ($can_move and $is_reply)
+		{
+			$html .= "<option value='move'>".$ibforums->lang['mod_move']."</option>";
+		}
+		
+		return $this->html->mod_options($html);
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: start form.
+	// ------------------
+	// Returns the HTML for the <FORM> opening tag
+	/*-------------------------------------------------------------------------*/
+	
+	function html_start_form($additional_tags=array())
+	{
+		global $ibforums;
+		
+		$form = $this->html->get_javascript();
+		
+		$form .= "<form action='{$this->base_url}' method='post' name='REPLIER' onsubmit='return ValidateForm()'".$this->obj['form_extra'].">".
+				"<input type='hidden' name='st' value='".$ibforums->input[st]."' />\n".
+				"<input type='hidden' name='act' value='Post' />\n".
+				"<input type='hidden' name='s' value='".$ibforums->session_id."' />\n".
+				"<input type='hidden' name='f' value='".$this->forum['id']."' />\n".
+				"<input type='hidden' name='auth_key' value='".$this->md5_check."' />\n".
+				"<input type='hidden' name='removeattachid' value='0' />\n".
+				$this->obj['hidden_field'];
+				
+		// Any other tags to add?
+		
+		if (isset($additional_tags))
+		{
+			foreach($additional_tags as $k => $v)
+			{
+				$form .= "\n<input type='hidden' name='{$v[0]}' value='{$v[1]}' />";
+			}
+		}
+		
+		return $form;
+    }
+		
+	/*-------------------------------------------------------------------------*/
+	// HTML: name fields.
+	// ------------------
+	// Returns the HTML for either text inputs or membername
+	// depending if the member is a guest.
+	/*-------------------------------------------------------------------------*/
+	
+	function html_name_field()
+	{
+		global $ibforums;
+		
+		return $ibforums->member['id'] ? $this->html->nameField_reg() : $this->html->nameField_unreg( $ibforums->input[UserName] );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: Post body.
+	// ------------------
+	// Returns the HTML for post area, code buttons and
+	// post icons
+	/*-------------------------------------------------------------------------*/
+	
+	function html_post_body($raw_post="")
+	{
+		global $ibforums;
+		
+		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
+		
+		return $this->html->postbox_buttons($raw_post);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: Post Icons
+	// ------------------
+	// Returns the HTML for post area, code buttons and
+	// post icons
+	/*-------------------------------------------------------------------------*/
+	
+	function html_post_icons($post_icon="")
+	{
+		global $ibforums;
+		
+		if ($ibforums->input['iconid'])
+		{
+			$post_icon = $ibforums->input['iconid'];
+		}
+		
+		$ibforums->lang['the_max_length'] = $ibforums->vars['max_post_length'] * 1024;
+		
+		$html = $this->html->PostIcons();
+		
+		if ($post_icon) {
+			$html = preg_replace( "/name=[\"']iconid[\"']\s*value=[\"']$post_icon\s?[\"']/", "name='iconid' value='$post_icon' checked", $html );
+			$html = preg_replace( "/name=[\"']iconid[\"']\s*value=[\"']0[\"']\s*checked=['\"]checked['\"]/i"  , "name='iconid' value='0'", $html );
+		}
+		return $html;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: checkboxes
+	// ------------------
+	// Returns the HTML for sig/emo/track boxes
+	/*-------------------------------------------------------------------------*/
+	
+	function html_checkboxes($type="", $tid="", $fid="") 
+	{
+		global $ibforums, $DB;
+		
+		$default_checked = array(
+								  'sig' => 'checked="checked"',
+						  		  'emo' => 'checked="checked"',
+						  		  'tra' => $ibforums->member['auto_track'] ? 'checked="checked"' : ''
+						        );
+						        
+		
+		// Make sure we're not previewing them and they've been unchecked!
+		
+		if ( isset( $ibforums->input['enablesig'] ) AND ( ! $ibforums->input['enablesig'] ) )
+		{
+			$default_checked['sig'] = "";
+		}
+		
+		if ( isset( $ibforums->input['enableemo'] ) AND ( ! $ibforums->input['enableemo'] ) )
+		{
+			$default_checked['emo'] = "";
+		}
+		
+		if ( isset( $ibforums->input['enabletrack'] ) AND ( ! $ibforums->input['enabletrack'] ) )
+		{
+			$default_checked['tra'] = "";
+		}
+		else if ( isset( $ibforums->input['enabletrack'] ) AND ( $ibforums->input['enabletrack'] == 1 ) )
+		{
+			$default_checked['tra'] = 'checked="checked"';
+		}
+		
+		$this->output = str_replace( '<!--IBF.EMO-->'  , $this->html->get_box_enableemo( $default_checked['emo'] )  , $this->output );
+		
+		if ( $ibforums->member['id'] )
+		{
+			$this->output = str_replace( '<!--IBF.SIG-->'  , $this->html->get_box_enablesig( $default_checked['sig'] )  , $this->output );
+		}
+		
+		if ( $ibforums->cache['forum_cache'][$fid]['use_html'] and $ibforums->cache['group_cache'][ $ibforums->member['mgroup'] ]['g_dohtml'] )
+		{
+			$this->output = str_replace( '<!--IBF.HTML-->' , $this->html->get_box_html( array( intval($ibforums->input['post_htmlstatus']) => ' selected="selected"' ) ), $this->output );
+		}
+		
+		if ( $type == 'reply' )
+		{
+			if ( $tid and $ibforums->member['id'] )
+			{
+				$DB->simple_construct( array( 'select' => 'trid', 'from' => 'tracker', 'where' => "topic_id=$tid AND member_id=".$ibforums->member['id'] ) );
+				$DB->simple_exec();
+				
+				if ( $DB->get_num_rows() )
+				{
+					$this->output = str_replace( '<!--IBF.TRACK-->',$this->html->get_box_alreadytrack(), $this->output );
+				}
+				else
+				{
+					$this->output = str_replace( '<!--IBF.TRACK-->', $this->html->get_box_enabletrack( $default_checked['tra'] ), $this->output );
+				}
+			}
+		}
+		else if ( $type != 'edit' )
+		{
+			if ( $ibforums->member['id'] )
+			{
+				$this->output = str_replace( '<!--IBF.TRACK-->', $this->html->get_box_enabletrack( $default_checked['tra'] ), $this->output );
+			}
+		}
+	}
+	
+    /*-------------------------------------------------------------------------*/
+	// HTML: add smilie box.
+	// ------------------
+	// Inserts the clickable smilies box
+	/*-------------------------------------------------------------------------*/
+	
+	function html_add_smilie_box($in_html="")
+	{
+		global $ibforums, $DB;
+		
+		$show_table = 0;
+		$count      = 0;
+		$smilies    = "<tr align='center'>\n";
+		
+		//-----------------------------------------
+		// Get the smilies from the DB
+		//-----------------------------------------
+		
+		if ( ! is_array( $ibforums->cache['emoticons'] ) )
+		{
+			$ibforums->cache['emoticons'] = array();
+			
+			$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$ibforums->cache['emoticons'][] = $r;
+			}
+		}
+		
+		usort( $ibforums->cache['emoticons'] , array( 'post', 'smilie_alpha_sort' ) );
+		
+		foreach( $ibforums->cache['emoticons'] as $a_id => $elmo )
+		{
+			if ( $elmo['emo_set'] != $ibforums->skin['_emodir'] )
+			{
+				continue;
+			}
+			
+			if ( ! $elmo['clickable'] )
+			{
+				continue;
+			}
+					
+			$show_table++;
+			$count++;
+			
+			//-----------------------------------------
+			// Make single quotes as URL's with html entites in them
+			// are parsed by the browser, so ' causes JS error :o
+			//-----------------------------------------
+			
+			if (strstr( $elmo['typed'], "&#39;" ) )
+			{
+				$in_delim  = '"';
+				$out_delim = "'";
+			}
+			else
+			{
+				$in_delim  = "'";
+				$out_delim = '"';
+			}
+			
+			$smilies .= "<td><a href={$out_delim}javascript:emoticon($in_delim".$elmo['typed']."$in_delim){$out_delim}><img src=\"".$ibforums->vars['EMOTICONS_URL']."/".$elmo['image']."\" alt='smilie' border='0' /></a>&nbsp;</td>\n";
+			
+			if ($count == $ibforums->vars['emo_per_row'])
+			{
+				$smilies .= "</tr>\n\n<tr align='center'>";
+				$count = 0;
+			}
+		}
+		
+		if ($count != $ibforums->vars['emo_per_row'])
+		{
+			for ($i = $count ; $i < $ibforums->vars['emo_per_row'] ; ++$i)
+			{
+				$smilies .= "<td>&nbsp;</td>\n";
+			}
+			$smilies .= "</tr>";
+		}
+		
+		$table = $this->html->smilie_table();
+		
+		if ($show_table != 0)
+		{
+			$table   = preg_replace( "/<!--THE SMILIES-->/", $smilies, $table );
+			$in_html = preg_replace( "/<!--SMILIE TABLE-->/", $table, $in_html );
+		}
+		
+		return $in_html;
+	}
+		
+	/*-------------------------------------------------------------------------*/
+	// HTML: topic summary.
+	// ------------------
+	// displays the last 10 replies to the topic we're
+	// replying in.
+	/*-------------------------------------------------------------------------*/
+	
+	function html_topic_summary($topic_id)
+	{
+		global $ibforums, $std, $DB;
+		
+		if (! $topic_id ) return;
+		
+		$cached_members = array();
+		
+		$this->output .= $this->html->TopicSummary_top();
+		
+		//-----------------------------------------
+		// Get the posts
+		// This section will probably change at some point
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'post_get_topic_review', array( 'tid' => $topic_id ) );
+							 
+		$post_query = $DB->cache_exec_query();
+		
+		while ( $row = $DB->fetch_row($post_query) )
+		{
+		    $row['author'] = $row['author_name'];
+			
+			$row['date']   = $std->get_date( $row['post_date'], 'LONG' );
+			
+			if (!$ibforums->member['view_img'])
+			{
+				// unconvert smilies first, or it looks a bit crap.
+				
+				$row['post'] = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $row['post'] );
+				
+				$row['post'] = preg_replace( "/<img src=[\"'](.+?)[\"'].+?".">/", "(IMG:<a href='\\1' target='_blank'>\\1</a>)", $row['post'] );
+			}
+			
+			$this->parser->pp_do_html  = ( $this->forum['use_html'] and $ibforums->cache['group_cache'][ $row['mgroup'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+			$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+			$this->parser->pp_nl2br    = $row['post_htmlstate'] == 2 ? 1 : 0;
+			
+			$row['post'] = $this->parser->post_db_parse( $row['post'] );
+			
+			$row['post'] = str_replace( "<br>", "<br />", $row['post'] );
+			
+			$this->output .= $this->html->TopicSummary_body( $row );
+		}
+		
+		$this->output .= $this->html->TopicSummary_bottom();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	//
+	// Get used space so far
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_attachment_sum()
+	{
+		global $ibforums, $std, $DB;
+		
+		if ( $this->attach_sum == -1 )
+		{
+			$stats = $DB->simple_exec_query( array( 'select' => 'sum(attach_filesize) as sum',
+												    'from'   => 'attachments',
+												    'where'  => 'attach_member_id='.$ibforums->member['id'] ) );
+												    
+			$this->attach_sum = intval( $stats['sum'] );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// HTML: Build Upload Area - yay
+	/*-------------------------------------------------------------------------*/
+	
+	function html_build_uploads($post_key="",$type="",$pid="")
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->_get_attachment_sum();
+		
+		if ( $ibforums->member['g_attach_max'] > 0 )
+		{
+			$size = intval( ( $ibforums->member['g_attach_max'] * 1024 ) - $this->attach_sum );
+			$size = $size < 0 ? 0 : $size;
+			$main_space_left = $std->size_format( $size );
+		}
+		else
+		{
+			$main_space_left = $ibforums->lang['upload_unlimited'];
+		}
+												
+		$upload_field = $this->html->Upload_field(  $main_space_left );
+		
+		if ( $post_key != "" )
+		{
+			//-----------------------------------------
+			// Check for current uploads based on temp
+			// key
+			//-----------------------------------------
+			
+			if ( ! is_array( $this->cur_post_attach ) or ! count( $this->cur_post_attach ) )
+			{
+				$DB->simple_construct( array( "select" => '*', 'from' => 'attachments', 'where' => "attach_post_key='$post_key'") );
+				$DB->simple_exec();
+				
+				while ( $r = $DB->fetch_row() )
+				{
+					$this->cur_post_attach[] = $r;
+				}
+			}
+			
+			if ( is_array( $this->cur_post_attach ) and count( $this->cur_post_attach ) )
+			{ 
+				$upload_tmp  = $this->html->uploadbox_tabletop();
+				$upload_size = 0;
+				
+				foreach( $this->cur_post_attach as $row )
+				{
+					$upload_size += $row['attach_filesize'];
+					$row['image'] = $ibforums->cache['attachtypes'][ $row['attach_ext'] ]['atype_img'];
+					$row['size']  = $std->size_format( $row['attach_filesize'] );
+					
+					if ( strlen( $row['attach_file'] ) > 40 )
+					{
+						$row['attach_file'] = substr( $row['attach_file'], 0, 35 ) .'...';
+					}
+					
+					$upload_tmp .= $this->html->uploadbox_entry($row);
+				}
+				
+				$space_used  = $std->size_format( intval( $upload_size ) );
+				
+				if ( $ibforums->member['g_attach_max'] > 0 )
+				{
+					if ( $ibforums->member['g_attach_per_post'] )
+					{
+						//-----------------------------------------
+						// Max + per post: show per post
+						//-----------------------------------------
+						
+						$space_left = $std->size_format( intval( ( $ibforums->member['g_attach_per_post'] * 1024 ) - $upload_size ) );
+					}
+					else
+					{
+						//-----------------------------------------
+						// Max + no per post: Show max
+						//-----------------------------------------
+						
+						$space_left = $std->size_format( intval( ( $ibforums->member['g_attach_max'] * 1024 ) - $upload_size - $this->attach_sum ) );
+					}
+				}
+				else
+				{
+					if ( $ibforums->member['g_attach_per_post'] )
+					{
+						//-----------------------------------------
+						// No Max + per post: show per post
+						//-----------------------------------------
+						
+						$space_left = $std->size_format( intval( ( $ibforums->member['g_attach_per_post'] * 1024 ) - $upload_size ) );
+					}
+					else
+					{
+						//-----------------------------------------
+						// No Max + no per post: Show unlimited
+						//-----------------------------------------
+						
+						$space_left = $ibforums->lang['upload_unlimited'];
+					}
+				}
+				
+				$upload_text = sprintf( $ibforums->lang['attach_space_left'], $space_used, $space_left );
+				
+				$upload_tmp .= $this->html->uploadbox_tableend( $upload_text );
+			}
+		}
+		
+		if ( $upload_tmp )
+		{
+			$upload_field = str_replace( '<!--IBF.UPLOADED_ITEMS-->', $upload_tmp, $upload_field );
+		}
+		
+		return $upload_field;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Moderators log
+	// ------------------
+	// Simply adds the last action to the mod logs
+	/*-------------------------------------------------------------------------*/
+	
+	function moderate_log($title = 'unknown', $topic_title)
+	{
+		global $std, $ibforums, $DB, $HTTP_REFERER, $QUERY_STRING;
+		
+		$DB->do_insert( 'moderator_logs', array (
+												'forum_id'    => $ibforums->input['f'],
+												'topic_id'    => $ibforums->input['t'],
+												'post_id'     => $ibforums->input['p'],
+												'member_id'   => $ibforums->member['id'],
+												'member_name' => $ibforums->member['name'],
+												'ip_address'  => $ibforums->input['IP_ADDRESS'],
+												'http_referer'=> $HTTP_REFERER,
+												'ctime'       => time(),
+												'topic_title' => $topic_title,
+												'action'      => $title,
+												'query_string'=> $QUERY_STRING,
+										     ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// perform: Check for new topic
+	/*-------------------------------------------------------------------------*/
+	
+	function check_for_new_topic( $topic=array() )
+	{
+		global $ibforums, $std, $DB;
+		
+		if (! $ibforums->member['g_post_new_topics'])
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_starting' ) );
+		}
+		
+		if ( $std->check_perms($this->forum['start_perms']) == FALSE )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_starting' ) );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// perform: Check for reply
+	/*-------------------------------------------------------------------------*/
+	
+	function check_for_reply( $topic=array() )
+	{
+		global $ibforums, $std, $DB;
+		
+		if ($topic['poll_state'] == 'closed' and $ibforums->member['g_is_supadmin'] != 1)
+		{
+			$std->Error( array( 'LEVEL' => '1', MSG => 'no_replies') );
+		}
+		
+		if ($topic['starter_id'] == $ibforums->member['id'])
+		{
+			if (! $ibforums->member['g_reply_own_topics'])
+			{
+				$std->Error( array( 'LEVEL' => '1', MSG => 'no_replies') );
+			}
+		}
+		
+		if ($topic['starter_id'] != $ibforums->member['id'])
+		{
+			if (! $ibforums->member['g_reply_other_topics'])
+			{
+				$std->Error( array( 'LEVEL' => '1', MSG => 'no_replies') );
+			}
+		}
+
+		if ( $std->check_perms($this->forum['reply_perms']) == FALSE )
+		{
+			$std->Error( array( 'LEVEL' => '1', MSG => 'no_replies') );
+		}
+		
+		// Is the topic locked?
+		
+		if ($topic['state'] != 'open')
+		{
+			if ($ibforums->member['g_post_closed'] != 1)
+			{
+				$std->Error( array( 'LEVEL' => '1', MSG => 'locked_topic') );
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// perform: Check for edit
+	/*-------------------------------------------------------------------------*/
+	
+	function check_for_edit( $topic=array() )
+	{
+		global $ibforums, $std, $DB;
+		
+		//-----------------------------------------
+		// Is the topic locked?
+		//-----------------------------------------
+		
+		if (($topic['state'] != 'open') and (!$ibforums->member['g_is_supmod']))
+		{
+			if ($ibforums->member['g_post_closed'] != 1)
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'locked_topic' ) );
+			}
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// process upload
+	// ------------------
+	// checks for an entry in the upload field, and uploads
+	// the file if it meets our criteria. This also inserts
+	// a new row into the attachments database if successful
+	/*-------------------------------------------------------------------------*/
+	
+	function process_upload()
+	{
+		global $ibforums, $std, $DB;
+		
+		//-----------------------------------------
+		// Got attachment types?
+		//-----------------------------------------
+		
+		if ( ! is_array( $ibforums->cache['attachtypes'] ) )
+		{
+			$ibforums->cache['attachtypes'] = array();
+				
+			$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+			$DB->simple_exec();
+		
+			while ( $r = $DB->fetch_row() )
+			{
+				$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+			}
+		}
+		
+		//-----------------------------------------
+		// Set up array
+		//-----------------------------------------
+		
+		$attach_data = array( 
+							  'attach_ext'            => "",
+							  'attach_file'           => "",
+							  'attach_location'       => "",
+							  'attach_thumb_location' => "",
+							  'attach_hits'           => "",
+							  'attach_date'           => time(),
+							  'attach_temp'           => 0,
+							  'attach_pid'            => "",
+							  'attach_post_key'       => $ibforums->input['post_key'],
+							  'attach_member_id'      => $ibforums->member['id'],
+							  'attach_filesize'       => 0,
+							);
+		
+		if ( ($this->can_upload != 1) or ($ibforums->member['g_attach_max'] == -1 ) )
+		{
+			return $attach_data;
+		}
+		
+		//-----------------------------------------
+		// Space left...
+		//-----------------------------------------
+		
+		$this->_get_attachment_sum();
+		
+		$this->cur_post_attach = array();
+		$this->per_post_count  = 0;
+	
+		if ( $ibforums->input['post_key'] )
+		{
+			$DB->simple_construct( array( "select" => '*', 'from' => 'attachments', 'where' => "attach_post_key='{$ibforums->input['post_key']}'") );
+			$DB->simple_exec();
+			
+			while( $r = $DB->fetch_row() )
+			{
+				$this->per_post_count   += $r['attach_filesize'];
+				$this->cur_post_attach[] = $r;
+			}
+		}
+		
+		if ( $ibforums->member['g_attach_max'] > 0 )
+		{
+			if ( $ibforums->member['g_attach_per_post'] )
+			{
+				$main_space_left = intval( ( $ibforums->member['g_attach_per_post'] * 1024 ) - $this->per_post_count );
+			}
+			else
+			{
+				$main_space_left = intval( ( $ibforums->member['g_attach_max'] * 1024 ) - $this->attach_sum );
+			}
+		}
+		else
+		{
+			if ( $ibforums->member['g_attach_per_post'] )
+			{
+				$main_space_left = intval( ( $ibforums->member['g_attach_per_post'] * 1024 ) - $this->per_post_count );
+			}
+			else
+			{
+				$main_space_left = 1000000000;
+			}
+		}
+					
+		//-----------------------------------------
+		// Load the library
+		//-----------------------------------------
+		
+		require_once( KERNEL_PATH.'class_upload.php' );
+		$upload = new class_upload();
+		
+		//-----------------------------------------
+		// Set up the variables
+		//-----------------------------------------
+		
+		$upload->out_file_name    = 'post-'.$ibforums->member['id'].'-'.time();
+		$upload->out_file_dir     = $ibforums->vars['upload_dir'];
+		$upload->max_file_size    = $main_space_left;
+		$upload->make_script_safe = 1;
+		$upload->force_data_ext   = 'ipb';
+		
+		//-----------------------------------------
+		// Populate allowed extensions
+		//-----------------------------------------
+		
+		if ( is_array( $ibforums->cache['attachtypes'] ) and count( $ibforums->cache['attachtypes'] ) )
+		{
+			foreach( $ibforums->cache['attachtypes'] as $idx => $data )
+			{
+				if ( $data['atype_post'] )
+				{
+					$upload->allowed_file_ext[] = $data['atype_extension'];
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Upload...
+		//-----------------------------------------
+		
+		$upload->upload_process();
+		
+		//-----------------------------------------
+		// Error?
+		//-----------------------------------------
+		
+		if ( $upload->error_no )
+		{
+			switch( $upload->error_no )
+			{
+				case 1:
+					// No upload
+					return $attach_data;
+				case 2:
+					// Invalid file ext
+					$this->obj['post_errors'] = 'invalid_mime_type';
+					return $attach_data;
+				case 3:
+					// Too big...
+					$this->obj['post_errors'] = 'upload_to_big';
+					return $attach_data;
+				case 4:
+					// Cannot move uploaded file
+					$this->obj['post_errors'] = 'upload_failed';
+					return $attach_data;
+			}
+		}
+					
+		//-----------------------------------------
+		// Still here?
+		//-----------------------------------------
+		
+		if ( $upload->saved_upload_name and @file_exists( $upload->saved_upload_name ) )
+		{
+			$attach_data['attach_filesize']   = @filesize( $upload->saved_upload_name  );
+			$attach_data['attach_location']   = $upload->parsed_file_name;
+			$attach_data['attach_file']       = $upload->original_file_name;
+			$attach_data['attach_is_image']   = $upload->is_image;
+			$attach_data['attach_ext']        = $upload->real_file_extension;
+			
+			if ( $attach_data['attach_is_image'] == 1 )
+			{
+				$thumb_data = $this->create_thumbnail( $attach_data );
+				
+				if ( $thumb_data['thumb_location'] )
+				{
+					$attach_data['attach_thumb_width']    = $thumb_data['thumb_width'];
+					$attach_data['attach_thumb_height']   = $thumb_data['thumb_height'];
+					$attach_data['attach_thumb_location'] = $thumb_data['thumb_location'];
+				}
+			}
+			
+			$DB->do_insert( 'attachments', $attach_data );
+			
+			$newid = $DB->get_insert_id();
+			
+			$attach_data['attach_id'] = $newid;
+			
+			$this->per_post_count    += $attach_data['attach_filesize'];
+			$this->cur_post_attach[]  = $attach_data;
+			
+			return $newid;
+		}
+	}
+
+	/*-------------------------------------------------------------------------*/
+	// Create thumbnail
+	/*-------------------------------------------------------------------------*/
+	
+	function create_thumbnail( $data )
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Load class
+		//-----------------------------------------
+		
+		$return = array();
+		
+		require_once( KERNEL_PATH.'class_image.php' );
+		$image = new class_image();
+		
+		$image->in_type        = 'file';
+		$image->out_type       = 'file';
+		$image->in_file_dir    = $ibforums->vars['upload_dir'];
+		$image->in_file_name   = $data['attach_location'];
+		$image->desired_width  = $ibforums->vars['siu_width'];
+		$image->desired_height = $ibforums->vars['siu_height'];
+		$image->gd_version     = $ibforums->vars['gd_version'];
+		
+		if ( $ibforums->vars['siu_thumb'] )
+		{
+			$return = $image->generate_thumbnail();
+		}
+		
+		return $return;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Increment user's post
+	// ------------------
+	// if +1 post, +1 member's cumulative
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_increment_user_post_count()
+	{
+		global $ibforums, $DB, $std;
+		
+		$pcount = "";
+		$mgroup = "";
+		
+		if ($ibforums->member['id'])
+		{
+			if ($this->forum['inc_postcount'])
+			{
+				// Increment the users post count
+				
+				$pcount = "posts=posts+1, ";
+			}
+			
+			// Are we checking for auto promotion?
+			
+			if ($ibforums->member['g_promotion'] != '-1&-1')
+			{
+				list($gid, $gposts) = explode( '&', $ibforums->member['g_promotion'] );
+				
+				if ( $gid > 0 and $gposts > 0 )
+				{
+					if ( $ibforums->member['posts'] + 1 >= $gposts )
+					{
+						$mgroup = "mgroup='$gid', ";
+						
+						if ( USE_MODULES == 1 )
+						{
+							$this->modules->register_class(&$this);
+							$this->modules->on_group_change($ibforums->member['id'], $gid);
+						}
+					}
+				}
+			}
+			
+			$ibforums->member['last_post'] = time();
+			
+			$DB->simple_construct( array( 'update' => 'members',
+										  'set'    => $pcount.$mgroup." last_post=".intval($ibforums->member['last_post']),
+										  'where'  => 'id='.$ibforums->member['id']
+								 )      );
+								 
+			$DB->simple_exec();
+		}	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Update forum's last information
+	// ------------------
+	// ^^ proper chrimbo!
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_update_forum_and_stats($tid, $title, $type='new')
+	{
+		global $ibforums, $DB, $std;
+		
+		$moderated = 0;
+		
+		//-----------------------------------------
+		// Moderated?
+		//-----------------------------------------
+		
+		if ( $this->obj['moderate'] )
+		{
+			if ( $type == 'new' and ( $this->obj['moderate'] == 1 or $this->obj['moderate'] == 2 ) )
+			{
+				$moderate = 1;
+			}
+			else if ( $type == 'reply' and ( $this->obj['moderate'] == 1 or $this->obj['moderate'] == 3 ) )
+			{
+				$moderate = 1;
+			}
+		}
+		
+		//-----------------------------------------
+		// Add to forum's last post?
+		//-----------------------------------------
+		
+		if ( ! $moderate )
+		{
+			$dbs = array( 'last_title'       => $title,
+						  'last_id'          => $tid,
+						  'last_post'        => time(),
+						  'last_poster_name' => $ibforums->member['id'] ?  $ibforums->member['name'] : $ibforums->input['UserName'],
+						  'last_poster_id'   => $ibforums->member['id'],
+					   );
+		
+			if ( $type == 'new' )
+			{
+				$ibforums->cache['stats']['total_topics']++;
+				
+				$this->forum['topics'] = intval($this->forum['topics']);
+				$dbs['topics']         = ++$this->forum['topics'];
+			}
+			else
+			{
+				$ibforums->cache['stats']['total_replies']++;
+				
+				$this->forum['posts'] = intval($this->forum['posts']);
+				$dbs['posts']         = ++$this->forum['posts'];
+			}
+		}
+		else
+		{
+			if ( $type == 'new' )
+			{
+				$this->forum['queued_topics'] = intval($this->forum['queued_topics']);
+				$dbs['queued_topics']         = ++$this->forum['queued_topics'];
+			}
+			else
+			{
+				$this->forum['queued_posts'] = intval($this->forum['queued_posts']);
+				$dbs['queued_posts']         = ++$this->forum['queued_posts'];
+			}
+		}
+		
+		$DB->do_update( 'forums', $dbs, "id=".intval($this->forum['id']) );
+		
+		//-----------------------------------------
+		// Update forum cache
+		//-----------------------------------------
+		
+		$std->update_forum_cache();
+		
+		$std->update_cache( array( 'name' => 'stats'      , 'array' => 1, 'deletefirst' => 0, 'donow' => 1 ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Remove attachment
+	// ------------------
+	// ^^ proper new year!
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_remove_attachment($aid, $post_key)
+	{
+		global $ibforums, $DB, $std;
+		
+		$DB->simple_construct( array( "select" => '*', 'from' => 'attachments',  'where' => "attach_post_key='$post_key' AND attach_id=$aid") );
+		$o = $DB->simple_exec();
+		
+		if ( $killmeh = $DB->fetch_row( $o ) )
+		{
+			if ( $killmeh['attach_location'] )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
+			}
+			if ( $killmeh['attach_thumb_location'] )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+			}
+			
+			$DB->simple_construct( array( 'delete' => 'attachments', 'where' => "attach_id={$killmeh['attach_id']}" ) );
+			$DB->simple_exec();
+			
+			//-----------------------------------------
+			// Remove from post
+			//-----------------------------------------
+			
+			$_POST['Post'] = str_replace( '[attachmentID='.$aid.']', '', $_POST['Post'] );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Convert temp uploads into permanent ones! YAY
+	// ------------------
+	// ^^ proper chinese new year!
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_make_attachments_permanent($post_key="", $tid="", $pid="", $msg="")
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Delete old unattached uploads
+		//-----------------------------------------
+		
+		$time_cutoff = time() - 7200;
+		$deadid      = array();
+		
+		$DB->simple_construct( array( "select" => '*', 'from' => 'attachments',  'where' => "attach_pid=0 and attach_msg=0 and attach_date < $time_cutoff") );
+		$DB->simple_exec();
+		
+		while( $killmeh = $DB->fetch_row() )
+		{
+			if ( $killmeh['attach_location'] )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
+			}
+			if ( $killmeh['attach_thumb_location'] )
+			{
+				@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+			}
+			
+			$deadid[] = $killmeh['attach_id'];
+		}
+		
+		if ( count($deadid) )
+		{
+			$DB->simple_construct( array( 'delete' => 'attachments', 'where' => "attach_id IN(".implode( ",",$deadid ).")" ) );
+			$DB->simple_exec();
+		}
+		
+		if ( $post_key AND ( $pid or $msg ) )
+		{
+			$DB->simple_construct( array( "select" => 'count(*) as cnt', 'from' => 'attachments',  'where' => "attach_post_key='{$post_key}'") );
+			$DB->simple_exec();
+		
+			$cnt = $DB->fetch_row();
+			
+			if ( $cnt['cnt'] )
+			{
+				if ( $msg != "" )
+				{
+					$DB->simple_construct( array( 'update' => 'attachments', 'set' => "attach_msg={$msg}", 'where' => "attach_post_key='{$post_key}'" ) );
+					$DB->simple_exec();
+				}
+				else
+				{
+					$DB->simple_construct( array( 'update' => 'attachments', 'set' => "attach_pid={$pid}", 'where' => "attach_post_key='{$post_key}'" ) );
+					$DB->simple_exec();
+				
+					$DB->simple_construct( array( 'update' => 'topics', 'set' => "topic_hasattach=topic_hasattach+{$cnt['cnt']}", 'where' => "tid={$tid}" ) );
+					$DB->simple_exec();
+				}
+			}
+		}
+		
+		return $cnt['cnt'];
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Recount how many attachments a topic has
+	// ------------------
+	//
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_recount_topic_attachments($tid="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ($tid == "")
+		{
+			return;
+		}
+		
+		//-----------------------------------------
+		// GET PIDS
+		//-----------------------------------------
+		
+		$pids  = array();
+		$count = 0;
+		
+		$DB->simple_construct( array( 'select' => 'pid', 'from' => 'posts', 'where' => "topic_id=$tid" ) );
+		$DB->simple_exec();
+				
+		while ( $p = $DB->fetch_row() )
+		{
+			$pids[] = $p['pid'];
+		}
+		
+		//-----------------------------------------
+		// GET ATTACHMENT COUNT
+		//-----------------------------------------
+		
+		if ( count($pids) )
+		{
+			$DB->simple_construct( array( "select" => 'count(*) as cnt', 'from' => 'attachments',  'where' => "attach_pid IN(".implode(",",$pids).")") );
+			$DB->simple_exec();
+			
+			$cnt = $DB->fetch_row();
+			
+			$count = intval( $cnt['cnt'] );
+		}
+		
+		$DB->simple_construct( array( 'update' => 'topics', 'set' => "topic_hasattach=$count", 'where' => "tid={$tid}" ) );
+		$DB->simple_exec();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Check out the tracker whacker
+	// ------------------
+	// ^^ proper er... May Day!
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_add_tracked_topic($tid="",$check_first=0)
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! $tid )
+		{
+			return;
+		}
+		
+		if ( $ibforums->member['id'] AND $ibforums->input['enabletrack'] == 1 )
+		{
+			if ( $check_first )
+			{
+				$DB->simple_construct( array( 'select' => 'trid', 'from' => 'tracker', 'where' => "topic_id=".intval($tid)." AND member_id=".$ibforums->member['id'] ) );
+				$DB->simple_exec();
+				
+				if ( $DB->get_num_rows() )
+				{
+					//-----------------------------------------
+					// Already tracking...
+					//-----------------------------------------
+					
+					return;
+				}
+			}
+				
+			$DB->do_insert( 'tracker', array (
+											  'member_id'        => $ibforums->member['id'],
+											  'topic_id'         => $tid,
+											  'start_date'       => time(),
+											  'topic_track_type' => $ibforums->member['auto_track'] ? $ibforums->member['auto_track'] : 'delayed' ,
+									)       );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Clean topic title
+	// ------------------
+	// ^^ proper er... um
+	/*-------------------------------------------------------------------------*/
+	
+	function pf_clean_topic_title($title="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ($ibforums->vars['etfilter_punct'])
+		{
+			$title	= preg_replace( "/\?{1,}/"      , "?"    , $title );		
+			$title	= preg_replace( "/(&#33;){1,}/" , "&#33;", $title );
+		}
+		
+		if ($ibforums->vars['etfilter_shout'])
+		{
+			$title = ucwords(strtolower($title));
+		}
+		
+		return $title;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// QUOTIN' DA' POSTAY IN DO HoooD'
+	/*-------------------------------------------------------------------------*/
+	
+	function check_multi_quote()
+	{
+		global $DB, $ibforums, $std, $forums;
+		
+		$add_tags = 0;
+		
+		if ( ! $ibforums->input['qpid'] )
+		{
+			$ibforums->input['qpid'] = preg_replace( "/[^,\d]/", "", trim($std->my_getcookie('mqtids')) );
+			
+			if ($ibforums->input['qpid'] == ",")
+			{
+				$ibforums->input['qpid'] = "";
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Came from reply button
+			//-----------------------------------------
+			
+			$ibforums->input['parent_id'] = $ibforums->input['qpid'];
+		}
+		
+		
+		if ( $ibforums->input['qpid'] )
+		{
+			$std->my_setcookie('mqtids', ',', 0);
+			
+			$this->quoted_pids = preg_split( '/,/', $ibforums->input['qpid'], -1, PREG_SPLIT_NO_EMPTY );
+			
+			//-----------------------------------------
+			// Do we have right and snapback in BBCode?
+			//-----------------------------------------
+			
+			if ( is_array( $ibforums->cache['bbcode'] ) and count( $ibforums->cache['bbcode'] ) )
+			{
+				foreach( $ibforums->cache['bbcode'] as $id => $data )
+				{
+					if ( $data['bbcode_tag'] == 'snapback' )
+					{
+						$add_tags++;
+					}
+					
+					if ( $data['bbcode_tag'] == 'right' )
+					{
+						$add_tags++;
+					}
+					
+					if ( $add_tags == 2 )
+					{
+						break;
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Get the posts from the DB and ensure we have
+			// suitable read permissions to quote them
+			//-----------------------------------------
+			
+			if ( count($this->quoted_pids) )
+			{
+				$DB->cache_add_query( 'post_get_quoted', array( 'quoted_pids' => $this->quoted_pids ) );
+				$DB->cache_exec_query();
+				
+				while ( $tp = $DB->fetch_row() )
+				{
+					if ( $std->check_perms( $forums->forum_by_id[ $tp['forum_id'] ]['read_perms']) == TRUE )
+					{
+						$tmp_post = trim( $this->parser->unconvert( $tp['post'] ) );
+				
+						if ($ibforums->vars['strip_quotes'])
+						{
+							$tmp_post = preg_replace( "#\[QUOTE(=.+?,.+?)?\].+?\[/QUOTE\]#is", "", $tmp_post );
+							
+							$tmp_post = preg_replace( "#(?:\n|\r){3,}#s", "\n", trim($tmp_post) );
+						}
+						
+						$extra = "";
+						
+						if ( $add_tags == 2 )
+						{
+							$extra = '[right][snapback]'.$tp['pid'].'[/snapback][/right]'."\n";
+						}
+				
+						$raw_post .= '[quote='.str_replace(']', chr(173).']', $tp['author_name']).','.$std->get_date( $tp['post_date'], 'LONG', 1 ).']'."\n$tmp_post\n".$extra.'[/quote]'."\n\n\n";
+					}
+				}
+				
+				$raw_post = trim($raw_post)."\n";
+			}
+		}
+		
+		if ( $_POST['Post'] )
+		{
+			//-----------------------------------------
+			// Raw post from preview?
+			//-----------------------------------------
+		
+			$raw_post .= isset($_POST['Post']) ? $std->txt_htmlspecialchars($_POST['Post']) : "";
+	
+			if (isset($raw_post))
+			{
+				$raw_post = $std->txt_raw2form($raw_post);
+			}
+		}
+		
+		return $raw_post;
+	}
+	
+	function smilie_alpha_sort($a, $b)
+	{
+		return strcmp( $a['typed'], $b['typed'] );
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Profile.php b/upload/sources/profile.php
similarity index 51%
rename from upload/sources/Profile.php
rename to upload/sources/profile.php
index 414ed873..324ef85c 100644
--- a/upload/sources/Profile.php
+++ b/upload/sources/profile.php
@@ -2,16 +2,15 @@
 
 /*
 +--------------------------------------------------------------------------
-|   Invision Power Board v1.3.1 Final
-|   ========================================
+|   Invision Power Board v2.0.0 
+|   =============================================
 |   by Matthew Mecham
-|   (c) 2001 - 2003 Invision Power Services
+|   (c) 2001 - 2004 Invision Power Services, Inc.
 |   http://www.invisionpower.com
-|   ========================================
+|   =============================================
 |   Web: http://www.invisionboard.com
-|   Time: Thu, 23 Sep 2004 23:05:01 GMT
-|   Release: 3cb325c445e1909182084806ae7f8226
-|   Email: matt@invisionpower.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
 |   Licence Info: http://www.invisionboard.com/?license
 +---------------------------------------------------------------------------
 |
@@ -20,19 +19,23 @@
 |   > Date started: 28th February 2002
 |
 |	> Module Version Number: 1.0.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
 +--------------------------------------------------------------------------
 */
 
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
 
-$idx = new Profile;
-
-class Profile {
-
+class profile
+{
     var $output     = "";
     var $page_title = "";
     var $nav        = array();
     var $html       = "";
-    var $parser;
 
     var $member     = array();
     var $m_group    = array();
@@ -57,38 +60,31 @@ class Profile {
     
     var $lib;
     
-    function Profile() {
-    	global $ibforums, $DB, $std, $print;
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
     
-    	require "./sources/lib/post_parser.php";
+    	require ROOT_PATH."sources/lib/post_parser.php";
         
         $this->parser = new post_parser();
+        $this->parser->check_caches();
     	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// Require the HTML and language modules
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$ibforums->lang = $std->load_words($ibforums->lang, 'lang_profile'  , $ibforums->lang_id );
     	
     	$this->html = $std->load_template('skin_profile');
     	
-    	$this->base_url        = $ibforums->base_url;
-    	$this->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
+    	$ibforums->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
     	
-    	//--------------------------------------------
-    	// Check viewing permissions, etc
-		//--------------------------------------------
-		
-		$this->member  = $ibforums->member;
-		$this->m_group = $ibforums->member;
-		
-    	
-    	//--------------------------------------------
+    	//-----------------------------------------
     	// What to do?
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
-    	
-    	switch($ibforums->input['CODE']) {
+    	switch($ibforums->input['CODE'])
+    	{
     		case '03':
     			$this->view_profile();
     			break;
@@ -100,7 +96,7 @@ class Profile {
     		case 'showcard':
     			$this->show_card();
     		
-    		//------------------------------
+    		//-----------------------------------------
     		default:
     			$this->view_profile();
     			break;
@@ -108,21 +104,17 @@ class Profile {
     	
     	// If we have any HTML to print, do so...
     	
-    	
     	$print->add_output("$this->output");
         $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 1, NAV => $this->nav ) );
-    		
  	}
  	
- 	//---------------------------------------------------------------------------
- 	//
+ 	/*-------------------------------------------------------------------------*/
  	// VIEW CONTACT CARD:
- 	//
- 	//---------------------------------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function show_card()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		$info = array();
  		
@@ -131,9 +123,9 @@ class Profile {
  			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
     	}
  		
- 		//--------------------------------------------
+ 		//-----------------------------------------
     	// Check input..
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$id = intval($ibforums->input['MID']);
     	
@@ -142,11 +134,12 @@ class Profile {
     		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'incorrect_use' ) );
     	}
     	
-    	$DB->query("SELECT * FROM ibf_members WHERE id=$id");
-    	
+    	$DB->cache_add_query( 'generic_get_all_member', array( 'mid' => $id ) );
+		$DB->cache_exec_query();
+		
     	$member = $DB->fetch_row();
     	
-    	$member['password'] = '';
+    	$member['website'] = $member['website'] == 'http://' ? '' : $member['website'];
     	
     	$info['aim_name']    = $member['aim_name']   ? $member['aim_name']   : $ibforums->lang['no_info'];
     	$info['icq_number']  = $member['icq_number'] ? $member['icq_number'] : $ibforums->lang['no_info'];
@@ -154,7 +147,7 @@ class Profile {
     	$info['location']    = $member['location']   ? $member['location']   : $ibforums->lang['no_info'];
     	$info['interests']   = $member['interests']  ? $member['interests']  : $ibforums->lang['no_info'];
     	$info['msn_name']    = $member['msnname']    ? $member['msnname']    : $ibforums->lang['no_info'];
-    	$info['integ_msg']   = $member['integ_msg']  ? $member['integ_msg']  : $ibforums->lang['no_info'];
+    	$info['website']     = $member['website']    ? "<a href='{$member['website']}' target='_blank'>{$member['website']}</a>" : $ibforums->lang['no_info'];
     	$info['mid']         = $member['id'];
     	
     	if (!$member['hide_email'])
@@ -181,8 +174,42 @@ class Profile {
     	{
     		$photo = str_replace( "<{NO_PHOTO}>", "No Photo Available", $photo );
     		$html  = $this->html->show_card_download( $member['name'], $photo, $info );
+    		$html  = str_replace( "<!--CSS-->", $ibforums->skin['_css'], $html );
+    		
+    		//-----------------------------------------
+    		// Macros
+    		//-----------------------------------------
+    		
+    		$macros = unserialize(stripslashes($ibforums->skin['_macro']));
+    		
+    		if ( is_array( $macros ) )
+			{
+				foreach( $macros as $i => $row )
+				{
+					if ($row['macro_value'] != "")
+					{
+						$html = str_replace( "<{".$row['macro_value']."}>", $row['macro_replace'], $html );
+					}
+				}
+			}
+			
+			//-----------------------------------------
+			// Images
+			//-----------------------------------------
+			
+			$html = str_replace( "<#IMG_DIR#>", $ibforums->skin['_imagedir'], $html );
+			
+    		if ( ! $ibforums->vars['ipb_img_url'] )
+			{
+				$ibforums->vars['ipb_img_url'] = preg_replace( "#/$#", "", $ibforums->vars['board_url'] ) . '/';
+			}
+			
+			$html = preg_replace( "#img\s+?src=[\"']style_(images|avatars|emoticons)(.+?)[\"'](.+?)?".">#is", "img src=\"".$ibforums->vars['ipb_img_url']."style_\\1\\2\"\\3>", $html );
+    		
+    		//-----------------------------------------
+    		// Download
+    		//-----------------------------------------
     		
-    		@flush();
 			@header("Content-type: unknown/unknown");
 			@header("Content-Disposition: attachment; filename={$member['name']}.html");
 			print $html;
@@ -194,18 +221,15 @@ class Profile {
 			
 			$print->pop_up_window( $ibforums->lang['photo_title'], $html );
     	}
-    	
     }
  	
- 	//---------------------------------------------------------------------------
- 	//
+ 	/*-------------------------------------------------------------------------*/
  	// VIEW PHOTO:
- 	//
- 	//---------------------------------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function show_photo()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
  		
  		$info = array();
  		
@@ -214,9 +238,9 @@ class Profile {
  			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
     	}
  		
- 		//--------------------------------------------
+ 		//-----------------------------------------
     	// Check input..
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$id = intval($ibforums->input['MID']);
     	
@@ -239,30 +263,32 @@ class Profile {
     	$html  = $this->html->show_photo( $this->photo_member['name'], $photo );
     	
     	$print->pop_up_window( $ibforums->lang['photo_title'], $html );
-    	
     }
     
-    
-    //---------------------------------------------------------------------------
- 	//
+    /*-------------------------------------------------------------------------*/
  	// FUNC: RETURN PHOTO
- 	//
- 	//---------------------------------------------------------------------------
- 	
+ 	/*-------------------------------------------------------------------------*/
     
-    function load_photo($id)
+    function load_photo($id, $member=array())
     {
-    	global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print;
     	
     	$this->show_photo  = "";
     	$this->show_height = "";
     	$this->show_width  = "";
     	
-    	$DB->query("SELECT m.id, m.name, me.photo_type, me.photo_location, me.photo_dimensions FROM ibf_member_extra me
-    	              LEFT JOIN ibf_members m ON me.id=m.id
-    			    WHERE m.id=$id");
+    	if ( ! isset( $member['photo_type'] ) )
+    	{
+			$DB->cache_add_query( 'profile_get_all', array( 'mid' => $id ) );
     	
-    	$this->photo_member = $DB->fetch_row();
+    		$DB->cache_exec_query();
+			
+			$this->photo_member = $DB->fetch_row();
+    	}
+    	else
+    	{
+    		$this->photo_member = $member;
+    	}
     	
     	if ( $this->photo_member['photo_type'] and $this->photo_member['photo_location'] )
     	{
@@ -291,16 +317,15 @@ class Profile {
     	}
     }
     
- 	
- 	//---------------------------------------------------------------------------
- 	//
+ 	/*-------------------------------------------------------------------------*/
  	// VIEW MAIN PROFILE:
- 	//
- 	//---------------------------------------------------------------------------
+ 	/*-------------------------------------------------------------------------*/
  	
  	function view_profile()
  	{
- 		global $ibforums, $DB, $std, $print;
+		global $ibforums, $DB, $std, $print, $forums;
+ 		
+ 		$this->topic_html = $std->load_template('skin_topic');
  		
  		$info = array();
  		
@@ -309,43 +334,45 @@ class Profile {
  			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
     	}
  		
- 		//--------------------------------------------
+ 		//-----------------------------------------
     	// Check input..
-    	//--------------------------------------------
+    	//-----------------------------------------
     	
     	$id = intval($ibforums->input['MID']);
     	
-    	if ( empty($id) )
+    	if ( ! $id )
     	{
-    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'incorrect_use' ) );
+    		$std->boink_it( $ibforums->base_url );
     	}
     	
-    	//--------------------------------------------
-    	// Prepare Query...
-    	//--------------------------------------------
+    	//-----------------------------------------
+    	// Get all member information
+    	//-----------------------------------------
+    	
+    	$DB->cache_add_query( 'profile_get_all', array( 'mid' => $id ) );
+    	
+    	$DB->cache_exec_query();
     	
-    	$DB->query("SELECT m.*, g.g_id, g.g_title as group_title FROM ibf_members m, ibf_groups g WHERE m.id='$id' and m.mgroup=g.g_id");
     	$member = $DB->fetch_row();
     	
-    	if (empty($member['id']))
+    	if ( empty( $member['id'] ) )
     	{
     		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'incorrect_use' ) );
     	}
     	
+    	//-----------------------------------------
     	// Play it safe
+    	//-----------------------------------------
     	
     	$member['password'] = "";
     	
-    	//--------------------------------------------
-    	// Find the most posted in forum that the viewing
-    	// member has access to by this members profile
-    	//--------------------------------------------
-    	
-    	$DB->query("SELECT id, read_perms FROM ibf_forums");
+    	//-----------------------------------------
+    	// Most posted forum
+    	//-----------------------------------------
     	
     	$forum_ids = array('0');
     	
-    	while ( $r = $DB->fetch_row() )
+    	foreach( $forums->forum_by_id as $i => $r )
     	{
     		if ( $std->check_perms($r['read_perms']) == TRUE )
     		{
@@ -353,24 +380,26 @@ class Profile {
     		}
     	}
     	
-    	$forum_id_str = implode( ",", $forum_ids );
+    	$DB->cache_add_query( 'profile_get_favourite', array( 'mid' => $member['id'], 'fid_array' => $forum_ids ) );
+    	
+    	$DB->cache_exec_query();
+    	
+    	$favourite   = $DB->fetch_row();
+    	
+    	//-----------------------------------------
+    	// Post count stats
+    	//-----------------------------------------
     	
     	$percent = 0;
     	
-    	$DB->query("SELECT DISTINCT(p.forum_id), f.name, COUNT(p.author_id) as f_posts FROM ibf_posts p, ibf_forums f ".
-    			   "WHERE p.forum_id IN ($forum_id_str) AND p.author_id='".$member['id']."' AND p.forum_id=f.id GROUP BY p.forum_id ORDER BY f_posts DESC");
-    			   
-    	$favourite   = $DB->fetch_row();
-    	
-    	$DB->query("SELECT COUNT(pid) as total_posts FROM ibf_posts WHERE author_id='".$member['id']."'");
-    	
+    	$DB->simple_construct( array( 'select' => 'COUNT(*) as total_posts',
+    								  'from'   => 'posts',
+    								  'where'  => "author_id={$member['id']}" ) );
+		$DB->simple_exec();
+		
     	$total_posts = $DB->fetch_row();
     	
-    	$DB->query("SELECT TOTAL_TOPICS, TOTAL_REPLIES FROM ibf_stats");
-    	
-    	$stats = $DB->fetch_row();
-    	
-    	$board_posts = $stats['TOTAL_TOPICS'] + $stats['TOTAL_REPLIES'];
+    	$board_posts = $ibforums->cache['stats']['total_topics'] + $ibforums->cache['stats']['total_replies'];
     	
     	if ($total_posts['total_posts'] > 0)
     	{
@@ -388,26 +417,135 @@ class Profile {
     		$info['posts_day'] = $member['posts'];
     	}
     	
+    	//-----------------------------------------
+    	// Pips / Icon
+    	//-----------------------------------------
+    	
+    	$pips = 0;
+		
+		foreach($ibforums->cache['ranks'] as $k => $v)
+		{
+			if ($member['posts'] >= $v['POSTS'])
+			{
+				if (!$member['title'])
+				{
+					$member['title'] = $ibforums->cache['ranks'][ $k ]['TITLE'];
+				}
+				
+				$pips = $v['PIPS'];
+				break;
+			}
+		}
+		
+		if ($ibforums->cache['group_cache'][ $member['mgroup'] ]['g_icon'])
+		{
+			$member['member_rank_img'] = $this->topic_html->member_rank_img($ibforums->cache['group_cache'][ $member['mgroup'] ]['g_icon']);
+		}
+		else if ($pips)
+		{
+			if ( is_numeric( $pips ) )
+			{
+				for ($i = 1; $i <= $pips; ++$i)
+				{
+					$member['member_rank_img'] .= "<{A_STAR}>";
+				}
+			}
+			else
+			{
+				$member['member_rank_img'] = $this->topic_html->member_rank_img('style_images/<#IMG_DIR#>/folder_team_icons/'.$pips);
+			}
+		}
+    	
+    	//-----------------------------------------
+    	// More info...
+    	//-----------------------------------------
+    	
     	$info['posts']       = $member['posts'] ? $member['posts'] : 0;
     	$info['name']        = $member['name'];
     	$info['mid']         = $member['id'];
-    	$info['fav_forum']   = $favourite['name'];
+    	$info['fav_forum']   = $ibforums->cache['forum_cache'][ $favourite['forum_id'] ]['name'];
     	$info['fav_id']      = $favourite['forum_id'];
     	$info['fav_posts']   = $favourite['f_posts'];
     	$info['percent']     = $percent;
-    	$info['group_title'] = $member['group_title'];
+    	$info['group_title'] = $ibforums->cache['group_cache'][ $member['mgroup'] ]['g_title'];
     	$info['board_posts'] = $board_posts;
     	$info['joined']      = $std->get_date( $member['joined'], 'JOINED' );
+    	$info['last_active'] = $std->get_date( $member['last_activity'], 'SHORT' );
     	
     	$info['member_title'] = $member['title']     ? $member['title']      : $ibforums->lang['no_info'];
     	
-    	$info['aim_name']    = $member['aim_name']   ? $member['aim_name']   : $ibforums->lang['no_info'];
-    	$info['icq_number']  = $member['icq_number'] ? $member['icq_number'] : $ibforums->lang['no_info'];
-    	$info['yahoo']       = $member['yahoo']      ? $member['yahoo']      : $ibforums->lang['no_info'];
-    	$info['location']    = $member['location']   ? $member['location']   : $ibforums->lang['no_info'];
-    	$info['interests']   = $member['interests']  ? $member['interests']  : $ibforums->lang['no_info'];
-    	$info['msn_name']    = $member['msnname']    ? $member['msnname']    : $ibforums->lang['no_info'];
-    	$info['integ_msg']   = $member['integ_msg']  ? $member['integ_msg']  : $ibforums->lang['no_info'];
+    	$info['aim_name']        = $member['aim_name']   ? $member['aim_name']   : $ibforums->lang['no_info'];
+    	$info['icq_number']      = $member['icq_number'] ? $member['icq_number'] : $ibforums->lang['no_info'];
+    	$info['yahoo']           = $member['yahoo']      ? $member['yahoo']      : $ibforums->lang['no_info'];
+    	$info['location']        = $member['location']   ? $member['location']   : $ibforums->lang['no_info'];
+    	$info['interests']       = $member['interests']  ? $member['interests']  : $ibforums->lang['no_info'];
+    	$info['msn_name']        = $member['msnname']    ? $member['msnname']    : $ibforums->lang['no_info'];
+    	$info['member_rank_img'] = $member['member_rank_img'];
+    	
+    	//-----------------------------------------
+		// Online, offline?
+		//-----------------------------------------
+		
+		$time_limit = time() - $ibforums->vars['au_cutoff'] * 60;
+		
+		$info['online_status_indicator'] = '<{PB_USER_OFFLINE}>';
+		$info['online_extra']            = '('.$ibforums->lang['online_offline'].')';
+		
+		list( $be_anon, $loggedin ) = explode( '&', $member['login_anonymous'] );
+		
+		if ( ( $member['last_visit'] > $time_limit or $member['last_activity'] > $time_limit ) AND $be_anon != 1 AND $loggedin == 1 )
+		{
+			$info['online_status_indicator'] = '<{PB_USER_ONLINE}>';
+			
+			//-----------------------------------------
+			// Where?
+			//-----------------------------------------
+			
+			$where = "";
+			
+			if ( $member['in_topic'] )
+			{
+				$topic = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'topics', 'where' => 'tid='.$member['in_topic'] ) );
+				
+				if ( $topic['tid'] )
+				{
+					if ( $std->check_perms($ibforums->cache['forum_cache'][ $topic['forum_id'] ]['read_perms']) == TRUE )
+					{
+						$where = $ibforums->lang['wol_topic'].': '."<a href='{$ibforums->base_url}showtopic={$topic['tid']}'>{$topic['title']}</a>";
+					}
+				}
+			}
+			else if ( $member['in_forum'] )
+			{
+				if ( $std->check_perms($ibforums->cache['forum_cache'][ $member['in_forum'] ]['read_perms']) == TRUE )
+				{
+					$where = $ibforums->lang['wol_forum'].' '.$ibforums->cache['forum_cache'][ $member['in_forum'] ]['name'];
+				}
+			}
+			else if ( strstr( strtolower($member['sesslocation']), 'usercp' ) or strstr( strtolower($member['sesslocation']), 'msg' ) )
+			{	
+				$where = $ibforums->lang['wol_ucp'];
+			}
+			else if ( strstr( strtolower($member['sesslocation']), 'profile' )  )
+			{	
+				$where = $ibforums->lang['wol_profile'];
+			}
+			else if ( strstr( strtolower($member['sesslocation']), 'search' )  )
+			{	
+				$where = $ibforums->lang['wol_search'];
+			}
+			
+			if ( ! $where )
+			{
+				$where = $ibforums->lang['wol_index'];
+			}
+					
+			$info['online_extra'] = '('.$where.')';
+		}
+		
+    	//-----------------------------------------
+    	// Time...
+    	//-----------------------------------------
     	
     	$ibforums->vars['time_adjust'] = $ibforums->vars['time_adjust'] == "" ? 0 : $ibforums->vars['time_adjust'];
     	
@@ -416,18 +554,23 @@ class Profile {
     		$member['time_offset'] += 1;
     	}
     	
-    	// This is a useless comment. Completely void of any useful information
-    	
     	$info['local_time']  = $member['time_offset'] != "" ? gmdate( $ibforums->vars['clock_long'], time() + ($member['time_offset']*3600) + ($ibforums->vars['time_adjust'] * 60) ) : $ibforums->lang['no_info'];
     	
-    	$info['avatar']      = $std->get_avatar( $member['avatar'] , 1, $member['avatar_size'] );
+    	$info['avatar']      = $std->get_avatar( $member['avatar_location'] , 1, $member['avatar_size'], $member['avatar_type'] );
+    	
+    	//-----------------------------------------
+    	// Siggy
+    	//-----------------------------------------
     	
     	$info['signature']   = $member['signature'];
     	
-    	if ( $ibforums->vars['sig_allow_html'] == 1 )
-		{
-			$info['signature'] = $this->parser->parse_html($info['signature'], 0);
-		}
+    	$this->parser->pp_do_html = intval($ibforums->vars['sig_allow_html']);
+		
+		$info['signature'] = $this->parser->post_db_parse($info['signature']);
+    	
+    	//-----------------------------------------
+    	// site
+    	//-----------------------------------------
     	
     	if ( $member['website'] and preg_match( "/^http:\/\/\S+$/", $member['website'] ) )
     	{
@@ -438,6 +581,9 @@ class Profile {
 			$info['homepage'] = $ibforums->lang['no_info'];
 		}
 		
+    	//-----------------------------------------
+    	// Birthday
+    	//-----------------------------------------
     	
     	if ($member['bday_month'])
     	{
@@ -448,20 +594,24 @@ class Profile {
     		$info['birthday'] = $ibforums->lang['no_info'];
     	}
     	
+    	//-----------------------------------------
+    	// Email
+    	//-----------------------------------------
     	
-    	if (!$member['hide_email']) {
-			$info['email'] = "<a href='{$this->base_url}act=Mail&amp;CODE=00&amp;MID={$member['id']}'>{$ibforums->lang['click_here']}</a>";
+    	if ( ! $member['hide_email'] )
+    	{
+			$info['email'] = "<a href='{$ibforums->base_url}act=Mail&amp;CODE=00&amp;MID={$member['id']}'>{$ibforums->lang['email']}</a>";
 		}
 		else
 		{
 			$info['email'] = $ibforums->lang['private'];
 		}
 		
-		//---------------------------------------------------
+		//-----------------------------------------
 		// Get photo and show profile:
-		//---------------------------------------------------
+		//-----------------------------------------
 		
-		$this->load_photo($id);
+		$this->load_photo( $member['id'], $member );
 		
 		if ( $this->has_photo == TRUE )
     	{
@@ -472,95 +622,63 @@ class Profile {
     		$info['photo'] = "";
     	}
     	
-    	$info['base_url'] = $this->base_url;
+    	$info['base_url'] = $ibforums->base_url;
     	
     	$info['posts'] = $std->do_number_format($info['posts']);
     	
-    	//---------------------------------------------------
+    	//-----------------------------------------
     	// Output
-    	//---------------------------------------------------
+    	//-----------------------------------------
     	
-    	$this->output .= $this->html->show_profile( $info );
+    	$this->output .= $this->html->show_profile( $info, $std->return_md5_check() );
     	
-    	//---------------------------------------------------
+    	//-----------------------------------------
     	// Is this our profile?
-    	//---------------------------------------------------
+    	//-----------------------------------------
     	
-    	if ($member['id'] == $this->member['id'])
+    	if ($member['id'] == $ibforums->member['id'])
     	{
-    		$this->output = preg_replace( "/<!--MEM OPTIONS-->/e", "\$this->html->user_edit(\$info)", $this->output );
+    		$this->output = preg_replace( "/<!--MEM OPTIONS-->/", $this->html->user_edit($info), $this->output );
     	}
     	
-    	//---------------------------------------------------
-    	// Can mods see the hidden parts of this profile?
-    	//---------------------------------------------------
+        //-----------------------------------------
+    	// Get custom profile information
+    	//-----------------------------------------
     	
-    	$query_extra = 'WHERE fedit=1 AND fhide <> 1';
-    	$custom_out  = "";
-    	$field_data  = array();
+    	require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
     	
-    	if ($ibforums->member['id'])
-        {
-        	if ($ibforums->member['g_is_supmod'] == 1)
-        	{
-        		$query_extra = "";
-        	}
-        	else if ($ibforums->member['mgroup'] == $ibforums->vars['admin_group'])
-        	{
-        		$query_extra = "";
-        	}
-        }
-        
-        $DB->query("SELECT * from ibf_pfields_content WHERE member_id='".$member['id']."'");
-		
-		while ( $content = $DB->fetch_row() )
-		{
-			foreach($content as $k => $v)
-			{
-				if ( preg_match( "/^field_(\d+)$/", $k, $match) )
-				{
-					$field_data[ $match[1] ] = $v;
-				}
-			}
-		}
-		
-		$DB->query("SELECT * from ibf_pfields_data $query_extra ORDER BY forder");
-		
-		while( $row = $DB->fetch_row() )
-		{
-			if ($row['ftype'] == 'drop')
-			{
-				$carray = explode( '|', trim($row['fcontent']) );
-				
-				foreach( $carray as $entry )
-				{
-					$value = explode( '=', $entry );
-					
-					$ov = trim($value[0]);
-					$td = trim($value[1]);
-					
-					if ($field_data[ $row['fid'] ] == $ov)
-					{
-						$field_data[ $row['fid'] ] = $td;
-					}
-				}
-			}
-			else
-			{
-				$field_data[ $row['fid'] ] = ($field_data[ $row['fid'] ] == "") ? $ibforums->lang['no_info'] : nl2br($field_data[ $row['fid'] ]);
-			}
-			
-    		$custom_out .= $this->html->custom_field($row['ftitle'], $field_data[ $row['fid'] ] );
+    	$fields->member_id   = $ibforums->member['id'];
+    	$fields->mem_data_id = $member['id'];
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_view();
+    	
+    	foreach( $fields->out_fields as $id => $data )
+    	{
+    		if ( ! $data )
+    		{
+    			$data = $ibforums->lang['no_info'];
+    		}
+    		
+			$custom_out .= $this->html->custom_field( $fields->field_names[ $id ], nl2br($data) );
     	}
     	
     	if ($custom_out != "")
     	{
     		$this->output = str_replace( "<!--{CUSTOM.FIELDS}-->", $custom_out, $this->output );
     	}
+    	else
+    	{
+    		$this->output = str_replace( "<!--{CUSTOM.FIELDS}-->", $this->html->no_custom_information(), $this->output );
+    	}
     	
-    	//---------------------------------------------------
+    	//-----------------------------------------
     	// Warning stuff!!
-    	//---------------------------------------------------
+    	//-----------------------------------------
     	
     	$pass = 0;
     	$mod  = 0;
@@ -574,17 +692,6 @@ class Profile {
 					$pass = 1;
 					$mod  = 1;
 				}
-				else
-				{
-					$DB->query("SELECT * FROM ibf_moderators WHERE (member_id=".$ibforums->member['id']." OR (is_group=1 AND group_id=".$ibforums->member['mgroup']."))");
-					$this->moderator = $DB->fetch_row();
-					
-					if ( $this->moderator['mid'] AND $this->moderator['allow_warn'] == 1 )
-					{
-						$pass = 1;
-						$mod  = 1;
-					}
-				}
 				
 				if ( $pass == 0 and ( $ibforums->vars['warn_show_own'] and ( $member['id'] == $ibforums->member['id'] ) ) )
 				{
@@ -674,7 +781,6 @@ class Profile {
     	
  		$this->page_title = $ibforums->lang['page_title'];
  		$this->nav        = array( $ibforums->lang['page_title'] );
- 		
  	}
  	
  	
diff --git a/upload/sources/register.php b/upload/sources/register.php
new file mode 100644
index 00000000..cfe2532d
--- /dev/null
+++ b/upload/sources/register.php
@@ -0,0 +1,1845 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Registration functions
+|   > Module written by Matt Mecham
+|   > Date started: 16th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class register {
+
+    var $output     = "";
+    var $page_title = "";
+    var $nav        = array();
+    var $html       = "";
+    var $email      = "";
+    var $modules    = "";
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	//-----------------------------------------
+    	// Require the HTML and language modules
+    	//-----------------------------------------
+    	
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_register', $ibforums->lang_id );
+    	
+    	$this->html = $std->load_template('skin_register');
+    	
+    	$this->base_url        = $ibforums->base_url;
+    	$this->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
+    	
+    	//-----------------------------------------
+    	// Get the emailer module
+		//-----------------------------------------
+		
+		require ROOT_PATH."sources/classes/class_email.php";
+		
+		$this->email = new emailer();
+		
+		if ( USE_MODULES == 1 )
+		{
+			require ROOT_PATH."modules/ipb_member_sync.php";
+			
+			$this->modules = new ipb_member_sync();
+		}
+		
+		//-----------------------------------------
+		// Board offline?
+		//-----------------------------------------
+		
+		if ($ibforums->vars['board_offline'] == 1)
+		{
+			if ($ibforums->member['g_access_offline'] != 1)
+			{
+				$ibforums->vars['no_reg'] = 1;
+			}
+		}
+    	
+    	//-----------------------------------------
+    	// What to do?
+    	//-----------------------------------------
+    	
+    	switch($ibforums->input['CODE'])
+    	{
+    		case '02':
+    			$this->create_account();
+    			break;
+    			
+    		case '03':
+    			$this->validate_user();
+    			break;
+
+    		case '05':
+    			$this->show_manual_form();
+    			break;
+    			
+    		case '06':
+    			$this->show_manual_form('lostpass');
+    			break;
+    			
+    		case 'lostpassform':
+    			$this->show_manual_form('lostpass');
+    			break;
+    			
+    		case '07':
+    			$this->show_manual_form('newemail');
+    			break;
+    			
+    		case '10':
+    			$this->lost_password_start();
+    			break;
+    		case '11':
+    			$this->lost_password_end();
+    			break;
+    			
+    		case '12':
+    			$this->coppa_perms_form();
+    			break;
+    			
+    		case 'coppa_two':
+    			$this->coppa_two();
+    			break;
+    			
+    		case 'image':
+    			$this->show_image();
+    			break;
+    			
+    		case 'reval':
+    			$this->revalidate_one();
+    			break;
+    			
+    		case 'reval2':
+    			$this->revalidate_two();
+    			break;
+
+    		default:
+    			if ($ibforums->vars['use_coppa'] == 1 and $ibforums->input['coppa_pass'] != 1)
+    			{
+    				$this->coppa_start();
+    			}
+    			else
+    			{
+    				$this->show_reg_form();
+    			}
+    			break;
+    	}
+    	
+    	// If we have any HTML to print, do so...
+    	
+    	$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// Show "check revalidate form" er.. form. thing.
+	// ------------------
+	//  
+	/*-------------------------------------------------------------------------*/
+	
+	function revalidate_one($errors="")
+	{
+		global $ibforums, $DB;
+		
+		if ($errors != "")
+    	{
+    		$this->output .= $this->html->errors( $ibforums->lang[$errors] );
+    	}
+    	
+    	$name = $ibforums->member['id'] == "" ? '' : $ibforums->member['name'];
+		
+		$this->output     .= $this->html->show_revalidate_form($name);
+		$this->page_title = $ibforums->lang['rv_title'];
+		$this->nav        = array( $ibforums->lang['rv_title'] );
+	}
+	
+	function revalidate_two()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------------
+		// Check in the DB for entered member name
+		//-----------------------------------------
+		
+		if ( $_POST['username'] == "" )
+		{
+			$this->revalidate_one('err_no_username');
+			return;
+		}
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "name='".$ibforums->input['username']."'" ) );
+		$DB->simple_exec();
+		
+		if ( ! $member = $DB->fetch_row() )
+		{
+			$this->revalidate_one('err_no_username');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Check in the DB for any validations
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'validating', 'where' => "member_id=".intval($member['id']) ) );
+		$DB->simple_exec();
+		
+		if ( ! $val = $DB->fetch_row() )
+		{
+			$this->revalidate_one('err_no_validations');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Which type is it then?
+		//-----------------------------------------
+		
+		if ( $val['lost_pass'] == 1 )
+		{
+			$this->email->get_template("lost_pass");
+				
+			$this->email->build_message( array(
+												'NAME'         => $member['name'],
+												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform&uid=".$member['id']."&aid=".$val['vid'],
+												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform",
+												'EMAIL'        => $member['email'],
+												'ID'           => $member['id'],
+												'CODE'         => $val['vid'],
+												'IP_ADDRESS'   => $ibforums->input['IP_ADDRESS'],
+											  )
+										);
+										
+			$this->email->subject = $ibforums->lang['lp_subject'].' '.$ibforums->vars['board_name'];
+			$this->email->to      = $member['email'];
+			
+			$this->email->send_mail();
+		}
+		else if ( $val['new_reg'] == 1 )
+		{
+			$this->email->get_template("reg_validate");
+					
+			$this->email->build_message( array(
+												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&uid=".$member['id']."&aid=".$val['vid'],
+												'NAME'         => $member['name'],
+												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=05",
+												'EMAIL'        => $member['email'],
+												'ID'           => $member['id'],
+												'CODE'         => $val['vid'],
+											  )
+										);
+										
+			$this->email->subject = $ibforums->lang['email_reg_subj']." ".$ibforums->vars['board_name'];
+			$this->email->to      = $member['email'];
+			
+			$this->email->send_mail();
+		}
+		else if ( $val['email_chg'] == 1 )
+		{
+			$this->email->get_template("newemail");
+				
+			$this->email->build_message( array(
+												'NAME'         => $member['name'],
+												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&type=newemail&uid=".$member['id']."&aid=".$val['vid'],
+												'ID'           => $member['id'],
+												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=07",
+												'CODE'         => $val['vid'],
+											  )
+										);
+										
+			$this->email->subject = $ibforums->lang['ne_subject'].' '.$ibforums->vars['board_name'];
+			$this->email->to      = $email_one;
+		}
+		else
+		{
+			$this->revalidate_one('err_no_validations');
+			return;
+		}
+		
+		$this->output .= $this->html->show_revalidated();
+		
+		$this->page_title = $ibforums->lang['rv_title'];
+		$this->nav        = array( $ibforums->lang['rv_title'] );
+	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// Coppa Start
+	// ------------------
+	// Asks the registree if they are an old git or not
+	/*-------------------------------------------------------------------------*/
+	
+	function coppa_perms_form()
+	{
+		global $ibforums, $DB, $std;
+		
+		echo($this->html->coppa_form());
+		exit();
+	}
+	
+	
+	
+	function coppa_start()
+	{
+		global $ibforums, $DB, $std;
+		
+		$coppa_date = date( 'j-F y', mktime(0,0,0,date("m"),date("d"),date("Y")-13) );
+		
+		$ibforums->lang['coppa_form_text'] = str_replace( "<#FORM_LINK#>", "<a href='{$ibforums->base_url}act=Reg&amp;CODE=12'>{$ibforums->lang['coppa_link_form']}</a>", $ibforums->lang['coppa_form_text']);
+		
+		$this->output .= $this->html->coppa_start($coppa_date);
+		
+		$this->page_title = $ibforums->lang['coppa_title'];
+		
+    	$this->nav        = array( $ibforums->lang['coppa_title'] );
+ 	}
+ 	
+ 	function coppa_two()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->lang['coppa_form_text'] = str_replace( "<#FORM_LINK#>", "<a href='{$ibforums->base_url}act=Reg&amp;CODE=12'>{$ibforums->lang['coppa_link_form']}</a>", $ibforums->lang['coppa_form_text']);
+		
+		$this->output .= $this->html->coppa_two();
+		
+		$this->page_title = $ibforums->lang['coppa_title'];
+		
+    	$this->nav        = array( $ibforums->lang['coppa_title'] );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// lost_password_start
+	// ------------------
+	// Simply shows the lostpassword form
+	// What do you want? Blood?
+	/*-------------------------------------------------------------------------*/
+	
+	function lost_password_start($errors="")
+	{
+		global $ibforums, $DB, $std;
+		
+		if ($ibforums->vars['bot_antispam'])
+		{
+			//-----------------------------------------
+			// Sort out the security code
+			//-----------------------------------------
+			
+			$r_date = time() - (60*60*6);
+			
+			//-----------------------------------------
+			// Remove old reg requests from the DB
+			//-----------------------------------------
+			
+			$DB->simple_exec_query( array( 'delete' => 'reg_antispam', 'where' => "ctime < '$r_date'" ) );
+			
+			//-----------------------------------------
+			// Set a new ID for this reg request...
+			//-----------------------------------------
+			
+			$regid = md5( uniqid(microtime()) );
+			
+			//-----------------------------------------
+			// Set a new 6 character numerical string
+			//-----------------------------------------
+			
+			mt_srand ((double) microtime() * 1000000);
+			
+			$reg_code = mt_rand(100000,999999);
+			
+			//-----------------------------------------
+			// Insert into the DB
+			//-----------------------------------------
+			
+			$DB->do_insert( 'reg_antispam', array (
+												   'regid'      => $regid,
+												   'regcode'    => $reg_code,
+												   'ip_address' => $ibforums->input['IP_ADDRESS'],
+												   'ctime'      => time(),
+									   )       );
+		}
+		
+		$this->page_title = $ibforums->lang['lost_pass_form'];
+		
+    	$this->nav        = array( $ibforums->lang['lost_pass_form'] );
+    	
+    	if ($errors != "")
+    	{
+    		$this->output .= $this->html->errors( $ibforums->lang[$errors]);
+    	}
+
+    	$this->output    .= $this->html->lost_pass_form($regid);
+    	
+    	if ($ibforums->vars['bot_antispam'] == 'gd')
+		{
+			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam_gd( $regid ), $this->output );
+		}
+		else if ($ibforums->vars['bot_antispam'] == 'gif')
+		{
+			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam( $regid ), $this->output );
+		}
+    }
+    
+    
+    /*-------------------------------------------------------------------------*/
+    // LOST PASSWORD: SEND
+    /*-------------------------------------------------------------------------*/
+    
+    function lost_password_end()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	if ($ibforums->vars['bot_antispam'])
+		{
+			//-----------------------------------------
+			// Security code stuff
+			//-----------------------------------------
+			
+			if ($ibforums->input['regid'] == "")
+			{
+				$this->lost_password_start('err_reg_code');
+				return;
+			}
+			
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'reg_antispam',
+										  'where'  => "regid='".trim(addslashes($ibforums->input['regid']))."'"
+								 )      );
+								 
+			$DB->simple_exec();
+			
+			if ( ! $row = $DB->fetch_row() )
+			{
+				$this->show_reg_form('err_reg_code');
+				return;
+			}
+			
+			if ( trim( intval($ibforums->input['reg_code']) ) != $row['regcode'] )
+			{
+				$this->lost_password_start('err_reg_code');
+				return;
+			}
+		}
+		
+    	//-----------------------------------------
+    	// Back to the usual programming! :o
+    	//-----------------------------------------
+    	
+    	if ($_POST['member_name'] == "")
+    	{
+    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
+    	}
+    	
+    	//-----------------------------------------
+		// Check for input and it's in a valid format.
+		//-----------------------------------------
+		
+		$member_name = trim(strtolower($ibforums->input['member_name']));
+		
+		if ($member_name == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_username' ) );
+		}
+    	
+    	//-----------------------------------------
+		// Attempt to get the user details from the DB
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['converge_login_method'] == 'username' )
+		{
+		
+			$DB->simple_construct( array( 'select' => 'name, id, email, mgroup', 'from' => 'members', 'where' => "LOWER(name)='$member_name'" ) );
+			$DB->simple_exec();
+		}
+		else
+		{
+			$DB->simple_construct( array( 'select' => 'name, id, email, mgroup', 'from' => 'members', 'where' => "LOWER(email)='$member_name'" ) );
+			$DB->simple_exec();
+		}
+		
+		if ( ! $DB->get_num_rows() )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
+		}
+		else
+		{
+			$member = $DB->fetch_row();
+			
+			//-----------------------------------------
+			// Is there a validation key? If so, we'd better not touch it
+			//-----------------------------------------
+			
+			if ($member['id'] == "")
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_such_user' ) );
+			}
+			
+			$validate_key = md5( $std->make_password() . time() );
+			
+			//-----------------------------------------
+			// Update the DB for this member.
+			//-----------------------------------------
+			
+			$db_str = array(
+							'vid'         => $validate_key,
+							'member_id'   => $member['id'],
+							'real_group'  => $member['mgroup'],
+							'temp_group'  => $member['mgroup'],
+							'entry_date'  => time(),
+							'coppa_user'  => 0,
+							'lost_pass'   => 1,
+							'ip_address'  => $ibforums->input['IP_ADDRESS']
+						   );
+						   
+			$DB->do_insert( 'validating', $db_str );
+			
+			//-----------------------------------------
+			// Send out the email.
+			//-----------------------------------------
+			
+    		$this->email->get_template("lost_pass");
+				
+			$this->email->build_message( array(
+												'NAME'         => $member['name'],
+												'PASSWORD'     => $new_pass,
+												'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform&uid=".$member['id']."&aid=".$validate_key,
+												'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=lostpassform",
+												'EMAIL'        => $member['email'],
+												'ID'           => $member['id'],
+												'CODE'         => $validate_key,
+												'IP_ADDRESS'   => $ibforums->input['IP_ADDRESS'],
+											  )
+										);
+										
+			$this->email->subject = $ibforums->lang['lp_subject'].' '.$ibforums->vars['board_name'];
+			$this->email->to      = $member['email'];
+			
+			$this->email->send_mail();
+			
+			$this->output = $this->html->show_lostpasswait( $member );
+		}
+    	
+    	$this->page_title = $ibforums->lang['lost_pass_form'];
+    }
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// show_reg_form
+	// ------------------
+	// Simply shows the registration form, no - really! Thats
+	// all it does. It doesn't make the tea or anything.
+	// Just the registration form, no more - no less.
+	// Unless your server went down, then it's just useless.
+	/*-------------------------------------------------------------------------*/   
+    
+    function show_reg_form($errors = "")
+    {
+		global $ibforums, $DB, $std;
+    	
+    	if ( $ibforums->vars['no_reg'] == 1 )
+    	{
+    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'reg_off' ) );
+    	}
+    	
+    	$coppa = ($ibforums->input['coppa_user'] == 1) ? 1 : 0;
+    	
+    	//-----------------------------------------
+    	// Read T&Cs yet?
+    	//-----------------------------------------
+    	
+    	if ( ! $ibforums->input['termsread'] )
+    	{
+    		//-----------------------------------------
+			// Temp Fix to HiveMail..
+			// If we have a logged in member, and a mailsign up call,
+			// we don't want to show the terms. Boink.
+			//-----------------------------------------
+			
+			if ( $ibforums->member['id'] && $ibforums->input['mailsignup'])
+			{
+				$std->boink_it( $ibforums->base_url.'act=Reg&mailsignup=1&coppa_pass=1&termsread=1&agree_to_terms=1' );
+			}
+
+    		$cache = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'conf_settings', 'where' => "conf_key='reg_rules'" ) );
+    		
+    		$text  = $cache['conf_value'] ? $cache['conf_value'] : $cache['conf_default'];
+    		
+    		$this->page_title = $ibforums->lang['registration_form'];
+    		$this->nav        = array( $ibforums->lang['registration_form'] );
+    	
+    		$this->output .= $this->html->show_terms( $std->my_nl2br($text), $coppa );
+    		return;
+    	}
+    	else
+    	{
+			//-----------------------------------------
+			// Did we agree to the t&c?
+			//-----------------------------------------
+			
+			if ( ! $ibforums->input['agree_to_terms'] )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'reg_no_agree', 'EXTRA' => $ibforums->base_url ) );
+			}
+    	}
+    	
+    	if ($ibforums->vars['reg_auth_type'])
+    	{
+    		$ibforums->lang['std_text'] .= "<br />" . $ibforums->lang['email_validate_text'];
+    	}
+    	
+    	$this->bash_dead_validations();
+    	
+    	//-----------------------------------------
+		// Clean out anti-spam stuffy
+		//-----------------------------------------
+		
+		if ($ibforums->vars['bot_antispam'])
+		{
+			// Set a new ID for this reg request...
+			
+			$regid = md5( uniqid(microtime()) );
+			
+			// Set a new 6 character numerical string
+			
+			mt_srand ((double) microtime() * 1000000);
+			
+			$reg_code = mt_rand(100000,999999);
+			
+			// Insert into the DB
+			
+			$DB->do_insert( 'reg_antispam', array (
+												   'regid'      => $regid,
+												   'regcode'    => $reg_code,
+												   'ip_address' => $ibforums->input['IP_ADDRESS'],
+												   'ctime'      => time(),
+									   )       );
+		}
+    	
+    	//-----------------------------------------
+		// Custom profile fields stuff
+		//-----------------------------------------
+		
+		$required_output = "";
+		$optional_output = "";
+		
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	
+    	$fields->init_data();
+    	$fields->parse_to_register();
+    	
+    	foreach( $fields->out_fields as $id => $data )
+    	{
+    		if ( $fields->cache_data[ $id ]['pf_not_null'] == 1 )
+			{
+				$ftype = 'required_output';
+			}
+			else
+			{
+				$ftype = 'optional_output';
+			}
+    		
+    		if ( $fields->cache_data[ $id ]['pf_type'] == 'drop' )
+			{
+				$form_element = $this->html->field_dropdown( 'field_'.$id, $data );
+			}
+			else if ( $fields->cache_data[ $id ]['pf_type'] == 'area' )
+			{
+				$data = $ibforums->input['field_'.$id] ? $ibforums->input['field_'.$id] : $data;
+				$form_element = $this->html->field_textarea( 'field_'.$id, $data );
+			}
+			else
+			{
+				$data = $ibforums->input['field_'.$id] ? $ibforums->input['field_'.$id] : $data;
+				$form_element = $this->html->field_textinput( 'field_'.$id, $data );
+			}
+			
+			${$ftype} .= $this->html->field_entry( $fields->field_names[ $id ], $fields->field_desc[ $id ], $form_element );
+    	}
+    	
+    	$this->page_title = $ibforums->lang['registration_form'];
+    	$this->nav        = array( $ibforums->lang['registration_form'] );
+    	
+    	if ($errors != "")
+    	{
+    		$this->output .= $this->html->errors( $ibforums->lang[$errors]);
+    	}
+
+    	$this->output    .= $this->html->ShowForm( array( 'TEXT'        => $ibforums->lang['std_text'],
+    												      'coppa_user'  => $coppa,
+    											 )      );
+    											 
+    	if ($ibforums->vars['bot_antispam'] == 'gd')
+		{
+			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam_gd( $regid ), $this->output );
+		}
+		else if ($ibforums->vars['bot_antispam'] == 'gif')
+		{
+			$this->output = str_replace( "<!--{REG.ANTISPAM}-->", $this->html->bot_antispam( $regid ), $this->output );
+		}
+    	
+    	if ($required_output != "")
+		{
+			$this->output = str_replace( "<!--{REQUIRED.FIELDS}-->", "\n".$required_output, $this->output );
+		}
+		
+		if ($optional_output != "")
+		{
+			$this->output = str_replace( "<!--{OPTIONAL.FIELDS}-->", $this->html->optional_title()."\n".$optional_output, $this->output );
+		}
+		
+		//-----------------------------------------
+		// Time zone...
+		//-----------------------------------------
+		
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_ucp', $ibforums->lang_id );
+		
+		$offset = ( $ibforums->input['time_offset'] != "" ) ? $ibforums->input['time_offset'] : $ibforums->vars['time_offset'];
+ 		
+ 		$time_select = "<select name='time_offset' class='forminput'>";
+ 		
+ 		foreach( $ibforums->lang as $off => $words )
+ 		{
+ 			if (preg_match("/^time_([\d\.\-]+)$/", $off, $match))
+ 			{
+				$time_select .= $match[1] == $offset ? "<option value='{$match[1]}' selected='selected'>$words</option>"
+												     : "<option value='{$match[1]}'>$words</option>";
+ 			}
+ 		}
+ 		
+ 		$time_select .= "</select>";
+ 		
+ 		$this->output = str_replace( "<!--{TIME_ZONE}-->", "\n".$time_select, $this->output );
+		
+		//-----------------------------------------
+		// Boxes checked?
+		//-----------------------------------------
+		
+		$admin_checked = 'checked="checked"';
+		
+		if ( $ibforums->input['CODE'] == '02' )
+		{
+			//-----------------------------------------
+			// Form submitted...
+			//-----------------------------------------
+			
+			if ( ! $ibforums->input['allow_admin_mail'] )
+			{
+				$admin_checked = '';
+			}
+		}
+		
+		$member_checked = $ibforums->input['allow_member_mail'] ? 'checked="checked"' : '';
+		$dst_checked    = $ibforums->input['dst']               ? 'checked="checked"' : '';
+		
+		$this->output = str_replace( "<!--[admin.checked]-->" , $admin_checked , $this->output );
+		$this->output = str_replace( "<!--[member.checked]-->", $member_checked, $this->output );
+		$this->output = str_replace( "<!--[dst.checked]-->"   , $dst_checked   , $this->output );
+		
+		//-----------------------------------------
+		// Subscribe on register?
+		//-----------------------------------------
+		
+		$all_currency = array();
+		$def_currency = "";
+		$subs         = array();
+		$subs_output  = "";
+		$desc_output  = "";
+		
+		if ( $ibforums->vars['subsm_show_reg'] )
+		{
+			$ibforums->lang = $std->load_words($ibforums->lang, 'lang_subscriptions', $ibforums->lang_id );
+			
+			//-----------------------------------------
+			// Get currency buns!
+			// Ok, we did that joke in another module and it
+			// wasn't funny then
+			//-----------------------------------------
+			
+    		$DB->simple_construct( array( 'select' => '*', 'from' => 'subscription_currency' ) );
+    		$DB->simple_exec();
+    		
+			while ( $c = $DB->fetch_row() )
+			{
+				$all_currency[ $c['subcurrency_code'] ] = $c;
+				
+				if ( $c['subcurrency_default'] )
+				{
+					$def_currency = $c;
+				}
+			}
+			
+			//-----------------------------------------
+			// Get subscription packages
+			//-----------------------------------------
+			
+			$sub_output = $this->html->subsm_start( $def_currency['subcurrency_code'] );
+			
+			//-----------------------------------------
+			// Enforcing?
+			//-----------------------------------------
+			
+			if ( ! $ibforums->vars['subsm_enforce'] )
+			{
+				$sub_output .= $this->html->subsm_row( '0', $ibforums->lang['subsm_none'], '0.00', $ibforums->lang['subsm_na'] );
+			}
+			
+			$DB->simple_construct( array( 'select' => '*', 'from' => 'subscriptions', 'order' => 'sub_cost' ) );
+    		$DB->simple_exec();
+    		
+			while ( $row = $DB->fetch_row() )
+			{
+				$duration = $row['sub_length'];
+			
+				if ( $duration > 1 )
+				{
+					$duration .= ' '.$ibforums->lang[ 'timep_'.$row['sub_unit'] ];
+				}
+				else
+				{
+					$duration .= ' '.$ibforums->lang[ 'time_'.$row['sub_unit'] ];
+				}
+				
+				$sub_output .= $this->html->subsm_row( $row['sub_id'],
+													   $row['sub_title'],
+													   sprintf( "%.2f", $row['sub_cost']  * $def_currency['subcurrency_exchange'] ),
+													   $duration
+													 );
+				$desc_output .= "\nvar subsdesc_{$row['sub_id']} = '".str_replace( "'", "\\'", strip_tags( str_replace( "\n", '\n', $std->my_br2nl($row['sub_desc']) ) ) )."';";
+			}
+			
+			$sub_output .= $this->html->subsm_end();
+			
+			//-----------------------------------------
+			// Parse 'n show
+			//-----------------------------------------
+			
+			if ( $sub_output )
+			{
+				$this->output = str_replace( '<!--{SUBS.MANAGER}-->', $sub_output , $this->output );
+				$this->output = str_replace( '<!--{SUBS.JSCRIPT}-->', str_replace( "\r", "", $desc_output ), $this->output );
+			}
+			
+		}
+		
+		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+    		$this->modules->on_register_form();
+   		}
+   	}
+    
+   	/*-------------------------------------------------------------------------*/
+	// create_account
+	// ------------------
+	// Now this is a really good subroutine. It adds the member
+	// to the members table in the database. Yes, really fancy
+	// this one. It also finds the time to see if we need to
+	// check any email verification type malarky before we
+	// can use this brand new account. It's like buying a new
+	// car and getting it towed home and being told the keys
+	// will be posted later. Although you can't polish this
+	// routine while you're waiting.
+	/*-------------------------------------------------------------------------*/ 
+	
+	function create_account()
+	{
+		global $ibforums, $std, $DB, $print;
+		
+		if ($_POST['act'] == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+		}
+		
+		if ($ibforums->vars['no_reg'] == 1)
+    	{
+    		$std->Error( array( 'LEVEL' => 1, 'MSG' => 'reg_off' ) );
+    	}
+    	
+    	$coppa = ($ibforums->input['coppa_user'] == 1) ? 1 : 0;
+    	
+		//-----------------------------------------
+		// Custom profile field stuff
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	
+    	$fields->init_data();
+    	$fields->parse_to_save( 1 );
+		
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
+		
+		if ( count( $fields->error_fields['empty'] ) )
+		{
+			$this->show_reg_form('err_complete_form');
+			return;
+		}
+		
+		if ( count( $fields->error_fields['invalid'] ) )
+		{
+			$this->show_reg_form('err_invalid');
+			return;
+		}
+		
+		if ( count( $fields->error_fields['toobig'] ) )
+		{
+			$this->show_reg_form('err_cf_to_long');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Trim off the username and password
+		//-----------------------------------------
+		
+		$in_username = str_replace( '|', '&#124;' , $ibforums->input['UserName'] );
+		
+		//-----------------------------------------
+		// Remove multiple spaces in the username
+		//-----------------------------------------
+		
+		$in_username = preg_replace( "/\s{2,}/", " ", $in_username );
+		
+		//-----------------------------------------
+		// Remove 'sneaky' spaces
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['strip_space_chr'] )
+    	{
+			$in_username = str_replace( chr(160), ' ', $in_username );
+			$in_username = str_replace( chr(173), ' ', $in_username );
+		}
+		
+		//-----------------------------------------
+		// Trim up..
+		//-----------------------------------------
+		
+		$in_username  = trim($in_username);
+		
+		//-----------------------------------------
+		// Test unicode name too
+		//-----------------------------------------
+		
+		$unicode_name = preg_replace('/&#([0-9]+);/esi', "chr('\\1')", $in_username);
+		
+		$in_password = trim($ibforums->input['PassWord']);
+		$in_email    = strtolower( trim($ibforums->input['EmailAddress']) );
+		
+		$ibforums->input['EmailAddress_two'] = strtolower( trim($ibforums->input['EmailAddress_two']) );
+		
+		if ($ibforums->input['EmailAddress_two'] != $in_email)
+		{
+			$this->show_reg_form('err_email_address_match');
+			return;
+		}
+		
+		//-----------------------------------------
+		// More unicode..
+		//-----------------------------------------
+		
+		$len_u = $in_username;
+		
+		$len_u = preg_replace("/&#([0-9]+);/", "-", $len_u );
+		
+		$len_p = $in_password;
+		
+		$len_p = preg_replace("/&#([0-9]+);/", "-", $len_p );
+		
+		//-----------------------------------------
+		// Check for errors in the input.
+		//-----------------------------------------
+		
+		if (empty($in_username))
+		{
+			$this->show_reg_form('err_no_username');
+			return;
+		}
+		if (strlen($len_u) < 3)
+		{
+			$this->show_reg_form('err_no_username');
+			return;
+		}
+		if (strlen($len_u) > 32) 
+		{
+			$this->show_reg_form('err_no_username');
+			return;
+		}
+		if (empty($in_password))
+		{
+			$this->show_reg_form('err_no_password');
+			return;
+		}
+		if (strlen($len_p) < 3)
+		{
+			$this->show_reg_form('err_no_password');
+			return;
+		}
+		if (strlen($len_p) > 32) 
+		{
+			$this->show_reg_form('err_no_password');
+			return;
+		}
+		if ($ibforums->input['PassWord_Check'] != $in_password)
+		{
+			$this->show_reg_form('err_pass_match');
+			return;
+		}
+		if (strlen($in_email) < 6)
+		{
+			$this->show_reg_form('err_invalid_email');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Check the email address
+		//-----------------------------------------
+		
+		$in_email = $std->clean_email($in_email);
+		
+		if ( ! $in_email )
+		{
+			$this->show_reg_form('err_invalid_email');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Is this name already taken?
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'login_getmember', array( 'username' => strtolower($in_username) ) );
+		$DB->cache_exec_query();
+		
+		$name_check = $DB->fetch_row();
+		
+		if ($name_check['id'])
+		{
+			$this->show_reg_form('err_user_exists');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Special chars?
+		//-----------------------------------------
+		
+		if ( $unicode_name != $in_username )
+		{
+			$DB->cache_add_query( 'login_getmember', array( 'username' => strtolower($unicode_name) ) );
+			$DB->cache_exec_query();
+			
+			$name_check = $DB->fetch_row();
+			
+			if ($name_check['id'])
+			{
+				$this->show_reg_form('err_user_exists');
+				return;
+			}
+		}
+		
+		if (strtolower($in_username) == 'guest')
+		{
+			$this->show_reg_form('err_user_exists');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Is this email addy taken? CONVERGE THIS??
+		//-----------------------------------------
+		
+		if ( $ibforums->converge->converge_check_for_member_by_email( $in_email ) == TRUE )
+		{
+			$this->show_reg_form('err_email_exists');
+			return;
+		}
+		
+		//-----------------------------------------
+		// Load ban filters
+		//-----------------------------------------
+		
+		$banfilters = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'banfilters' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$banfilters[ $r['ban_type'] ][] = $r['ban_content'];
+		}
+		
+		//-----------------------------------------
+		// Are they banned [IP]?
+		//-----------------------------------------
+		
+		if ( is_array( $banfilters['ip'] ) and count( $banfilters['ip'] ) )
+		{
+			foreach ($banfilters['ip'] as $ip)
+			{
+				$ip = str_replace( '\*', '.*', preg_quote($ip, "/") );
+				
+				if ( preg_match( "/^$ip/", $ibforums->input['IP_ADDRESS'] ) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'you_are_banned', 'INIT' => 1 ) );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Are they banned [NAMES]?
+		//-----------------------------------------
+		
+		if ( is_array( $banfilters['name'] ) and count( $banfilters['name'] ) )
+		{
+			foreach ( $banfilters['name'] as $n )
+			{
+				if ( $n == "" )
+				{
+					continue;
+				}
+				
+				if ( preg_match( "/".preg_quote($n, '/' )."/i", $in_username ) )
+				{
+					$this->show_reg_form('err_user_exists');
+					return;
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Are they banned [EMAIL]?
+		//-----------------------------------------
+		
+		if ( is_array( $banfilters['email'] ) and count( $banfilters['email'] ) )
+		{
+			foreach ( $banfilters['email'] as $email )
+			{
+				$email = preg_replace( "/\*/", '.*' , $email );
+				
+				if ( preg_match( "/$email/", $in_email ) )
+				{
+					$std->Error( array( LEVEL => 1, MSG => 'you_are_banned' ) );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Check the reg_code
+		//-----------------------------------------
+		
+		if ($ibforums->vars['bot_antispam'])
+		{
+			if ($ibforums->input['regid'] == "")
+			{
+				$this->show_reg_form('err_reg_code');
+				return;
+			}
+			
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'reg_antispam',
+										  'where'  => "regid='".trim(addslashes($ibforums->input['regid']))."'"
+								 )      );
+								 
+			$DB->simple_exec();
+			
+			if ( ! $row = $DB->fetch_row() )
+			{
+				$this->show_reg_form('err_reg_code');
+				return;
+			}
+			
+			if ( trim( intval($ibforums->input['reg_code']) ) != $row['regcode'] )
+			{
+				$this->show_reg_form('err_reg_code');
+				return;
+			}
+			
+			$DB->simple_exec_query( array( 'delete' => 'reg_antispam', 'where' => "regid='".trim(addslashes($ibforums->input['regid']))."'" ) );
+		}
+		
+		//-----------------------------------------
+		// Build up the hashes
+		//-----------------------------------------
+		
+		$mem_group = $ibforums->vars['member_group'];
+		
+		//-----------------------------------------
+		// Are we asking the member or admin to preview?
+		//-----------------------------------------
+		
+		if ($ibforums->vars['reg_auth_type'])
+		{
+			$mem_group = $ibforums->vars['auth_group'];
+		}
+		else if ($coppa == 1)
+		{
+			$mem_group = $ibforums->vars['auth_group'];
+		}
+		else if ( $ibforums->vars['subsm_enforce'] )
+		{
+			$mem_group = $ibforums->vars['subsm_nopkg_group'];
+		}
+		
+		$member = array(
+						 'name'             => $in_username,
+						 'member_login_key' => $ibforums->converge->generate_auto_log_in_key(),
+						 'email'            => $in_email,
+						 'mgroup'           => $mem_group,
+						 'posts'            => 0,
+						 'joined'           => time(),
+						 'ip_address'       => $ibforums->input['IP_ADDRESS'],
+						 'time_offset'      => $ibforums->input['time_offset'],
+						 'view_sigs'        => 1,
+						 'email_pm'         => 1,
+						 'view_img'         => 1,
+						 'view_avs'         => 1,
+						 'restrict_post'    => 0,
+						 'view_pop'         => 1,
+						 'msg_total'        => 0,
+						 'new_msg'          => 0,
+						 'coppa_user'       => $coppa,
+						 'language'         => $ibforums->vars['default_language'],
+						 'dst_in_use'       => intval( $ibforums->input['dst'] ),
+						 'allow_admin_mails'=> intval( $ibforums->input['allow_admin_mail'] ),
+						 'hide_email'       => $ibforums->input['allow_member_mail'] ? 0 : 1,
+						 'subs_pkg_chosen'  => intval( $ibforums->input['subspackage'] )
+					   );
+		
+		$salt     = $ibforums->converge->generate_password_salt(5);
+		$passhash = $ibforums->converge->generate_compiled_passhash( $salt, md5($in_password) );
+					   
+		$converge = array( 'converge_email'     => $in_email,
+						   'converge_joined'    => time(),
+						   'converge_pass_hash' => $passhash,
+						   'converge_pass_salt' => str_replace( '\\', "\\\\", $salt )
+						 );
+					   
+		//-----------------------------------------
+		// Insert: CONVERGE
+		//-----------------------------------------
+		
+		$DB->do_insert( 'members_converge', $converge );
+		
+		//-----------------------------------------
+		// Get converges auto_increment user_id
+		//-----------------------------------------
+		
+		$member_id    = $DB->get_insert_id();
+		$member['id'] = $member_id;
+		
+		//-----------------------------------------
+		// Insert: MEMBERS
+		//-----------------------------------------
+		
+		$DB->force_data_type = array( 'name' => 'string' );
+									  
+		$DB->do_insert( 'members', $member );
+		
+		//-----------------------------------------
+		// Insert: MEMBER EXTRA
+		//-----------------------------------------
+		
+		$DB->do_insert( 'member_extra', array( 'id' => $member_id, 'vdirs' => 'in:Inbox|sent:Sent Items' ) );
+		
+		//-----------------------------------------
+		// Insert into the custom profile fields DB
+		//-----------------------------------------
+		
+		// Ensure deleted members profile fields are removed.
+		
+		$DB->simple_exec_query( array( 'delete' => 'pfields_content', 'where' => 'member_id='.$member['id'] ) );
+		
+		$fields->out_fields['member_id'] = $member['id'];
+				
+		$DB->do_insert( 'pfields_content', $fields->out_fields );
+				
+		//-----------------------------------------
+		// Use modules?
+		//-----------------------------------------
+		
+		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+			
+			$member['password'] = trim($ibforums->input['PassWord']);
+			
+    		$this->modules->on_create_account($member);
+    		
+    		if ( $this->modules->error == 1 )
+    		{
+    			return;
+    		}
+    		
+    		$member['password'] = "";
+   		}
+		
+		//-----------------------------------------
+		// Validation key
+		//-----------------------------------------
+		
+		$validate_key = md5( $std->make_password() . time() );
+		$time         = time();
+		
+		if ($coppa != 1)
+		{
+			if ( ($ibforums->vars['reg_auth_type'] == 'user') or ($ibforums->vars['reg_auth_type'] == 'admin') )
+			{
+			
+				// We want to validate all reg's via email, after email verificiation has taken place,
+				// we restore their previous group and remove the validate_key
+				
+				$DB->do_insert( 'validating', array (
+													  'vid'         => $validate_key,
+													  'member_id'   => $member['id'],
+													  'real_group'  => $ibforums->vars['member_group'],
+													  'temp_group'  => $ibforums->vars['auth_group'],
+													  'entry_date'  => $time,
+													  'coppa_user'  => $coppa,
+													  'new_reg'     => 1,
+													  'ip_address'  => $member['ip_address']
+											)       );
+				
+				
+				if ( $ibforums->vars['reg_auth_type'] == 'user' )
+				{
+					$this->email->get_template("reg_validate");
+					
+					$this->email->build_message( array(
+														'THE_LINK'     => $this->base_url_nosess."?act=Reg&CODE=03&uid=".urlencode($member_id)."&aid=".urlencode($validate_key),
+														'NAME'         => $member['name'],
+														'MAN_LINK'     => $this->base_url_nosess."?act=Reg&CODE=05",
+														'EMAIL'        => $member['email'],
+														'ID'           => $member_id,
+														'CODE'         => $validate_key,
+													  )
+												);
+												
+					$this->email->subject = "Registration at ".$ibforums->vars['board_name'];
+					$this->email->to      = $member['email'];
+					
+					$this->email->send_mail();
+					
+					$this->output     = $this->html->show_authorise( $member );
+					
+				}
+				else if ( $ibforums->vars['reg_auth_type'] == 'admin' )
+				{
+					$this->output     = $this->html->show_preview( $member );
+				}
+				
+				if ($ibforums->vars['new_reg_notify'])
+				{
+					
+					$date = $std->get_date( time(), 'LONG' );
+					
+					$this->email->get_template("admin_newuser");
+				
+					$this->email->build_message( array(
+														'DATE'         => $date,
+														'MEMBER_NAME'  => $member['name'],
+													  )
+												);
+												
+					$this->email->subject = "New Registration at ".$ibforums->vars['board_name'];
+					$this->email->to      = $ibforums->vars['email_in'];
+					$this->email->send_mail();
+				}
+				
+				$this->page_title = $ibforums->lang['reg_success'];
+				
+				$this->nav        = array( $ibforums->lang['nav_reg'] );
+			}
+	
+			else
+			{
+				//-----------------------------------------
+				// We don't want to preview, or get them to validate via email.
+				//-----------------------------------------
+							 
+				$ibforums->cache['stats']['last_mem_name'] = $member['name'];
+				$ibforums->cache['stats']['last_mem_id']   = $member['id'];
+				$ibforums->cache['stats']['mem_count']    += 1;
+				
+				$std->update_cache(  array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 0 ) );
+				
+				if ($ibforums->vars['new_reg_notify'])
+				{
+					$date = $std->get_date( time(), 'LONG', 1 );
+					
+					$this->email->get_template("admin_newuser");
+				
+					$this->email->build_message( array(
+														'DATE'         => $date,
+														'MEMBER_NAME'  => $member['name'],
+													  )
+												);
+												
+					$this->email->subject = "New Registration at ".$ibforums->vars['board_name'];
+					$this->email->to      = $ibforums->vars['email_in'];
+					$this->email->send_mail();
+				}
+				
+				$std->my_setcookie("member_id"   , $member['id']              , 1);
+				$std->my_setcookie("pass_hash"   , $member['member_login_key'], 1);
+					
+				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&fromreg=1');
+			}
+		}
+		else
+		{
+			// This is a COPPA user, so lets tell them they registered OK and redirect to the form.
+			
+			$DB->do_insert( 'validating', array (
+												  'vid'         => $validate_key,
+												  'member_id'   => $member['id'],
+												  'real_group'  => $ibforums->vars['member_group'],
+												  'temp_group'  => $ibforums->vars['auth_group'],
+												  'entry_date'  => $time,
+												  'coppa_user'  => $coppa,
+												  'new_reg'     => 1,
+												  'ip_address'  => $member['ip_address']
+										)       );
+			
+			$print->redirect_screen( $ibforums->lang['cp_success'], 'act=Reg&CODE=12' );
+		}
+	} 
+    
+    /*-------------------------------------------------------------------------*/
+	// validate_user
+	// ------------------
+	// Leave a message after the tone, and I'll amuse myself
+	// by pulling faces when hearing the message later.
+	/*-------------------------------------------------------------------------*/
+	
+	function validate_user()
+	{
+		global $ibforums, $std, $DB, $print, $HTTP_POST_VARS;
+		
+		//-----------------------------------------
+		// Check for input and it's in a valid format.
+		//-----------------------------------------
+		
+		$in_user_id      = intval(trim(urldecode($ibforums->input['uid'])));
+		$in_validate_key = trim(urldecode($ibforums->input['aid']));
+		$in_type         = trim($ibforums->input['type']);
+		
+		if ($in_type == "")
+		{
+			$in_type = 'reg';
+		}
+		
+		//-----------------------------------------
+		// check input
+		//-----------------------------------------
+		
+		if (! preg_match( "/^(?:[\d\w]){32}$/", $in_validate_key ) )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
+		}
+		
+		if (! preg_match( "/^(?:\d){1,}$/", $in_user_id ) )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
+		}
+		
+		//-----------------------------------------
+		// Attempt to get the profile of the requesting user
+		//-----------------------------------------
+		
+		$member = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'members', 'where' => 'id='.$in_user_id ) );
+			
+		if ( ! $member['id'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_mem' ) );
+		}
+		
+		//-----------------------------------------
+		// Get validating info..
+		//-----------------------------------------
+		
+		if ( $in_type == 'lostpass' )
+		{
+			$validate = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'validating', 'where' => 'member_id='.$in_user_id.' and lost_pass=1' ) );
+		}
+		else
+		{
+			$validate = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'validating', 'where' => 'member_id='.$in_user_id ) );
+		}
+		
+		if ( ! $validate['member_id'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
+		}
+		
+		if (($validate['new_reg'] == 1) && ($ibforums->vars['reg_auth_type'] == "admin")) 
+		{ 
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key_not_allow' ) ); 
+		} 
+		
+		if ($validate['vid'] != $in_validate_key)
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_key_wrong' ) );
+		}
+		else
+		{
+			//-----------------------------------------
+			// REGISTER VALIDATE
+			//-----------------------------------------
+			
+			if ($in_type == 'reg')
+			{
+				if ( $validate['new_reg'] != 1 )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
+				}
+				
+				if (empty($validate['real_group']))
+				{
+					$validate['real_group'] = $ibforums->vars['member_group'];
+				}
+				
+				$DB->do_update( 'members', array( 'mgroup' => intval($validate['real_group']) ), 'id='.intval($member['id']) );
+				
+				if ( USE_MODULES == 1 )
+				{
+					$this->modules->register_class(&$this);
+    				$this->modules->on_group_change($member['id'], $validate['real_group']);
+    			}
+    			
+				//-----------------------------------------
+				// Update the stats...
+				//-----------------------------------------
+			
+				$ibforums->cache['stats']['last_mem_name'] = $member['name'];
+				$ibforums->cache['stats']['last_mem_id']   = $member['id'];
+				$ibforums->cache['stats']['mem_count']    += 1;
+				
+				$std->update_cache(  array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 0 ) );
+							 
+				$std->my_setcookie("member_id"   , $member['id']              , 1);
+				$std->my_setcookie("pass_hash"   , $member['member_login_key'], 1);
+				
+				//-----------------------------------------
+				// Remove "dead" validation
+				//-----------------------------------------
+				
+				$DB->simple_exec_query( array( 'delete' => 'validating', 'where' => "vid='".$validate['vid']."' OR (member_id={$member['id']} AND new_reg=1)" ) );
+				
+				$this->bash_dead_validations();
+					
+				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&fromreg=1');
+							 
+			}
+			
+			//-----------------------------------------
+			// LOST PASS VALIDATE
+			//-----------------------------------------
+			
+			else if ($in_type == 'lostpass')
+			{
+				if ($validate['lost_pass'] != 1)
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'lp_no_pass' ) );
+				}
+				
+				if ( $_POST['pass1'] == "" )
+				{
+					$std->Error( array( LEVEL => 1, MSG => 'pass_blank' ) );
+				}
+				
+				if ( $_POST['pass2'] == "" )
+				{
+					$std->Error( array( LEVEL => 1, MSG => 'pass_blank' ) );
+				}
+				
+				$pass_a = trim($ibforums->input['pass1']);
+				$pass_b = trim($ibforums->input['pass2']);
+				
+				if ( strlen($pass_a) < 3 )
+				{
+					$std->Error( array( LEVEL => 1, MSG => 'pass_too_short' ) );
+				}
+				
+				if ( $pass_a != $pass_b )
+				{
+					$std->Error( array( LEVEL => 1, MSG => 'pass_no_match' ) );
+				}
+				
+				$new_pass = md5($pass_a);
+				
+				$ibforums->converge->converge_update_password( $new_pass, $member['email'] );
+				
+				$std->my_setcookie("member_id"   , $member['id']              , 1);
+				$std->my_setcookie("pass_hash"   , $member['member_login_key'], 1);
+				
+				//-----------------------------------------
+				// Remove "dead" validation
+				//-----------------------------------------
+				
+				$DB->simple_exec_query( array( 'delete' => 'validating', 'where' => "vid='".$validate['vid']."' OR (member_id={$member['id']} AND lost_pass=1)" ) );
+				
+				$this->bash_dead_validations();
+					
+				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&frompass=1');
+			
+			}
+			
+			//-----------------------------------------
+			// EMAIL ADDY CHANGE
+			//-----------------------------------------
+			
+			else if ($in_type == 'newemail')
+			{
+				if ( $validate['email_chg'] != 1 )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
+				}
+				
+				if (empty($validate['real_group']))
+				{
+					$validate['real_group'] = $ibforums->vars['member_group'];
+				}
+				
+				$DB->do_update( 'members', array( 'mgroup' => intval($validate['real_group']) ), 'id='.intval($member['id']) );
+				
+				if ( USE_MODULES == 1 )
+				{
+					$this->modules->register_class(&$this);
+    				$this->modules->on_group_change($member['id'], $validate['real_group']);
+    			}
+    			
+				$std->my_setcookie("member_id"   , $member['id']              , 1);
+				$std->my_setcookie("pass_hash"   , $member['member_login_key'], 1);
+				
+				//-----------------------------------------
+				// Remove "dead" validation
+				//-----------------------------------------
+				
+				$DB->simple_exec_query( array( 'delete' => 'validating', 'where' => "vid='".$validate['vid']."' OR (member_id={$member['id']} AND email_chg=1)" ) );
+				
+				$this->bash_dead_validations();
+					
+				$std->boink_it($ibforums->base_url.'&act=Login&CODE=autologin&fromemail=1');
+			}
+		} 
+	} 
+    
+    /*-------------------------------------------------------------------------*/
+	// show_board_rules
+	// ------------------
+	// o_O  ^^
+	/*-------------------------------------------------------------------------*/
+	
+	function show_board_rules()
+	{
+		global $ibforums, $DB;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Manual Lost Password Form
+	/*-------------------------------------------------------------------------*/
+	
+	function show_manual_form($type='reg')
+	{
+		global $ibforums, $std, $DB;
+		
+		if ( $type == 'lostpass' )
+		{
+			$this->output = $this->html->show_lostpass_form();
+			
+			//-----------------------------------------
+			// Check for input and it's in a valid format.
+			//-----------------------------------------
+			
+			if ( $ibforums->input['uid'] AND $ibforums->input['aid'] )
+			{ 
+			
+				$in_user_id      = intval(trim(urldecode($ibforums->input['uid'])));
+				$in_validate_key = trim(urldecode($ibforums->input['aid']));
+				$in_type         = trim($ibforums->input['type']);
+				
+				if ($in_type == "")
+				{
+					$in_type = 'reg';
+				}
+				
+				//-----------------------------------------
+				// Check and test input
+				//-----------------------------------------
+				
+				if (! preg_match( "/^(?:[\d\w]){32}$/", $in_validate_key ) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
+				}
+				
+				if (! preg_match( "/^(?:\d){1,}$/", $in_user_id ) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'data_incorrect' ) );
+				}
+				
+				//-----------------------------------------
+				// Attempt to get the profile of the requesting user
+				//-----------------------------------------
+				
+				$DB->simple_construct( array( 'select' => '*', 'from' => 'members', 'where' => "id=$in_user_id" ) );
+		
+				$DB->simple_exec();
+		
+				if ( ! $member = $DB->fetch_row() )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_mem' ) );
+				}
+				
+				//-----------------------------------------
+				// Get validating info..
+				//-----------------------------------------
+				
+				$validate = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'validating', 'where' => "member_id=$in_user_id and vid='$in_validate_key' and lost_pass=1" ) );
+				
+				if ( ! $validate['member_id'] )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'auth_no_key' ) );
+				}
+				
+				$this->output = str_replace( "<!--IBF.INPUT_TYPE-->", $this->html->show_lostpass_form_auto($in_validate_key, $in_user_id), $this->output );
+			}
+			else
+			{
+				$this->output = str_replace( "<!--IBF.INPUT_TYPE-->", $this->html->show_lostpass_form_manual(), $this->output );
+			}
+		}
+		else
+		{
+			$this->output     = $this->html->show_dumb_form($type);
+		}
+		
+		$this->page_title = $ibforums->lang['activation_form'];
+		$this->nav        = array( $ibforums->lang['activation_form'] );
+	}
+	
+	
+	
+	
+	
+	function show_image()
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( $ibforums->input['rc'] == "" )
+		{
+			return false;
+		}
+		
+		// Get the info from the db
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'reg_antispam',
+									  'where'  => "regid='".trim(addslashes($ibforums->input['rc']))."'"
+							 )      );
+							 
+		$DB->simple_exec();
+		
+		if ( ! $row = $DB->fetch_row() )
+		{
+			return false;
+		}
+		
+		//-----------------------------------------
+		// Using GD?
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['bot_antispam'] == 'gd' )
+		{
+			$std->show_gd_img($row['regcode']);
+		}
+		else
+		{
+			//-----------------------------------------
+			// Using normal then, check for "p"
+			//-----------------------------------------
+			
+			if ( $ibforums->input['p'] == "" )
+			{
+				return false;
+			}
+			
+			$p = intval($ibforums->input['p']) - 1; //substr starts from 0, not 1 :p
+			
+			$this_number = substr( $row['regcode'], $p, 1 );
+			
+			$std->show_gif_img($this_number);
+		}
+	}
+	
+	
+	
+	function bash_dead_validations()
+	{
+		global $ibforums, $std, $DB;
+		
+		$mids = array();
+		$vids = array();
+		
+		// If enabled, remove validating new_reg members & entries from members table
+		
+		if ( intval($ibforums->vars['validate_day_prune']) > 0 )
+		{
+			$less_than = time() - $ibforums->vars['validate_day_prune']*86400;
+			
+			$DB->cache_add_query( 'register_get_dead_validating', array( 'less_than' => $less_than ) );
+			$DB->cache_exec_query();
+		
+			while( $i = $DB->fetch_row() )
+			{
+				if ( intval($i['posts']) < 1 )
+				{
+					$mids[] = $i['member_id'];
+					$vids[] = "'".$i['vid']."'";
+				}
+			}
+			
+			// Remove non-posted validating members
+			
+			if ( count($mids) > 0 )
+			{
+				$DB->simple_exec_query( array( 'delete' => 'members_converge', 'where' => "converge_id IN(".implode(",",$mids).")" ) );
+				$DB->simple_exec_query( array( 'delete' => 'members'         , 'where' => "id IN(".implode(",",$mids).")" ) );
+				$DB->simple_exec_query( array( 'delete' => 'member_extra'    , 'where' => "id IN(".implode(",",$mids).")" ) );
+				$DB->simple_exec_query( array( 'delete' => 'pfields_content' , 'where' => "member_id IN(".implode(",",$mids).")" ) );
+				$DB->simple_exec_query( array( 'delete' => 'validating'      , 'where' => "vid IN(".implode(",",$vids).")" ) );
+				
+				if ( USE_MODULES == 1 )
+				{
+					$this->modules->register_class(&$this);
+					$this->modules->on_delete($mids);
+				}
+			}
+		}
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/search.php b/upload/sources/search.php
new file mode 100644
index 00000000..e6092d2d
--- /dev/null
+++ b/upload/sources/search.php
@@ -0,0 +1,1645 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Searching procedures
+|   > Module written by Matt Mecham
+|   > Date started: 24th February 2002
+|
+|	> Module Version Number: 1.1.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class search {
+
+    var $output     = "";
+    var $page_title = "";
+    var $nav        = array();
+    var $html       = "";
+    
+    var $first      = 0;
+    
+    var $search_type = 'posts';
+    var $sort_order  = 'desc';
+    var $sort_key    = 'last_post';
+    var $search_in   = 'posts';
+    var $prune       = '0';
+    var $st_time     = array();
+    var $end_time    = array();
+    var $st_stamp    = "";
+    var $end_stamp   = "";
+    var $result_type = "topics";
+    var $parser      = "";
+    var $load_lib    = 'search_mysql_man';
+    var $lib         = "";
+    
+    var $mysql_version   = "";
+	var $true_version    = "";
+    
+    /*-------------------------------------------------------------------------*/
+    // Auto run
+    /*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	if (! $ibforums->vars['allow_search'])
+    	{
+    		$std->Error( array( LEVEL => 1, MSG => 'search_off') );
+    	}
+    	
+    	if ($ibforums->member['g_use_search'] != 1)
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_permission' ) );
+    	}
+    	
+    	if ( $read = $std->my_getcookie('topicsread') )
+        {
+        	$this->read_array = unserialize(stripslashes($read));
+        }
+        
+        $ibforums->forum_jump = $std->build_forum_jump();
+    	
+    	//-----------------------------------------
+		// Get the SQL version.
+		//-----------------------------------------
+		
+		$DB->sql_get_version();
+		
+		$this->true_version  = $DB->true_version;
+		$this->mysql_version = $DB->mysql_version;
+		
+    	//-----------------------------------------
+    	// Sort out the required search library
+    	//-----------------------------------------
+    	
+    	$method = isset($ibforums->vars['search_sql_method']) ? $ibforums->vars['search_sql_method'] : 'man';
+    	$sql    = isset($ibforums->vars['sql_driver'])        ? $ibforums->vars['sql_driver']        : 'mysql';
+    	
+    	$this->load_lib = 'search_'.strtolower($sql).'_'.$method.'.php';
+    	
+    	require ( ROOT_PATH."sources/lib/".$this->load_lib );
+    	
+    	//-----------------------------------------
+    	// Require the HTML and language modules
+    	//-----------------------------------------
+    	
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_search', $ibforums->lang_id );
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_forum' , $ibforums->lang_id );
+    	
+    	$this->html = $std->load_template('skin_search'); 
+    	
+    	$this->base_url = $ibforums->base_url;
+    	
+    	//-----------------------------------------
+    	// Suck in libby
+    	//-----------------------------------------
+    	
+    	$this->lib = new search_lib(&$this);
+    	
+    	$this->first = intval($ibforums->input['st']);
+    	
+    	//-----------------------------------------
+    	// What to do?
+    	//-----------------------------------------
+    	
+    	if (! isset($ibforums->member['g_use_search']) )
+    	{
+    		$std->Error( array( LEVEL => 1, MSG => 'cant_use_feature') );
+    	}
+    	
+    	switch($ibforums->input['CODE']) {
+    		case '01':
+    			$this->do_search();
+    			break;
+    		case 'getnew':
+    			$this->get_new_posts();
+    			break;
+    		case 'show':
+    			$this->show_results();
+    			break;
+    		case 'getreplied':
+    			$this->get_replies();
+    			break;
+    		case 'lastten':
+    			$this->get_last_ten();
+    			break;
+    		case 'getalluser':
+    			$this->get_all_user();
+    			break;
+    		case 'simpleresults':
+    			$this->show_simple_results();
+    			break;
+    		case 'explain':
+    			$this->show_boolean_explain();
+    			break;
+    		case 'searchtopic':
+    			$this->search_topic();
+    			break;
+    		case 'gettopicsuser':
+    			$this->get_topics_user();
+    			break;
+    		case 'getactive':
+    			$ibforums->input['active'] = 1;
+    			$this->get_new_posts();
+    			break;
+    		default:
+    			$this->show_form();
+    			break;
+    	}
+    	
+    	// If we have any HTML to print, do so...
+    	
+    	$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 0, NAV => $this->nav ) );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+	// Do simple search
+	/*-------------------------------------------------------------------------*/
+	
+	function show_simple_results()
+	{
+		global $ibforums, $DB, $std, $print;
+    	
+    	$result = $this->lib->do_simple_search();
+    }
+    
+    /*-------------------------------------------------------------------------*/
+	// Search topic
+	/*-------------------------------------------------------------------------*/
+	
+	function search_topic()
+	{
+		global $ibforums, $DB, $std, $print;
+    	
+    	$this->topic_id          = intval($ibforums->input['topic']);
+    	$this->topic_search_only = 1;
+    	$this->result_type       = 'posts';
+    	$this->search_type       = 'posts';
+    	$this->search_in         = 'posts';
+    	
+    	$this->do_search();
+    }
+    
+     /*-------------------------------------------------------------------------*/
+	// Get all posts by a member
+	/*-------------------------------------------------------------------------*/
+ 	
+ 	function get_topics_user()
+ 	{
+		global $ibforums, $DB, $std, $print;
+		
+		//-----------------------------------------
+		// Do we have flood control enabled?
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_search_flood'] > 0)
+		{
+			$flood_time = time() - $ibforums->member['g_search_flood'];
+			
+			//-----------------------------------------
+			// Get any old search results..
+			//-----------------------------------------
+			
+			$DB->simple_construct( array( 'select' => 'id',
+										  'from'   => 'search_results',
+										  'where'  => "(member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'" ) );
+			$DB->simple_exec();
+		
+			if ( $DB->get_num_rows() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
+			}
+		}
+		
+		$ibforums->input['forums'] = 'all';
+		
+		$forums = $this->get_searchable_forums();
+		
+		$mid    = intval($ibforums->input['mid']);
+		
+		//-----------------------------------------
+		// Do we have any forums to search in?
+		//-----------------------------------------
+		
+		if ($forums == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
+		}
+		
+		if ($mid == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+	
+		//-----------------------------------------
+		// Get the topic ID's to serialize and store into
+		// the database
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'count(*) as count', 'from' => 'topics t', 'where' => "t.approved=1 AND t.forum_id IN($forums) AND t.starter_id=$mid" ) );
+		$DB->simple_exec();
+		
+		$row = $DB->fetch_row();
+	
+		$results = intval($row['count']);
+		
+		//-----------------------------------------
+		// Do we have any results?
+		//-----------------------------------------
+		
+		if ( ! $results )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		//-----------------------------------------
+		// Cache query
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 't.*, t.title as topic_title',
+									  'from'   => 'topics t',
+									  'where'  => "t.approved=1 AND t.forum_id IN($forums) AND t.starter_id=$mid",
+									  'order'  => "t.last_post DESC" ) );
+		
+		
+		$query_to_cache = $DB->cur_query;
+		$DB->flush_query();
+		
+		//-----------------------------------------
+		// If we are still here, store the data into the database...
+		//-----------------------------------------
+		
+		$unique_id = md5(uniqid(microtime(),1));
+		
+		$DB->do_insert( 'search_results', array (
+												  'id'          => $unique_id,
+												  'search_date' => time(),
+												  'post_max'    => $results,
+												  'sort_key'    => $this->sort_key,
+												  'sort_order'  => $this->sort_order,
+												  'member_id'   => $ibforums->member['id'],
+												  'ip_address'  => $ibforums->input['IP_ADDRESS'],
+												  'query_cache' => $query_to_cache
+										 )        );
+		
+		$std->boink_it( $ibforums->base_url."act=Search&nav=au&CODE=show&searchid=$unique_id&search_in=topics&result_type=topics" );
+	}
+    
+    /*-------------------------------------------------------------------------*/
+	// Get all posts by a member
+	/*-------------------------------------------------------------------------*/
+ 	
+ 	function get_all_user()
+ 	{
+		global $ibforums, $DB, $std, $print;
+		
+		//-----------------------------------------
+		// Do we have flood control enabled?
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_search_flood'] > 0)
+		{
+			$flood_time = time() - $ibforums->member['g_search_flood'];
+			
+			// Get any old search results..
+			
+			$DB->simple_construct( array( 'select' => 'id',
+										  'from'   => 'search_results',
+										  'where'  => "(member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'" ) );
+			$DB->simple_exec();
+			
+			if ( $DB->get_num_rows() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
+			}
+		}
+		
+		$ibforums->input['forums'] = 'all';
+		
+		$forums = $this->get_searchable_forums();
+		
+		$mid    = intval($ibforums->input['mid']);
+		
+		//-----------------------------------------
+		// Do we have any forums to search in?
+		//-----------------------------------------
+		
+		if ($forums == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
+		}
+		
+		if ($mid == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+	
+		//-----------------------------------------
+		// Get the topic ID's to serialize and store into
+		// the database
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'search_get_all_user_count', array( 'mid' => $mid, 'forums' => $forums ) );
+		$DB->cache_exec_query();
+	
+		$row = $DB->fetch_row();
+	
+		$results = intval($row['count']);
+		
+		//-----------------------------------------
+		// Do we have any results?
+		//-----------------------------------------
+		
+		if ( ! $results )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		//-----------------------------------------
+		// Cache query
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'search_get_all_user_query', array( 'mid' => $mid, 'forums' => $forums ) );
+		
+		$query_to_cache = $DB->cur_query;
+		$DB->flush_query();
+		
+		//-----------------------------------------
+		// If we are still here, store the data into the database...
+		//-----------------------------------------
+		
+		$unique_id = md5(uniqid(microtime(),1));
+		
+		$DB->do_insert( 'search_results', array (
+												 'id'          => $unique_id,
+												 'search_date' => time(),
+												 'post_max'    => $results,
+												 'sort_key'    => $this->sort_key,
+												 'sort_order'  => $this->sort_order,
+												 'member_id'   => $ibforums->member['id'],
+												 'ip_address'  => $ibforums->input['IP_ADDRESS'],
+												 'query_cache' => $query_to_cache
+										)        );
+		
+		$std->boink_it( $ibforums->base_url."act=Search&nav=au&CODE=show&searchid=$unique_id&search_in=posts&result_type=posts" );
+	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Get new posts
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function get_new_posts()
+ 	{
+		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
+		
+		if ( ! $ibforums->member['id'] and ! $ibforums->input['active'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		//-----------------------------------------
+		// Do we have flood control enabled?
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_search_flood'] > 0)
+		{
+			$flood_time = time() - $ibforums->member['g_search_flood'];
+			
+			// Get any old search results..
+			
+			$DB->simple_construct( array( 'select' => 'id',
+										  'from'   => 'search_results',
+										  'where'  => "(member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'" ) );
+			$DB->simple_exec();
+			
+			if ( $DB->get_num_rows() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
+			}
+		}
+		
+		$last_time = $ibforums->member['last_visit'];
+		
+		if ( $ibforums->forum_read[0] > $last_time )
+		{
+			$last_time = $ibforums->forum_read[0];
+		}
+		
+		//-----------------------------------------
+		// Are we getting 'active topics'?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['active'] )
+		{
+			if ( $ibforums->input['lastdate'] )
+			{
+				$last_time = time() - intval($ibforums->input['lastdate']);
+			}
+			else
+			{
+				$last_time = time() - 86400;
+			}
+		}
+		
+		$ibforums->input['forums'] = 'all';
+		$ibforums->input['nav']    = 'lv';
+		
+		$forums = $this->get_searchable_forums();
+		
+		//-----------------------------------------
+		// Do we have any forums to search in?
+		//-----------------------------------------
+		
+		if ($forums == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
+		}
+		
+		//-----------------------------------------
+		// Get the topic ID's to serialize and store into
+		// the database
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'count(*) as count', 'from' => 'topics', 'where' => "approved=1 AND forum_id IN($forums) AND last_post > '".$last_time."'" ) );
+		$DB->simple_exec();
+		
+		$row = $DB->fetch_row();
+		
+		$results = intval($row['count']);
+		
+		//-----------------------------------------
+		// Do we have any results?
+		//-----------------------------------------
+		
+		if ( ! $results )
+		{
+			//$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		//-----------------------------------------
+		// Cache query
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 't.*, t.title as topic_title',
+									  'from'   => 'topics t',
+									  'where'  => "t.approved=1 AND t.forum_id IN($forums) AND t.last_post > {$last_time}",
+									  'order'  => "t.last_post DESC" ) );
+		
+		
+		$query_to_cache = $DB->cur_query;
+		$DB->flush_query();
+		
+		//-----------------------------------------
+		// If we are still here, store the data into the database...
+		//-----------------------------------------
+		
+		$unique_id = md5(uniqid(microtime(),1));
+		
+		$DB->do_insert( 'search_results', array (
+												 'id'          => $unique_id,
+												 'search_date' => time(),
+												 'post_max'    => $results,
+												 'sort_key'    => $this->sort_key,
+												 'sort_order'  => $this->sort_order,
+												 'member_id'   => $ibforums->member['id'],
+												 'ip_address'  => $ibforums->input['IP_ADDRESS'],
+												 'query_cache' => $query_to_cache
+										)        );
+		
+		$std->boink_it( $ibforums->base_url."act=Search&nav=lv&CODE=show&searchid=$unique_id&search_in=topics&result_type=topics&lastdate={$ibforums->input['lastdate']}" );
+	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Last 10 posts
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function get_last_ten()
+ 	{
+		global $ibforums, $DB, $std, $forums, $print;
+		
+		//-----------------------------------------
+		// Do we have flood control enabled?
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_search_flood'] > 0)
+		{
+			$flood_time = time() - $ibforums->member['g_search_flood'];
+			
+			// Get any old search results..
+			
+			$DB->simple_construct( array( 'select' => 'id',
+										  'from'   => 'search_results',
+										  'where'  => "(member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'" ) );
+			$DB->simple_exec();
+			
+			if ( $DB->get_num_rows() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
+			}
+		}
+		
+		$ibforums->input['forums'] = 'all';
+		
+		$forums = $this->get_searchable_forums();
+		
+		$mid    = $ibforums->member['id'];
+		
+		//-----------------------------------------
+		// Do we have any forums to search in?
+		//-----------------------------------------
+		
+		if ($forums == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
+		}
+		
+		//-----------------------------------------
+		// Cache query
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'search_get_last_ten', array( 'mid' => $mid, 'forums' => $forums ) );
+		
+		$query_to_cache = $DB->cur_query;
+		$DB->flush_query();
+		
+		//-----------------------------------------
+		// If we are still here, store the data into the database...
+		//-----------------------------------------
+		
+		$unique_id = md5(uniqid(microtime(),1));
+		
+		$DB->do_insert( 'search_results', array (
+												 'id'          => $unique_id,
+												 'search_date' => time(),
+												 'post_max'    => 10,
+												 'sort_key'    => $this->sort_key,
+												 'sort_order'  => $this->sort_order,
+												 'member_id'   => $ibforums->member['id'],
+												 'ip_address'  => $ibforums->input['IP_ADDRESS'],
+												 'query_cache' => $query_to_cache
+										)        );
+		
+		$std->boink_it( $ibforums->base_url."act=Search&nav=au&CODE=show&searchid=$unique_id&search_in=posts&result_type=posts" );
+	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Get all replies
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function get_replies()
+ 	{
+		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
+		
+		//-----------------------------------------
+		// Do we have flood control enabled?
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_search_flood'] > 0)
+		{
+			$flood_time = time() - $ibforums->member['g_search_flood'];
+			
+			// Get any old search results..
+			
+			$DB->simple_construct( array( 'select' => 'id',
+										  'from'   => 'search_results',
+										  'where'  => "(member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'" ) );
+			$DB->simple_exec();
+			
+			if ( $DB->get_num_rows() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
+			}
+		}
+		
+		$ibforums->input['forums'] = 'all';
+		$ibforums->input['nav']    = 'lv';
+		
+		$forums = $this->get_searchable_forums();
+		
+		//-----------------------------------------
+		// Do we have any forums to search in?
+		//-----------------------------------------
+		
+		if ($forums == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_forum') );
+		}
+	
+		//-----------------------------------------
+		// Get the topic ID's to serialize and store into
+		// the database
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'tid', 'from' => 'topics', 'where' => "starter_id={$ibforums->member['id']} AND last_post > {$ibforums->member['last_visit']} AND forum_id IN($forums) AND approved=1" ) );
+		$DB->simple_exec();
+		
+		$max_hits = $DB->get_num_rows();
+		
+		$topics  = "";
+		
+		while ($row = $DB->fetch_row() )
+		{
+			$topics .= $row['tid'].",";
+		}
+	
+		$DB->free_result();
+		
+		$topics  = preg_replace( "/,$/", "", $topics );
+		
+		//-----------------------------------------
+		// Do we have any results?
+		//-----------------------------------------
+		
+		if ($topics == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		//-----------------------------------------
+		// If we are still here, store the data into the database...
+		//-----------------------------------------
+		
+		$unique_id = md5(uniqid(microtime(),1));
+		
+		$DB->do_insert( 'search_results', array (
+												 'id'         => $unique_id,
+												 'search_date'=> time(),
+												 'topic_id'   => $topics,
+												 'topic_max'  => $max_hits,
+												 'sort_key'   => $this->sort_key,
+												 'sort_order' => $this->sort_order,
+												 'member_id'  => $ibforums->member['id'],
+												 'ip_address' => $ibforums->input['IP_ADDRESS'],
+										)        );
+		
+		$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&nav=gr&CODE=show&searchid=$unique_id&search_in=posts&result_type=topics" );
+		exit();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Show pop-up window
+	/*-------------------------------------------------------------------------*/
+	
+	function show_boolean_explain()
+ 	{
+		global $DB, $std, $ibforums, $print;
+ 		
+ 		$print->pop_up_window( $ibforums->lang['be_link'], $this->html->boolean_explain_page() );
+ 	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Show main form
+	/*-------------------------------------------------------------------------*/
+ 	
+ 	function show_form()
+ 	{
+		global $DB, $std, $ibforums, $forums;
+ 		
+		$the_html = $forums->forums_forum_jump(1, 1);
+		
+		if ( ! $ibforums->input['f'] )
+		{
+			$init_sel = ' selected="selected"';
+		}
+		
+		$forums   = "<select name='forums[]' class='forminput' size='10' multiple='multiple'>\n"
+		           ."<option value='all'".$init_sel.">".$ibforums->lang['all_forums']."</option>"
+		           . $the_html
+		           . "</select>";
+		
+		if ( $ibforums->input['mode'] == 'simple' )
+		{
+			if ( $ibforums->vars['search_sql_method'] == 'ftext' )
+			{
+				$this->output = $this->html->simple_form($forums);
+			}
+			else
+			{
+				$this->output = $this->html->Form($forums);
+			}
+		}
+		else if ( $ibforums->input['mode'] == 'adv' )
+		{
+			$this->output = $this->html->Form($forums);
+			
+			if ( $ibforums->vars['search_sql_method'] == 'ftext' )
+			{
+				$this->output = str_replace( "<!--IBF.SIMPLE_BUTTON-->", $this->html->form_simple_button(), $this->output );
+			}
+		}
+		else
+		{
+			// No mode specified..
+			
+			if ( $ibforums->vars['search_default_method'] == 'simple' )
+			{
+				if ( $ibforums->vars['search_sql_method'] == 'ftext' )
+				{
+					$this->output = $this->html->simple_form($forums);
+				}
+				else
+				{
+					$this->output = $this->html->Form($forums);
+				}
+			}
+			else
+			{
+				// Default..
+				
+				$this->output = $this->html->Form($forums);
+				
+				if ( $ibforums->vars['search_sql_method'] == 'ftext' )
+				{
+					$this->output = str_replace( "<!--IBF.SIMPLE_BUTTON-->", $this->html->form_simple_button(), $this->output );
+				}
+			}
+		}
+		
+		if ( ( $DB->sql_can_fulltext_boolean() == TRUE ) AND $ibforums->vars['search_sql_method'] == 'ftext' )
+		{
+			$this->output = str_replace( "<!--IBF.BOOLEAN_EXPLAIN-->", $this->html->boolean_explain_link(), $this->output );
+		}
+		
+		$this->page_title = $ibforums->lang['search_title'];
+		$this->nav        = array( $ibforums->lang['search_form'] );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// DO MAIN SEARCH
+ 	/*-------------------------------------------------------------------------*/
+
+	function do_search()
+	{
+		global $ibforums, $DB, $std, $HTTP_POST_VARS, $print;
+		
+		//-----------------------------------------
+		// Do we have flood control enabled?
+		//-----------------------------------------
+		
+		if ($ibforums->member['g_search_flood'] > 0)
+		{
+			$flood_time = time() - $ibforums->member['g_search_flood'];
+			
+			// Get any old search results..
+			
+			$DB->simple_construct( array( 'select' => 'id',
+										  'from'   => 'search_results',
+										  'where'  => "(member_id='".$ibforums->member['id']."' OR ip_address='".$ibforums->input['IP_ADDRESS']."') AND search_date > '$flood_time'" ) );
+			$DB->simple_exec();
+			
+			if ( $DB->get_num_rows() )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'search_flood', 'EXTRA' => $ibforums->member['g_search_flood']) );
+			}
+		}
+		
+		//-----------------------------------------
+		// init main search
+		//-----------------------------------------
+		
+		$result = $this->lib->do_main_search();
+		
+		//-----------------------------------------
+		// Do we have any results?
+		//-----------------------------------------
+		
+		if ($result['topic_id'] == "" and $result['post_id'] == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		//-----------------------------------------
+		// If we are still here, store the data into the database...
+		//-----------------------------------------
+		
+		$unique_id = md5(uniqid(microtime(),1));
+		
+		$DB->do_insert( 'search_results', array (
+												  'id'         => $unique_id,
+												  'search_date'=> time(),
+												  'topic_id'   => $result['topic_id'],
+												  'topic_max'  => $result['topic_max'],
+												  'sort_key'   => $this->sort_key,
+												  'sort_order' => $this->sort_order,
+												  'member_id'  => $ibforums->member['id'],
+												  'ip_address' => $ibforums->input['IP_ADDRESS'],
+												  'post_id'    => $result['post_id'],
+												  'post_max'   => $result['post_max'],
+									  )        );
+		
+		$print->redirect_screen( $ibforums->lang['search_redirect'] , "act=Search&CODE=show&searchid=$unique_id&search_in=".$this->search_in."&result_type=".$this->result_type."&highlite=".urlencode(trim($result['keywords'])) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Show Results
+	// Shows the results of the search
+	/*-------------------------------------------------------------------------*/
+	
+	function show_results()
+	{
+		global $ibforums, $DB, $std, $forums, $HTTP_POST_VARS;
+		
+		$this->cached_query   = 0;
+		$this->cached_matches = 0;
+		
+		//-----------------------------------------
+		// Grab the post parser
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH."sources/lib/post_parser.php" );
+       	$this->parser = new post_parser();
+       	
+       	//-----------------------------------------
+       	// Grab forums lib
+       	//-----------------------------------------
+       	
+       	require_once( ROOT_PATH."sources/forums.php" );
+       	$this->forums = new forums();
+       	$this->forums->init();
+       	
+       	//-----------------------------------------
+       	// Start...
+       	//-----------------------------------------
+		
+        $this->result_type = $ibforums->input['result_type'];
+        $this->search_in   = $ibforums->input['search_in'];
+		
+		//-----------------------------------------
+		// We have a search ID, so lets get the parsed results.
+		//-----------------------------------------
+		
+		$this->unique_id = $ibforums->input['searchid'];
+		
+		if ($this->unique_id == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+		}
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'search_results',
+									  'where'  => "id='{$this->unique_id}'" ) );
+		$DB->simple_exec();
+		
+		$sr = $DB->fetch_row();
+		
+		$this->sort_order = $sr['sort_order'];
+		$this->sort_key   = $sr['sort_key'];
+		
+		//-----------------------------------------
+		// Cached query or PID/TID list?
+		//-----------------------------------------
+		
+		if ( $sr['query_cache'] )
+		{
+			$this->cached_query   = $sr['query_cache'];
+			$this->cached_matches = $sr['post_max'];
+			
+			$DB->cur_query = $this->cached_query;
+			$DB->simple_limit_with_check($this->first, "25");
+			$this->cached_query = $DB->cur_query;
+			$DB->flush_query();
+		}
+		else
+		{
+			$topics         = $sr['topic_id'];
+			$topic_max_hits = $sr['topic_max'];
+			$posts          = $sr['post_id'];
+			$post_max_hits  = $sr['post_max'];
+			
+			//-----------------------------------------
+			// Build array
+			//-----------------------------------------
+			
+			$topic_array = array();
+			$post_array  = array();
+			
+			if ( $topics )
+			{
+				foreach( explode( ",", $topics ) as $t )
+				{
+					$topic_array[ $t ] = $t;
+				}
+			}
+			
+			if ( $posts )
+			{
+				foreach( explode( ",", $posts ) as $t )
+				{
+					$post_array[ $t ] = $t;
+				}
+			}
+			
+			//-----------------------------------------
+			// Anything left to show?
+			//-----------------------------------------
+			
+			if ( ! $topics and ! $posts )
+			{
+				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+			}
+		}
+		
+		$url_words = $this->convert_highlite_words($ibforums->input['highlite']);
+		
+		if ($this->result_type == 'topics')
+		{
+			//-----------------------------------------
+			// CACHED QUERY?
+			//-----------------------------------------
+			
+			if ( $this->cached_query )
+			{
+				$this->output .= $this->start_page($this->cached_matches);
+				
+				$DB->prefix_changed = 1;
+				$DB->query( $this->cached_query );
+				$DB->prefix_changed = 0;
+			}
+			//-----------------------------------------
+			// PID / TID
+			//-----------------------------------------
+			
+			else if ($this->search_in == 'titles')
+			{
+				if ( ! $topics )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+				}
+			
+				$this->output .= $this->start_page($topic_max_hits);
+				
+				$DB->simple_construct( array( 'select' => 't.*',
+											  'from'   => 'topics t',
+											  'where'  => "t.tid IN({$topics})",
+											  'order'  => "t.pinned DESC, t.".$this->sort_key." ".$this->sort_order,
+											  'limit'  => array( $this->first, 25 )
+									 )      );
+				$DB->simple_exec();
+			}
+			else
+			{
+				//-----------------------------------------
+				// Add posts to the mix
+				//-----------------------------------------
+				
+				if ($posts)
+				{
+					$DB->simple_construct( array( 'select' => 'topic_id', 'from' => 'posts', 'where' => "pid IN({$posts})" ) );
+					$DB->simple_exec();
+				
+					while ( $pr = $DB->fetch_row() )
+					{
+						$topic_array[ $pr['topic_id'] ] = $pr['topic_id'];
+					}
+					
+					$topics         = implode( ",", $topic_array );
+					$topic_max_hits = count( $topic_array );
+				}
+				
+				$this->output .= $this->start_page($topic_max_hits);
+				
+				$DB->simple_construct( array( 'select' => 't.*',
+											  'from'   => 'topics t',
+											  'where'  => "t.tid IN({$topics})",
+											  'order'  => "t.pinned DESC, t.".$this->sort_key." ".$this->sort_order,
+											  'limit'  => array( $this->first, 25 )
+									 )      );
+				$DB->simple_exec();
+			}
+			
+			//-----------------------------------------
+			// PRINT: Any returned rows?
+			//-----------------------------------------
+			
+			if ( $DB->get_num_rows() )
+			{
+				while ( $row = $DB->fetch_row() )
+				{
+					$row['keywords'] = $url_words;
+					$this->output   .= $this->html->RenderRow( $this->parse_entry($row) );
+				
+				}
+			}
+			else
+			{
+				if ( ! $ibforums->input['lastdate'] )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_search_results' ) );
+				}
+				else
+				{
+					$this->output .= $this->html->no_results_row(); 
+				}
+			}
+			
+			//-----------------------------------------
+			// PRINT: End the page
+			//-----------------------------------------
+			
+			$this->output .= $this->html->end_results_table(array( 'SHOW_PAGES' => $this->links ));
+		}
+		
+		//-----------------------------------------
+		// Results as posts...
+		//-----------------------------------------
+		
+		else
+		{
+			//-----------------------------------------
+			// Grab topic lib
+			//-----------------------------------------
+			
+			require_once( ROOT_PATH.'sources/topics.php' );
+			$this->topics = new topics();
+			$this->topics->topic_init();
+			
+			$attach_pids = array();
+			
+			//-----------------------------------------
+			// CACHED QUERY?
+			//-----------------------------------------
+			
+			if ( $this->cached_query )
+			{
+				$this->output .= $this->start_page($this->cached_matches, 1);
+				
+				$DB->query( $this->cached_query );
+			}
+			//-----------------------------------------
+			// PID / TID
+			//-----------------------------------------
+			
+			else
+			{
+				//-----------------------------------------
+				// Start...
+				//-----------------------------------------
+				
+				if ($this->search_in == 'titles')
+				{
+					$this->output .= $this->start_page($topic_max_hits, 1);
+					
+					$DB->cache_add_query( 'search_main_in_titles', array( 'topics' => $topics, 'limit_a' => $this->first ) );
+					$DB->cache_exec_query();
+				}
+				else
+				{
+					//-----------------------------------------
+					// Add Topics
+					//-----------------------------------------
+					
+					if ($topics)
+					{
+						$DB->simple_construct( array( 'select' => 'pid', 'from' => 'posts', 'where' => "topic_id IN({$topics}) AND new_topic=1" ) );
+						$DB->simple_exec();
+					
+						while ( $pr = $DB->fetch_row() )
+						{
+							$post_array[ $pr['pid'] ] = $pr['pid'];
+						}
+						
+						$posts         = implode( ",", $post_array );
+						$post_max_hits = count( $post_array );
+					}
+					
+					$this->output .= $this->start_page($post_max_hits, 1);
+					
+					$DB->cache_add_query( 'search_main_in_posts', array( 'posts' => $posts, 'limit_a' => $this->first ) );
+					$DB->cache_exec_query();
+				}
+			}
+			
+			while ( $row = $DB->fetch_row() )
+			{
+				$row['keywords']  = $url_words;
+				$row['post_date'] = $std->get_date( $row['post_date'],'LONG' );
+				
+				//-----------------------------------------
+				// Parse HTML tag on the fly
+				//-----------------------------------------
+				
+				$this->parser->pp_do_html  = ( $forums->forum_by_id[$row['forum_id']]['use_html'] and $ibforums->cache['group_cache'][ $row['mgroup'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+				$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+				$this->parser->pp_nl2br    = $row['post_htmlstate'] == 2 ? 1 : 0;
+				
+				$row['post'] = $this->parser->post_db_parse( $row['post'] );
+				
+				//-----------------------------------------
+				// Attachments?
+				//-----------------------------------------
+				
+				if ( strstr( $row['post'], '[attachmentid=' ) )
+				{
+					$attach_pids[] = $row['pid'];
+				}
+				
+				//-----------------------------------------
+				// Parse Member
+				//-----------------------------------------
+				
+				$member = $this->topics->parse_member( $row );
+				
+				//-----------------------------------------
+				// Do word wrap?
+				//-----------------------------------------
+				
+				if ( $ibforums->vars['post_wordwrap'] > 0 )
+				{
+					$row['post'] = $this->parser->my_wordwrap( $row['post'], $ibforums->vars['post_wordwrap']) ;
+				}
+				
+				//-----------------------------------------
+				// Do word wrap?
+				//-----------------------------------------
+				
+				$this->output .= $this->html->RenderPostRow( $this->parse_entry($row, 1), $member );
+			
+			}
+			
+			//-----------------------------------------
+			// Add in attachments?
+			//-----------------------------------------
+			
+			if ( count( $attach_pids ) )
+			{
+				$this->output = $this->topics->parse_attachments( $this->output, $attach_pids );
+			}
+			
+			$this->output .= $this->html->end_results_table(array( 'SHOW_PAGES' => $this->links ), 1 );
+		}
+		
+		$this->page_title = $ibforums->lang['search_results'];
+		
+		if ( $ibforums->input['nav'] == 'lv' )
+		{
+			if ( $ibforums->input['lastdate'] )
+			{
+				$this->nav = array( $ibforums->lang['nav_au'] );
+			}
+			else
+			{
+				$this->nav = array( $ibforums->lang['nav_since_lv'] );
+			}
+		}
+		else if ( $ibforums->input['nav'] == 'lt' )
+		{
+			$this->nav = array( $ibforums->lang['nav_lt'] );
+		}
+		else
+		{
+			$this->nav = array( "<a href='{$this->base_url}&act=Search'>{$ibforums->lang['search_form']}</a>", $ibforums->lang['search_title'] );
+		}
+		
+		//-----------------------------------------
+		// Active topics fing?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['lastdate'] )
+		{
+			$this->output = preg_replace( "#(value=[\"']{$ibforums->input['lastdate']}[\"'])#i", "\\1 selected='selected'", $this->output );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Start the page functions
+	/*-------------------------------------------------------------------------*/
+	
+	function start_page($amount, $is_post = 0)
+	{
+		global $ibforums, $DB, $std;
+		
+		$url_words = $this->convert_highlite_words($ibforums->input['highlite']);
+		
+		$this->links = $std->build_pagelinks( array( 'TOTAL_POSS'  => $amount,
+													 'PER_PAGE'    => 25,
+													 'CUR_ST_VAL'  => $this->first,
+													 'L_SINGLE'    => "",
+													 'L_MULTI'     => $ibforums->lang['search_pages'],
+													 'BASE_URL'    => $this->base_url."act=Search&nav=".$ibforums->input['nav']."&CODE=show&searchid=".$this->unique_id."&search_in=".$this->search_in."&result_type=".$this->result_type."&hl=".$url_words,
+											)	   );
+									  
+		if ($is_post == 0)
+		{
+			return $this->html->start( array( 'SHOW_PAGES' => $this->links ) );
+		}
+		else
+		{
+			return $this->html->start_as_post( array( 'SHOW_PAGES' => $this->links ) );
+		}
+	}
+
+	
+    
+    /*-------------------------------------------------------------------------*/
+    // Parse search result entry
+    /*-------------------------------------------------------------------------*/
+    
+	function parse_entry($topic, $view_as_post=0)
+	{
+		global $DB, $std, $ibforums, $forums;
+		
+		$ibforums->input['last_visit'] = $ibforums->forum_read[ $topic['forum_id'] ] > $ibforums->input['last_visit']
+        						       ? $ibforums->forum_read[ $topic['forum_id'] ] : $ibforums->input['last_visit'];
+		
+		//-----------------------------------------
+		// Over ride with 'master' cookie?
+		//-----------------------------------------
+		
+		if ( $ibforums->forum_read[0] > $ibforums->forum_read[ $topic['forum_id'] ] )
+		{
+			$ibforums->forum_read[ $topic['forum_id'] ] = $ibforums->forum_read[0];
+		}
+		
+		//-----------------------------------------
+		// Disable DB tracking...
+		//-----------------------------------------
+		
+		$tmp = $ibforums->vars['db_topic_read_cutoff'];
+		$ibforums->vars['db_topic_read_cutoff'] = 0;
+		
+		$topic = $this->forums->parse_data( $topic );
+		
+		$ibforums->vars['db_topic_read_cutoff'] = $tmp;
+		
+		if ($topic['pinned'] == 1)
+		{
+			$topic['prefix']     = $ibforums->vars['pre_pinned'];
+			$topic['topic_icon'] = "<{B_PIN}>";
+		}
+		
+		//-----------------------------------------
+		// Extra processing for posts..
+		//-----------------------------------------
+		
+		if ($view_as_post == 1)
+		{
+			if ( $ibforums->vars['search_post_cut'] )
+			{
+				$topic['post'] = substr( $this->parser->unconvert($topic['post'] ), 0, $ibforums->vars['search_post_cut']) . '...';
+				$topic['post'] = str_replace( "\n", "<br />", $topic['post'] );
+			}
+			
+			if ($topic['author_id'])
+			{
+				$topic['author_name'] = "<b><a href='{$this->base_url}showuser={$topic['author_id']}'>{$topic['author_name']}</a></b>";
+			}
+			
+			//-----------------------------------------
+			// Highlighting?
+			//-----------------------------------------
+			
+			if ($topic['keywords'])
+			{
+				$keywords = str_replace( "+", " ", $topic['keywords'] );
+				
+				if ( preg_match("/,(and|or),/i", $keywords) )
+				{
+					while ( preg_match("/,(and|or),/i", $keywords, $match) )
+					{
+						$word_array = explode( ",".$match[1].",", $keywords );
+						
+						if (is_array($word_array))
+						{
+							foreach ($word_array as $keywords)
+							{
+								$topic['post'] = preg_replace( "/(^|\s|,!|;)(".preg_quote($keywords, "/").")(\s|,|!|&|$)/i", "\\1<span class='searchlite'>\\2</span>\\3", $topic['post'] );
+							}
+						}
+					}
+				}
+				else
+				{
+					$topic['post'] = preg_replace( "/(^|\s|,!|;)(".preg_quote($keywords, "/").")(\s|,|!|&|$)/i", "\\1<span class='searchlite'>\\2</span>\\3", $topic['post'] );
+				}
+			}
+		}
+		
+		if ( ! $ibforums->member['view_img'] )
+		{
+			//-----------------------------------------
+			// unconvert smilies first, or it looks a bit crap.
+			//-----------------------------------------
+			
+			$topic['post'] = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $topic['post'] );
+			
+			$topic['post'] = preg_replace( "/<img src=[\"'](.+?)[\"'].+?".">/", "(IMG:<a href='\\1' target='_blank'>\\1</a>)", $topic['post'] );
+		}
+		
+		$topic['forum_full_name'] = $forums->forum_by_id[ $topic['forum_id'] ]['name'];
+		
+		if ( strlen($topic['forum_full_name']) > 50 )
+		{
+			$topic['forum_name'] = substr( $topic['forum_full_name'], 0, 47 ) .'...';
+		}
+		else
+		{
+			$topic['forum_name'] = $topic['forum_full_name'];
+		}
+		
+		//$this->parser->pp_do_html  = ( $forums->forum_by_id[ $topic['forum_id'] ]['use_html'] and $ibforums->cache['group_cache'][ $ibforums->member['mgroup'] ]['g_dohtml'] and $topic['post_htmlstate'] ) ? 1 : 0;
+		//$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+		//$this->parser->pp_nl2br    = $topic['post_htmlstate'] == 2 ? 1 : 0;
+		
+		//$topic['post'] = $this->parser->post_db_parse( $topic['post'] );
+		
+		return $topic;
+	}
+        
+    /*-------------------------------------------------------------------------*/
+    // Filter keywords
+    /*-------------------------------------------------------------------------*/
+        
+    function filter_keywords($words="", $name=0)
+    {
+    	// force to lowercase and swop % into a safer version
+    	
+    	$words = trim( strtolower( str_replace( "%", "\\%", $words) ) );
+    	
+    	// Remove trailing boolean operators
+    	
+    	$words = preg_replace( "/\s+(and|or)$/" , "" , $words );
+    	
+    	// Swop wildcard into *SQL percent
+    	
+    	//$words = str_replace( "*", "%", $words );
+    	
+    	// Make safe underscores
+    	
+    	$words = str_replace( "_", "\\_", $words );
+    	
+    	$words = str_replace( '|', "&#124;", $words );
+    	
+    	// Remove crap
+    	
+    	if ($name == 0)
+    	{
+    		$words = preg_replace( "/[\|\[\]\{\}\(\)\,:\\\\\/\"']|&quot;/", "", $words );
+    	}
+    	
+    	// Remove common words.. (should be expanded upon in a later release to return 'not searchable word'
+    	
+    	$words = preg_replace( "/^(?:img|quote|code|html|javascript|a href|color|span|div|border|style)$/", "", $words );
+    	
+    	return " ".preg_quote($words)." ";
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Filter keywords
+    /*-------------------------------------------------------------------------*/
+    
+    function filter_ftext_keywords($words="")
+    {
+		global $ibforums;
+    	
+    	// force to lowercase and swop % into a safer version
+    	
+    	$words = trim($words);
+    	$words = str_replace( '|', "&#124;", $words );
+    	
+    	// Remove crap
+    	
+    	$words = str_replace( "&quot;", '"', $words );
+    	$words = str_replace( "&gt;"  , ">", $words );
+    	$words = str_replace( "%"     , "" , $words );
+    	
+    	//-----------------------------------------
+    	// If it's a phrase in quotes..
+    	//-----------------------------------------
+    	
+    	if ( preg_match( "#^\"(.+?)\"$#", $words ) )
+    	{
+    		return $words;
+    	}
+    	
+    	// Remove common words..
+    	
+    	$words = preg_replace( "/^(?:img|quote|code|html|javascript|a href|color|span|div|border|style)$/", "", $words );
+    	
+    	// OK, lets break up the keywords
+    	
+    	// this or that and this not me
+    	
+    	$words = preg_replace( "/\s+and\s+/i", " ", $words );
+    	
+    	// this or that this not me
+    	
+    	$words = preg_replace( "/\s+not\s+/i", " -", $words );
+    	
+    	// this or that this -me
+    	
+    	$words = preg_replace( "/\s+or\s+/i", ' ~', $words );
+    	
+    	// this ~that this -me
+    	
+    	$words = preg_replace( "/\s+(?!-|~)/", " +", $words );
+    	
+    	// this ~that +this -me
+    	
+    	$words = preg_replace( "/~/", "", $words );
+    	
+    	// this that +this -me
+    	
+    	return $words;
+    }
+    
+    /*-------------------------------------------------------------------------*/
+    // Make the hl words nice and stuff
+    /*-------------------------------------------------------------------------*/
+    
+    function convert_highlite_words($words="")
+    {
+    	$words = trim(urldecode($words));
+    	
+    	// Convert booleans to something easy to match next time around
+    	
+    	$words = preg_replace("/\s+(and|or)(\s+|$)/i", ",\\1,", $words);
+    	
+    	// Convert spaces to plus signs
+    	
+    	$words = preg_replace("/\s/", "+", $words);
+    	
+    	return $words;
+    }
+        
+    /*-------------------------------------------------------------------------*/
+    // Get the searchable forums
+    /*-------------------------------------------------------------------------*/
+        
+    function get_searchable_forums()
+    {
+		global $ibforums, $DB, $std, $forums, $HTTP_POST_VARS;
+    	
+    	$forumids = array();
+    	
+    	//-----------------------------------------
+    	// Check for an array
+    	//-----------------------------------------
+    	
+    	if ( is_array( $HTTP_POST_VARS['forums'] )  )
+    	{
+    	
+    		if ( in_array( 'all', $HTTP_POST_VARS['forums'] ) )
+    		{
+    			//-----------------------------------------
+    			// Searching all forums..
+    			//-----------------------------------------
+    			
+    			foreach( $forums->forum_by_id as $id => $data )
+    			{
+    				$forumids[] = $data['id'];
+    			}
+    		}
+    		else
+    		{
+				//-----------------------------------------
+				// Go loopy loo
+				//-----------------------------------------
+				
+				foreach( $HTTP_POST_VARS['forums'] as $l )
+				{
+					if ( $forums->forum_by_id[ $l ] )
+					{
+						$forumids[] = intval($l);
+					}
+				}
+				
+				//-----------------------------------------
+				// Do we have cats? Give 'em to Charles!
+				//-----------------------------------------
+				
+				if ( count( $forumids  ) )
+				{
+					foreach( $forumids as $f )
+					{
+						$children = $forums->forums_get_children( $f );
+						
+						if ( is_array($children) and count($children) )
+						{
+							$forumids  = array_merge( $forumids , $children );
+						}
+					}
+				}
+				else
+				{
+					//-----------------------------------------
+					// No forums selected / we have available
+					//-----------------------------------------
+					
+					return;
+				}
+    		}
+		}
+		else
+		{
+			//-----------------------------------------
+			// Not an array...
+			//-----------------------------------------
+			
+			if ( $ibforums->input['forums'] == 'all' )
+			{
+				foreach( $forums->forum_by_id as $id => $data )
+    			{
+    				$forumids[] = $data['id'];
+    			}
+			}
+			else
+			{
+				if ( $ibforums->input['forums'] != "" )
+				{
+					$l = intval($ibforums->input['forums']);
+					
+					//-----------------------------------------
+					// Single forum
+					//-----------------------------------------
+					
+					if ( $forums->forum_by_id[ $l ] )
+					{
+						$forumids[] = intval($l);
+					}
+					
+					if ( $ibforums->input['searchsubs'] == 1 )
+					{
+						$children = $forums->forums_get_children( $l );
+						
+						if ( is_array($children) and count($children) )
+						{
+							$forumids  = array_merge( $forumids , $children );
+						}
+					}
+				}
+			}
+		}
+		
+		$final = array();
+		
+		foreach( $forumids  as $f )
+		{
+			if ( $this->check_access($forums->forum_by_id[ $f ] ) == TRUE )
+			{
+				$final[] = $f;
+			}
+		}
+    	
+    	return implode( "," , $final );
+    }
+        
+    /*-------------------------------------------------------------------------*/
+    // Check password...
+    /*-------------------------------------------------------------------------*/
+    
+    function check_access($i)
+    {
+		global $std, $ibforums, $forums;
+    	
+    	$can_read = FALSE;
+  
+    	if ( $std->check_perms( $i['read_perms'] ) == TRUE )
+    	{
+    		$can_read = TRUE;
+    	}
+    	else
+    	{
+    		$can_read = FALSE;
+    	}
+        
+        if ( $i['password'] != "" and $can_read == TRUE )
+		{
+			if ( $forums->forums_compare_password( $i['id'] ) == TRUE )
+			{
+				$can_read = TRUE;
+			}
+			else
+			{
+				$can_read = FALSE;
+			}
+		}
+		
+		return $can_read;
+	}
+        
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/Admin/index.html b/upload/sources/sql/index.html
similarity index 100%
rename from upload/sources/Admin/index.html
rename to upload/sources/sql/index.html
diff --git a/upload/sources/sql/mysql_admin_queries.php b/upload/sources/sql/mysql_admin_queries.php
new file mode 100644
index 00000000..7e044dd7
--- /dev/null
+++ b/upload/sources/sql/mysql_admin_queries.php
@@ -0,0 +1,496 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > MySQL ADMIN DB Queries abstraction module
+|   > Module written by Matt Mecham
+|   > Date started: 24th May 2004
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+
+class sql_queries extends db_driver
+{
+
+     var $db  = "";
+     var $tbl = "";
+     
+    /*========================================================================*/
+    // Set up...             
+    /*========================================================================*/  
+                   
+    function sql_queries( $obj )
+    {
+    	$this->db = $obj;
+    	
+    	if ( ! $this->db->obj['sql_tbl_prefix'] )
+    	{
+    		$this->db->obj['sql_tbl_prefix'] = '".SQL_PREFIX."';
+    	}
+    	
+    	$this->tbl = $this->db->obj['sql_tbl_prefix'];
+    }
+    
+    /*========================================================================*/
+    
+    
+    function admin_emo_count( $a )
+    {
+    	return "SELECT id, count(id) as count, emo_set FROM ".SQL_PREFIX."emoticons GROUP BY emo_set ORDER BY emo_set";
+    }
+    
+    function adminlogs_view_one( $a )
+    {
+    	return "SELECT m.*, mem.id, mem.name FROM ".SQL_PREFIX."admin_logs m, ".SQL_PREFIX."members mem
+				WHERE m.member_id={$a['mid']} AND m.member_id=mem.id ORDER BY m.ctime DESC LIMIT {$a['limit_a']}, 20";
+    }
+    
+    function adminlogs_view_two( $a )
+    {
+    	return "SELECT m.*, mem.id, mem.name FROM ".SQL_PREFIX."admin_logs m, ".SQL_PREFIX."members mem
+				 WHERE m.member_id=mem.id AND {$a['dbq']} ORDER BY m.ctime DESC LIMIT {$a['limit_a']}, 20";
+    }
+    
+    function adminlogs_view_list_current( $a )
+    {
+    	return "SELECT m.*, mem.id, mem.name FROM ".SQL_PREFIX."admin_logs m, ".SQL_PREFIX."members mem
+				 WHERE m.member_id=mem.id ORDER BY m.ctime DESC LIMIT 0, 5";
+    }
+    
+    function adminlogs_view_list_current_two( $a )
+    {
+    	return "SELECT m.*, mem.name, count(m.id) as act_count
+				FROM ".SQL_PREFIX."admin_logs m, ".SQL_PREFIX."members mem
+				WHERE m.member_id=mem.id
+				GROUP BY m.member_id ORDER BY act_count DESC";
+    }
+	
+	function attachments_search_complete( $a )
+	{
+		return "SELECT a.*, t.tid, t.forum_id, t.title, p.author_id, p.author_name, p.post_date
+				FROM ".SQL_PREFIX."attachments a
+				 LEFT JOIN ".SQL_PREFIX."posts p ON (p.pid=a.attach_pid)
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				WHERE attach_pid != 0 {$a['queryfinal']}
+				ORDER BY a.attach_{$a['orderby']} {$a['sort']}
+				LIMIT 0, {$a['limit_b']}";
+	}
+	
+	function attachments_bulk_remove( $a )
+	{
+		return "SELECT a.*, p.pid, p.topic_id
+				FROM ".SQL_PREFIX."attachments a
+				 LEFT JOIN ".SQL_PREFIX."posts p ON (p.pid=a.attach_pid)
+				WHERE a.attach_pid > 0 AND a.attach_id IN(".implode(",",$a['ids']).")";
+	}
+	
+	function attachments_last_x( $a )
+	{
+		return "SELECT a.*, t.tid, t.forum_id, t.title, p.author_id, p.author_name, p.post_date
+				FROM ".SQL_PREFIX."attachments a
+				 LEFT JOIN ".SQL_PREFIX."posts p ON (p.pid=a.attach_pid)
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				WHERE attach_pid != 0
+				ORDER BY a.{$a['order']} DESC
+				LIMIT 0, 5";
+	}
+	
+	function emaillogs_view_email( $a )
+	{	
+		return "SELECT email.*, m.id, m.name, mem.id as to_id, mem.name as to_name FROM ".SQL_PREFIX."email_logs email
+				 LEFT JOIN ".SQL_PREFIX."members m ON (m.id=email.from_member_id)
+				 LEFT JOIN ".SQL_PREFIX."members mem ON (mem.id=email.to_member_id)
+				WHERE email.email_id={$a['id']}";
+	}
+	
+	function emaillogs_list_current( $a )
+	{	
+		return "SELECT email.*, m.id, m.name, mem.id as to_id, mem.name as to_name FROM ".SQL_PREFIX."email_logs email
+				 LEFT JOIN ".SQL_PREFIX."members m ON (m.id=email.from_member_id)
+				 LEFT JOIN ".SQL_PREFIX."members mem ON (mem.id=email.to_member_id) {$a['dbe']}
+				ORDER BY email_date DESC LIMIT {$a['limit_a']},25";
+	}
+	
+	function groups_permsplash( $a )
+	{
+		return "SELECT COUNT(id) as count, org_perm_id FROM ".SQL_PREFIX."members WHERE (org_perm_id IS NOT NULL AND org_perm_id <> 0) GROUP by org_perm_id";
+	}
+	
+	function groups_main_screen( $a )
+	{
+		return "SELECT ".SQL_PREFIX."groups.g_id, ".SQL_PREFIX."groups.g_access_cp, ".SQL_PREFIX."groups.g_is_supmod, ".SQL_PREFIX."groups.g_title,".SQL_PREFIX."groups.prefix, ".SQL_PREFIX."groups.suffix,
+				  COUNT(".SQL_PREFIX."members.id) as count FROM ".SQL_PREFIX."groups
+		         LEFT JOIN ".SQL_PREFIX."members ON (".SQL_PREFIX."members.mgroup = ".SQL_PREFIX."groups.g_id)
+		         GROUP BY ".SQL_PREFIX."groups.g_id ORDER BY ".SQL_PREFIX."groups.g_title";
+	}
+	
+	function index_admin_logs( $a )
+	{
+		return "SELECT m.*, mem.id, mem.name FROM ".SQL_PREFIX."admin_logs m, ".SQL_PREFIX."members mem
+					WHERE  m.member_id=mem.id ORDER BY m.ctime DESC LIMIT 0, 5";
+	}
+	
+	function languages_list_current( $a )
+	{
+		return "select ".SQL_PREFIX."languages.*, count(".SQL_PREFIX."members.id) as mcount from ".SQL_PREFIX."languages
+				left join ".SQL_PREFIX."members on(".SQL_PREFIX."members.language=".SQL_PREFIX."languages.ldir)
+				where (".SQL_PREFIX."members.language is not null or ".SQL_PREFIX."members.language = 'en')
+				group by ".SQL_PREFIX."languages.ldir
+				order by ".SQL_PREFIX."languages.lname";
+	}
+	
+	function member_tools_learn_ip_one( $a )
+	{
+		return "SELECT m.id, m.name, m.email, m.posts, m.joined, p.pid, p.author_id, p.post_date, p.ip_address, p.topic_id
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."members m ON ( p.author_id=m.id)
+				WHERE p.ip_address{$a['query']} GROUP BY p.author_id ORDER BY p.post_date DESC LIMIT 250";
+	}
+	
+	function member_tools_learn_ip_two( $a )
+	{
+		return "SELECT m.id, m.name, m.email, m.posts, m.joined, p.vote_date, p.ip_address, p.tid
+				FROM ".SQL_PREFIX."voters p
+				 LEFT JOIN ".SQL_PREFIX."members m ON ( p.member_id=m.id)
+				WHERE p.ip_address{$a['query']} GROUP BY p.member_id ORDER BY p.vote_date DESC LIMIT 250";
+	}
+	
+	function member_tools_learn_ip_three( $a )
+	{
+		return "SELECT m.id, m.name, m.email, m.posts, m.joined, p.email_date, p.from_ip_address
+				FROM ".SQL_PREFIX."email_logs p
+				 LEFT JOIN ".SQL_PREFIX."members m ON ( p.from_member_id=m.id)
+				WHERE p.from_ip_address{$a['query']} GROUP BY p.from_member_id ORDER BY p.email_date DESC LIMIT 250";
+	}
+	
+	function member_tools_learn_ip_four( $a )
+	{
+		return "SELECT m.id, m.name, m.email, m.posts, m.joined, p.entry_date, p.ip_address
+				FROM ".SQL_PREFIX."validating p
+				 LEFT JOIN ".SQL_PREFIX."members m ON ( p.member_id=m.id)
+				WHERE p.ip_address{$a['query']} GROUP BY p.member_id ORDER BY p.entry_date DESC LIMIT 250";
+	}
+	
+	function member_tools_show_ips( $a )
+	{
+		return "SELECT count(ip_address) as ip, ip_address, pid, topic_id, post_date
+				FROM ".SQL_PREFIX."posts
+				WHERE author_id={$a['mid']}
+				GROUP BY ip_address
+				ORDER BY ip DESC LIMIT {$a['st']}, {$a['end']}";
+	}
+	
+	function member_domod( $a )
+	{
+		return "SELECT m.id, m.email, m.mgroup, v.* FROM ".SQL_PREFIX."validating v
+				 LEFT JOIN ".SQL_PREFIX."members m ON (v.member_id=m.id)
+				WHERE m.id IN(".implode( ",",$a['ids'] ).")";
+	}
+	
+	function member_view_mod( $a )
+	{
+		return "SELECT m.name, m.id, m.email, m.posts, m.joined, v.*
+				  FROM ".SQL_PREFIX."validating v
+				LEFT JOIN ".SQL_PREFIX."members m ON (v.member_id=m.id)
+				WHERE v.lost_pass <> 1
+				ORDER BY {$a['col']} {$a['ord']} LIMIT {$a['st']},75";
+	}
+	
+	function member_search_form_one( $a )
+	{
+		return "SELECT m.*, me.*, m.id as memid
+				FROM ".SQL_PREFIX."members m
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
+				{$a['rq']} ORDER BY m.name LIMIT {$a['st']},25";
+	}
+	
+	function member_search_form_two( $a )
+	{
+		return "SELECT m.*, me.*, m.id as memid
+				FROM ".SQL_PREFIX."members m
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
+				{$a['rq']}";
+	}
+	
+	function member_search_form_count( $a )
+	{
+		return "SELECT COUNT(*) as count
+				FROM ".SQL_PREFIX."members m
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
+			   {$a['rq']}";
+	}
+	
+	function member_search_do_edit_form( $a )
+	{
+		return "SELECT m.*, me.*, p.*, m.id as memid FROM ".SQL_PREFIX."members m
+				 LEFT JOIN ".SQL_PREFIX."member_extra me on (me.id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."pfields_content p on (p.member_id=m.id)
+				WHERE m.id=".$a['mid'];
+	}
+	
+	function modlogs_view_one( $a )
+	{
+		return "SELECT m.*, f.id as forum_id, f.name FROM ".SQL_PREFIX."moderator_logs m
+				 LEFT JOIN ".SQL_PREFIX."forums f ON(f.id=m.forum_id)
+				WHERE m.member_id={$a['mid']} ORDER BY m.ctime DESC LIMIT {$a['start']}, 20";
+	}
+	
+	function modlogs_view_two( $a )
+	{
+		return "SELECT m.*, f.id as forum_id, f.name FROM ".SQL_PREFIX."moderator_logs m
+				LEFT JOIN ".SQL_PREFIX."forums f ON(f.id=m.forum_id)
+				WHERE {$a['dbq']} ORDER BY m.ctime DESC LIMIT {$a['start']}, 20";
+	}
+	
+	function modlogs_list_current_last_five( $a )
+	{
+		return "SELECT m.*, f.id as forum_id, f.name FROM ".SQL_PREFIX."moderator_logs m
+		            LEFT JOIN ".SQL_PREFIX."forums f ON (f.id=m.forum_id)
+		            ORDER BY m.ctime DESC LIMIT 0, 5";
+	}
+	
+	function modlogs_list_current_show_all( $a )
+	{
+		return "SELECT m.*, count(m.id) as act_count from ".SQL_PREFIX."moderator_logs m GROUP BY m.member_id ORDER BY act_count DESC";
+	}
+	
+	function spiderlogs_list_current( $a )
+	{
+		return "SELECT count(*) as cnt, bot, entry_date, query_string FROM ".SQL_PREFIX."spider_logs group by bot order by entry_date DESC";
+	}
+	
+	function statistics_show_views( $a )
+	{
+		return "SELECT SUM(t.views) as result_count, t.forum_id, f.name as result_name
+				FROM ".SQL_PREFIX."topics t, ".SQL_PREFIX."forums f
+				WHERE t.start_date > '{$a['from_time']}'
+				AND t.start_date < '{$a['to_time']}'
+				AND t.forum_id=f.id
+				GROUP BY t.forum_id
+				ORDER BY result_count {$a['sortby']}";
+	}
+	
+	function statistics_result_screen( $a )
+	{
+		return "SELECT MAX({$a['sql_field']}) as result_maxdate,
+				 COUNT(*) as result_count,
+				 DATE_FORMAT(from_unixtime({$a['sql_field']}),'{$a['sql_date']}') AS result_time
+				 FROM ".SQL_PREFIX."{$a['sql_table']}
+				 WHERE {$a['sql_field']} > '{$a['from_time']}'
+				 AND {$a['sql_field']} < '{$a['to_time']}'
+				 GROUP BY result_time
+				 ORDER BY {$a['sql_field']} {$a['sortby']}";
+	}
+	
+	function stylesets_list_sets_templates( $a )
+	{
+		return "SELECT set_id FROM ".SQL_PREFIX."skin_templates GROUP BY set_id";
+	}
+	
+	function stylesets_list_sets_macros( $a )
+	{
+		return "SELECT macro_set FROM ".SQL_PREFIX."skin_macro GROUP BY macro_set";
+	}
+	
+	function stylesheets_do_form_concat( $a )
+	{
+		return "SELECT *, instr(',{$a['id']}{$a['parent']},1,', concat(',',set_skin_set_id,',') ) as theorder
+				 FROM ".SQL_PREFIX."skin_sets
+				 WHERE set_skin_set_id in ({$a['id']}{$a['parent']},1)
+				 ORDER BY theorder";
+	}
+	
+	function warnlogs_view_note( $a )
+	{
+		return "SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
+				FROM ".SQL_PREFIX."warn_logs l
+				  LEFT JOIN ".SQL_PREFIX."members m ON (m.id=l.wlog_mid)
+				  LEFT JOIN ".SQL_PREFIX."members p ON (p.id=l.wlog_addedby)
+				WHERE l.wlog_id={$a['id']}";
+	}
+	
+	function warnlogs_view( $a )
+	{
+		return "SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
+				FROM ".SQL_PREFIX."warn_logs l
+				  LEFT JOIN ".SQL_PREFIX."members m ON (m.id=l.wlog_mid)
+				  LEFT JOIN ".SQL_PREFIX."members p ON (p.id=l.wlog_addedby)
+				WHERE l.wlog_mid={$a['mid']}
+				ORDER BY l.wlog_date DESC LIMIT {$a['start']},30";
+	}
+	
+	function warnlogs_view_two( $a )
+	{
+		return "SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
+				FROM ".SQL_PREFIX."warn_logs l
+				  LEFT JOIN ".SQL_PREFIX."members m ON (m.id=l.wlog_mid)
+				  LEFT JOIN ".SQL_PREFIX."members p ON (p.id=l.wlog_addedby)
+				WHERE {$a['dbq']}
+				ORDER BY l.wlog_date DESC LIMIT {$a['start']},30";
+	}
+	
+	function warnlogs_list_current( $a )
+	{
+		return "SELECT l.*, m.id as a_id, m.name as a_name, p.id as p_id, p.name as p_name
+				FROM ".SQL_PREFIX."warn_logs l
+				LEFT JOIN ".SQL_PREFIX."members m ON (m.id=l.wlog_mid)
+				LEFT JOIN ".SQL_PREFIX."members p ON (p.id=l.wlog_addedby)
+			   ORDER BY l.wlog_date DESC LIMIT 0,10";
+	}
+	
+	function warnlogs_list_current_two( $a )
+	{
+		return "SELECT l.*, m.name, count(l.wlog_mid) as act_count
+				from ".SQL_PREFIX."warn_logs l, ".SQL_PREFIX."members m
+				WHERE m.id=l.wlog_mid
+				GROUP BY l.wlog_mid
+				ORDER BY act_count DESC";
+	}
+	
+	
+	function cache_wrapper( $a )
+	{
+		return "SELECT *, instr(',{$a['id']}{$a['parent_in']},{$a['root']},', concat(',',set_skin_set_id,',') ) as theorder
+				FROM ".SQL_PREFIX."skin_sets
+				WHERE set_wrapper != '' AND set_skin_set_id in ({$a['id']}{$a['parent_in']},{$a['root']})
+				ORDER BY theorder
+				LIMIT 0,1";
+	}
+	
+	function cache_templates_titles( $a )
+	{
+		return "SELECT group_name, set_id, suid, func_name, func_data,
+				 INSTR(',{$a['id']}{$a['parent_in']},{$a['root']},' , CONCAT(',',set_id,',') ) as theorder
+				FROM ".SQL_PREFIX."skin_templates WHERE set_id IN ({$a['id']}{$a['parent_in']},{$a['root']}) ORDER BY group_name, theorder DESC";
+	}
+	
+	function cache_templates_bits( $a )
+	{
+		return "SELECT *,
+				 INSTR(',{$a['id']}{$a['parent_in']},{$a['root']},' , CONCAT(',',set_id,',') ) as theorder
+				FROM ".SQL_PREFIX."skin_templates WHERE set_id IN ({$a['id']}{$a['parent_in']},{$a['root']}) AND group_name='{$a['group']}' ORDER BY func_name,theorder DESC";
+	}
+	
+	function cache_templates_all( $a )
+	{
+		return "SELECT *,
+				 INSTR(',{$a['id']}{$a['parent_in']},{$a['root']},' , CONCAT(',',set_id,',') ) as theorder
+				FROM ".SQL_PREFIX."skin_templates WHERE set_id IN ({$a['id']}{$a['parent_in']},{$a['root']}) ORDER BY group_name, func_name, theorder DESC";
+	}
+	
+	function cache_templates_css( $a )
+	{
+		return "SELECT *, instr(',{$a['id']}{$a['parent_in']},{$a['root']},', concat(',',set_skin_set_id,',') ) as theorder
+				FROM ".SQL_PREFIX."skin_sets
+				WHERE set_css != '' AND set_skin_set_id in ({$a['id']}{$a['parent_in']},{$a['root']})
+				ORDER BY theorder
+				LIMIT 0,1";
+	}
+	
+	function cache_templates_macros( $a )
+	{
+		return "SELECT *,
+				 INSTR(',{$a['id']}{$a['parent_in']},{$a['root']},' , CONCAT(',',macro_set,',') ) as theorder
+				FROM ".SQL_PREFIX."skin_macro
+				WHERE macro_set IN ({$a['id']}{$a['parent_in']},{$a['root']})
+				ORDER BY macro_value ASC,theorder DESC";
+	}
+	
+	function cache_empty_css( $a )
+	{
+		return "SELECT * FROM ".SQL_PREFIX."skin_sets WHERE set_css like '' AND set_skin_set_parent={$a['parent_id']}";
+	}
+	
+	function cache_empty_wrapper( $a )
+	{
+		return "SELECT * FROM ".SQL_PREFIX."skin_sets WHERE set_wrapper like '' AND set_skin_set_parent={$a['parent_id']}";
+	}
+	
+	function mod_func_get_last_post( $a )
+	{
+		return "SELECT p.post_date, p.topic_id, p.author_id, p.author_name, p.pid, t.forum_id
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				WHERE topic_id={$a['tid']} and queued <> 1
+				ORDER BY pid DESC LIMIT 0,1";
+	}
+	
+	function mod_func_get_attach_count( $a )
+	{
+		return "SELECT COUNT(*) as count FROM ".SQL_PREFIX."attachments a
+			     LEFT JOIN ".SQL_PREFIX."posts p on (a.attach_pid=p.pid)
+			    WHERE p.topic_id={$a['tid']}";
+	
+	}
+	
+	function mod_func_get_topic_tracker( $a )
+	{
+		return "SELECT tr.*, m.id, m.mgroup, m.org_perm_id, t.tid, t.forum_id, g.g_id, g.g_perm_id
+				 FROM ".SQL_PREFIX."tracker tr
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (tr.topic_id=t.tid)
+				 LEFT JOIN ".SQL_PREFIX."members m on (m.id=tr.member_id)
+				 LEFT JOIN ".SQL_PREFIX."groups g on (g.g_id=m.mgroup)
+				WHERE tr.topic_id".$a['tid'];
+	}
+	
+	function ucp_get_all_announcements( $a )
+	{
+		return "SELECT a.*, m.id, m.name
+				 FROM ".SQL_PREFIX."announcements a
+				  LEFT JOIN ".SQL_PREFIX."members m on (a.announce_member_id=m.id)
+				 ORDER BY announce_end DESC";
+	}
+	
+	function ucp_get_all_announcements_byid( $a )
+	{
+		return "SELECT a.*, m.*, me.*
+				 FROM ".SQL_PREFIX."announcements a
+				  LEFT JOIN ".SQL_PREFIX."members m on (a.announce_member_id=m.id)
+				  LEFT JOIN ".SQL_PREFIX."member_extra me on (me.id=m.id)
+				 WHERE a.announce_id={$a['id']}";
+	}
+	
+	function ucp_tracker_prune( $a )
+	{
+		return "SELECT tr.trid FROM ".SQL_PREFIX."tracker tr, ".SQL_PREFIX."topics t WHERE t.tid=tr.topic_id AND t.last_post < {$a['time']}";
+	}
+	
+	function login_getmember( $a )
+	{
+		return "SELECT m.*, g.*
+				FROM ibf_members m, ibf_groups g
+				WHERE LOWER(name)='{$a['username']}' and m.mgroup=g.g_id";
+	}
+	
+	function settings_search( $a )
+	{
+		return "SELECT *
+				FROM ".SQL_PREFIX."conf_settings
+				WHERE LOWER(conf_title) LIKE '%{$a['keywords']}%' OR LOWER(conf_description) LIKE '%{$a['keywords']}%'
+				ORDER BY conf_title
+				LIMIT {$a['limit_a']}, {$a['limit_b']}";
+	}
+	
+    
+} // end class
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/sql/mysql_extra_queries.php b/upload/sources/sql/mysql_extra_queries.php
new file mode 100644
index 00000000..9bc2111a
--- /dev/null
+++ b/upload/sources/sql/mysql_extra_queries.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > MySQL DB Queries abstraction module
+|   > Module written by Matt Mecham
+|   > Date started: 26th November 2003
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+
+class sql_extra_queries extends db_driver
+{
+
+     var $db  = "";
+     var $tbl = "";
+     
+    /*========================================================================*/
+    // Set up...             
+    /*========================================================================*/  
+                   
+    function sql_extra_queries( $obj )
+    {
+    	$this->db = $obj;
+    	
+    	if ( ! $this->db->obj['sql_tbl_prefix'] )
+    	{
+    		$this->db->obj['sql_tbl_prefix'] = 'ibf_';
+    	}
+    	
+    	$this->tbl = $this->db->obj['sql_tbl_prefix'];
+    }
+    
+    /*========================================================================*/
+    
+    function digest_get_topics( $a )
+    {
+    	return "SELECT tr.trid, tr.topic_id, tr.member_id as trmid, m.name, m.email, m.id, m.email_full, m.language, m.last_activity, t.title, t.*
+				FROM ".SQL_PREFIX."tracker tr
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=tr.topic_id)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (tr.member_id=m.id)
+				WHERE tr.topic_track_type='{$a['type']}'
+				AND t.approved=1
+				AND t.last_post > {$a['last_time']}";
+    }
+    
+    function digest_get_forums_topics( $a )
+    {
+    	return "SELECT t.*, p.*
+			     FROM ".SQL_PREFIX."topics t
+			      LEFT JOIN ".SQL_PREFIX."posts p on (t.topic_firstpost=p.pid)
+			     WHERE t.forum_id={$a['forum_id']}
+			      AND t.last_post > {$a['last_time']}";
+    }
+    
+    function digest_get_forums( $a )
+    {
+    	return "SELECT ft.*, m.name, m.id, m.email
+    			 FROM ".SQL_PREFIX."forum_tracker ft
+    			 LEFT JOIN ".SQL_PREFIX."members m ON (m.id=ft.member_id)
+    			 WHERE ft.forum_track_type='{$a['type']}'";
+    }
+    
+    function acp_postoffice_concat_bit($a)
+    {
+    	return "CONCAT(',',mgroup_others,',') LIKE '%,{$a['gid']},%'";
+    }
+    
+	
+    
+} // end class
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/sql/mysql_queries.php b/upload/sources/sql/mysql_queries.php
new file mode 100644
index 00000000..6061e2eb
--- /dev/null
+++ b/upload/sources/sql/mysql_queries.php
@@ -0,0 +1,684 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > MySQL DB Queries abstraction module
+|   > Module written by Matt Mecham
+|   > Date started: 26th November 2003
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+
+class sql_queries extends db_driver
+{
+
+     var $db  = "";
+     var $tbl = "";
+     
+    /*========================================================================*/
+    // Set up...             
+    /*========================================================================*/  
+                   
+    function sql_queries( $obj )
+    {
+    	$this->db = &$obj;
+    	
+    	if ( ! $this->db->obj['sql_tbl_prefix'] )
+    	{
+    		$this->db->obj['sql_tbl_prefix'] = 'ibf_';
+    	}
+    	
+    	$this->tbl = $this->db->obj['sql_tbl_prefix'];
+    }
+    
+    /*========================================================================*/
+    
+    function forums_get_active_users( $a )
+    {
+    	# forums.php
+    	
+    	return "SELECT s.member_id, s.member_name, s.member_group, s.login_type, s.location, t.forum_id
+				FROM ".SQL_PREFIX."sessions s
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=s.in_topic)
+				WHERE (s.in_forum={$a['fid']} OR t.forum_id={$a['fid']})
+				AND s.running_time > {$a['time']}
+				AND s.in_error != 1
+				ORDER BY s.running_time DESC";
+    }
+    
+    function forums_get_replied_topics( $a )
+    {
+    	return  "SELECT COUNT(DISTINCT(p.topic_id)) as max FROM ".SQL_PREFIX."topics t
+				  LEFT JOIN ".SQL_PREFIX."posts p ON (p.topic_id=t.tid)
+				 WHERE t.forum_id={$a['fid']} AND p.author_id={$a['mid']} AND p.new_topic=0
+				 {$a['approved']} {$a['prune_filter']}";
+    }
+    
+    function forums_get_replied_topics_actual( $a )
+    {
+    	return  "SELECT DISTINCT(p.author_id), t.* FROM ".SQL_PREFIX."topics t
+				  LEFT JOIN ".SQL_PREFIX."posts p ON (p.topic_id=t.tid AND p.author_id={$a['mid']})
+				 WHERE t.forum_id={$a['fid']} 
+				 AND {$a['query']}  AND p.new_topic=0
+				 ORDER BY pinned desc,{$a['topic_sort']} {$a['sort_key']} {$a['r_sort_by']}
+				 LIMIT {$a['limit_a']}, {$a['limit_b']}";
+    }
+    
+    function topics_check_for_mod( $a )
+    {
+    	# topics.php
+    	
+    	return "SELECT * FROM ".SQL_PREFIX."moderators WHERE forum_id={$a['fid']} AND (member_id={$a['mid']} OR (is_group=1 AND group_id={$a['gid']}))";
+    	
+    }
+    
+    
+    function topics_get_posts( $a )
+    {
+    	# topics.php
+    	
+    	return "SELECT p.*,
+				m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
+				me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size
+				FROM ".SQL_PREFIX."posts p
+				  LEFT JOIN ".SQL_PREFIX."members m ON (p.author_id=m.id)
+				  LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				WHERE p.pid IN(".implode(',', $a['pids']).") ORDER BY {$a['scol']} {$a['sord']}";
+    	
+    }
+    
+    function topics_get_posts_with_join( $a )
+    {
+    	# topics.php
+    	
+    	return "SELECT p.*,
+				m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
+				me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size,
+				pc.*
+				FROM ".SQL_PREFIX."posts p
+				  LEFT JOIN ".SQL_PREFIX."members m ON (p.author_id=m.id)
+				  LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				  LEFT JOIN ".SQL_PREFIX."pfields_content pc ON (pc.member_id=p.author_id)
+				WHERE p.pid IN(".implode(',', $a['pids']).") ORDER BY {$a['scol']} {$a['sord']}";
+    	
+    }
+    
+    function topics_get_active_users( $a )
+    {
+    	# topics.php
+    	
+    	return "SELECT s.member_id, s.member_name, s.member_group, s.login_type, s.location
+				FROM ".SQL_PREFIX."sessions s
+				WHERE s.in_topic={$a['tid']}
+				AND s.running_time > {$a['time']}
+				AND s.in_error != 1
+				ORDER BY s.running_time DESC";
+	}
+	
+	function topics_replace_topic_read( $a )
+	{
+		# topics.php
+		# Not got REPLACE INTO? Use delete from .. where, then insert into ... set...
+		
+		return "REPLACE INTO ".SQL_PREFIX."topics_read SET read_tid={$a['tid']},read_mid={$a['mid']},read_date={$a['date']}";	
+	}
+	
+	
+	
+	function session_load_member( $a )
+	{
+		return "SELECT m.id, m.name, m.mgroup, m.member_login_key, m.email, m.restrict_post, m.view_sigs, m.view_avs, m.view_pop, m.view_img, m.auto_track,
+				m.mod_posts, m.language, m.skin, m.new_msg, m.show_popup, m.msg_total, m.time_offset, m.posts, m.joined, m.last_post, m.subs_pkg_chosen,
+				m.ignored_users, m.login_anonymous, m.last_visit, m.last_activity, m.dst_in_use, m.view_prefs, m.org_perm_id, m.mgroup_others, m.temp_ban, m.sub_end
+				FROM ".SQL_PREFIX."members m
+				WHERE m.id={$a['mid']}";
+	}
+	
+	function post_topic_tracker( $a )
+	{
+		#post
+		
+		return "SELECT tr.trid, tr.topic_id, m.name, m.email, m.id, m.email_full, m.language, m.last_activity, t.title, t.forum_id
+				FROM ".SQL_PREFIX."tracker tr, ".SQL_PREFIX."topics t,".SQL_PREFIX."members m
+				WHERE tr.topic_id='{$a['tid']}'
+				AND tr.member_id=m.id
+				AND m.id <> {$a['mid']}
+				AND t.tid=tr.topic_id
+				AND ( ( tr.topic_track_type='delayed' AND m.last_activity > {$a['last_post']} ) OR tr.topic_track_type='immediate' )";
+	
+	}
+	
+	function post_forum_tracker( $a )
+	{
+		#post
+		
+		return "SELECT tr.frid, m.name, m.email, m.id, m.language, m.last_activity, m.org_perm_id, g.g_perm_id
+				FROM ".SQL_PREFIX."forum_tracker tr,".SQL_PREFIX."members m, ".SQL_PREFIX."groups g
+				WHERE tr.forum_id={$a['fid']}
+				AND tr.member_id=m.id
+				AND m.mgroup=g.g_id
+				AND m.id <> {$a['mid']}
+				AND ( ( tr.forum_track_type='delayed' AND m.last_activity < {$a['last_post']} ) OR tr.forum_track_type='immediate' )";
+	}
+	
+	
+	function post_get_quoted( $a )
+	{
+		return "select p.*,t.forum_id FROM ".SQL_PREFIX."posts p LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=p.topic_id)
+				WHERE pid IN (".implode(",", $a['quoted_pids']).")";
+	
+	}
+	
+	function msg_get_msg_poster( $a )
+	{
+		return "SELECT m.*, g.* FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE m.id={$a['mid']} AND g.g_id=m.mgroup";
+	}
+	
+	function msg_get_msg_archive( $a )
+	{
+		return "SELECT m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
+				g.g_id, g.g_title, g.g_icon, g.g_dohtml,
+				me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size,
+				mt.*, msg.*
+				FROM ".SQL_PREFIX."message_topics mt
+				 LEFT JOIN ".SQL_PREFIX."message_text msg ON (mt.mt_msg_id=msg.msg_id)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (mt.mt_from_id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_date {$a['older_newer']} {$a['time_cut']} {$a['folder_query']}
+				LIMIT 0, {$a['limit_b']}";
+	}
+	
+	function msg_get_msg_to_show( $a )
+	{
+		return "SELECT m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,m.login_anonymous,m.title,m.hide_email, m.warn_level, m.warn_lastwarn,
+				g.g_id, g.g_title, g.g_icon, g.g_dohtml,
+				me.msnname,me.aim_name,me.icq_number,me.signature, me.website,me.yahoo,me.location, me.avatar_location, me.avatar_type, me.avatar_size,
+				mt.*, msg.*
+				FROM ".SQL_PREFIX."message_topics mt
+				 LEFT JOIN ".SQL_PREFIX."message_text msg ON (mt.mt_msg_id=msg.msg_id)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (mt.mt_from_id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				WHERE mt.mt_id={$a['msgid']} AND mt.mt_owner_id={$a['mid']}";
+	}
+	
+	function msg_get_saved_msg( $a )
+	{
+		return "SELECT m.id,m.name, mt.*, msg.*
+				FROM ".SQL_PREFIX."message_topics mt
+				 LEFT JOIN ".SQL_PREFIX."message_text msg ON (mt.mt_msg_id=msg.msg_id)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (mt.mt_to_id=m.id)
+				WHERE mt.mt_id={$a['msgid']} AND mt.mt_owner_id={$a['mid']}";
+	}
+
+	function msg_get_cc_users( $a )
+	{
+	
+		return "SELECT m.mgroup_others, m.id, m.name, m.msg_total, m.view_pop, m.email_pm, m.language, m.email, me.vdirs, g.g_max_messages, g.g_use_pm FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g
+		        LEFT JOIN ".SQL_PREFIX."member_extra me ON (m.id=me.id)
+			   WHERE LOWER(m.name) IN (".implode(",",$a['name_array']).")
+			   AND m.mgroup=g.g_id";
+	
+	
+	}
+	
+	function msg_get_cc_blocked( $a )
+	{
+	
+		return "SELECT m.name, c.allow_msg
+				FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."contacts c
+				WHERE contact_id={$a['mid']}
+				AND member_id IN (".implode(",",$a['cc_array']).") AND m.id=c.member_id";
+	
+	}
+
+	function msg_get_sent_list( $a )
+	{
+		return "SELECT mem.name as from_name, mem.id as from_id, mt.*
+				 FROM ".SQL_PREFIX."message_topics mt
+				 LEFT JOIN ".SQL_PREFIX."members mem ON ( mt.mt_to_id=mem.id )
+				WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_from_id={$a['mid']} AND mt.mt_vid_folder='{$a['vid']}'
+				ORDER BY {$a['sort']} LIMIT {$a['limita']}, {$a['limitb']}";
+	}
+	
+	function msg_get_folder_list( $a )
+	{
+	
+		return "SELECT mt.*,mem.name as from_name, mem.id as from_id
+				 FROM ".SQL_PREFIX."message_topics mt
+				 LEFT JOIN ".SQL_PREFIX."members mem ON ( mt.mt_from_id=mem.id )
+				WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_to_id={$a['mid']}  AND mt.mt_vid_folder='{$a['vid']}'
+				ORDER BY mt.{$a['sort']} LIMIT {$a['limita']}, {$a['limitb']}";
+	}
+	
+	function msg_get_tracking( $a )
+	{
+		return "SELECT msg.*, mt.*, mp.name as to_name, mp.id as memid
+				 FROM ".SQL_PREFIX."message_topics mt
+				  LEFT JOIN ".SQL_PREFIX."message_text msg ON ( mt.mt_msg_id=msg.msg_id )
+				  LEFT JOIN ".SQL_PREFIX."members mp ON (mt.mt_to_id=mp.id)
+				WHERE mt.mt_from_id={$a['mid']} AND mt.mt_tracking=1";
+	
+	}
+
+	function msg_get_new_pm_notification( $a )
+	{
+		return "SELECT m.id,m.name,m.mgroup,m.email,m.joined,m.posts, m.last_visit, m.last_activity,
+				 m.warn_level, m.warn_lastwarn,
+				 me.*,
+				g.g_id, g.g_title, g.g_icon, g.g_dohtml, mt.*, msg.*
+				FROM ".SQL_PREFIX."message_topics mt
+				 LEFT JOIN ".SQL_PREFIX."message_text msg ON (mt.mt_msg_id=msg.msg_id)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (mt.mt_from_id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (mt.mt_from_id=me.id)
+				 LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
+				WHERE mt.mt_owner_id={$a['mid']} AND mt.mt_vid_folder='in' ORDER BY mt_date DESC LIMIT 1";
+	}
+	
+	function ucp_tracker_prune( $a )
+	{
+		return "SELECT tr.trid FROM ".SQL_PREFIX."tracker tr, ".SQL_PREFIX."topics t WHERE t.tid=tr.topic_id AND t.last_post < {$a['time']}";
+	}
+
+	function profile_get_all( $a )
+	{
+		return "SELECT m.*, me.*, s.running_time, s.location as sesslocation, s.in_forum, s.in_topic FROM ".SQL_PREFIX."members m
+					LEFT JOIN ".SQL_PREFIX."sessions s ON (s.member_id=m.id)
+					LEFT JOIN ".SQL_PREFIX."member_extra me ON ( me.id=m.id )
+				WHERE m.id={$a['mid']}";
+	}
+	
+	function profile_get_favourite( $a )
+	{
+		return "SELECT t.forum_id, COUNT(p.author_id) as f_posts
+    				FROM ".SQL_PREFIX."posts p
+    				  LEFT JOIN ".SQL_PREFIX."topics t ON ( p.topic_id=t.tid AND t.forum_id IN (".implode(",",$a['fid_array']).") )
+    			    WHERE p.author_id={$a['mid']} AND t.tid IS NOT NULL
+    			    GROUP BY t.forum_id
+    			    ORDER BY f_posts DESC";
+	}
+	
+	function attach_get_perms( $a )
+	{
+		return "SELECT p.pid, p.topic_id, t.forum_id
+    				FROM ".SQL_PREFIX."posts p
+    				  LEFT JOIN ".SQL_PREFIX."topics t ON ( p.topic_id=t.tid )
+    			    WHERE p.pid={$a['apid']}";
+	}
+	
+	
+	function usercp_get_attachments( $a )
+	{
+		return "SELECT a.*, t.*, p.topic_id
+				 FROM ".SQL_PREFIX."attachments a
+				  LEFT JOIN ".SQL_PREFIX."posts p ON ( a.attach_pid=p.pid )
+				  LEFT JOIN ".SQL_PREFIX."topics t ON ( t.tid=p.topic_id )
+				 WHERE a.attach_member_id={$a['mid']}
+				 ORDER BY {$a['order']}
+				 LIMIT {$a['limit_a']}, {$a['limit_b']}";
+	
+	}
+	
+	function usercp_get_to_delete( $a )
+	{
+		return "SELECT a.*, p.topic_id, p.pid
+				 FROM ".SQL_PREFIX."attachments a
+				  LEFT JOIN ".SQL_PREFIX."posts p ON ( a.attach_pid=p.pid )
+				 WHERE a.attach_id IN (".implode(",",$a['aid_array']).")
+				 AND attach_member_id={$a['mid']}";
+	
+	}
+	
+	
+	
+	function stats_get_all_members( $a )
+	{
+		return "SELECT m.*, me.*
+    			 FROM ".SQL_PREFIX."members m
+    				LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+    			 WHERE m.id IN(".implode(',', $a['member_ids']).")
+    			 ORDER BY m.name";
+	}
+	
+	function stats_get_all_members_groups( $a )
+	{
+		return "SELECT m.*, me.*
+    			 FROM ".SQL_PREFIX."members m
+    				LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+    			 WHERE mgroup IN (".implode( ',', $a['group_ids'] ).")
+    			 ORDER BY m.name";
+	}
+	
+	function stats_get_todays_posters( $a )
+	{
+		return "SELECT COUNT(*) as tpost, m.id, m.name, m.joined, m.posts
+				 FROM ".SQL_PREFIX."posts p
+					LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id )
+					LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=p.topic_id)
+				WHERE t.forum_id in(".implode(",", $a['ids']).") and post_date > {$a['time_low']}
+				GROUP BY p.author_id
+				ORDER BY tpost DESC LIMIT 0,10";
+	}
+	
+	function ucp_mod_ip_tool_one( $a )
+	{
+		return "SELECT pid, t.forum_id
+				FROM ".SQL_PREFIX."posts p, ".SQL_PREFIX."topics t
+				WHERE t.tid=p.topic_id and p.queued <> 1 AND t.forum_id IN({$a['the_forums']}) AND {$a['sql']}";
+	}
+	
+	function ucp_get_all_announcements( $a )
+	{
+		return "SELECT a.*, m.id, m.name
+				 FROM ".SQL_PREFIX."announcements a
+				  LEFT JOIN ".SQL_PREFIX."members m on (a.announce_member_id=m.id)
+				 ORDER BY announce_end DESC";
+	}
+	
+	function ucp_get_all_announcements_byid( $a )
+	{
+		return "SELECT a.*, m.*, me.*
+				 FROM ".SQL_PREFIX."announcements a
+				  LEFT JOIN ".SQL_PREFIX."members m on (a.announce_member_id=m.id)
+				  LEFT JOIN ".SQL_PREFIX."member_extra me on (me.id=m.id)
+				 WHERE a.announce_id={$a['id']}";
+	}
+	
+	function ucp_get_forum_tracker( $a )
+	{
+		return "SELECT t.*, f.*
+				FROM ".SQL_PREFIX."forum_tracker t
+				 LEFT JOIN ".SQL_PREFIX."forums f ON (t.forum_id=f.id)
+				WHERE t.member_id={$a['mid']}
+				ORDER BY f.position";
+	}
+	
+	function ucp_get_topic_tracker( $a )
+	{
+		return "SELECT s.topic_track_type, s.trid, s.member_id, s.topic_id, s.last_sent, s.start_date as track_started, t.*, f.id as forum_id, f.name as forum_name
+				FROM ".SQL_PREFIX."tracker s, ".SQL_PREFIX."topics t, ".SQL_PREFIX."forums f
+				WHERE s.member_id={$a['mid']} AND t.tid=s.topic_id AND f.id=t.forum_id {$a['date_query']}
+				ORDER BY f.id, t.last_post DESC";
+	}
+	
+	function mlist_count( $a )
+	{
+		return "SELECT COUNT(*) as total_members FROM ".SQL_PREFIX."members m
+				LEFT JOIN ".SQL_PREFIX."member_extra me ON me.id=m.id
+				LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
+				LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
+				WHERE g.g_hide_from_list <> 1 {$a['query']}";
+	}
+	
+	function mlist_get_members( $a )
+	{
+		return "SELECT m.*,me.*,p.*,g.g_hide_from_list,g.g_id FROM ".SQL_PREFIX."members m
+				LEFT JOIN ".SQL_PREFIX."member_extra me ON me.id=m.id
+				LEFT JOIN ".SQL_PREFIX."pfields_content p ON (p.member_id=m.id)
+				LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
+				WHERE g.g_hide_from_list <> 1 {$a['query']}
+				ORDER BY m.{$a['sort']} {$a['order']}
+				LIMIT {$a['limit_a']}, {$a['limit_b']}";
+	}
+	
+	function forum_get_attachments( $a )
+	{
+		return "SELECT a.*, t.*, p.topic_id, p.pid
+				 FROM ".SQL_PREFIX."attachments a
+				  LEFT JOIN ".SQL_PREFIX."posts p ON ( a.attach_pid=p.pid )
+				  LEFT JOIN ".SQL_PREFIX."topics t ON ( t.tid=p.topic_id )
+				 WHERE a.attach_pid != 0 AND p.topic_id={$a['tid']}
+				 ORDER BY a.attach_date";
+	
+	}
+	
+	function buddy_posts_last_visit( $a )
+	{
+		return "SELECT COUNT(*) as posts
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				WHERE p.post_date > {$a['last_visit']}
+				AND p.queued <> 1 AND t.forum_id IN({$a['forum_string']})";
+ 	}
+	
+	function generic_get_all_member( $a )
+	{
+		return "SELECT g.*, m.*, me.*
+				FROM ".SQL_PREFIX."members m
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."groups g ON (g.g_id=m.mgroup)
+				WHERE m.id={$a['mid']}";
+	}
+	
+	function moderate_get_topics( $a )
+	{
+		return "SELECT p.*,t.forum_id FROM ".SQL_PREFIX."posts p LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=p.topic_id) WHERE pid IN (".implode(",", $a['pids']).")";
+	}
+	
+	function moderate_concat_title( $a )
+	{
+		return "UPDATE ".SQL_PREFIX."topics SET title=CONCAT('{$a['pre']}', title, '{$a['end']}') WHERE tid IN(".implode( ",", $a['tids'] ).")";
+	}
+	
+	function mod_func_get_last_post( $a )
+	{
+		return "SELECT p.post_date, p.topic_id, p.author_id, p.author_name, p.pid, t.forum_id
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				WHERE topic_id={$a['tid']} and queued <> 1
+				ORDER BY pid DESC LIMIT 0,1";
+	}
+	
+	function mod_func_get_attach_count( $a )
+	{
+		return "SELECT COUNT(*) as count FROM ".SQL_PREFIX."attachments a
+			     LEFT JOIN ".SQL_PREFIX."posts p on (a.attach_pid=p.pid)
+			    WHERE p.topic_id={$a['tid']}";
+	
+	}
+	
+	function mod_func_get_topic_tracker( $a )
+	{
+		return "SELECT tr.*, m.id, m.mgroup, m.org_perm_id, t.tid, t.forum_id, g.g_id, g.g_perm_id
+				 FROM ".SQL_PREFIX."tracker tr
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (tr.topic_id=t.tid)
+				 LEFT JOIN ".SQL_PREFIX."members m on (m.id=tr.member_id)
+				 LEFT JOIN ".SQL_PREFIX."groups g on (g.g_id=m.mgroup)
+				WHERE tr.topic_id".$a['tid'];
+	}
+	
+	function register_get_dead_validating( $a )
+	{
+		return "SELECT v.vid, v.member_id, m.posts
+				   FROM ".SQL_PREFIX."validating v
+				 LEFT JOIN ".SQL_PREFIX."members m ON (v.member_id=m.id)
+				WHERE v.new_reg=1
+				AND v.coppa_user <> 1
+				AND v.entry_date < {$a['less_than']}
+				AND lost_pass <> 1";
+	}
+	
+	function search_get_all_user_count( $a )
+	{
+		return "SELECT count(*) as count
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				WHERE p.queued <> 1 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}";
+	}
+	
+	function search_get_all_user_query( $a )
+	{
+		return "SELECT p.*, t.*, t.posts as topic_posts, t.title as topic_title, m.*, me.*
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=p.author_id)
+				WHERE p.queued <> 1 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}
+				ORDER BY post_date DESC";
+	}
+	
+	function search_get_last_ten( $a )
+	{
+		return "SELECT p.*, t.*, t.posts as topic_posts, t.title as topic_title, m.*, me.*
+				FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."topics t ON (p.topic_id=t.tid)
+				 LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
+				 LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=p.author_id)
+				WHERE p.queued <> 1 AND t.forum_id IN({$a['forums']}) AND p.author_id={$a['mid']}
+				ORDER BY post_date DESC
+				LIMIT 0,10";
+	}
+	
+	function search_main_in_titles( $a )
+	{
+		return "SELECT t.*, t.posts as topic_posts, t.title as topic_title, p.pid, p.author_id, p.author_name, p.post_date, p.post, m.*, me.*
+				FROM ".SQL_PREFIX."topics t
+				  LEFT JOIN ".SQL_PREFIX."posts p ON (t.tid=p.topic_id AND p.new_topic=1)
+				  LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
+				  LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=p.author_id)
+				WHERE t.tid IN({$a['topics']})
+				ORDER BY p.post_date DESC
+				LIMIT {$a['limit_a']},25";
+	}
+	
+	function search_main_in_posts( $a )
+	{
+		return "SELECT t.*, t.posts as topic_posts, t.title as topic_title, p.pid, p.author_id, p.author_name, p.post_date, p.post, p.post_htmlstate, m.*, me.*
+				FROM ".SQL_PREFIX."posts p
+				  LEFT JOIN ".SQL_PREFIX."topics t ON (t.tid=p.topic_id)
+				  LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
+				  LEFT JOIN ".SQL_PREFIX."member_extra me ON (me.id=p.author_id)
+				WHERE p.pid IN({$a['posts']})
+				ORDER BY p.post_date DESC
+				LIMIT {$a['limit_a']},25";
+	}
+	
+	function poll_get_poll_with_topic( $a )
+	{
+		return "SELECT f.allow_pollbump, t.*, p.pid as poll_id,p.choices,p.starter_id,p.votes
+				FROM ".SQL_PREFIX."polls p, ".SQL_PREFIX."topics t, ".SQL_PREFIX."forums f
+				WHERE t.tid={$a['tid']} and p.tid=t.tid and t.forum_id=f.id";
+	}
+	
+	function contact_member_report_get_mods( $a )
+	{
+		return "SELECT m.id, m.name, m.email, mod.member_id FROM ".SQL_PREFIX."moderators mod, ".SQL_PREFIX."members m WHERE mod.forum_id='{$a['fid']}' and mod.member_id=m.id";
+	}
+	
+	function contact_member_report_get_cpaccess( $a )
+	{
+		return "SELECT m.id, m.name, m.email FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE g.g_access_cp=1 AND m.mgroup=g.g_id";
+	}
+	
+	function print_page_get_members( $a )
+	{
+		return "SELECT g.*, m.* FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE m.id in ({$a['mem_ids']}) AND m.mgroup=g.g_id";
+	}
+	
+	function stats_who_posted( $a )
+	{
+		return "SELECT COUNT(p.pid) as pcount, p.author_id, p.author_name FROM ".SQL_PREFIX."posts p
+ 				WHERE p.topic_id={$a['tid']} AND queued <> 1 GROUP BY p.author_name ORDER BY pcount DESC";
+	}
+	
+	function warn_get_data( $a )
+	{
+		return "SELECT l.*,  p.id as punisher_id, p.name as punisher_name
+				 FROM ".SQL_PREFIX."warn_logs l
+				  LEFT JOIN ".SQL_PREFIX."members p ON ( p.id=l.wlog_addedby )
+				WHERE l.wlog_mid={$a['mid']} ORDER BY l.wlog_date DESC LIMIT {$a['limit_a']}, {$a['limit_b']}";
+	}
+	
+	function warn_get_forum( $a )
+	{
+		return "SELECT t.tid, t.title, f.id, f.name FROM ".SQL_PREFIX."topics t, ".SQL_PREFIX."forums f WHERE tid={$a['tid']} AND t.forum_id=f.id";
+	}
+	
+	function portal_get_poll_join( $a )
+	{
+		return "SELECT t.tid, t.title, t.state, t.last_vote, p.*, v.member_id as member_voted
+				FROM ".SQL_PREFIX."topics t, ".SQL_PREFIX."polls p
+				LEFT JOIN ".SQL_PREFIX."voters v ON (v.member_id={$a['mid']} and v.tid=t.tid)
+				WHERE t.tid={$a['tid']} AND p.tid=t.tid";
+	}
+	
+	function portal_get_monster_bitch( $a )
+	{
+		return "SELECT t.*, p.*, me.avatar_location, m.view_avs, me.avatar_size, me.avatar_type,
+				m.id as member_id, m.name as member_name, m.mgroup
+				FROM ".SQL_PREFIX."topics t
+				 LEFT JOIN ".SQL_PREFIX."members m ON (t.starter_id=m.id)
+				 LEFT JOIN ".SQL_PREFIX."member_extra me on (m.id=me.id)
+				 LEFT JOIN ".SQL_PREFIX."posts p ON (p.topic_id=t.tid AND p.new_topic=1)
+				WHERE t.forum_id IN (-1{$a['csite_article_forum']}) {$a['qe']}
+				AND t.approved=1 AND (t.moved_to IS NULL or t.moved_to='')
+				ORDER BY t.pinned DESC, t.start_date DESC
+				LIMIT 0,{$a['limit']}";
+	}
+	
+	function help_search( $a )
+	{
+		return "SELECT id, title, description
+				 FROM ".SQL_PREFIX."faq
+				WHERE LOWER(title) LIKE '%{$a['search_string']}%' or LOWER(text) LIKE '%{$a['search_string']}%'
+				ORDER BY title";
+	}
+	
+	#-- NEW FOR RC1 --#
+	
+	function login_getmember( $a )
+	{
+		return "select id, name, email, mgroup, member_login_key, ip_address, login_anonymous
+				from ".SQL_PREFIX."members
+				where LOWER(name)='{$a['username']}'";
+	}
+	
+	function contact_member_report_get_supmod( $a )
+	{
+		return "SELECT m.id, m.name, m.email FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g WHERE g.g_is_supmod=1 AND m.mgroup=g.g_id";
+	}
+	
+	function post_get_topic_review( $a )
+	{
+		return "SELECT p.*, m.mgroup
+				 FROM ".SQL_PREFIX."posts p
+				 LEFT JOIN ".SQL_PREFIX."members m ON (m.id=p.author_id)
+				WHERE topic_id={$a['tid']} and queued <> 1
+				ORDER BY pid DESC
+				LIMIT 0,10";
+	}
+	
+	function post_forum_tracker_all( $a )
+	{
+		#post
+		
+		return "SELECT m.name, m.email, m.id, m.language, m.last_activity, m.org_perm_id, g.g_perm_id
+				FROM ".SQL_PREFIX."members m, ".SQL_PREFIX."groups g
+				WHERE m.mgroup IN ({$a['groups']})
+				AND m.mgroup=g.g_id
+				AND m.id <> {$a['mid']}
+				AND m.allow_admin_mails=1
+				AND m.last_activity < {$a['last_post']}";
+	}
+	
+    
+} // end class
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/sql/mysql_subsm_queries.php b/upload/sources/sql/mysql_subsm_queries.php
new file mode 100644
index 00000000..e7ea2a83
--- /dev/null
+++ b/upload/sources/sql/mysql_subsm_queries.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > MySQL DB Queries abstraction module
+|   > Module written by Matt Mecham
+|   > Date started: 12th August 2004
+|   > SUBSCRIPTIONS MANAGER
+|
+|	> Module Version Number: 1.0.0
++--------------------------------------------------------------------------
+*/
+
+
+
+class sql_subsm_queries extends db_driver
+{
+
+     var $db  = "";
+     var $tbl = "";
+     
+    /*========================================================================*/
+    // Set up...             
+    /*========================================================================*/  
+                   
+    function sql_subsm_queries( $obj )
+    {
+    	$this->db = $obj;
+    	
+    	if ( ! $this->db->obj['sql_tbl_prefix'] )
+    	{
+    		$this->db->obj['sql_tbl_prefix'] = 'ibf_';
+    	}
+    	
+    	$this->tbl = $this->db->obj['sql_tbl_prefix'];
+    }
+    
+    /*========================================================================*/
+    
+    
+	
+    function intro_get_all( $a )
+    {
+    	return "SELECT COUNT(*) as total, SUM(subtrans_cumulative) as revenue, subtrans_method
+		         FROM ".SQL_PREFIX."subscription_trans WHERE subtrans_state NOT IN ('failed', 'dead', 'pending')
+		        GROUP BY subtrans_method";
+    }
+    
+    function intro_get_failed_dead( $a )
+    {
+    	return "SELECT COUNT(*) as total, SUM(subtrans_cumulative) as revenue, subtrans_method
+				  FROM ".SQL_PREFIX."subscription_trans WHERE subtrans_state IN ('failed', 'dead')
+				GROUP BY subtrans_method";
+    }
+    
+    function intro_get_failed_pending( $a )
+    {
+    	return "SELECT COUNT(*) as total, SUM(subtrans_cumulative) as revenue, subtrans_method
+				  FROM ".SQL_PREFIX."subscription_trans WHERE subtrans_state='pending'
+				GROUP BY subtrans_method";
+    }
+    
+    function intro_plans_a( $a )
+    {
+    	return "SELECT COUNT(*) as total, subtrans_sub_id
+				  FROM ".SQL_PREFIX."subscription_trans
+				  WHERE subtrans_end_date < {$a['time']} AND subtrans_state != 'expired'
+				GROUP BY subtrans_sub_id";
+    }
+    
+    function intro_plans_b( $a )
+    {
+    	return "SELECT COUNT(*) as total, subtrans_sub_id
+				  FROM ".SQL_PREFIX."subscription_trans
+				  WHERE subtrans_end_date > {$a['time']} AND subtrans_state != 'expired'
+				GROUP BY subtrans_sub_id";
+    }
+    
+    function do_search( $a )
+    {
+    	return "SELECT s.*, m.id, m.name, m.email, ss.* FROM ".SQL_PREFIX."subscription_trans s
+				 LEFT JOIN ".SQL_PREFIX."members m ON ( s.subtrans_member_id=m.id )
+				 LEFT JOIN ".SQL_PREFIX."subscriptions ss ON ( s.subtrans_sub_id=ss.sub_id ) ".$a['query']."
+				 ORDER BY s.subtrans_end_date ASC LIMIT {$a['st']}, {$a['end']}";
+				 
+    }
+    
+    function do_search_two( $a )
+    {
+    	return "SELECT * FROM ".SQL_PREFIX."subscription_logs ".$a['query']." ORDER BY sublog_date DESC LIMIT {$a['st']}, {$a['end']}";
+    }
+   
+   	function get_lower_name( $a )
+   	{
+   		return "SELECT * FROM ".SQL_PREFIX."members WHERE lower(name)='{$a['name']}'";
+   	}
+   	
+   	function get_lower_like( $a )
+   	{
+   		return "SELECT * FROM ".SQL_PREFIX."members WHERE lower(name) LIKE '%{$a['name']}%'";
+   	}
+   	
+   	function edit_trans( $a )
+   	{
+   		return "SELECT s.*, ss.*, m.name, m.id FROM ".SQL_PREFIX."subscription_trans s
+				 LEFT JOIN ".SQL_PREFIX."subscriptions ss ON ( ss.sub_id=s.subtrans_sub_id )
+				 LEFT JOIN ".SQL_PREFIX."members m ON ( s.subtrans_member_id=m.id )
+				WHERE s.subtrans_id={$a['id']}";
+   	}
+   	
+   	function delete_trans( $a )
+   	{
+   		return "SELECT s.*, ss.*, m.* FROM ".SQL_PREFIX."subscription_trans s
+				 LEFT JOIN ".SQL_PREFIX."subscriptions ss ON ( ss.sub_id=s.subtrans_sub_id )
+				 LEFT JOIN ".SQL_PREFIX."members m ON (s.subtrans_member_id=m.id)
+				WHERE s.subtrans_id IN (".implode(",", $a['ids']).")";
+   	}
+    
+    function unsub_members( $a )
+    {
+    	return "SELECT s.*, ss.*, m.* FROM ".SQL_PREFIX."subscription_trans s
+				 LEFT JOIN ".SQL_PREFIX."subscriptions ss ON ( ss.sub_id=s.subtrans_sub_id )
+				 LEFT JOIN ".SQL_PREFIX."members m ON (s.subtrans_member_id=m.id)
+				WHERE s.subtrans_sub_id={$a['id']}".$a['qe'];
+    }
+	
+	/*
+    	$DB->cache_add_query( 'intro_get_all', array(), 'sql_subsm_queries' );
+		$DB->cache_exec_query();
+	*/
+	
+	function mod_custom( $a )
+	{
+		return "SELECT s.*, ss.* FROM ibf_subscription_methods s
+				 LEFT JOIN ibf_subscription_extra ss ON ( ss.subextra_method_id=s.submethod_id )
+				WHERE submethod_name='{$a['type']}'";
+	}
+	
+	function mod_payment_method( $a )
+	{
+		return "SELECT s.*, ss.* FROM ibf_subscription_methods s
+				 LEFT JOIN ibf_subscription_extra ss ON ( ss.subextra_method_id=s.submethod_id )
+				WHERE s.submethod_active=1";
+	}
+	
+	function mod_do_index( $a )
+	{
+		return "SELECT s.submethod_id, ss.subextra_id, s.submethod_active, ss.subextra_can_upgrade FROM ibf_subscription_methods s
+				 LEFT JOIN ibf_subscription_extra ss ON ( ss.subextra_method_id=s.submethod_id )
+				WHERE s.submethod_active=1";
+	}
+	
+	function mod_failed_member( $a )
+	{
+		return "SELECT t.*, g.g_id FROM ibf_subscription_trans t
+				LEFT JOIN ibf_groups g ON (g.g_id=t.subtrans_old_group)
+				WHERE subtrans_id={$a['cur_trx_id']}";
+	}
+	
+	
+	
+	
+	
+    
+} // end class
+
+
+?>
\ No newline at end of file
diff --git a/upload/sources/taskloader.php b/upload/sources/taskloader.php
new file mode 100644
index 00000000..48199198
--- /dev/null
+++ b/upload/sources/taskloader.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Task loader module
+|   > Module written by Matt Mecham
+|   > Date started: 28th January 2004
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class taskloader
+{
+
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	@set_time_limit(1200);
+    	
+    	//-----------------------------------------
+		// Require and run
+		//-----------------------------------------
+		
+		chdir( ROOT_PATH );
+		$ROOT_PATH = getcwd() .'/';
+		
+		require_once( ROOT_PATH.'sources/lib/task_functions.php' );
+		
+		$functions = new task_functions();
+    	$functions->root_path = $ROOT_PATH;
+    	
+    	//-----------------------------------------
+		// Check shutdown functions
+		//-----------------------------------------
+		
+    	if ( USE_SHUTDOWN )
+		{
+			register_shutdown_function( array( &$functions, 'run_task') );
+		}
+    	else
+    	{
+    		$functions->run_task();
+    	}
+    	
+    	if ( $functions->type != 'cron' )
+    	{
+    		//-----------------------------------------
+    		// Print out the 'blank' gif
+    		//-----------------------------------------
+    		
+    		@header( "Content-Type: image/gif" );
+    		print base64_decode( "R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" );
+    	}
+ 	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/announcements.php b/upload/sources/tasks/announcements.php
new file mode 100644
index 00000000..e2063190
--- /dev/null
+++ b/upload/sources/tasks/announcements.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Clean out 'dead' sessions, validations, registration image entires, etc
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Deactivate expired announcements
+		//-----------------------------------------
+		
+		require_once( $this->root_path.'sources/announcements.php' );
+		$announce = new announcements();
+		
+		$announce->announce_retire_expired();
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->append_task_log( $this->task, 'Announcements updated' );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/bulkmail.php b/upload/sources/tasks/bulkmail.php
new file mode 100644
index 00000000..3ef040dd
--- /dev/null
+++ b/upload/sources/tasks/bulkmail.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Send Bulk Mail
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Sends out bulk mail
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		define( 'IN_ACP', 1 );
+		
+		//-----------------------------------------
+		// Load Bulk Mailer thing
+		//-----------------------------------------
+		
+		require_once( $this->root_path.'sources/admin/ad_postoffice.php' );
+		$po = new ad_postoffice();
+		
+		$po->mail_send_process( $this->root_path );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/calendarevents.php b/upload/sources/tasks/calendarevents.php
new file mode 100644
index 00000000..3cf843a4
--- /dev/null
+++ b/upload/sources/tasks/calendarevents.php
@@ -0,0 +1,191 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Gathers birthday and calendar events for a few days and caches them
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class        = "";
+	var $root_path    = "";
+	var $task         = "";
+	var $restrict_log = 0;
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Cache calendar info
+		//-----------------------------------------
+		
+		$calendar  = array();
+		$birthdays = array();
+		
+		$a = explode( ',', gmdate( 'Y,n,j,G,i,s', time() ) );
+		
+		$day         = $a[2];
+		$month       = $a[1];
+		$year        = $a[0];
+		$daysinmonth = date( 't', time() );
+		
+		//-----------------------------------------
+		// Get 24hr before and 24hr after to make
+		// sure we don't break any timezones
+		//-----------------------------------------
+		
+		$last_day   = $day - 1;
+		$last_month = $month;
+		$last_year  = $year;
+		$next_day   = $day + 1;
+		$next_month = $month;
+		$next_year  = $year;
+		
+		//-----------------------------------------
+		// Calculate dates..
+		//-----------------------------------------
+		
+		if ( $last_day == 0 )
+		{
+			$last_month -= 1;
+			$last_day   = date( 't', time() - 86400 );
+		}
+		
+		if ( $last_month == 0 )
+		{
+			$last_month = 12;
+			$last_year  -= 1;
+		}
+		
+		if ( $next_day > date( 't', time() ) )
+		{
+			$next_month += 1;
+			$next_day   = 1;
+		}
+		
+		if ( $next_month == 13 )
+		{
+			$next_month = 1;
+			$next_year += 1;
+		}
+		
+		//-----------------------------------------
+		// Grab birthdays
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => 'id, name, mgroup, bday_day, bday_month, bday_year',
+									  'from'   => 'members',
+									  'where'  => "( bday_day=$last_day AND bday_month=$last_month )
+									  			   or ( bday_day=$day AND bday_month=$month )
+									  			   or ( bday_day=$next_day AND bday_month=$next_month )"
+							 )      );
+							 
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$birthdays[ $r['id'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Grab Calendar (-24hr + 24hr)
+		//-----------------------------------------
+		
+		if ($ibforums->vars['calendar_limit'] < 2)
+		{
+			$ibforums->vars['calendar_limit'] = 2;
+		}
+			
+		$our_unix = time() - 86400;
+		$max_date = $our_unix + ( ($ibforums->vars['calendar_limit'] + 1 ) * 86400);
+		
+		$DB->simple_construct( array( 'select' => 'eventid, title, read_perms, priv_event, userid, unix_stamp',
+									  'from'   => 'calendar_events',
+									  'where'  => "unix_stamp > $our_unix and unix_stamp < $max_date",
+									  'order'  => "unix_stamp"
+							 )      );
+							 
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$calendar[ $r['eventid'] ] = $r;
+		}
+		
+		//-----------------------------------------
+		// Save...
+		//-----------------------------------------
+		
+		$DB->simple_exec_query( array( 'delete' => 'cache_store', 'where' => "cs_key IN ('birthdays', 'calendar')" ) );
+		
+		$DB->do_insert( 'cache_store', array( 'cs_array' => 1, 'cs_key' => 'birthdays', 'cs_value' => addslashes(serialize($birthdays)) ) );
+		$DB->do_insert( 'cache_store', array( 'cs_array' => 1, 'cs_key' => 'calendar' , 'cs_value' => addslashes(serialize($calendar)) ) );
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		if ( ! $this->restrict_log )
+		{
+			$this->class->append_task_log( $this->task, intval(count($birthdays))." birthdays cached, ".intval(count($calendar))." events cached" );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/cleanout.php b/upload/sources/tasks/cleanout.php
new file mode 100644
index 00000000..5756ecc4
--- /dev/null
+++ b/upload/sources/tasks/cleanout.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Clean out 'dead' sessions, validations, registration image entires, etc
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Delete reg_anti_spam
+		//-----------------------------------------
+		
+		$date = time() - (60*60*6);
+		
+		$DB->simple_exec_query( array( 'delete' => 'reg_antispam', 'where' => 'ctime < '.$date ) );
+		
+		//-----------------------------------------
+		// Delete old sessions
+		//-----------------------------------------
+		
+		$date = $ibforums->vars['session_expiration'] ? (time() - $ibforums->vars['session_expiration']) : (time() - 3600);
+			
+		$DB->simple_exec_query( array( 'delete' => 'sessions',  'where'  => "running_time < {$date}" ) );
+		
+		//-----------------------------------------
+		// Delete old searches
+		//-----------------------------------------
+		
+		$date = time() - (60*60*24);
+		
+		$DB->simple_exec_query( array( 'delete' => 'search_results',  'where'  => "search_date < {$date}" ) );
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->append_task_log( $this->task, 'Old reg_images, sessions and search results removed' );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/dailycleanout.php b/upload/sources/tasks/dailycleanout.php
new file mode 100644
index 00000000..3dffb40a
--- /dev/null
+++ b/upload/sources/tasks/dailycleanout.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Prunes back subscribed topics...
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Delete old subscriptions
+		//-----------------------------------------
+		
+		$deleted = 0;
+		$trids   = array();
+		
+		if ($ibforums->vars['subs_autoprune'] > 0)
+ 		{
+			$time = time() - ($ibforums->vars['subs_autoprune'] * 86400);
+			
+			$DB->cache_add_query( 'ucp_tracker_prune', array( 'time' => $time ) );
+			$DB->cache_exec_query();
+			
+			while ( $r = $DB->fetch_row() )
+			{
+				$trids[] = $r['trid'];
+			}
+			
+			if (count($trids) > 0)
+			{
+				$DB->simple_exec_query( array( 'delete', 'tracker', 'where' => "trid IN (".implode(",",$trids).")" ) );
+			}
+			
+			$deleted = intval( count($trids) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Remove read topics
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->vars['db_topic_read_cutoff'] = intval($ibforums->vars['db_topic_read_cutoff']);
+ 		
+ 		if ( $ibforums->vars['db_topic_read_cutoff'] > 0 )
+ 		{
+ 			$time = time() - ( $ibforums->vars['db_topic_read_cutoff'] * 86400 );
+ 			
+ 			$DB->simple_exec_query( array( 'delete' => 'topics_read', 'where' => "read_date < $time" ) );
+ 			
+ 			$topics_deleted = $DB->get_affected_rows();
+ 		}
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->append_task_log( $this->task, "$deleted subscriptions pruned and {$topics_deleted} db read topic entries deleted" );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/dailydigest.php b/upload/sources/tasks/dailydigest.php
new file mode 100644
index 00000000..237c06de
--- /dev/null
+++ b/upload/sources/tasks/dailydigest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Clean out 'dead' sessions, validations, registration image entires, etc
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Send daily digests...
+		//-----------------------------------------
+		
+		require_once( $this->root_path.'sources/lib/digest_functions.php' );
+		$digest = new digest_functions();
+		
+		$digest->digest_time = 'daily';
+		$digest->digest_type = 'topic';
+		$digest->run_digest();
+		
+		$digest->digest_time = 'daily';
+		$digest->digest_type = 'forum';
+		$digest->run_digest();
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->append_task_log( $this->task, 'Daily Topic & Forum Digest Sent' );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/rebuildstats.php b/upload/sources/tasks/rebuildstats.php
new file mode 100644
index 00000000..decbeb6b
--- /dev/null
+++ b/upload/sources/tasks/rebuildstats.php
@@ -0,0 +1,121 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Rebuilds topics, posts, forum, members, last reg. member counts
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Get current stats...
+		//-----------------------------------------
+		
+		$stats = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='stats'" ) );
+		
+		$stats = unserialize(stripslashes($stats['cs_value']));
+		
+		//-----------------------------------------
+		// Rebuild stats
+		//-----------------------------------------
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'count(*) as posts', 'from' => 'posts', 'where' => 'queued <> 1' ) );
+		$stats['total_replies'] = intval($r['posts']);
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'count(*) as topics', 'from' => 'topics', 'where' => 'approved = 1' ) );
+		$stats['total_topics'] = intval($r['topics']);
+		
+		$stats['total_replies'] -= $stats['total_topics'];
+	
+		$r = $DB->simple_exec_query( array( 'select' => 'count(*) as members', 'from' => 'members', 'where' => "mgroup <> ".$ibforums->vars['auth_group'] ) );
+		$stats['mem_count'] = intval( $r['members'] );
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'id, name',
+										    'from'   => 'members',
+										    'where'  => "mgroup <> ".$ibforums->vars['auth_group'],
+										    'order'  => 'id DESC',
+										    'limit'  => array(0,1)
+								   )      );
+		
+		$stats['last_mem_name'] = $r['name'];
+		$stats['last_mem_id']   = $r['id'];
+		
+		if ( count($stats) > 0 )
+		{
+			$DB->obj['use_shutdown']  = 0;
+			$ibforums->cache['stats'] = $stats;
+			$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 1 ) );
+		}
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->append_task_log( $this->task, 'Statistics rebuilt' );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/tasks/weeklydigest.php b/upload/sources/tasks/weeklydigest.php
new file mode 100644
index 00000000..79e36c37
--- /dev/null
+++ b/upload/sources/tasks/weeklydigest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > TASK SCRIPT: Test
+|   > Script written by Matt Mecham
+|   > Date started: 28th January 2004
+|
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------
+// THIS TASKS OPERATIONS:
+// Clean out 'dead' sessions, validations, registration image entires, etc
+//+--------------------------------------------------------------------------
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class task_item
+{
+	var $class     = "";
+	var $root_path = "";
+	var $task      = "";
+	
+	/*-------------------------------------------------------------------------*/
+	// Our 'auto_run' function
+	// ADD CODE HERE
+	/*-------------------------------------------------------------------------*/
+	
+	function run_task()
+	{
+		global $DB, $ibforums, $std;
+		
+		//-----------------------------------------
+		// Send daily digests...
+		//-----------------------------------------
+		
+		require_once( $this->root_path.'sources/lib/digest_functions.php' );
+		$digest = new digest_functions();
+		
+		$digest->digest_time = 'weekly';
+		$digest->digest_type = 'topic';
+		$digest->run_digest();
+		
+		$digest->digest_time = 'weekly';
+		$digest->digest_type = 'forum';
+		$digest->run_digest();
+		
+		//-----------------------------------------
+		// Log to log table - modify but dont delete
+		//-----------------------------------------
+		
+		$this->class->append_task_log( $this->task, 'Weekly Topic & Forum Digest Sent' );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// register_class
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function register_class(&$class)
+	{
+		$this->class = $class;
+		
+		$this->root_path = $this->class->root_path;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// pass_task
+	// LEAVE ALONE
+	/*-------------------------------------------------------------------------*/
+	
+	function pass_task( $this_task )
+	{
+		$this->task = $this_task;
+	}
+	
+	
+}
+?>
\ No newline at end of file
diff --git a/upload/sources/topics.php b/upload/sources/topics.php
new file mode 100644
index 00000000..d5e2446f
--- /dev/null
+++ b/upload/sources/topics.php
@@ -0,0 +1,2082 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > Topic display module
+|   > Module written by Matt Mecham
+|   > Date started: 18th February 2002
+|
+|	> Module Version Number: 1.1.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class topics {
+
+    var $output         = "";
+    var $base_url       = "";
+    var $html           = "";
+    var $moderator      = array();
+    var $forum          = array();
+    var $topic          = array();
+    var $mem_titles     = array();
+    var $mod_action     = array();
+    var $poll_html      = "";
+    var $parser         = "";
+    var $mimetypes      = "";
+    var $nav_extra      = "";
+    var $read_array     = array();
+    var $mod_panel_html = "";
+    var $warn_range     = 0;
+    var $warn_done      = 0;
+
+    var $md5_check      = "";
+    var $post_count     = 0;
+    var $cached_members = array();
+    var $first_printed  = 0;
+    var $pids           = array();
+    var $attach_pids    = array();
+    var $first          = "";
+    var $qpids          = "";
+    var $custom_fields  = "";
+	
+    /*-------------------------------------------------------------------------*/
+	//
+	// Our constructor, load words, load skin, print the topic listing
+	//
+	/*-------------------------------------------------------------------------*/
+	
+    function auto_run()
+    {
+		global $ibforums, $forums, $DB, $std, $print, $skin_universal;
+        
+        $this->init();
+        
+        //-----------------------------------------
+		// Process the topic
+		//-----------------------------------------
+        
+        $this->topic_set_up();
+        
+        //-----------------------------------------
+		// Which view are we using?
+		//-----------------------------------------
+		
+		if ( $ibforums->input['mode'] )
+		{
+			$this->topic_view_mode = $ibforums->input['mode'];
+			$std->my_setcookie( 'topicmode', $ibforums->input['mode'], 1 );
+		}
+		else
+		{
+			$this->topic_view_mode = $std->my_getcookie('topicmode');
+		}
+		
+		if ( ! $this->topic_view_mode )
+		{
+			//-----------------------------------------
+			// No cookie and no URL
+			//-----------------------------------------
+			
+			$this->topic_view_mode = $ibforums->vars['topicmode_default'] ? $ibforums->vars['topicmode_default'] : 'linear';
+		}
+        
+        //-----------------------------------------
+        // VIEWS
+        //-----------------------------------------
+        
+        if ( isset($ibforums->input['view']) )
+        {
+        	if ($ibforums->input['view'] == 'new')
+        	{
+        		//-----------------------------------------
+        		// Newer
+        		//-----------------------------------------
+        		
+        		$DB->simple_construct( array( 'select' => 'tid',
+											  'from'   => 'topics',
+											  'where'  => "forum_id=".$this->forum['id']." AND approved=1 AND state <> 'link' AND last_post > ".$this->topic['last_post'],
+											  'order'  => 'last_post',
+											  'limit'  => array( 0,1 )
+									)      );
+									
+				$DB->simple_exec();
+        		
+        		if ( $DB->get_num_rows() )
+        		{
+        			$this->topic = $DB->fetch_row();
+        			
+        			$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']);
+        		}
+        		else
+        		{
+        			$std->Error( array( LEVEL => 1, MSG => 'no_newer') );
+        		}
+        	}
+        	else if ($ibforums->input['view'] == 'old')
+        	{
+        		//-----------------------------------------
+        		// Older
+        		//-----------------------------------------
+        		
+				$DB->simple_construct( array( 'select' => 'tid',
+											  'from'   => 'topics',
+											  'where'  => "forum_id=".$this->forum['id']." AND approved=1 AND state <> 'link' AND last_post < ".$this->topic['last_post'],
+											  'order'  => 'last_post DESC',
+											  'limit'  => array( 0,1 )
+									)      );
+									
+				$DB->simple_exec();
+					
+				if ( $DB->get_num_rows() )
+        		{
+        			$this->topic = $DB->fetch_row();
+        			
+        			$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']);
+        		}
+        		else
+        		{
+        			$std->Error( array( LEVEL => 1, MSG => 'no_older') );
+        		}
+        	}
+        	else if ($ibforums->input['view'] == 'getlastpost')
+        	{
+        		//-----------------------------------------
+        		// Last post
+        		//-----------------------------------------
+        		
+        		$this->return_last_post();
+			}
+			else if ($ibforums->input['view'] == 'getnewpost')
+			{
+				//-----------------------------------------
+				// Newest post
+				//-----------------------------------------
+				
+				$st  = 0;
+				$pid = "";
+				
+				if ( $ibforums->vars['db_topic_read_cutoff'] and $ibforums->member['id'] )
+				{
+					$row = $DB->simple_exec_query( array( 'select' => 'read_date', 'from' => 'topics_read', 'where' => 'read_tid='.$this->topic['tid'].' AND read_mid='.$ibforums->member['id'] ) );
+					
+					$last_time = intval( $row['read_date'] );
+				}
+				else
+				{
+					$last_time = $this->last_read_tid;
+				}
+				
+				$last_time = $last_time ? $last_time : $ibforums->input['last_visit'];
+				
+				$DB->simple_construct( array( 'select' => 'pid, post_date',
+											  'from'   => 'posts',
+											  'where'  => "queued <> 1 AND topic_id=".$this->topic['tid']." AND post_date > ".intval($last_time),
+											  'order'  => 'post_date',
+											  'limit'  => array( 0,1 )
+									)      );
+									
+				$DB->simple_exec();
+				
+				if ( $post = $DB->fetch_row() )
+				{
+					$pid = "&#entry".$post['pid'];
+					
+					$DB->simple_construct( array( 'select' => 'COUNT(*) as posts',
+												  'from'   => 'posts',
+												  'where'  => "topic_id=".$this->topic['tid']." AND pid <= ".$post['pid'],
+										)      );
+										
+					$DB->simple_exec();
+				
+					$cposts = $DB->fetch_row();
+					
+					if ( (($cposts['posts']) % $ibforums->vars['display_max_posts']) == 0 )
+					{
+						$pages = ($cposts['posts']) / $ibforums->vars['display_max_posts'];
+					}
+					else
+					{
+						$number = ( ($cposts['posts']) / $ibforums->vars['display_max_posts'] );
+						$pages = ceil( $number);
+					}
+					
+					$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
+					
+					$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&st=$st".$pid);
+				}
+				else
+				{
+					$this->return_last_post();
+				}
+			}
+			else if ($ibforums->input['view'] == 'findpost')
+			{
+				//-----------------------------------------
+				// Find a post
+				//-----------------------------------------
+				
+				$pid = intval($ibforums->input['p']);
+				
+				if ( $pid > 0 )
+				{
+					$DB->simple_construct( array( 'select' => 'COUNT(*) as posts',
+												  'from'   => 'posts',
+												  'where'  => "topic_id=".$this->topic['tid']." AND pid <= ".$pid,
+										)      );
+										
+					$DB->simple_exec();
+					
+					$cposts = $DB->fetch_row();
+					
+					if ( (($cposts['posts']) % $ibforums->vars['display_max_posts']) == 0 )
+					{
+						$pages = ($cposts['posts']) / $ibforums->vars['display_max_posts'];
+					}
+					else
+					{
+						$number = ( ($cposts['posts']) / $ibforums->vars['display_max_posts'] );
+						$pages = ceil( $number);
+					}
+					
+					$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
+					
+					$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&st=$st&p=$pid"."&#entry".$pid);
+				}
+				else
+				{
+					$this->return_last_post();
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// UPDATE TOPIC?
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['b'] )
+		{
+			if ( $this->topic['topic_firstpost'] == 0 )
+			{
+				//-----------------------------------------
+				// No first topic set - old topic, update
+				//-----------------------------------------
+				
+				$DB->simple_construct( array (
+												'select' => 'pid',
+												'from'   => 'posts',
+												'where'  => 'topic_id='.$this->topic['tid'].' AND new_topic=1'
+									 )       );
+									 
+				$DB->simple_exec();
+				
+				$post = $DB->fetch_row();
+				
+				if ( ! $post['pid'] )
+				{
+					$post['pid'] = -1;
+				}
+				
+				$DB->simple_construct( array (
+												'update' => 'topics',
+												'set'    => 'topic_firstpost='.$post['pid'],
+												'where'  => 'tid='.$this->topic['tid']
+									 )       );
+									 
+				$DB->simple_exec();
+				
+				//-----------------------------------------
+				// Reload "fixed" topic
+				//-----------------------------------------
+				
+				$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&b=1&st={$ibforums->input['st']}&p={$ibforums->input['p']}"."&#entry".$ibforums->input['p']);
+				
+			}
+		}
+		
+		$find_pid = $ibforums->input['pid'] == "" ? $ibforums->input['p'] : $ibforums->input['pid'];
+		
+		if ( $find_pid )
+		{
+			$threaded_pid = '&amp;pid='.$find_pid;
+			$linear_pid   = '&amp;view=findpost&amp;p='.$find_pid;
+		}
+		
+		if ( $this->topic_view_mode == 'threaded' )
+		{
+			$require = 'topic_threaded.php';
+			
+			$this->topic['to_button_threaded'] = $this->html->toutline_mode_choice_on( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=threaded".$threaded_pid, $ibforums->lang['tom_outline'] );
+			$this->topic['to_button_standard'] = $this->html->toutline_mode_choice_off( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=linear".$linear_pid, $ibforums->lang['tom_standard'] );
+			$this->topic['to_button_linearpl'] = $this->html->toutline_mode_choice_off( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=linearplus".$linear_pid, $ibforums->lang['tom_linear'] );
+			
+		}
+		else
+		{
+			$require = 'topic_linear.php';
+			
+			$this->topic['to_button_threaded'] = $this->html->toutline_mode_choice_off( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=threaded".$threaded_pid, $ibforums->lang['tom_outline'] );
+			
+			if ( $this->topic_view_mode == 'linearplus' )
+			{
+				$this->topic['to_button_standard'] = $this->html->toutline_mode_choice_off( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=linear".$linear_pid, $ibforums->lang['tom_standard'] );
+				$this->topic['to_button_linearpl'] = $this->html->toutline_mode_choice_on( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=linearplus".$linear_pid, $ibforums->lang['tom_linear'] );
+			}
+			else
+			{
+				$this->topic['to_button_standard'] = $this->html->toutline_mode_choice_on( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=linear".$linear_pid, $ibforums->lang['tom_standard'] );
+				$this->topic['to_button_linearpl'] = $this->html->toutline_mode_choice_off( "{$ibforums->base_url}showtopic={$this->topic['tid']}&amp;mode=linearplus".$linear_pid, $ibforums->lang['tom_linear'] );
+			}
+		}
+		
+		//-----------------------------------------
+		// Load and run lib
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH . 'sources/lib/'.$require );
+		
+		$this->func = new topic_display();
+		$this->func->register_class( &$this );
+		$this->func->display_topic();
+		
+		$this->output .= $this->func->output;
+		
+		//-----------------------------------------
+		// Do we have a poll?
+		//-----------------------------------------
+		
+		if ($this->topic['poll_state'])
+		{
+			$this->output = str_replace( "<!--{IBF.POLL}-->", $this->parse_poll(), $this->output );
+		}
+		else
+		{
+			// Can we start a poll? Is this our topic and is it still open?
+			
+			if ( $this->topic['state'] != "closed" AND $ibforums->member['id'] AND $ibforums->member['g_post_polls'] AND $this->forum['allow_poll'] )
+			{
+				if ( 
+					 ( ($this->topic['starter_id'] == $ibforums->member['id']) AND ($ibforums->vars['startpoll_cutoff'] > 0) AND ( $this->topic['start_date'] + ($ibforums->vars['startpoll_cutoff'] * 3600) > time() ) )
+					 OR ( $ibforums->member['g_is_supmod'] == 1 )
+				   )
+				{
+					$this->output = str_replace( "<!--{IBF.START_NEW_POLL}-->", $this->html->start_poll_link($this->forum['id'], $this->topic['tid']), $this->output );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// ATTACHMENTS!!!
+		//-----------------------------------------
+		
+		if ( $this->topic['topic_hasattach'] )
+		{
+			$this->output = $this->parse_attachments( $this->output, $this->attach_pids );
+		}
+		
+		//-----------------------------------------
+		// Process users active in this forum
+		//-----------------------------------------
+		
+		if ($ibforums->vars['no_au_topic'] != 1)
+		{	
+			//-----------------------------------------
+			// Get the users
+			//-----------------------------------------
+			
+			$cut_off = ($ibforums->vars['au_cutoff'] != "") ? $ibforums->vars['au_cutoff'] * 60 : 900;
+			 
+			$DB->cache_add_query( 'topics_get_active_users', 
+								  array( 'tid'   => $this->topic['tid'],
+										 'time'  => time() - $cut_off,
+								)      );
+									 
+			$DB->simple_exec();
+					   
+			//-----------------------------------------
+			// ACTIVE USERS
+			//-----------------------------------------
+			
+			$cached = array();
+			$active = array( 'guests' => 0, 'anon' => 0, 'members' => 0, 'names' => "");
+			$rows   = array( 0 => array( 'login_type'   => substr($ibforums->member['login_anonymous'],0, 1),
+										 'running_time' => time(),
+										 'member_id'    => $ibforums->member['id'],
+										 'member_name'  => $ibforums->member['name'],
+										 'member_group' => $ibforums->member['mgroup'] ) );
+										 
+			//-----------------------------------------
+			// FETCH...
+			//-----------------------------------------
+			
+			while ($r = $DB->fetch_row() )
+			{
+				$rows[] = $r;
+			}
+			
+			//-----------------------------------------
+			// PRINT...
+			//-----------------------------------------
+			
+			foreach( $rows as $i => $result )
+			{
+				$result['suffix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['suffix'];
+				$result['prefix'] = $ibforums->cache['group_cache'][ $result['member_group'] ]['prefix'];
+				
+				if ($result['member_id'] == 0)
+				{
+					$active['guests']++;
+				}
+				else
+				{
+					if (empty( $cached[ $result['member_id'] ] ) )
+					{
+						$cached[ $result['member_id'] ] = 1;
+						
+						$p_start = "";
+						$p_end   = "";
+						$p_title = " title='reading...' ";
+						
+						if ( strstr( $result['location'], 'Post,' ) and $result['member_id'] != $ibforums->member['id'] )
+						{
+							$p_start = "<span class='activeuserposting'>";
+							$p_end   = "</span>";
+							$p_title = " title='replying...' ";
+						}
+						
+						if ($result['login_type'] == 1)
+						{
+							if ( ($ibforums->member['mgroup'] == $ibforums->vars['admin_group']) and ($ibforums->vars['disable_admin_anon'] != 1) )
+							{
+								$active['names'] .= "$p_start<a href='{$ibforums->base_url}showuser={$result['member_id']}'$p_title>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>*$p_end, ";
+								$active['anon']++;
+							}
+							else
+							{
+								$active['anon']++;
+							}
+						}
+						else
+						{
+							$active['members']++;
+							$active['names'] .= "$p_start<a href='{$ibforums->base_url}showuser={$result['member_id']}'$p_title>{$result['prefix']}{$result['member_name']}{$result['suffix']}</a>$p_end, ";
+						}
+					}
+				}
+			}
+			
+			$active['names'] = preg_replace( "/,\s+$/", "" , $active['names'] );
+			
+			$ibforums->lang['active_users_title']   = sprintf( $ibforums->lang['active_users_title']  , ($active['members'] + $active['guests'] + $active['anon'] ) );
+			$ibforums->lang['active_users_detail']  = sprintf( $ibforums->lang['active_users_detail'] , $active['guests'],$active['anon'] );
+			$ibforums->lang['active_users_members'] = sprintf( $ibforums->lang['active_users_members'], $active['members'] );
+			
+			
+			$this->output = str_replace( "<!--IBF.TOPIC_ACTIVE-->", $this->html->topic_active_users($active), $this->output );
+		
+		}
+	
+		//-----------------------------------------
+		// Print it
+		//-----------------------------------------
+		
+		if ( $ibforums->member['is_mod'] )
+		{
+			$this->output = str_replace( "<!--IBF.MOD_PANEL-->", $this->moderation_panel(), $this->output );
+		}
+		else
+		{
+			$this->output = str_replace( "<!--IBF.MOD_PANEL_NO_MOD-->", $this->moderation_panel(), $this->output );
+		}
+		
+		// Enable quick reply box?
+		
+		if (   ( $this->forum['quick_reply'] == 1 )
+		   and ( $std->check_perms( $this->forum['reply_perms']) == TRUE )
+		   and ( $this->topic['state'] != 'closed' ) )
+		{
+			$show = "none";
+			
+			$sqr = $std->my_getcookie("open_qr");
+			
+			if ( $sqr == 1 )
+			{
+				$show = "show";
+			}
+			
+			$this->output = str_replace( "<!--IBF.QUICK_REPLY_CLOSED-->", $this->html->quick_reply_box_closed(), $this->output );
+			$this->output = str_replace( "<!--IBF.QUICK_REPLY_OPEN-->"  , $this->html->quick_reply_box_open($this->topic['forum_id'], $this->topic['tid'], $show, $this->md5_check), $this->output );
+		}
+		
+		$this->output = str_replace( "<!--IBF.TOPIC_OPTIONS_CLOSED-->", $this->html->topic_opts_closed(), $this->output );
+		$this->output = str_replace( "<!--IBF.TOPIC_OPTIONS_OPEN-->"  , $this->html->topic_opts_open($this->topic['forum_id'], $this->topic['tid']), $this->output );
+		
+		$this->topic['id'] = $this->topic['forum_id'];
+		
+		$this->output = str_replace( "<!--IBF.FORUM_RULES-->", $std->print_forum_rules($this->topic), $this->output );
+		
+		//-----------------------------------------
+		// Topic multi-moderation - yay!
+		//-----------------------------------------
+		
+		$this->output = str_replace( "<!--IBF.MULTIMOD-->", $this->multi_moderation(), $this->output );
+		
+		// Pass it to our print routine
+		
+		$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE'    => $ibforums->vars['board_name']." -> {$this->topic['title']}",
+        					 	  'JS'       => 1,
+        					 	  'NAV'      => $this->nav,
+        				 )      );
+				        
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// ATTACHMENTS
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_attachments( $html, $attach_pids, $type='attach_pid', $from='pid', $method='post' )
+	{
+		global $DB, $forums, $std, $ibforums;
+		
+		$final_attachments = array();
+		
+		if ( count( $attach_pids ) )
+		{
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'attachments',
+										  'where'  => "$type IN (".implode(",", $attach_pids).")"
+								 )      );
+								 
+			$DB->simple_exec();
+			
+			while ( $a = $DB->fetch_row() )
+			{
+				$final_attachments[ $a[ $type ] ][ $a['attach_id'] ] = $a;
+			}
+			
+			foreach ( $final_attachments as $pid => $data )
+			{
+				$temp_out = "";
+				$temp_hold = array();
+				
+				foreach( $final_attachments[$pid] as $aid => $row )
+				{
+					//-----------------------------------------
+					// Is it an image, and are we viewing the image in the post?
+					//-----------------------------------------
+					
+					if ( $ibforums->vars['show_img_upload'] and $row['attach_is_image'] )
+					{
+						if ( $row['attach_thumb_location'] AND $row['attach_thumb_width'] )
+						{
+							$tmp = $this->html->Show_attachments_img_thumb( $row['attach_thumb_location'],
+																			$row['attach_thumb_width'],
+																			$row['attach_thumb_height'],
+																			$row['attach_id'],
+																			$std->size_format( $row['attach_filesize'] ),
+																			$row['attach_hits'],
+																			$row['attach_file'],
+																			$method
+																		  );
+																		  
+							if ( strstr( $html, '[attachmentid='.$row['attach_id'].']' ) )
+							{
+								$html = str_replace( '[attachmentid='.$row['attach_id'].']', $tmp, $html );
+							}
+							else
+							{
+								$temp_hold['thumb'] .= $tmp . ' ';
+							}
+						}
+						else
+						{
+							//-----------------------------------------
+							// Standard size..
+							//-----------------------------------------
+							
+							$tmp = $this->html->Show_attachments_img( $row['attach_location'] );
+																		  
+							if ( strstr( $html, '[attachmentid='.$row['attach_id'].']' ) )
+							{
+								$html = str_replace( '[attachmentid='.$row['attach_id'].']', $tmp, $html );
+							}
+							else
+							{
+								$temp_hold['image'] .= $tmp . ' ';
+							}
+						}
+					}
+					else
+					{
+						//-----------------------------------------
+						// Full attachment thingy
+						//-----------------------------------------
+						
+						$tmp = $this->html->Show_attachments( array (
+																	  'hits'  => $row['attach_hits'],
+																	  'image' => $ibforums->cache['attachtypes'][ $row['attach_ext'] ]['atype_img'],
+																	  'name'  => $row['attach_file'],
+																	  $from   => $row[$type],
+																	  'id'    => $row['attach_id'],
+																	  'method'=> $method,
+																	  'size'  => $std->size_format( $row['attach_filesize'] ),
+															)  	  );
+																		  
+						if ( strstr( $html, '[attachmentid='.$row['attach_id'].']' ) )
+						{
+							$html = str_replace( '[attachmentid='.$row['attach_id'].']', $tmp, $html );
+						}
+						else
+						{
+							$temp_hold['attach'] .= $tmp;
+						}
+					}
+				}
+				
+				//-----------------------------------------
+				// Anyfink to show?
+				//-----------------------------------------
+				
+				if ( $temp_hold['thumb'] )
+				{
+					$temp_out = $this->html->show_attachment_title($ibforums->lang['attach_thumbs']) . $temp_hold['thumb'];
+				}
+				
+				if ( $temp_hold['image'] )
+				{
+					$temp_out .= $this->html->show_attachment_title($ibforums->lang['attach_images']) . $temp_hold['image'];
+				}
+				
+				if ( $temp_hold['attach'] )
+				{
+					$temp_out .= $this->html->show_attachment_title($ibforums->lang['attach_normal']) . $temp_hold['attach'];
+				}
+				
+				if ( $temp_out )
+				{
+					$html = str_replace( "<!--IBF.ATTACHMENT_{$row[$type]}-->", $temp_out, $html );
+				}
+			}
+		}
+		
+		return $html;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Parse post
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_row( $row = array() )
+	{
+		global $ibforums, $std, $DB, $forums, $skin_universal;
+		
+		$poster = array();
+		
+		//-----------------------------------------
+		// Cache member
+		//-----------------------------------------
+		
+		if ($row['author_id'] != 0)
+		{
+			//-----------------------------------------
+			// Is it in the hash?
+			//-----------------------------------------
+			
+			if ( isset($this->cached_members[ $row['author_id'] ]) )
+			{
+				//-----------------------------------------
+				// Ok, it's already cached, read from it
+				//-----------------------------------------
+				
+				$poster = $this->cached_members[ $row['author_id'] ];
+				$row['name_css'] = 'normalname';
+			}
+			else
+			{
+				$row['name_css'] = 'normalname';
+				$poster = $this->parse_member( $row );
+				
+				//-----------------------------------------
+				// Add it to the cached list
+				//-----------------------------------------
+				
+				$this->cached_members[ $row['author_id'] ] = $poster;
+			}
+		}
+		else
+		{
+			//-----------------------------------------
+			// It's definitely a guest...
+			//-----------------------------------------
+			
+			$poster = $std->set_up_guest( $row['author_name'] );
+			$row['name_css'] = 'unreg';
+		}
+		
+		//-----------------------------------------
+		
+		if ( $row['queued'] or ($this->topic['topic_firstpost'] == $row['pid'] and $this->topic['approved'] != 1) )
+		{
+			$row['post_css'] = $this->post_count % 2 ? 'post1shaded' : 'post2shaded';
+			$row['altrow']   = 'row4shaded';
+		}
+		else
+		{
+			$row['post_css'] = $this->post_count % 2 ? 'post1' : 'post2';
+			$row['altrow']   = 'row4';
+		}
+		
+		//-----------------------------------------
+		
+		if ( ($row['append_edit'] == 1) and ($row['edit_time'] != "") and ($row['edit_name'] != "") )
+		{
+			$e_time = $std->get_date( $row['edit_time'] , 'LONG' );
+			
+			$row['post'] .= "<br /><br /><span class='edit'>".sprintf($ibforums->lang['edited_by'], $row['edit_name'], $e_time)."</span>";
+		}
+		
+		//-----------------------------------------
+		
+		if (!$ibforums->member['view_img'])
+		{
+			//-----------------------------------------
+			// unconvert smilies first, or it looks a bit crap.
+			//-----------------------------------------
+			
+			$row['post'] = preg_replace( "#<!--emo&(.+?)-->.+?<!--endemo-->#", "\\1" , $row['post'] );
+			
+			$row['post'] = preg_replace( "/<img src=[\"'](.+?)[\"'].+?".">/", "(IMG:<a href='\\1' target='_blank'>\\1</a>)", $row['post'] );
+		}
+		
+		//-----------------------------------------
+		
+		if ($ibforums->input['hl'])
+		{
+			$keywords = str_replace( "+", " ", urldecode($ibforums->input['hl']) );
+			
+			if ( preg_match("/,(and|or),/i", $keywords) )
+			{
+				while ( preg_match("/,(and|or),/i", $keywords, $match) )
+				{
+					$word_array = explode( ",".$match[1].",", $keywords );
+					
+					if (is_array($word_array))
+					{
+						foreach ($word_array as $keywords)
+						{
+							$row['post'] = preg_replace( "/(^|\s|;)(".preg_quote($keywords, '/').")(\s|,|\.|!|<br|&|$)/is", "\\1<span class='searchlite'>\\2</span>\\3", $row['post'] );
+						}
+					}
+				}
+			}
+			else
+			{
+				while( preg_match( "/(^|\s|;)(".preg_quote($keywords, '/').")(\s|,|\.|!|<br|&|$)/i", $row['post'] ) )
+				{
+					$row['post'] = preg_replace( "/(^|\s|;)(".preg_quote($keywords, '/').")(\s|,|\.|!|<br|&|$)/is", "\\1<span class='searchlite'>\\2</span>\\3", $row['post'] );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Online, offline?
+		//-----------------------------------------
+		
+		if ( $row['author_id'] )
+		{
+			$time_limit = time() - $ibforums->vars['au_cutoff'] * 60;
+		
+			$poster['online_status_indicator'] = '<{PB_USER_OFFLINE}>';
+		
+			list( $be_anon, $loggedin ) = explode( '&', $row['login_anonymous'] );
+			
+			if ( ( $row['last_visit'] > $time_limit or $row['last_activity'] > $time_limit ) AND $be_anon != 1 AND $loggedin == 1 )
+			{
+				$poster['online_status_indicator'] = '<{PB_USER_ONLINE}>';
+			}
+		}
+		else
+		{
+			$poster['online_status_indicator'] = '';
+		}
+		
+		//-----------------------------------------
+		// Multi Quoting?
+		//-----------------------------------------
+		
+		$row['mq_start_image'] = $this->html->mq_image_add($row['pid']);
+		
+		if ( $this->qpids )
+		{
+			if ( strstr( ','.$this->qpids.',', ','.$row['pid'].',' ) )
+			{
+				$row['mq_start_image'] = $this->html->mq_image_remove($row['pid']);
+			}
+		}
+		
+		//-----------------------------------------
+		// Multi PIDS?
+		//-----------------------------------------
+		
+		if ( $ibforums->member['is_mod'] )
+		{
+			$row['pid_start_image'] = $this->html->pid_image_unselected($row['pid']);
+			
+			if ( $ibforums->input['selectedpids'] )
+			{
+				if ( strstr( ','.$ibforums->input['selectedpids'].',', ','.$row['pid'].',' ) )
+				{
+					$row['pid_start_image'] = $this->html->pid_image_selected($row['pid']);
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Delete button..
+		//-----------------------------------------
+		
+		if ( $row['pid'] != $this->topic['topic_firstpost'] )
+		{
+			$row['delete_button'] = $this->delete_button($row['pid'], $poster);
+		}
+		
+		
+		$row['edit_button']   = $this->edit_button($row['pid'], $poster, $row['post_date']);
+		
+		$row['post_date']     = $std->get_date( $row['post_date'], 'LONG' );
+		
+		$row['post_icon']     = $row['icon_id']
+							  ? $this->html->post_icon( $row['icon_id'] )
+							  : "";
+		
+		$row['ip_address']    = $this->view_ip($row, $poster);
+		
+		$row['report_link']   = (($ibforums->vars['disable_reportpost'] != 1) and ( $ibforums->member['id'] ))
+							  ? $this->html->report_link($row)
+							  : "";
+		
+		//-----------------------------------------
+		// Siggie stuff
+		//-----------------------------------------
+		
+		$row['signature'] = "";
+		
+		if ($poster['signature'] and $ibforums->member['view_sigs'])
+		{
+			if ($row['use_sig'] == 1)
+			{
+				$this->parser->pp_do_html  = intval($ibforums->vars['sig_allow_html']);
+				$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+				$this->parser->pp_nl2br    = 1;
+				
+				$row['signature'] = $ibforums->skin_global->signature_separator( $this->parser->post_db_parse($poster['signature']) );
+			}
+		}
+		
+		//-----------------------------------------
+		// Fix up the membername so it links to the members profile
+		//-----------------------------------------
+		
+		if ($poster['id'])
+		{
+			$poster['name'] = "<a href='{$this->base_url}showuser={$poster['id']}'>{$poster['name']}</a>";
+		}
+		
+		//-----------------------------------------
+		// Parse HTML tag on the fly
+		//-----------------------------------------
+		
+		$this->parser->pp_do_html  = ( $this->forum['use_html'] and $ibforums->cache['group_cache'][ $poster['mgroup'] ]['g_dohtml'] and $row['post_htmlstate'] ) ? 1 : 0;
+		$this->parser->pp_wordwrap = $ibforums->vars['post_wordwrap'];
+		$this->parser->pp_nl2br    = $row['post_htmlstate'] == 2 ? 1 : 0;
+		
+		$row['post'] = $this->parser->post_db_parse( $row['post'] );
+		
+		//-----------------------------------------
+		// A bit hackish - but there are lots of <br> => <br /> changes to make
+		//-----------------------------------------
+		
+		//$row['post']      = str_replace( "<br>", "<br />", $row['post'] );
+		//$row['signature'] = str_replace( "<br>", "<br />", $row['signature'] );
+		
+		//-----------------------------------------
+		// Post number
+		//-----------------------------------------
+		
+		if ( $this->topic_view_mode == 'linearplus' and $this->topic['topic_firstpost'] == $row['pid'])
+		{
+			$row['post_count'] = 1;
+			
+			if ( ! $this->first )
+			{
+				$this->post_count++;
+			}
+		}
+		else
+		{
+			$this->post_count++;
+		
+			$row['post_count'] = intval($ibforums->input['st']) + $this->post_count;
+		}
+		
+		return array( 'row' => $row, 'poster' => $poster );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Parse the member info
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_member( $member=array() )
+	{
+		global $ibforums, $std, $DB;
+		
+		$member['avatar'] = $std->get_avatar( $member['avatar_location'], $ibforums->member['view_avs'], $member['avatar_size'], $member['avatar_type'] );
+		
+		$pips = 0;
+		
+		foreach($this->mem_titles as $k => $v)
+		{
+			if ($member['posts'] >= $v['POSTS'])
+			{
+				if (!$member['title'])
+				{
+					$member['title'] = $this->mem_titles[ $k ]['TITLE'];
+				}
+				
+				$pips = $v['PIPS'];
+				break;
+			}
+		}
+		
+		if ( $ibforums->cache['group_cache'][ $member['mgroup'] ]['g_icon'] )
+		{
+			$member['member_rank_img'] = $this->html->member_rank_img($ibforums->cache['group_cache'][ $member['mgroup'] ]['g_icon']);
+		}
+		else if ( $pips )
+		{
+			if ( is_numeric( $pips ) )
+			{
+				for ($i = 1; $i <= $pips; ++$i)
+				{
+					$member['member_rank_img'] .= "<{A_STAR}>";
+				}
+			}
+			else
+			{
+				$member['member_rank_img'] = $this->html->member_rank_img( 'style_images/<#IMG_DIR#>/folder_team_icons/'.$pips );
+			}
+		}
+		
+		$member['member_joined'] = $this->html->member_joined( $std->get_date( $member['joined'], 'JOINED' ) );
+		
+		$member['member_group']  = $this->html->member_group( $ibforums->cache['group_cache'][ $member['mgroup'] ]['g_title'] );
+		
+		$member['member_posts']  = $this->html->member_posts( $std->do_number_format($member['posts']) );
+		
+		$member['member_number'] = $this->html->member_number( $std->do_number_format($member['id']) );
+		
+		$member['profile_icon']  = $this->html->member_icon_profile( $member['id'] );
+		
+		$member['message_icon']  = $this->html->member_icon_msg( $member['id'] );
+		
+		if ($member['location'])
+		{
+			$member['member_location']  = $this->html->member_location( $member['location'] );
+		}
+		
+		if (! $member['hide_email'])
+		{
+			$member['email_icon'] = $this->html->member_icon_email( $member['id'] );
+		}
+		
+		if ( $member['id'] )
+		{
+			$member['addresscard'] = $this->html->member_icon_vcard( $member['id'] );
+		}
+		
+		//-----------------------------------------
+		// Warny porny?
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['warn_on'] and ( ! strstr( ','.$ibforums->vars['warn_protected'].',', ','.$member['mgroup'].',' ) ) )
+		{
+			if (   ( $ibforums->vars['warn_mod_ban'] AND $ibforums->member['_moderator'][ $this->topic['forum_id'] ]['allow_warn'] )
+				or ( $ibforums->member['g_is_supmod'] == 1 )
+				or ( $ibforums->vars['warn_show_own'] and ( $ibforums->member['id'] == $member['id'] ) )
+			   )
+			{
+				// Work out which image to show.
+				
+				if ( ! $ibforums->vars['warn_show_rating'] )
+				{
+					if ( $member['warn_level'] <= $ibforums->vars['warn_min'] )
+					{
+						$member['warn_img']     = '<{WARN_0}>';
+						$member['warn_percent'] = 0;
+					}
+					else if ( $member['warn_level'] >= $ibforums->vars['warn_max'] )
+					{
+						$member['warn_img']     = '<{WARN_5}>';
+						$member['warn_percent'] = 100;
+					}
+					else
+					{
+						
+						$member['warn_percent'] = $member['warn_level'] ? sprintf( "%.0f", ( ($member['warn_level'] / $ibforums->vars['warn_max']) * 100) ) : 0;
+						
+						if ( $member['warn_percent'] > 100 )
+						{
+							$member['warn_percent'] = 100;
+						}
+						
+						if ( $member['warn_percent'] >= 81 )
+						{
+							$member['warn_img'] = '<{WARN_5}>';
+						}
+						else if ( $member['warn_percent'] >= 61 )
+						{
+							$member['warn_img'] = '<{WARN_4}>';
+						}
+						else if ( $member['warn_percent'] >= 41 )
+						{
+							$member['warn_img'] = '<{WARN_3}>';
+						}
+						else if ( $member['warn_percent'] >= 21 )
+						{
+							$member['warn_img'] = '<{WARN_2}>';
+						}
+						else if ( $member['warn_percent'] >= 1 )
+						{
+							$member['warn_img'] = '<{WARN_1}>';
+						}
+						else
+						{
+							$member['warn_img'] = '<{WARN_0}>';
+						}
+					}
+					
+					if ( $member['warn_percent'] < 1 )
+					{
+						$member['warn_percent'] = 0;
+					}
+					
+					$member['warn_text']  = $this->html->warn_level_warn($member['id'], $member['warn_percent'] );
+				}
+				else
+				{
+					// Ratings mode..
+					
+					$member['warn_text']  = $ibforums->lang['tt_rating'];
+					$member['warn_img']   = $this->html->warn_level_rating($member['id'], $member['warn_level'], $ibforums->vars['warn_min'], $ibforums->vars['warn_max']);
+				}
+								
+				if ( ( $ibforums->vars['warn_mod_ban'] AND $ibforums->member['_moderator'][ $this->topic['forum_id'] ]['allow_warn'] ) or ( $ibforums->member['g_is_supmod'] == 1 ) )
+				{
+					$member['warn_add']   = "<a href='{$ibforums->base_url}act=warn&amp;type=add&amp;mid={$member['id']}&amp;t={$this->topic['tid']}&amp;st=".intval($ibforums->input['st'])."' title='{$ibforums->lang['tt_warn_add']}'><{WARN_ADD}></a>";
+					$member['warn_minus'] = "<a href='{$ibforums->base_url}act=warn&amp;type=minus&amp;mid={$member['id']}&amp;t={$this->topic['tid']}&amp;st=".intval($ibforums->input['st'])."' title='{$ibforums->lang['tt_warn_minus']}'><{WARN_MINUS}></a>";
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Profile fields stuff
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['custom_profile_topic'] == 1 )
+		{
+			if ( $this->custom_fields )
+			{
+				$this->custom_fields->member_data = $member;
+				$this->custom_fields->init_data();
+				$this->custom_fields->parse_to_view( 1 );
+				
+				if ( count( $this->custom_fields->out_fields ) )
+				{
+					foreach( $this->custom_fields->out_fields as $i => $data )
+					{
+						if ( $data )
+						{
+							$member['custom_fields'] .= "\n".$this->custom_fields->method_format_field_for_topic_view( $i );
+						}
+					}
+				}
+			}
+		}
+		
+		return $member;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Render the delete button
+	/*-------------------------------------------------------------------------*/
+	
+	function delete_button($post_id, $poster)
+	{
+		global $ibforums, $std;
+		
+		if ($ibforums->member['id'] == "" or $ibforums->member['id'] == 0)
+		{
+			return "";
+		}
+		
+		$button = $this->html->button_delete($this->forum['id'],$this->topic['tid'],$post_id,$this->md5_check );
+		
+		if ($ibforums->member['g_is_supmod']) return $button;
+		if ($this->moderator['delete_post']) return $button;
+		if ($poster['id'] == $ibforums->member['id'] and ($ibforums->member['g_delete_own_posts'])) return $button;
+		return "";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Render the edit button
+	/*-------------------------------------------------------------------------*/
+	
+	function edit_button($post_id, $poster, $post_date)
+	{
+		global $ibforums;
+		
+		if ($ibforums->member['id'] == "" or $ibforums->member['id'] == 0)
+		{
+			return "";
+		}
+		
+		$button = $this->html->button_edit( $this->forum['id'],$this->topic['tid'],$post_id );
+		
+		if ($ibforums->member['g_is_supmod']) return $button;
+		
+		if ($this->moderator['edit_post']) return $button;
+		
+		if ($poster['id'] == $ibforums->member['id'] and ($ibforums->member['g_edit_posts']))
+		{
+			// Have we set a time limit?
+			
+			if ($ibforums->member['g_edit_cutoff'] > 0)
+			{
+				if ( $post_date > ( time() - ( intval($ibforums->member['g_edit_cutoff']) * 60 ) ) )
+				{
+					return $button;
+				}
+				else
+				{
+					return "";
+				}
+			}
+			else
+			{
+				return $button;
+			}
+		}
+		
+		return "";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Render the reply button
+	/*-------------------------------------------------------------------------*/
+
+	function reply_button()
+	{
+		global $ibforums;
+		
+		if ($this->topic['state'] == 'closed')
+		{
+			// Do we have the ability to post in
+			// closed topics?
+			
+			if ($ibforums->member['g_post_closed'] == 1)
+			{
+				return $this->html->button_posting( "{$ibforums->base_url}act=Post&amp;CODE=02&amp;f=".$this->forum['id']."&amp;t=".$this->topic['tid'], "<{A_LOCKED_B}>" );
+			}
+			else
+			{
+				return "<{A_LOCKED_B}>";
+			}
+		}
+		
+		if ($this->topic['state'] == 'moved')
+		{
+			return "<{A_MOVED_B}>";
+		}
+		
+		if ($this->topic['poll_state'] == 'closed')
+		{
+			return "<{A_POLLONLY_B}>";
+		}
+		
+		return $this->html->button_posting( "{$ibforums->base_url}act=Post&amp;CODE=02&amp;f=".$this->forum['id']."&amp;t=".$this->topic['tid'], "<{A_REPLY}>" );
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Poll button
+	/*-------------------------------------------------------------------------*/
+	
+	function poll_button()
+	{
+		global $ibforums;
+		
+		return $this->forum['allow_poll']
+			   ? $this->html->button_posting( "{$ibforums->base_url}act=Post&amp;CODE=10&amp;f=".$this->forum['id'],  "<{A_POLL}>" )
+			   : '';	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Render the IP address
+	/*-------------------------------------------------------------------------*/
+	
+	function view_ip($row, $poster)
+	{
+		global $ibforums;
+		
+		if ($ibforums->member['g_is_supmod'] != 1 && $this->moderator['view_ip'] != 1)
+		{
+			return "";
+		}
+		else
+		{
+			$row['ip_address'] = $poster['mgroup'] == $ibforums->vars['admin_group']
+						  ? $this->html->ip_admin_hide()
+						  : $this->html->ip_admin_show( $row['ip_address'] );
+			return $this->html->ip_show($row['ip_address']);
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Render the topic multi-moderation
+	/*-------------------------------------------------------------------------*/
+	
+	function multi_moderation()
+	{
+		global $ibforums, $std, $DB;
+		
+		$mm_html = "";
+		
+		$mm_array = $std->get_multimod( $this->forum['id'] );
+		
+		//-----------------------------------------
+		// Print and show
+		//-----------------------------------------
+		
+		if ( is_array( $mm_array ) and count( $mm_array ) )
+		{
+			foreach( $mm_array as $m )
+			{
+				$mm_html .= $this->html->mm_entry( $m[0], $m[1] );
+			}
+		}
+		
+		if ( $mm_html )
+		{
+			$mm_html = $this->html->mm_start($this->topic['tid']) . $mm_html . $this->html->mm_end();
+		}
+		
+		return $mm_html;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Render the moderator links
+	/*-------------------------------------------------------------------------*/
+	
+	function moderation_panel()
+	{
+		global $ibforums, $std;
+		
+		$mod_links = "";
+		
+		if (!isset($ibforums->member['id'])) return "";
+		
+		$skcusgej = 0;
+		
+		if ($ibforums->member['id'] == $this->topic['starter_id'])
+		{
+			$skcusgej = 1;
+		}
+		
+		if ($ibforums->member['g_is_supmod'] == 1)
+		{
+			$skcusgej = 1;
+		}
+		
+		if ($this->moderator['mid'] != "")
+		{
+			$skcusgej = 1;
+		}
+		
+		if ($skcusgej == 0)
+		{
+		   		return "";
+		}
+		
+		//-----------------------------------------
+		// Add on approve/unapprove topic fing
+		//-----------------------------------------
+		
+		if ( $std->can_queue_posts( $this->forum['id'] ) ) 
+		{
+			if ( $this->topic['approved'] != 1 )
+			{
+				$mod_links .= $this->html->mod_wrapper('topic_approve', $ibforums->lang[ 'cpt_approvet' ]);
+			}
+			else
+			{
+				$mod_links .= $this->html->mod_wrapper('topic_unapprove', $ibforums->lang[ 'cpt_unapprovet' ]);
+			}
+		}
+		
+		$actions = array( 'MOVE_TOPIC', 'CLOSE_TOPIC', 'OPEN_TOPIC', 'DELETE_TOPIC', 'EDIT_TOPIC', 'PIN_TOPIC', 'UNPIN_TOPIC', 'MERGE_TOPIC', 'UNSUBBIT' );
+		
+		foreach( $actions as $key )
+		{
+			if ($ibforums->member['g_is_supmod'])
+			{
+				$mod_links .= $this->append_link($key);
+			}
+			elseif ($this->moderator['mid'])
+			{
+				if ($key == 'MERGE_TOPIC' or $key == 'SPLIT_TOPIC')
+				{
+					if ($this->moderator['split_merge'] == 1)
+					{
+						$mod_links .= $this->append_link($key);
+					}
+				}
+				else
+				{
+					if ($this->moderator[ strtolower($key) ])
+					{
+						$mod_links .= $this->append_link($key);
+					}
+				}
+			}
+			elseif ($key == 'OPEN_TOPIC' or $key == 'CLOSE_TOPIC')
+			{
+				if ($ibforums->member['g_open_close_posts'])
+				{
+					$mod_links .= $this->append_link($key);
+				}
+			}
+			elseif ($key == 'DELETE_TOPIC')
+			{
+				if ($ibforums->member['g_delete_own_topics'])
+				{
+					$mod_links .= $this->append_link($key);
+				}
+			}
+		}
+		
+		if ($ibforums->member['g_access_cp'] == 1)
+		{
+			$mod_links .= $this->append_link('TOPIC_HISTORY');
+		}
+		
+		if ($mod_links != "")
+		{
+			return $this->html->Mod_Panel($mod_links, $this->forum['id'], $this->topic['tid'], $this->md5_check);
+			
+		}
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Append mod links
+	/*-------------------------------------------------------------------------*/
+	
+	function append_link( $key="" )
+	{
+		global $ibforums;
+		
+		if ($key == "") return "";
+		
+		if ($this->topic['state'] == 'open'   and $key == 'OPEN_TOPIC') return "";
+		if ($this->topic['state'] == 'closed' and $key == 'CLOSE_TOPIC') return "";
+		if ($this->topic['state'] == 'moved'  and ($key == 'CLOSE_TOPIC' or $key == 'MOVE_TOPIC')) return "";
+		if ($this->topic['pinned'] == 1 and $key == 'PIN_TOPIC')   return "";
+		if ($this->topic['pinned'] == 0 and $key == 'UNPIN_TOPIC') return "";
+		
+		++$this->colspan;
+		
+		return $this->html->mod_wrapper($this->mod_action[$key], $ibforums->lang[ $key ]);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Process and parse the poll
+	/*-------------------------------------------------------------------------*/
+	
+	function parse_poll()
+	{
+		global $ibforums, $DB, $std;
+	    
+	    $html        = "";
+	    $check       = 0;
+	    $poll_footer = "";
+	    
+	    $ibforums->lang  = $std->load_words($ibforums->lang, 'lang_post', $ibforums->lang_id);
+        
+        $this->poll_html = $std->load_template('skin_poll');
+        
+        //-----------------------------------------
+        // Get the poll information...
+        //-----------------------------------------
+        
+        $DB->simple_construct( array( 'select' => '*',
+        							  'from'   => 'polls',
+        							  'where'  => "tid=".$this->topic['tid']
+        					 )      );
+        					 
+        $DB->simple_exec();
+        
+        $poll_data = $DB->fetch_row();
+        
+        if (! $poll_data['pid'])
+        {
+        	return;
+        }
+        
+        if ( ! $poll_data['poll_question'] )
+        {
+        	$poll_data['poll_question'] = $this->topic['title'];
+        }
+        
+        //-----------------------------------------
+        
+        $delete_link = "";
+        $edit_link   = "";
+        $can_edit    = 0;
+        $can_delete  = 0;
+        
+        if ($this->moderator['edit_post'])
+        {
+        	$can_edit = 1;
+        }
+        if ($this->moderator['delete_post'])
+        {
+        	$can_delete = 1;
+        }
+        
+        if ($ibforums->member['g_is_supmod'] == 1)
+        {
+        	$can_edit   = 1;
+        	$can_delete = 1;
+        }
+        
+        if ($can_edit == 1)
+        {
+        	$edit_link   = $this->poll_html->edit_link($this->topic['tid'], $this->forum['id'], $this->md5_check );
+        }
+        
+        if ($can_delete == 1)
+        {
+        	$delete_link = $this->poll_html->delete_link($this->topic['tid'], $this->forum['id'], $this->md5_check );
+        }
+        
+        //-----------------------------------------
+        
+        $voter = array( 'id' => 0 );
+        
+        //-----------------------------------------
+        // Have we voted in this poll?
+        //-----------------------------------------
+        
+        $DB->simple_construct( array( 'select' => 'member_id',
+        							  'from'   => 'voters',
+        							  'where'  => "member_id=".$ibforums->member['id']." and tid=".$this->topic['tid']
+        					 )      );
+        					 
+        $DB->simple_exec();
+        
+        $voter = $DB->fetch_row();
+        
+        if ($voter['member_id'] != 0)
+        {
+        	$check = 1;
+        	$poll_footer = $ibforums->lang['poll_you_voted'];
+        }
+        
+        if ( ($poll_data['starter_id'] == $ibforums->member['id']) and ($ibforums->vars['allow_creator_vote'] != 1) )
+        {
+        	$check = 1;
+        	$poll_footer = $ibforums->lang['poll_you_created'];
+        }
+        	
+        if (! $ibforums->member['id'] ) {
+        	$check = 1;
+        	$poll_footer = $ibforums->lang['poll_no_guests'];
+        }
+        
+        //-----------------------------------------
+        // is the topic locked?
+        //-----------------------------------------
+        
+        if ( $this->topic['state'] == 'closed' )
+        {
+        	$check = 1;
+        	$poll_footer = '&nbsp;';
+        }
+        
+        if ( $ibforums->vars['allow_result_view'] == 1 )
+        {
+        	if ( $ibforums->input['mode'] == 'show' )
+        	{
+        		$check       = 1;
+        		$poll_footer = "";
+        	}
+        }
+        
+        //-----------------------------------------
+        // Stop the parser killing images
+        // 'cos there are too many
+        //-----------------------------------------
+        
+        $tmp_max_images               = $ibforums->vars['max_images'];
+        $ibforums->vars['max_images'] = 0;
+        
+        if ($check == 1)
+        {
+        	//-----------------------------------------
+        	// Show the results
+        	//-----------------------------------------
+        	
+        	$total_votes = 0;
+        	
+        	$html = $this->poll_html->poll_header($this->topic['tid'], $poll_data['poll_question'], $edit_link, $delete_link);
+        	
+        	$poll_answers = unserialize(stripslashes($poll_data['choices']));
+        	
+        	reset($poll_answers);
+        	
+        	foreach ($poll_answers as $entry)
+        	{
+        		$id     = $entry[0];
+        		$choice = $entry[1];
+        		$votes  = $entry[2];
+        		
+        		$total_votes += $votes;
+        		
+        		if ( strlen($choice) < 1 )
+        		{
+        			continue;
+        		}
+        		
+        		if ($ibforums->vars['poll_tags'])
+        		{
+        			$choice = $this->parser->parse_poll_tags($choice);
+        		}
+        		if ( $ibforums->vars['post_wordwrap'] > 0 )
+				{
+					$choice = $this->parser->my_wordwrap( $choice, $ibforums->vars['post_wordwrap']) ;
+				}
+        		
+        		$percent = $votes == 0 ? 0 : $votes / $poll_data['votes'] * 100;
+        		$percent = sprintf( '%.2f' , $percent );
+        		$width   = $percent > 0 ? (int) $percent * 2 : 0;
+        		$html   .= $this->poll_html->Render_row_results($votes, $id, $choice, $percent, $width);
+        	}
+        	
+        	$html   .= $this->poll_html->show_total_votes($total_votes);
+        }
+        else
+        {
+        	$poll_answers = unserialize(stripslashes($poll_data['choices']));
+        	reset($poll_answers);
+        	
+        	//-----------------------------------------
+        	// Show poll form
+        	//-----------------------------------------
+        	
+        	$html = $this->poll_html->poll_header($this->topic['tid'], $poll_data['poll_question'], $edit_link, $delete_link);
+        	
+        	foreach ($poll_answers as $entry)
+        	{
+        		$id     = $entry[0];
+        		$choice = $entry[1];
+        		$votes  = $entry[2];
+        		
+        		if ( strlen($choice) < 1 )
+        		{
+        			continue;
+        		}
+        		
+        		if ($ibforums->vars['poll_tags'])
+        		{
+        			$choice = $this->parser->parse_poll_tags($choice);
+        		}
+        		if ( $ibforums->vars['post_wordwrap'] > 0 )
+				{
+					$choice = $this->parser->my_wordwrap( $choice, $ibforums->vars['post_wordwrap']) ;
+				}
+        		
+        		$html   .= $this->poll_html->Render_row_form($votes, $id, $choice);
+        	}
+        }
+        
+        $html .= $this->poll_html->ShowPoll_footer();
+        
+        if ( $poll_footer != "" )
+        {
+        	//-----------------------------------------
+        	// Already defined..
+        	//-----------------------------------------
+        	
+        	$html = str_replace( "<!--IBF.VOTE-->", $poll_footer, $html );
+        }
+        else
+        {
+        	//-----------------------------------------
+        	// Not defined..
+        	//-----------------------------------------
+        	
+        	if ( $ibforums->vars['allow_result_view'] == 1 )
+        	{
+        		if ( $ibforums->input['mode'] == 'show' )
+        		{
+        			// We are looking at results..
+        			
+        			$html = str_replace( "<!--IBF.SHOW-->", $this->poll_html->button_show_voteable(), $html );
+        		}
+        		else
+        		{
+        			$html = str_replace( "<!--IBF.SHOW-->", $this->poll_html->button_show_results(), $html );
+        			$html = str_replace( "<!--IBF.VOTE-->", $this->poll_html->button_vote(), $html );
+        		}
+        	}
+        	else
+        	{
+        		//-----------------------------------------
+        		// Do not allow result viewing
+        		//-----------------------------------------
+        		
+        		$html = str_replace( "<!--IBF.VOTE-->", $this->poll_html->button_vote(), $html );
+        		$html = str_replace( "<!--IBF.SHOW-->", $this->poll_html->button_null_vote(), $html );
+        	}
+        }
+        
+        $html = str_replace( "<!--IBF.POLL_JS-->", $this->poll_html->poll_javascript($this->topic['tid'], $this->forum['id']), $html );
+        
+        $ibforums->vars['max_images'] = $tmp_max_images;
+        
+        return $html;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Return last post
+	/*-------------------------------------------------------------------------*/
+	
+	function return_last_post()
+	{
+		global $ibforums, $DB, $std;
+		
+		$st = 0;
+        	
+		if ($this->topic['posts'])
+		{
+			if ( (($this->topic['posts'] + 1) % $ibforums->vars['display_max_posts']) == 0 )
+			{
+				$pages = ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts'];
+			}
+			else
+			{
+				$number = ( ($this->topic['posts'] + 1) / $ibforums->vars['display_max_posts'] );
+				$pages = ceil( $number);
+			}
+			
+			$st = ($pages - 1) * $ibforums->vars['display_max_posts'];
+		}
+		
+		$DB->simple_construct( array( 'select' => 'pid',
+        							  'from'   => 'posts',
+        							  'where'  => "queued <> 1 AND topic_id=".$this->topic['tid'],
+        							  'order'  => 'pid DESC',
+        							  'limit'  => array( 0,1 )
+        					 )      );
+        					 
+        $DB->simple_exec();
+        
+		$post = $DB->fetch_row();
+		
+		$std->boink_it($ibforums->base_url."showtopic=".$this->topic['tid']."&pid={$post['pid']}&st=$st&"."#entry".$post['pid']);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INIT, innit? IS IT?
+	/*-------------------------------------------------------------------------*/
+	
+	function topic_init( $load_modules=0 )
+	{
+		global $ibforums, $forums, $DB, $std;
+		
+		//-----------------------------------------
+		// Compile the language file
+		//-----------------------------------------
+		
+        $ibforums->lang = $std->load_words($ibforums->lang, 'lang_topic', $ibforums->lang_id);
+
+        $this->html     = $std->load_template('skin_topic');
+        
+        //-----------------------------------------
+        // Parser
+        //-----------------------------------------
+        
+        require_once( ROOT_PATH."sources/lib/post_parser.php" );
+        
+        $this->parser = new post_parser();
+        
+        //-----------------------------------------
+        // Custom Profile fields
+        //-----------------------------------------
+        
+        if ( $ibforums->vars['custom_profile_topic'] == 1 or $load_modules )
+        {
+			require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+			$this->custom_fields = new custom_fields( $DB );
+			
+			$this->custom_fields->member_id  = $ibforums->member['id'];
+			$this->custom_fields->cache_data = $ibforums->cache['profilefields'];
+			$this->custom_fields->admin      = intval($ibforums->member['g_access_cp']);
+			$this->custom_fields->supmod     = intval($ibforums->member['g_is_supmod']);
+        }
+        
+        //-----------------------------------------
+ 		// Get all the member groups and
+ 		// member title info
+ 		//-----------------------------------------
+        
+        if ( ! is_array( $ibforums->cache['ranks'] ) )
+        {
+        	$ibforums->cache['ranks'] = array();
+        	
+			$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+										  'from'   => 'titles',
+										  'order'  => "posts DESC",
+								)      );
+								
+			$DB->simple_exec();
+						
+			while ($i = $DB->fetch_row())
+			{
+				$ibforums->cache['ranks'][ $i['id'] ] = array(
+															  'TITLE' => $i['title'],
+															  'PIPS'  => $i['pips'],
+															  'POSTS' => $i['posts'],
+															);
+			}
+			
+			$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+        }
+        
+        $this->mem_titles = $ibforums->cache['ranks'];
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MAIN init
+	/*-------------------------------------------------------------------------*/
+	
+	function init($topic="")
+	{
+		global $ibforums, $forums, $DB, $std, $print;
+		
+		 $this->md5_check = $std->return_md5_check();
+		 
+		 $this->topic_init();
+         
+        if ( ! is_array($topic) )
+        {
+			//-----------------------------------------
+			// Check the input
+			//-----------------------------------------
+			
+			$ibforums->input['t'] = intval($ibforums->input['t']);
+			
+			if ( $ibforums->input['t'] < 0  )
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+			}
+			
+			
+			//-----------------------------------------
+			// Get the forum info based on the forum ID,
+			// get the category name, ID, and get the topic details
+			//-----------------------------------------
+			
+			if ( ! $ibforums->topic_cache['tid'] )
+			{
+				$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'topics',
+											  'where'  => "tid=".$ibforums->input['t'],
+									)      );
+									
+				$DB->simple_exec();
+				
+				$this->topic = $DB->fetch_row();
+			}
+			else
+			{
+				$this->topic = $ibforums->topic_cache;
+			}
+		}
+		else
+		{
+			$this->topic = $topic;
+		}
+        
+        $this->forum = $forums->forum_by_id[ $this->topic['forum_id'] ];
+        
+        $ibforums->input['f'] = $this->forum['id'];
+        
+        //-----------------------------------------
+        // Error out if we can not find the forum
+        //-----------------------------------------
+        
+        if (!$this->forum['id'])
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'is_broken_link') );
+        }
+        
+        //-----------------------------------------
+        // Error out if we can not find the topic
+        //-----------------------------------------
+        
+        if (!$this->topic['tid'])
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'is_broken_link') );
+        }
+        
+        //-----------------------------------------
+        // Error out if the topic is not approved
+        //-----------------------------------------
+        
+        if ( ! $std->can_queue_posts($this->forum['id']) )
+        {
+			if ($this->topic['approved'] != 1)
+			{
+				$std->Error( array( LEVEL => 1, MSG => 'missing_files') );
+			}
+        }
+        
+        //-----------------------------------------
+        // If this forum is a link, then 
+        // redirect them to the new location
+        //-----------------------------------------
+        
+        if ($this->topic['state'] == 'link')
+        {
+        	$f_stuff = explode("&", $this->topic['moved_to']);
+        	$print->redirect_screen( $ibforums->lang['topic_moved'], "showtopic={$f_stuff[0]}" );
+        }
+        
+        $forums->forums_check_access( $this->forum['id'], 1, 'topic' );
+        
+        //-----------------------------------------
+        // Unserialize the read array and parse into
+        // array
+        //-----------------------------------------
+        
+        if ( $read = $std->my_getcookie('topicsread') )
+        {
+        	$this->read_array = unserialize(stripslashes($read));
+        	
+        	if (! is_array($this->read_array) )
+        	{
+        		$this->read_array = array();
+        	}
+        }
+        
+        $this->last_read_tid = $this->read_array[$this->topic['tid']];
+        
+        //-----------------------------------------
+	    // Are we actually a moderator for this forum?
+	    //-----------------------------------------
+	    
+	    if ( ! $ibforums->member['g_is_supmod'] AND ! $ibforums->member['g_access_cp'] )
+	    {
+	    	if ( ! is_array( $ibforums->member['_moderator'][ $this->forum['id'] ] ) )
+	    	{
+	    		$ibforums->member['is_mod'] = 0;
+	    	}
+	    }
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Topic set up ya'll
+	/*-------------------------------------------------------------------------*/
+	
+	function topic_set_up()
+	{
+		global $DB, $ibforums, $std, $forums, $skin_universal;
+		
+		$this->base_url = $ibforums->base_url;
+        
+		$this->forum['JUMP'] = $std->build_forum_jump();
+		
+		$this->first = intval($ibforums->input['st']);
+		
+        //-----------------------------------------
+        // Check viewing permissions, private forums,
+        // password forums, etc
+        //-----------------------------------------
+        
+        if ( (!$this->topic['pinned']) and ( ( ! $ibforums->member['g_other_topics'] ) AND ( $this->topic['starter_id'] != $ibforums->member['id'] ) ) )
+        {
+        	$std->Error( array( LEVEL => 1, MSG => 'no_view_topic') );
+        }
+        
+        //-----------------------------------------
+        // Update the topic views counter
+        //-----------------------------------------
+        
+        $DB->simple_construct( array( 'update' => 'topics',
+									  'set'    => 'views=views+1',
+									  'where'  => "tid=".$this->topic['tid'],
+							)      );
+							
+		$DB->simple_shutdown_exec();
+        
+        //-----------------------------------------
+        // Update the topic read cookie / counters
+        //-----------------------------------------
+        
+        if ( $ibforums->member['id'] )
+        {
+			$this->read_array[$this->topic['tid']] = time();
+			
+			$std->my_setcookie('topicsread', serialize($this->read_array), -1 );
+			
+			if ( $ibforums->vars['db_topic_read_cutoff'] and $ibforums->input['view'] != 'getnewpost' )
+			{
+				$DB->cache_add_query( 'topics_replace_topic_read', array( 'tid' => $this->topic['tid'], 'mid' => $ibforums->member['id'], 'date' => time() ) );
+				$DB->cache_shutdown_exec();
+			}
+        }
+        
+        //-----------------------------------------
+        // If this is a sub forum, we need to get
+        // the cat details, and parent details
+        //-----------------------------------------
+        
+       	$this->nav = $forums->forums_breadcrumb_nav( $this->forum['id'] );
+        
+        //-----------------------------------------
+        // Are we a moderator?
+        //-----------------------------------------
+		
+		if ( ($ibforums->member['id']) and ($ibforums->member['g_is_supmod'] != 1) )
+		{
+			$DB->cache_add_query('topics_check_for_mod',  array( 'fid' => $this->forum['id'], 'mid' => $ibforums->member['id'], 'gid' => $ibforums->member['mgroup'] ) );
+			$DB->simple_exec();
+			
+			$this->moderator = $DB->fetch_row();
+		}
+		
+		$this->mod_action = array( 'CLOSE_TOPIC'   => '00',
+								   'OPEN_TOPIC'    => '01',
+								   'MOVE_TOPIC'    => '02',
+								   'DELETE_TOPIC'  => '03',
+								   'EDIT_TOPIC'    => '05',
+								   'PIN_TOPIC'     => '15',
+								   'UNPIN_TOPIC'   => '16',
+								   'UNSUBBIT'      => '30',
+								   'MERGE_TOPIC'   => '60',
+								   'TOPIC_HISTORY' => '90',
+								 );
+		
+		
+		//-----------------------------------------
+        // Get the reply, and posting buttons
+        //----------------------------------------- 
+        
+        $this->topic['POLL_BUTTON']   = $this->poll_button();
+										 
+		$this->topic['REPLY_BUTTON']  = $this->reply_button();
+		
+		
+		//-----------------------------------------
+		// Hi! Light?
+		//-----------------------------------------
+		
+		if ($ibforums->input['hl'])
+		{
+			$hl = '&amp;hl='.$ibforums->input['hl'];
+		}
+		
+		//-----------------------------------------
+		// If we can see queued topics, add count
+		//-----------------------------------------
+		
+		if ( $std->can_queue_posts($this->forum['id']) )
+		{
+			$this->topic['posts'] += intval( $this->topic['topic_queuedposts'] );
+		}
+		
+		//-----------------------------------------
+		// Generate the forum page span links
+		//-----------------------------------------
+		
+		$this->topic['SHOW_PAGES']
+			= $std->build_pagelinks( array( 'TOTAL_POSS'  => ($this->topic['posts']+1),
+											'PER_PAGE'    => $ibforums->vars['display_max_posts'],
+											'CUR_ST_VAL'  => $ibforums->input['st'],
+											'L_SINGLE'    => "",
+											'BASE_URL'    => $this->base_url."showtopic=".$this->topic['tid'].$hl,
+										  )
+								   );
+								   
+		if ( ($this->topic['posts'] + 1) > $ibforums->vars['display_max_posts'])
+		{
+			$this->topic['go_new'] = $this->html->golastpost_link($this->forum['id'], $this->topic['tid'] );
+		}
+								   
+		
+		//-----------------------------------------
+		// Fix up some of the words
+		//-----------------------------------------
+		
+		$this->topic['TOPIC_START_DATE'] = $std->get_date( $this->topic['start_date'], 'LONG' );
+		
+		$ibforums->lang['topic_stats'] = preg_replace( "/<#START#>/", $this->topic['TOPIC_START_DATE'], $ibforums->lang['topic_stats']);
+		$ibforums->lang['topic_stats'] = preg_replace( "/<#POSTS#>/", $this->topic['posts']           , $ibforums->lang['topic_stats']);
+		
+		if ($this->topic['description'])
+		{
+			$this->topic['description'] = ', '.$this->topic['description'];
+		}
+		
+		//-----------------------------------------
+		// Multi Quoting?
+		//-----------------------------------------
+		
+		$this->qpids = $std->my_getcookie('mqtids');
+		
+		//-----------------------------------------
+		// Multi PIDS?
+		//-----------------------------------------
+		
+		$ibforums->input['selectedpids'] = $std->my_getcookie('modpids');
+		
+		$ibforums->input['selectedpidcount'] = intval( count( preg_split( "/,/", $ibforums->input['selectedpids'], -1, PREG_SPLIT_NO_EMPTY ) ) );
+		
+		$std->my_setcookie('modpids', '', 0);
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/upload/sources/usercp.php b/upload/sources/usercp.php
new file mode 100644
index 00000000..0aaf9930
--- /dev/null
+++ b/upload/sources/usercp.php
@@ -0,0 +1,3056 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   =============================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services, Inc.
+|   http://www.invisionpower.com
+|   =============================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > UserCP functions
+|   > Module written by Matt Mecham
+|   > Date started: 14th February 2002
+|
+|	> Module Version Number: 1.0.0
+|   > DBA Checked: Thu 20 May 2004
+|   > Quality Checked: Wed 15 Sept. 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class usercp
+{
+    var $output     = "";
+    var $page_title = "";
+    var $nav        = array();
+    var $html       = "";
+
+    var $member     = array();
+    var $m_group    = array();
+    
+    var $jump_html  = "";
+    var $parser     = "";
+    
+    var $links      = array();
+    
+    var $bio        = "";
+    var $notes      = "";
+    var $size       = "m";
+    
+    var $email      = "";
+    var $md5_check  = "";
+    
+    var $modules    = "";
+    
+    var $lib;
+    
+    /*-------------------------------------------------------------------------*/
+    // Run!
+    /*-------------------------------------------------------------------------*/
+    
+    function auto_run()
+    {
+		global $ibforums, $DB, $std, $print;
+    	
+    	//-----------------------------------------
+    	// Load parser
+    	//-----------------------------------------
+    	
+    	require ROOT_PATH."sources/lib/usercp_functions.php";
+    	
+    	require ROOT_PATH."sources/lib/post_parser.php";
+        
+        $this->parser = new post_parser();
+        
+        //-----------------------------------------
+        // Prep form check
+        //-----------------------------------------
+        
+        $this->md5_check = $std->return_md5_check();
+        
+        //-----------------------------------------
+    	// Get the emailer module
+		//-----------------------------------------
+		
+		require ROOT_PATH."sources/classes/class_email.php";
+		
+		$this->email = new emailer();
+		
+		//-----------------------------------------
+    	// Get the sync module
+		//-----------------------------------------
+		
+		if ( USE_MODULES == 1 )
+		{
+			require ROOT_PATH."modules/ipb_member_sync.php";
+			
+			$this->modules = new ipb_member_sync();
+		}
+        
+    	//-----------------------------------------
+    	// Require the HTML and language modules
+    	//-----------------------------------------
+    	
+    	$ibforums->lang = $std->load_words($ibforums->lang, 'lang_post'  , $ibforums->lang_id );
+		$ibforums->lang = $std->load_words($ibforums->lang, 'lang_ucp'   , $ibforums->lang_id );
+		
+    	$this->html = $std->load_template('skin_ucp');
+    	
+    	$ibforums->base_url_nosess = "{$ibforums->vars['board_url']}/index.{$ibforums->vars['php_ext']}";
+    	
+    	//-----------------------------------------
+    	// Check viewing permissions, etc
+		//-----------------------------------------
+		
+		if ( ! $ibforums->member['id'] )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
+		}
+		
+    	//-----------------------------------------
+		// Get all member info..
+    	//-----------------------------------------
+    	
+    	$DB->cache_add_query( 'generic_get_all_member', array( 'mid' => $ibforums->member['id'] ) );
+		$DB->cache_exec_query();
+    			   
+    	if ( ! $member = $DB->fetch_row() )
+    	{
+    		$DB->do_insert( 'member_extra', array( 'id' => $ibforums->member['id'] ) );
+    	}
+    	else
+    	{
+    		$ibforums->member = array_merge( $member, $ibforums->member );
+    	}
+    	
+		$this->links = $ibforums->member['links'];
+		$this->notes = $ibforums->member['notes'];
+		$this->size  = $ibforums->member['ta_size'] ? $ibforums->member['ta_size'] : $this->size;
+		
+		//-----------------------------------------
+    	// Print the top button menu
+    	//-----------------------------------------
+    	
+    	$menu_html = $this->html->Menu_bar($ibforums->base_url);
+    	
+    	//-----------------------------------------
+    	// If no messenger, remove the links!
+    	//-----------------------------------------
+    	
+    	if ( $ibforums->member['g_use_pm'])
+        {
+        	//-----------------------------------------
+    		// Print folder links
+    		//-----------------------------------------
+    		
+    		$folder_links = "";
+    		
+			if (empty($ibforums->member['vdirs']))
+			{
+				$ibforums->member['vdirs'] = "in:Inbox|sent:Sent Items";
+			}
+			
+			foreach( explode( "|", $ibforums->member['vdirs'] ) as $dir )
+			{
+				list ($id  , $data)  = explode( ":", $dir );
+				list ($real, $count) = explode( ";", $data );
+				
+				if ( ! $id )
+				{
+					continue;
+				}
+				
+				if ( $count )
+				{
+					$real .= " ({$count})";
+				}
+				
+				$folder_links .= $this->html->menu_bar_msg_folder_link($id, $real);
+			}
+			
+			if ( $folder_links != "" )
+			{
+				$menu_html = str_replace( "<!--IBF.FOLDER_LINKS-->", $folder_links, $menu_html );
+			}
+        }
+		
+		//-----------------------------------------
+    	// Using Sub Manager?
+    	//-----------------------------------------
+    	
+		if ( @is_dir( ROOT_PATH.'/modules/subsmanager' ) )
+		{
+			$url  = $ibforums->base_url."act=module&amp;module=subscription&amp;CODE=index";
+			$name = $ibforums->lang['new_sub_link'];
+			
+			$menu_html = str_replace( "<!--IBF.OPTION_LINKS-->", $this->html->menu_bar_new_link( $url, $name ), $menu_html );
+		}
+		
+    	$print->add_output( $menu_html );
+    	
+    	$this->lib    = new usercp_functions(&$this);
+    	
+    	//-----------------------------------------
+    	// What to do?
+    	//-----------------------------------------
+    	
+    	switch($ibforums->input['CODE'])
+    	{
+    		case '00':
+    			$this->splash();
+    			break;
+    		case '01':
+    			$this->personal();
+    			break;
+    		//-----------------------------------------
+    		case '02':
+    			$this->email_settings();
+    			break;
+    		case '03':
+    			$this->lib->do_email_settings();
+    			break;
+    		//-----------------------------------------
+    		case '04':
+    			$this->board_prefs();
+    			break;
+    		case '05':
+    			$this->lib->do_board_prefs();
+    			break;
+    		//-----------------------------------------
+    		case '08':
+    			$this->email_change();
+    			break;
+    		case '09':
+    			$this->do_email_change();
+    			break;
+    		//-----------------------------------------
+    		case '21':
+    			$this->lib->do_profile();
+    			break;
+    		case '20':
+    			$this->update_notepad();
+    			break;
+    		//-----------------------------------------
+    		case '22':
+    			$this->signature();
+    			break;
+    		case '23':
+    			$this->lib->do_signature();
+    			break;
+    		//-----------------------------------------
+    		case '24':
+    			$this->avatar();
+    			break;
+    		case '25':
+    			$this->lib->do_avatar();
+    			break;
+    		//-----------------------------------------
+    		case '26':
+    			$this->tracker();
+    			break;
+    		case '27':
+    			$this->do_update_tracker();
+    			break;
+    		//-----------------------------------------
+    		case '28':
+    			$this->pass_change();
+    			break;
+    		case '29':
+    			$this->do_pass_change();
+    			break;
+    		//-----------------------------------------
+    		case '50':
+    			$this->forum_tracker();
+    			break;
+    		case '51':
+    			$this->remove_forum_tracker();
+    			break;
+    		//-----------------------------------------
+    		case 'ignore':
+    			$this->ignore_user_splash();
+    			break;
+    		case 'ignoreadd':
+    			$this->lib->ignore_user_add();
+    			break;
+    		case 'ignoreremove':
+    			$this->lib->ignore_user_remove();
+    			break;
+    		//-----------------------------------------
+    		case 'show_image':
+    			$this->show_image();
+    			break;
+    		case 'photo':
+    			$this->photo();
+    			break;
+    		case 'dophoto':
+    			$this->lib->do_photo();
+    			break;
+    		case 'getgallery':
+    			$this->avatar_gallery();
+    			break;
+    		case 'setinternalavatar':
+    			$this->lib->set_internal_avatar();
+    			break;
+    		case 'attach':
+    			$this->attachments();
+    			break;
+    		//-----------------------------------------
+    		// Mod tools
+    		//-----------------------------------------
+    		case 'iptool':
+    			$this->mod_ip_tool_start();
+    			break;
+    		case 'doiptool':
+    			$this->mod_ip_tool_complete();
+    			break;
+    		case 'memtool':
+    			$this->mod_find_user_start();
+    			break;
+    		case 'domemtool':
+    			$this->mod_find_user_complete();
+    			break;
+    		case 'announce_start':
+    			$this->mod_announce_start();
+    			break;
+    		case 'announce_add':
+    			$this->mod_announce_form('add');
+    			break;
+    		case 'announce_save':
+    			$this->mod_announce_save();
+    			break;
+    		case 'announce_edit':
+    			$this->mod_announce_form('edit');
+    			break;
+    		case 'announce_delete':
+    			$this->mod_announce_delete();
+    			break;
+    		//-----------------------------------------
+    		// Subs
+    		//-----------------------------------------
+    		case 'start_subs':
+    			$this->lib->subs_choose();
+    			break;
+    		case 'end_subs':
+    			$this->lib->subs_choose('save');
+    			break;
+    		default:
+    			$this->splash();
+    			break;
+    	}
+    	
+    	//-----------------------------------------
+    	// If we have any HTML to print, do so...
+    	//-----------------------------------------
+    	
+    	$fj = $std->build_forum_jump();
+		$fj = preg_replace( "!#Forum Jump#!", $ibforums->lang['forum_jump'], $fj);
+		
+		$this->output .= $this->html->CP_end();
+		
+		$this->output .= $this->html->forum_jump($fj, $links);
+    	
+    	$print->add_output("$this->output");
+        $print->do_output( array( 'TITLE' => $this->page_title, 'JS' => 1, NAV => $this->nav ) );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// ANNOUNCEMENTS: DELETE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_announce_delete()
+	{
+		global $std, $ibforums, $DB, $forums;
+		
+		if ( ! $ibforums->member['g_is_supmod'] )
+		{
+			$this->output .= $this->html->dead_section();
+ 			return;
+		}
+		
+		$id = intval( $ibforums->input['id'] );
+		
+		if ( $id )
+		{
+			$DB->simple_exec_query( array( 'delete' => 'announcements', 'where' => 'announce_id='.$ibforums->input['id'] ) );
+		}
+		
+		//-----------------------------------------
+		// Update cache
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/announcements.php' );
+		$announcements = new announcements();
+		$announcements->announce_recache();
+		
+		$this->mod_announce_start();
+	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// ANNOUNCEMENTS: SAVE (new/edit)
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_announce_save()
+	{
+		global $std, $ibforums, $DB, $forums;
+		
+		$type = $ibforums->input['type'];
+		$forums_to_save = "";
+		
+		if ( ! $ibforums->member['g_is_supmod'] )
+		{
+			$this->output .= $this->html->dead_section();
+ 			return;
+		}
+		
+		//-----------------------------------------
+		// check...
+		//-----------------------------------------
+		
+		if ( ! $ibforums->input['announce_title'] or ! $ibforums->input['announce_post'] )
+		{
+			$this->mod_announce_form( $type, $ibforums->lang['announce_error_title'] );
+			return;
+		}
+		
+		//-----------------------------------------
+		// Get forums to add announce in
+		//-----------------------------------------
+		
+		if ( is_array( $_POST['announce_forum'] ) and count( $_POST['announce_forum'] ) )
+		{
+			if ( in_array( '*', $_POST['announce_forum'] ) )
+			{
+				$forums_to_save = '*';
+			}
+			else
+			{
+				$forums_to_save = implode( ",", $_POST['announce_forum'] );
+			}
+		}
+		
+		if ( ! $forums_to_save )
+		{
+			$this->mod_announce_form( $type, $ibforums->lang['announce_error_forums'] );
+			return;
+		}
+		
+		//-----------------------------------------
+		// check dates
+		//-----------------------------------------
+		
+		$start_date = 0;
+		$end_date   = 0;
+		
+		if ( strstr( $ibforums->input['announce_start'], '-' ) )
+		{
+			$start_array = explode( '-', $ibforums->input['announce_start'] );
+			
+			if ( $start_array[0] and $start_array[1] and $start_array[2] )
+			{
+				if ( ! checkdate( $start_array[0], $start_array[1], $start_array[2] ) )
+				{
+					$this->mod_announce_form( $type, $ibforums->lang['announce_error_date'] );
+					return;
+				}
+			}
+			
+			$start_date = $std->date_gmmktime( 0, 0, 1, $start_array[0], $start_array[1], $start_array[2] );
+		}
+		
+		if ( strstr( $ibforums->input['announce_end'], '-' ) )
+		{
+			$end_array = explode( '-', $ibforums->input['announce_end']  );
+			
+			if ( $end_array[0] and $end_array[1] and $end_array[2] )
+			{
+				if ( ! checkdate( $end_array[0], $end_array[1], $end_array[2] ) )
+				{
+					$this->mod_announce_form( $type, $ibforums->lang['announce_error_date'] );
+					return;
+				}
+			}
+			
+			$end_date = $std->date_gmmktime( 23, 59, 59, $end_array[0], $end_array[1], $end_array[2] );
+		}
+		
+		//-----------------------------------------
+		// Build save array
+		//-----------------------------------------
+		
+		$save_array = array( 'announce_title'        => $ibforums->input['announce_title'],
+							 'announce_post'         => $ibforums->input['announce_post'],
+							 'announce_active'       => $ibforums->input['announce_active'],
+							 'announce_forum'        => $forums_to_save,
+							 'announce_html_enabled' => $ibforums->input['announce_html_enabled'],
+							 'announce_start'        => $start_date,
+							 'announce_end'          => $end_date
+						   );
+						   
+		//-----------------------------------------
+		// Save..
+		//-----------------------------------------
+		
+		if ( $type == 'add' )
+		{
+			$save_array['announce_member_id'] = $ibforums->member['id'];
+			
+			$DB->do_insert( 'announcements', $save_array );
+		}
+		else
+		{
+			if ( $ibforums->input['id'] )
+			{
+				$DB->do_update( 'announcements', $save_array, 'announce_id='.intval($ibforums->input['id']) );
+			}
+		}
+		
+		//-----------------------------------------
+		// Update cache
+		//-----------------------------------------
+		
+		require_once( ROOT_PATH.'sources/announcements.php' );
+		$announcements = new announcements();
+		$announcements->announce_recache();
+		
+		$this->mod_announce_start();
+		return;
+	}
+	
+ 	/*-------------------------------------------------------------------------*/
+ 	// ANNOUNCEMENTS: FORM (new/edit)
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_announce_form($type='add', $msg="")
+	{
+		global $std, $ibforums, $DB, $forums;
+		
+		if ( ! $ibforums->member['g_is_supmod'] )
+		{
+			$this->output .= $this->html->dead_section();
+ 			return;
+		}
+		
+		//-----------------------------------------
+		// Set up
+		//-----------------------------------------
+		
+		if ( $type == 'add' )
+		{
+			$button   = $ibforums->lang['announce_button_add'];
+			$announce = array( 'announce_active' => 1 );
+		
+		}
+		else
+		{
+			$ibforums->input['id'] = intval($ibforums->input['id']);
+			$button                = $ibforums->lang['announce_button_edit'];
+			$announce              = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'announcements', 'where' => 'announce_id='.$ibforums->input['id'] ) );
+			$announce['announce_forum'] = explode( ",", $announce['announce_forum'] );
+			$announce['announce_start'] = $announce['announce_start'] ? gmdate( 'm-d-Y', $announce['announce_start'] ) : '';
+			$announce['announce_end']   = $announce['announce_end']   ? gmdate( 'm-d-Y', $announce['announce_end'] ) : '';
+		}
+		
+		//-----------------------------------------
+		// Do we have _POST?
+		//-----------------------------------------
+		
+		foreach( array( 'announce_title', 'announce_post', 'announce_start', 'announce_end', 'announce_forum', 'announce_active' ) as $bit )
+		{
+			if ( $_POST[$bit] )
+			{
+				$announce[$bit] = $_POST[$bit];
+			}
+		}
+		
+		//-----------------------------------------
+		// Forums
+		//-----------------------------------------
+		
+		$forum_html = "<option value='*'>{$ibforums->lang['announce_form_allforums']}</option>" . $forums->forums_forum_jump();
+		
+		//-----------------------------------------
+		// Save forums?
+		//-----------------------------------------
+		
+		if ( is_array( $announce['announce_forum'] ) and count( $announce['announce_forum'] ) )
+		{
+			foreach( $announce['announce_forum'] as $f )
+			{
+				$forum_html = preg_replace( "#option\s+value=[\"'](".preg_quote($f,'#').")[\"']#i", "option value='\\1' selected='selected'", $forum_html );
+			}
+		}
+		
+		if ( $announce['announce_active'] )
+		{
+			$announce['announce_active_checked'] = 'checked="checked"';
+		}
+		
+		if ( $announce['announce_html_enabled'] )
+		{
+			$announce['announce_html_enabled'] = 'checked="checked"';
+		}
+		
+		$announce['announce_post'] = $std->my_br2nl( $announce['announce_post'] );
+		
+		$this->output .= $this->html->ucp_announce_form($announce, $button, $forum_html, $type, $msg);
+		
+		$this->page_title = $ibforums->lang['menu_announcements'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		$this->nav[]      = $ibforums->lang['menu_announcements'];
+	}
+	
+ 	/*-------------------------------------------------------------------------*/
+ 	// ANNOUNCEMENTS: START (Show current)
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_announce_start()
+	{
+		global $std, $ibforums, $DB, $forums;
+		
+		if ( ! $ibforums->member['g_is_supmod'] )
+		{
+			$this->output .= $this->html->dead_section();
+ 			return;
+		}
+		
+		//-----------------------------------------
+		// Get announcements
+		//-----------------------------------------
+		
+		$DB->cache_add_query( 'ucp_get_all_announcements', array() );
+		$DB->cache_exec_query();
+		
+		$content = "";
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			if ( $r['announce_start'] )
+			{
+				$r['announce_starts_converted'] = gmdate( 'M-d-Y', $r['announce_start'] );
+			}
+			else
+			{
+				$r['announce_starts_converted'] = '-';
+			}
+			
+			if ( $r['announce_end'] )
+			{
+				$r['announce_end_converted'] = gmdate( 'M-d-Y', $r['announce_end'] );
+			}
+			else
+			{
+				$r['announce_end_converted'] = '-';
+			}
+			
+			if ( $r['announce_forum'] == '*' )
+			{
+				$r['announce_forum_show'] = $ibforums->lang['announce_page_allforums'];
+			}
+			else
+			{
+				$tmp_forums = explode(",",$r['announce_forum']);
+				
+				if ( is_array( $tmp_forums ) and count($tmp_forums) )
+				{
+					if ( count($tmp_forums) > 5 )
+					{
+						$r['announce_forum_show'] = count($tmp_forums).' '.$ibforums->lang['announce_page_numforums'];
+					}
+					else
+					{
+						$tmp2 = array();
+						
+						foreach( $tmp_forums as $id )
+						{
+							$tmp2[] = "<a href='{$ibforums->base_url}showforum={$id}'>{$forums->forum_by_id[ $id ]['name']}</a>";
+						}
+						
+						$r['announce_forum_show'] = implode( "<br />", $tmp2 );
+					}
+				}	
+			}
+			
+			if ( ! $r['announce_active'] )
+			{
+				$r['announce_inactive'] = "<span class='desc'>{$ibforums->lang['announce_page_disabled']}</span>";
+			}
+			
+			$content .= $this->html->ucp_announce_manage_row( $r );
+		}
+		
+		$this->output .= $this->html->ucp_announce_manage($content);
+		
+		$this->page_title = $ibforums->lang['menu_announcements'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		$this->nav[]      = $ibforums->lang['menu_announcements'];
+	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// MEMBER TOOL: START
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_find_user_start($msg="")
+	{
+		global $std, $ibforums, $DB;
+		
+		if ( ! $ibforums->member['g_is_supmod'] )
+		{
+			$this->output .= $this->html->dead_section();
+ 			return;
+		}
+		
+		$this->output .= $this->html->mod_find_user($msg);
+	}
+	
+	/*-------------------------------------------------------------------------*/
+ 	// MEMBER TOOL: COMPLETE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+	function mod_find_user_complete()
+	{
+		global $std, $ibforums, $DB, $print;
+		
+		$ibforums->input['name'] = trim(strtolower($ibforums->input['name']));
+		
+		if ( $ibforums->input['name'] == "" )
+		{
+			$this->mod_find_user_start($ibforums->lang['cp_no_matches']);
+			return;
+		}
+		
+		//-----------------------------------------
+		// Query the DB for possible matches
+		//-----------------------------------------
+		
+		$this->start_val = intval($ibforums->input['st'] );
+		
+		$sql = "lower(name) LIKE '{$ibforums->input['name']}%'";
+		
+		$DB->simple_construct( array( 'select' => 'count(id) as max', 'from' => 'members', 'where' => $sql ) );
+		$DB->simple_exec();
+		
+		$total_possible = $DB->fetch_row();
+		
+		if ($total_possible['max'] < 1)
+		{
+			$this->mod_find_user_start( $ibforums->lang['cp_no_matches'] );
+			return;
+		}
+		
+		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_possible['max'],
+											   'PER_PAGE'    => 20,
+											   'CUR_ST_VAL'  => $this->start_val,
+											   'L_SINGLE'    => $ibforums->lang['single_page_forum'],
+											   'L_MULTI'     => $ibforums->lang['multi_page_forum'],
+											   'BASE_URL'    => $ibforums->base_url."act=usercp&CODE=domemtool&name={$ibforums->input['name']}",
+											 )
+									  );
+									  
+		$content = "";
+		
+		$DB->simple_construct( array( 'select' => 'name, id, ip_address, posts, joined, mgroup',
+									  'from'   => 'members',
+									  'where'  => $sql,
+									  'order'  => "joined DESC",
+									  'limit'  => array( $this->start_val,20 ) ) );
+		$DB->simple_exec();
+		
+		while( $row = $DB->fetch_row() )
+		{
+			$row['joined']    = $std->get_date( $row['joined'], 'JOINED' );
+			$row['groupname'] = $ibforums->cache['group_cache'][ $row['mgroup'] ]['prefix']
+							  . $ibforums->cache['group_cache'][ $row['mgroup'] ]['g_title']
+							  . $ibforums->cache['group_cache'][ $row['mgroup'] ]['suffix'];
+							  
+			if ( ($ibforums->member['mgroup'] != $ibforums->vars['admin_group']) and ($row['mgroup'] == $ibforums->vars['admin_group']) )
+			{
+				$row['ip_address'] = '--';
+			}
+			
+			$content .= $this->html->mod_ip_member_row( $row, $std->return_md5_check() );
+		}
+		
+		$this->mod_find_user_start( $this->html->mod_ip_member_results($pages, $content) );
+	}
+	
+ 	/*-------------------------------------------------------------------------*/
+ 	// IP TOOL: Start
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_ip_tool_start($msg="")
+ 	{
+		global $ibforums, $DB, $std, $forums;
+ 		
+ 		if ( ! $ibforums->member['g_is_supmod'] )
+ 		{
+ 			$this->splash();
+ 		}
+ 		
+ 		$this->output .= $this->html->mod_ip_start_form($ibforums->input['ip'], $msg);
+ 		
+ 		$this->page_title = $ibforums->lang['menu_ipsearch'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		$this->nav[]      = $ibforums->lang['menu_ipsearch'];
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// IP TOOL: Complete
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function mod_ip_tool_complete()
+ 	{
+		global $ibforums, $DB, $std, $forums;
+ 		
+ 		//-----------------------------------------
+		// Remove trailing periods
+		//-----------------------------------------
+		
+		$exact_match     = 1;
+		$final_ip_string = trim( $ibforums->input['ip'] );
+		$this->start_val = intval($ibforums->input['st'] );
+		
+		if ( strstr( $final_ip_string, '*' ) )
+		{
+			$exact_match = 0;
+			
+			$final_ip_string = preg_replace( "/^(.+?)\*(.+?)?$/", "\\1", $final_ip_string ).'%';
+		}
+		
+		//-----------------------------------------
+		// H'okay, what have we been asked to do?
+		// (that's a metaphorical "we" in a rhetorical question)
+		//-----------------------------------------
+		
+		if ($ibforums->input['iptool'] == 'resolve')
+		{
+			$resolved = @gethostbyaddr($final_ip_string);
+			
+			if ($resolved == "")
+			{
+				$this->mod_ip_tool_start( $ibforums->lang['cp_safe_fail'] );
+				return;
+			}
+			else
+			{
+				$this->mod_ip_tool_start( sprintf($ibforums->lang['ip_resolve_result'], $final_ip_string, $resolved) );
+			}
+		}
+		else if ($ibforums->input['iptool'] == 'members')
+		{
+			if ($exact_match == 0)
+			{
+				$sql = "ip_address LIKE '$final_ip_string'";
+			}
+			else
+			{
+				$sql = "ip_address='$final_ip_string'";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'count(id) as max', 'from' => 'members', 'where' => $sql ) );
+			$DB->simple_exec();
+			
+			$total_possible = $DB->fetch_row();
+			
+			if ($total_possible['max'] < 1)
+			{
+				$this->mod_ip_tool_start( $ibforums->lang['cp_no_matches'] );
+				return;
+			}
+			
+			$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $total_possible['max'],
+												   'PER_PAGE'    => 20,
+												   'CUR_ST_VAL'  => $this->start_val,
+												   'L_SINGLE'    => $ibforums->lang['single_page_forum'],
+												   'L_MULTI'     => $ibforums->lang['multi_page_forum'],
+												   'BASE_URL'    => $ibforums->base_url."act=usercp&CODE=doiptool&iptool=members&ip={$ibforums->input['ip']}",
+												 )
+										  );
+										  
+			$content = "";
+			
+			if ( $ibforums->member['mgroup'] != $ibforums->vars['admin_group'] )
+			{
+				$sql .= "AND mgroup != {$ibforums->vars['admin_group']}";
+			}
+			
+			$DB->simple_construct( array( 'select' => 'name, id, ip_address, posts, joined, mgroup',
+										  'from'   => 'members',
+										  'where'  => $sql,
+										  'order'  => "joined DESC",
+										  'limit'  => array( $this->start_val,20 ) ) );
+			$DB->simple_exec();
+		
+			while( $row = $DB->fetch_row() )
+			{
+				$row['joined']    = $std->get_date( $row['joined'], 'JOINED' );
+				$row['groupname'] = $ibforums->cache['group_cache'][ $row['mgroup'] ]['prefix']
+								  . $ibforums->cache['group_cache'][ $row['mgroup'] ]['g_title']
+								  . $ibforums->cache['group_cache'][ $row['mgroup'] ]['suffix'];
+				$content .= $this->html->mod_ip_member_row( $row, $std->return_md5_check() );
+			}
+			
+			$this->mod_ip_tool_start( $this->html->mod_ip_member_results($pages, $content) );
+		}
+		else
+		{
+			// Find posts then!
+			
+			if ($exact_match == 0)
+			{
+				$sql = "ip_address LIKE '$final_ip_string'";
+			}
+			else
+			{
+				$sql = "ip_address='$final_ip_string'";
+			}
+			
+			// Get forums we're allowed to view
+			
+			$aforum = array();
+			
+			foreach( $forums->forum_by_id as $id => $data )
+			{
+				if ( $std->check_perms($data['read_perms']) == TRUE )
+				{
+					$aforum[] = $data['id'];
+				}
+			}
+			
+			if ( count($aforum) < 1)
+			{
+				$this->mod_ip_tool_start( $ibforums->lang['cp_no_matches'] );
+				return;
+			}
+			
+			$the_forums = implode( ",", $aforum);
+			
+			$DB->cache_add_query( 'ucp_mod_ip_tool_one', array( 'the_forums' => $the_forums, 'sql' => $sql ) );
+			$DB->cache_exec_query();
+			
+			$max_hits = $DB->get_num_rows();
+		
+			$posts  = "";
+			
+			while ($row = $DB->fetch_row() )
+			{
+				$posts .= $row['pid'].",";
+			}
+			
+			$posts  = preg_replace( "/,$/", "", $posts );
+			
+			//-----------------------------------------
+			// Do we have any results?
+			//-----------------------------------------
+			
+			if ($posts == "")
+			{
+				$this->mod_ip_tool_start( $ibforums->lang['cp_no_matches'] );
+				return;
+			}
+			
+			//-----------------------------------------
+			// If we are still here, store the data into the database...
+			//-----------------------------------------
+			
+			$unique_id = md5(uniqid(microtime(),1));
+			
+			$DB->do_insert( 'search_results', array (
+													  'id'         => $unique_id,
+													  'search_date'=> time(),
+													  'post_id'    => $posts,
+													  'post_max'   => $max_hits,
+													  'sort_key'   => 'p.post_date',
+													  'sort_order' => 'desc',
+													  'member_id'  => $ibforums->member['id'],
+													  'ip_address' => $ibforums->input['IP_ADDRESS'],
+											 )        );
+			
+			$this->mod_ip_tool_start( $this->html->mod_ip_post_results($unique_id, $max_hits) );
+				
+			return TRUE;
+		}
+	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Attachments
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function attachments()
+ 	{
+		global $ibforums, $DB, $std, $forums;
+ 		
+ 		$info     = array();
+ 		$start    = intval($ibforums->input['st']);
+ 		$perpage  = 15;
+ 		
+ 		$sort_key = "";
+ 		
+ 		switch ($ibforums->input['sort'])
+ 		{
+ 			case 'date':
+ 				$sort_key = 'a.attach_date ASC';
+ 				$info['date_order'] = 'rdate';
+ 				$info['size_order'] = 'size';
+ 				break;
+ 			case 'rdate':
+ 				$sort_key = 'a.attach_date DESC';
+ 				$info['date_order'] = 'date';
+ 				$info['size_order'] = 'size';
+ 				break;
+ 			case 'size':
+ 				$sort_key = 'a.attach_filesize DESC';
+ 				$info['date_order'] = 'date';
+ 				$info['size_order'] = 'rsize';
+ 				break;
+ 			case 'rsize':
+ 				$sort_key = 'a.attach_filesize ASC';
+ 				$info['date_order'] = 'date';
+ 				$info['size_order'] = 'size';
+ 				break;
+ 			default:
+ 				$sort_key = 'a.attach_date DESC';
+ 				$info['date_order'] = 'date';
+ 				$info['size_order'] = 'size';
+ 				break;
+ 		}
+ 		
+ 		$this->page_title = $ibforums->lang['m_attach'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 		//-----------------------------------------
+ 		// Get the ID's to delete
+ 		//-----------------------------------------
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^attach_(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$affected_ids = count($ids);
+ 		
+ 		if ( $affected_ids > 0 )
+ 		{
+ 			$DB->cache_add_query( 'usercp_get_to_delete', array( 'mid' => $ibforums->member['id'], 'aid_array' => $ids ) );
+    	
+    		$o = $DB->cache_exec_query();
+ 			
+			while ( $killmeh = $DB->fetch_row( $o ) )
+			{
+				if ( $killmeh['attach_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_location'] );
+				}
+				if ( $killmeh['attach_thumb_location'] )
+				{
+					@unlink( $ibforums->vars['upload_dir']."/".$killmeh['attach_thumb_location'] );
+				}
+				
+				if ( $killmeh['topic_id'] )
+				{
+					$DB->simple_construct( array( 'update' => 'topics', 'set' => 'topic_hasattach=topic_hasattach-1', 'where' => 'tid='.$killmeh['topic_id'] ) );
+					$DB->simple_shutdown_exec();
+				}
+			}
+			
+			$DB->simple_exec_query( array( 'delete' => 'attachments', 'where' => 'attach_id IN ('.implode(",",$ids).') and attach_member_id='.$ibforums->member['id'] ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Get some stats...
+ 		//-----------------------------------------
+ 		
+ 		$maxspace = intval($ibforums->member['g_attach_max']);
+ 		
+ 		if ( $ibforums->member['g_attach_max'] == -1 )
+ 		{
+ 			$std->Error( array( 'MSG' => 'no_permission', 'LEVEL' => 1 ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Limit by forums
+ 		//-----------------------------------------
+ 		
+ 		$stats = $DB->simple_exec_query( array( 'select' => 'count(*) as count, sum(attach_filesize) as sum',
+ 												'from'   => 'attachments',
+ 												'where'  => 'attach_member_id='.$ibforums->member['id'] ) );
+ 		
+ 		if ( $maxspace > 0 )
+ 		{
+			//-----------------------------------------
+			// Figure out percentage used
+			//-----------------------------------------
+			
+			$info['has_limit']    = 1;
+			$info['full_percent'] = $stats['sum'] ? sprintf( "%.0f", ( ( $stats['sum'] / ($maxspace * 1024) ) * 100) ) : 0;
+			
+			if ( $info['full_percent'] > 100 )
+			{
+				$info['full_percent'] = 100;
+			}
+			
+			$info['img_width']    = $info['full_percent'] > 0 ? intval($info['full_percent']) * 2.4 : 1;
+			
+			if ($info['img_width'] > 235)
+			{
+				$info['img_width'] = 235;
+			}
+			
+			$ibforums->lang['attach_space_count'] = sprintf( $ibforums->lang['attach_space_count'], $stats['count'], $info['full_percent'] );
+			$ibforums->lang['attach_space_used']  = sprintf( $ibforums->lang['attach_space_used'] , $std->size_format(intval($stats['sum'])), $std->size_format($maxspace * 1024) );
+ 		}
+ 		else
+ 		{
+ 			$info['has_limit'] = 0;
+ 			$ibforums->lang['attach_space_used']  = sprintf( $ibforums->lang['attach_space_unl'] , $std->size_format(intval($stats['sum'])) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Pages
+ 		//-----------------------------------------
+ 		
+ 		$pages = $std->build_pagelinks( array( 'TOTAL_POSS'  => $stats['count'],
+											   'PER_PAGE'    => $perpage,
+											   'CUR_ST_VAL'  => $start,
+											   'L_SINGLE'    => "",
+											   'L_MULTI'     => $ibforums->lang['msg_pages'],
+											   'BASE_URL'    => $ibforums->base_url."act=usercp&amp;CODE=attach&amp;sort={$ibforums->input['sort']}",
+									  )      );
+									  
+ 		//-----------------------------------------
+ 		// Get attachments...
+ 		//-----------------------------------------
+ 		
+ 		$DB->cache_add_query( 'usercp_get_attachments', array( 'mid' => $ibforums->member['id'], 'order' => $sort_key, 'limit_a' => $start, 'limit_b' => $perpage ) );
+    	
+    	$DB->cache_exec_query();
+    	
+    	$temp_html = "";
+    	
+		$ibforums->lang = $std->load_words($ibforums->lang,'lang_topic', $ibforums->lang_id );
+		
+		while ( $row = $DB->fetch_row() )
+		{
+			if ( $std->check_perms($forums->forum_by_id[ $row['forum_id'] ]['read_perms']) != TRUE )
+			{
+				$row['title'] = $ibforums->lang['attach_topicmoved'];
+			}
+			
+			//-----------------------------------------
+			// Full attachment thingy
+			//-----------------------------------------
+			
+			if ( $row['attach_pid'] )
+			{
+				$row['_type'] = 'post';
+			}
+			else
+			{
+				$row['_type'] = 'msg';
+				$row['title'] = $ibforums->lang['attach_inpm'];
+			}
+			
+			$row['image']       = $ibforums->cache['attachtypes'][ $row['attach_ext'] ]['atype_img'];
+			
+			$row['short_name']  = $std->txt_truncate( $row['attach_file'], 30 );
+															  
+			$row['attach_date'] = $std->get_date( $row['attach_date'], 'SHORT' );
+			
+			$row['real_size']   = $std->size_format( $row['attach_filesize'] );
+			
+			$temp_html .= $this->html->attachments_row( $row );
+		}
+    	
+    	$this->output .= $this->html->attachments_top($info, $pages, $temp_html);
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Ignore user.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function ignore_user_splash($msg="")
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 		$final_users = array();
+ 		$temp_users  = array();
+ 		
+ 		//-----------------------------------------
+ 		// Do we have a MESSAGE FRROM GAWD???!@
+ 		//-----------------------------------------
+ 		
+ 		if ( $msg )
+ 		{
+ 			$this->output .= $this->html->ucp_message( $ibforums->lang['mi5_error'], $msg );
+ 		}	
+ 		
+ 		//-----------------------------------------
+ 		// Do we have incoming?
+ 		//-----------------------------------------
+ 		
+ 		if ( intval($ibforums->input['uid']) )
+ 		{
+ 			$DB->simple_construct( array( 'select' => 'id, name', 'from' => 'members', 'where' => "id=".intval($ibforums->input['uid']) ) );
+			$DB->simple_exec();
+ 			
+ 			$newmem = $DB->fetch_row();
+ 			
+ 			$ibforums->input['newbox_1'] = $newmem['name'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Stored as userid,userid,userid
+ 		//-----------------------------------------
+ 		
+ 		$ignored_users = explode( ',', $ibforums->member['ignored_users'] );
+ 		
+ 		//-----------------------------------------
+ 		// Get members and check to see if they've
+ 		// since been moved into a group that cannot
+ 		// be ignored
+ 		//-----------------------------------------
+ 		
+ 		foreach( $ignored_users as $id )
+ 		{
+ 			if ( intval($id) )
+ 			{
+ 				$temp_users[] = $id;
+ 			}
+ 		}
+ 		
+ 		if ( count($temp_users) )
+ 		{
+ 			$DB->simple_construct( array( 'select' => 'id, name, mgroup, posts',
+										  'from'   => 'members',
+										  'where'  => "id IN (".implode(",",$temp_users).")"
+								 )      );
+								 
+			$DB->simple_exec();
+		
+ 			while ( $m = $DB->fetch_row() )
+ 			{
+ 				$m['g_title'] = $ibforums->cache['group_cache'][ $m['mgroup'] ]['g_title'];
+ 				$m['prefix']  = $ibforums->cache['group_cache'][ $m['mgroup'] ]['prefix'];
+ 				$m['suffix']  = $ibforums->cache['group_cache'][ $m['mgroup'] ]['suffix'];
+ 				
+ 				if ( $ibforums->vars['cannot_ignore_groups'] )
+				{
+					if ( strstr( $ibforums->vars['cannot_ignore_groups'], ','.$m['mgroup'].',' ) )
+					{
+						continue;
+					}
+ 				}
+ 				
+ 				$final_users[ $m['id'] ] = $m;
+ 			}
+ 		}
+ 		
+ 		$this->output .= $this->html->iu_start();
+ 		
+ 		foreach( $final_users as $id => $member )
+ 		{
+ 			$this->output .= $this->html->iu_populated_row($member);
+ 		}
+ 		
+ 		$this->output .= $this->html->iu_add_new();
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Photo:
+ 	//
+ 	// Change / Add / Edit Users Photo
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function photo()
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 		if ( $ibforums->member['g_photo_max_vars'] == "" or $ibforums->member['g_photo_max_vars'] == "::" )
+ 		{
+ 			// Nothing set up yet...
+ 			
+ 			$this->output .= $this->html->dead_section();
+ 			return;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// SET DIMENSIONS
+ 		//-----------------------------------------
+ 		
+ 		list($p_max, $p_width, $p_height) = explode( ":", $ibforums->member['g_photo_max_vars'] );
+ 		
+ 		if ( $p_max )
+ 		{
+ 			$ibforums->lang['pph_max']  = sprintf( $ibforums->lang['pph_max'], $p_max );
+ 			$ibforums->lang['pph_max'] .= sprintf( $ibforums->lang['pph_max2'], $p_width, $p_height );
+ 		}
+ 		else
+ 		{
+ 			$ibforums->lang['pph_max'] = sprintf( $ibforums->lang['pph_max2'], $p_width, $p_height );
+ 		}
+ 		
+ 		list($p_w, $p_h) = explode( ",", $ibforums->member['photo_dimensions'] );
+ 		
+ 		$cur_photo = $ibforums->lang['pph_none'];
+ 		$cur_type  = "";
+ 		$url_photo = "";
+ 		
+ 		$width  = ( $p_w ) ? "width='$p_w'"  : "";
+ 		$height = ( $p_h ) ? "height='$p_h'" : "";
+ 		
+ 		$show_size = str_replace( ",", " X ", $ibforums->member['photo_dimensions'] );
+ 		
+ 		//-----------------------------------------
+ 		// TYPE?
+ 		//-----------------------------------------
+ 		
+ 		if ( $ibforums->member['photo_type'] == 'upload' )
+ 		{
+ 			$cur_type  = $ibforums->lang['pph_t_upload'];
+ 			$cur_photo = "<img src=\"".$ibforums->vars['upload_url']."/".$ibforums->member['photo_location']."\" $width $height alt='Photo' />";
+ 		}
+ 		else if ( $ibforums->member['photo_type'] == 'url' )
+ 		{
+ 			$cur_type  = $ibforums->lang['pph_t_url'];
+ 			$cur_photo = "<img src=\"".$ibforums->member['photo_location']."\" $width $height alt='Photo' />";
+ 			$url_photo = $ibforums->member['photo_location'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// SHOW THE FORM
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->html->photo_page($cur_photo, $cur_type, $url_photo, $show_size, $this->md5_check);
+ 		
+ 		if ($p_max)
+ 		{
+ 			$this->output = str_replace( "<!--IPB.UPLOAD-->", $this->html->photo_page_upload( 500000 ), $this->output );
+ 		}
+ 		
+ 		$size_html = $ibforums->vars['disable_ipbsize'] ? $this->html->photo_page_mansize() : $this->html->photo_page_autosize();
+ 		
+ 		$this->output = str_replace( "<!--IPB.SIZE-->", $size_html, $this->output );
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// Forum tracker
+ 	//
+ 	// What, you need a definition with that title?
+ 	// What are you doing poking around in the code for anyway?
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function remove_forum_tracker()
+ 	{
+		global $ibforums, $std, $DB;
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^id-(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$allowed = array( 'none', 'immediate', 'delayed', 'daily', 'weekly' );
+ 		
+ 		//-----------------------------------------
+ 		// what we doing?
+ 		//-----------------------------------------
+ 		
+ 		if ( count($ids) > 0 )
+ 		{
+ 			if ( $ibforums->input['trackchoice'] == 'unsubscribe' )
+ 			{
+ 				$DB->simple_exec_query( array( 'delete' => 'forum_tracker', 'where' => "member_id={$ibforums->member['id']} and forum_id IN (".implode( ",", $ids ).")" ) );
+ 			}
+ 			else if ( in_array( $ibforums->input['trackchoice'], $allowed ) )
+ 			{
+ 				$DB->do_update( 'forum_tracker', array( 'forum_track_type' => $ibforums->input['trackchoice'] ), "member_id={$ibforums->member['id']} and forum_id IN (".implode( ",", $ids ).")" );
+ 			}
+ 		}
+ 			
+ 	    $std->boink_it($ibforums->base_url."act=UserCP&CODE=50");
+ 		
+ 	}
+ 	
+ 	function forum_tracker()
+ 	{
+		global $ibforums, $DB, $std, $print, $forums;
+ 		
+ 		//-----------------------------------------
+ 		// Remap...
+ 		//-----------------------------------------
+ 		
+ 		$remap = array( 'none'      => 'subs_none_title',
+						'immediate' => 'subs_immediate',
+						'delayed'   => 'subs_delayed',
+						'daily'     => 'subs_daily',
+						'weekly'    => 'subs_weekly'
+					  );
+					  
+ 		$this->output .= $this->html->forum_subs_header();
+ 		
+ 		//-----------------------------------------
+ 		// Query the DB for the subby toppy-ics - at the same time
+ 		// we get the forum and topic info, 'cos we rule.
+ 		//-----------------------------------------
+ 		
+ 		$DB->cache_add_query( 'ucp_get_forum_tracker', array( 'mid' => $ibforums->member['id'] ) );
+		$DB->cache_exec_query();
+		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			while( $forum = $DB->fetch_row() )
+ 			{
+ 				$forum['folder_icon'] = $forums->forums_new_posts($forum);
+ 				
+ 				$forum['last_post'] = $std->get_date($forum['last_post'], 'LONG');
+						
+				$forum['last_topic'] = $ibforums->lang['f_none'];
+ 				
+ 				$forum['last_title'] = str_replace( "&#33;" , "!", $forum['last_title'] );
+				$forum['last_title'] = str_replace( "&quot;", "\"", $forum['last_title'] );
+					
+				if (strlen($forum['last_title']) > 30)
+				{
+					$forum['last_title'] = substr($forum['last_title'],0,27) . "...";
+					$forum['last_title'] = preg_replace( '/&(#(\d+;?)?)?\.\.\.$/', '...', $forum['last_title'] );
+				}
+				
+				if ($forum['password'] != "")
+				{
+					$forum['last_topic'] = $ibforums->lang['f_none'];
+				}
+				else
+				{
+					$forum['last_topic'] = "<a href='{$ibforums->base_url}showtopic={$forum['last_id']}&view=getlastpost'>{$forum['last_title']}</a>";
+				}
+			 
+							
+				if ( isset($forum['last_poster_name']))
+				{
+					$forum['last_poster'] = $forum['last_poster_id'] ? "<a href='{$ibforums->base_url}showuser={$forum['last_poster_id']}'>{$forum['last_poster_name']}</a>"
+																	 : $forum['last_poster_name'];
+				}
+				else
+				{
+					$forum['last_poster'] = $ibforums->lang['f_none'];
+				}
+				
+				$this->output .= $this->html->forum_subs_row($forum, $remap[ $forum['forum_track_type'] ]);
+			}
+			
+		}
+		else
+		{
+			$this->output .= $this->html->forum_subs_none();
+		}
+		
+		$this->output .= $this->html->forum_subs_end();
+ 		
+		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// pass change:
+ 	//
+ 	// Change the users password.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function pass_change()
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+ 		$this->output    .= $this->html->pass_change();
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// PASSWORD CHAGE COMPLETE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function do_pass_change()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		if ( $_POST['current_pass'] == "" or empty($_POST['current_pass']) )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Check and trim
+ 		//-----------------------------------------
+ 		
+ 		$cur_pass = trim($ibforums->input['current_pass']);
+ 		$new_pass = trim($ibforums->input['new_pass_1']);
+ 		$chk_pass = trim($ibforums->input['new_pass_2']);
+ 		
+ 		if ( ( empty($new_pass) ) or ( empty($chk_pass) ) )
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+ 		}
+ 		
+ 		if ($new_pass != $chk_pass)
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'pass_no_match' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Check password...
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->converge->converge_load_member($ibforums->member['email']);
+ 		
+ 		if ( $ibforums->converge->converge_authenticate_member( md5($cur_pass) ) != TRUE )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'wrong_pass' ) );
+		}
+ 		
+ 		//-----------------------------------------
+ 		// Create new password...
+ 		//-----------------------------------------
+ 		
+ 		$md5_pass = md5($new_pass);
+ 		
+ 		//-----------------------------------------
+ 		// Update the DB
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->converge->converge_update_password( $md5_pass, $ibforums->member['email'] );
+ 		
+ 		//-----------------------------------------
+ 		// Use sync module?
+ 		//-----------------------------------------
+ 		
+ 		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+    		$this->modules->on_pass_change($ibforums->member['id'], $new_pass);
+   		}
+ 		
+ 		//-----------------------------------------
+ 		// Redirect...
+ 		//-----------------------------------------
+ 		
+ 		$print->redirect_screen( $ibforums->lang['pass_redirect'], 'act=UserCP&CODE=00' );
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// email change:
+ 	//
+ 	// Change the users email address
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function email_change($msg="")
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+ 		$txt = $ibforums->lang['ce_current'].$ibforums->member['email'];
+ 		
+ 		if ($ibforums->vars['reg_auth_type'])
+ 		{
+ 			$txt .= $ibforums->lang['ce_auth'];
+ 		}
+ 		
+ 		if ($ibforums->vars['bot_antispam'])
+ 		{
+			//-----------------------------------------
+			// Set up security code
+			//-----------------------------------------
+			
+			// Set a new ID for this reg request...
+			
+			$regid = md5( uniqid(microtime()) );
+			
+			// Set a new 6 character numerical string
+			
+			mt_srand ((double) microtime() * 1000000);
+			
+			$reg_code = mt_rand(100000,999999);
+			
+			// Insert into the DB
+			
+			$DB->do_insert( 'reg_antispam', array (
+													 'regid'      => $regid,
+													 'regcode'    => $reg_code,
+													 'ip_address' => $ibforums->input['IP_ADDRESS'],
+													 'ctime'      => time(),
+										 )       );
+		}
+ 		
+ 		$this->output    .= $this->html->email_change($txt, $ibforums->lang[$msg]);
+ 		
+ 		if ($ibforums->vars['bot_antispam'])
+ 		{
+ 		
+			if ($ibforums->vars['bot_antispam'] == 'gd')
+			{
+				$this->output = str_replace( "<!--ANTIBOT-->", $this->html->email_change_gd($regid), $this->output );
+			}
+			else
+			{
+				$this->output = str_replace( "<!--ANTIBOT-->", $this->html->email_change_img($regid), $this->output );
+			}
+ 		
+ 		}
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// COMPLETE EMAIL ADDRESS CHANGE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function do_email_change()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Check input
+ 		//-----------------------------------------
+ 		
+ 		if ($_POST['in_email_1'] == "")
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+ 		}
+ 		
+ 		if ($_POST['in_email_2'] == "")
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'no_guests' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Authorizing?
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->member['mgroup'] == $ibforums->vars['auth_group'])
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'email_change_v' ) );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Check password...
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->converge->converge_load_member($ibforums->member['email']);
+ 		
+ 		if ( $ibforums->converge->converge_authenticate_member( md5($ibforums->input['password']) ) != TRUE )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'wrong_pass' ) );
+		}
+		
+ 		//-----------------------------------------
+ 		// Test email addresses
+ 		//-----------------------------------------
+ 		
+ 		$email_one    = strtolower( trim($ibforums->input['in_email_1']) );
+ 		$email_two    = strtolower( trim($ibforums->input['in_email_2']) );
+ 		
+ 		if ($email_one != $email_two)
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'email_addy_mismatch' ) );
+		}
+		
+		$email_one = $std->clean_email($email_one);
+		
+		if ( $email_one == "" )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'invalid_email' ) );
+		}
+		
+		//-----------------------------------------
+		// Is this email addy taken?
+		//-----------------------------------------
+		
+		if ( $ibforums->converge->converge_check_for_member_by_email( $email_one ) == TRUE )
+		{
+			$std->Error( array( LEVEL => 1, MSG => 'email_exists' ) );
+		}
+		
+		//-----------------------------------------
+		// Check in banned list
+		//-----------------------------------------
+		
+		if ($ibforums->vars['ban_email'])
+		{
+			$ips = explode( "|", $ibforums->vars['ban_email'] );
+			
+			foreach ($ips as $ip)
+			{
+				$ip = preg_replace( "/\*/", '.*' , $ip );
+				
+				if ( preg_match( "/$ip/", $email_one ) )
+				{
+					$std->Error( array( 'LEVEL' => 1, 'MSG' => 'banned_email' ) );
+				}
+			}
+		}
+		
+		//-----------------------------------------
+		// Anti bot flood...
+		//-----------------------------------------
+		
+		if ($ibforums->vars['bot_antispam'])
+ 		{
+			//-----------------------------------------
+			// Check the security code:
+			//-----------------------------------------
+			
+			if ($ibforums->input['regid'] == "")
+			{
+				$this->email_change('err_security_code');
+				return "";
+			}
+			
+			$DB->simple_construct( array( 'select' => '*',
+										  'from'   => 'reg_antispam',
+										  'where'  => "regid='".trim(addslashes($ibforums->input['regid']))."'"
+								 )      );
+								 
+			$DB->simple_exec();
+			
+			if ( ! $row = $DB->fetch_row() )
+			{
+				$this->email_change('err_security_code');
+				return "";
+			}
+			
+			if ( trim( intval($ibforums->input['reg_code']) ) != $row['regcode'] )
+			{
+				$this->email_change('err_security_code');
+				return "";
+			}
+			
+			$DB->simple_construct( array( 'delete' => 'reg_antispam',
+										  'where'  => "regid='".trim(addslashes($ibforums->input['regid']))."'"
+								 )      );
+								 
+			$DB->simple_exec();
+		}
+		
+		//-----------------------------------------
+		// Update converge...
+		//-----------------------------------------
+		
+		$ibforums->converge->converge_update_member( $ibforums->member['email'], $email_one );
+		
+		//-----------------------------------------
+		// Update dupemail
+		//-----------------------------------------
+		
+		if ( $ibforums->member['bio'] == 'dupemail' )
+		{
+			$DB->do_update( 'member_extra', array( 'bio' => '' ), 'id='.$ibforums->member['id'] );
+		}
+		
+		//-----------------------------------------
+ 		// Use sync module?
+ 		//-----------------------------------------
+ 		
+ 		if ( USE_MODULES == 1 )
+		{
+			$this->modules->register_class(&$this);
+    		$this->modules->on_email_change($ibforums->member['id'], $email_one);
+   		}
+   		
+		//-----------------------------------------
+		// Require new validation? NON ADMINS ONLY
+		//-----------------------------------------
+		
+		if ($ibforums->vars['reg_auth_type'] AND ! $ibforums->member['g_access_cp'] )
+		{
+			$validate_key = md5( $std->make_password() . time() );
+			
+			//-----------------------------------------
+			// Update the new email, but enter a validation key
+			// and put the member in "awaiting authorisation"
+			// and send an email..
+			//-----------------------------------------
+			
+			$db_str = array(
+							'vid'         => $validate_key,
+							'member_id'   => $ibforums->member['id'],
+							'real_group'  => $ibforums->member['mgroup'],
+							'temp_group'  => $ibforums->vars['auth_group'],
+							'entry_date'  => time(),
+							'coppa_user'  => 0,
+							'email_chg'   => 1,
+							'ip_address'  => $ibforums->input['IP_ADDRESS']
+						   );
+						   
+			$DB->do_insert( 'validating', $db_str );
+			
+			$DB->do_update( 'members' , array(
+												'mgroup' => $ibforums->vars['auth_group'],
+												'email'  => $email_one,
+											 ), 'id='.$ibforums->member['id']
+						  );
+			
+			//-----------------------------------------
+			// Update their session with the new member group
+			//-----------------------------------------
+			
+			if ( $ibforums->session_id )
+			{
+				$DB->do_update( 'sessions', array( 'member_name'  => '',
+												   'member_id'    => 0,
+												   'member_group' => $ibforums->vars['guest_group']
+												 ), "member_id=".$ibforums->member['id']." and id='".$ibforums->session_id."'"
+							  );
+			}
+ 			
+ 			//-----------------------------------------
+ 			// Kill the cookies to stop auto log in
+ 			//-----------------------------------------
+ 			
+ 			$std->my_setcookie( 'pass_hash'  , '-1', 0 );
+ 			$std->my_setcookie( 'member_id'  , '-1', 0 );
+ 			$std->my_setcookie( 'session_id' , '-1', 0 );
+ 			
+ 			//-----------------------------------------
+ 			// Dispatch the mail, and return to the activate form.
+ 			//-----------------------------------------
+ 			
+ 			$this->email->get_template("newemail");
+				
+			$this->email->build_message( array(
+												'NAME'         => $ibforums->member['name'],
+												'THE_LINK'     => $ibforums->base_url_nosess."?act=Reg&CODE=03&type=newemail&uid=".$ibforums->member['id']."&aid=".$validate_key,
+												'ID'           => $ibforums->member['id'],
+												'MAN_LINK'     => $ibforums->base_url_nosess."?act=Reg&CODE=07",
+												'CODE'         => $validate_key,
+											  )
+										);
+										
+			$this->email->subject = $ibforums->lang['lp_subject'].' '.$ibforums->vars['board_name'];
+			$this->email->to      = $email_one;
+			
+			$this->email->send_mail();
+			
+			$print->redirect_screen( $ibforums->lang['ce_redirect'], 'act=Reg&CODE=07' );
+		}
+		else
+		{
+			//-----------------------------------------
+			// No authorisation needed, change email addy and return
+			//-----------------------------------------
+			
+			$DB->do_update( 'members', array( 'email' => $email_one ), 'id='.$ibforums->member['id'] );
+			
+			$print->redirect_screen( $ibforums->lang['email_changed_now'], 'act=UserCP&CODE=00' );
+		}
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// tracker:
+ 	//
+ 	// Print the subscribed topics listings
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function tracker()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$this->output .= $this->html->subs_header();
+ 		
+ 		//-----------------------------------------
+ 		// Remap...
+ 		//-----------------------------------------
+ 		
+ 		$remap = array( 'none'      => 'subs_none_title',
+						'immediate' => 'subs_immediate',
+						'delayed'   => 'subs_delayed',
+						'daily'     => 'subs_daily',
+						'weekly'    => 'subs_weekly'
+					  );
+ 		
+ 		//-----------------------------------------
+ 		// Get forums module
+ 		//-----------------------------------------
+ 		
+ 		require_once( ROOT_PATH.'sources/forums.php' );
+ 		$this->forums = new forums();
+ 		$this->forums->init();
+ 		
+ 		//-----------------------------------------
+ 		// Are we checking for auto-prune?
+ 		//-----------------------------------------
+ 		
+ 		$auto_explain = $ibforums->lang['no_auto_prune'];
+ 		
+ 		if ($ibforums->vars['subs_autoprune'] > 0)
+ 		{
+			$auto_explain = sprintf( $ibforums->lang['auto_prune'], $ibforums->vars['subs_autoprune'] );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Do we have an incoming date cut?
+ 		//-----------------------------------------
+ 		
+ 		$date_cut   = intval($ibforums->input['datecut']) != "" ? intval($ibforums->input['datecut']) : 30;
+ 		
+ 		$date_query = $date_cut != 1000 ? " AND t.last_post > '".(time() - ($date_cut*86400))."' " : "";
+ 		
+ 		//-----------------------------------------
+ 		// Query the DB for the subby toppy-ics - at the same time
+ 		// we get the forum and topic info, 'cos we rule.
+ 		//-----------------------------------------
+ 		
+ 		$DB->cache_add_query( 'ucp_get_topic_tracker', array( 'mid' => $ibforums->member['id'], 'date_query' => $date_query ) );
+		$DB->cache_exec_query();
+		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			$last_forum_id = -1;
+ 		
+ 			while( $topic = $DB->fetch_row() )
+ 			{
+ 				if ($last_forum_id != $topic['forum_id'])
+ 				{
+ 					$last_forum_id = $topic['forum_id'];
+ 					
+ 					$this->output .= $this->html->subs_forum_row($topic['forum_id'], $topic['forum_name']);
+ 				}
+				
+				$topic['last_post_date']  = $std->get_date( $topic['last_post'], 'LONG' );
+				
+				if ( $topic['description'] )
+				{
+					$topic['description'] .= "<br />";
+				}
+				
+				$topic = $this->forums->parse_data($topic);
+				
+				$this->output .= $this->html->subs_row($topic, $remap[ $topic['topic_track_type'] ]);
+			}
+			
+		}
+		else
+		{
+			$this->output .= $this->html->subs_none();
+		}
+		
+		// Build date box
+		
+		$date_box = "<option value='1'>".$ibforums->lang['subs_today']."</option>\n";
+		
+		foreach( array( 1,7,14,21,30,60,90,365 ) as $day )
+		{
+			$selected = $day == $date_cut ? ' selected="selected"' : '';
+				
+			$date_box .= "<option value='$day'$selected>".sprintf( $ibforums->lang['subs_day'], $day )."</option>\n";
+		}
+		
+		$date_box .= "<option value='1000'>".$ibforums->lang['subs_all']."</option>\n";
+			
+		$this->output .= $this->html->subs_end($auto_explain, $date_box);
+ 		
+		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// UPDATE TRACKER
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function do_update_tracker()
+ 	{
+		global $ibforums, $std, $DB;
+ 		
+ 		//-----------------------------------------
+ 		// Get the ID's to delete
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->input['request_method'] != 'post')
+ 		{
+ 			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'poss_hack_attempt' ) );
+ 		}
+ 		
+ 		$ids = array();
+ 		
+ 		foreach ($ibforums->input as $key => $value)
+ 		{
+ 			if ( preg_match( "/^id-(\d+)$/", $key, $match ) )
+ 			{
+ 				if ($ibforums->input[$match[0]])
+ 				{
+ 					$ids[] = $match[1];
+ 				}
+ 			}
+ 		}
+ 		
+ 		$allowed = array( 'none', 'immediate', 'delayed', 'daily', 'weekly' );
+ 		
+ 		//-----------------------------------------
+ 		// what we doing?
+ 		//-----------------------------------------
+ 		
+ 		if ( count($ids) > 0 )
+ 		{
+ 			if ( $ibforums->input['trackchoice'] == 'unsubscribe' )
+ 			{
+ 				$DB->simple_exec_query( array( 'delete' => 'tracker', 'where' => "member_id='".$ibforums->member['id']."' and trid IN (".implode( ",", $ids ).")" ) );
+ 			}
+ 			else if ( in_array( $ibforums->input['trackchoice'], $allowed ) )
+ 			{
+ 				$DB->do_update( 'tracker', array( 'topic_track_type' => $ibforums->input['trackchoice'] ), "trid IN (".implode( ",", $ids ).")" );
+ 			}
+ 		}
+ 			
+ 	    $std->boink_it($ibforums->base_url."act=UserCP&CODE=26");
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// BOARD PREFS:
+ 	//
+ 	// Set up view avatar, sig, time zone, etc.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function board_prefs()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$time = $std->get_date( time(), 'LONG' );
+ 		
+ 		// Do we have a user stored offset, or use the board default:
+ 		
+ 		$offset = ( $ibforums->member['time_offset'] != "" ) ? $ibforums->member['time_offset'] : $ibforums->vars['time_offset'];
+ 		
+ 		$time_select = "<select name='u_timezone' class='forminput'>";
+ 		
+ 		// Loop through the langauge time offsets and names to build our
+ 		// HTML jump box.
+ 		
+ 		foreach( $ibforums->lang as $off => $words )
+ 		{
+ 			if ( preg_match("/^time_(-?[\d\.]+)$/", $off, $match))
+ 			{
+				$time_select .= $match[1] == $offset ? "<option value='{$match[1]}' selected='selected'>$words</option>\n"
+												     : "<option value='{$match[1]}'>$words</option>\n";
+ 			}
+ 		}
+ 		
+ 		$time_select .= "</select>";
+ 		
+ 		// Print out the header..
+ 		
+ 		if ($ibforums->member['dst_in_use'])
+ 		{
+ 			$dst_check = 'checked';
+ 		}
+ 		else
+ 		{
+ 			$dst_check = '';
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->vars['postpage_contents'] == "")
+		{
+			$ibforums->vars['postpage_contents'] = '5,10,15,20,25,30,35,40';
+		}
+		
+		if ($ibforums->vars['topicpage_contents'] == "")
+		{
+			$ibforums->vars['topicpage_contents'] = '5,10,15,20,25,30,35,40';
+		}
+ 		
+ 		list($post_page, $topic_page) = explode( "&", $ibforums->member['view_prefs'] );
+ 		
+ 		if ($post_page == "")
+ 		{
+ 			$post_page = -1;
+ 		}
+ 		if ($topic_page == "")
+ 		{
+ 			$topic_page = -1;
+ 		}
+ 		
+ 		$pp_a = array();
+ 		$tp_a = array();
+ 		$post_select  = "";
+ 		$topic_select = "";
+ 		
+ 		$pp_a[] = array( '-1', $ibforums->lang['pp_use_default'] );
+ 		$tp_a[] = array( '-1', $ibforums->lang['pp_use_default'] );
+ 		
+ 		foreach( explode( ',', $ibforums->vars['postpage_contents'] ) as $n )
+ 		{
+ 			$n      = intval(trim($n));
+ 			$pp_a[] = array( $n, $n );
+ 		}
+ 		
+ 		foreach( explode( ',', $ibforums->vars['topicpage_contents'] ) as $n )
+ 		{
+ 			$n      = intval(trim($n));
+ 			$tp_a[] = array( $n, $n );
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		
+ 		foreach( $pp_a as $id => $data )
+ 		{
+ 			$post_select .= ($data[0] == $post_page) ? "<option value='{$data[0]}' selected='selected'>{$data[1]}\n" : "<option value='{$data[0]}'>{$data[1]}\n";
+ 		}
+ 		
+ 		foreach( $tp_a as $id => $data )
+ 		{
+ 			$topic_select .= ($data[0] == $topic_page) ? "<option value='{$data[0]}' selected='selected'>{$data[1]}\n" : "<option value='{$data[0]}'>{$data[1]}\n";
+ 		}
+ 		
+ 		
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->html->settings_header($this->member, $time_select, $time, $dst_check, $this->md5_check);
+ 		
+ 		$hide_sess   = $std->my_getcookie('hide_sess');
+ 		
+ 		$open_qreply = $std->my_getcookie("open_qr");
+ 		
+ 		if ( $open_qreply == FALSE )
+ 		{
+ 			$open_qreply = 0;
+ 		}
+ 		
+ 		// View avatars, signatures and images..
+ 		
+ 		$view_ava  = "<select name='VIEW_AVS' class='forminput'>";
+ 		$view_sig  = "<select name='VIEW_SIGS' class='forminput'>";
+ 		$view_img  = "<select name='VIEW_IMG' class='forminput'>";
+ 		$view_pop  = "<select name='DO_POPUP' class='forminput'>";
+ 		$html_sess = "<select name='HIDE_SESS' class='forminput'>";
+ 		$html_qr   = "<select name='OPEN_QR' class='forminput'>";
+ 		
+ 		$view_ava .= $ibforums->member['view_avs'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
+ 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
+ 		
+ 		$view_sig .= $ibforums->member['view_sigs'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
+ 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
+ 		
+ 		$view_img .= $ibforums->member['view_img'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
+ 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
+ 											  
+ 		$view_pop .= $ibforums->member['view_pop'] ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
+ 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
+ 		
+ 		$html_sess .= $hide_sess == 1          ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
+ 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
+ 		
+ 		$html_qr   .= $open_qreply == 1        ? "<option value='1' selected='selected'>".$ibforums->lang['yes']."</option>\n<option value='0'>".$ibforums->lang['no']."</option>"
+ 											   : "<option value='1'>".$ibforums->lang['yes']."</option>\n<option value='0' selected='selected'>".$ibforums->lang['no']."</option>";
+ 		
+ 		
+ 		
+ 		
+ 		$this->output .= $this->html->settings_end( array ( 'IMG'  => $view_img."</select>",
+ 															'SIG'  => $view_sig."</select>",
+ 															'AVA'  => $view_ava."</select>",
+ 															'POP'  => $view_pop."</select>",
+ 															'SESS' => $html_sess."</select>",
+ 															'QR'   => $html_qr."</select>",
+ 															'TPS'  => $topic_select,
+ 															'PPS'  => $post_select,
+ 												  )       );
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// EMAIL SETTINGS:
+ 	//
+ 	// Set up the email stuff.
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function email_settings()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		// PM_REMINDER: First byte = Email PM when received new
+ 		//   			Second byte= Show pop-up when new PM received
+ 						
+ 		
+ 		$info = array();
+ 		
+ 		foreach ( array(hide_email, allow_admin_mails, email_full, email_pm, auto_track) as $k )
+ 		{
+ 			if (!empty($ibforums->member[ $k ]))
+ 			{
+ 				$info[$k] = 'checked';
+ 			}
+ 		}
+ 		
+ 		$info['key'] = $this->md5_check;
+ 		
+ 		$this->output .= $this->html->email($info);
+ 		
+ 		//-----------------------------------------
+ 		// Update select box
+ 		//-----------------------------------------
+ 		
+ 		$this->output = str_replace( "<option value=\"{$ibforums->member['auto_track']}\">", "<option value='{$ibforums->member['auto_track']}' selected='selected'>", $this->output );
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// custom sort routine:
+ 	//
+ 	// Like wot is seys on the tin
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function sort_avatars($a, $b)
+ 	{
+ 		$aa = strtolower($a[1]);
+ 		$bb = strtolower($b[1]);
+ 		
+ 		if ( $aa == $bb ) return 0;
+ 		
+ 		return ( $aa > $bb ) ? 1 : -1;
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// AVATAR:
+ 	//
+ 	// Displays the avatar choices
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function avatar_gallery()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		$avatar_gallery    = array();
+ 		$av_categories     = array( 0 => array( "root", $ibforums->lang['av_root'] ) );
+ 		
+ 		$av_cat_selected   = preg_replace( "/[^\w\s_\-]/", "", $ibforums->input['av_cat'] );
+ 		$av_cat_found      = FALSE;
+ 		$av_human_readable = "";
+ 		
+ 		if ($av_cat_selected == 'root')
+ 		{
+ 			$av_cat_selected   = "";
+ 			$av_human_readable = $ibforums->lang['av_root'];
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Get the avatar categories
+ 		//-----------------------------------------
+ 		
+ 		$dh = opendir( CACHE_PATH.'style_avatars' );
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+			if ( is_dir( CACHE_PATH.'style_avatars'."/".$file ) )
+			{
+				if ( $file != "." && $file != ".." )
+				{
+					if ( $file == $av_cat_selected )
+					{
+						$av_cat_found      = TRUE;
+						$av_human_readable = str_replace( "_", " ", $file );
+					}
+					
+					$av_categories[] = array( $file, str_replace( "_", " ", $file ) );
+				}
+			}
+ 		}
+ 		
+ 		closedir( $dh );
+ 		
+ 		//-----------------------------------------
+ 		// SORT IT OUT YOU MUPPET!!
+ 		//-----------------------------------------
+ 		
+ 		usort( $av_categories, array( 'UserCP', 'sort_avatars' ) );
+ 		reset( $av_categories );
+ 		
+ 		//-----------------------------------------
+ 		// Did we find the directory?
+ 		//-----------------------------------------
+ 		
+ 		if ($av_cat_selected)
+ 		{
+ 			if ( $av_cat_found != TRUE )
+ 			{
+ 				$std->Error( array( 'LEVEL' => 1, 'MSG' => 'av_no_gallery' ) );
+ 			}
+ 			
+ 			$av_cat_real = "/".$av_cat_selected;
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Get the avatar images for this category
+ 		//-----------------------------------------
+ 		
+ 		$dh = opendir( CACHE_PATH.'style_avatars'.$av_cat_real);
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+ 			if ( ! preg_match( "/^..?$|^index|^\.ds_store|^\.htaccess/i", $file ) )
+ 			{
+ 				if ( is_file( CACHE_PATH.'style_avatars'.$av_cat_real."/".$file) )
+ 				{
+ 					if ( preg_match( "/\.(gif|jpg|jpeg|png|swf)$/i", $file ) )
+ 					{
+ 						$av_gall_images[] = $file;
+ 					}
+ 				}
+ 			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// SORT IT OUT YOU PLONKER!!
+ 		//-----------------------------------------
+ 		
+ 		if ( is_array($av_gall_images) and count($av_gall_images) )
+ 		{
+ 			natcasesort($av_gall_images);
+ 			reset($av_gall_images);
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Render drop down box..
+ 		//-----------------------------------------
+ 		
+ 		$av_gals = "<select name='av_cat' class='forminput'>\n";
+ 		
+ 		foreach( $av_categories as $cat )
+ 		{
+ 			$av_gals .= "<option value='".$cat[0]."'>".$cat[1]."</option>\n";
+ 		}
+ 		
+ 		$av_gals .= "</select>\n";
+ 		
+ 		closedir( $dh );
+ 		
+ 		$gal_cols = $ibforums->vars['av_gal_cols'] == "" ? 5 : $ibforums->vars['av_gal_cols'];
+ 		$gal_rows = $ibforums->vars['av_gal_rows'] == "" ? 3 : $ibforums->vars['av_gal_rows'];
+ 		
+ 		$gal_found = count($av_gall_images);
+ 		
+ 		//-----------------------------------------
+ 		// Produce the avatar gallery sheet
+ 		//-----------------------------------------
+ 		
+ 		$this->output .= $this->html->avatar_gallery_start_table($av_human_readable,$av_gals,urlencode($av_cat_selected), $this->md5_check);
+ 		
+ 		$c = 0;
+ 		
+ 		if ( is_array($av_gall_images) and count($av_gall_images) )
+ 		{
+			foreach( $av_gall_images as $img )
+			{
+				$c++;
+				
+				if ($c == 1)
+				{
+					$this->output .= $this->html->avatar_gallery_start_row();
+				}
+				
+				$this->output .= $this->html->avatar_gallery_cell_row(
+																	  $av_cat_real."/".$img,
+																	  str_replace( "_", " ", preg_replace( "/^(.*)\.\w+$/", "\\1", $img ) ),
+																	  urlencode($img)
+																	);
+				
+				
+				if ($c == $gal_cols)
+				{
+					$this->output .= $this->html->avatar_gallery_end_row();
+					
+					$c = 0;
+				}
+				
+			}
+ 		}
+ 		
+ 		if ($c != $gal_cols)
+ 		{
+			for ($i = $c ; $i < $gal_cols ; ++$i)
+			{
+				$this->output .= $this->html->avatar_gallery_blank_row();
+			}
+			
+			$this->output .= $this->html->avatar_gallery_end_row();
+		}
+ 		
+ 		$this->output .= $this->html->avatar_gallery_end_table();
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SHOW AVATAR
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function avatar()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+ 		// Organise the dimensions
+ 		//-----------------------------------------
+ 		
+ 		list( $ibforums->member['AVATAR_WIDTH'] , $ibforums->member['AVATAR_HEIGHT']  ) = explode ("x", $ibforums->member['avatar_size']);
+ 		list( $ibforums->vars['av_width']       , $ibforums->vars['av_height']        ) = explode ("x", $ibforums->vars['avatar_dims']);
+ 		list( $w, $h ) = explode ( "x", $ibforums->vars['avatar_def'] );
+ 		
+ 		//-----------------------------------------
+ 		// Get the users current avatar to display
+ 		//-----------------------------------------
+ 		
+ 		$my_avatar = $std->get_avatar( $ibforums->member['avatar_location'], 1, $ibforums->member['avatar_size'], $ibforums->member['avatar_type'] );
+ 		
+ 		$my_avatar = $my_avatar ? $my_avatar : 'noavatar';
+ 		
+ 		//-----------------------------------------
+ 		// Get the avatar gallery
+ 		//-----------------------------------------
+ 		
+ 		$avatar_gallery = array();
+ 		$av_categories  = array( 0 => array( "root", $ibforums->lang['av_root'] ) );
+ 		
+ 		//-----------------------------------------
+ 		// Get the avatar categories
+ 		//-----------------------------------------
+ 		
+ 		$dh = opendir( CACHE_PATH.'style_avatars' );
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+			if ( is_dir( CACHE_PATH.'style_avatars'."/".$file ) )
+			{
+				if ( $file != "." && $file != ".." )
+				{
+					if ( $file == $av_cat_selected )
+					{
+						$av_cat_found = TRUE;
+					}
+					
+					$av_categories[] = array( $file, str_replace( "_", " ", $file ) );
+				}
+			}
+ 		}
+ 		
+ 		closedir( $dh );
+ 		
+ 		usort( $av_categories, array( 'UserCP', 'sort_avatars' ) );
+ 		reset( $av_categories );
+ 		
+ 		//-----------------------------------------
+ 		// Get the avatar gallery selected
+ 		//-----------------------------------------
+ 		
+ 		$url_avatar = "http://";
+ 		 		
+ 		$avatar_type = "na";
+ 		
+ 		if ( ($ibforums->member['avatar_location'] != "") and ($ibforums->member['avatar_location'] != "noavatar") )
+ 		{
+ 			if ( ! $ibforums->member['avatar_type'] )
+ 			{
+				if ( preg_match( "/^upload:/", $ibforums->member['avatar'] ) )
+				{
+					$avatar_type = "upload";
+				}
+				else if ( ! preg_match( "/^http/i", $ibforums->member['avatar'] ) )
+				{
+					$avatar_type = "local";
+				}
+				else
+				{
+					$url_avatar = $ibforums->member['avatar'];
+					$avatar_type = "url";
+				}
+			}
+			else
+			{
+				switch ($ibforums->member['avatar_type'])
+				{
+					case 'upload':
+						$avatar_type = 'upload';
+						break;
+					case 'url':
+						$avatar_type = 'url';
+						$url_avatar  = $ibforums->member['avatar_location'];
+						break;
+					default:
+						$avatar_type = 'local';
+						break;
+				}
+			}
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Render drop down box..
+ 		//-----------------------------------------
+ 		
+ 		$av_gals = "<select name='av_cat' class='forminput'>\n";
+ 		
+ 		foreach( $av_categories as $cat )
+ 		{
+ 			$av_gals .= "<option value='".$cat[0]."'>".$cat[1]."</option>\n";
+ 		}
+ 		
+ 		$av_gals .= "</select>\n";
+ 		
+ 		
+ 		//-----------------------------------------
+ 		// Rest of the form..
+ 		//-----------------------------------------
+ 		
+ 		$formextra   = "";
+ 		$hidden_field = "";
+ 		
+ 		if ($ibforums->member['g_avatar_upload'] == 1)
+ 		{
+ 			$formextra    = " enctype='multipart/form-data'";
+			$hidden_field = "<input type='hidden' name='MAX_FILE_SIZE' value='9000000' />";
+		}
+ 		
+ 		$this->output .= $this->html->avatar_main( array (
+															'MEMBER'               => $this->member,
+															'avatar_galleries'     => $av_gals,
+															'current_url_avatar'   => $url_avatar,
+															'current_avatar_image' => $my_avatar,
+															'current_avatar_type'  => $ibforums->lang['av_t_'.$avatar_type],
+															'current_avatar_dims'  => $ibforums->member['avatar_size'] == "x" ? "" : $ibforums->member['avatar_size'],
+												 )  , $formextra, $hidden_field, $this->md5_check     );
+		
+		//-----------------------------------------
+ 		// Autosizing or manual sizing?
+ 		//-----------------------------------------
+ 												 
+		$size_html = $ibforums->vars['disable_ipbsize'] ? $this->html->avatar_mansize() : $this->html->avatar_autosize();
+ 		
+		//-----------------------------------------
+ 		// Can we use a URL avatar?
+ 		//-----------------------------------------
+ 		
+ 		if ($ibforums->vars['avatar_url'])
+ 		{											 
+ 			$this->output = str_replace( "<!--IBF.EXTERNAL_TITLE-->",  $this->html->avatar_external_title(), $this->output );
+ 			$this->output = str_replace( "<!--IBF.URL_AVATAR-->",  $this->html->avatar_url_field($url_avatar), $this->output );
+ 			$this->output = str_replace( "<!--IPB.SIZE-->", $size_html, $this->output );
+ 			$ibforums->lang['av_text_url'] = sprintf( $ibforums->lang['av_text_url'], $ibforums->vars['av_width'], $ibforums->vars['av_height'] );
+ 		}
+ 		else
+ 		{
+ 			$ibforums->lang['av_text_url'] = "";
+ 		}
+ 		
+ 		//-----------------------------------------
+ 		// Can we use an uploaded avatar?
+ 		//-----------------------------------------
+ 		
+		if ($ibforums->member['g_avatar_upload'] == 1)
+		{
+			$this->output = str_replace( "<!--IBF.EXTERNAL_TITLE-->",  $this->html->avatar_external_title(), $this->output );
+			$this->output = str_replace( "<!--IBF.UPLOAD_AVATAR-->", $this->html->avatar_upload_field($text), $this->output );
+			$this->output = str_replace( "<!--IPB.SIZE-->", $size_html, $this->output );
+			$ibforums->lang['av_text_upload'] = sprintf( $ibforums->lang['av_text_upload'], $ibforums->vars['avup_size_max'] );
+		}
+		else
+		{
+			$ibforums->lang['av_text_upload'] = "";
+		}
+		
+		//-----------------------------------------
+ 		// If yes, show little thingy at top
+ 		//-----------------------------------------
+ 		
+ 		$ibforums->lang['av_allowed_files'] = sprintf($ibforums->lang['av_allowed_files'], implode (' .', explode( "|", $ibforums->vars['avatar_ext'] ) ) );
+ 		
+ 		if ( $ibforums->vars['allow_flash'] != 1 )
+		{
+			$ibforums->lang['av_allowed_files'] = str_replace( ".swf", "", $ibforums->lang['av_allowed_files'] );
+		}
+		
+		$this->output = str_replace( "<!--IBF.LIMITS_AVATAR-->", $this->html->avatar_limits(), $this->output );
+		
+ 			
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SIGNATURE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function signature()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+		$t_sig = $this->parser->unconvert( $ibforums->member['signature'], $ibforums->vars['sig_allow_ibc'], $ibforums->vars['sig_allow_html'] );
+		
+		$ibforums->lang['the_max_length'] = $ibforums->vars['max_sig_length'] ? $ibforums->vars['max_sig_length'] : 0;
+		
+		if ( $ibforums->vars['sig_allow_html'] == 1 )
+		{
+			$this->parser->pp_do_html = 1;
+		}
+ 		
+ 		$ibforums->member['signature'] = $this->parser->post_db_parse($ibforums->member['signature']);
+ 		
+ 		$this->output .= $this->html->signature($ibforums->member['signature'], $t_sig, $std->return_md5_check());
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 		
+ 	}
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// PROFILE
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function personal()
+ 	{
+		global $ibforums, $DB, $std, $print;
+ 		
+ 		//-----------------------------------------
+		// Check to make sure that we can edit profiles..
+		//-----------------------------------------
+		
+		if ( empty($ibforums->member['g_edit_profile']) )
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'cant_use_feature' ) );
+		}
+		
+		//-----------------------------------------
+		// Format the birthday drop boxes..
+		//-----------------------------------------
+		
+		$date = getdate();
+		
+		$day  = "<option value='0'>--</option>";
+		$mon  = "<option value='0'>--</option>";
+		$year = "<option value='0'>--</option>";
+		
+		for ( $i = 1 ; $i < 32 ; $i++ )
+		{
+			$day .= "<option value='$i'";
+			
+			$day .= $i == $ibforums->member['bday_day'] ? "selected='selected'>$i</option>" : ">$i</option>";
+		}
+		
+		for ( $i = 1 ; $i < 13 ; $i++ )
+		{
+			$mon .= "<option value='$i'";
+			
+			$mon .= $i == $ibforums->member['bday_month'] ? "selected='selected'>{$ibforums->lang['month'.$i]}</option>" : ">{$ibforums->lang['month'.$i]}</option>";
+		}
+		
+		$i = $date['year'] - 1;
+		$j = $date['year'] - 100;
+		
+		for ( $i ; $j < $i ; $i-- )
+		{
+			$year .= "<option value='$i'";
+			
+			$year .= $i == $ibforums->member['bday_year'] ? "selected='selected'>$i</option>" : ">$i</option>";
+		}
+		
+		//-----------------------------------------
+    	// Get custom profile information
+    	//-----------------------------------------
+    	
+    	$required_output = "";
+		$optional_output = "";
+		
+    	require_once( ROOT_PATH.'sources/classes/class_custom_fields.php' );
+    	$fields = new custom_fields( $DB );
+    	
+    	$fields->member_id   = $ibforums->member['id'];
+    	$fields->mem_data_id = $ibforums->member['id'];
+    	$fields->cache_data  = $ibforums->cache['profilefields'];
+    	$fields->admin       = intval($ibforums->member['g_access_cp']);
+    	$fields->supmod      = intval($ibforums->member['g_is_supmod']);
+    	
+    	$fields->init_data();
+    	$fields->parse_to_edit();
+    	
+    	foreach( $fields->out_fields as $id => $data )
+    	{
+    		if ( $fields->cache_data[ $id ]['pf_not_null'] == 1 )
+			{
+				$ftype = 'required_output';
+			}
+			else
+			{
+				$ftype = 'optional_output';
+			}
+    		
+    		if ( $fields->cache_data[ $id ]['pf_type'] == 'drop' )
+			{
+				$form_element = $this->html->field_dropdown( 'field_'.$id, $data );
+			}
+			else if ( $fields->cache_data[ $id ]['pf_type'] == 'area' )
+			{
+				$form_element = $this->html->field_textarea( 'field_'.$id, $data );
+			}
+			else
+			{
+				$form_element = $this->html->field_textinput( 'field_'.$id, $data );
+			}
+			
+			${$ftype} .= $this->html->field_entry( $fields->field_names[ $id ], $fields->field_desc[ $id ], $form_element );
+    	}
+		
+		//-----------------------------------------
+		// Format the interest / location boxes
+		//-----------------------------------------
+		
+		$ibforums->member['location']  = $this->parser->unconvert( $ibforums->member['location']  );
+ 		$ibforums->member['interests'] = $this->parser->unconvert( $ibforums->member['interests'] );
+ 		
+ 		$ibforums->member['key']       = $this->md5_check;
+ 		
+		//-----------------------------------------
+		// Suck up the HTML and swop some tags if need be
+		//-----------------------------------------
+		
+		$this->output .= $this->html->personal_panel($ibforums->member);
+		
+		if ( ($ibforums->vars['post_titlechange']) and ($ibforums->member['posts'] > $ibforums->vars['post_titlechange']) )
+		{
+			$t_html = $this->html->member_title($ibforums->member['title']);
+			$this->output = preg_replace( "/<!--\{MEMBERTITLE\}-->/", $t_html, $this->output );
+		}
+		
+		$t_html = $this->html->birthday($day, $mon, $year);
+		
+		$this->output = preg_replace( "/<!--\{BIRTHDAY\}-->/", $t_html, $this->output );
+		
+		//-----------------------------------------
+		// Add in the custom fields if we need to.
+		//-----------------------------------------
+		
+		if ($required_output != "")
+		{
+			$this->output = str_replace( "<!--{REQUIRED.FIELDS}-->", $this->html->required_title()."\n".$required_output.$this->html->required_end(), $this->output );
+		}
+		
+		if ($optional_output != "")
+		{
+			$this->output = str_replace( "<!--{OPTIONAL.FIELDS}-->", "\n".$optional_output, $this->output );
+		}
+		
+		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+		
+	}
+	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// SPLASH (no, not the movie starring Tom Hanks)
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function splash()
+ 	{
+		global $ibforums, $DB, $std, $print, $forums;
+ 		
+		//-----------------------------------------
+		// Format the basic data
+		//-----------------------------------------
+		
+		$info['member_email']    = $ibforums->member['email'];
+		$info['date_registered'] = $std->get_date( $ibforums->member['joined'], 'LONG' );
+		$info['member_posts']    = $ibforums->member['posts'];
+		
+		$info['daily_average']   = $ibforums->lang['no_posts'];
+		
+		if ($ibforums->member['posts'] > 0 )
+		{
+			$diff = time() - $ibforums->member['joined'];
+			$days = ($diff / 3600) / 24;
+			$days = $days < 1 ? 1 : $days;
+			$info['daily_average']  = sprintf('%.2f', ($ibforums->member['posts'] / $days) );
+		}
+		
+		//-----------------------------------------
+		// Grab the last 5 read topics
+		//-----------------------------------------
+		
+		$topic_array = array();
+		$final_array = array();
+		
+		$topics = $std->my_getcookie( 'topicsread' );
+		$topics = unserialize(stripslashes( $topics ) );
+		
+		$tmp = $ibforums->vars['db_topic_read_cutoff'];
+		$ibforums->vars['db_topic_read_cutoff'] = 0;
+		
+		if ( is_array( $topics ) and count( $topics ) )
+		{
+			arsort($topics);
+			
+			$topic_array = array_slice( array_keys( $topics ), 0, 5 );
+			
+			if ( count( $topic_array ) )
+			{
+				//-----------------------------------------
+				// Grab libraries
+				//-----------------------------------------
+				
+				require_once( ROOT_PATH."sources/forums.php" );
+				$this->forums = new forums();
+				$this->forums->init();
+				
+				$DB->simple_construct( array( 'select' => '*',
+											  'from'   => 'topics',
+											  'where'  => 'tid IN ('.implode(",",$topic_array).')',
+											  'limit'  => array(0,5) ) );
+				
+				$DB->simple_exec();
+											  
+				while ( $row = $DB->fetch_row() )
+				{
+					if ( $forums->forum_by_id[ $row['forum_id'] ] )
+					{
+						$topic = $this->forums->parse_data( $row );
+						$final_array[ $row['tid'] ] = $this->forums->html->render_forum_row( $topic );
+					}
+				}
+				
+				foreach( $topic_array as $tid )
+				{
+					$info['topic_html'] .= $final_array[ $tid ];
+				}
+			}
+		}
+ 		
+ 		$ibforums->vars['db_topic_read_cutoff'] = $tmp;
+ 		
+ 		//-----------------------------------------
+		// Grab the last 5 attachments
+		//-----------------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*',
+								      'from'   => 'attachments',
+									  'where'  => 'attach_member_id='.$ibforums->member['id'],
+									  'order'  => 'attach_date desc',
+									  'limit'  => array( 0, 5 ) ) );
+									  
+		$DB->simple_exec();
+		
+		if ( $DB->get_num_rows() )
+		{
+			$this->topic_html = $std->load_template( 'skin_topic' );
+			
+			$ibforums->lang = $std->load_words($ibforums->lang,'lang_topic', $ibforums->lang_id );
+			
+			while ( $row = $DB->fetch_row() )
+			{
+				//-----------------------------------------
+				// Full attachment thingy
+				//-----------------------------------------
+				
+				$method = $row['attach_msg'] ? 'msg' : 'post';
+				
+				$info['attach_html'] .= $this->topic_html->Show_attachments( array (
+																			   'hits'  => $row['attach_hits'],
+																			   'image' => $ibforums->cache['attachtypes'][ $row['attach_ext'] ]['atype_img'],
+																			   'name'  => $row['attach_file'],
+																			   'pid'   => $row['attach_pid'],
+																			   'id'    => $row['attach_id'],
+																			   'method'=> $method,
+																			   'size'  => $std->size_format( $row['attach_filesize'] ),
+																	 )  	  );
+			}
+		}
+		
+		//-----------------------------------------
+		// Write the data..
+		//-----------------------------------------
+		
+		$s_array = array( 's' => 5 ,
+						  'm' => 7 ,
+						  'l' => 15
+						);
+		
+		$info['NOTES'] = $this->notes ? $this->notes : $ibforums->lang['note_pad_empty'];
+		
+		$info['SIZE']  = $s_array[$this->size];
+		
+		$info['SIZE_CHOICE'] = "";
+		
+		//-----------------------------------------
+		// If someone has cheated, fix it now.
+		//-----------------------------------------
+		
+		if ( empty($info['SIZE']) )
+		{
+			$info['SIZE'] = '5';
+		}
+		
+		//-----------------------------------------
+		// Make the choice HTML.
+		//-----------------------------------------
+		
+		foreach ($s_array as $k => $v)
+		{
+			if ($v == $info['SIZE'])
+			{
+				$info['SIZE_CHOICE'] .= "<option value='$k' selected='selected'>{$ibforums->lang['ta_'.$k]}</option>";
+			}
+			else
+			{
+				$info['SIZE_CHOICE'] .= "<option value='$k'>{$ibforums->lang['ta_'.$k]}</option>";
+			}
+		}
+ 		
+ 		$info['NOTES'] = $std->my_br2nl( $info['NOTES'] );
+ 		
+ 		$this->output .= $this->html->splash($info);
+ 		
+ 		$this->page_title = $ibforums->lang['t_welcome'];
+ 		$this->nav        = array( "<a href='".$ibforums->base_url."act=UserCP&amp;CODE=00'>".$ibforums->lang['t_title']."</a>" );
+ 	}
+ 	
+ 	
+ 	
+ 	
+ 	
+ 	
+ 	/*-------------------------------------------------------------------------*/
+ 	// UPDATE_NOTEPAD:
+ 	//
+ 	// Displays the intro screen
+ 	/*-------------------------------------------------------------------------*/
+ 	
+ 	function update_notepad()
+ 	{
+		global $ibforums, $DB, $std;
+ 		
+ 		// Do we have an entry for this member?
+ 		
+ 		if ($_POST['act'] == "")
+		{
+			$std->Error( array( 'LEVEL' => 1, 'MSG' => 'complete_form' ) );
+		}
+		
+ 		
+ 		$DB->simple_construct( array( 'select' => 'id', 'from' => 'member_extra', 'where' => "id=".$ibforums->member['id'] ) );
+		$DB->simple_exec();
+ 		
+ 		if ( $DB->get_num_rows() )
+ 		{
+ 			$DB->do_update( 'member_extra', array( 'notes' => $ibforums->input['notes'], 'ta_size' => $ibforums->input['ta_size'] ), 'id='.$ibforums->member['id'] );
+ 		}
+ 		else
+ 		{
+ 			$DB->do_insert( 'member_extra',  array( 'notes' => $ibforums->input['notes'], 'ta_size' => $ibforums->input['ta_size'], 'id' => $ibforums->member['id'] ) );
+ 		}
+ 		
+ 		$std->boink_it($ibforums->base_url."act=UserCP&CODE=00");
+ 	}
+ 	
+ 	
+ 	function show_image()
+	{
+		global $ibforums, $DB, $std;
+		
+		
+		if ( $ibforums->input['rc'] == "" )
+		{
+			return false;
+		}
+		
+		// Get the info from the db
+		
+		$row = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'reg_antispam', 'where' => "regid='".trim(addslashes($ibforums->input['rc']))."'" ) );
+		
+		if ( ! $row['regid'] )
+		{
+			return false;
+		}
+		
+		//-----------------------------------------
+		// Using GD?
+		//-----------------------------------------
+		
+		if ( $ibforums->vars['bot_antispam'] == 'gd' )
+		{
+			$std->show_gd_img($row['regcode']);
+		}
+		else
+		{
+		
+			//-----------------------------------------
+			// Using normal then, check for "p"
+			//-----------------------------------------
+			
+			if ( $ibforums->input['p'] == "" )
+			{
+				return false;
+			}
+			
+			$p = intval($ibforums->input['p']) - 1; //substr starts from 0, not 1 :p
+			
+			$this_number = substr( $row['regcode'], $p, 1 );
+			
+			$std->show_gif_img($this_number);
+		}
+		
+	}
+        
+}
+
+?>
\ No newline at end of file
diff --git a/upload/ssi_templates/index.html b/upload/ssi_templates/index.html
deleted file mode 100644
index 7a0e71b5..00000000
--- a/upload/ssi_templates/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html>
<head><title>IBForums - Bulletin Board System</title></head>
<body>
<h1>403: IBForums-> Forbidden</h1>
<hr>
You have reached this Page in error, please use
your back button to return to Invision Board.
<hr>
<a href="http://www.invisionboard.com/">Get your free download of IBForums now!</a>
</body>
</html>
\ No newline at end of file
diff --git a/upload/ssi_templates/syndicate_xml.html b/upload/ssi_templates/syndicate_xml.html
deleted file mode 100644
index 79f75785..00000000
--- a/upload/ssi_templates/syndicate_xml.html
+++ /dev/null
@@ -1 +0,0 @@
-[TOP]
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE ipbsource
[
	<!-- CUSTOM IPB INLINE DOCTYPE -->
	<!ELEMENT ipbsource (topic+) >
	<!ELEMENT topic     (title,lastposter,starter,forum,date) >
	<!ATTLIST topic id	     CDATA #REQUIRED >
	
	<!ELEMENT title		   (#PCDATA) >
	
	<!ELEMENT lastposter   (#PCDATA) >
	<!ATTLIST lastposter id  CDATA #REQUIRED >
	
	<!ELEMENT starter      (#PCDATA) >
	<!ATTLIST starter    id  CDATA #REQUIRED >
	
	<!ELEMENT forum		   (#PCDATA) >
	<!ATTLIST forum id  	 CDATA #REQUIRED >
	
	<!ELEMENT date		   (#PCDATA) >
	<!ATTLIST date timestamp CDATA #REQUIRED >
]>
<ipbsource>
[/TOP]

[ROW]
	<topic id="{topic_id}">
		<title>{topic_title}</title>
		<lastposter id="{last_poster_id}">{last_post_name}</lastposter>
		<starter id="{starter_id}">{starter_name}</starter>
		<forum id="{forum_id}">{forum_title}</forum>
		<date timestamp="{timestamp}">{last_post_time}</date>
	</topic>
[/ROW]

[BOTTOM]
</ipbsource>
[/BOTTOM]
\ No newline at end of file
diff --git a/upload/html/avatars/Abu.gif b/upload/style_avatars/Abu.gif
similarity index 100%
rename from upload/html/avatars/Abu.gif
rename to upload/style_avatars/Abu.gif
diff --git a/upload/html/avatars/Aladdin.gif b/upload/style_avatars/Aladdin.gif
similarity index 100%
rename from upload/html/avatars/Aladdin.gif
rename to upload/style_avatars/Aladdin.gif
diff --git a/upload/html/avatars/Alfred.gif b/upload/style_avatars/Alfred.gif
similarity index 100%
rename from upload/html/avatars/Alfred.gif
rename to upload/style_avatars/Alfred.gif
diff --git a/upload/html/avatars/Ares.gif b/upload/style_avatars/Ares.gif
similarity index 100%
rename from upload/html/avatars/Ares.gif
rename to upload/style_avatars/Ares.gif
diff --git a/upload/html/avatars/ArmondoGuitierrez.gif b/upload/style_avatars/ArmondoGuitierrez.gif
similarity index 100%
rename from upload/html/avatars/ArmondoGuitierrez.gif
rename to upload/style_avatars/ArmondoGuitierrez.gif
diff --git a/upload/html/avatars/Arthur.gif b/upload/style_avatars/Arthur.gif
similarity index 100%
rename from upload/html/avatars/Arthur.gif
rename to upload/style_avatars/Arthur.gif
diff --git a/upload/html/avatars/Atta.gif b/upload/style_avatars/Atta.gif
similarity index 100%
rename from upload/html/avatars/Atta.gif
rename to upload/style_avatars/Atta.gif
diff --git a/upload/html/avatars/Batman.gif b/upload/style_avatars/Batman.gif
similarity index 100%
rename from upload/html/avatars/Batman.gif
rename to upload/style_avatars/Batman.gif
diff --git a/upload/html/avatars/Batman2.gif b/upload/style_avatars/Batman2.gif
similarity index 100%
rename from upload/html/avatars/Batman2.gif
rename to upload/style_avatars/Batman2.gif
diff --git a/upload/html/avatars/BlackWidow.gif b/upload/style_avatars/BlackWidow.gif
similarity index 100%
rename from upload/html/avatars/BlackWidow.gif
rename to upload/style_avatars/BlackWidow.gif
diff --git a/upload/html/avatars/BruceWayne.gif b/upload/style_avatars/BruceWayne.gif
similarity index 100%
rename from upload/html/avatars/BruceWayne.gif
rename to upload/style_avatars/BruceWayne.gif
diff --git a/upload/html/avatars/Catwoman2.gif b/upload/style_avatars/Catwoman2.gif
similarity index 100%
rename from upload/html/avatars/Catwoman2.gif
rename to upload/style_avatars/Catwoman2.gif
diff --git a/upload/html/avatars/Flik.gif b/upload/style_avatars/Flik.gif
similarity index 100%
rename from upload/html/avatars/Flik.gif
rename to upload/style_avatars/Flik.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Aeroplane.gif b/upload/style_avatars/IPB_Community_Pack/Aeroplane.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Aeroplane.gif
rename to upload/style_avatars/IPB_Community_Pack/Aeroplane.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Crazyman.jpg b/upload/style_avatars/IPB_Community_Pack/Crazyman.jpg
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Crazyman.jpg
rename to upload/style_avatars/IPB_Community_Pack/Crazyman.jpg
diff --git a/upload/html/avatars/IPB_Community_Pack/Dolphin.jpg b/upload/style_avatars/IPB_Community_Pack/Dolphin.jpg
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Dolphin.jpg
rename to upload/style_avatars/IPB_Community_Pack/Dolphin.jpg
diff --git a/upload/html/avatars/IPB_Community_Pack/Fish.gif b/upload/style_avatars/IPB_Community_Pack/Fish.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Fish.gif
rename to upload/style_avatars/IPB_Community_Pack/Fish.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Golfball.gif b/upload/style_avatars/IPB_Community_Pack/Golfball.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Golfball.gif
rename to upload/style_avatars/IPB_Community_Pack/Golfball.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Green-haze.gif b/upload/style_avatars/IPB_Community_Pack/Green-haze.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Green-haze.gif
rename to upload/style_avatars/IPB_Community_Pack/Green-haze.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Hammer-man.jpg b/upload/style_avatars/IPB_Community_Pack/Hammer-man.jpg
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Hammer-man.jpg
rename to upload/style_avatars/IPB_Community_Pack/Hammer-man.jpg
diff --git a/upload/html/avatars/IPB_Community_Pack/IBFstars.jpg b/upload/style_avatars/IPB_Community_Pack/IBFstars.jpg
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/IBFstars.jpg
rename to upload/style_avatars/IPB_Community_Pack/IBFstars.jpg
diff --git a/upload/html/avatars/IPB_Community_Pack/Leaf.gif b/upload/style_avatars/IPB_Community_Pack/Leaf.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Leaf.gif
rename to upload/style_avatars/IPB_Community_Pack/Leaf.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Melon.gif b/upload/style_avatars/IPB_Community_Pack/Melon.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Melon.gif
rename to upload/style_avatars/IPB_Community_Pack/Melon.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Meow.gif b/upload/style_avatars/IPB_Community_Pack/Meow.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Meow.gif
rename to upload/style_avatars/IPB_Community_Pack/Meow.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Orange-sticks.gif b/upload/style_avatars/IPB_Community_Pack/Orange-sticks.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Orange-sticks.gif
rename to upload/style_avatars/IPB_Community_Pack/Orange-sticks.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Pink-sea.gif b/upload/style_avatars/IPB_Community_Pack/Pink-sea.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Pink-sea.gif
rename to upload/style_avatars/IPB_Community_Pack/Pink-sea.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Pow.gif b/upload/style_avatars/IPB_Community_Pack/Pow.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Pow.gif
rename to upload/style_avatars/IPB_Community_Pack/Pow.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Radioactive.gif b/upload/style_avatars/IPB_Community_Pack/Radioactive.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Radioactive.gif
rename to upload/style_avatars/IPB_Community_Pack/Radioactive.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Whale.jpg b/upload/style_avatars/IPB_Community_Pack/Whale.jpg
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Whale.jpg
rename to upload/style_avatars/IPB_Community_Pack/Whale.jpg
diff --git a/upload/html/avatars/IPB_Community_Pack/Woof.gif b/upload/style_avatars/IPB_Community_Pack/Woof.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Woof.gif
rename to upload/style_avatars/IPB_Community_Pack/Woof.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/Wub.gif b/upload/style_avatars/IPB_Community_Pack/Wub.gif
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/Wub.gif
rename to upload/style_avatars/IPB_Community_Pack/Wub.gif
diff --git a/upload/html/avatars/IPB_Community_Pack/avatar-readme.txt b/upload/style_avatars/IPB_Community_Pack/avatar-readme.txt
similarity index 100%
rename from upload/html/avatars/IPB_Community_Pack/avatar-readme.txt
rename to upload/style_avatars/IPB_Community_Pack/avatar-readme.txt
diff --git a/upload/html/avatars/Smiley_Avatars/smiley-aloof.gif b/upload/style_avatars/Smiley_Avatars/smiley-aloof.gif
similarity index 100%
rename from upload/html/avatars/Smiley_Avatars/smiley-aloof.gif
rename to upload/style_avatars/Smiley_Avatars/smiley-aloof.gif
diff --git a/upload/html/avatars/Smiley_Avatars/smiley-biggrin.gif b/upload/style_avatars/Smiley_Avatars/smiley-biggrin.gif
similarity index 100%
rename from upload/html/avatars/Smiley_Avatars/smiley-biggrin.gif
rename to upload/style_avatars/Smiley_Avatars/smiley-biggrin.gif
diff --git a/upload/html/avatars/Smiley_Avatars/smiley-blunder.gif b/upload/style_avatars/Smiley_Avatars/smiley-blunder.gif
similarity index 100%
rename from upload/html/avatars/Smiley_Avatars/smiley-blunder.gif
rename to upload/style_avatars/Smiley_Avatars/smiley-blunder.gif
diff --git a/upload/html/avatars/Smiley_Avatars/smiley-evil.gif b/upload/style_avatars/Smiley_Avatars/smiley-evil.gif
similarity index 100%
rename from upload/html/avatars/Smiley_Avatars/smiley-evil.gif
rename to upload/style_avatars/Smiley_Avatars/smiley-evil.gif
diff --git a/upload/html/avatars/Smiley_Avatars/smiley-grimmace.gif b/upload/style_avatars/Smiley_Avatars/smiley-grimmace.gif
similarity index 100%
rename from upload/html/avatars/Smiley_Avatars/smiley-grimmace.gif
rename to upload/style_avatars/Smiley_Avatars/smiley-grimmace.gif
diff --git a/upload/html/avatars/Smiley_Avatars/smiley-punched.gif b/upload/style_avatars/Smiley_Avatars/smiley-punched.gif
similarity index 100%
rename from upload/html/avatars/Smiley_Avatars/smiley-punched.gif
rename to upload/style_avatars/Smiley_Avatars/smiley-punched.gif
diff --git a/upload/html/avatars/abra1.gif b/upload/style_avatars/abra1.gif
similarity index 100%
rename from upload/html/avatars/abra1.gif
rename to upload/style_avatars/abra1.gif
diff --git a/upload/html/avatars/arbok.gif b/upload/style_avatars/arbok.gif
similarity index 100%
rename from upload/html/avatars/arbok.gif
rename to upload/style_avatars/arbok.gif
diff --git a/upload/html/avatars/artistbirdie.gif b/upload/style_avatars/artistbirdie.gif
similarity index 100%
rename from upload/html/avatars/artistbirdie.gif
rename to upload/style_avatars/artistbirdie.gif
diff --git a/upload/html/avatars/avengers.gif b/upload/style_avatars/avengers.gif
similarity index 100%
rename from upload/html/avatars/avengers.gif
rename to upload/style_avatars/avengers.gif
diff --git a/upload/html/index.html b/upload/style_avatars/index.html
similarity index 100%
rename from upload/html/index.html
rename to upload/style_avatars/index.html
diff --git a/upload/html/emoticons/angry.gif b/upload/style_emoticons/default/angry.gif
similarity index 100%
rename from upload/html/emoticons/angry.gif
rename to upload/style_emoticons/default/angry.gif
diff --git a/upload/html/emoticons/biggrin.gif b/upload/style_emoticons/default/biggrin.gif
similarity index 100%
rename from upload/html/emoticons/biggrin.gif
rename to upload/style_emoticons/default/biggrin.gif
diff --git a/upload/html/emoticons/blink.gif b/upload/style_emoticons/default/blink.gif
similarity index 100%
rename from upload/html/emoticons/blink.gif
rename to upload/style_emoticons/default/blink.gif
diff --git a/upload/html/emoticons/blush.gif b/upload/style_emoticons/default/blush.gif
similarity index 100%
rename from upload/html/emoticons/blush.gif
rename to upload/style_emoticons/default/blush.gif
diff --git a/upload/html/emoticons/closedeyes.gif b/upload/style_emoticons/default/closedeyes.gif
similarity index 100%
rename from upload/html/emoticons/closedeyes.gif
rename to upload/style_emoticons/default/closedeyes.gif
diff --git a/upload/html/emoticons/cool.gif b/upload/style_emoticons/default/cool.gif
similarity index 100%
rename from upload/html/emoticons/cool.gif
rename to upload/style_emoticons/default/cool.gif
diff --git a/upload/html/emoticons/dry.gif b/upload/style_emoticons/default/dry.gif
similarity index 100%
rename from upload/html/emoticons/dry.gif
rename to upload/style_emoticons/default/dry.gif
diff --git a/upload/html/emoticons/excl.gif b/upload/style_emoticons/default/excl.gif
similarity index 100%
rename from upload/html/emoticons/excl.gif
rename to upload/style_emoticons/default/excl.gif
diff --git a/upload/html/emoticons/glare.gif b/upload/style_emoticons/default/glare.gif
similarity index 100%
rename from upload/html/emoticons/glare.gif
rename to upload/style_emoticons/default/glare.gif
diff --git a/upload/html/emoticons/happy.gif b/upload/style_emoticons/default/happy.gif
similarity index 100%
rename from upload/html/emoticons/happy.gif
rename to upload/style_emoticons/default/happy.gif
diff --git a/upload/html/emoticons/huh.gif b/upload/style_emoticons/default/huh.gif
similarity index 100%
rename from upload/html/emoticons/huh.gif
rename to upload/style_emoticons/default/huh.gif
diff --git a/upload/sources/Drivers/index.html b/upload/style_emoticons/default/index.html
similarity index 100%
rename from upload/sources/Drivers/index.html
rename to upload/style_emoticons/default/index.html
diff --git a/upload/html/emoticons/laugh.gif b/upload/style_emoticons/default/laugh.gif
similarity index 100%
rename from upload/html/emoticons/laugh.gif
rename to upload/style_emoticons/default/laugh.gif
diff --git a/upload/html/emoticons/mad.gif b/upload/style_emoticons/default/mad.gif
similarity index 100%
rename from upload/html/emoticons/mad.gif
rename to upload/style_emoticons/default/mad.gif
diff --git a/upload/html/emoticons/mellow.gif b/upload/style_emoticons/default/mellow.gif
similarity index 100%
rename from upload/html/emoticons/mellow.gif
rename to upload/style_emoticons/default/mellow.gif
diff --git a/upload/html/emoticons/ninja.gif b/upload/style_emoticons/default/ninja.gif
similarity index 100%
rename from upload/html/emoticons/ninja.gif
rename to upload/style_emoticons/default/ninja.gif
diff --git a/upload/html/emoticons/ohmy.gif b/upload/style_emoticons/default/ohmy.gif
similarity index 100%
rename from upload/html/emoticons/ohmy.gif
rename to upload/style_emoticons/default/ohmy.gif
diff --git a/upload/html/emoticons/ph34r.gif b/upload/style_emoticons/default/ph34r.gif
similarity index 100%
rename from upload/html/emoticons/ph34r.gif
rename to upload/style_emoticons/default/ph34r.gif
diff --git a/upload/html/emoticons/rolleyes.gif b/upload/style_emoticons/default/rolleyes.gif
similarity index 100%
rename from upload/html/emoticons/rolleyes.gif
rename to upload/style_emoticons/default/rolleyes.gif
diff --git a/upload/html/emoticons/sad.gif b/upload/style_emoticons/default/sad.gif
similarity index 100%
rename from upload/html/emoticons/sad.gif
rename to upload/style_emoticons/default/sad.gif
diff --git a/upload/html/emoticons/sleep.gif b/upload/style_emoticons/default/sleep.gif
similarity index 100%
rename from upload/html/emoticons/sleep.gif
rename to upload/style_emoticons/default/sleep.gif
diff --git a/upload/html/emoticons/smile.gif b/upload/style_emoticons/default/smile.gif
similarity index 100%
rename from upload/html/emoticons/smile.gif
rename to upload/style_emoticons/default/smile.gif
diff --git a/upload/html/emoticons/tongue.gif b/upload/style_emoticons/default/tongue.gif
similarity index 100%
rename from upload/html/emoticons/tongue.gif
rename to upload/style_emoticons/default/tongue.gif
diff --git a/upload/html/emoticons/unsure.gif b/upload/style_emoticons/default/unsure.gif
similarity index 100%
rename from upload/html/emoticons/unsure.gif
rename to upload/style_emoticons/default/unsure.gif
diff --git a/upload/html/emoticons/wacko.gif b/upload/style_emoticons/default/wacko.gif
similarity index 100%
rename from upload/html/emoticons/wacko.gif
rename to upload/style_emoticons/default/wacko.gif
diff --git a/upload/html/emoticons/wink.gif b/upload/style_emoticons/default/wink.gif
similarity index 100%
rename from upload/html/emoticons/wink.gif
rename to upload/style_emoticons/default/wink.gif
diff --git a/upload/html/emoticons/wub.gif b/upload/style_emoticons/default/wub.gif
similarity index 100%
rename from upload/html/emoticons/wub.gif
rename to upload/style_emoticons/default/wub.gif
diff --git a/upload/style_images/1/addresscard.gif b/upload/style_images/1/addresscard.gif
deleted file mode 100644
index e7e17e4cf5827ea10bf96a23156f9e873c4abbda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1382
zcmV-s1)2IsNk%w1VI2S!0QUd@V~V_crqh0};XYPr%GKn7vDbKvvxT(RZIrgy+1XN3
zQd)w(QhL3Gg@#0FwUo>9e5lj5wzqMe(T2I*`uh6K*yd(tW_6*?X_Cf+oXf}2;FHMj
z<>u#ntlMjq$%?$)PEJmBb#<()uD!j!g}CZ}u-1ya<?8C|ahk%SqN6D(Dc;}UY;0_^
zy~?DerEQtcL1(nW%-Up(!g8R|`1tvHr_Su`?VFsPiMir*qSkhv%Wj>{X=!OlNJw|2
z&w;e%g|yyhjI-n9<=x%iv9Ynz($dh;)KYV`b)v<O!s#S3L4&f`@$m6cZ;X1X-9bS?
z<KpGr-rm~V-q6v~Jv}|h$;onZa+1gFU4Fh>TU&0N&_+f^8X6i<akB;n2GQK>vb)H}
z(cj9{<F&ucPjIry)8fzB==S#Z$kXAsz|PRy>htsTg0S21@$$^g&`fZ+W{}12@9=-D
z*N(vH+}zx|#nR8(>G${db)dzIzUFUlZ?wM4ki_i0#?+F=?~umqTYI>FnaYmB?AzVm
z`1tp*xyIDh*J6jXVTHI@gTdh8<40nNPj8jGyuws+i&%M`$H&LU#>u<8zHfDXhPK*<
ztJCZ2?9b5BdZ^KNqs4!$(XYVUz|Q5Dn3(PD?v9<eFG_+xW2~X6wOoI#hq&U-&d$rs
z&u)mjva_^}wb-Gu&Xc>@IZkVTvEZVkr7u8KgShD1+~9b4c#y;AhrI0c^!4`j_Ri1K
zd#v52r>Wc8;MLXGf`Wp9vc_<m#&n&>bfL>TQffqBd_7ff(9qC_w%5_p)N`Q4=H};Q
zkjU=t?{=lrbDqU-n#X~#*m$PdfwSR&vgCrb;b353yvpBvtkrz2*MF_lzR1>ouGWpB
z$&jVY@$&QX^7B?!R{8n*%FE7Hb+UJ++3f7<prE3Y%j0&U#$bf1e5=lk!RTdwv3R1&
zkB^YAxWt00)YH_~fUVU?WPMO?dd}JEXpg%zG&Hiq-%fVC;o;%q<Kw%$y@R&sYLLLh
z&fL}2)z{b8EC2ui0384o000R80KW(vNKhcMB1MKoNgxVM!G{pP;3G!IMw=5tMoiih
zao{|Afv`A$L8nx{GZfA+IU!{VBv7FoU<tIzjGBR*95A@>;a?GCcPLPxvBndJ6{g6^
z>s4;T4hGu@m=TykMygd+5)7qr=ggWoHim#}B#Fo(M9qp_TcAyhoiA_rRnkFZ*S9mZ
z)^y`GPS-6rM%<)eH41|VcMAZ;sPF{_3Lh7OjDTV*&P6E38mOS6Z%Bd&j4-@-0pLg-
z0*!w`2%y8oJ4-?aNr}SFi)}qdZlD@=NP+|zUDAkYyiSgB1i3C5ip9Z(9xl*9h*0uM
z7=Ro(;E)+prg056-~+h-h_nKkGD0C#s1Kne*dux~o{7V-y*ms|K=K1Y;X()#8pt&8
zL_Jg}F~B*?;NrxB9@N(uJUB#1iZde^qeuj<+|a`lJ-E=s1+54mq5v;A2*VP2q-cT(
z=7>N}Csrr`f{Y4G(||7>{P06GT9`;l5<t!|#{>v8pg<ND@W2BLELf0*6+yHD%RV!h
z_`wx_{J{qwg5bc5EFoCn4G2AK(Srhd!~+a1B;?@W8%xZx!JHfT;Ria744~(pdp6+%
zEzoEYj&NTD0*4R9T=Br752T|>CP+kz1Ri)C!%Pj*ShGVS2AuW<H9C2K$pNGuu*9ha
z6i~vdt7cQp49VO}V?aBLePM<Ms+@AfNHFy3>#x2#(1kjm6oQRg0+}I341J{0LJMF-
oEA6z=KAT1#{YXWS8fFk61{xZKA?~>3imL${Vn}t<7XbkPJGia)@&Et;

diff --git a/upload/style_images/1/atb_calendar.gif b/upload/style_images/1/atb_calendar.gif
deleted file mode 100644
index 4ce8025be64a5babecbe71c5ff32131713d1092a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 627
zcmV-(0*w7fNk%w1VG;lj0Oo%HnRP_*`TnD14&v<c{TUm$s+8NwtEq=r>erXLbQZ>?
zbeCNYwTMdD#G2dI%JlpH_>Gs%yPJoHho_Z=_1D|r>F=bAXSI4Hk(#8ulwIb_cI4Q_
zseC+|V-(8C#q#(2teAVswUp}W<j|o%-r?fc-QvZFH}v-O%akeM=j-XfAno}7@b~<t
zawp5u*P?13!nL2umN)kN|M`7|<mv2#lA`DA@9Xyd*5m4{l9}6>Lh96i$i~9KfEDZY
z``pg9uWJv>z_Q8A&&aTh(}p0DeSzu7O32{;z@c^T(bo3Q)4zc#;N<7Sva7^|FW<Rl
z?Bcf|Z{*n4(dX&qvyfh$fmhbAW0#YRx|U|4s<6Y()!Vm;w|_O0n&t2F^tr^z{Xj+g
zYjM!TvGwWg(#yZw&%MXY&aS)1!jDPq-{#VuSm)~N>gCna)Ya10+vVZS+TP#2zP{Js
z=KV4@-{tA)@AI{yiO{ir*|Bihxp(H|-`A{N?dsOpkrn9k`~Uy{A^8LW004ggEC2ui
z01^NX000NjfPaF6f_r@ogo%lFF%2;nWr~RgC?YamRy~q~Y$$I5NdXTA5`=jwDn<w+
z5jZz95MUH1Pdx^IFL*LC4^u51QZq_(U@~hX9e)5#esTj53JM++VF6<{7z_(!MO_so
zE-MZ#R8pc37#0gve-k+s179T}KWH#s4>T462Z9AADVWspu_6QqBydt-SYUxr0vaE*
zNT3rzgbokcKqL~d;ll?SLb6C$g5&@UMK89r!El9&i3A;jY~nx!ixVIn0D$1J>5muz
N0su^i(^F6&06TB#QJw$*

diff --git a/upload/style_images/1/atb_chat.gif b/upload/style_images/1/atb_chat.gif
deleted file mode 100644
index 0db747c2176adb9b8a98d0f42481ee12a41204c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 361
zcmZ?wbhEHb6lCCMxXQqA^1{tGZ{H<XOxe2k*psKvZr-}{_TBrGDJPS&ivIrl*D~ky
z+js9?y?OiV&)?T?-o1MLcFF23>$dLmDOhvi+Ku4q?a$u4J$v=u{$po%9XR>w^_%PW
zo=4<$9zJ;~v!F7!wC?TOcb`6gZJx2EqHpD%!>13QINve<{LwR4?>u@uYyHuqr!JQE
z?wLMs`SyLs1IxGn`u+F9)w>m&9!54FK79Jh??3<U-M|0m??1=%EeyDU;!hT^qz;G#
z`H6w8?ZBj54;?AdZOl0*bBy?%J+r;m2B|uG<(z(7r0F~@$476n;bB296@eV5+=iGs
z$w_fP_SnsrvWsbGY-;3p<`L$QVPzE%7GUL2;N|6U<};o#bJk2gXGRuTHAxmhZFNBw
t(^ZV~R;^pVevKJ7o1B=u6q_hB^KMQ~ZfBFjM~)sd^Kd)mqUFe74FI-Msek|g

diff --git a/upload/style_images/1/atb_help.gif b/upload/style_images/1/atb_help.gif
deleted file mode 100644
index 0c077b9e32908996ce8ca91698d6cfa8d0831183..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 617
zcmV-v0+#(pNk%w1VGsZh0Oo%HMPr^_jNyQq&r^NNY@^(JmBvJ6tW9#bWtq}+jlx!f
z(}I+{TY$t-dc~>0>%_>;KxDB`cfr5W?YqU+-QnfW($>w;)LMnnRe;V}huK<)+eB%)
zO>MEYy1Q9(xOl4H%g)n=nZCEj=FrpEgrLx(!sL>z-qO*>qs!@$puCQ!(T1?!X`j|#
zkJ!%D-cD+!U2?U~(biCDpmCJc=<M;o#LURo?0K2Z@$~!4+v~~K@v^(jaEQEqxZ`oG
z-iw&7gP6glx!sPQz~JNJ=j!k5>*2M=-|_F{zQ@?!+|$_H-|_I}j;Y;Wkj;>w!jH%4
zo~XfAg2iZ^*`K@RLuj>-ow$9P({Y*NW0lp5pvq^Q*q5u!&CboFy5mM^tnKppN@1;y
zp2<*gxLA9?X@j`X;`EA|y13Zx=;z&dm(j`6-_F$8&C%0kk>aPZ$Kl}DuDH&_%h>n%
z{Ew;DxWUud+u&r6-D!`~v%AFH;o{cS%XW{rceLVGfyiHw=l}ozA^8LW004ggEC2ui
z01yBV000NZfPaF6f)Z0Ugo%SIT2fjcB{_<JC_V@zK@3qWO)5l#XFUXc5oscFRuNu1
z6n|w;d{_gsGfX&L2YWY2CM^UCzzRBF5)Ky!9RO|~V-XD*8f6Z48X64?KQbU-P<RCm
z16OSU0T~R*RU<G9CwdPg7#Mzj7+Yp94}W0>LR?92Yvx=~aEFb76czr^m_Wt=kP&E#
z<T0Wo3x|AzDA3^np@54eM}|-d5o6MX1XL2J5g?{Uok@QvoZPU%NlBQ4;=r*$C=dWU
Dxs6SM

diff --git a/upload/style_images/1/atb_members.gif b/upload/style_images/1/atb_members.gif
deleted file mode 100644
index b52134a6c81f82701490406642d41e5bed35ce95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 685
zcmV;e0#f})Nk%w1VG{rk0OkMy$C^$mP0s(WN5`peNn=ab+T1Hot2D4NmopE-#mTa@
zx<<i9cdPAKYXAL_F?M-*XoUVlP;w_KEad3yg@=h)T8rz>o&UR3V5(%hs)tfjQ?_Lq
zJa90#QX2oGI*>#eV!vdj)3j@9YC%Ip(`qA_nwv>AD-#qH=k4@@QX=@2D8_>-L|pZv
zr>WcC<9;hHJzYQ0)7QMd!e?Py-Qng_$5VMD4Ah7s9*iEBYZy;(>seu8_=+u4sDPcI
zqw}stO>foKs$*V{<<hu?a&KoSJbCQ!_5c6>>8eA4i=zLqNr9>5$jr|}mPB-!TPAUE
z?S?I5$6e-}HsZW`^p7x+f@Ml*?q)(bO=I}Fh9*;g>Qr&_i;s}MjYe*7a$Z_mp3C~b
z%j!Umlw^cta<qghlP+Hy0Zb@OS0@qNqCR}ZcRXC=X3uHi-qdi@Z{pzF$e2OWlrF~5
z=+)ow6mb-c$e@Jdf2)f?p@v(q=KsBvMm>>rqoSVfeI{ax>Hq)#A^8LW004ggEC2ui
z022TY000O7fPaF2F)@RJZ39CC8HaxgJ0c=q6oPMhQx+C*Rfi*9B`psUUVj-`06{@;
zIVFN48X8|$2p=X206%F+KR<Cqf)XPp8+{HQ8xH^%%*;|V!4fGvR8&wMGhIsC0s<={
ze_tmjA0*}^A0l`j?CdF(KI3Q|^c^-7d^all8yX6N6vmlBfWU@{F&Lb5S#gKMgF{IS
zoO$u0f`L7D>Yyk<hE0<egLFX9vIGnR2v&NiIT8Ydn;IPc%mLB>0t6v>7;I@ECQ3^-
zH5TCD5+(qPnp+t7X~5#ifiepg95_JdfgA$?)?jI{CP0898g>wXK^DdikP0e9SQ}x7
T7cL44m@r8oqi%vffdBwI_OdGX

diff --git a/upload/style_images/1/atb_search.gif b/upload/style_images/1/atb_search.gif
deleted file mode 100644
index 88e4d76bbf25009b9c1faa404590112d915bf0e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 576
zcmV-G0>Ax7Nk%w1VGjTg0Oo!G{JcJ=thbtpae#@S&*t=<qq1jXW00Y^qn3xLthdSM
z`GIg(%h21|?fK5>`p@h8;_vrxdXn4m{ldY&$msgZ==sRZ(Zk2g*!KVG_58ub&D!kt
zad?Tn!O4S-q}%lWsK(pw^7q&C{*jlcTx*HA)8f?Z`nbKueu$ucnzL$2A$3?Tn{5`B
zY#h7B(}S0<#^?I2w8WNeAZve{W_g!uMHt@W>)Yz{>Fx6D`Tnxc;e2aS-uC}sI}wSd
z!Q%M;)9Uzng`a_mp^&1vm!h`h^7_JnA)=Lra(kA6n6Sys)ztF;fo@fzm4&;1D0_;d
z)$94+`TyPT`kHSYaetZ5+vk~Q7qPg<zPq*3)77%V)AYAIp}*7K@cO&J&dlNNr>(bT
zVqxCz_;EoA;qCUhdnD28`Fw<#sIS1`@%goTCX14$il@Gkr@wfPuF~lA+w%S8@%r2C
z_`TQWU2~G|vODJJ>Y<Z>rgI*6M+}|0(q(p$f^l1MK??u>{{R30A^8LW004dfEC2ui
z01p5U000M_fPR95f<j0rgoz<&9xhc{PXmd9F+@2(A3ShFYl${NVj?gKW)cKcN`zhq
zQ4|$G4P9?91%y{^7!FW!X>ngkBZLfYOD0l98Du3h0fbm#dJh{AH*;(e7K2SJcm_To
zI$S9v34;hS07g9=G<17sV1jl>En7}~Ocxp_9fSf?b<~XEGilHYD`oQRC^+bjiW&<T
O4#JUTg2X|A0029q^*Y4>

diff --git a/upload/style_images/1/attachicon.gif b/upload/style_images/1/attachicon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3c85ca7c504b33d9b69f3eb7897cc419e8c762d1
GIT binary patch
literal 59
zcmZ?wbhEHb<Y3@pXkcUjg8%>jEB<5wG8q|kKzxu41Cx+XL)wBpdt<CN9rKQ#^vdK3
I3oC;)0F<T=h5!Hn

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/bar.gif b/upload/style_images/1/bar.gif
index fe373dad32a5c36c28b51d03b6482b2bab94537f..8790473c412171e4e9655eaf3c8b623dbee4a866 100644
GIT binary patch
literal 107
zcmZ?wbhEHbWMSZD*v!C?Htl-$+<UQ|CzB>zXx;HOXU4Vs#ZLoDw**z}VAo1xzyOLr
qS-@gCAQEH-1B-;g$rdf88B=0g#GNe|R0QTUE|hYw_VHw4um%A0aU7`t

literal 65
zcmZ?wbhEHbWMtrASj52Kn7*ZC<IB=bk8_tji0n9#I_p}_k}C`h42nNlfFuKh4u}A$
QWngCGa57C)U}Ufc0LYyYwEzGB

diff --git a/upload/style_images/1/bar_left.gif b/upload/style_images/1/bar_left.gif
index 7be171e4d1a57848d278c16931d3b0f25c97e206..56a86a3df74f2e32e420c869748a7c702151c982 100644
GIT binary patch
literal 106
zcmZ?wbhEHbWMSZD*v!C?Htl-$+<UQ|CzB>zXx;HOXU4Vs#ZLoDw**z}VAo1xzyOLr
pS-@gCAQEH-1B<wUXJ?j@#nibi{?0QPQiSGoE>v^3RuyEh1_0O99GL(B

literal 69
zcmZ?wbhEHbWMbf8Sj52Kn7*ZZ@ui$4SJLKOil1;Yamu;i`rWz9ZYlm`VE_Rg5CKxl
Tz|1AVz{<wLQ_v8=$zTltGMp23

diff --git a/upload/style_images/1/bar_right.gif b/upload/style_images/1/bar_right.gif
index e31d14283f2426b090110137f72d4c675f265857..7c272a2b99caa1fa6b218332e4e80f6b85d39ff5 100644
GIT binary patch
literal 106
zcmZ?wbhEHbWMSZD*v!C?Htl-$+<UQ|CzB>zXx;HOXU4Vs#ZLoDw**z}VAo1xzyOLr
pS-@gCAQEH-1B<x9$(Af7i>Y&4{GDeoqzKLFT&U)5?J3A$4FKcv9XJ30

literal 69
zcmZ?wbhEHbWMbf8Sj52Kn7*ZZ@ui$4SJLKOil1;Yamu;i`rWz9ZYlm`VE_Rg5CKxl
Tz|6%FnBb7mz|0cB$zTltJOLCl

diff --git a/upload/style_images/1/bc_new.gif b/upload/style_images/1/bc_new.gif
index 069e931aa84bb3a88f8e44c2bf9cd66f230b4adf..0b32108eb57e05d450eda5eab90a6d7ab068ae8f 100644
GIT binary patch
literal 772
zcmZ?wbhEHblxC1-c*ekxyWnB^^c#`QhmV}Q6Ww;KX5Piv&Xbw5ZYTDiPo8)wzUNHi
z(wnJMuhuTSQos0G)AHN59=;B5IMA}{ZbZ|e(7Jt5ZO6hI545g%kluSdZ^ot6sn=pU
zPiFL=ESz&aZQAvWnYTjg_J%d=x6Rv;(tRwV`EXp<>Eub5V%m?#beznXaWiwmDT}oA
z5se4adXB~QoXO}rkv!>g&cu_sQ!j)y97vjYF>msz^xk7ptw*C;kHvMLan0XcwcuKK
z<H5-0LrFcS@}^zPoOmjx^-%8gi}pENk|tbCn{+Ow<zRTz!L<HU*^|%aOg*15;bd6-
z{>+J|Q~ORPb{@-`bS9zyeEN)=A$5Bb`p#v~y;rdGd1%e<C-48{FMbkSwe#`2KQi94
zTX%fTnQ<+wZr|f~zattC>^gdtT`TSX|Njis28usfz((qTNKl+Gu>WrmU`}djZENpn
zVQxz9?dzW~vA;PvcG~nAGiOapZb^<?uyE1hB@5;zB}c7Vy=LvYRm+pZH*eXxZTsep
z@w@lz-M4@D#>B%%jvhOHcq7wkCSgTE8y^J`K^;Mn%f`ZIm^QN9XAx$VP-J~(m}vHl
z)zsGf!A7=EY)riRV!XO;yvh>1!H!Y|7KZxMnwq(^EEt>)HFhcUO)Dr!c-YCO7ZWDa
z)4D*piI;m)NW_IBCz(_N#8y0UYU7#Sw^8VX&xFT~JR<yZZ+-+ion)4=i`X?qvb!;m
zEl?$;K+%yyRM^DG<3@mshWO%*Oc}fkkDb_+;!IgC7_cZGn-;U>nAL%A4qW_<iAxUr
zEqKs;VOqw`W2+8rUw?mJ`NyJ%(%cOX4|ni)8)S#IJdB7`@}B3jv*<}gm{In<Gdqi)
zMND$){>HLw%gf6vf~WUwUAp!4^$p3}`&yT7dwY9F@%48m4qM)PbhD{S&C3W>V6X-N
Dt{7FJ

literal 1435
zcmV;M1!Ve1Nk%w1VH^M)0QUd@VUXZwo7Hx#^x)_5V2;ympW>mk+F_2)%GBg(n%+ll
zxp1P{cC6`Pj@?*-!&QF4l&aHeo#A<{?PiqHZJym_l-gg6&{~DfYMt*;dB9?V!Fsa)
zZ=u~(fWk>^vxc6}Vvx?Qz1noA<K5%x(Aw%_lGMb_-&ldhYns?+nckG9$YqkwZl2Z8
z+3IqR$6bfYUX9ISk=t#c`c!?qaiZdqr_yYh)n}R7bf@NSq2o$%xnPURW|Yoxrs!LR
z#ciSF*WKl7hPi5()l+%9O?AFwlGa3Pw#CfU!N<>WqugAG&0L4ncdF=6bGme?<#VUw
zZ-lMh<?T^<zG9HqVvy8bip^Su$XJBQScA%ey#J@Lz*K(3Q+&jvuDw%sy?CwaQFXg@
zsNzL!w~LvvXO`B1lCxu!*<XszU5LwChs$Jruv2oeLut0;>hk~p|3zxG<LUC?=I+zk
z;C`6P+TiHS(b#jS=xv?aU5d-k)Z1^Q=XI;-XqVM%pX2H6_TlL9RCc>`s_Le=+Hs`e
zai;1_Z@6ur<jc_5TZhPYtnFKTzT)Wd+~e_#&i-YW+jp+-yUF7C`utXb#%Gw-ZJg0t
zh|0CY+;gPkai!{Bi_@#T+-8*2b*%1jq26hj&0U4XQhmZwf6alAt#GIRU5dtkx%P6Z
z>}s3ed$<3+%H?#b>~g5;iJr%2mfv=$<ZGVXQFyj%oZ3`-yn?>)T7<_<akqoO=xv+V
zWRc2Le7<+A=3<Y^b+GS$yy%9U#<#}bNN~Jlk<eL%%XzQ<ZKCJ1!rM)Cz_P;MbgAf#
zq|$b&=xm_ZR)NTKrte*g&tHqqUW&<Zq~dX-<#VOsVUX2lnC^+l`+&IbaHQy4iOqJZ
z>T;*+UyRj*!SHRK+HRfLZk^h~&gX8Q+fsA1QFgXfb+oFx++~&FXP4Yvh{<A<-Cl^v
zVUE_$)7oT}*KeNKScJq`gve-^(2mgiZ=>aDpVPR;-*c+#M{m4yrr%e6zG;@vcB<#n
z-0N$Z+isuoA^8LV00000EC2ui02}}u000R80NV&0NU)&6g9sBUO!%jTpg9_vG|@0e
zP>Vkc2f}FqK|wuR-5NET)hmF48ZF=~901A7vUyo#09dl5fecjE0)VkMAmM;xz^-Na
z$L+)rSmcI0SW;~RFMJ_-8iWH0SgB#HUO3P<qw5S=xlS|~B><l#l?6$7X*Mjuj!!<~
z!gD~EZoC*WFf>6>a1n$H0t^M)u>;zJb?Fcxvci~_l5-eBv5G>l-y454$bdL-KuR(l
zTkwcRgXTq=Oy?S~F+osMh5{5OtOyqDjT=TTh{SvLtcq`EG1M7T5oh3>7ZhSoSZ>>m
zn^cOpoUuUN!W4E~g3uYLVV8|NLWJ=D;nUoCBm;%EP$58IiiIoV<O~GF<CeEuDDszg
z?#9mtVMP=%1p#Sz(9V4Od?OAxcia)ne$M%KK?P=*K}|Lu)WO{f?{v}$2OLnaUnGJQ
zf(1J0I8p%>X{@24Ky#47LK4#qG6)Ujg`)^Fj+}Bz0x38`g(Pa^F_1Y@P?CfQB0O=4
zZMbn!L;(dvVC5-}96&@F@(E;_Ckuq(iW4|sQ3DYKNJGyLKN!+S9}&1y1shsyCy-wc
zu#k@~dnkhp0d@r1gC2wu^TR16WB|nx#SKIP7`QCp3Iks-z<@S^1hNVtgkXYAA7oVG
zK^H(21jjF8$g_YGUr69;B8jMYV#+o><Z#0QVvKP}qXZ2Qf&x5*$waG<Ji^I6wW0un
z7@{CC0zv~6Q;P#LKEcl(d*BewE0b*D!5Gde1P21X7|{U;e1NzK44@bRMHh!Wn^6=d
ps1QUs9(b^Z8f9p41Q5Jt)J7b1$dN}Kb>txj9RUmMa6th906PlM>#+a;

diff --git a/upload/style_images/1/bc_nonew.gif b/upload/style_images/1/bc_nonew.gif
index 6cbb5013e214e7eba9f6e2a3f24ddb45c102096a..cfcace598c92320cd4c52a982c5d17c5f7dd9b96 100644
GIT binary patch
literal 754
zcmdUsTTfB}0D#XC1W{1SbZ)kVE?s4<vaQ*=h!^rSoz{Ax7pJo}tB1_Bdguj^(yi1k
z&dg<^Iokk_oSPRwKslTPf@rnrl;ptSa=fKmZFYIF*}v#}_@2M*E5CBN@LXLMkOjm5
zV0b!cm|{@(D(qkvnKdI7#b(w_-l&m^jF4fAZxwOH^!9*xHilAcFt$B8w`TEi7{waw
zjCFn;b%szEhqyT06+vfK33t@`X#*z1{p0>o52v%Oz|#yo6&RdY8W>-~DHeA}jdZM!
zSR`CgcsgWs1W_`G(h<EaVDfSV%^FG8NJkMTi#mfi9Uh?~2pNP)cElOM=rHcxz&-2R
z-+x*ce&B9SH|g)x&5ioD^wzJ0Z&PnuG1vo<&7Cj)*z;Z!@IR3KoBuEK_@4Kk0K#2m
z3cp<Q<Y`N*hOdU&+B;sn>}ZBAcD?C-+tUSUpiA2Rfe(Y)-g2l&r#B44x{pu^h7+S>
z7*b}oOj>PbMD8G+6zxDj511x)oG_CXahexIfMp;}m@XEE4$IGkgeO5ifbhQYKnWws
z&z77`mmHExl8<g7qPRRDwYWs7mgf{Urm9ql`((;@37JVMIiGi69?;6v;`rpIBbg$N
zFh!bCpRTx}<nhHksjN}O3Iqv2ZRdrFf(3P7(w(dGc2$Y!;OWE$?J1?RN?KGe>ON*C
z1u5}xO=@FZ8QGers%*QZHGp8o(9mqH)KT@iuG&K_7mvX!rhB2d{;Y}?#-`kT`0EeR
z%qU9t=ht}0@3V^HoQn6A6HO7ttAe{bHwQ6pPFwn@J=gT$_UEDNkGINX*aq}WklWMS
Ja7_xF{|ofxJOTg!

literal 1426
zcmWktYfMuI6mGF%T^j}n2!h~1d}7Ab%{raoDL%*sQIt7h8|risBRCe_VwR%fYvR;p
zi%t^3AcNADKJINVP|Iz5DSg~ND5jRaU)<i7(iX<3+p@88^5y$=@}2K|C#T}ze%kIY
zvj|y)D1pFLc=Tq!)`Y*DoJI5)q@NLJ{Z?<7jbIG1vsYy68MH#<5dfVRXaYjH%P}?c
z$`(``WBsAQi6~?U3-v*sYL>6U2Sx)-*v%5#dWX!f9RYzpg6LeZ$^@u<JQc=K1UPa(
zTk7hEU0kuLPh|H7=E8H)ZlT$Y$Ml09{~Sk-nVmRa6<|qSfI24VWg~8$5)<k}1Bln=
znTEzgLS2w8bMq8a!%8<pY-Nb7PAtTM?QEIH>hkwMrUAq)(1n?>bI=eG>cbqlk2B^2
zR5%;)K>CnC7vd@Xpf=?8&oN;~4>ZY?xLH!S(dvBxSp?eY-v=!$sZ%sI$r<(ZiOeov
z7?c=6H7?NLJcW;=zzx=zJr87<WlLibIRG@!H)QP_wpu)4P~+#yy&_YTF=S#RUO*GX
zrsso^1-?4wJZ!RKTxBc)x5N<zHG$q?TerZ>lsH_z*y3KRC#*8q7$ctk5xY<~%YYrA
zb_PU)FzOPkz5Qax2<l}FO?E>TnQn?B_XxGqAc_qcqin=E=?t3PK{r0jM={PA253S(
zLzV#q<14*FT>#L`h~!346BHTe0hJ$6`+JA&pk~472#JidkUs44g#_9d!cyk~<E2fg
z3jyk&KpVphPZ1DmWA_d4Rnq_(0ns@?YGF#8Vzm>}1z8f8=Cz-vzy=V{fIK!1<0^2j
zBEVJR%2)V{K?_qF%N7&pqAZykwk|*uvjB<%s2@ae5cM-9Ue2gbpbrm>V(5gOC2{f;
zUan$_zr;SqQVuhW5hsWSKy=#T!a1XU?wFS&pYDdtEScv8WCoNNpq}C?f_!yQqMefI
zFeYqgh;9918%ORIXo7sHg)4V+$2<&?t$%nD($4`XCN#_gs1HPa>IwThe~}1FRj@=$
zKS3Zb5{{6w4sbdp*U784RN~ThQcj79ljJVFmbsd;G9mXt<-`r*)i>0~>v9iw7iZL!
z5e(s)tfQErTdD7Sv?J*P`b8NnAC9YOZuzbxZd$#1UHh+fosohk^v&eFf_3Fx#_TJZ
z-hWMh=Vd2fLf_<5nj!>oX-Y%-W=Y%O59;ZJ>L=&hNDNA2VQNb;{Wo!1)4lXQSNn>$
zGj1m>u4yPZ-c?>e&aSP#o1Jm6Ueww2T3OYuyBR%M4BtndC6JbPCJK8hcGIpM>m|<@
zwWelCJE$4kZy~pj<m6K3tEESwY=uyHtSeU<|32-U6MpaPL6G$4HEPQCcM<BhNTX@7
zR%=b*ZFAO((gmbjzf|mwj~h>mJMr^B>53i4t8YErzM-<9S(8z7FE3|TLuH<vN)3#i
zTzkKxx-#R8i2iX>VdLeWb|%pD6*=eev$sf}ol7iF`99?jY3ilZw2u7$XoYvuPSA?#
zw`4v}ET`_ZKOduP=qN&pV3>EGxM%&>KQ;pSa2aKr!k}FXWtCpfsY5pEPd~d?T|`W~
zdTMmf5Bj3Rxh;C)8Or4r50Ya#w=wban^kdl6F%JAETin2U)h#Izm$B4`V>yypDn#G
zdGn)FZ=RPXUvYBpCLgN(21#NAhPVt(N->!f|Ky=|V|?ucq>tLoxUr(5sEZuGv*Y5j
zIO?5*oo$3q2~~krsq0(g*HAYRM>nO@h<7&C(p#%G5S!@8z61MO&ld2@PA#LA)9K5%
zQtAxqw{DXgWSJL9rPtSNy-`f2s=h)>R^$X9eUe(EXf9d3=p`1jLh%omB^AO&WeLTR
Nr{j|N<s`zM{{hROUoZdw

diff --git a/upload/style_images/1/bc_queued.gif b/upload/style_images/1/bc_queued.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0be990c9bdc57a5722c6783b3b2f5ff1dac37f5b
GIT binary patch
literal 70
zcmZ?wbhEHb<YM4rn8?6T)VJo-*PlhDl?)6Fia%L^Bm;vEhyckmFo{p;7doAN_fnx&
UkjN^=n9PHWa-w}RTSOSF0h_iHD*ylh

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/bf_new.gif b/upload/style_images/1/bf_new.gif
index 373c91b69eaf22dc8185dd939a18b10b222c78e4..e89cbf432914b71f9ea828f776afe2d7ddf53a6e 100644
GIT binary patch
literal 771
zcmV+e1N{6)Nk%w1VH*G&0OkMyX`0(vgTutm+-H~AVUN#cmDOXB(qD|sU5UwChQ`|A
z>s^b?o3PPDXr^YC*Itaxjh?<$fWT9Jzm%rPS%$|?cC|fWppvA;HCL8Oa<OBQ(@b))
zm8ZypmAaU$%}aB$OL4GSbEHjnwOfbCuDjDwdAM7N%1UyujHAenpTJIUsgIz+KV+h3
zf2{HJ_;`=FWtG-8T9}cd!aQG{lB2_ztIb-4#a)WZmZ{1>Wu!xArA2C}Q+KjSZ>>&t
zwMcKTlcmK)Y^pO<k&~syWt7!Zd%9eAsWMWJMr*2ajk;@vvQ2cdSA)X0!Paw$vQ}=N
zjh((mYpIf?#8iE}H(Hm9nz>ALv`1~L)!gVvZ?2Z9$z6-fRersTo4dNj*;s<YL1?B-
zbF#6(*<g;(R)D};h{sTSyKtrFReZZ|qvUIy-cx$Htjh1L%<))(z=gQ=Y?#(<py92{
z@K%1ly2aH8DrW!x{{R30000000000000000000000000000000A^8LV00000EC2ui
z02=@s000O7fC>V1goTEOh=c-yb&ZaXkdcprb#IoJn3<ZEb%b?rprN9pq@bO2b!)1t
ztgWu9r*&wvw6(Ukv$1o#yuH4^yRmM=#Kp$P!?6L&0aF_lB|QyMOGQ3N4Lf06%mJ|p
z;0YjhI68LcBq|)|c3wPR;jsww2v>GAGj>%^b{!CQM?%=qLWW+f0|*afu_MKT9T`;Y
zK!9RLNDDhjY$S|Dpd*13c7U+3)5VFM7c1B`339_@ECVnNe6TYl$2lw>eq6AF!HAt2
zBVxuXK(v4eI}^azNs*xplL>ZWD6xZLOVL;ZvJQw~hk=!@4+cD7aL$F82t>5T0>Bo4
z1_}#c#=vy|z`+6uW+a$^(H1}~HGl&P9!wZ;tT>1hD_+bPajZ0uBTJr48FH*Mm@{kM
z%o%emNuWb}Vne#L>C>o5$CAUkwd>cgS;uNaySDAyxM_D15W07yMS~IvPqZiy06W6F
BYajps

literal 1425
zcmV;C1#bFBNk%w1VH^M)0QUd@WtQ4bcEFaa)oPvZR)NV?eZy9O!eWBKdb0mXY_o`+
z$F05EW}DaD<LYjp<IvjbVUFHVbGpRM-))}VSb@cqrpR)o-)^4O&)Mo-hss`!&0>+;
zZ=w5CeY{?a(rud7W|Yoxrs!LR#bAxoMr^m&-Q{bBxl?(&d9Ch5YqrJA)WOHkM{c=s
zqupGG)Nh2X-sSCXpWten+hUQ`NpHDZg~wQg$$`B8R)NQ-u)tG&!lbUfQ+B<Rsnbz(
zx=C=mi<z;3lCxTe%Tap4WPPwudB9V0u}g8fLut0;>hk~p|Ipg(MQXKlkH~0-!}Ip~
z;O6e*>GGnq+FX6U+~e`n+2GpX=*-dB=<N1>n9GZz(Z$f{&(z!C=kZN-zpcLB;^^^p
ztLR{j%wUes%h1?=nattm@pi23Z=u|GuJ3fJ>P&OIrnuTvcDuXD;&7qZScAh}iph-5
z{!4PZ;pp*krs`*z-eQo~O?ACdc(!Yv+^f9YTZhO~eZ_L4++T~#gTe4vfx~B;(@}P|
zZk^a{q2*?l)?A3qU5d<Iipz7T=xUnTaHQgKquFPc-*c+#aiQH?hs<c0&~~clX`j<=
zoY8@htzwPL&ePgyn9XUH&v&Zmg1+#Pr_pbs<94UxgTUx>rthk|+<CA5xW?a5dA(G7
zymF`OZlBvnZ@hJ|?|;1LYo7SC!rQXK-?hWsx5nRLkj`Y0%4L$xiOBnKr0938>v5&(
zU5dtHkIGVe!)cq|QggIbb+lQA%yg>kScJq>f5cgY$WnjJVUE^Qd%<j=*LAG!d$<2|
zr{_p;yltJ@Omn+!p4xAo*k6p*fVl5+s_bNy*JhN|j?nvOnALx|_E&wrU4_M5iO<s9
z>t~tSZlCgDkl<yN;&-a@bglN_=I~&T+fR4FU5LqEh{?#(<IC0LYnj_vg2-{D;d7_r
zMs2ufnC?e!x^Sb~Sb@M)e7?EI<7AZITZzqOm)>HO-EyevO>wtRcfW9_|7)M(VUX2h
zlhav*&RdAeA^8LV00000EC2ui02}}u000R80FwwDNU)&6g9sBUOh^X<n=A(+L^zOz
z4F)<32S&lr!yP41faJ*Gv`P?*P8gyrG~<ScF={tBbaUYX0xM*+82BJ%CSey>%Anog
z_Kd=bJcCXYaM2Eds#FWQ9E{>dnYB@lGQhjmp=$?I@hCvh2QJksl?5O02sO$>4QwLf
z0)qo5kbywLHgFga;aov50{nd=P{xUYIC096<D=t91RcT-%^NUG0StoLn4t5-M9C6n
zm&AzqlW5M8C37+e@!(Ay5(xzN6p1mRSm7Z|jxZsC+cOI$`Fw4#=cNLafmt$4n9zAi
z6D3rXJkiqm2^J+^#@!*-$Ap!E2XcM?Sl0YG^e0NDD1m-m3xN?fcvTtL2E>PE<*~0(
zFF*+v8WB9PMF1m2k^m<3X+j7p`ALyZXHt0Pg%_uJ!4EwNTmjxJ&Op*24*Ws4#t&F*
zG0qG^7@?s+S>SR(3;8|qMRe*ZA<q^{XyFS#I1s_bK%$gV35=eZx1JQ$t+zw~0E~f0
z5c3I?Stf4?(}WYxNzud<1Q2kg6Hbidfi#F9k;8Wafzg8j7g!*J3|VI5fFdCPV22&`
z6tYV{MZBQGaRWWzgDh`+0_PG=#Gr;6_ta6xEw$`p$Uh0}P(ndbz`~9sji?iWE&!l#
z#u>jvb4myfY%>N4K#&0_L0v3vzyb*GSg?sLD5R0bF^`1c$s!uCW625)AQVn3_)u_x
zAL~pKMi|L3qDM8sBme}l3PoX#0x1{}OEqYqF^vW~r0~KHWE7hb3=&jeLN5s<U<46C
f<e)+cuV$146joHh#T8d@QH2%x>T7U80RaFz$$IOj

diff --git a/upload/style_images/1/bf_nonew.gif b/upload/style_images/1/bf_nonew.gif
index d20ae673bfcac5fc2e4ce0ac0993aa6244bedf07..ef6ddf2c6be9a28de73aca180fc57a4460d4afef 100644
GIT binary patch
literal 768
zcmcJM+fPyf0EZ6>VoOctHJvT9+}vzwwbIo}ZP{h>QmL_(dgP(ndeJR=s299sREV~g
zS{o(`qTCN42q+vlfEVzjB8YN3h=RB2)V9`BW&cCJhwt&*xBYJ2DbCBUO9fJaAOOgw
zHw1bgG#QjmtuOjEga%B6tcZ;PiFs9GUK1GuSa8?)-9KSl8yZ{Y!(Oi1X+$yeT!5`u
z;3(~bYA1qX(#a4{>(*O60)u~0wJ0*Km}XaaI`8~)NN@4*N9R;#*O129KVs8cy+bNH
zSG^>e2*T5@0mXvYv<gqVnZjwVW~pC3FMxe)<wCCn6{u|rliRzxGrP2|M4ZFpu0fSU
zXz;T~?Lx$_NBvTr16>RbYu$2#lO>(Cxz-I<FI!<lW_%kvKcLAFQ)FSu=6c05-y|q+
z>~E)Ue9|o%vvWorLSzN?>}eeb@~IH&-IH6lc;ha)WmAFf@U`v{bXx#>QSUxq=h@x=
zX>$eXOf~R-mi`O>Pn><o!%qO>Z|YHeUF(~+x3pG#Go_u;(fP5Xg;LSg-Sg#Z7p0X_
z*~jW1VD~ZWC}bXAAQbVqlt(i8h(alYYBgiyTAc=}MvNx&1OnkKxa8QFy!^QMjO3X3
zxZK!UD-I%Hgjg``CK$S&85II=l;rrKh=YiGU}+JUl@6922hTp~d|hzP(bPh`M1}hB
zbW$dGo(g<25|dL1vF0L}R7l7n)llmi!s(Hxwy$ktv$<8x-A78PryE3Vt<i~ac2ih!
zb4(9}k4(UTsPF{vZUsgHne>z3tNP@W=TtlH7<{pwRjCIE(P$d9R{-0|z<gK%t5E-5
zkyH&lF2`^*V%F`2FxqF1*r%h0|7>sMNc;#bE{S2{K!J(QjLQrTN4jR|x$uy2W?1&L
v>_O3o6D8^w>*T8Y{F)hc<0iR=V(Bf>yxcCuU)^HJpOyFf-X#*kfGd9hiAsZ7

literal 1412
zcmWktdrT7t9Bz39WN1Y}VCcXHJ|GSi0_b$81aU*-+}w1T8(@4a(+rJsJ{Od!b7KZJ
zw=p*#BY>rpaxK^PD5c!>MIYDpc%&YskL$Hu+oSe@Xj$Uo$}eBO|Gs>W<hN&UWocP$
zHY1x6VK91CG#4hjVS+8OJay0`7M}<UDNRmThl4tgK<D9Wynx!rlRG)EgEK_%Wq2nv
z>859bGm&<&#p(`;)lSkI63898aqkm}l`XZqd@~lpO9x+cNvuxK3{Pewr~oxR3&3{v
zfQ=(_aAa1SYnmgq4rs|vXu|3aa$!Pb3ihhpq;Cc%0%9x(sHsi}w>o{D{Z?osBr*kf
zO0sLv&V?ODoQ4fk0v(MwB6_n|pry=KH#8d7joL&;U)O+j)Jk&^r^rC}s$4yCQmS)}
z+x$X<uLGI{Q9n;kaS?}V#N+e?`*c2@f|L$Va3uJoD=5Vy5Ec*_y&dzWfgZUNw^LnG
z3s31X;@)<VMP%^ulv5p$#p;S`y*xQ7M9e*MLZAx+YPUe^g;6I@;pS^RLX_@7ocv)|
zH%tO5SGUa3tD>Z8GwBU;2CYKW59)maofkx>L6j1r6fjIVrk?SXgvdAzVKXv4A<(!T
zZvWs!Ky32&>F5c<KW6m{(U&4q1W<WE`6L&1auGsKyzD^;F5>P(sUA5s>GTfbVe#m!
z(-SQcMUba(^(tMGu}GKH4x%9;I%B|nTsdiY8s+Fdt{w%c#HL{D%U<Oah(;s%gs4}D
z`au0uJ7j5xCZ*=tj{ZrG%q}wcyNB%Pm>p300QEFiW|NpBVpE_`J_#D02@QU}#?OWA
zN{mvDPzuu&M`r7m*+897prJv%mpxz?>b=ldxPLU%JutzM+BlL45f&6<0SoB|Q5rHu
z3r=%}Tp$`9(9@@lW^(~*PoKsu&`<)6M{J_?V|I~|2Gk^9P4<sRIwe-V#>Lmrn1vp+
zgrU(OprOU4Fkedxv~H<6%u`amN~&wn);|&w8eV|ttP~IQk48jBzs()Y{Wp#=e+Bb2
z{}YVF*NioZ*;T+}q%m>HhH6c2GAnKMj;lHU#8jm(OipSmyOlrI_U*gh)ss(%y_<_N
z%Zm1n7=B5wlC@PZfkmzP@s)RLDiReBe!l!^we2fpZFTF?i$%f@mi6c}G7|s7p<>RT
zS;vNce}G@!b>yedTeg0)zP>rW_|kvq)i2>&hK~0Rw)<H?Y*OsCGdpVXHO$P;-7&2-
zc+0BWY58ANpPH+=v7ddR148=CLvO{OkgTg_KX%?tUDI~%6dOKbNWG%UXwEGUE$uop
zaW2Wcvv&E-Envx>#{e^}@uF$rfpm7;^+#p*^AEQ&>TcX#aesSLD|~Es>E68W?_^ZP
z9E~}t{bS4PNMWurjvBiXckyO>){ocMr><#8dnieG{$XAd5Jq-4rCj0)<awbxv4(;d
z$II`W$UOb=uB7(g3S&!)&cjES3s$#0X3TARay@0$s}e=(;lov*<=Rg{6X#Zhu)i-Y
zc_&p7x1GJYk--`-Jg{L7J6Lhev#)vQdCwsLdGqai^{Oi|{Boq^cup-dL4UkvXCf2d
zv?d|rbj_{ox@JUwA?7Tm+j!&Nua#+s)J#=zX#vr===mFCnw+g%rn-J#R?GfO3vh&)
z(4fg_EZzt)bZZYZD;A_wu<EeICo#p%+@`@6Q%Z@ZrXjg>Hawgx%)ywCVv$1i5`X<!
zV|u8nc8ikrfGn@hs>9oEvp&iJZ*PkQSyhXhPCIWdL*|ye&su~vG_W2PxD!_{EhQ>h
z`%5<&lk*M$35%D{-XDpN%P!Ow<#QY2<34GPy|t2kH$P@U@p)`#%DNv|Ust}$TFPQ<
F`yavTXG8!1

diff --git a/upload/style_images/1/bf_readonly.gif b/upload/style_images/1/bf_readonly.gif
index 639b33c276406f73b281d8decef504017b371a60..04248e938916979780bc7153ffc4d6368fe57a3f 100644
GIT binary patch
literal 755
zcmZ?wbhEHblxC1-c*el+=FOXpEiKQVKY#M%$;+27@87?F<lLP{j~?B<d-whO_cw0b
zxOMB+hYue%G&jF}`}Wqu*PlLpdie0+t5>hqH#a|h`t;77J72zhxpDO9>({T3E?v5F
z^5iT*!H2hQ?V2*>{MM~?Mn-dzlTU5faQpV{@87@QI(BSwaPY*yz{igtuc@!UuzmZ3
z2M^XaHLYuE`u6SH+Q!D&iHVz9TYvocv9_V%?)B?eu3Wiv>C&G+e-5UkJbU)++O=yJ
zE?hX2ntCWD<>SYXU%!5R_wL>2&z}<*7<L`KYGh=@Fa&|(PZqGNbwDI2P8it#H}JDL
zwY0XiceJoIIrsMUPng)>>})n|`iz;gra8AbTP#?(Xz`K-bDf;6R;^yMcHOGw&Ze8U
zY~8kf^G1{1d-m?zzk8$Q;Uh<n9Y4I0>ok|BAS;JDlZcimtH@<Rr88U`x$ko`J8G~v
zKGT;mdgiEREc#$0$0rUUM_!(9;*PSsj&{HFl+JXAE=XYH`SyWzgMf-dgMzLN3uobh
zgf+|({1zD;3lrNEB;{slPfTz)7Qr0E_v4~K$4-77AsZP-r4w9?TFIO@G#wP3C2S2C
zDkPL$1$c!jjwv0O;?SfZY~{z`z;J-2SlU5l!UYqthV=|}1|AcD1~c#pIWRCa9*o?u
zF`(|mT<`7cVs~z=dU5yk_Vw|5H#Ts{`Rv$`cyMElM%<Yl8<UT2RPmhm=4IQ{(=&{-
qx5;$3KR>^~x%-<;cKgfAD}q;>-935W$@Ph1yk0KW7Z*7&SOWm)kSPQJ

literal 1428
zcmV;F1#9|8Nk%w1VH^M)0QUd@pFlyRWM<M)QPfse>SkunQBmnzTg6RH%Bru|-R0a{
zTe?F-n`&+1US7yjQq)aN(o9UwxxdIuOQAP6#YRT<R#xg#QlvRKu&1o(US8T-TGvrg
z#>>*zO-=t{VYfm;(MwC<W@fHFKId9m=U7<4M@PO!MyWbFz(hpXSy{eAL!y6z(^psC
zPfwpVHmy87$4g4eNlC^^Nyte_yhKE}LPDTKMXWqL)md4YJw2m1INME4zDrA-Twc0F
zM7Tsmw?##<KR@K^^8f$;<;={PGc&VhW~^CR%$b?_^77#3?(EswrcF)S(%H<>*xKOe
z^5x~z+2G^p@!!9{zkq<x)Z4XpdeWt(nmj$^>GAAdUY#{H;^ywyQBlT?jl)Sv+F4nk
zI5@|osq9=_xpQ;wUtj87UE}BP-Q((+NJ-sOQ`=Ql!^O<XOias7P1{&l!bnJ*H8spt
zRnfe{s8?8`NJ-dOSgBcC<L2(^Sy{}`*W>8$+tk~#s<5L+NZ(yuv_C)6PfxOfh2mFN
ztUy5VU|qsSNV2J~xIsaqMMkqhLEKJGw?IIkLqxrflAeHs*-lQ%O-#0vmz_2?-{kDF
zL`2-y-OaMNwRn5TtFWv)JJ?iG^ITl`S69D~l>b^<`(k3Ei;w<qaoAc~yh23zYis#(
za{g~`^JZq)R#wnhSn6M2(n(3#TwJC)I@3^3;#*tJ)7srvSJ|?%>0MpxXlUnLTH@vH
z>swpj<LkpkN5V!$!bV2i;_2L3S-_H(|7d95Sy|p&TmNTg#7RldNJ+;@Nt{SXoJ&mC
zT3WtEMZic%<yBR~NlLUqLDbCB*3Q+$P*B5BQNvVJ?^jpZR8*pikk7@;q&GLouCv5N
zMYDy7#YacVw7H^0MblJN;7?E4Oib-mRIorm=U-j3LqgM4Q_@OG&P+_t$j{46Ov|>r
znLa+SJUrT1SjA9I;Z;@PS69haR--pJ?OtB(Utj-XVzrT#++1ARQBkWqJHC&U;#pao
zG&IaqRNK|uA^8LV00000EC2ui02}}u000R80EGw~NU)&6g9sBUOn9b=7%O*d*tlaw
zOp`MU2TEz;Da^DGwM3mF5JK7nM@^(G#4{(6JX6CuwK&IWM+Fb19C(X>Cn1+h7YG2O
z_CQw+XMhl)C}zP!hI!ez9LzH30xElIjG3T8!^eWJq_l<m#0lHFEC%`bF#rliiDqBE
zz=30k7cXVIxIwC5p%Ju#dw!KD^nuKg9}*<USp4Av07l$mv=FCa8zq94wxohpWC#&g
zZrns_)8+yZA{S!BI0vr7mUILWhzRCuoM90~bQFmbq%#p0MP6{*v8bISB?B?>a0kY>
zks(WlB%#td36vpMM09wtAi$G>blwgBu;Y9P^dv)=m|t?8iV6@Ejzt+*#~%ywo}XX2
zpx(<6C=&pX#1xu95JL{J&?ko-&E+=)5<YZ>gl8w5aM}qE#K4Xd;5m?j0_7p`L4VL)
zFaZ=(yzl@wX>cfz6+Ga8PkBjP5uJKN%reCgRP6Eq4Lwvb5CVj#0-}TFJy@N2MCg+b
zIxnm+pFsb_A;%~{7;(gNNEpFH4K-+a#1S{luz>{q^zofQd+bvQ4u6>Q4VTNvV#^4x
zbfG6RY6KDl0~{bX5Fa)~lS~5x7(v7lYnVZc0S4re2MO?OKnxZbBv4Qm5x5{nE5ZOE
zf&f~SI>s2d7%<2t>bPKy9)c2a#6>1yIG}+78LU!I8D-F8#t89L1A_~Xuz?0bw{!yl
z5G*Lr067_CFakeo2=D<Gp|H`5LQ*^<$Ry<)P{12+6mWndTQGou9>->s%Qg1|fD9H`
iq|w6)hj5TUtQiTR#1m0e;e-=aMDYZ_{U%&cKma?=NTiYg

diff --git a/upload/style_images/1/birthdays.gif b/upload/style_images/1/birthdays.gif
deleted file mode 100644
index 4e0ccc1979bf9408389d36b7af4aba05ffc9536b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1508
zcmV<A1snQDNk%w1VIBY;0QUd@gT3q8*4e72smaC2?B>h(_2yx#=!}GFLx#xG&e8Mn
z@=}`O$jHccb$0df-8OQv?C9%+esS5;x6I7U%F4?0@Y(3(=RPzXMmr){q2;EcrO(gL
z<l@%&_xQcNy_uPvxVX4ZO-!+|vG?}(_44%Y>h19D?|QoIb#rwnC^`1?;h43M?dt5m
zzrW_<<>lezwY9b2+~2~!!TI;<j*gD;?(ixpFze^*>E-C><mTbs;4v{i)X~$6#P4Zo
zadEWkOhPGXVNpUi9X2i;FeVN^KTYZB=}}Qp<>lq(=H}<;=jiC@<mBYj)6?MK;NITe
z<KyGR#KhUz*_yYK+S=OT;o;)q;`sLW-QC^S*Vo0x#n{-`*4EbT>Fo6K^W5Cr_Ve|_
z!^70n)Y8(@Z*6X<qo<j+k@D~H(9qEH?$-D9_xAMm_x1Mn^z~0qT61x7nz)j-wzg1E
zQ0wUGXs_vrw%$WSP+VA1<KW_1j>f^k!Lh25?CIY*Z=*asLn<;#Lx$3Kw(IZf?wGgJ
zaj@wtNpL?!SKQg#%*LxPI#hSK>g3?#T4{fsmU*4d^32K0_w?iL>DxwJd%C*1fqsK5
zVV*~RtU-6Fetv#=czLg{udA!8$i>HIq}RK)u}zlUxU{#swU^Arrqj%>(aq25=IL%{
zTBM+(rKP1%lh9b3)O@Yd*wfcCFgNt?*gH8qDJV7O<K^4i+uz^cg@cQXjFU4nL2Q$|
zrJsSeu$Rlo%0yRi$iu8_X=}&C#^Bt@GGdiqpw(YpUc|w}#>2(m+up3Dk3vCDU8Uyn
z?ATa-pwG<DY_aNnby>KwqkX#Q^6k_5`0aXgW^Jg~ytuPuWNuT2uSG&TpwIHcy`Y!0
zk1r(*aBgs2RYPWDWjun;fuOx=W@=4>t)iQMU68j|PCcf}=cCZ_*VER|%Ff2d#xGlv
zZftgvyx`y5-qg;pN08jp(9@E}@N})&H#<$VuAV_YH}2`sva+_cucCK%e{HMh=;YGo
z;mPUa#CVmjA^8LV00000EC2ui03HAy000R80F4M7NU)&6g9sBUT*$DY!-oWyC{dCm
z36hH#GiIzfaY?}?G>(WINwQ=~8cdRS6u2bG5jAYss9CdSgv~2Bb6)AtVMLoFPExK^
z!sLhoYC$es2;!-R0xw>`v;jkvDv2#es039aP>B^e5isQAz@Z+72whB^dFo}#6gY5l
zJUY_k3ly$Kk~p~rgio{?1q$#3a%WD1ObQgZbsJ09kqJ_&BoT-N%MfRPRj6=~%viTr
zY1g_nvtp5B23(v>Ho}C;wn&g1IH-`OA1@+g-ZU^#gY*h*I(!|`BIXGaflQ<j`Q^Y>
z8fXM0?70vC4-P>l1eIV>LI<ZKQJNV47YJp`kX-i&5b!4<+ktXC+~t74f<>1u-HCx0
zf80oUdl(?{&M2aUGL8@-#FHBe4Rp~!gT)N9-*~J^5rQ;A9DqwB&0Jv00O;rtODS{Q
z2f+=8$S@%i9<`QWIIX|}iw&;`<4rHzxPStKJ6aHcis2dO5foYYaSS8iv{T0|k`zG;
zD={pB!wooC@WKl}uDHY!R_J5MAm_*fKp=$dlSd-#43JI&Y%W7e0t0|DTyaQDgbzLD
zVAI11%ou=71`7c42PLOypg|b|Bw9upN1&z}Mb-S{$eusYVE~};e6!9DA;=+zNti$;
znMHQ20>CqhRC?(r2s}`UEvRh4qKOE!!T>@G4Aga35=_)m#4htp(@8L@q|$03Dfj?`
z2YQ4NMHE^vFhLVqF)<MmPBh_$GUQkzjwP4$0Za-XfDpz6XpGTB6Jl^7#TP-TM3EI#
zeBee3_~yHV4<4w4Mi#PQ@x;JRQ~`xhT`@6B78_{c!6b3S0fGnTQtJd18zs@vKrKP>
zgcMC|FaZV9ZZL)vSU{mtLoG2;1r}6nkp&l9ynAt-4@ras6IN8=M8Q@ZyfQ>vPE-*`
KN^I#+Kma?oVI186

diff --git a/upload/style_images/1/br_new.gif b/upload/style_images/1/br_new.gif
index 27bab1d58f929805f999607c3e4d625a27e73a2a..fce862174c2ed32fced14a4fc2f03526380bdfea 100644
GIT binary patch
literal 552
zcmV+@0@wXVNk%w1VH*G&0M!5h@$vEL>FMI);@{uj?Ck8_-QDEm<k;BQ+S=O0&fK7&
zpy%i3&CSis%*?{V!q3mo+TrWEy1K>1#nI8x$H&L-@9*pD>&eN<)6>(+%F2<Ek-fdW
z^78WP>gvwU&W?_b)z#I7g@wbz!-j^2*VosKjEu&{#@pN5!NI}H%gfo>*~rMq?(XjO
z_4WMx{J~^o=H}+}^Yhl$*1~0F!enI9($dt_)X>n-PEJm`#nm!0GXMYo0000000000
z00000A^8LV00000EC2ui02=@s000L6Ku97-EE<nUVnV2EI-k(!bEtD!uh^{Csw3)P
z;IMd126uD1n|jS|yVYl1ZBDP-@AJ5A&+q&HdvP*@goTEOgK-Co2R0246B!Z|3^flc
zlMFVD2XP3W2n_)>5&@<lCKDextT-c}aRssk85R#H78e^9DGfL~z&kjzaRbH!4FnS+
z1P>bo3=F@l!pCs}*a99b7!oWE7c2}n)6>~;2I&Sj6*d$V6$UCEA?3m)>2VAD3m5<-
z7XVDSG2jFa2MQ7@h=5~X98;zca43LbqJRJb4hGx7&{P}(APFoOAix004g@+JRJafa
z$T%!w%A6@vV=#s>;{e#nvnNkQ4Xs*f*cm5=(W6L{Dm5CXh0~`{qe^ueM~c;}US4S3
q%C)Okt#N3G9ZR;XS+Q|us9nppty{HS5?q}dWyz2vc#|v%0suSe4++r#

literal 1455
zcmV;g1yK4&Nk%w1VH^M)0QUd@ZJ+gVqTR8;;Fhb^VUXZwo7G~0z;>+k;OFs2Zn;%`
z!(ooj%GBgabGmS%*<p^|TZhbfl**~P-C&Q?!p`Srl+s#-#z=6xcCGJLg2-c$(oT23
zYMt+Do#9b*x_Ywzb*t!BfWk>^vr~S?Vvx?Qz1no9<K5%xd9Cettmx3%>S>wZUyRXB
zb-u*S-%fJ5ZJym&fyI=j$X<%cWs=Tsq1|qt)z8`LU5CkDjm=__+i#)!RDHZ{qULLw
z*ld~ANpihhh|O-H<3ww=V2jFTl+M@P<!gqyYM9kidAnqm+{Mh)!N<>BhtyPm#ZY_0
zP;<I;spWB|>2HLs-sSB^ZMQ>dwqlUiVvy8Yhs%My|EI9Pq^`YFcD<9S(|E1wb*SQt
znXzY<)`60<W0curlGRv+$x?j7WPPwudA?A2z*BOu<m&SO|NrCZ^5Ev~ewfSC+2Dzw
z(AwbW^7Q)5(b)a{{?F9gi=xr5zu(E!>ZZ8b;pp+Z$>NO8{%xJwU5d@i(AaB<#c++s
z*Wd3{cDv%}@w&+5`}_TApVRB__j9K2Z=Tq5s_WU|@KJWQXPDJxm)miq;d7<ofVl5@
zul}pN+=IaAf4t~ljMagVt#GIRX_n7qk<fCd>u{mtU4_NC#^1HW+-;oEkEYX+r_q?L
z)?A3oT#3zEg~*AX$84b2X_(Dad%S|a@Lh_=caq6sl-*c?z<;^+N^ZD!tmbW-*JP2(
zOLV<%pWtGT%5|{s^!EE|o8Py_<7=PernlT}pX6GI&|ZtvQh&{Z!SGmw&4!%DfSJv+
z!rQaL;A@`Tx5nRRg~QU@?P!<PzRTr_$opuS*=U&CYnj_&kkwFn#9)xtbEe;AmEmTW
z*=LvBXO`bhakx@*v{iMqd$<2>p4x7m*lwNLj?nvVpWA1c?#|QNWR=%%rs-ys)NrKe
zai!|g-0NkO*=U&1Wt7`=r{`yu+edG_<m&WYi_c+>*4^atQFyj+q~dg^;`sXfRD8cz
zeZF?6<aes*A^8LV00000EC2ui02}}u000R80NDr}NU)&6g9sBUOvvZP9ykV|KrsMk
z&ka5c2fDf8B|)M~#r*hjg{eS-Qa9WzM9`<pDsozO5NOim0RV8(3U~;GARz)}7bs}~
zkSRtIe2<bSXkzZeu6ZST8g$d=!mLW%aLDS%qbrYA{9-)VbYPw+l?7FFSyX8S5l|K^
zq^UBb0lyF-Ea=$50SbeHh6Wfr5UdjsA~RaxaYRo5tuv`C1j)vMm?|m++YO=iNeqbv
z3lzv{;|v-iJr_>l$TBS311l~FT2hk>Mg<z3IwiPw=mIWSZ48(}g{q#8SS@6{83+dl
z4BHi=Tj3=@f-+KwB4l8}{ffO2N9GLwG@$FpA0$Yg0rIe~jeGZao?w|U;R*{g-r@`_
zRK!*|TR!-(0R?T?A%Q7$v_VH9ER<2k6%#-p!a4hKB2GEu{Gov$?j7=k6Qi|}hc)hy
zK}I#Gh)~CPG%ylC05xPWfP20?kwJ)r0I^LZ@L-X}8Y>C}$164jFo`6n%vhitgCy8S
zjw`GX2^JZkamPTGq%leW`j{XMhwgcS%zJr^&_OSeEYQLj`U#{ND-M9+PZVbm*hVui
z*rA{YO8n9RI)GTQg?IuP;zbBHU{ebS)4ZU^du=E(h%r6%&`TL=OtHjr1F7J_Ee`mT
z!WY_D0|zhy;L(jR?5y*P7^jGgz=aV7xxq{o?>G>}7bu`0k1)nula41+2qDb^RfG`;
zrvxETLIOp^`46ucRNF|gKIBk^CQO`w5CX|`6GM^u`~w0A@#M1%Bu<DBMz;#N!N4&?
zgh0YGHPoO^4rdH81s8#Mn-LW*$Z*6rB8adC8e?p+gb~bU#Ks$Q#BoO*b=(oh91%<G
JaX|qA06Qeu1#bWV

diff --git a/upload/style_images/1/br_nonew.gif b/upload/style_images/1/br_nonew.gif
index 3765347a7742f0f7c9d72276c9608eabe691ef60..2d50785e1172a58cf00a1342134181075ce7f592 100644
GIT binary patch
literal 547
zcmV+;0^I#aNk%w1VH*G&0M!5h<LB(=>h9v^>gVh5;pOV!<mk!F(bwPU)Y#nQ=<MI)
z=;i6|+TP>a-s9lr@7UYm+~4Hf;N{uf;@I5b-Qniv>hI|6@yE;1>h1F8>hIg%<l5ch
z)Y#qN<LJi8&fnta*4p01$j!sX%h=rD-s0xj+~MHl>Du1n*V^C0#>?sL^6&EZ=<M*;
zwYuKo=j!hA?(z2P?(^m7?cLzz+~DNi;pVTixYo3})7$2qprrr+000000000000000
z00000A^8LV00000EC2ui02=@s000L6K*s?`EE<nU;z5{eI-k(!bC`o!uh^{Cnj_|9
z;IMd126u5entIJ{yVd91Y)-G+@AG(V&+q&HdvPv<goTEOgK-Lr3N;K65gQK^4KolW
zlMOYD3ULLW1q=Z*4*{kmBM}}ptTrN`aRjmi8x;^B6%rg3Ck!?#z$-ShaRSBy3<D7;
z0}vbo4Gq7n!pCs{*Z>+V6b~#65-bfg)6>~;3F!$m7Bv$V76~01DdoZ;>2VAD3lu6J
z5>!N>A;5$U1O^fsKwx8E98;zWU?4zYB7gt@4hCDn&{UiOAO|cE03ZR$3<EM8RJhOv
z$T%!w%A6@vV=#s><EYrlvnS6$3$0pR*cs=A(W6L{Dm5A>hSR4|qe^ueM~c;}UT$dJ
l%C)Okt#Q7J6&t68*|TWVsx{l?z}2@=mJCTkH_4J906V-Q6%GIZ

literal 1441
zcmWmDZA=pf7zgmfmJ0X+2s*?{+UeAxbG~iV*MW*+e4m=I3>CJyxwsGNG;T|#1yN_B
z2A61zG0GGOt+ZUrwG=3|FUQfAD{Wy`+FswT*X!MJw6rSdLUi@{@O*jl&p-Jk&(2*t
zMC)t#03VnH0O_-!REtTw-7Vdi#u<Z9vPI)YU5s_eryd+t57J|aiSFl<t=(RQIo#_`
zXdJA1km|AE7!jAlB!s>SM8<|OcECmTx?|nLlbWG;r-M~m6YYJB%ouDl;7|3THhrK)
z<9!ie9G+39hlcGTy>$e#MwM1dX(d5310r-g5|tSVxiO^BjSx&So}9#~@i3kA1gWM@
z4~USy@Mw^XfqK8(6qf2RCic3e3)7>7(j1ZWU|mDwAQIKvA~GW`hr{hK4xwx;Iq7hZ
zLRPB1k7(9-JFJY-LaJ?yR2RTPG)^bm^g%hCI(eGZ9v4RZ>tp3cQlblt_(|0O)eaMO
zHv^g}g_)LUJ*_>yj)74u99P>Ym5mON3AH^2_D5j{37LW*LMRYIJ2I)T&_h_Nh<1l!
z+J1L)7pCqDNqT+I05v#5g`#n9I1cuOCEb|P95n<|VhOns?{h{~2A9%88SP|;b+pr-
z=&%qWDk*&y*7V~t6X7Gq)q`<Ge^_q9p@E2`*RQpPK_slQF&>=lFnXUp^J|>r8b?xT
z47B$6VMnC7%iCrMJ@=2f{9}^dpf^Ox;h?k!)4E<s^?^1+ijIl0uOOpWZJ$)34A@Tw
z$pmDjk)bFwK+EAso6gq`leQPM!W;=jV~P}og@Vv=6`It#5(;y)%ZxXr^fcbip;rns
zt3ug!y<cf%RQ8zCoT6qsEM%u6t{F~1XevmnP|6sbXfxt6BPlb6^=L?D!j)#C10_4m
zgdE1fz9_-GR1e1V*o4|1@3hAt+t`ahOl4ysTMQlc!%h<Hqd{a;s`Ee91x)q`h(r|q
z1Y{vwwf@%LK&PFRX#JAjfEIDd3?bb>P^$Ai)%lqC1WqMD1Xm!bMp|W?fKW#GmJ58C
z6(81zp8zu611B>06=0*`az<Y9p32MFyv&VLZ`{H(&ZEK^nfGg6W`28hx)|7O291^t
zYv-RjnR!4^$iGCXe@Psutu2|mm8jlc(F|uFKmCVWTK5xr4`5o(S3A&KMa3DaDN%FT
z9YL;Y{Pl<@eC*Dzva9aZXHIVgwiiAW)Fwilhs#TNO?kp;hi6<`I8{|#X{wU$-Q^dQ
zJ-)dow-UR1qapcEQTA%>ydzJ_9L}4S)^~@Q;hk9x^KWhatnuZdzXgl(|5E9<)-@LW
zE`OK)^CWUJul%En4K?db_tq6{YJ;ksH1|a9oNDy!+@|&N1#j<S#Wg3>z?|c{N}+OZ
z){=#s3+(&dxBGo-mhG%xanJDZ&)k)w(;7iCy<W`caH@8PZd`wV0Y@9*H07IBm$O?O
zN~91w_&xCH+Y{j{%a0L;eGAy5KsNBm1|ZA2>vMUtZx&Q<`>mlguRQ;5!Rm^uRrQXV
zLJpdHtw2;D)L%E>dHmh9%<=KZ;!><8ICI^WGkf@=`W#a}$5(f4aTc7nUs#~*=Y29(
zn^rpi8au?De?GX>!7W*QmdDLGEx59bJu@VpGd)YVW6p`Gv)p+R@zMjc9{%uk=_YQ@
zs-2v3P>HGdg1B^_Xuoz%rtm2LLQBrngEA`T3VO&nr+ms`UgTSxxb_84P+ePgw(52T
zmp}8O@YGkIi-XhF1X>T?$lA-jTsQ0P?Cn>I_KASyYZuJStq|N_^#l<W^Mx}vf5X-`
zY+17IKzZ7cHHVgoGB<J30bXN6`N|p28vCqPO<H>4$;HF<`6W4Z;#saAw{tR=f**_1
ico{j{7Dmq1l!5;-4W|4rM^=^3-XM73gn8*)VB`N3ENxH#

diff --git a/upload/style_images/1/br_redirect.gif b/upload/style_images/1/br_redirect.gif
index 46e5c2afc837a2f6289f0d04793f0dc4a0053e31..67d83cbcdedfc5e5750d25f9c2a4530b8d1fc809 100644
GIT binary patch
literal 770
zcmZ?wbhEHblxC1-c*ejG*?c&C`i&#!?nJj8%baz)X5Piv&XbKxZ^rkWN$fwLI`wMu
z#7ngcuhcKT*0lWgt%t9}8xFLrx*O4SD70>0RNJxEH4nlX52W`V&*(oHTDLc2=B?DJ
z*9zxc4{O+;Htl-ej7u?{CvEd~Bu~0zk+wc}`o)Om!%01-a;Bb->po+jvn6B3&8h|0
zk|thEns70u<zQIDfy{}gvnHL%oq8c}+QrNXr!ps=ifTO;)p|6%@nCq<!L&)|T=O?4
zb{<RVK9)S`a!l)?xUSPN9VZj|&!_bq%b9pGt^ZU=-QM&WH^b`p=S@Bp(ReVU??gi1
zx$MbjBbyJU_MMDrKc3!uEMvmSxSliFbMNIYcv!IXd1%e<C&vu(7e5KE+9~5byLHFc
zoEg``>h?W8svpsK;PEkoT}Q97Yo#&J04V-s0h_7=B0+J&!2Z91pDC%OwXMCQg{djI
zx37P~#Qx^wm}%2z%$zkXxg|Mv!NNt0mn@i@lpM8c^_sQoRxM8s-@Ik(w(XlY#_is-
zci;Zq8xsy6IeP5);f)NZ8H8j7EIcHI1-t}=FY61PVc5ugpIL}iT$c5jOG4l?R!=|k
z2OHTwu`%#?i}5(?@z{#<xY<i2G#KfNH8pc+n5+m~#MmptyCfkaq49X1ZnT?B&(sCU
zOakn)0xTFFpKMez<Xdq^NbStDzKvohVj2!L_9*blteL_1q=i{pEn?RcN$<u$Rwt#J
z8A6RL!h$+>E({BuUx+Q<$dtkRU@=p>Se!Y_jR{Q3$EHPZIi_@AS_2n9V|?F%s}2s$
z7p7(0Jhtf2_VxGom4D28D80Jt;o%Pcc7trQmWL6MO5XE)b{0K}2s6sQcV=htvxrGf
x-QT_}-SYDCis0#et=qT0zP>Iwai;I?ZEtUHw&oN#Ykg^vV`r0kln4idH2_vzPF4T_

literal 1447
zcmV;Y1z7q=Nk%w1VH^M)0QUd@tia!}#_6=m=G%msrn=Xvzv8&k@u|Apw9MwS%ImPk
z=C!xi+TiH0#^UCToX&@(%hu?dhNQO6>#M)svB>DEzTB<C;^OG=x6tpm&+77wo~pXp
zuEgM`xY@m{%cQs3%F^BTm8QOywX>A5s=nXajhm>v*|^c}^`EcynW?hM=C8!&?u?$_
zj-1DCkF(0?w$Jyl#pkQR;r5ZDv&`qQ$m+1h<*vr%t;FKep{weQo#g8B<LUCP!r`>c
z?A_z*uEXNo<nO!5;;_Kpuf^oA#N?{H+_=&3;O6eR)AzQ`>aN4%uEgWA$mOcN-O$?U
z&e-Usx!bkP>9)@4w$Jai&hD<n;@sis#L(un%jn|i^0v?Jrn%hM-sZK-=+@li(%kCQ
z-R!i==&ZrwvA)>2(Cw?h+~4Kxyx8}(%;~Pg<iyY6*Wc>l=kK-6>b=?V;EbHJ$>gQD
z+pWXk!Qc0?$mg=j=Df$*uEOHA&Gxg&=CaE1uEOTE!Pea4@7v?=z1i-q!r->e=)lU@
z!r=C|&+N;Ru$-{Tsl49CdXu!m+p)>%sdJLC$m627(WRupt-jr%tjVs$;meGx@SU%%
z#NW)*-oV`UvdHGV#@494+nTM%#&eMHm8ipipSrWstis)|#^$fU-;<rZuf^h#qQJ7q
z<h<7LvBl=P*7wGgv%{FT&w!w+qQ9`l>$S}4zRTdR$l}1v;lt16-i({fZ;`Wel)HSL
z+2HK)i=C>0pta2Cw9M$LsKkw(yV;DVypgfB%<Qhh;keT8w9NFi%<{C#>AcqTw9Dz*
zg`nZ*?zYbEw$AUrn77*E?6=SEsJq^_&Fr+y>F$f5w9N3e&g-|&@!EWt;FPPVy4tkN
z>a@-7w9M<Z%<J}zpS8{Fu%NxIxYx7D<fORTq`2Fx!{4R2+Nr?Zjh3^jz~8jZ?XiHM
zwax6Z$m+Ag+pNIer>exEsKwQSp5c9$s=VFilBluB?60@hslVH}(DJXu<E+8tt-|KG
zaF4do@VC<RA^8LV00000EC2ui02}}u000R80Cxx+NU)&6g9sBUOvvL81R+BX92g=5
z!XF+B3Hrejg$AHEbm+VRq(aUtKN)$1F@k^)nmn%f@CiUH)g=`Nz+gnE<q4NlXo{@>
z;KYOpBP96kNn#)h6fFqDa5<Kw9iDfPDrnsbAOMViQJx$OLeE-~1o}h;S}Oy9Teo8Z
z<k@q;SwS9H_T}?I>Ya#Y;eY_?L74EEB{irOkadAzkPpV9)tN(}my2t_?pfI^7>|V&
z_5yrhLl6q0ZrYlVBCyF;u4(c_EGVLn$&w{%0@Q%Erm;XF!jQdc(!|W62o5xasP|yi
z0wP6<s8JAuggYbyhcpn7MUNgyj?lIL(BUlw3TzKleNqrgL6I>Vehf5XN&qi0V)Wqi
zmBRsx8Rk*)%L9gZfJzJ&ba2Id;&_pU7g=O6M=3eLp@Rl9gwRPctW08{0!wtjKz5Dn
zqJ$D|xPikcCBWfdF7wpl2{@YEK!E}lY%t<)9GED91X6$!L5mIy;KD7f5FmpMi!7pm
z3}h@Q5EM=bFhwDSykG(&v<$$>I*(|A0|g0`xd;)^+##PpkHsNK8D+!*Pd|z163;m|
zEW(Wsd?r8v6CYTDoj`a^fItQkR5HQ{k(6V{H(OL8={D*lpnwy7bm1GD2Q(l^8j_eH
zNfr`dfPp_$P{GVHKGXq32Oyk;VGtPRxJg4b7#MKGuBTG5MKCWAG0q?iY&wt@P{`59
z6mSk>z_UkSumw9WFhNcxU$lYH1y5uH00LK*al#4DNFa?J1#~dT7s@Pz3oIX`V}l)1
zNP!6vBz({Z2n=YO(FJU*p~waubg%&#cUaQJ8OHvL#1B_6z`zwhAklC}7#kE206RL&
BR0IG3

diff --git a/upload/style_images/1/cal_addevent.gif b/upload/style_images/1/cal_addevent.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1d7b6b87ba062c50208f0e2703f9745ea8f2493d
GIT binary patch
literal 1987
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
Vp$9%B<(06Er7UB)l%@m(06Uqf?w9}o

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/cal_goto.gif b/upload/style_images/1/cal_goto.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a4d2cd63226b7ae3390e3a131f1fab74abf3a03
GIT binary patch
literal 1267
zcmZ?wbhEHblwlBO_|CwPKI2CE^c!hYul|3x>dUvE>C>)<RPPS0-W5`_J7v;k?}E+8
z&fkq_JLO%tIkM@{y?gh<YWJp0xsp2hO2&*E5v`}Z3pOQByqM5;E~@!(Sl!;_NtZ*b
zcc)FemNxymY1|y^l!ZwXE{50bi)cI$(ReVlW>4#mui^Cv(r4U^Z9nc?vMqJWmBjuF
zN&V-;8}`R_o{H@}kuv!Tn|gd?^I>+)<fQ%!F&)Pvnhu84><X*d!>SaK*mv&Pvu6<v
z`$KE@Bu%^+)^Z}c?bxQBN0KI7@GaRK-+el;YF~K$UjK^iz9rj3s&}PNyXIfHJ9)yz
z;F>+&g`12brzK9jl+b(j<(p4_rQ4!fkNA~t32WHD=FlVe-1QTd9t*4A=ajx=;__oY
zCEH^<PZl-K=F`tGj-C<Sai+e1Z9>nPH3uK@>ZZG8t@JM35ZQLhuWV;b>#=~!y=haf
z#&w<cFW;Wne?Do#dEb()5v?b}>-TRw@xr%sOK8n5x7;<smAm{(w<q?V3#iy*5;I%Y
zI#0+b%e#0}XzlKxn*9+C2fPZ_$8?_EviqoS@m4LL=HRMbaowjgrr*%<Zwsp3CvBM%
z)q2#wd|PDWfr-nHhu7~jiJk3Tv^AoBzmQR8bjJzb;!VLddqZpY`V?*TFW;3m?Rx6e
zYt2(Oh1Kn2*Gl_;hT;GJ{|uu5H3SrYvVaA2KqM$nFmU{5$d_<%_|VYEEX}9kl98a$
z)W&9};8FB|t;t%Y;LC{}hW#?Eq7Gph3l=ywPf(dV!DfnvK+AMVg(Gv6RxLX_+ah<_
z2?3|mO9I@ST34uOO}V((V{)6&QB4+ExoJ@!G7^<s1D8hhcD+hUn!q7A(XB(G(M4qC
z=8Vg$R8_ssbFlN}9N4;%^K{SFii=%Aj~SZdB_*8Z3Qlcyh}*Ns>g0l?MO=y|(Js6K
zTMrm$24p&B`e}EaS5}x%&^Ifl@^j>w<zF{NHY-hj!nnb`cbN~v)~MTyx)xLzx=eX<
zf0MfR#@=Z=G#vF~ZhYj8G0T0l<k*`Ehr0niZh9Rig0@}Xo}RHTm~~;}A`LHI-~7G@
zAK%6rXPu3AnX2*epx`2@ly5I~6gakvJG4Z$U1$DOTi_|?|6w~5uMWq?1=8MkN+lZQ
z{~UCctlhxS&Z=N=a3R0KpM-0PjvbHMRl=`0cCw18JXplWc|gO>&*CTpn{r~sg5(~p
z0|JdKf`2$%6*CPImP`~;@jNIq<A~rA76Xq3ht%hDC@@Toi1K_oHMH)M+tipm%?5SW
zibtLdUIhmn*;B<Xq|Ht%df>@kJnQ927Dk2%>I^mW3>fEkznGcMQ0ZrIkdskiR=NX&
FH2^o>(CYvI

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/cal_monthview.gif b/upload/style_images/1/cal_monthview.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b115efc94fba7427dc8b39d2e5a27bb92f947aed
GIT binary patch
literal 406
zcmZ?wbhEHb6lD-)xXQp#US7Ux)vD*upU;^y=ll2X_wL=hapT7S|No7RXU>>0W9ibR
zYuBz_xcC0*)vG5>n)K$)o7uBxU%!6+)~#D}=gyrqYu1AY559i=`s~@W$B!SMJ9qBo
z%a_}?Z$Ewd^!oMd@7}$8_3G8ln>X*;wd?-<`|sbsXP^O4{K*0~RR=_Z{KUYv*`cAp
zLx)e0pIhNTj@5idcBRh|PV0R#7boOO^>TPDIn5$+?u7}nqu~VRXNMlxOc%c<e6sw&
z``^qQ(F{y2t!?d0+0qitOw29)eG?{UbBi+6&78&DP}$qDpp%1BzIWpC$&<2^7`WE0
z->{KOfnyp2%Z{D9cC%zFif?CO-f{TQk>lA-+^5f+<xW_`e(CZR_LQJphD*%1?_To@
iniv1rsgYGqmh;u?H*a6bNGU6^efj$B`xj3~25SIMouYsM

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/cal_newevent.bak.gif b/upload/style_images/1/cal_newevent.bak.gif
new file mode 100644
index 0000000000000000000000000000000000000000..42ad3416723b995dc9ae7c3c2988cc79f320d772
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/cal_newevent.gif b/upload/style_images/1/cal_newevent.gif
index e174f464ec0ded4cbff2214f0281244630c4eadd..75604f9a47d3d9b727c351bd522cb3d991cde580 100644
GIT binary patch
literal 1944
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

literal 1560
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
K@$f(a0RTIM2^c^C

diff --git a/upload/style_images/1/cal_weekview.gif b/upload/style_images/1/cal_weekview.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10fbb96dbcfbb080a0de20b13aa701f7596da146
GIT binary patch
literal 687
zcmZ?wbhEHb6lD-)c*Xz(?f358TeWJ{%$YN1&6;)N#*J66UcGqnV)yRd4<9~EoB4m{
zng5R;KVGtA$=$nmzkU1m_wV1|zkmPu@#Fvh|BDwdc5!i;F=NKnt5-uqL+{_eZ=7}}
zIyxF?=)8IJ+S}V38XEfh`{&G=vu@qG_3PJnc6N4mcRzUW;Qjme48~`S85kBVTJ-tz
z=Sh<$H8(d;n>KCZ#*KA#b^iMLH8nLoJw5a1&#$kq@9XO`Hco48ZLO%NXl!hJ^5n^s
zDO0Mds-{kzx_0f_mX;P5Y3bFgSFc>Ta^l2^&!0a(eE4vAdHI$tTfTq)9uN?4`}XaQ
zj*g>8k1kxeFgSO2U|`^yHEXJ?t3h5L1VHg83)mGpAQBWO4DA0Kc$=DAnnbkxOk@>V
zB-KS28963S<eN5qhL|$n1V)J|3l>ha6B8F<Ua@l3>J>UHtaB$ba&FnWZHvPCx$}AU
z?%Ti5c&UhnhCkDZlc!Fp9A;<dIDhH#6}eq(Y!Wwa-?{6sp5fu6$4?$FW#H!Kdimz<
zTPcR;TwLa#zkUDy;lb0VQlgroUqmH7JYZ~U;t(`isgTgrz@=a%QlRL_)Yc_oXf)@*
z!G~>%j1>wJo|{yfM1(EMc$AbFCvpf19GGKSob1IY-7;eXBO_DWJcmZU8yXHL+XW@P
zCVXgE+}bB)kmB)j;$sg^4MVdUj>IJ%ZQ?A4x@5f_T&Kt@O)xRs_{gP=setG4DcucA
OuJJKzPhw$Wum%A34G41p

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/calen.gif b/upload/style_images/1/calen.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5ba53a68c013662769addcf585e10422737fbef5
GIT binary patch
literal 369
zcmV-%0gnDhNk%w1VH*G&0K@<QS%brCo!()O&s~YhZJ^<4n%iZS)nk#;Sb@N2m)Ki|
z#$Sxg#LnE>;p=dv=T&^WZ=>W>dbzC1@2$-7g}C)>nAWY!@K%1l|L&?GOOm?9)dwnO
z|I7dY0000000000A^8LV00000EC2ui02=@s000H<V8du+X`U#_h+FHvaQu!NW#4$N
z+Z(x6z@TtQ1okwWh;qqnI+e%GV@j=BuhZyd%k6r<+bCi@&X~{WGkF{ZxZN3yd``z?
z-tMSkzt3>~fPr>=dr<?2hkk#G9Ex^`hfxcYlZs}Gjv17bQ39TxjG=#apPo?%sHmcg
zqZz5FQ3kTIX@HrtvQY`UyK!=tXB>9CyHN$l$7gndt;okw0nyRQjDU91(NP53+iBir
z+}lwQ<mKk)=;Toj?CtLF@a$1C^z}Xx`1$(#{P<B800RmfNDyF@2?!G^T*we%4+ixj
P##k{Tg~b#rLI40eON_P6

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/camera.gif b/upload/style_images/1/camera.gif
index eb7457a2bb3605c2d704c40540d696fd946fb7f8..8f31692a10eecc81268373cad51a3ad1f4879422 100644
GIT binary patch
literal 728
zcmZ?wbhEHblw%NOc*ekxG3!?Ly!&~J9v3WoUcB=4|97k6CtSMs^xfs#&u-j*_2kv3
zM=w4`70pVVa@8Pgdfwuv=`(HyRqjlgdNsIu*VJy8fQs$Lu?zgmwi-px4Jg|>V}e)w
zgo`QDZbY@8&<~yNU$yK0v-c4#hdpvvnMBXi3z>HH&hy}ggFZzY0;_giyZ7SmlegCC
z%alCZZ$5lowBn^*R7X(ul-B861dVf)y*qLiJrTDkn6!BB<CmW<-Fj;1-w@t;^7zGj
zAvse++m79Q@G4{Wors15u^lI(T8^Yny_P)jVnWZ^(Aqua>pzyRd8g<-DY$B9>yEEE
zGp=2{^^{#J?f)5u!3Gq6vVfhW10q3j!odE&ft#I^!?&%yqqEDGgOk09$8XZ)DO0CS
z<!Scwo-=pe`~~y<TKs&LEnl&6)k?osKd%iNH*Mas*{{vdZP)JI!jkGrO6rordyZ}Q
z^>a9V=8T}Sil?WFvf$b4C;Xgl-?<|yC&J1qA}4zH`Ax@HuV0IMvike8dWygKcGLCe
zuU{ITA3u5qypf*K+i|d&-8tccfIoAa0Ecp#wA03<qkLjA9>oa@n~(P2WayC53_8?a
z{^(il1cymabY=XQPRx;HXzDEg|3uZ0vGLiNXw{TI0uEbVu+6b7&C@vbWm><C6`RN0
zTMo0XuJ)Ajxm)G!$|I)7(INV~p}BE$#`&TOgKcluvTB-EtZ{JKzV7bsir3qM7?Rj~
uByBTfBz<;lczAfR$Q_1>hmLhiO;?IOwPeAj1!AgPy0>yxTwLtHU=0Ai1{*X0

literal 1756
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

diff --git a/upload/style_images/1/click2enlarge.gif b/upload/style_images/1/click2enlarge.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c8833aa203b58a704ae017eb939428cf3496370d
GIT binary patch
literal 304
zcmZ?wbhEHb^kd*=*v!Dt(9p1Z_wKuQ?=D)jX!GXHXU?4I=;)X@apKjhS7*+gdF05E
zRjXD#d-jY01{8m?fSEcV5@ZGg%UyvJo~!p-ygs}8e}YC|iYII10zY>}9R|abZ>5>t
z6f{>&xMIY)aC!ho{$>`1g-#mm9Mbu!7d=^ok1z&UL@-+EUgtKOqw>h%1GfXufe)Nq
z1{KmGy3GqGY_8c@Vo+4X+!V^{*v#1$rcvBq$iU8G#mv~s#h50{s?ixAR+=8VD3X~~
zbZUO+l0~y7gmU>U-&D)M#ly^1>a}KHOlZoQ6$vTaorOm@d(&Cm;&)G5$97tXds<yz
wJPQwxQ6SS4!@EXdHO(bj&l6n2cyhH^vKLjqVXAr1p!WOE-+%ull^7VT0Vun1YXATM

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/css_img_code.gif b/upload/style_images/1/css_img_code.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d1477442c9152ef85e84796c7af6df35c1b27deb
GIT binary patch
literal 408
zcmV;J0cZY4Nk%w1VKo350J8xA{gILX_xJwG%l(;|{;sb6;^O_Mr~ROy{?pU`y}keG
z>HgZ<{>8=r@bLb&w*UYCA^8LW00031EC2ui05t#^000F4Fvv-(y;v5&NB&@V4IChz
zXvP(3+pd8?7>P>>!eR#p;Pj<~El~mxY=mNwky03xK1|_95LAd917h(MqDWZ+m?cpN
z3fPk2)|o6g9|V9Y;T*^c5;Na{0@f0800<N?7lKC;JysJ8Mlnzf1qeWl8zzMSIu?8Y
zi~&iXkVkJtgcChp0frJ!qGez;Zi%Rm5~Z|(aCMp#NpusPvKd&Pm#?b;WUdsBxdBgq
zAXpxmWY!YDYy-5>fEf-Yn-d(TZidcejwP*GA>o4-Pv7m;3P~JRKycIwAp*84;G+dk
z*1jl?Xdvh(Vgs@O>!4H%00zK-apdfn+W}Cbzgq%D5PY;y5x{|sEiR=YF!F?ek|#l2
zqi{*X4hb)d#2jJr0;`)iVYUo#2~&k~KrQ6tFl>T>0S`kZy^!-^h9m?W5WsjM0suRT
CzN&Ko

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/css_img_quote.gif b/upload/style_images/1/css_img_quote.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c6e5d69659dd3703b4655711c0b961a32df20d65
GIT binary patch
literal 406
zcmV;H0crk6Nk%w1VKo350J9GOe2%Wd%GrdLv-bD;<>>F9ti<i`^vcrTmZiSj;px-a
z<c*!Vxx>`3yUwSy$^ZZVA^8LW000jFEC2ui05t#^000F4@X1N5z1SYWI~rLiN=8!@
zO;Qa)=N4mZC9TU)fvX=f7FaAD=O@VtIj|mufDjNW#-pKl>|_)f8e&>;Q~?c%;tNo%
zydcZ?bMaOe6U5g%AuI&+r9i;7M5Ph~avXRySakvmX%=!s7eQ5d3IPWo1srq+El(F4
z0E-s{HA5YF6_)^<4~-deNg)Od1q@RQm>HJ>6P}<H217~`sC^b3VG_0u8J><ka&Q=)
zTm-;Azy<*Uham$THyD@S4@S*U90-2}y%o~dY!VE>0|^PBe>%tD0OA#*@506o)DXaf
z$`@i3#wh9};GYCHM+#E=Qn241RTMTbSa;8bE(xPUgp_+A$_WMnrgo7r)3F1_2V>L)
zBe62jARVuEjZ^|rh$=xk_{<!k=}6880|M9*&;a4kXhKXromvMKfC4Y6_J{xgJO6B-
AmH+?%

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/exp_minus.gif b/upload/style_images/1/exp_minus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..210e43a754d04861186dc9de09d33f0cacbe6dbb
GIT binary patch
literal 59
zcmZ?wbhEHb<YM4rXkcKNk(B!7`76brEDRu^10p~&3`{~T{Q{@6@5+^EUF~j~BmFHy
Ik(I$30K;?;9RL6T

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/exp_plus.gif b/upload/style_images/1/exp_plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b9e8c36d87292e61c8c01d8bdb0242ba4dc6e041
GIT binary patch
literal 61
zcmZ?wbhEHb<YM4rXkcKt^Y~qS`8>s+EDRu^10p~&3``<D{fwux|IC>bpxQ0iQT>g}
K>}sh9gEau`U=c9@

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/f_closed.gif b/upload/style_images/1/f_closed.gif
index e8c58133fd1445f91d15cbb1872f65922a50c62b..745ae034edf7df643c5ae15d7f3ca4155f61fb4c 100644
GIT binary patch
literal 91
zcmZ?wbhEHb<YVAtn8?6zVbj(puRhI4O8xTumEunp1`yBz5g>U6CY_#s&C`3;+UA5f
qbhYyaepk)C&(v^Bb?UQ|zB~^WsR*A+zMEFKZu7bQo*cZa4Aua^)FH?K

literal 595
zcmZ?wbhEHb6k_0Ec*el6c-zhY3=C(Ve)?Zox$D}qZ5Lkr7Z%=i_3e(!ul{p#?mPYD
z|F2(1AAVlG_wnX4k9S^u`G4omHHV(wfBXI3o6j3gK3}ot+S()Ue*F5o^UAYb*WPV7
z@!;^C_v?<{`@ekouRs6R9C>l=!N>o{k8e8j^ylxto6kJkb^Yy+-+%Yr{rF#8eDCd#
z8&1C3e(CxD`}Ysse!2Dh)Ac9b+<Ni#zk<Tc&p-dm$o&2Hf7QX4EB4)Ay5r``{WrIq
zc)a1nqg}V(tT}Rj!|_K8H(y-1>B7<-x3->tvFGlat*4$W*>Pjpu3Ibi+*@_%-l~JQ
z7={8+{K*1#rVfY%#R&uZh6XN%=9bnrh9+|-rXD6E6BDCeCTo{wQ9BQIb^}>XPFaK5
z7WSgeGPbTZ(rSh}I)-Y}?haNm%~C2#X3pH4#>Sl7mTpQaQq6p<td0uIj29T06;8AA
zHS2M3h={W>3J5T=iHqFQYt~lP;+4CnsQ5^ZS4&m9nP1;jQt13eW+BO}JrxEonp;KG
uC3GYjn2t8E^7t*;@F6jPg@?sx+YE!GBQ0W*oCzHbFD7_8aWOG6SOWkM|J(-v

diff --git a/upload/style_images/1/f_hot.gif b/upload/style_images/1/f_hot.gif
index 4af3295086bc8737aebbfea7c2189c692c480421..10caabb4325118dd12d405f7af2c47bcb9763a73 100644
GIT binary patch
literal 169
zcmV;a09OA;Nk%w1VG{rk0J8u9q_fG}<L$}Q;p^AevjG9X0Rij)0M7vd_W%IMOibPY
z0NY+(<m&Rk%iCrL2LJ#7A^8LV00000EC2ui022TY000D5kg*_|y-ftkxo}_@3SHMY
zL#hr=Q%(YauBiiH+9&S3Q#p&Ea7b*O63C=-X><^t(5SRos9LYs=3&e2dYg){cuZ~@
X&gitdiD<ju@RqJe&tdL(O#}ct^c6>7

literal 367
zcmZ?wbhEHb6k_0ExXQqA#Es#9uiyWJ3;y>7{9j!7e|F0MRn`CNEdIB<{omgIKbG}>
zmgN6QVP`sv{}(F%FHwIQ$nZOo;e9B>|1{zM^RxfwNdKQ0a@LdKwjaa)D#QPs9{&@$
z{}-wLk7545sr~=5(*Mm4|94IP8Nu-X$da4B49|lYUWYKe3}$#3z;Mcg;s30pP4*0*
z!x;Y8n*EJp_@Bc6HJo9K1H)AxhL1qOd71xPofz-}#h)x-c^wc5@)HAF&jGds4;?AS
zL)@+ha;#>qx*{MvnP=UNoXl29tvI9W#~t+Q6Q*}2SyUEy3Hm3^`*0>;&heBN7BW$4
zI*Q85ifRIN?0n9W930##vO+%UvMSttlFkY|q5>Q|{6gydJf;GoJPOW?+)84s8~OM)
nvWh8jGsa1au<YA^z(hKmK~ReE#K}`9qy#<OFSzhJGFSru-H3wP

diff --git a/upload/style_images/1/f_hot_dot.gif b/upload/style_images/1/f_hot_dot.gif
index 31494f5ac8edef3f12059fca0ca005b0c01f3d9c..8d2dd83bf8aba011578f1b7e933043d324a34216 100644
GIT binary patch
literal 174
zcmV;f08#%(Nk%w1VG{rk0J8u9q_fG}<L&GK0QUd@-T(lz0Rg}P0nY&e$<yJ;OibHe
zUgYZX>(|%7%iCrL2LJ#7A^8LV00000EC2ui022TY000DAaIJuvy$uD)IdWhaB3;)w
zOsX<YQ%(qguBiiH+9&S3Q#p#Da7b*O63C=-X>=5x(CAZSaTu=H>~+>Wc)wsTw@N6R
c&7xXWz;3r^s^(x$r^D5{o<4`^`!x{&JJEnhA^-pY

literal 574
zcmZ?wbhEHb6k_0Ec*ekR#Es#9uiyWJ3;r)I{NESwzs}-+yW5%0;{UO%3=9navn2n|
zPI(&0@H>*h*x2}gn(+ULA<u&t{wH$(uQL3<s``JC>dy#<|MRo|7b^ds6n4{>;qc+Z
zHa0eAJsJL&sNeQu_`j_5f2YU)9O?hf4i**`AHx{FhBN%1m-+wk<^M;P{Co3QK|w)A
zMrP~Qt$(8!PI)l=Z*}^AVcY+APp|qg{JwkU|LJxAXC*xhVEBJx)&G67--j~%KeXWg
zz0(&jUfklq@W0k<lRd-#+b90Ne(?YG{r|hB{J(zSe+vKW5TM(K22lLT0(Phlhy=w6
z1N-a-c82Db);5MFS#hSG-o73){bqSPE0*aqW(qpUH*>fd>nVts8aY{rD5%Nub2RhI
zi3;+%>hj4*8>*U%%JDZ#u(H~_Yw2)u@|o})VwGqXW@F=$a@Ibf;wZ&+Nw`^AQi+F6
zQ+m6tivf?4q;fMOmzV%Ix3z|i<re`lF2;F6;%po;9v@m*!WpDmI1X%B=-j3#rC{YU
K@j{~mgEatqx}>N8

diff --git a/upload/style_images/1/f_hot_no.gif b/upload/style_images/1/f_hot_no.gif
index 2b0bc9bd612106e12fc6b51a26cdd3f38c0cb6e7..7fa2d28ac099dcc1adc9e1ffa99cf8e44319eb04 100644
GIT binary patch
literal 169
zcmV;a09OA;Nk%w1VG{rk0J8u9#LnH{=I_?t>FD6(*Or>nb$QW{l;L%G?sa+Db$RG@
zdCPTq<m&R$+UBKrd;kCdA^8LV00000EC2ui022TY000D5kg*_|y-ftkxo}_@3SHMY
zL#hr=Q%(YauBiiH+9&S3Q#pj7a7b*O49KK%X>=@}(5SRos9LYsW@5|jdYgx^cua08
X&gitdiD<ju@RqJe&tdL(O#}ctScy-T

literal 367
zcmZ?wbhEHb6k_0ExXQqAeZ|E0w=TXvy5aq~eeaKMe1B@^`wNHO?_cr$(AxK#Cf_=|
z|NZeT?|03Af9=%!?X%zSUifyy#24!(zTZ0Y$=ZqUub+7iWS>9qV9mt$dzZeyefj;4
zIqwgzdkU1=wcx?(iElPce1CBD`(vA*0hMi>^nUZS_h<IpUN!OkmE*ToPJFd~;=2tK
zU$38dZ}r5N>nFb7GX27`iSG}sdB1P@`!l=WpW5+w&BTk#CNkg!ia%Mv@;V?A<R=EU
z9tYM04;?8+r(n$kIaV``uY3sV7Fc&f=Xt55T8z%rqYiq}VQQX98kHp$6M~cPS!~Ui
z+n#d5LMBO6Q$$iyL{zwroyS>%gM&{_S<pvGS&pwy!dZb^N|=M2Ur>pk+dx=~Tfv!$
uPhOFABM;9;Rz-O}rZ^Q<=6(AQ7^!442uL%XIC<)Xw19{E1s5(y25SI4m!_To

diff --git a/upload/style_images/1/f_hot_no_dot.gif b/upload/style_images/1/f_hot_no_dot.gif
index 1965399865d6c8a9c6ab03cc0ce817a88c2f625c..2122e8e88e2dda4a40dbb8154328eceb6b9a88c8 100644
GIT binary patch
literal 174
zcmV;f08#%(Nk%w1VG{rk0J8u9#LnH{=I`NkdG2+2=yiG4-s#eHdD(S&%XN9zmYUI!
zl;rC2=-}ki+UBKrd;kCdA^8LV00000EC2ui022TY000DAaIH|9y{!bvd2wJE7G2jk
zOsX<YQ%(hduBiiH+9&S3Q#pyCa7b*O6v(7<X>=f-(CAZSaTu=H>~+>Wc)wsTw<;)`
c&7xYBz;3r^s^(x$r^D5{o<4`^`!x{&JIL=*hX4Qo

literal 574
zcmZ?wbhEHb6k_0Ec*ekReZ|E0M>o8`b@BbVeeaKMe1B-|`~554pW69;)8zNtXWu%!
zzq4oJ+YJ-vE?o9x?Zo$6XTIOH;QijEPl4=R^WUF8@Mgor_s2HhUN!Ok?uFNH-G9G%
z+WX^M9;})8VD-d>OIE%=v*-Q6)$e!Ad4G7_`wNHOKe+Y&`Lh@6Ccb}kZ_120&w-3P
zS1&G`_;}64_fH<aefs$Q^)nZ*-kQI7#hnLF-@kfwZ}r62>nFZHwd4J(*B6#eytQ)T
zJD_#9FTVr|?pyx;#`*VWcE3Ng=Ka%0(`L?lfA9MHH*ep)e)E3IbcUe=6o0aS9jgN(
zL2<&sKD&X7p}D2CjiE_go~fs|ugA=?Sw>rpW%`VnLKZU39Bw97BFfG#=32@krsDh@
z&HNGqLOkjQymFE%HaY?l{LR8_Y_^)N8r<BxdVGi2gqsCfSvh5molY3)%5q*3Y*vs~
z<YTp#+-{`rz^5p!(9FmwD#p&vr0Qt*MNE{Fah{Ys8;6X?hjzAb28j-i0~;1Pw<$>|
NSh-A`(B!~i4FJ!X&HDfV

diff --git a/upload/style_images/1/f_moved.gif b/upload/style_images/1/f_moved.gif
index 506494c4952e17154ec31659db714b58cde90f25..e4cc8b3132cc7ae9f55691f78c51a5ab1018cd6c 100644
GIT binary patch
literal 85
zcmZ?wbhEHb<YVAtn8?8J<khF5(#lU?e=;yIDE?#tk_-$wAOa-Mz@*mFFL`>eSj!v}
lhptxEjn|?}rCyZGe(9mU&1d!VrkPsj(_gAs1u-yK0|0Yr9QgnM

literal 578
zcmZ?wbhEHb6k_0Ec*el6c-zhY3=C(Ve%f{I*}l6UcU^tE@AQ-Z|Nrl~^?v8om+Mcw
z*?HyJ|D8M69(lLs$cz6oXYRfIan-?>7ao1ye(CwH>u>*Gym;j9hyR;5Z$1BX#hz<7
zUw_|l;=!6jPycV-y6)(`vkyM}_x0U;=JDn;&vxB@^It}0$&MQfH(xw(;q{q&?~mR5
zxZ(Jt|9X0R?!Ni_<In%ckFPxYvj58a{~tfT{P^SlnKK(sJX*Hv*2?`i|8sIK-Eni_
zrVIc1_+EVax##-xUDw_ny!hhPr=S0S{W^T-{r_9Hp1u9{Usd(O-M1%izkUDh_vw4@
zZ@>C>`}ya`?|(dh|KtC+Z%cRFI`{0;nj`nmKmNSx;H?ukKiql#?Z2BF!+-+CpDbYe
zbwDI2P8itdH?T1@x3sn~G+F2{_4M}m_bRJ4OR5F2&X_6WAjE2BDcLNiWg6fpCKjmg
z9%|_7XCl`ut>k9sY|Spp!_VmA<fSCttf(Pwq`=O2`izyVhhnpYytvQFGiS_Y<t3Vh
zMS|7sy?5<lR51<_5pL$>613&`WT2_5t>-Do#o5fqE5O3Ub>)H!Gb0DD49}wt2@Qwa
U`6_K<4lrI^*xkaz!o*+=0GloTLI3~&

diff --git a/upload/style_images/1/f_msg.gif b/upload/style_images/1/f_msg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..03b48c473af88805893a2e20069558f9323a8391
GIT binary patch
literal 258
zcmZ?wbhEHb6lUOOIKsg2>D#Z`wJ(b1-pHPGrgFvOocRyZdyeN#zf`v9?(O@J8aBOs
z^WjTE@7bzV&r&8|(T`gj(|){e{p*OvgBde#HEe#L(s8I~&zDQrZhrmw_vPD<>{@9I
zs6g>23s^u0M1t&OV69hB>r3%uidwZUhf8Or>iI8o^ky#02zmcsWUks|ZWoh@OM*Ii
zc#2z`oG-74THed_aHXTqzFF%n{<s#f_I+`lT$Ul1%lQ33g3YT{zvdP`;8WliXlib5
xWR79u7wYcm72;=$;TN4Ub=uTy7v0&~lH8o)3l}Y3!pW`gvU1hxc?^mS)&MyzZnppc

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/f_msg_no.gif b/upload/style_images/1/f_msg_no.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ede3ddab271e9f40c3c822adb3e611699b3a7f65
GIT binary patch
literal 258
zcmZ?wbhEHb6lUOOIKsg2`TOskmp^Sd`egIzSG%r$-FV{p_6r|2oO$=+&HHtS9&J7Q
z_QRJSs}4V1bL_?TiytSgzPjt$w-pB-tvmU8=anzZ_TE2m>&Kb{_a8rh{q^VH_n*Jl
zP29+U3KV~`fCY3wB*;z%)_MiCz7$WUs8#E7xO6gA&wrVtH`6U6;QfDrxoVTSeM}}V
z3F_qGDQ;_ae!L=Td0+Fxm4P1nX05mQ6I#ID`^9;3UWVLT#_b0ZY+kMUH8=19mlD5V
zQ*(18Qw%4+NOw=K2tQ{Gzu1(i)23#-=+4%b<mM1xxM=Yb4sLyym8(|IV^CzU1_1Jt
BdpiIC

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/f_norm.gif b/upload/style_images/1/f_norm.gif
index a68f3d3d31b3be44c0418a6a4aa1a6768e168526..d876fc9872e70d48f31cc1f1e0d970bb19ace565 100644
GIT binary patch
literal 169
zcmV;a09OA;Nk%w1VG{rk0J8u9q_fG}<L$}Q;n&~mYMkA5tnOHW!EmMKWRuihipqt!
z^=z2d<m&Rk%i9MkW&i*HA^8LV00000EC2ui022TY000D5kg*_|y-ftkxo}_@3SHMY
zL#hr=Q%(YauBiiH+9&S3Q#p#Da7b*O7RaP>X>=H#(5SSTs9LYsCSuF&dYgo>cuZ~{
X&gitdS!lc8@RqJe&tdL(O#}ctp*v0W

literal 572
zcmZ?wbhEHb6k_0Ec*elsn7*ZI`_<KVKUHsg+II4N<DpkmPQ5Ewd8>5e{e@RPwah(N
zv+HSi+r`XzXCk_8uD|;&r1^IGy!&~}E>`V)Is4-K*xm#FWox2)o>y+Z>REiaWZm_w
z`InQYUte|iQ{}eX6HmNOnsGOE&g0~%#}-}x;8S%rvg>ljyh{mF9|bg=4{knHfAVoa
z-Ik!{?Y`v){i@FfH6ON3m>*DoA#uv-(hZLTYEOC;ZI9?WlsM^B&5=jN>mK{p9CFLu
z>Xy4Xr1gMb&H1Jy@BOMy*u>4rUw$*J<7hzL$)=<4opUxZ3>~2OlLhQp9S{kM69)E~
z4O|S(Ev;<~O*UFgJ-vNB7H-XA20F~sXUx=g6l)eWH#L)ITe4K%*4jw4SxH*W%2|YS
zGpC5Yu9~z`GcP;4lZmD>Kfkhz!#;N2W+4s^8A(+QSy??*Ntts(%~IS7D#qM`hIWG7
zmMRL|Qq6Me0>Z4H6cs<Q3Ja*qHS>wPvM?}n{V6<nP=QT?Nh9V&fFc`P2cM_P5(NPU
FYXDvms*C^t

diff --git a/upload/style_images/1/f_norm_dot.gif b/upload/style_images/1/f_norm_dot.gif
index 4b8ea62b991267516742ce3f679173f269ddad46..1349c6a5d6c14f8b698333944013bbbf5bb6d37f 100644
GIT binary patch
literal 174
zcmV;f08#%(Nk%w1VG{rk0J8u9q_fG}<Lzpk-F2+)aHZy0fx*es;bfE4UW&?vxb<w9
z*5vB)*Wc^F%i9MkW&i*HA^8LV00000EC2ui022TY000DAaIIjPz0Cy4xp80^8eP{o
zOsX<YQ%(keuBiiH+9&S3Q#pyCa7b*O6v(7<X>=5x(CAZSaUibP>~+>Wc)wsTw<;)`
c&7xYBz;3r^s^(x$r^D5{o<4`^`!x{&J3TT`ng9R*

literal 576
zcmZ?wbhEHb6k_0Ec*elsn7(E8-A`59uU2n++II4N!OB~WhhCL#yx%hS90LP`v9WRG
zw%h(?YeJfDXU;nl-gdEM-Sw)SFC)5cCQm(<G~@2!!-w;hU7UF0b<M7)K2>L9dk<vI
zznnb%x@Ym>gsG1*=3R>Jc|PUTyUNX1ZES3UnzvuPcrm2)K+TayuRi>|{q*auyI<}+
z{j%@=*P!OZiIYy9e*WDpcXQ&D(@jU-M|2&su&~&=b?d7yf0~ZIw~3omyza4W!hGkP
zP5w294n6)_fAaCO&%YHE6as2b?!5J}bi-qhqU{e}|CEuDdGqn7Z~4L7FMhb?ZVl@=
zy5{oxwKqNn)NRRMesj~UPkvP=fL<FUK=CIF*d;n35)>y4>~kA97@AvJ+ZdV*>==7`
z`+C%^n|Z8Mn5WN}>1V;yET!jSEUu_yX0N3vuI6PZ)hsM6Z{w|R%B3u7tLq^zE!@n<
z%Ifdv?#9W<r5$*Pm9JThon1y&!{LO9rmV~*v1S1Y5lLq!(e0`}mXab80?piVyn<|O
v0j{3DUj%vOxSNF(@&qJ2HZ0%~5Mr|xP+YL^a67N7jYG)_B}JA-1_o;YwkE|x

diff --git a/upload/style_images/1/f_norm_no.gif b/upload/style_images/1/f_norm_no.gif
index bb08df3c9062f1e08fb395501ae364b86e49fe58..c6a24f6e931c4130a37e2843434511c0e24afe8b 100644
GIT binary patch
literal 169
zcmV;a09OA;Nk%w1VG{rk0J8u9#LnH{=I_?t>D}b+s>kf1y56kI@TbG)q`u>xwb`h_
z<h0TB<m&R$+U9kNtN;K2A^8LV00000EC2ui022TY000D5kg*_|y-ftkxo}_@3SHMY
zL#hr=Q%(YauBiiH+9&S3Q#p&Ea7b*O6v(7<X>=r>(5SRos9LYsCSuF&dYgx^cuZ~*
X&gitdX=uCO@RqJe&tdL(O#}ctL)=pW

literal 571
zcmZ?wbhEHb6k_0Ec*el6c-zghPe1Lt_H5VHxBKpX+;i*wk-HzZU3hWw;iny!U+p{n
zWY_h#8%{o7bL83a2OrlQdV2WI`?W{jZ8-5@<LNi+j^5jF^40Rak2jrpx@_0|&1W93
z*mLdt(=S`kKRxy6<KEjJR~>x0>CCJ3C*G_%@?!IuXWK75-+ATPu50ghUVXV@@55cU
z->lsKWb64CEB4)Axaq>m{Wq8FxUuTs{Z$7aE!}Zz)uDT9j@)0d=ichW4>p{5v|``m
z4ab4xla>1(ZNKzp&)qkx4&GX}>(-9TKtmp_Jn&@U=8H>r++-MPK=CIF*vUE|5)>y4
z>@ym;7@AvJ+ZdW$Y#Doc`+79>o28uXn5WN}si!N|EMjSIBEYs}serMOxk$5+vbc^J
zAID}6J_A#6WuazCc6M!RLs@BQSx1e1?2^qgoSZxoyiPq9yb?U;WSUjDMa3Mr6|}4r
zxNXElxmB9g73I}fKMD(fWL1+_RBu)ilw<kNz+Ba#kaVG0h)GB*X2ymi%r5OpLO}u?
G4AuZm4$YAO

diff --git a/upload/style_images/1/f_norm_no_dot.gif b/upload/style_images/1/f_norm_no_dot.gif
index 5f028c8a1e7313553bff1d07f31483d328368251..eb9b267c443d3d7628b27a40becd1d9804bc59d1 100644
GIT binary patch
literal 174
zcmV;f08#%(Nk%w1VG{rk0J8u9#LnH{=I^S<?5xZ1r^Dyg-sz#b-lV?cp0(Mi!Q`~j
z^yKRD-Q@1l+U9kNtN;K2A^8LV00000EC2ui022TY000DAaIH|9y{!bvd2wJE7G2jk
zOsX<YQ%(hduBiiH+9&S3Q#p#Da7b*O63C=-X>=f-(CAZSaTu=H>~+>Wc)wsTw@N6R
c&7xXWz;3r^s^(x$r^D5{o<4`^`!x{&JLT$CLjV8(

literal 576
zcmZ?wbhEHb6k_0Ec*el6c-zghPe1Lt_H5tXkGrnE-FD%{o?Gwtoqp2UGjYe|S92FG
zTX*!{!X+zrU4Ogt%Cik8U+um9as7!m%XZ!0b?x2uOV2l)e7@@7%OiI`?7aGN!-)r*
z&OAMQ=l$k0&sOZYwtVm7wMX7<KJ)nct@~?^yx4mF>6$}NSMI;LaP!5>Pd+_+^Yy{Y
zFAFzaShC~B%6*Sk9lXEe@|z1!KFwde;?~PA&)$7|_~P@O2T!-2f3e}jqoq4;o_qLl
z#h!ahciejV?%TP?pZ45+vtr-<X*1`oI(Tc%k^9%4e}4Y<>y#ODu0H$x;Kk=huf8tZ
zb!*q{Hye&Wx_I^0szdj-UwX4*@59xHA6$O=nPD&i#h)x-=jeb)P@FKZ&uw65Xl`k3
zV`wtBW$fwg>+#fXmQ{0LnLcBts+Mdsx0i>bw79F0b%40EkChpBv!slaoxh<s7muQo
zuBDWWWU~S*tErB&3kL_6vELz9g=S?=PEjEZ`x6FkLZX+Hn?-o}<@D4Qx0_h_%JK7x
zG)oAI3A3^3yKCBf5f&4aXjYO};F0jypwPmv#5S=&VZp+~?Yy!R97<LwEo5$FV6X-N
DCur_m

diff --git a/upload/style_images/1/f_pinned.gif b/upload/style_images/1/f_pinned.gif
index a83f3b426e379e9d4323d529bb15aa152d723c05..7725f9bc3d8b8d665e936bc670daf2f1097a0e14 100644
GIT binary patch
literal 85
zcmZ?wbhEHb<YVAtn8?6z|JnQEj#alGy=7ovQ2faPBpDcVKm<shfk~~UU-I-`v6eX|
k4qdIRh3l$3d&RBpUh7;bwn`y<ZN|5Cl37+K`$QP50bc(cQ2+n{

literal 1030
zcmeH`T~AU00EQ2m6H5)vnk{Rlu1sAYTU(l4xaEqP7p|Mi)tZ$}ywFN5SEk_iO3Tb8
zIy4zXZ~%2k>I#jc!iFCp_(28fAv^>s%2D6|M=<>j-S+-~chBBu@8v6(l2futKsbOk
z0~88nYikPxL9fqewOVl;cQ_m<ih8|Xg+c+tFkdvw1ZP%PSF<P#i)Cq4fy^UoVzC$$
zsYN2u^!(bQak1uAi@|6U3WcqmvZ5Ca4NdKuX^lpsR;g6QR9;Tump1N%2lr;@a|{N!
ztE<a{`zF<9?RPB%L6{RODjz}q*mXLcKp=3t-6fS@>su5~r<2D6^{}nFUfkE$w_)G-
zrZ5dkB*-H2iNksKo*|V&{r!C=lSwX<xm_+co6YC*9d<|eAZ)kWeLkPfW}BOxE2<F4
z$IV<W_d#JhzgN#>GPPRm(3t5pebVJ}W#{wX(5KuU_dx%E#bUv*Z5)iwQKL2+hPfP0
z+-x?><#MT1IyN>YlgX4yRbDZ#ovTtRmE$V2cXLyx(_7at7K@elM5Nd2f9S1u?iWa8
zMv%u7@cBK1ze;P^=sMo~VemGEH#`YnzgK3q*bAPER@WQ|f^>Ix<M?K2EtK>4Gn>t6
zZv7~N7JeHHb3d)KFuJs~^t1{B#X5m_Ze?W!Sw^R)XBL;S1(VI=@ob9&{^#EoIO^U-
z0Dxv7X{ToA69CZ&oCt~{_jINK#C^xkl7rHywf=t44cb)a2teFTY(;Y`k6cJeU?kVY
z#qRfSVrS%55tOazfwLLwccUv9r%0LgTu3?vC1$;hIz3$5P#;j&K?DmQj=%K}i3}n4
za<2xT3ynEEs;;KSoGi=A2s#t5>YxElq!J*#swOo<&=VaNC}bs-hdOTh4c8nzUJY~x
z^s+_+Q>o8x!D(bFTzMcu5*AA%ABw-2D=E=uLTwR^!*MQkRV{FyK^UmhFem8I3Hfvq
e94QRnn;YJUGX3{d2NzyTj2dcWKB5r_K<Zz$-ndQx

diff --git a/upload/style_images/1/f_poll.gif b/upload/style_images/1/f_poll.gif
index 482044153aacf349b7f4371aef526680aa8e6804..ba8875b4fb2210cad88bc1709f715052c5f4bbd4 100644
GIT binary patch
literal 169
zcmV;a09OA;Nk%w1VG{rk0J8u9q_fG}<L$}Q;pf-u$ZXc7Si!Dd%Hf6e)OGH|YTe9m
z=DB3l<m&Rk%iC86W&i*HA^8LV00000EC2ui022TY000D5kg*_|y-ftkxo}_@3SHMY
zL#hr=Q%(YauBiiH+9&S3Q#psAa7b*O2*{*zX>=5x(5SR&s9LYs=3>k3dYg%`cua08
X&gitdiD<ju@RqJe&tdL(O#}ctaJ*0>

literal 367
zcmZ?wbhEHb6k_0ExXQo~S<A5NzsS@}3`?FfOuNi5?>@tdw+!7!7$%-&Xxh$Dx|E@P
zQ)t~rhL&9n8-Fp(xXw_$mLX#jL(U9_!UYT!D;P=^Gh|L-Na|wfKgqE7zg))whDqlb
zns+i}PG%^a$B^8^kTs2A=}U&#W`@mw7#2QesNcje{VK!SuMGKf7!o@ea%VDBu4c%a
z&Cq{}A*h(4Xd%PAdkhO6F{Je~L^m*W9cBnDWWWy;f3koT=zvI&pBUJB4zMP8=twa-
z32Gk5v6{Kz=7-0V1lHZiS^iB@D{N)>2?xFQ0Huy3j?4n9$&-`cS*%Q%!<I6`LMB5&
zM_E!*SwXOlozq#0gM&w0RLDn6RGg<z%2|S6Rgi<9S4fPPUsq6-U&5J*M^24(BPZuZ
mRy8>urZ^E5=6(AQ7>Z;w2um}aIC<)Xw6KT!1s85d25SJmH*b0X

diff --git a/upload/style_images/1/f_poll_dot.gif b/upload/style_images/1/f_poll_dot.gif
index ab446cee54f3f8faff3b4e0b6dded763664e3a41..329375ea34c92ed60346e5950224be0d7262c029 100644
GIT binary patch
literal 174
zcmV;f08#%(Nk%w1VG{rk0J8u9q_fG}<L%US?!#)`%y8zVSi!Dd%E{B=xn$JHY}Vn0
z_2laE=hy4N%iC86W&i*HA^8LV00000EC2ui022TY000DAaIJ8fz3l|a`Eg(v9$nWs
zOsX<YQ%(nfuBiiH+9&S3Q#p#Da7b*O63C=-X>=5x(CAZSaTu=H>~+>ec)wsTw>l`B
c&7xYBz;3r^s-|F0r^D5{o<4`^`!x{&J1Ue?Pyhe`

literal 574
zcmZ?wbhEHb6k_0Ec*ejGS<5i>62q?lB1@h#OuNj`eS~4+S%!J{8A_Kjv~LP!U|^`*
z$WXnOA!8DQv9WRC0)~ne49z<kVw)LkY-}<oGbD8}^q*u{@s^=*9>esj3@y7DW?W~e
z-^9>yfT3wS!{Nh+C!J$h_?RKNhhgbUh7+&Ka%VCWEo8`=#$aJ#@$BQ7ty{M~e03(U
zkm1q0!_f^43JMDQp2eN|l6>}Oa^-4<E5EAp=P<nceE<EI$2l_?=G|imDrV?9%<%5_
znY4a}*S`-Rd7XUVRn+m%Q5P>>OzdD-@Q9)R6vKnp$7N(>fG!^rK=CIF*qu5c5)>y4
z?6Vs<8Jb&K+ZdXJ6q$N@`+6+(nw6|9Sf<aIDWap)%wg=TrYvq~W9KNYY%0XV(aa+y
zD8g@|#V0Ipq-rZD#nUXu%4)4{?#{)<r_FnaRjyf<jg4E>O#g(2n<)1s*=8|m8D2IO
z`Rz^yuDmkRV$F=)5|Zrf_L{m5UnC{C8RrQovT?|GOyFP%XOL^)IIv-%bDM&kf|bj}
JfF=h9YXDkrkJ|tM

diff --git a/upload/style_images/1/f_poll_no.gif b/upload/style_images/1/f_poll_no.gif
index 1dd31da17ae1d765f3a987dcfc0bf146dadb868a..c2db1adf1739e433e3782338368fb9530d70a57f 100644
GIT binary patch
literal 169
zcmV;a09OA;Nk%w1VG{rk0J8u9#LnH{=I_?t>E__>+^_KBxAfDh=h&_6#G%>Aq~6Y_
z<JPO><m&R$+UA{jtN;K2A^8LV00000EC2ui022TY000D5kg*_|y-ftkxo}_@3SHMY
zL#hr=Q%(YauBiiH+9&S3Q#pm8a7b*O7RaP>X>=f-(5SSTs9LYsree$OdYgu@cuZ~{
X&gitdNoc#@@RqJe&tdL(O#}ctzA98+

literal 366
zcmb7<&o4p&0LPz5d0tI#{h*byxLE5PHe)qqb1(;-jB(=+aB^*CY~N$U)o9h;`hlW)
z>BoDok|@9D=Z0Z3y15zufzRP{`y4)w!2xU66iraXDM5JSC|BL-d*oh`c>w>6!aHJT
zNZo?H#&!XTN^q|XCXMVPc8e%|B7Tk_kLU>k96|zw7aZK6_<{WjD%Ev=5|I*8cPM=!
z^N7SH@^1)o*eSvj#a0wP7NH!%c|?v8&Vju`APXi1{t4TMApS|)cimrM{`Kz@QNP5B
zC!J<(&B1a9JJ;>Dl$m}{lmEiIS!wPa@s06)7T55qFl}Ab*-2_fo?IJu@iX(z_EEaC
zRjX~Kl?x3Ln^7vIWG2-RZIV$dMw>?7qLj)NDq11eC|fpcB8oJK8Ht1u8%Rntp;On!
Y;t92GmLT;aju$vR>2w^~8~cf#ANxd;U;qFB

diff --git a/upload/style_images/1/f_poll_no_dot.gif b/upload/style_images/1/f_poll_no_dot.gif
index 967aabc8bf58215d877604ccac326547cd597189..9c2ddfc2eec64eec5bff32c92b04f4f7a9a87e7b 100644
GIT binary patch
literal 174
zcmV;f08#%(Nk%w1VG{rk0J8u9#LnH{=I`9E@YAa2*sbi=-s!}l*~z5d&ZpzzxAfMl
z<mBq|=HTwq+UA{jtN;K2A^8LV00000EC2ui022TY000DAaIH|9y{!bvd2wJE7G2jk
zOsX<YQ%(hduBiiH+9&S3Q#pyCa7b*O6v(7<X>=H#(CAZSaU8DL>~+>ec)wsTw>l`B
c&7xYBz;3r^s-|F0r^D5{o<4`^`!x{&J4=RD@c;k-

literal 574
zcmZ?wbhEHb6k_0Ec*el6X5Yjk4<=szH1pKUiANt!JbZ8BwlfnC+@84i+QiPDiMuaP
zJn?Mej&l<?9GSTP%H~6NC!TyhaqhxpyDm-KbbR8mM-xxKnz(Su%KbMdt~)q!&y|Ur
zk54@Fdg9^x6Zc)8xbwoqqmL$Dzjc4ru8B|IK7Ri3{+5#yx15?dfANY(uO4nXHu2tv
zL(^u?+je&1+5;00+?x2}-K!h#ww`!8ar23Z*I(_t`Rc&d(?G#DD|b!2^Wf=}8FQ|_
z*naEX&KDma@4Pti@vFxduin~lc;e$X_piO$di%pphM@@*f3kobt^*=Lal*hpyMd3P
zxuvy@p-Do3si(KE$3Ul<S5bv!`iz-UX1vWjHul=0(pJ{W`qH8%5<)!9Lb4oEY?^k0
zVhT>G8XU4h%^d9Px`w6}oScHT!iU&7n#EaJxp?)oPN=E#a$OQ{<`<C^W;IsWZf?mh
zEGfd@%*e$i&&_S5<ly*4o{fufo}2(1hm40n6MHxVPXWh)4GW#yWOx*;TqaIvc3`ju
E03?FEEC2ui

diff --git a/upload/style_images/1/folder_mime_types/doc.gif b/upload/style_images/1/folder_mime_types/doc.gif
new file mode 100644
index 0000000000000000000000000000000000000000..88bae59b3c18e03fd6f6966c944e500ea808efbd
GIT binary patch
literal 1018
zcmeH`>rYZ)0Eb_x5jD(9tb3a_KXhNUTKC4R<;tyTYpoBiX*aDe*=nup!ex@FMXk#$
zG_f{?VBA(Fc16=9w4FFZF2RBK@E#6ukQ~lXp||`a`quLYJRhFleg%8?Y~E6q2{OU2
z27ocvXf$rO+vRepR4RfXhB;QPR_pb8qtQtFe)xS}?Pn$)kE38jtx{fn(&zPfyk0Mj
zLRT7lEf7P*{)`5HazUGuZu@}DL|CWO84QNAHOiiE@M#A+{0QIC$LwDAjWrfvLNP8B
zK%wtW+GK^PRLbijdkCMgHxT34OON}mJ?Y(FJM45i&r6k+ce|6xNxRcyvLHK2AcT?=
z3HfW-t~GU9BZ&4*PK?pe|AT@pR$ShK6N!XYtF?QA9sSTxxovKy>ABA2z^$#VnwRZ3
zmC*Ju7$>36^X_ezq6^hE8ooQA#U6@}a0ee?o6}QV8)bv2xw+{xL5;^*v)Md4I*Ni}
zjauFIo^?7LQO39XIz1d_6bi+Q&cQHC<79#u^7NB`&A%<A|10TJDcf8QJI8TdR<5I;
z3eui;1B{oV`fNxhy9;5!@2A$3e{oTaL8lvuG6x!Bk#O+sR~F;RB*vr*$>nm0Ldfrm
zvXEsN$VUIp1pf063gnJYPXnL<teSF9eF6xEz@m-t9-m)5PgGHq^+l$T<`=FIe#$o2
z->(st3vzSw3+u(#SjQ*Fve}Y3w@OMrN^aDNHl#1y2_$*<c-ylNZ6M;PXcrI6b+GqQ
zdY$0-$F-*}0`N>!X#vXaJ+rfT>C?dBgD1W<<`k^oU7VG(QnFf-46Gx0H#5Lu>%xk2
z1+tm^y(AEqUNDPh91&K`R|v$?nxmjPO<zSwmu#vBiDP58AFkW6Pk8xg*_rO8;PmDy
lcyb^ke=Eo<oz?OxGW2r6;PRYf5{a9~7cP_SDiwome*n_9tiS*O

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/eps.gif b/upload/style_images/1/folder_mime_types/eps.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b75dcaef80069b126e998cb017fd3fe0a2b52df3
GIT binary patch
literal 1051
zcmd^;{ZA8j0EfTWt|>2>Xlhc)th^KuVGbfwro(iL5y>_~WXZ^!X3Q)z2A#_^kuBRQ
zg@rjaY!h**1+3#mOW^3+mAhiEch|f2sN$&B(%Q9!c122|%Ib98{5tn<?DNC(>ytdm
zr>1sS)oYE}ARGJ%0EDo!vy)+%k&%(n(b2-fLbKT%2n1586uh!pCX+QaH6aL6U0n^S
z#>8C2L5z8v98_o8EU29@*=fu{<5BN)#5dh`@+gTJ&V2I)>GE?l{^h5KY_|het2Gvx
z@p`>x)X3fqB||r+rzQvcyKk|ihq1(G?)~Aj8;wS<gP<@yH0{Q5oFqxzl}iq4%rPCN
zD2l|e#q+>_dd1Vp*5Ca;I9~s7DU!ShXqrxTrTN;y!c4%T)y)TdE{kD#VICUaaNV4E
z5MP+Y_0F$>Mx(LgV+=`jo%?<%9Q;cO>;#%p31F`v8jV6t9%K(oB$87nK6BX!RoD4P
ziwo^vHAC%It4X&Q^v{I?Zia-Hvseo{K~srHu=&U*akrf%@zl^JI8+S#*4)3tVJ1W>
zm2wm|JUqPYW(x`mAX4#9PloC$!V+e~$S`U!V4A-63#wQwMl=h_an$4S#QQf#W@jDN
z>p>@Hp1A!)$$vQe+Z1hu+AR!045*c%Q0ShE(`vOAR3E#=1cSl&k7>V>cw&Ce%@FrH
zfZb+>Dlnx;ziveJdcAwXF>XRjOG{x7KODXR4b>Pj1i9l*8=Y86aPENd^9(qULyzhF
z?7vbf8omqu-^+W#|1Ut<b3XqB5IzQJLeUT3S%HElC|BnrdGefJ4s|>x8tYU%o+#bf
z_%WMV(1ST^muptG@ZOT72~P}iITiI~$=>57yq2GiJ*uiZxbal$p1PwTq_Zm4ZrbyA
z)oxi$#^v=L$2OD{O4C=ZZID%p<Qwn&yt+H9jHIM{CE|TLegp27uY0@XeZ+&wG6(Aq
zR7ww*e>9b`VxN-l4d-*J9mQGV)4YaWdET~jmDkFtH~WC#rB?;Hy;<Tlt8(j3ZZ49a
z6)0bL9f<gfqRMqe{9MI`<c0i|-5+GPs^5{9tGA@YZ9Dh2ztZ;Z%O4(WVddXeh(s56
Q?0>O%>w6-xPzbg^1BBnfVE_OC

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/gif.gif b/upload/style_images/1/folder_mime_types/gif.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c7e9e3d156795b49c17de1fc5df4d1dd262128ae
GIT binary patch
literal 1045
zcmeH`X-|>?0Dxan(;03WYndx&g=Nkx(KcI$_m$RMvvO{hI?K7%)cRuTnp~1j(#+`=
z5-%Y-72$n33=oJz2tky?Gmo*RjHc7@0CkGxU+8ns4|qO2+moJ|7I&j400;nF?EsI*
z<8rz4^YaS}3mguINF;7-Z0Pm+)zwv*Ot!PLb8v7Vkx1}(Je^M0XfzIoV|{&{#bRx3
zZ7nV?n$2byhP7HPfk2Q-r7o9CAP^iL9>QGSckPH;Z}?25>h-$u@o}+O$Y!%;QiWtl
zL?m;R%5Sw@`^(GA<g&*zGqX4xj=^B0CM8Ma2BT%Ny!F?xW`shayzM*O+}xa<nO3P3
zy}i985@~zeNf9_?A_0@htjdmux;tP_zl=wdD@_!pD*ZXF2G=^S9(?(xS*OzlMWkzn
zl~3yUTrS7yaxMO}n=F%E_4#i1fx^6Eu}o-nRvL}g-{0?cyG0_A=?G&%IVcngM@L7O
zmX=2O9fRd5WHMPUmygYE$))1bCi~vro?5MjSYK4~q4&`K<mA)<tIz3liid`JTC0Tv
z;Pne3!I-BJiPb$lJ=4?EZEbD4yL)Dn$zT|xQmHnZjR}pdt*zzd6m$zLo!wKV53&@>
zA1{c8vXW=N9gbTMYfWY|_5;jevunuW#JGgHxjDPt{#Cb9P+Y0i&4VDw=fiwHAA+F2
zwSoWqYk_mSULF9@4n!Uaj-CK~H-Ia*TdXRgXJ%+*EO!{9hXMH!OAegv9?9qY84SA6
zC$KFjrn-w>Va25(a&^O4Pn$1z>3CFbMP7q<OL$VqKr}Br19A6Q@QFfvv0p3dvacx`
zQ`YQ952>2iL0t?C40~M|2O5pa_B)uy{XCC`EHLAdS1i(+;r}uDmDkDO+~Sn80;Fe(
z(1ArVPBnfa%)lNTCJ@jW*^B8Shs2}CN=_RC>OB1Gv#oWZsmTOyWOxj}$p=e7`yj4C
za46nRLdAJ$E3NnONIwW&<qu$SSJCXIqB=Pl7gdjXr^o?Q@d#tI9aNBt5`de30CLQt
Ah5!Hn

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/html.gif b/upload/style_images/1/folder_mime_types/html.gif
new file mode 100644
index 0000000000000000000000000000000000000000..68026953644e85abd51c4126752d72358b8ba474
GIT binary patch
literal 1055
zcmeH`TQ8e&0Ehowm_{n=WLYFL>1God7nqA3x?pBvvN;XASfWA}$D|tTDB@MDrfc_>
z%^_K;&MityyE=tdtMzJWl^POFTb<GhB7}*<<~!_izYp+SJWqa+QO_SdOvM5$IAnqI
z^Yi`veIAcjTU+aJIO^-`r>Cb42E)|U)amIdolaj`T2d;NBO@bYV`JUj-CC{IYPBvb
zEZFV#<KyG?^>wLKDwE09*48W*i$o$>U0pRAjY6SNEEdns&I$yA`T6;+tu3`$-QVBe
z&gC{YH~01R<t8Scot>FXW}D5nva*t&pWoTpDI<|&QmJB6q1Ed*Y&J5PY$z<$Xf&gv
zqf91Knw?!uCinIB9vmEOZf;6`NM88)_4M>qR#pxS4D2!($TXtY&k>2l*7kM?f_`RY
zIqVLdR=d8lvuH3Zq@^`AHO(a@{fdqjCnlDbmYPf^J%O-ybR-gqPEJm?x3}9mI?QI%
zX9k1CVwFZjs3;T$gOL*xqtWTQ`TX&!s+pM?yTdV2P;hv7cvM_mo1DCvlG4@Hg{akX
zx%>l#(#z*JG&Be!BM}6ttNSJviHC=Wa}yF&D%JbUOc;i@^YTivvxkO;)H+>bV<U&d
zF<Pz5%gf55B8g<sWHybDkCR9w82+M!ATF0nrBbI5q`JDA&1S1L8XlMXHyQZ9e`Mg+
zZzmK0EZ~2^yZ8h^p8)SnU!C(+59hb8m<)w)O*pNjLlhds0XR>}5}vRd5MPeFbT1ZQ
zAw^3_#WhV~hKt@6L&XtLMCwOYxQ~}{5KFzpzKjAy4=jyIr(F-`MCn?eR-oP44aBw$
zb0r422Mkif6fUSxCv-suPK^N|9u9u3qQNd#LaK=JGHHcdpywON44jrR{&hHy9D)LU
z;~5_BKM*!irh1uvRCuSu?K=(Y6B`$o5seFal@-dXNr&aP@o3+`a0sD4iCe@(c~7QR
yIiW}{f)*cD{rykYg1kY%&jXJpc8AI>kzTZ$cz6R?6wJW8%&)q=cVTT1c>D+NQJ3-n

literal 0
HcmV?d00001

diff --git a/upload/html/mime_types/index.html b/upload/style_images/1/folder_mime_types/index.html
similarity index 100%
rename from upload/html/mime_types/index.html
rename to upload/style_images/1/folder_mime_types/index.html
diff --git a/upload/style_images/1/folder_mime_types/music.gif b/upload/style_images/1/folder_mime_types/music.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c324d0fca2a303017c6d1a09e08842d27856ce60
GIT binary patch
literal 619
zcmZ?wbhEHb6krfwc$Uxb`}gnk^z=`kK7IJ`;memVfByVgzkdDu_wPS{{`~my<LA$x
z@7%ewv9a;aojY&dyt#k>{+TmpHgDd1`}XZ^+qOM;@L<7$1)DZ)TDfxNuV267<Kveu
zUD|Lr`}+0kix)5c_U+q>6)VhEEB*ZW(_@kT{{8#+?b|nJ%dCwXH+FP%1owIcE_9xL
ztnt>ZTTh-oxp(hgTU*=JJ6DQN<<`xt(l6HS?(UwwdFHx(>+asY+uz@B-eP>`$<0NJ
z7A34n&@0k8eCg1%qYcxhP0L&yKV!y>z#h+^zrF|ecz^oxY3<%MH*VZWT^fDq_Jv1}
z9%V1dI(YElh7B8n`@Ht<-FxlYwOzY*1@?M=|NedZ_U$)s-u(INSJIZm)vH&(`|xhr
zvSpvXy?OHL@$%)%ckkZ4Wy_WW2M+xI|Nq6C=PzHrJa+Er%$YNNmpj$WsOaqM^lfxI
zckWzZmuL3k%!Y=BhYueDRWgtW6o0ZXGBD&b=z#Qr;)H?yL_>Z)n|!RSy|JS?XH#zz
zn~+d|fKOBcw{~BXtQjw_dzP{k1Gh|KpOgqcziz02Is-!-Z=XCTr&pecjA%w~Do<Yo
z*AX3kTkjm<K)pUTz6%c4;RY7$$)bI}?02%$G(9pon8o|Vm|r-hyl`P+vU>K8DaiAk
z1_#H}UO|?>ewG|PCj^uaG%V(nv$^u%;L|f~0+Adu3S3y7d)i$yIzBiic(J&1b4?Lg
nc*v`9GOIyN;TIN%4qfM@lRS=x1e<vni(Z|Xsd!_y1A{dH`^zuG

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/pdf.gif b/upload/style_images/1/folder_mime_types/pdf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f4288245e3e6f1c125dda3e772cd07ab97040719
GIT binary patch
literal 617
zcmZ?wbhEHb6krfwc$UXdUtj-|gY&5X=l%QllaiAD0|5iWvuDp<y?S-y#*K#$AKtok
z>-qENZ{ECl`t<382M?YzFy!RqeE$6T%a<<~E?oHd@#Dpd7f+u){p87$D_5@Ey?gi4
zrAseYt-5pP&gILOuQD+F&Q9C2XU~68zW2B8ytsXP_wL<q-@g6p=Kk{S$8Vla2M!$g
z^y$OH{DSu%KHa%}`&CW#a}Uq=kDmS);a$tXaJ!}LX+gocbLYN({ra@G|6^J1<42Eg
zbMZXo<$I$ee`DLum)<`AIT&8QetqxWy_+|0zIgHC+qZ9L&z?QZ!0;$G{?)40&)waR
zA3uKe>eXKnA-^)yFQ;UD`2YWLRMgv`pck{|{^#O;^7g}jKGyqwzVF_>JAC-?_wV1&
zoH_II<;!Eoj$IB6dVTrY3laWj{S!`{IPvMzr&oLS{ns=6FD`KO=+QHir`@%-x_$fh
zeg=m7K<geo0*4#}sX*~33nK$V9)k`@BPdQ7*pD^jH8HfbwlX*6S^8<Fg|RuXDH*W|
zGIZoAs58!)Ym*}{$T~gGH#KCgz$$C^McUJC6PPw{k<T_}*~!At$q=b1CZ560E}pKM
zw5M4zTEr<%kDpW8+xb);1HX@yaJUsOUzQoybp{D;UX{#X;RrrSo~Jxq=K30mo~|z3
zF;96p;_C_?FgSOLNQs{6ohZ<Hrb8@X)sKp%1u;A-7Ah=>4;~z3QkFWkaYZ0wa}yt@
fPC&rJg)xk}Y63DD%|*`Br!~1r-ip)^V6X-NZ_p_y

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/php.gif b/upload/style_images/1/folder_mime_types/php.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a19a57db0da0c8835e55d0a3267ea6d9818c51aa
GIT binary patch
literal 1088
zcmZ?wbhEHb6krfw_|Cxa;lqbFZ{8HQ?%KY6dqLy2?>~MvO+Q=KvG2;2D?fhxY@2;C
zwQN=M^s|%Z9_U+i{m-AjQ`bCw`1n<I-;p0bf92F|egEO}gGVoa|NgUY-@Y3+Zq)Q2
z{ru(Ix9>l8?%cU(`<tr1!&|m)?^$^B%hzvBlMYRtu_Ui{b^qLB{j>L_SFZp0^H*;D
z)>#{0b<MvzW%ZNV)>%_lKXwW2nYa0Me#6#3fBqzttm~Yxti5MmQql6OSFcv|9I2gn
zytHF)P4mpe!lh@=p53tHLPphw=B{}wH=JpoeW7XEnd+_`_aDCa_3L+h!J^WZO>$}u
zc{MBh7vJhxbTg?K$ha|Q!=t*%Ck^bfT6$N-=Pd|Jox&xX9-F(UbH<T(??3g-KAKp(
zx~hG{%Dr#1Yt|(duaY;aENt0%|NevYiZxALiyu9DRNB6`ZO$c+z}!unw=UawdcyMi
z<=uy*HIpVTzxU|L+ofA>KYRWrt9ENm*VZX3?>F^tFRht0ZPwDbyoEgrZ%mlF<jR$+
zwJo!HX6);jd7`d+YuCIh6PMpfDP7sxvsg|iNzJOk!mF!$!S&qwZIwOyGirBaRjx`d
zT3FS&xxIHmRMzaap1F>p)7-)*I0R3w>)qbgw`|Mqi&kFkO2!3m-hOPKbE%?jqg%w3
zrfFw$>NfSxIr`-3>x$NOhYugM_Gyz<v3>jQ<Ez*2mGl!*N>`-ib+paCq-0!v<j7I~
z*vXR?pQ~)&w0P<2S?eFFn-`Z>PyGA$Z}X%BU%q~K3+?;#`Rl~x4_aqkj7Xc2T(+TM
z>gkEomZp}jsGo4Cuxb0|Bkvk}w-+_<NGVy7RJ7#k%_pV~i3~#lDE?#tJ5vWlg7O3d
z$A1P!4i<%1egblOG6zo?6ez6ric8_Rq1bR>hLDN`6UT&Qf{eU8A{jvm4or;6!QWUM
zKDakDs^z`VXcFph6-n}7WBu^d)4k7yZ^nsFpN}xk*5#IKyiwA?rfA}&F?Ui)=XEXT
z?H?R|eNDVHNpVTgM9GcXL4uZR^Ui2}TX;c3vu47|l|o!RJU%f2H!D+*aZU4&-NI4K
zy1chD>Oj?v3&pL$Ivm<b6(1Nn0_VjYT+!fQpx)Ccurtb`V&gM`iOfw|EE=EHI=MJ`
zLgrq)>e<}D$}7aPV}qhov%ZFg!XkzvCl|?!a@p(%U<hB9?DUIgb@8E~79D9dn-7M`
rO>4Q9IYi1DBq{o73TkHXax^SH%)pZ*RPZ3+0Y@97EE5X{2ZJ>Lp_S&q

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/ppt.gif b/upload/style_images/1/folder_mime_types/ppt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db1b1b362555c6793c74c87580b5978ec165bf00
GIT binary patch
literal 1046
zcmeH``%6=C0L8zvoR1=wQEEl4v@)pZ2PvZm#d5h`^nyYNEb6zQ^`IA7u9R|>CL^Pw
zNLpmRMau`y$K16|_qe({AA5DT+nsk0@8)&yR^Qf-{STcV4;(mr4(EV?pSR;22XH`0
z3Lu0=qtRlqP!y$5DBx8flgYeZZ&Onf!!S^s>NCjTHGpB5TrM}6OhZFME^1n*(+!m7
zJLVv~0$e``mxJ(PJ@85D5Q0SfzCqQP4YxWeDjJPG>#z)r=<B{Y5X}UFAh4}yW@bj*
zX>+Sv0<$#3%&PUK?wfh7?ocEWaR?X46dKJ_fzkZk6_3Yaue%KGm>I|M#>Pg*&@-&o
zp=6k$-Bz>7MUo@>Np;P2dYT+3ebBBfZ7`3Kp}q&acYS1MwUCZiVtTccc6b@UJ78+u
z@KrYz4u?N>Pk7wU_PBc0Py_;ur@ggVe-J3uD8$?P%lKY{tm?%pM*u3Bn51FYG(J|@
zi-$v@NPrno>6;O?4Yve*RB`b=hl9{o9+e{_ZnqnjC$}{>ICY(3U63N|&zsOUJvxjG
zhWx%ygM^}^_BVusal((;ZGEUm`vse{8mZ8%&o}s}pj%qiikTzfFzs=-PeYofho2rE
zuD|c4XP`_d`HYZuLQ($`3ISTYITnjmG;6e4t#h;sw^~Q-{-EDq**%33!DwJ^<h$SF
z@pPE|s$2W;2~5fSY|$DdU-4g`3gcUY|N57}n#g<>08+5&ul@HEAbAc5QdSnUa5rX`
zmo$`%a?sMv{4>dGlLh6~X-9&c$KP{#FVau5?-b^WSxeZ7tCr>*V;!nk4GL_TV@ZkZ
zEen=qi+HNh6`3c2P|34ZemtCi<5C@wU+^+FkHY~)WvNwJH}^lbKU^<=mNZYAFbT3M
zYPfrL<+_A?&BAncE<mLp5^HyC*t=Dnz^_=ld=VFLe_SYAEjYh*)Om`KuLC01U23sI
zlDVRWU3~lexrJbNHrRiHRh#yPbCJJEmBva12@;^JKAV%6xpS9PU0uW-5b=`oQZlx1
b`yXywpO%q<a!cl>(YM<(idv%mC1B?t)STSC

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/quicktime.gif b/upload/style_images/1/folder_mime_types/quicktime.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5733a5a62d248d0629ea1de0405b9f9db182e1b8
GIT binary patch
literal 1034
zcmeH`>rYZ~0ET}gCKh?ABp24enU{3d%r>oNEX{OnR;#u34X3TGwdMx|6H(3)<nqNZ
zb&@zqrx{KsYl7j8z)J`sF^<ELpdbg2n*)cFWkb_HqHn!_!24|Pv-d%1abA9T9EbxU
zAs84KI6OQwo6Sp0OXK6?VzIcPp#j4%9*^hq`LtT?#Kc5>ef|3Sx<a97ZEdw!EIOS|
zuh$z4hTv|<YPCWTq*klD7BG*;)7910*x0zby4uqt9~~WqVHjUIxwW;mxw&b#+wpG~
z0)d?Zk+JN9u~cGYin`@;c^YhjU>HTwp_ygXEOLRf(9+W4a5z#S^A|H#S65f7MpJ}V
zp~eZS+%A_(sZ<hJ2<8ul!{NEPxxT)BlXWE&3LP9A1cG~fK0gUw4*dxuE}!4;9~>Oy
zz)g~`CVrDJp&9k>>~gtWw+D5*-5VPlHk(a1Z<NVocBdP>HhR5Y6x*(?WuLBhvf1pm
z8LWV(d&pP4<G{On`>}kFKp<c$R=TGgPy4-8!Se9%a0+v*y}iA&vlH=bPft&)R4N2P
z7z{>c8^&U>0LSw}?pR!0)Mzwq8b_P@r`EphbUH;M5pT?ecmh(zWTwOw3<jlADT?|k
z6wWl}R5gp0DMXH>fdBdT3s8UKaR3NG)-me%6M*0Y@ufBN`<9Q1k;E+8%m}q77k`!3
zL4jydCnJ(_@Yg>TlQMGF(k%f>Zy{jDBqcJglq66ti)nfJT9|b4RSc(8`LawFaR&D|
z1Nt6Kyh%9~{-*zY&k|n_R%;|tL{U!DGXg;~AKQGZq+^U$m@aM^B9pVE<wcLk*DCf$
z><}rQn}G|^*OLWhG34{vwn$5lHvUHHa~TcljXvr;QPOWIG@VPv{UVZ{P=J7TmsgZ6
yr&kdSG07=Zn)U&gP<<)){hhT%825%jq|(ny0G>c(D8Vdfj3xi5q$kFK+kXLa(Qb4A

literal 0
HcmV?d00001

diff --git a/upload/html/mime_types/real_audio.gif b/upload/style_images/1/folder_mime_types/real_audio.gif
similarity index 100%
rename from upload/html/mime_types/real_audio.gif
rename to upload/style_images/1/folder_mime_types/real_audio.gif
diff --git a/upload/style_images/1/folder_mime_types/rtf.gif b/upload/style_images/1/folder_mime_types/rtf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fab03f1283dbe65b2f95ff85e408a4cee644f3bf
GIT binary patch
literal 1028
zcmeH`+e=dc0LG8HO*7F!dk_<~5W*TXw7ew52C^=YEmO4c!9>*Pra=_c!{*FJh#6(*
zhUUg{;wJ5)+nJtiXXl)4$6ej#R=Z)&?J#G7`Vv88`d9SQ_YZtOz8~MEE9~03J5+!Q
z{Nw@q`}+hz;5Z%#1WYDVFc`F2ttg5{qfxuv9u9|-$)rM|fFLLo3aM18si`Tm*^D5F
z(P%Un3`<K(i;Ig6hr?>MB?-dk^GPHUkH_P3xokF@Mx#+GRWOXfC@PgoMIw>c>rL8q
ze!tgbg0J6TMIw=4EKPj#e(|~G%fa2<-Ju$~9`P9<Fik`)77IZn-J$Om40BkJRhI*T
zmgB^hUO9RG+_8TC7>1&2fxx4CZOZvszu!MHGNRGQxIAvht(NWW?aj^P+}!+UbW5kx
zfuK&S)tXUsK|P~ZtL1X};LtOnP$(9QXXL5_{K%ROG8*xf6{pjgNF<W$KBv<@A^Px|
z|MX^a>xw6A!||<D>Osrpo@)&<nGDBm@%Uyu9)}>XxxVT}fA_?s1j8@{h8GZ9M9?}Y
z;476%y<Y#M=ByR7YG#D(S8Ei;br1y8>9oOU=zG}ZcDrM-*ntAzfBw+|Cw`GK0DuS3
z5Bm>40px4|S>!Z>&1Dtzl1?|{uh>V+ivE<3Gdjfxxh^3Mi92CYZYiB&=c1&NGpEY#
zb9W>ImZIBn@NVV+k6Xo_9c>%mK!lY1bUUYm#~RBnp;5l>!Ax4ka}uYwV}nWhR6JhJ
z$x1brl5^kpj!rMY0O>f#N%g%X7gTnUDTPe~jXCt{PH<JzWqG4MLQMgT9{XFyMJ&p>
zz=VNX;5Vt_oh+M{H(WvM8*QKzR(Chi%=A81Mpm()Y-i7sKV03K*Ph6n*8YfO(@yq3
S<}yi{@J9h&Ddxjmp#CpI4s%Wb

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/script.gif b/upload/style_images/1/folder_mime_types/script.gif
new file mode 100644
index 0000000000000000000000000000000000000000..57647a11d1479cf550bdeec0a3a2d00f6e4f7afd
GIT binary patch
literal 172
zcmZ?wbhEHb6krfw*v!fB|Nnn(J{j-S+uL?r+p%K@0|P^1Lc)h{|CcRW29yGF(SYJl
z7DfgJP6i#2ILHhJmPmtE&uk9~_JTGB1qYv*S1RQ#l*F%zX6)K@l9T&~dC<uR;s;{5
zN=}NhFwZ#epunKVaK~^bkF6=wf=dZ|y%wEd+<fy(-l9i(fs4bon?13(dFS1}*VneE
K`gbufSOWmuFg<(#

literal 0
HcmV?d00001

diff --git a/upload/html/mime_types/sound.gif b/upload/style_images/1/folder_mime_types/sound.gif
similarity index 100%
rename from upload/html/mime_types/sound.gif
rename to upload/style_images/1/folder_mime_types/sound.gif
diff --git a/upload/html/mime_types/stuffit.gif b/upload/style_images/1/folder_mime_types/stuffit.gif
similarity index 100%
rename from upload/html/mime_types/stuffit.gif
rename to upload/style_images/1/folder_mime_types/stuffit.gif
diff --git a/upload/style_images/1/folder_mime_types/txt.gif b/upload/style_images/1/folder_mime_types/txt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ee082b9a5f860f90e93138bbb97ab4b62e912fdd
GIT binary patch
literal 640
zcmZ?wbhEHb6krfwcoxBM?AS3?Rn_0We{bBl@%HW8_wV0-{`~p(@83Uu{P^b0n_s_v
ztzW<X+qZ9z9zA;S;K90e>+amS^ZNDcg9i`3eEIU>!-tnIU%q?y?z?yI-oJmpdiCm#
zj*br>K1`iD_1w90d-m*k{P?khgF|m`@5PH3Z{51}^XJbmU%veK@#Edwca@cuXU?3F
zlat%9VMB9s^PfL|Zr;4PXwjl)&z`MZxpLR8U2osMy>a8lm(QP<ELk#t{`>_C7A#w~
z?7)Eo+qP}nzkh#cXJ>6~?dj8}Crz64>C>m9M~@ype0cHV#WQElymsx{@#Dwm%$c)v
z>C$P_rcIeLWyOjW_wL<$_3G83Lx*<n-hJfAkryvs%$_~_{Q2|OuV3G}bLZ8oSO5S2
z&oB@`@h1x-149IZ4#;v)oG`H8ZHQ2oWpEN=Hq#DcV2kMMbJk;FanlsCv|{BJ>5pJw
z5fczFk+tz;VwL3UXJF-HW%bq5lww-JFWASxD=*J0!WU{GW#_GLvWtx^gvC#kSJ_>g
zTSjP?Ag7BypSi0czbFHDz%FqKP9<SBP6Kg{a0csL($f4=K8i9Ll13t;%%7VKHWVbW
zH8KY&xMVO~5N;B(pTLl4c(hqaOhU<orJ#Y)s`Skr#RD5IwluNZCOx^WzL=${mn(`#
rr=ozVh1pcfEi>`-G$vLRj~Op^9JnYfpv9ySyDEg0gFk|ak--`OBsT_m

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/unknown.gif b/upload/style_images/1/folder_mime_types/unknown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0931fa73d94c45c568001a4a42bc35a5a131c466
GIT binary patch
literal 614
zcmZ?wbhEHb6krfwcoxDiapJ_kfB!Z#G&D9gZr!@|$dMzzfB!yy{P>O?I~Ffq{O{kt
zy?gi0n>X*+v13h5O^+Wx-m+!Oh7B8b?b`L~)vM>vpTB+kcEN%LYu2neeE9IjjT^sy
z{d)iY{r~^}-@SYH>C>lw{``6Q^5wN_*EVh1bm-8bZQHipym|B2uV0%tZ@zl<>b-mS
zmMmHF?c2AXKYzY^_iq3G{i|26ZfR-Rw{PFnsZ)Ra_;K{;(dOpnPoF;BxpU|H_wRG&
z%$YlPZhL$Ci4!MYym+y0-MY({FTa2PzQ4c!_U+rRU%!6y=FPHY%N8zNxO?~R2@@tf
zdGh4ety^Ede0lcl+1aya*RNlH;J|@{2M<1c_;AmjJ+o%b0=ko7pn>8~7Dfh!5C$EP
zLqKuDz<#(PBt*zvh(kq)Te_*ICy1Y4+FpW%!?(AGTTae1P=i%mn|($Ix5#oIenmf-
zMKkoAg@qMtRXL0tgH?M2bah2VU4%6Z_1(mKmCY2jIL~r&`m+o4vPv<t2&fCNs8~C3
z^qN@kX=<9w%6c&?aQE`+++bl5bQNQA(0i}Otga*}CSf43A?1iQGqaM*hl$R|9e5?A
zWH|zo8<^Rdj1J8RbXe5Hpuk*XkZ^#dyRWCBAmD(}6Axw$)=mb8&1t?Wk}RxD4AuZ%
C*ZRr;

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/win_player.gif b/upload/style_images/1/folder_mime_types/win_player.gif
new file mode 100644
index 0000000000000000000000000000000000000000..343c58ff227695173ea6920c0d111074e668f1d0
GIT binary patch
literal 1073
zcmd6mjZ@PF9EX2#biSb6h`I|Zk~=$zqYlg~%{mukif;#3S76;4cNvfn2%>_?u^BNT
z94}7Uh;44bHrTOu8EoPPY{GbxA54gsy)t3rHyFq^*nn^PU-bD4p69vyoJjoU@R2ke
zf<wG00svQNGwmjj89|1+D%+>FeO?fRqNHe#`AKunTmf~Ks<6@Ib0oIb-%|;$39m`h
z^w<a!51CyvMRjVEW#I~I$z+(+8r*7w7hGddiL843Dl;&NNe+h{1P5Sy6<b>N^$Ghh
zpb2$4MN1aNpnJ$J;m!1p8SCW^3P;B1GG*6K2&UF8BR%X(2i!xl2P50yUy>-b(39Ct
zP6b1M(q+E9A&-~y&c+sy#13*NMi4o(=r06|Fa@BV2YtU1T?1#o7&@})qG!%&U2j{>
zAKaxi*)L`_`Jav_#f^GnRRpbVuDo$X|5AQj!Vry=a(V}Ak9s`rt)Z5J29)my(fu5H
z+wcYQ(+4s=Fhb9i>hwbz`GA8jeT+Rf&#(IL3ZGZhl#)4Sg#qYF<5C4OUJ)I1hOYr=
zR?Uq9NQ}T$TOZY@!-9Tc9X1Es>57>;a(06qyGET(<t@@G&vPa=|EgoG83#b{{=9Ru
zectZtrr?g%CKf8)FP3{{5*-oOLcm|=yPzu#8&O!)oi+vOB7X(bRzusq4L4T76oD$$
zg9>1*vt!Y7uRO!P>c8F84b6d2zsqKGkr-2h7&sI+cb(-q0gB~TW@{f{C|hl{TAdut
zJfPIl8VXfBQ9|#*rxtp>z5<3dzjXyBMc3F)zINeQ4)^n`y3SenvHDp)d!=|3$h2;t
z1>fOn_*$ELQtI;op>b@Pb+F3;3LDs6UcHKcgE0#o=b(Ad4X&k4X}HW>y{8<`ldNp{
z+%C-WGCcDCSmZ|FYY2iOF|Tl5eFE7DNK@kUe!`uA@3K_a<20w437P2#sU-KeguMvz
zGo>hMD1{hZ=c;;|cN=A%ycrQOuo9L0H~z%#FIB4ey-|eY*kN&XdO0N|r0S3zDWOVZ
zLVw+NF!{7T^1a0UALhrODwoDd?jl^5<^JwC_MZN?ukNUnzS%m6&!+^H3qQK>`=de`
ziy-~rGgerxFeW%GAofp8tS1trp^+tSmpkEB$dO#ny180ib_kbN^ZF%snGP2}oSQqD
z96(Ziydyl>RAWyJJ4u|8@6_~~S?5yL#zQV<zCk?o^%t>u8DG`1KBX5O-%#-;!+#RL
pTTJ^FNech|hYVb3EME0V8Lw(I7=5ep-_n$zfI!o&`15$==zrj*Or!t+

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/folder_mime_types/zip.gif b/upload/style_images/1/folder_mime_types/zip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bc71391f18238e1e83ca597d15f0a84f77028de3
GIT binary patch
literal 610
zcmZ?wbhEHb6krfwcoxs_|Ns9LD^`5@^5y5xpKss3t*xzn^XARBZ{Oa%d-v+qtLM+3
z|N8ao)~#C?E?n5RZ{Lp}KPoFLzkmP!;lqcIA3y&2^XKv7$Gdjz3JVK6fByW}uV1sW
zvfjUcfB5j>&d$!ypFeNiy0x*fv8t;2+_`frSFZf`@86z1d)BR6w{z#tsZ*z(J$rWA
zv}r9ZEt4iqTD5A``t|FNA3wf#@7}VqvS-hpJ$m%$_wU~t8X8NNE<1AM$dxNsK7IQ1
z>ecICKY!KK)I53eL|R(<>C>lw|Ngyx{rb)wJ6^naF?sUjmoHz=m@#A4tXU5pJSZ+M
z-n@D9oH=vq>gsmy-d$Byb>hT{`}gl(yLPRut!>SkHBC)T&CSiHPMx}Y_wJLYPuttu
z4;(mf@7}%n^XG5au%W)b9vC<bGzN-4Sr{1@;u&;6_JHDqfqj2Ne7uZ~yPJlo9jj_n
zZ<CsXC5N-DfUk{2UlSusgsq2^xR|%g%sxgTE-s^~24-H`yvvz5w=U#WR5bKlF37^d
zrX^tS$g32&+(cN&UoAM?)mSuUxe60gtg3vNkQJNqat3yGWd>1mIbkNfhx~$kJWf1J
za@_I{nVE%UG$q+3Rs33_Hzc^*m9sNgaJV-*iD>Y|JqecJV_=Zs+9t7q!=Zbz7{6JL
fgTtrkjErJ3ohzJ{HVEtcaEUN5I(02@V6X-NKf(wr

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/icon1.gif b/upload/style_images/1/folder_post_icons/icon1.gif
similarity index 100%
rename from upload/style_images/1/icon1.gif
rename to upload/style_images/1/folder_post_icons/icon1.gif
diff --git a/upload/style_images/1/icon10.gif b/upload/style_images/1/folder_post_icons/icon10.gif
similarity index 100%
rename from upload/style_images/1/icon10.gif
rename to upload/style_images/1/folder_post_icons/icon10.gif
diff --git a/upload/style_images/1/icon11.gif b/upload/style_images/1/folder_post_icons/icon11.gif
similarity index 100%
rename from upload/style_images/1/icon11.gif
rename to upload/style_images/1/folder_post_icons/icon11.gif
diff --git a/upload/style_images/1/icon12.gif b/upload/style_images/1/folder_post_icons/icon12.gif
similarity index 100%
rename from upload/style_images/1/icon12.gif
rename to upload/style_images/1/folder_post_icons/icon12.gif
diff --git a/upload/style_images/1/icon13.gif b/upload/style_images/1/folder_post_icons/icon13.gif
similarity index 100%
rename from upload/style_images/1/icon13.gif
rename to upload/style_images/1/folder_post_icons/icon13.gif
diff --git a/upload/style_images/1/icon14.gif b/upload/style_images/1/folder_post_icons/icon14.gif
similarity index 100%
rename from upload/style_images/1/icon14.gif
rename to upload/style_images/1/folder_post_icons/icon14.gif
diff --git a/upload/style_images/1/icon2.gif b/upload/style_images/1/folder_post_icons/icon2.gif
similarity index 100%
rename from upload/style_images/1/icon2.gif
rename to upload/style_images/1/folder_post_icons/icon2.gif
diff --git a/upload/style_images/1/icon3.gif b/upload/style_images/1/folder_post_icons/icon3.gif
similarity index 100%
rename from upload/style_images/1/icon3.gif
rename to upload/style_images/1/folder_post_icons/icon3.gif
diff --git a/upload/style_images/1/icon4.gif b/upload/style_images/1/folder_post_icons/icon4.gif
similarity index 100%
rename from upload/style_images/1/icon4.gif
rename to upload/style_images/1/folder_post_icons/icon4.gif
diff --git a/upload/style_images/1/icon5.gif b/upload/style_images/1/folder_post_icons/icon5.gif
similarity index 100%
rename from upload/style_images/1/icon5.gif
rename to upload/style_images/1/folder_post_icons/icon5.gif
diff --git a/upload/style_images/1/icon6.gif b/upload/style_images/1/folder_post_icons/icon6.gif
similarity index 100%
rename from upload/style_images/1/icon6.gif
rename to upload/style_images/1/folder_post_icons/icon6.gif
diff --git a/upload/style_images/1/icon7.gif b/upload/style_images/1/folder_post_icons/icon7.gif
similarity index 100%
rename from upload/style_images/1/icon7.gif
rename to upload/style_images/1/folder_post_icons/icon7.gif
diff --git a/upload/style_images/1/icon8.gif b/upload/style_images/1/folder_post_icons/icon8.gif
similarity index 100%
rename from upload/style_images/1/icon8.gif
rename to upload/style_images/1/folder_post_icons/icon8.gif
diff --git a/upload/style_images/1/icon9.gif b/upload/style_images/1/folder_post_icons/icon9.gif
similarity index 100%
rename from upload/style_images/1/icon9.gif
rename to upload/style_images/1/folder_post_icons/icon9.gif
diff --git a/upload/html/team_icons/admin.gif b/upload/style_images/1/folder_team_icons/admin.gif
similarity index 100%
rename from upload/html/team_icons/admin.gif
rename to upload/style_images/1/folder_team_icons/admin.gif
diff --git a/upload/html/team_icons/index.html b/upload/style_images/1/folder_team_icons/index.html
similarity index 100%
rename from upload/html/team_icons/index.html
rename to upload/style_images/1/folder_team_icons/index.html
diff --git a/upload/style_images/1/forum_markers_180.gif b/upload/style_images/1/forum_markers_180.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9f222f82794ffd07918e5ed462367fa383b063c7
GIT binary patch
literal 226
zcmZ?wbhEHbG-lvp*v!DNY5tO%_n)tuHUHCzGdq^9zW?;?tkTL)8@4=o^@#x+Q2faP
z7S;igATt<P`UOsUuHI{roW${H9!uR_lfI<RN%v0i&Sl(QWHY(g_xbni=^Qs1%_O9n
zTo(yu`pC6<Nf=l0$gR6^*tq*{(bjA0r$@6&oM32?Tx*xk`|_*xyLZb3Ssm{xXgv5D
zTU%e<RM}G3)>tRhS<~Gd)zs6_C)_(}!c>vA8IxyCtD4)qXiooZ#%0r1h_kL1Tf4Gn
Josb}dH30Q%S~dUx

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/forum_rules.gif b/upload/style_images/1/forum_rules.gif
index cd4f12f4f986630517e0f08930f62dbc868fb94e..410a48c22774c197516505e9a25d68d479bf67b8 100644
GIT binary patch
literal 61
zcmZ?wbhEHb<YM4rXkcKNk(B!7`76brEDRu^10p~&3``;|{Q{@6|IC?G&{m;)O!xYI
KPtG6)25SKEI1zgQ

literal 1095
zcmd6m{ZrBh9DqM4Ow3lP<;=M=H>X}><>uU3Ghb+_xHP6`y3VTv-@unp6kk!4NEzsm
zh(yIyQk<{Ii_5!G(3$e$3lf5q-tq@G^V)TIyInthSO3MHzu>v&?nxlTN1n^}1W)+a
z3~~ADv>4#1ZEU5D(Z62SY3R1>-kGvBDV~c>&dR=3k->SH_DHzo%;RbC6pcd(7b%(&
zv7XYVtsS&<t?%|&b`dLxOitC4dCklmnE*yvBC>|6k=y3)0b)TnjN0=A3*`??Ka^;y
z3ckJ7X{1x}(^GQhh-0P$8b-{L_1(lm6=FfLm3HGGIx`xO6<5A)zxSbZO9PTRPh>Sh
zOg~{C0>P4#!l)t?sgU3O|6WahHU`gCP;?`l&E?RgE472muOGuzJcj+NxkS8>$JZ8!
z77HcDF#%rQnp{(a=iZYbw!pd}i;{b^%d#sJ)R)q)(R)^2Ou*(tSRaB7IaJD4#g({1
zYKG!|6!IcrQwindkblfcb*!?D36M7eiF!lT7BXG|W-$n!{!!I$U`;%u{-U)j-f5$^
zXHsrUO|-0&2Xl#3N*c0^5y;f@A~dpw{we-2r)Rlw($+9)do>G`WVli`T}uh8AGb2w
zx_P3z<<dnWeVRFH6HeQa706&du9n+c^5Fpke&fU5BWM`kVs{%QjS<MIJ42wY7V21I
z*3vFLtLQ9)!$%D0zh;tnQ#MM|WbLp;e;4NZW9mj6)x8Env8K7$&(w_)8l25yX;%6f
z=D4GxThFJ#HP(}wAxo8P?O+a4-<97uM{U;)^E~+6(%Wjs{$etfJ*jI8K+N94#r@@e
zKukc+2r8AXq+WpXyhxg49<hIs!=L4-w<l)|n+m8OFyB#Ix70vteM%NAik4n-r+4;b
z(Aa6Xbze^v%pwQ^{~H3|qEP^5z`Zwm{{&zWkX^E*VOcu18xrf~`(+b1*9Yg@5jlXz
z_)x`BEk60yK4Nk3<z8=cv#T2+wK(Z}E=v6whIE8l#^d$odj<J=2Ok2()kDW~LUk`c
z@C#v#9^N})Jk=L^Jd~gPwLBr*zXMxvi9}1rMt^gLa$coN^NSsf3RUI^ur6qMG_!r@
z&y?W!yi}H7Hf<s7bUQWft)fNbfs^$_IY<hx@awdj1jCQ<9zEw<n~srl-z?zHl4!5X
zDh9CqN7{<8U*#O*_y_2=vxt4CjhK_C$~oqnZ$9EjM`$7NVE#iicIjvRD;E}O%sc)%
zrX%G7Ya%M0sG$Y#WR9cV!*D^F#NjyCPr_Y3S6PYfU9N8ErGVImD<QcbV^ThCRKy%j
KalxSByZ-=x9?yyZ

diff --git a/upload/style_images/1/img_larger.gif b/upload/style_images/1/img_larger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d7aab02060406014ff88f841c8e63e16b4c4222f
GIT binary patch
literal 54
zcmZ?wbhEHb<YeGrXkcJq*Gl{U|G(l-76uT|0TCb>1}5H~e)b95WamX)3S=wRVz34P
DR45F#

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/index.html b/upload/style_images/1/index.html
index a56ff26a..b7aa4145 100644
--- a/upload/style_images/1/index.html
+++ b/upload/style_images/1/index.html
@@ -1 +1 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>OMG!</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#F4F3EE" text="#000000" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
  <tr>
    <td align="center" valign="middle"><img src="/403.gif" width="276" height="146"></td>
  </tr>
</table>
</body>
</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>OMG!</title><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></head><body bgcolor="#F4F3EE" text="#000000" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"><table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">  <tr>    <td align="center" valign="middle"><img src="/403.gif" width="276" height="146"></td>  </tr></table></body></html>
\ No newline at end of file
diff --git a/upload/style_images/1/lastpost.gif b/upload/style_images/1/lastpost.gif
index bf77a5b798126e71483880e5465f5b9039341686..291e60e9cdb059e89b636a03ab8351d34af67629 100644
GIT binary patch
literal 61
zcmZ?wbhEHb<YM4rXkcK7FQ0ek@jJzzEDRu^10p~&3``;|{Q{@6@5+^EX`PgFOPn9)
KdoqH7!5RSC*bpKB

literal 255
zcmZ?wbhEHb<YC}pxT?$$oKQ4*!|m$%S9YFxk=eZB?WdpJE3T|Q_#~xj_WmQM;|hE8
zy0$dVJHBZ5!;80HZ9e|&|NsAmeY?`?7Di{c&faz}v2@D8ORxJ@U%zzc_4d;*vRYQ9
zlyo=FJ5@SqUv~A<DQmAy-E{ZJ<u~W<ya#GzpaD?)$->CMpv<5HG8^P41~!=k6AL_a
fr20J`=I^jEb3gyc_|zJ&wMR0GPCsR1WUvMRk^Nh&

diff --git a/upload/style_images/1/login-button.gif b/upload/style_images/1/login-button.gif
new file mode 100644
index 0000000000000000000000000000000000000000..850a496381c6b47454b56925dd0c6a73ee99196a
GIT binary patch
literal 1226
zcmZ?wbhEHblw%NO_|Cu()p8_t>b2yF7mHWE&YpKaq33LD$BB$tw+fa$&s+5P)%$Oc
zUwypy?A^yNKR$i^`QhuYcb|V+XDrhXoot!1&^CEdeEHm6$M5)+ZZ(aa-7@>2S^T_p
z`>wm?tw?O$mOcML@}$cVZAT+3SKWB<_QCV_k?qH)tUi-C=~8ybHp7s9-~6QyUwoLf
z;-pRLB9GEdd(S*PdFAQrkKcW(cXcc}UN!B&)HP>czW*BAdp4qQrbGHN*TVJAxvR@3
z?QWfWD5q<ON6F^(`)}+yb>BE_VqWiV&$2BAOP@REu92`TEbZTsG5b#U+?@`Y%j5da
z#r2*wkDXOL<Dh-olDx%Fa~D0fN?rWq)hEZ;E}z`R*B`uztzGX|xZE*k<&&2mPhEQ!
z+j}Nw(UXXd<I3J0=8;p3BBo7Sd#-5t%eznBhPEA>wd!!e(q|WMJ$>@}lX=pD&c!Dz
zVrN>XFLTOW<&d>p$T&B=^JG}#!Fx~Ny5uYi%b%V$^XB_6za}j^5m>!T$+O)tbA?07
zJkO#{2@}rmK5;j&YJ1U&mrfarGFvy>q%L{-`cu~2d+9T8IcKlRm~}h4YR##u&w{FV
zxa6!pdF6?5U{gfHf%5eqOV_*$uG-nU<7>{0YoWD!?mT(Ju9f!x|9^&2Kw=0e{$v5`
z&;gO4Ji);6pFvS0;=qGR2b(#Bwe}oIXk=;>HSnC{v2oGSE>X6mMMpL+KHjfjpQO~W
za?;7k8o{f4I#((z^E604HOI49O|5x`&dWO|H!nXw&s;yT$z_Yi5^j-09upcKYqTyE
z(UVY>5)p1#9r3+o!v%%lWy&3^B0gj(x+t#+Uo91}+pK?)Pm~eQp~+4D&1{lJcYGDw
z*EX(VWnvHeq%J&7A>oEi<it*PE)i>^wJ(%+ID|6JFibx2WJTu!VfA%6Ct4T<7N3<a
zNf8S$ZOFbZWwck}%Hh}C3NuY=ehB<_pLm^dm7IiK%qbD}k~=F-Zdu{7Owusv%!!aB
zj*radClizo%-zi|HFJ%{a=}TN-0bXpDJLAxH+q&cnY$lwoV1{h$zJDL#|JGZo^C$9
zil<KOmJ&(vOy)~JddP5?bU28_>@jp?5%ihRDz57jk;q*(=b-|V`PB(6a*aF*j~HB3
zHnDIh+$i7>k(=Sb#Hm(caI9199!n#a`4+{K{SIuJPbN5Q`@+DJapj|{WUR}hCzAu*
nG@p9#-(hU#N()Fl;u;e*<sx$eSI7yDVx5#{j=Z)a0u0sw9n`}e

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/login_button.gif b/upload/style_images/1/login_button.gif
new file mode 100644
index 0000000000000000000000000000000000000000..850a496381c6b47454b56925dd0c6a73ee99196a
GIT binary patch
literal 1226
zcmZ?wbhEHblw%NO_|Cu()p8_t>b2yF7mHWE&YpKaq33LD$BB$tw+fa$&s+5P)%$Oc
zUwypy?A^yNKR$i^`QhuYcb|V+XDrhXoot!1&^CEdeEHm6$M5)+ZZ(aa-7@>2S^T_p
z`>wm?tw?O$mOcML@}$cVZAT+3SKWB<_QCV_k?qH)tUi-C=~8ybHp7s9-~6QyUwoLf
z;-pRLB9GEdd(S*PdFAQrkKcW(cXcc}UN!B&)HP>czW*BAdp4qQrbGHN*TVJAxvR@3
z?QWfWD5q<ON6F^(`)}+yb>BE_VqWiV&$2BAOP@REu92`TEbZTsG5b#U+?@`Y%j5da
z#r2*wkDXOL<Dh-olDx%Fa~D0fN?rWq)hEZ;E}z`R*B`uztzGX|xZE*k<&&2mPhEQ!
z+j}Nw(UXXd<I3J0=8;p3BBo7Sd#-5t%eznBhPEA>wd!!e(q|WMJ$>@}lX=pD&c!Dz
zVrN>XFLTOW<&d>p$T&B=^JG}#!Fx~Ny5uYi%b%V$^XB_6za}j^5m>!T$+O)tbA?07
zJkO#{2@}rmK5;j&YJ1U&mrfarGFvy>q%L{-`cu~2d+9T8IcKlRm~}h4YR##u&w{FV
zxa6!pdF6?5U{gfHf%5eqOV_*$uG-nU<7>{0YoWD!?mT(Ju9f!x|9^&2Kw=0e{$v5`
z&;gO4Ji);6pFvS0;=qGR2b(#Bwe}oIXk=;>HSnC{v2oGSE>X6mMMpL+KHjfjpQO~W
za?;7k8o{f4I#((z^E604HOI49O|5x`&dWO|H!nXw&s;yT$z_Yi5^j-09upcKYqTyE
z(UVY>5)p1#9r3+o!v%%lWy&3^B0gj(x+t#+Uo91}+pK?)Pm~eQp~+4D&1{lJcYGDw
z*EX(VWnvHeq%J&7A>oEi<it*PE)i>^wJ(%+ID|6JFibx2WJTu!VfA%6Ct4T<7N3<a
zNf8S$ZOFbZWwck}%Hh}C3NuY=ehB<_pLm^dm7IiK%qbD}k~=F-Zdu{7Owusv%!!aB
zj*radClizo%-zi|HFJ%{a=}TN-0bXpDJLAxH+q&cnY$lwoV1{h$zJDL#|JGZo^C$9
zil<KOmJ&(vOy)~JddP5?bU28_>@jp?5%ihRDz57jk;q*(=b-|V`PB(6a*aF*j~HB3
zHnDIh+$i7>k(=Sb#Hm(caI9199!n#a`4+{K{SIuJPbN5Q`@+DJapj|{WUR}hCzAu*
nG@p9#-(hU#N()Fl;u;e*<sx$eSI7yDVx5#{j=Z)a0u0sw9n`}e

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/login_button.jpg b/upload/style_images/1/login_button.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..12d3d21de24dc991a43d75ca4d333e59f6217a76
GIT binary patch
literal 853
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfx!kS^p1hgF(p4Kl_BK-
zP=xXSZH5*GHWn5ZRu(o^RyIyHAm-*^W8>iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw
z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%!*j+s%Afk}{&S&;Gn5rz(+
z`&b!)u7m?d1}0`!HWm=Yh%CXx!oUcW5MW?rVPIusV_}EtU}9uuVPz0h6cQFOY+R^h
z#O4^7xY5ZtSk$z1s~}Jd6EhndGt6{G20<o8X2U?C4~c~n4=Ob-y!cR<#nH(4|1Aa{
zW}uaV%z_N|4DUAV+gx|=#{8)^XLQoHXx;63#weW?y>^?@ZGGmXCZ^^^6^}1QZf0h5
zY<d#2Q`c<;&*`R)&91u_HQB9PoS3)qa?I9B*~h*mUlX=Om1XR2TE64l(+NeTn|(}G
zAMVUD{?9N`^|W+B=9&KtzK1Fqc25^@x~Rhve=yLTp<MHV{+f$FFHQ>iH|O=7lH1yn
z$GjdFCw2%}_-psB=w33<)#qYS%w=Y4gR4?JRU&~q)l6?*m>T!GFD}PtUbJ+G$d7lC
z>sS1}EL~gwT#j4%=(38nyc>Q;9XogEUTnwi5W$G3s%Og>Bnr4QFU(=`eLZW@>zm8Z
zmN+pLGAWeXW<Gm)Qeu+#<&W`dUgu(pC%((fE;-v%eL-Pe%k4kQmIX09o@jXMxYvyp
z>z?>8<GRD2AgFL$cw0ug{f$Wv9;|rmbUW`w>g!dLA6hXzeBHdurb=Xu>TNyQu+{f`
z19!gb?DW-qv3axqU0&twYC`+B+B&UwE1sSfy-hE6_SQr3?oThfUEXW>ZJ%vu`JEM2
z>Xr2~+t2=udiS5f*~aF(QNQtvsTt{daWA%W{&Ri2v;E|cZC9tg`?JPS?pffoS`m=c
ztB8w68){{@3UAQ5eo3>ps9WKFBxhVWYr3GM)*A;GMVHT7t6p?ZJzN};VR+_AxvqlZ
MvWPbo>;K;b0DaXd&j0`b

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/logo4.gif b/upload/style_images/1/logo4.gif
index 10c72441d4e167f0aea8b754b8964d4bfb8f55fd..24c08dff0e3444c301b4b779a6660c05ed43c56a 100644
GIT binary patch
literal 7692
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

literal 5946
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
Qnht;6A^*B{2@Tl(KVc@UX8-^I

diff --git a/upload/style_images/1/logobg.gif b/upload/style_images/1/logobg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8ec25f76721f915fc8a15e53a9bf25901b43b8c
GIT binary patch
literal 3295
zcmV<53?TDINk%w1VQ~O70QUd@bgJx3b-T&b>20CocBJ9u>h${i{Zxa?UyRH{X{|(U
zv{;79?C|$jf4*_2>7lpVPj<GPv)Oo*#(uEuPIb0mj?Ywkx@?}`b)nsNo6=c=!aroG
zr^M}vrqyPJyxQjWX`SNp_4-?d#c!nLQFpeAqRrIX?0c-}PI|%U?e=b<<Z-C%NpZDj
zm)KK#y;Xt5wZ-C+s?t(=yjOt0Rer!xe86Lp)Y{_kL1wF7ipx@Xw`_~TW0KNJaItBh
z<Yt=Qn78FvfWcmj(XheaWRuiik=IRly@sOEU5d_wxb-<*qFs*FVvx{wtnN^L#!`B^
zZ=~qs=kfRX{9b{(fwS<1p36*fvuK;$T8YnAhR;ZDvAxRUS%buqt=WR5*?O+-Z<W$$
znc8rr=4+wmQGCBxgvVQl$6JWY^!EC!!Q_6i@Kk-iVwK!XbG2EA%w~$k-sSOPk<!@U
z?^ub_o3GSJa=A}<x@(ZlkEPCGliFXB+Gd*KQFyq3wDMPh!fB7nRe-}_kI}-;=6tT~
zM{KThq~}_U)pe!gWtG-7S)XyE<!PMXWR}}qipyb-&+qg3b*Sofqu_6#;b)iHT8q?D
zfyiZ+*<g^<Ta40KgvC*IwNQ4oc(L<%u=01X@^`QCcCPSKdbw15yH<X^T!_e8gu`5h
z#$AcYV2#asspVyq)n=C0b*%1do!)7h+iINLa;WNTpy6|=>v5*%cB9{Trs8?1<9e&-
ze68tyuIhfT>wdBAfU@s_wDE$q@q)GTg0}Nqh{;cPxMh~z*yQ$Ih{<D<)^e%qR(`*E
zs^<0g`(umAWQxjOg2Kz#?QNOZP<6CXb+%W6#ZGjzQ-H)%f5&T?*-?4Abgl4qt?zWJ
z?RKy6bfMnd=l9#>^4#O_UVgc9pWJ4Lz+R8of3)&sm*7TkwpWMIL~prysN{dB;drU%
zSb@P+eY}3H=&HTmXqw@Hw)DNt=x?6hkEhX9dAqR7?@)Zie6a7a%<zG)>3OT`b*b!o
zvGI4R?EnA&A^8LV00000EC2ui0C4~`000R80FwxeN3P$OCfc-Z<HWF`!-o(fN}Ncs
zqQ#391q%GtM~#{<{Gj+4v!av9lPFWFT*<Pf%a<@?veZa(AUS;e#_aKd&6CfcK!XY$
zO0=laqeznmt;saWFE#$gl=G48lhvzOvufSSwX4^!V8dPoMz*Y3v%l~`0#R-ZsJC$A
z%AHHMuHCzM^Xh&3tFPa`fPYc>G7BCXDA^J#Ud*_$<Hw9yvC;-WmgUQsGi%<w8Gts)
zj(v$9O}g}GUi(z!`SDq@>({Vj%bqQnvI8h%eCXcIySMM(zsEpvAglH3UdWRxU#@(x
zA~t#)B%DsYy7lYW6CQKm&K|LDAHs|OA5Xr#dGg(e<<ke{m~|@f<IA5<e?p;Q<DdZ8
z&%eL_{{RN)z!*S0^3Q<?CaB<o3^w?W6da5}oPWGjXyJtzX2^?u!z?idXCQ{S87#B-
z5Q#Gmrl=x=#Ha%T6tHBr%ZxPEXyc7D4pImkhKvErk3a?~<d8%T2?YpxV8FnNOs1%e
z7e&12fRH#=Y2_e_<Uz>@4s_||mtck|CYWOQz{WX1G^yr-X=IUylweLE=bUubX(yd0
zNHUHgV$9;_pMVA`=%9d#F~AQ?xFNurjLLz8AwLW-f}pxoYU!nzW{T-Li%_D67@&qK
z>ZqiaI_d}@oC!t>j5hg525y4?FhHrf)N1RkxaNv0E{8C3&JQC5E9|hu7HcfA16(oA
z0bLl->WU9kvP7iE;$rQ!*k-G(wzo*K#5pPqAnv&2mTT_0<$}NnB?rj!Y>LjDF$Wv6
zqI<%<_~xtczWg3C$vH)!EAYVP#&SgwS=`~xy9_dr!2w15aDl+LRBZ9Z7-y_;GTt7r
zNGu?SEb_=Cmpt+!j9^kp2hK8_U<6KJ!pO%a$CAp;IOnYM&OE1bNDEnDa>39<7j5*>
zNE_XXE5=|^4Gb<LD1bCs7!yV-Ne|ug)?DA5&OAaK;7TiGmu>dhXs3Pl6_Z?Y05dm4
zox&Z`T5^TjW!s|n-hB7}?f2h$N21CBLcC)5;fN=$_~MCQ5r#2HIB|p&3>(nJJy=+M
z1>=X;;`!&Ghc5c)o)ch=8<n`C`s%E=?)vMlhq1~f3!pFr!-Cv%z$KQ10Xypi1TXyX
z#20V8@L*SCLm13A@BH)7M-P1q#;DAN9M2Z;h7*~$ApP^lhcEu{;n+}#8!e=-{`%~<
z@4owpT;c`_87RZ30Ua2zKp?8D@;>{t2%rE5NWcObP=MTMK^dyCiUvCHfe?(K1SN<F
zA_(CH0eA<awh(|yAi)NRm|z4kK*AE5@PsH#p$VUXgnPt66)=pU3};Bg8rIMTfjGlG
zkb$Bm6`&a?*q;smY*<5X81aZmOrjE(h{SLZ;RW{~f)uAn#VT5{iZ-x89JZLnDaJtv
zWiWySmb4-RR3QK_KtddBFhwnLk&RX4fgI;Z$2!{aj&(!=3ebTHJo*ujOsGHxyx@om
zFky~y$RRZX5CJB=BLGe~Lj~e6$3RxV3mGt^9htz%PI~f_pbX_FTZoPqi1L)7bOb8S
z@PHI_;S30HL?<1QgEF9?9*atm97bV;GBiS#oOA>N&d`Arqyd(|oTVd{$;@Ut^O?|W
zCIVhihX6$Ln$WC3Bgzl~DHPxj3qU{xn7K*}?tqL83V{UbK#en?f|(USfEkwI4FkMG
z8j^G-D)!0$&wl#zp8)kI0?H5o1)L(F2>qu#0nvpJ`~wDlFhdUbiGXd^pbjx;*@7Ox
z0u=ZX0sPE?831uRWjufe5)~){R?5<ry7Z+mb*UNlSc90_^raS!fq|6K0YFHUr8x-3
z3yjbPK`_V!^$37Za{$zl9sv#iKtlw`@X?m$;Hp^7s#dqk)vX2t5OpwUSI4T=VsOC-
zIz12^{_p}boC2%C$izi=PyhunKmz8dK^cO9)l-<^1#gI3R3l&nY4A0xr%0?~7t7ej
zI@YmVC}<5HOIgO6!4F2Dhk*_R0~$!f6vaqvF-(D31<*sI|9F4`jNnsJDAo+pAj9nr
z6aqT`7$KsJC53Kx%iG@i_P4(^Lk-NK0N@(8x1`PNX8)lKdXRw&X4tJ6GC_j?XkiNo
zGC?%zP=icFSGQ*10vV3rP}<T#so&kLDb~y0_PY1I@Qtq@0+4_J#P`1K6#+5=fQRM&
z0}eY_0~bWVUJ>{~1}p#v_M)%@EnH&;nJ6$9))3eP)iwY$h;V*Iz~K&i_`@I$afnN?
z26Ny*10qgwhq+MQ{wfFt7NEg^S4;ytC}0OekbnXLum%*<SO&92P;J{F;18GL$Vg7I
zl9$ZnCYNHq2{4C~r(6mRtf37qPLKg&V21{10LdEggA0Vg0xhtB0xp=rmyfK023({6
z1W>gw9f-VUFl*q>c+Rt)_sr)$vttb`zySsNOz1lY!39|M?|}-igKIQ^9e8F(16*JS
zVc5Y1$OuBDk#P-id}BeiWkH(t%#Ko<`qZdSwW?QL>KR-^0UK}ut64n*1ZP=6g0O%L
z8W03i&!7Qo2zCQzVCo<=Kn8q(8mQ^O0vR9!)ia2;w5Lt&YFqo-(jJ8{5`cp>VEfv~
zX2BR66oWQkn%WIWH?@)B0t%FXatnF{9$0V<WS~3U_|CV!_s#Eq=UWtQ;C4Iw&F@i!
zq7C54<$@Tn0|<y>6a;U;C`2I)aYUg(-|&DHt^x6UkK*GX54p%kPV$nA+yVjr$HBu*
zF7kGSVj6^yfc+RG01I5B9V{P3JDv~<>@vszcpyX@o`Ca^x8vwYPrA~V&h(}){Rvj!
z_RXEHbPGU03pl8P2?`K}u6I2JH}HTkEI{>kSbz^xa7GHe?sYieApu%|Kqy3^bWzy-
z?s(6;-uKS;y<a2h8*q5v@qYF;5Ml#LNQB}QuY?UGpa;Tu!r(;_3K9T5@rzGH;|XB}
zK3G8S76`rQM^F0FoBs5tzlPyA&;!(y{u(4`gBA$EZ5-G>0fgwmG)NE%*IOVIe3(WL
zXm9)C!`%v-&_VA>AByHX|M}35zVxS0eH~B$>j{uM^_|ZL5>UVjJqW+N_^mLFP4Hp+
z+$X^_z%Tyrlb;0Vm%a|>PyhPc|Ni*Tzy9YB0V^Cn0VJ@0^T!9>M*<LVfCoqd@F#%v
zSAd&<fDo_=@W%%XSb-LJf%HcL(9i=3umOY+fEXBpB6xoaSb`>af+(1RD!76uxCvIE
z1szBTyT^hwSc5jWf|`(nI=F*8*n>X!gFxtm&;WjfV0$tcgh-f#O6Y@|(1cF-gisiT
dQaFWFScU61d<lSixn~8)SA|~qg<u#E06Vl?c&h*a

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/msg_folder.gif b/upload/style_images/1/msg_folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a31d5bc6515c3af7eaa769a8f4abdff15d865975
GIT binary patch
literal 173
zcmV;e08;-)Nk%w1VG{rk0J8u9u)osm@%L(+-F2+)Sb@QCrRHRl)Lx3p*x>7hxb<w9
z*7f=Q*Wc^T*yRT*W&i*HA^8LV00000EC2ui022TY000D9aIJuvy$uD)IdWhaB3;)w
zOsX<YQ%(qguBiiH+9&S3Q#pyCa7b*O6v(7<X><^t&}XlCs9LMDRnx%ja<i(YU`!r^
bYZgag&0e2b>4AJMf46kgUJk?WYa#$U=1NXZ

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/nav.gif b/upload/style_images/1/nav.gif
index 289f5fc57dd37f0d0b44ea96eacafede56314a90..8a8d3d9fd00fdbdea1e98a3df3c218e4193c7661 100644
GIT binary patch
literal 87
zcmZ?wbhEHb<YM4rSj50^^yty<?(VN&zh1g@sjI6iEiLW;|NjgO42nNlfFuKh4u}A$
nWnh-c*p*|LJJlgUn`y$S4JT$lZJg7XxzuRsY2m#-Obpfls52mS

literal 1072
zcmZ?wbhEHb6krfw_|Cxa|NsAY@813U_wT~ZH;(CBo<Dy+VcF$}&pyU>9xGUMBeC(I
zSJCb#Po6w`_H5$v%gId#zkmN;(6;%<j~`#Z|Ni&yf8PAtKYso>bM1BMs+VC+N3-YM
zNS$=WD|d@W&h|-Hzk3z!nsD)N{k~^~i|?h@txxDbSGe?E@zT55orlwB-ixc-pF8vF
zr!T*}OZKGCxR$r@jeGvCx^4e!r=R)!^+)r8XCFU*uipGWyzxlUqQ{{PM++7|NS}E>
zci!F775CGpJ<6GTw`|R`vNbO+Ub;GW#h$IZjugzho;Lk@(u6amE8Ztfy<fTEZRWIF
zaouP3oxGbh<3is28#!}tlrDefUA(Jp-ucoMFFOwYZ<}+nan_l`XYTvtZ7E*%Fni98
z-qU{*`>$loei+wv!ME(d%eUV$XWWeKI2PV~G<)W?jF~s0T8}+{^R<5Jq0r)u1@mtf
zE`1u`b0MT`cfpb;73*HiU%97Z?eB&?|AXs}M6?{uoN+s(c=O~HmvZO5^C~_N*?cr@
z(wWpLw~7`&Shf4EZ~1|`X~+Gm4xYU7Dtqp`>9>L5`5=Avjl8)x;(O0Me(|OM^7oPz
z4~m!FO`CeDV$GMl#h>21d6U|5==bm6_0tYNfAcMM%FXh%uR}|>rB1$@4b;_nDz@wN
z)KypW=HJilJ{C}YuzdB?oTl}^fB${>{By<XXFdfxGNzqRo^-Kv#qVd&o`;ujOPhWv
zpz45U(XNEvGYP$CqpJ4>6>X01I(7E^<-B=!lA8`hw;U^3^(?St*M@C}^5<VJUHLSz
z`*c{-$zQ*IF${g6_>%?f2^|m#$`cG6{}~uLwip~}WQyUE;n|?DL6OyKj@{W04jzFW
z4&~=eSSFm9%qC#);fq8_a`!@Eb{4-0i<-S;R5u;Tc+~90C*)wl5cA{F3l9lf`J4|`
zp(l?nw(((+*igDSSXrzoXhT#Hm#er;hJwwF#Z6+8ObjkRHBFbFYx7;jv?a4>g%j%r
zrtkxYLRwg+G4cDX6uij(uEAq(%@oI!_C`h)mrZY~7}bu+>*aB6l@MNdpjBg+Pean>
zgWPSJ*=1|8R8<bJXmbeZD6y(^s%ltnxgcrC&D0RM^^D4ckB`r;6`E<Z<Rq&n0|OWP
yDjkDIEf<Buxt(}DpJp%a(VnbV*dfa3H-TZ285ggJf}#U68!wZGfu4Z^gEasRAmWDr

diff --git a/upload/style_images/1/newpost.gif b/upload/style_images/1/newpost.gif
index 9a2285b4d04e6681858735c60d53ca8aab9ee375..cf7e7066f1f2999bb92b75c633fe99133a1365c4 100644
GIT binary patch
literal 82
zcmZ?wbhEHb<Y3@nSj52ae^ufCd9nW|y8mxB{9i8nKbPnK|Noo)SQLM<Fo1v#hybZ&
hU>2{~75%U4#LBj<-Wi2GTnW!*85H`?Ok!ZL1_1I?9iRXJ

literal 316
zcmZ?wbhEHb<YC}pxXQo~oKQ4*!|m$%S9YFxk=eZB?WdpJE3T|Q_#~xj_WmQM;|hE8
zy0$dVJHBZ5!;80HZ9e|&|NsAmeY?`?7Di{c&faz}v2@D8ORxJ@U%zzc_4d;*vRYQ9
zlyo=FJ5@SqUv~A<DQmAy-E{ZJ<u~W<ya#GzpaD?)$-*kapv<5HG8^P42DZopP8lC8
zOf*C;JZ<9a)H$lGn(&~&NUX7J^;;J?e!cRI7BWYoc^6(3aM+RG$+EI`_tv7SyLt`^
oOpF;(qN3t#O-#aE;xe+_EJAgn!VJ=UJc9ibIYhanIUO0S0bluQI{*Lx

diff --git a/upload/style_images/1/newpost_n.gif b/upload/style_images/1/newpost_n.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f0aaaf99063ea7e0cb60877cffb1a950f39b412
GIT binary patch
literal 61
zcmZ?wbhEHb<YM4rXkcI{Dy{tV^{3)b76uT|0TCb>1}2e~eu2~3cjZd7v`)&oCC-oY
KJsH8kU=0A^GY~-l

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/nophoto.gif b/upload/style_images/1/nophoto.gif
index 467bceacb9406f5c8afcbf3dc24d3fa96cc0850b..d71bda544b1ec4cd37aa93bef15fe320c32f4fbc 100644
GIT binary patch
literal 3288
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
WQaFWFScO)2g;<z{RR|IR0RTIlg^jxa

literal 2866
zcmV-23(fRLNk%w1VNU>10Qdg@CMG8Q{QM~?DQRhGczAeaWo5Ruwk<6!R8&;HzP|14
z?oLilg@uJ39UY;eqI7h0fq{Yg`ufq)(bd${P*700xw(FRe)jhEc6N4|nVC#XOh`yb
zaBy&jhKAwc;Sv%O+1c5Oii#N-843yt4Gj(5-Q7h+Mb6L96%`eZj*iL7%IfRtva+&7
zL_|SBK}t$W<>lp!jEwT~^6>ERsi~<wJv{>h1Hr<=l$4Z`l9KrN_&7K?h=_<FARy@I
z=xl6kJUl#?mzOd!GMt>8Zf<U-rlvYNIyE&lFfcHmpP!JBkaKc!G&D3KA|gRRL9ef`
zj*g3miHXL>#)^uKP)$vBa&lr|V0U+Qm6euMR90MCT01*CGBh$^U|?cmVqafhUS3{X
zTU%IISXWn9T3T9DQ&Un>Qek0XU0q%N{{CECTw!8jSy@?DR#swSVPauoU0hsUU0hsU
zT~JR?TwGmaV`Id`#9UomU0huuAt6stP+3}9Q&dw=P)}1+R8UY)QBqP-Qc)ryA!1`<
zR8v!0T3I6_BO)OpWMpJOKtEJeQ&(43VPIfiU|@TCdowXJD=RC1fPXA1Dq&(_yS%)2
zcXw)PYiDO?dwhFURaKgtoNH@qOG`@!2L}iR2un*%b#--JUSD-~c3fLrR8v&T%*<L^
zTTDz#T3cI$goa>YVLv}VzrVj-U0yFQFOQFp78n?Zhlfo~O-DyZO-)Q$Sz16qLT_?%
zNl8gsSy@q0QCL@4<KyGt-{0@=@896xPfk#yqobsxqhn=dBPAnpb#);jBwb!ztE{Y)
zlaqLNcaxKo`T6-qM@9<^3m6v|v$V8{i;Hn{b75g#adB}{RaM2s#vULZi;Ihlj*Mbr
zW5>wI7Z(>GA|PU8V?#qjjg5^F5f2|9A4EY!m6ny2m6c#$UmzbJgM)*Bf`v^^PKJhv
zJUl<s)6_aTI9pp<SXo$hb#^l_Fc1(Al9G`~M@XHWoh>aZS5{YASz3I2d^IvPk&%%z
zH8ubL|NsC0A^8LW00930EC2ui08ao=000R80RIUbNU)&6g9sBUT*$DY!-o(fN}Ncs
zqQ#3CGiuz(v7^V2AVZ2ANwTELlPFWFT*<Pf%a<@?%FLL?*S28GGzCL;qumN-GaX(4
z5sbhWCrFU&aIwJ*q7Eto1VtFYhXDu$#sQeu$%a=Ookn~RFzZ2ysRd_Hf}jULxUOI0
ze(i)p7OOO9|IL6#U>^y&faT7kAO&ww5HadVayGY<<HwL4dqu&fl;M~#3J8HU0&L{Z
zpKUbw;Y(%!3k|w@0?it-jS($+$z-)-MA#9ybL-x{J8X>;F;@%_(aD+d<H(aMcZR!0
z1(*Sn)R;Gdg!Sv#vuh_|JW&ytzAOm;sIHyJlN0{@`C>(6`*n61VDbWGh{U}6_+O>p
zzn@hP`~Z>wL<lf}uta^~B&eVZ{52Sff(qXEO(hq+WX%J{%=5v99DX2y61wOD0e`=A
zxM4USZ14jNFR}1I58<F7<BT-Q$Pa%t%J{(?hydqO296l=L5?{(upbLKe$W6Kp+MtO
z8X;J401D4kY2}sAw838iSU!Wo7CU6(fJ*_Sl8QShh@j@0Y}PZwe!;N0CN~Fw0ZKY6
zv=jgjm^33o1Aqn^C?pc>Cjlga3M#?^tzc6cO92D}K|P5k8q0nj98hVX&$z%w1yZpT
z0W=*j(SSHTq^fGFg{DWqs<4Xx(||6SOyE)kL+B$w1Bc|{>#x4@cZeW@0PCwD*BH{p
z0(rI+K@bE8(1Rh=R$Hwd*xF(3wuba@z%Xcp$`Ug{L~>6P0Hmw#y6m<K05Rum0R}iP
zT~H1>t{CEOx*T}mj{!&QOH31rm|{S^%P=4W00K1ZaKp{;SHZ&$1HeQZ`UGODOBcMt
z&khVjBJ#+PAkrYoA`2kIC;&7;fe-aM;s^o#Kytv%I3IwE#5vzAz#J6V&_n?h-s*@8
z7!Z&M60S7uv?~wr;!g!NJnhQOh&*D0A=q5TQX1gQBETv77;%6QXs50A+Cm(#0|(UY
zz#>dA%&~(jL2Q5o+kB`0?aBsqJVU_7F|qQE07>W~4--c;?)c-7AD{*&El}e1O95CS
zL=vP3al{Uwhc3G4M{JSG0ZTMHlO6hK^1$e@lm3k*i->UWR5Ao3L<j@au*L7d2miYf
zTWlhZ4F|}8RvI_h76}?a)FA!z)JwmGC1jwGLSFw|;5jyktWv`&<d<*0_#1$dK@vcr
zwE{9lEFnuGF4S-T{r9&33=vM^?!XTVXhsXZLBIkU@PM{hg$o7%f}jMz0HT=1Dq7G2
z6Ik$q7|fsv2516H+(29|@y7|4!3GmFqZzYEp$b>X!W5p+1RLPM6BLjJf3U<KGdO`g
z3V@3Z;Npis45ASKg}8wYG-Clj00#|9Ap;wpBmgjAg)p#DfCb><1)RvD7PrX7F23Le
zxL80N1^|IqJOKm|7>Pf0Fac-`0V{1-fGjj1i#pPR7In;{9`~3>4fs(5xX{2H*zki$
zEF%FcxST>1iI6nRU>ilq0S3%rh6Qk90hr9BCO65+PGV9PpSWZo)Ifv|3_$`iU}Qnk
zxR3zw0vh&61@<VQ4q42h4|>qUA1J`fIRNdKbNIt9d6`QJ{E`BH=z}knsZ3vLfC6Pe
z!!6KJj&1k=gas)YLN3q_8sLBcUTA|Z77!v`0KyFBJf|7f$<B7V^PTWCLm<jI&N*b_
z3rk2v5GvsRfe1KpAlMv;FYJ(nSP<bD2nbOb7Rm=j5MrSaEdw9;5K)Nwp`s9-=tcc-
zQHT=ap%tZo8OCsiD)1l!1}MR00vZ52l*17PU_(L?fPhTc^rkq?sZMvw)1Ky(rn;zx
z7`%XiSg;^em-9gesL_Qn(6kM0z{eOCF@~yI^{QCSs#dqkRjfi4s%2<HE-aA%fvl7g
z15m>*vM>fQxb>}YjjLSeO4qvDb*^KuDK%Op5E(>+3{_==VD~_V!W#Clh&?P}*-(hY
zI+hHDD8wH2P>aV}HXn;+!zf~bo`3k_0csG#JHkNP(wg?Ps7<YESIgSgk`@(W*aQo7
z@DEo1pn(i(phFzgaECjfAr5eegK*J6hdamt4QPOa9OOU;IKaWU$@MKA@PGz2sA0Fw
zjYD?PAO|(T0lCPf19#DY2RYyY4%am<9`2w9Jm7&2-GxUTf}y-*XaNlP&98p<%isR`
z_rCxRFn`fdhar@P18Vq!f)~u-20Qq{5RR~fC+uJ_AOZ_3P(U5f(1i|r_`@I$v4}@Z
z;u4!U#9u%JKVUEcFPy;(Z+Nj6W=vx@%-9WXc*7fLOyf1I0mnY}agKRB;~nqV$1^^|
z8hTvhCF2;zHrDZs*Dwh$xZw;1NI@^2PzM<k`O7>W#2|>Q4KSPe%wHZenu+{|0$>CG
z1n8K?7f9TQ6We*jj8KJ#8F7X_`}xm+4s;#r@P#^rzz+Pt00t^i2}NTd9-xTy113%B
zN=F(LS70=w3Bc)2b6Odib~FZxv4m1TKpNCYwW?RmfmXZv2e5|qCN^P-AG{(7{NMo(
zVh{pwq#y>_NI?p~5d&~wgV)#yfwDso3m(K`9SrCI15$yGX`3k(49NDhJHTyjYdhN=
zh(au)5CR@xBL!1{!Yja$gB0X|AM{uT4$3j_AYg$U<gmvj&;W)noB<I9xWoVkaESsG
zz#CR*1RBC1hD?-!3NM(23u<759dO|Qk^n$A8Xy90%;*CN!jF5jbDtrlsR4NpFoXck
Q_BkLZ&;%MlLqGrkJG>vuvj6}9

diff --git a/upload/style_images/1/p_aim.gif b/upload/style_images/1/p_aim.gif
index 362670e36dcbd279188d8f6cf79a15e4f3e90962..494b5a6d9112e1cc2be399174edb8e5fb3ddf0a5 100644
GIT binary patch
literal 1294
zcmd^;`!m}I0Kk(7(zIPW4%N--RgBnB?-*&klBU~S#fVa&jYND)M2%rB^-9Y|ksw}4
z5MeRzo3^n_oFbWLLMUyb2tjMdrHAcqcHO_R&kvv9KR<jzu_4|*@irh6&>;vET{s$*
zCyr%I5X+`WOy%t-a}@S+a+5lRw@%}4sWf{VI|quD&Ge4lCH2mlcK^$WDioQIr0}Kl
z8tMFoRI%Z6hv%EXA=NAqD`sU2o6&SOrT$e_hm6%V?MLE$moLd?iQ_93JtHdz?~f<s
z>(!lqc*NERPzAok=8zPD`^`G91dexH<CU9r3$L~|w)ZOq(yvq7aP&UUxF)4a8<X3m
z-u!c4chohk6v@<4jER6GK3%X4@HU!yr)A15<?9_xYB#`H!)EkX|1!xGPLbIw&3)5K
z)z0gUcfO>Sw013;!aL9%`;++riEXam<^=)#+suVq6*HAB!(Sz}2T<GnsqMIo0q=MY
zDp^3TTYmXw_bzu0N#>)e9Sq*MXKZ~iAf(hSr<RNG1(Kk&?xodte&klKTMgrLs`yHI
zMDdtQB=gtb7lon)nR3%Nu~ojT3A-=yk7l&|Hh&|z+9QSyJRWi*)KHsL$<3?y>>eb!
z4Fz=cNS0GuH3zz*oLY%*d~-mu0F@-b1I%E0k2SXB<10YQPtU`1p3?<8+yQyyBdJKL
zA~6>L?wcoVW7I~~%hjE*tf8Ws0b<1*HgnKFiGP(U2%&Xd&lp@(@3ssr6g7_Eei(`^
zpIKDD^&_{fZ||>f9{^=fClu>8IEI-wEwg(+L%0{7{j_N4Jy5HR_)#>stTA*<JUKZ5
z{SUA@hW=NH_}~vufM6$}OAa)#B}-BOGj_yJi1Q)&pWMMVV0w8kN{zkFRBJk0#>*`O
zAL|@SIl@SX@Xi=%AL$xFpEStE_VcIey^~~a4yRc&&8Pyn#b4=U1OZ&>c$Rny4)s7o
zCNW?uG!*7E=JJf4FeV3ukiZvkrYNX)|HA<gjXR3)s!C*z=xvS*jm%^am=mWv4(vn|
z*Iw3xTH*V3mXfPcldHDQ|G;5LP9N#KXX1-m{Z2&@ygvpHvam`2d6wl=;w*la!TPA5
z4SP7Stye^_chKHfNQ~bacM(c1qeMg8Q>PEg=sb<Ikl=22-K7^*Vq-j8YJ4u4lXHl<
zk@#rW>;b&An1FDnz+6j%7}nb1Otnv_GXL+x%rk70u@N5Od(QcBgy|%N0be5!M-h${
z`D!q7m;*C};Tb3gn@PE$J+30J*aS6cJ&yP+*JZ@sFUtjIj*nu9zhMULV<7H!me;I|
z8hS(R?pL6LE*b$=VE8=>y~z9lCXZq3Vb@b-RAVa-)WaLN1shbmuj$(XG)uI>1x6nD
zQp~5WPy=(C7|O)&=}>1&awW2cd&;D(#;iVw0^%i13w6AE)Fa~*no_mgV%9+3=U($+
e!4{oF+m6<Y&cqH>tSD?2-SEZyY#<m6LjDWgcMs73

literal 1661
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
H0RaFzv*AO<

diff --git a/upload/style_images/1/p_card.gif b/upload/style_images/1/p_card.gif
new file mode 100644
index 0000000000000000000000000000000000000000..90cc2578c8d0f330bae0f67ce0a87f8c4733b03c
GIT binary patch
literal 1557
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
H6c7MAoj3dT

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_delete.gif b/upload/style_images/1/p_delete.gif
index 99296ea0abc62ca3bd54296677293cec50c9e435..6c30860b55a9a31336917b5b70dcf72f0a2aa04d 100644
GIT binary patch
literal 1583
zcmdUu`9ISQ0LO<ppOss)R6Ha^Y%14ejyXa(!rXIim|Hzhjv9t3_r1A>`C{#P9Oa6#
zq1jxKvxpqYQJy@-^Yk3;d3yef=kvq+_5Shw%g4sf+R!Kf4Uz}_1_FhY&SQuyUAJNr
zJP=ekji<iyA`N46CVa`<_?Eqhn$;NKT~z%Bf1hCxNb?{Kg=IX9%IzDS+ZtPV$9b{A
zn|&KW?i!qYbIG?--<!gl*}UvuGdlkcg#)IS_jt3L#-a3pqM7HfcKz}u^*l<Ag6qAq
z#}S_8&bPZgvba$VZ>{h^46t1U{Og-Y9NjvCaU;18lf@aG-*SyCpI_N6Wlk7lYZu<U
z=f2o53vaf))k&bO<0@WykVhhF*Bzr91JXN77-RNv?bh)f&cp%dlqddq6OOlgo#LAp
zR`(_rw<Bn4rUBK)fizbldvoW&9N+Ad#l4o$fgz9h+#CD#@QdTEP6VdJJn}(dBgg&j
z!0^<%SwsuAU@EwDjytpApEDj@wlMU3&F#)pv+$-XIKaS{nn~>qt9s3zT>aiI%M1_1
zHSfUPi%f6;(!Ux-U|7Yrx)BHLLyP8D_KX5+ZKHp7BMo5-r%?E&KJN1T>s@^1GNFFc
z5m#*Fo{0>l!`+K5qkke*vOUQomQfFqD%c*`yjWmc)t>B<_}D(K<B|{6BV%}EX4BY@
zY8+f|iEA+QrMhKuHg*ntQ(C<;pP@qP5tvd1gJ{;os!eQ%Ya08aHzl1qfDEpaLJ+RT
zwOw$y>yq@?iU8m!uY9sb#^$$-18dO)W+-)OYH81#%yqx>bYx~DF|RG8e9;J7ZQxgx
zOc^xB(YuBhjeIJQAq~bM^+wnlbR^Rh2N?QSUG}TI$=r8K>Hneiz%{Wqqvw!NG0&P<
z5!DLikAwJpKIs22l`r7`GPS?)+b2L`d=T1!7E@QjP8XBa^5M4CS!SHjaFDVcs(5xE
zsvo}0ZEvv2zbFDbY288R6>GRMe0W8T@H7sYS7rAQn5Z<2-<=I((%=E8bcs_}A2m-m
z*cQU{@sNs{CJlf_)H-aLdw_Wu{+e+!3?3vfn3>x?xOfjLz@?(kUuJ4u7X*(#mL*Q-
z_QaYje~{`D@)Jnp3w~W<yDfqIauqQI?01l$V>xWhXG27ePR<Df1_`2Adp)sgb9<RG
zjF-7@S6~f<d=8(ZcfKDbD8tj1#JH#{3W}5a+~AniE2&Hok}20~TQD7x_DO&IIz)G0
zNvux6si<2yN=Z=4Wl&m;e+BiGSfawoJ6K5>UzE~(%fq1nb0>9;o5^9QvNZ+3@6QnB
zGbxyhD&lHUU_)LqOip7|^WangR6x!J%8}n`X{v#HkemZDpvs?8Wjm6I5D|4RZ0cEB
z1z8|NMXN4QCZ4{&eilBtIGP1k6Jh0}+@;Z(AJERi1-4N{2jS3<E&_;?$d{hNJ;+{m
z{?#INuuLdM9932wnXLxOmd64Ve<*t;(K<PHi*j69HT8HSMkV!>jPeFisIb4FNeC?`
z-2_f5izOYutDuLkv+4I_xl}?MSagZcAHhkA)<;&7CD*(J5r$TJLWnFdA{^YjtH(IT
zyaNjdn>+CfpEaM=c%#K=zr|p=1d(2d3bF2`YM!IOR7KjjX;Tz=rKv${B_*ba#Ur|=
zJxtUJBBLV)!7M3uaRvKk&o?M{uzDTn1vPL@W_?tWre5rRzX?PSrPB*7vN@-_7}2Wq
z_aBuR140RFLZ|=UZ$mx#3Pb+VYhNcg28&d~wo9l(gVH3#u}t`gLe}_@Sf1QE8kXH7
zl?IVS>ZNI(??zf^t3J}U6uZ#;URY8*hoC>H;@w{&=JVG9N7t4=I4G&D_9S7(&PL~O
z_J&8~r8(2vZ6uup4U6nEY?98=VsLrn(Mx=j<B|R8whr(KJgA;$lduqJU@QA0ts9k}
U1F7R!5=AfkZXxX`Cj~P32WGOQLI3~&

literal 1783
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
ZSy=Fb7|fssH^{*bTCf%q3`;-&06Su>hyMTo

diff --git a/upload/style_images/1/p_edit.gif b/upload/style_images/1/p_edit.gif
index e4b5bce01397c2b966f11e6b514b4006a2fdc689..2d2d358e2d86e436bc7b2c6bac0c689d1b2f9037 100644
GIT binary patch
literal 1438
zcmd^;>sQhT0ET~-Ah|SHO|7g==BgnpBukX?R=OdYDVk_lfEN@^jcR$RQ{D)?GzAsW
zOhrWUQY14;?Zib8MDk8#p0prKZI!Lg>YR4i+P|^)!}Iky&xiMCTnNU8;thNQ`~?8n
zq8FJ0^O+kf@x?>L%ktzJV`}|u`t^BoxgoJ?B7vpd6T`)(imb0Y^bcQXCe7Z|X61v0
ziMf@12@PYj%RWg0-xOg0O|<tofB(trx+%-Z%%X1kxo+B$(flm7ScQtMLC5hpB5hiU
zl){-JoZ^ibUu0Gc{PJt>>idtlv%T?bU1;{L_)>j3>yCEPT-=}_T)1a^vixx2Rdwg6
zKV9rgZc3^(ow)jdQauxz)jeWd455p|&q~9y+D=wZ8cZ*T#-EWZ$KQSU6vnuHs>K{v
zq{1c(B6DSt`2$4eupdp7P;O9-J*Cw>3P=)Uwmv6Zx*wU_r+6@5(`C?3nf=pmcpl>%
zxzJB3>P>B!i)X4&UL6Z%NRD68MCVDO@?~gZHJVr(Q>;3aeUo@aLu9HC(1dcsylLT&
z41tA^KXBw+FC2Hp>o}iWVb~pZX;Am%&X9>zruU^Z;~71Hr#cTN3Vf+e=$NWlwyuA8
zE-dGc&oL%PtP7`c4^kST=#1cuuJF9OC5=k+(yC=?mBydN(nNmAt>ceZ^u|TsWWhdC
zy+6Huc*=Z;E<BXgUDc+E%k97>HXoo~$EFC6o)IV27;oJ-#V|E_S0&%$S<L#o!&8>b
zR!en<o*`b6C?7j{XN6>n@hKd1Y&9mK{^9(J8=ez$aq#@D)pK313IEz<A2RBUa>Ell
zM2dA3uv)Fa|6p#PZ2zl7e&Lr-01zwiBPIuGQ>!R~Y($W>k`@JIgDV6H>lCQVT=vrE
zw4RCVg4-mvE3QYV<L)BVmj|Paojg?H$Tgf)WZ>Vn*U;6{_OYgbBKvLjUbPBh2L}<3
z2)5g>-B*Zg4DIch=?I~y;qqROSojU42>xtlr394fOoCd#-F4WEWz$itclT^hT%v<X
ze|}F{w8Iu5b)s(%D~?6O(W4=!OAm5i4%UIF4C+Y9p9s_7BM4`EM3jzGvy9u|9)iho
z^u%jeFhAk|vkG4F8$uc+hf-2&Aux8dhqkOaXVrxo%yrtT$~nDW>Q!tr4eAFIav_Fy
ztrRC_Xl#F?71OKnDI8ok*&eY5^Y*2@kSmVxr#K;;ckiBg6R<AqZ_Kt)bb)h@Ek@y#
zHOdP(0rE1DH;q*6a7&BCn8;vWL7|%+KHElz<Y%MsU=Y#`&UV^g$Fo89$buNHKlBBa
zA%jqQFf?F+Rk3v%1#ys$OB6_`%TZNj@T67{nL5Ofb0d5e#a|<K@k;GOQBQ5FBaWf;
z>vvwOEa8!(JcppdS13Hl&eXD_f#jDKy|Ew_CU49Ej~CYbWZ}1iczj?NHI4O74cjqF
z4Fsy(`^8N*E*~JSc>sB-4X{*_9P6m1Yt}ZS$)L?GXol^#M4}R~2g*-tIvV5i>C^Cr
z-(jVIY|&or;Qu*$?WVh6kIQzL3vUBAySqkpZ9YSeIt+7%JS_m44r99|Yg~c@p_jf>
zj`S@sJzmQ!wdt8M9~@BZ+LkR~Z|NNJcr*CknEvM8$D2xyZ7Bddyz^rD<b>ST`E!*m
V<SPqqBLQQ1t8xr<j|>2?{{Y`mM*08%

literal 1633
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

diff --git a/upload/style_images/1/p_email.gif b/upload/style_images/1/p_email.gif
index 5c70c314cf755d331e38095c3e26ebfdc6953d76..efa19ea0d7b7fab0e0dd2b45a64f8f2cc5bf6c31 100644
GIT binary patch
literal 1574
zcmchW{X5eM0KmWIrNxps<tcSYrx!)Yn4M-JHm;S_u0~s#&6?S*dPsE*^BUdql9w^F
z*&1ybB4u4;!em}1+hQSG3hAmxZ%;kvp1VKdK0kbZ{rvPf7#SWANI(LPz-ItB!Ro;>
z6>)j}XKsuV%e44H^;zyTxoU#OH_}C~&NVCskwx6Az$vySB3a@UTe9-D@rmx0>gmhw
zp&0~8G$aIiHAdA_)4=%Ls9}*%Jf<2mK~M9BCl>lOMi{=9R@7N0Q6Fb10~7dgQoZlV
zO7G)kB@F{f*{x_s3$a|^KW6kl#f6>b!4m87?2(w{@_lif0qxv?_SMg1k!j(>FBk60
zx+f2%-aD4jbvCd4@TJb1(xI5Ek4*FL({C!2!!O=1e+k5MOB<gg+|+;g_!XPmOB1}r
zU6v9`$FVtmQH<v3^Q~0gY&cB}C-VJHRtB7^*-sHirwG;h*T=Gy@z;lrUheD}nJpHp
ze10uI%zSjB;0c1-5J2F`2d4K^Zow1y`kAFbLM@?KlYU)>pf<t?wF>q04Ph^tW5}tx
zA4(PNPZWkxCABR>p}#fliMooUN#v@jqgh=H@q%`0K{ve^MBpY?K7%LLL*uLS_<jCy
zoN&5SA|DT-h@}s;nBV2Ht_dWW&ut!xxzu?)Uv;UXD>AhWm3A+PBt%jgsC*NiJu2uJ
zN2Ru{ho-dm=!xYzYC#93X6k6VEQlluJeCto5@pwP>!#npNy4P+=UdTvu{piLNg`MR
zziVjP&W8#o3fv-d&(_Wu=il$cRVCNW2I49ZM7}?+vTw|E=TDvX`2vh6Kwr2^s+@?s
z(lj!;h)j_@(axp(A&*MGzduP7O)6oC=VMt)Qq?4dJ4G$LFSz&gK#CNWQ1@Z^D>|_l
z8dnu{p)De%36s`=ND_Zo{?a#QqzO!=w+9o-v~_niA<4G`;;UWJ#i>p2FG$|Tq~Fi(
z_(-kL#$J&t)KjZ=Caw$uD=RC&|Ap&Ui~mxd|N7r20PqSB6e{y}<#c6%9d_dSWp&Cd
z2hUJD@Bz-_YfiotLw~cNugKeq(i+}UuPWId(}+{~2>mlB?x?CGTSaP4z_|r^gOt}!
zL1bBPM%@*U3L>sie8p=xW4AB@R1K=Fal8TDnq;HcrzqQI+g-4^(}dF9*%1uKeq(~N
zS78iJ>EB$#fP~~NZvxjdX%p?F;lyz(o;R>bW4|lDTAxEu?uOGjgX++Yv|E_HJA2dz
zY=9sBreAWjWabYc-8pIB(_~B?s3PJFP}jaR0jb}cvF6*LHEnyQ@uCB3vNSlj<5|8N
zfMT0s7~~i2e0|Dp`Ng$+6b}L0q)8|0%BDl{azE$io%i$#DXTFS=`S13WS!)F3S1z)
z5UH@MX`5u-@vG;BP(1*)m6@l#xS^Zz*SullGY{buMYga(`(8`u2aN8`9(0ETp04)%
zL1$)<LTx#UbyBh%Y{M0W7R!p6tl1)u=(T>DihPUGNJN2!J>;-*!!V?4jg2Y-W4?_8
zF<ROfBD}5Gp38b8e%1Ml2uH{<J8s%(BsRM|9+hDRb*9@{uXe(}GlzzKAAxYF82@Kp
z&h)Gd@3Rcq<Mk!Hi;5#;@)-r+YP(r{rES5EBKtxg>mrDO$(sioAhSIQTUm-ChdjEn
z59~rWhurdcosk5V&8{42FhiT|E!YS)4P^VVVI9$y8v2bz8Q8)%i@S%eR60Q6#WrgV
z28KEG<`*;cy3_7K=4<+n%z>K0o^4Uix$bzHeW7qywEbK=2k>(DbomR!@N~&`;W0xF
zZm_8cQG)1Siu>KFpSA$2**!r`Zf}2*mF^~%wp;^QJBNgtJCP)N*B!*XX$B3F@hq?#
zwl33ZXN4QuD_Z<6(|4mB6S=t|02#i;i#(Fw?|yQ$r_b7R+-&^=98x_R;UQhtL_wF9
z$55Y3%^ZvEj4F?!D8WZ9E_Lan4xhWbUF$_e*f?S(8IkTkwk>^{bO~d389;3y*7mh8
PrJtw3Vdj2^5kSyC`Lxv9

literal 1813
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
Di08Xq

diff --git a/upload/style_images/1/p_icq.gif b/upload/style_images/1/p_icq.gif
index fb4765e312fed92f1df3ebcae8f052626753a52a..4dddf72c2f44af002c0b65259921e61d50b98e6e 100644
GIT binary patch
literal 1290
zcmdUu`8V4K0KmU<S4(SbN?-QkYCEe1Wpx!1S6)>Ssrw2c2!eK1vNev73Pp&h7!gD&
zaTX6FOVpL1bCiXdGjWzK%9`%&J$v1MvCj{m-#<TmJmBs&woyjF7r+Mq2+kWpQx}t&
zTVbS$=(1T%^>Sp<bYkrqj<u8i;$Z&w?N#ZKcx``kS0>p%mYvA+=mH3`oWd5~j&HWd
zu&l%ASjJ{>T6KIuH!Pv?b~Mug%^Vc2hLD8cMbuWdzFu72wL>wa`|rIU_O$bt7FKp7
zd$P6dcjEQK4#D#A>BoWb73Y}RpvNuA4H6Gr8+UNQE}F5mCv(I!1r>}FY29JPQ;6JQ
zRM~96Q(+Xb*C(SF*R<2d`;GY1uwxtxp5A2{SUEnsYT;j!-g1yx$&W0ZF%O`oHScZh
z9lPRMZv|6>i6gF9PC@-xboso+J%S5{`G@2%s%+Nx#~}=T1)9LNjbSDi{|rlM^~X}3
z64-W8b&d&aSaNGf{-|v<Be8D7!oO7bMoMWIGK3cd=8yU%R>TuuT8CDL7EkNi;FdNH
zU`bpwO?)S<YiWJoGKhx252QBl4oz)L%xyWxu@dXnQ%VN0ObIgYm1tqR{TDIfaa$UD
z4_zfTx<d*n6j_BlkD|<1w#_&OlOAvm@1`_ii~4QD>36dRv~FT6I8&m<ZM(=ihq%Tl
z%3M~Jz!F*JN8mZdHQC41BlE|Q_%6@yyKPVmM^p`!J6+K->66iSGvvAOjYN9z-aD&b
zw73&Op7bH`ZlM@<v5lT-ohhX}XcA{ow1&X<yJ5MW4?4XvdWG|niTN$})HbKsrnzOQ
zeH<&0z<<a+dekmMWcCyLPO(*s$R7r0m!+zvv1eyz!2chEk4pbV-1y{APXKCXz?B=3
z3<6D%tEO%0&n5^IvUM}zHJ+W!QL;AV!doh*VY~zkD?AaCBOzhe5iOy@F0?3IIcuXD
z{*pCKw~7DDQk+Qpwaz(L9rSnlwf68HifQZVn6Hw3kDXBcbLb_GmcF6uj5+FsU&9bU
z0-XoDf+9S^F*!0mt;ovkzWlg{>89O<5@?Di9|5|7yv+`C8K9uAR`8WhzH^mwIZu(V
zU*)yrObXyR!2guO<|wXo3zA-rfTjedY7k8L1J>CZb$I0N#y6s8kP4fLaFga7i01uJ
zZQu%{PX;)R$&VQcw$Fehxm+|;4^xS#@djN4dI=xiDfhnJks%AqAlC}riKd(6k-T%p
zc!O#s9{+XFkml~%6EM;!BH*MxN1Yz2B~<xZZkVISYczkQ{ST-EagOY7z$adgH7JCz
zuGcGq((7m3E@a>dIS>XOr<kvMq@=223kGi$WjeTgcJ)cOf{L<^mvf;;r$0q#lE+|<
z6<Hn`yJ?{1W&HAc1Lh>HFTts*##U7pL?AtI-5uPP0VOK?IQAnH!5Apn4BNZ6O;6Sz
zhF$*llI*INW({~mj}S;1HzTN+?lST;gDHye8bCph$jzQ@C`pj;8x=ZzU7+XD13s{e
I%1VI!zbUaH{Qv*}

literal 1699
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

diff --git a/upload/style_images/1/p_im.gif b/upload/style_images/1/p_im.gif
index 0d791e9ee5253200c70a3af38b292e93e29d9613..7a0469ef6c93199a9f3cdec967ec3c2528651035 100644
GIT binary patch
literal 1200
zcmZ?wbhEHblw%NO_|CwPJ@0<rqQ?cxo)@otefjpYdr#jzdG+bW{a24(d^~yO$*HT)
zqKamny!^yEW0^zxvefA}tdbV!hfY3u<*9wvimP{?U%U6hyJ%D5q{|5tF5G|i-Z*+@
z)wBa{c`Hs_dOUgMsf^io%;M*nCoPz^_MBD1{3)wWo5s$zOj%@;y2vPUx<&llyHDN*
zSMSd6-;=Z8(fm#47Vo&4v*<}k&eT1p?%QWAcg|nyl(jM_d&=>P_X?N42=6>Oap^H}
zivmOch7*?`r_a1)oxbex%TFQA2VILcgti=Bx9_@D;{3-iKYsf9GoWryXxlM^@Tu4C
zy}Ew?wV-j%q!lOaGnd(<FLBIW?V7XZ)U{_h3m?W!IBya?(=KzFT~tTWikEij%Q9x(
zTDaxXscX-ly!?3S*3)?#&wc#z!!%}=vUf*J&Dz%KTO4v$X3u}%kiBB+nzLrHvnMUy
zYn8S{$+LaK!CQHYpRC<`?dHSRHy^y3vii)1L$}js-S*928qshdw&O%p%aM#(w^FBG
zOP+W!q33M*`j4e+-UV0fY~ArSXU4VA+C3L<J!RKQ`~Uwx!ziFv2q^w!0b8X5B0+hA
zf#W}epooP-!-Rv)9Ku>EE)N_S8@ahW=Xh*fbhL|`O^oZv#>L0`73{^7B0MIXoU9SN
z$|rI~f}(>#@~JtV#c7Jot!yvvoZP(p{5*3`(Ou44UdVDQD_Il>9PFAR>f;_^;AN7r
z&?aK@v&IVtCkV;5^>nOcJQl#t5w$Vu=;3X;^OS6P78VE|n;>f%$D`}{aN63db`8wm
z8xI_qz{b`(cY-0y@eK(F!hU+pJM-Ly$yrq>L+w#xC;OQxs?m3ycYTr572;`}pwQUD
zC>i6i!p!&9s(H6}eDw)P&}d;|mFAJXX|TNf-EH&zB1{MNST<+`^UO4O($=i_GLxt9
z#v_>nzFfX`EWHx`^W4Opb9g!}9G@Q*7Ho?MQMCWJOh(R<<;8t_7B6NKUY~{|qQ)$V
zZp=;r8|T-VuMBXLj^t5T*peU9aFAKtrl5_#bjt?@Hu(nz3tP+;0~~qm|15merL*nD
zqb^;^2?u%2dM2{))IC}8xX<RB#Uw_Dlz@X$5pN1EP83T`IWURosH3AJw`*pAGe0W}
GgEas*@tYg~

literal 1568
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
SE%)4X#|=jvbKHbRKma?VoH`2t

diff --git a/upload/style_images/1/p_move.gif b/upload/style_images/1/p_move.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a1eaa5f3759d5a845171ada6735a823fc45c619
GIT binary patch
literal 1586
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

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_mq_add.gif b/upload/style_images/1/p_mq_add.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d692040d321d18947e420bfb04d3208e938e1416
GIT binary patch
literal 1633
zcmV-n2A=sxNk%w1VMPEH0QUd@Sb)HDsq0#V#BiqPZldF5mDXsQ+H0QQV2sUOh{$7+
z(Jxh#|L&?aU7I#vp3B$gJ7}iD&fvz<<H^+I$<*b^)8x<E>TaXt(cJ6G)#ho1vol+n
zGFg{yjk`HyqCjV+^7Z-U>+?5apgCZju)*5b;Ovs7$S_xxaHZ$*^!QV4m&nrNOLDS%
zn87+=pE_comaWdj(Bf{R<;c_H&DiMV>G4{M%gWa0Xq(*D-s(PRr9fn&z02T6YN%6x
zzfEtYM{ufHgTp#yqc>ihN^q}AZ>>>#yJVKwQF*w#$lPm)wvnaAQF*t+&*4pUvuB#y
zKWe8}gu^;!q+N~8*4^q;e7!+zs#u4{K4+##cC|@#wOx$OKWeB*Z?9pL)mVndT8YU$
zXQg41(`T63c96O>TbWF9v238?V35$`>G71R%Y>W3Uy#yokiJ1|sbG=NqPEjLXQX44
z)J1Kqa;WKSqU1|vl3R$#Q+cjfiO5=p#X4i5Uy#p0Xs1AHs6%h9L~N^+tIS=D%do=R
zVS}|rZ>(>m<veGkZ>8otXQr>f*+6Wn7B_E1Z>?I1$VF_dlBmgDj?K%~=2>~FI$@qe
zZmmUZt5t-<RffhhR*`j&xJGlbJ!htdnz=Dkjyz?eIaY?e$=+m@)jMXQ$J69kg27mb
z$83zbQhT~SXr^(d=x3VRYoFkjuFyJRpS#H2TzsvAn!h?`qfvgnYoFmjX{S<vzGj)(
zI9-}oh{wv-=C;JxP;;m`V4h8Rx53WeR(`%sXOkmKh%QWjIAWk)j?N-Uhg5yLRfEEF
zsOmjooz~v#OL(`?+v`<)vWcU}z0Bc5YNSnhxiVUpHCmY0-|IJEoe(l?bE@lKfwMAL
zlrmVAz|G%utL;m5vr2NXdXBJPj?F=Bt3Ya~JZGg*e!N_Z%Up-Y$J66EVV``N!mYj4
zI%1zhY^GO<$v<nUOnA3BVxL`%%xt0ITZ_vfOOkc0?p1xfcdzkNdbx$T^=z2dz|GzV
zDrW!80RR90A^8LV00000EC2ui07U>5000R804+R_5P_e;g9sBUT*$DYLxm9}JP@d&
zpT&z9Giuz(v7<+iDhBq`N3x{JlPFWFT*;DUKZ5=C$(%{Erp=o;bL!ODuVBA?K!XY$
zO0=laqezkVGuZE*)2B|E6zS2U2otDSvufSSwX4&m{Q3bHOLnZ8dT8sJDa)4ZqcRJI
zbOG>TfeRLO?*iyDWI-8AEL<!YJh(3555U-h?I)nI<HkhlF<?-S$m7e6`@~A~kIE!K
zC;qK?5qfkjO;rA+S(0wWzt^ur!(KAy^5O)zaR))-WJf)J{_5>;f+R@p<KD>pTSq2G
ziXR;Q&2SZc1|<#ul4wZsZ_OGLHU63ZFcCe61`R(@9Z#?rfqVB=(*6#fw#xhadzRJM
z<_Xq6NE`f9!3zOaFv2S-Op^%*DO5mBCKdd%0WJk<qs%ww+=swo3Ut_^5t2;?++>s)
z;o*r5{4+r>$D|laiW7VSBa9=IGQtG^G{6py4d{_#HA*PK%N-{wuvh^|BI(0?z%?11
z4@pMpz&{jlf<`p|s4*o4SZujv7zKnu!9NaQF{T3rObMGB(nMLnVg|$+Cm8YpCm$Gc
z=4pi@|75dBApe{~3<w!;(at|`#FGIC9?;_f2qloiMF#(fV1Nk!WFUeFP=u4G0ZVby
z&jF;8I>r`XXfa<sT70p^7^TMliVPkg{8Pd|B<NrT3IDXfYX^n2@DC3i@X#wf;^^{^
z2M2gyYX=<=VoIzBEY-v{I1r%iwglL)stw$RO8^dy009Fu|AYVoGe8WIE)3%clFBn7
zq^ph&qWp2gKT;4N1#JJ^ut~T}p)-s-10<~Q0A9%F#ljE|fXFK4#9@syt+bJcEu%mn
z1Qe0X!-pS2Kp=}7Z(MN6ArNFSKo$_h48c3OK)jSB;21+k06h0B!x3z-afA##7hQBR
zhCDHaFO|%~$^~*bV$Lln1c1U5@?0?m4ypujff#6<5x^P6L=nXmVq9SKQWnGzOd|Hg
zE%)4X*G+dfD9~~NHg@+u?RVcjVL-z!b_jz>9rz@!_~MK=?)c-7N6z?57&Jpe44r_&
f$VZ%a?m0*gU?93cq%`r%L#U^&`a%&+6c7MAyX-Cl

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_mq_remove.gif b/upload/style_images/1/p_mq_remove.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5cb431cfd2366e77ee337b4fb17062f1db6219b3
GIT binary patch
literal 1578
zcmcJO`!~}I0KmT~ZJu|l^!R~9H|{Mb#@d6i*|5ycF|*9t*qUcsrm%Kz?m6a_ib6=2
zR-q-247p;IF|%RJ)K-y(g-bc<rS5T$d+z-o?&pWkub-bjA;*J}C{7UI0IUOmAwK?9
zQqmh9Z-UF!ve{}D>-y27W{qZuPTw2_+R0?8ukYq+Llqo8VqBCQJEqdl_m7$0YBcj|
z^$i$oVR+b_lA>j?Zllo?(<|ezmX{5N?;k(PQ&MhvdrPs{I|xJ#3iavj+xFz-TPT#`
z!UY|hJyub1C7Lbu_kSgmH3bE!OG|6f=r$7R4jTQ=X#BReR_^I(>g~Ph<5P!5Kc-OR
z6iNq?xHdn(I6PdB#r9IE^#K6`(a|px6T5}Nf$`b<0Ri_g7!8BbjK@#Q<s)Tf4LICW
zD)l}VJICkWBa^2R6P3C-RY^%T0&yFK(!N+)Gn*SiLMAz!79#PUzrTu3|AWUHh>B9=
z=1wOiNl>U~T&^rMROof=f<Hk@APh1XITXeyi}f@oXDTVFi%hP{zSc&g{f<O-l1L5F
z(N9jC=%rA`V`D4f@LLGP5R>^lE>1zGw*?1}mX)1`?ocxrx{8WAKfhT%zdtjxr(gfF
zrDZuStv)=wokTM6cq1oI^7rg3_VH;93L1-vx#;3DC6hhQ$oTWzxhD}34{*3X?VDyM
zQxg?c>gA;=EtN+`z7+`W`T2E6M7&B&?5EN0Adyc5f)OV3s+X4(gX!RK76gLMu&`Vz
zvkrripwW#uTmu%X7<;o~FwFGyyq3#ndAw!<Vd?DIMgpOSLV1~xPzHl_@%h@=*aBDA
z5f-b)&+mPDdV6f_-D1fAjrNdA9WgAZFI~EeM&H6<o;NoSO`0DB1gL1Vp{S_InwmO1
ze#L04@%2@oJlRPmm&0IYK7VL(ezvz)O{eRoR_0Sulnlm7TH0c2Y9F1xnvt<~{=9+D
z@1jzBXtXbRd41ZM1Q2L*a})UgIq-eke~}~q`rju2@FoC9W<kVNiX8CHpP6deU3?zY
z83`$<sT#bp*ZcIey0tdsn)`O)RB&6J=DItzfvG8tM`XX2X{wL6OSM(VwB=_no7tUw
zY>u^K=%f0HT4IUN`vtjb@_u-2=&jI>23jMjE2B}>(P(U8KYe(I16(dYz2BCdS|U6H
zKOAnWLz*pe#Pai#bAOu_c!m_cg^g3#;}7f~6V8dIbgFV&!Oj@Jt4(ne+XW~I;ijoM
zZE;9)yUBT@Gb?%0pYKlB{@P);|325oV$N=Fv7J|Ccvc~2eOrWU&%S*e<y3{o5vho)
zIJKS+b**GxW|@wPSB$@i%;H}8(MW1V#%8wpOeshJim4932GVS;^WBw5NQi!mz{${b
z?aRtY_3E|_cwg4m8J*o$@Sy@W0s&cKZ(Yj3S>-;!in2U*Gl+qX2d9m|cBiXbX1${0
zphTFx{f9lkk+w<#!b<7REqr}&Vy@^1k*nD4(B6416ct(=Sd6pZ(g)cg`h>MU?hjzE
zN*u+iB4ERzuRLnUEEGx?UQ+I#F`XKAoKe?UfgC<N=OYFQlr5kGkR28vPr4p&Ig<qe
zz%!A61vqe29}kc)`XZpf<*xxtu+MT*?VgR|rMjE%`o#!OQEk5ivED?sk_csiRx_hI
zh3)P92y4j!FvLRYn7;YJ%Hq1UED|D0g=!!6d|h5?kxLZT4sOW#BCwkbm*+Ahk>Ndl
z`s~u*`Wq7$0!53ccptcEp~znNtvk}2O$gL>ElC?!yBD*wHHT}}ck`X9{3gLLn@7${
z%gnx3yv=v?scg&ccddZ^Gn1^Z-v*2?>?W<12D=o7an}a-CN{MWW<~0imczT&RL;9a
zB_KChxVIggTqYj0WIlowS<)(HN*|JQP2O&LBnPJ=C7W{HZRp(36GXS>bbV)d`|vm^
z#3SPwCf+%3f1D0x>upSb|Ha6@=<)SM+zq?0q<vV|yq#US6m>}IkOzWjAII**Dz=>+
R#%HdB-meEj$-5wc??0<Y!H@s|

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_msn.gif b/upload/style_images/1/p_msn.gif
index b0aee4cafc3393d733d3553c0f53a07fcbc1a0bb..be5347d0342e66b61f10f462e6013a86944b0291 100644
GIT binary patch
literal 1310
zcmds$`8V4K0KmVlP_<X)ETyh)tz$!5B90~@Ds{d(N}O>eCDbu1s(W#SpxTH#t|TOg
z)KS`@+9h3)P#RaLsswSxrlY*p<~@7epRvympWi<}e6Azi!1ibpKoj^3021kb5T29J
zD2lBVMn0JMF`yhvSqvlcqRXb1*LP9*uV>zGKrze(k<<apOlEFYJ)VrMURd4QOQNr(
zweLu__x29HRI(>3I^LAGkBtd8?PKWt+4W?`W_+UvO`f?NQp=x_pi(J6lLjkT<4|1t
z{=t`_F%f@O!kb>>&8+Po9zo(-?4qdHx}~|LO`G6qCoJP?SREv?X<qz?)ve0Tm-En=
zMvv4d!sRXBjDGgeoNYuStyfUcG%VWq7)cU9qNw+3xYyzsWsDJW8$YH>h)7~<gOh#J
z+Wc{qewm%_X+7TQPp^d6B{YenE9W4w&5#({yOkYdWMTNjN&6@&97{)}cHc~>fMXeB
za~pOcHOQZOQ(CtO4X@NL<Iv=3NE8hcLk}nzxmCoEC=&z~j=0=;Om2R$F8vf-IBFYC
z!BF1&+#iC)QQ?U!99{C_&5Bbr-2uaV&igPlE<zKY;fnhMe|aff-WeQSTHD@-;aI_$
zEJsWWp}KEOxG_4l?3FcO7fx}-G2N0nt$px_M7A@Ecn!mFNo0|kJol6?&&*#Di5<3K
zwH_JIrWe<fN}ro}5O3Ul>WF2$6HC3a`Z4)Et|?s+WmDkDMhLnAQ@hyp+rqqP=Y!-=
zXhPeaM?+UaYE#>`Zx{Am4W&TPO*q=>jr3mU_}05!d+F?5zpMd5{~@kM7;t}RYH?lB
zEbipw1o*#WbR_>@qQzH#eF9KA0WO$gyP;LwJSBBA|9&b=Hpe&)S?}IMA1+ZxsMH^_
znnxcQx)dLPOT-pI7yVeF{3o$v!3vlG3bL0uQ3t*~X#+N|dfNoeQ`Y}Gt(6@tLk4lI
zn>nibo()p0O)FFeq{6mQB2~f+7;czLIvs}Y$|wh&8bk;0tpTc!IE%023qp;FyaFfA
zXTVHT%Yrlr8_zBF(=>Y!q#~C@&?`ObB-N|J$I8|p%+g||B?MI?sDSlXL5bFs5mr+z
zOu}35R*Etq!OZiDRBUlnD6CD<Qr)RjFbNa~k{3&33iUbJz!{V&xE>Ja$thZsvH@!P
zs{JX)K4;iJAEzDJIiEl%!7Dua9?cS<TWw47L6(O)3kx&_z{T{y0cleL$SZftSZaI1
zPk$3A4<83<D;d33jz5>dHTGcR#fA#I2eLXpcv^A4YZl0Ib#$Ssd7!>-j<IFx5;wQ#
zAx9>sD2WK>dRL#jIU;waC6^#a_m4uJuQ^@;bUVOeyao%q3O(gpqxO4+8*s$&rU7uo
zC5?;~Syi<RRhXVZHjw}Q`T8C=9iNu7FhzY=-{E=<$w0Zh{YBVyb3Djwi<+;ssO$+G
z8@g*%kkk~-Np5D_EfwCVZ-MM%l8bJUVa`-*Q@lK<P1b7<4m-^l^mRF-AP+eF3lcUC
Ar2qf`

literal 1721
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
P?|%E8c<{+h0RaFz<)Uwd

diff --git a/upload/style_images/1/p_offline.gif b/upload/style_images/1/p_offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82978f0b8a94a4c7950702138eb28c3724b16ed2
GIT binary patch
literal 815
zcmc(c*-O&_0Dyn$=A2WTI?bdE&1)1AVO9t=C2PwgMg5U)b3|BAA%Y|Y%X>>Jo#|54
zt=ybx9y#?VnrFCnx%+VUeRymp6e>hv|3u%z_xe42cL{f{->AF*!~iY;(A#!&7Oz5Q
zR~eiZmtU!Oa0iCPT8~8M<qmRWh8>~WE!FQB?YnA&bCS-qxc3eAU6W&PQ=rhAJtJSf
zLacEPm8Lbhrw4{b8xo0b+hE(7XHRI1E~!{8(zwL}g;3)j>+Iva>SB$}NJT28&Mw*1
zsPvAmK2~@CFnfGqZi&a9SQKwa#7d(~y2Vr2bk=RbH!*ifG~LhE=pAyU5n7W8q+9FI
zs!;7>jBv*~diz<E5}|T+cA2-tlZn+5kxFfJ@mKg}r*F&b(U{yOr_bovvwIKBF2Bw5
zL#DCVya#fv)#~0KYHZ)Kcm--#2b~H0KN62%|KgWUeDVZ9{2_;hAW-GaEv*zP6@>_?
zj{!SrUGKVkXfX|7asR*|gZW_qYy`_VBcDdcK97J+;QeXt%<LS*1)IT=rR9~?we{tN
zaxjoD;0F=#aS>_o1bi7jA%eic$b=gp+-k!TGEbG>%*Mo>DfMLmK3`6R4Q>uPIwmBR
z#@>!)hXfFbR0=XZso)tg3HCbaIQV&f?i2|?o$fBKs9q&E*2j0GXQE$*Hc>Ili52|n
zWJL1W&@Aj>06q+fx>W#GwmatlTtmit5+jEk3`b&WdYF_&Z1f{o_<lH9HJTswwo1-G
zQV_7Hf{qUlDGC@mITL#FQ{OrFv@NBIF0aJ5VB^<{9v}SLjfBXxl;TJn#kyYD)<(Z#
z%cG@|ka4M(Q*vnQ^xAWW0rn|34?WbHDs9A7$yqEM?)N-D19tTu8eO<ByQhcp{3Kv4
z50$pkfI45a2t_{#&H7F($wdIE(vSIrMK9{GaDI-%GZjdy_4iI*MAzV8Z}L2{Yjv0q
GAp0+V4tW^>

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_online.gif b/upload/style_images/1/p_online.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8fd38ed15a24330e0fdf41b38275d5bbf49d602d
GIT binary patch
literal 1231
zcmZ?wbhEHblw%NO_|Cu((QqKD<w)w(YZ<d{#de%X=sBA_@nZJ8`+18V7q5I>u<ZHi
z>(39JdvNU1<BNA*pTG4=KXkG~`m%zh&x3QP8%0h}oqprf*PqrI%PdnCO<Q|z@977o
zv9rzM=S^OD>gnsxQ&yeMn0@E)`G;q3ys%7|`|-<<BNrYSgioEg^jK!=X4~|o#?dn!
zGL}2!tPHE$ck=R+>KO;8tUj~*#GOeiPEK8O_T-f(C$Bt>Xg?O+efreZXV>q)PMLOX
z&*}RK6EEa+?GP}^am`y}5<N40)@_HBdB-n5x&GjdW6sKmri1JE-`IBK#<jbzp1k^G
zm$}R?W0_mtI;+&hu{~$}s(0ordJ@-n&NgGIXUXQG6)zvZ{Ft-gQDD{1fZ`R(-W^X~
ze)K3@ZxT8oe!_YG+C4s%+w*#N+hr^@kDC+PcFa6!fu2u&c<0H}*PgY_+NtE(e&Fo=
z-6!rkWUp||U2PUOE4^i7^3<zVX^Zm~KRI~re&MngrTsgCE7wh0cEY=2+wsefU31qs
z=dQ90YfGGT*&%beZ~A19{PmrSPt?pj<efH2%sl_X?blU(8)AFUy5_95N?Q^?@q$zC
zDx;|B*6GVqr(J8AebBvhvv1YT^7S7}*Srg^+S$6}YtD>op|yJsoV~}cmG=Mte}+*&
zbO<Q^WC5$y0g<3Q!NBpKL0%{0fWqX1%^bp7XO1j5$kZro;yK4-<D#Qo!faWaj%-|f
zykEgSOKHW+Nhc?31h4X0xpKiWFN5S$b3BWesWs0sczNgK=H=(-nHy&^Ic(8ra7b2Q
z@VuhL#KIxSV9|TwP)2|+<EE^?$?7N7wAI6A+}OhDH+iG_w+!BbsSVNFBLZ@|8kLTz
zd5E0I6PzU8KYKgNIxz{G3RY>M-dzC-51o#xiO){4nD()`pm8;uQTn|NoyRzol{0c4
z-BCQgOlP)L!Nr^hs~WDax6D~J(aE7pYIaKfi;XW&EaMMJ;ND@ipyH#dg-*hb#)C`~
zjb<n8xw+Akv&ZHb`<<A@FB{6=2gK#9xg_9rc$v6_+1Urh$D67=@AKc`dC1Jt^qWJ@
zQ1D6O<aWm-jZL0x2?mo6HpD+@Kj2$6qp*!hK+B+AJlCSIQO5Oyz)4n}BO6bM$h;C*
z$Yj2-utO?TWkC{?5X;9F-j0TV<DzvT3XLqH9*K{;IPZLM;B2sPIyu2bEc3}kmu*iP
zI6MRvu}TK|C_SAL5|;VYgHJ-qi8J#{;0f1+s3{YfQ@BiAI7)PuJago=6%k;t1^|3s
B&aMCe

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_pin.gif b/upload/style_images/1/p_pin.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ddbab07ff105ef6b5bb702bbdc76d4396d866b07
GIT binary patch
literal 1415
zcmeH`=`-620EVNbh#qOtsdhU>uMN7CuBvJ`?z?Ogid7OqG9;lz+n8-d<63Mdhg(*I
zG;&b)*$xSs%PmC4+9u^!M_4M$Y|YroZu@ua`{8}Qy&s;L*Vo_2<p%0D$Q<-H2!ySg
zM;4DIlq%w>Q@T-*RUmC-Zbi4r8yr`QrkCu)=u->p6Z0AvhVArIrDJ6IO)Og~2fn{w
z?V8APj;(>?%TYA>4RoEuz0%ZID`idN*W;M6l<9<WC8}f=Ntp~G_Trd}G>$YPPaK{#
zFf{SOgU}fGu+<I2`jOZjNggU~9Fr-Q$CRs4g(K+FS-+H~=zPiW<RaqdH`_a(afLmK
z_nN3Yk>8_EpJX1P{-bmTDB+Ei@JC@d?wo2}rdSDj+)d}oP?RYzEE`>>yb+#v8^ii8
zDC<son^?Y-SJfMqClZXQ0uyN-*g8-Ae<Of)XAjT(&?jC9&g=!&w6WAlU~N0(>D$Z~
zEw|$99HT1y9yG^hw+BAyig_{qc0_dx`wC8ceG|imp=<7BbovlpOQx4-Y)O3StZa5!
zySw+0vljlWKa$AvOyU9>t$%vEM85Qh(r1sLcoQ1E@r}-?n&tteSPmev`bQMYn4DHj
z<$MsaJ2Z_GjG<Fsi6(zv56c<4_lp!oo$|o*&}9ng%*U=_rE5HMPQ796pMUat3d9lT
zihL;?S2@R2oewO)Rxfzt`M5g3F{12#fh4&`6_qob#$6}WEv2$oB1nSA&D&v5-)1y!
z!ZUkwdv<XZ3c=WWLz_gMP6zrwUkzC8>3^l&m;UkzkdY2#amtUxED@58Ol_hiEhtZY
z<HJUcNM7B$qEk*u3zF9Qci@A;zn=DQV@c`X!g<mD(`N2)R-BCC-_9PZc1e?63!5zA
zyo8a#X9GGoQ}wW5i)#ivF1!IsV?7Dz<jwLUnryBl$mny;F&M~IZ}cH$J61l}%Yq3{
zIvp{C74n(c4LwH|7=I)M&{YFfet<)U0CDsL$<#J{G*`rhBi<ujauc=O+n7rxee?=@
z_5?FbU>U@8IBd>@^JD(m6GG3VW0k45#Jf<tgy;q?t15-08i;3D1~WUjrdLU}vEyze
zGW@v4%VpQiV;62+Q`FMV*dlGIQXo2e!v3Mpf33=oQBsq{rnWyQw~+RL7z%61Nq3*P
zN6ON9l0sp6z!9TCi0&ds{ro`aCnfamj2dZuR2w=3B{Bxd-+;9Sf_%$<h<^4vbI7oX
zC7ZKYc#e<?J|ClgkW-Z0qa<HIF;4g%i{)?-rfjq|K&dQ-S?d`T!vI>4BT)#ovun$@
z3TgWUfJ2LgBB(8*m38-`n}_jbblKV<)u1PIxeC`6xvbv+LJgWR1jhP|)B6t!4mDsY
z2Gs%3Y%i<d%#t{U2QO)|Ym1#VoLUzc>3~(PPvLW8$Y-X=JPuvxS0Aul>wO-Ni{o)!
z&4fap_iCz!-y%Y1CK;WJfaG#JqSW~YXVDaQL*x#afA_EiVq{T!fxpo<>b$<uKIwA?
z9AeVJEHI@zprn@<9<Be`t<JOE>{;yV5LjN3wB#Ir@dVg>^XVB{a9{__@-?Qqu(ta5
Nt@Wv1dU~Ln{{p(*Nyq>I

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_pm.gif b/upload/style_images/1/p_pm.gif
index 0a0ee24960c615559f67142a42e996926d8be254..dd67b33f30e2218f767ee0b938dfd00f56d68b61 100644
GIT binary patch
literal 1222
zcmZ?wbhEHblw%NO_|CwP&~r9*>b2yF7Ymj>k7zg$)p8_b)~(o%6U8fE=Pi1iJ@5YM
z>(39JdvNU1<BNA*pTG4=KXmfR%TG>Td14$r(=ugI&VonQ8OuI?`El*utKi(}lUJUa
zvg)*H>}<36c@F8z-11gr%)WEv!lSb{UYxx0^!okR)7G9#oqofkZ0o73&k`qHwn|%a
z`253!2^XrS9WYN?U=}+&apFb4(ydNeE4_<0<t})5>e};D*Pd-Va^u9M$4_2<%vt!*
zDQ}IEXS;pYian?9KY8`ZA!nsU+#E6Ue50rt*B`vep8vo;Yx%C@cP6bkX_LArre^Ji
zL$_^{7d?6T$ug|XIcueD`qK27x8f$8&s+TD)0dwi_50Fi-L^?zlHb3_EOB0F+p$ky
ze_AEXw}_uRf77{zTP|6rFAHrsJZ1Hn;OgC{uRV)z+#FW7@51fZCebset~nb}w@1&X
z-nD4Myp8AV(wF$APu_6wmQ~UMtK<bn5z`KyyKfpZ%P4Ys(TbOkUw*VqoFCGBFue0*
z#>`tei=O0k?Xb^W=AAZa?cQsyIcwTx?exuG>XfnQz}fqem8)EGRv*9oSU+UK#HGiS
zy*mVqa>^#`I)3>{;qn*j_FcEjTvpY$VeyWu<?BC|u6Y++wX=1{*PI#GLTmRNID3y>
zEA9XP{|uvmh!9Zx$pTiT10q3rf`Q{dgS<}0frQBin>mEF?i^Wgkf~A9!gG$t#zjZF
zB-x4%9oe|}c)x;uk<tmx$tNdk1h4Wrxl&=dw?Xo$IiAI8>dkXZUfwymdHMNy=H`V;
z4pUxCwiHk>=uAAu%wp1X%;KrhVvUOn=5S?PwR+;T+|Qj)G3pAZzpP}g)x(a>q1xA&
z3m)Ej*>dnAE05!z3e_)4?05AFA11Ln%=pmaCn)0j!bI^<l8ToVYf{V%gD}P!hQ%*b
z76u3l>8o_~Eop3N^OG@3J|?xG^fh0+b>PRz=|?(v?Q3doURc@u`dS1phxofi!V`@m
z?>IO%E^=M2t9zuR$S~%Iuk##{jO%_2C-Yi{CX_60|NKz9)nu;ShnwpjJnM2(5IW(%
zU{P?dtjUXVt%)g|OYK!lnp#CZs}=++Wxp{z(8N3^;h<=u&Wi;8ERUoXIfsY?ZG1d@
z1;Ub(KNPStse~PH;tHNJqlweiCDD~tZ36?7ipr#l%gl;<7~52BzP)(d@9^!$Bxa>M
z3>?Z)Ujk1~@-ch)WU{hlK^uo6&!ZLr@zl&fH@*_h3(DFTHeQ&)Zu%v_fx#L8d&1HW

literal 1682
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

diff --git a/upload/style_images/1/p_quote.gif b/upload/style_images/1/p_quote.gif
index fdb0dca00eae11142577f949074dfe694150cb84..1ef40be2aef56a47c75a57d2e9579fcd9249be57 100644
GIT binary patch
literal 1516
zcmd6m_g4}K0Dw8b;B1+CuIxo-Jx{R^DHocirZ`F-;z|=7ponH#YIdCq#U0|pji9&_
zXPK5F4!~3l2bHBM4aX}ryXtlKyx08|_x<qw{QdGdVJ?|l5N!az0loqN(Y*IjoYjcx
zrLgiBp~dsT1v7-)Nk7_1K&HqidB`e^cNSmh9N9Xt@P6#s>hRRE>D98mkIiD4LOlC+
zW^uzTh>a%KN#@>JlIo^ktVgil5R2w4LO7yltKsQg1cua`CbT5fMCJ9n#&k;N-$~}*
zM`ZSjWUJy?g=G-?TtEftYS}sea_6`nTQZNxl!aHmqOw<Tk)^9^+ZRanp{4S->z`>A
zg3GtM@wAcifz_5ows885TTBP`PJipboFldMO8f(acd^HxPqufz-G8!B+&Xzau<}~|
zl>5yt&p-Mn<sU9k8nHK9Mx-l9-%|VQZ3|1Aq|ya*LN(H-#4VERmnCwH;RobQI7YU#
zJ)U1!+F*B1dnFCxX~H<hqm1&taoMU*`lx3j-#UypG5^jipxiF9*`Cs5PieFyR=bl6
zuO#*rHc2kuXmGgEZWq~t^kboe+0vIAep%w+;yD#0wRc4BK;>DHdCsx?Gj2(i#HxV1
z?bO^p*Vqp8z^aAi&9j~ibV#jWYAG?FpHVH0s$C(m<Yd-!V*XT3=Tu11+|KUzn8r1;
zfC{&`F7J%dahbw4lw(8Yd1r}n$pQ<17L}vu7riQJn`(PJXHTh%;wmUruTg%bHbIqo
z7<yR6qGD|upD{Kxxr7eoSdr=y3J0vo_1NS=bST%CKBidPv8T3Jcx7;UWlWyP_jdEn
z?zg~u)3~I;h?*rU5|=;xQp4=J4}FYSFcX;4<(klI9ae7{!tqFWIRAS6q-*B2Y>6w0
zNiKU4#FV*Tua9loIN{2SZ{NPv`Vp7dm;Uezl{JsQJ1{i)8e&M=dkWaw+XMU$IPo3)
zUj_W9e?9?#?g30u(OZCWK^j!e&|kzS3L%GdphZX8IHNgQrj$id2iH*>#65Qu(^)4j
zG{80cV~{$6u&E$PC8movSz#V4$@N0$bk*3VDIas`Zk*xTa<y~+YHgA=cyL{+TzZ;u
z^-|6$`6E2$@IHbN`Jt9(<P9^@fJ04!9H2dv0I5fR>OO>Kgwt|pPKHDoMp7f>#j&G_
zx?)u$uUsLYsA0-;-+)CpLB!1TzZvLNh{1`%c+av*y+Z}saNXltx$IjT`eHp%zO_|W
z#KIMx(vOQF>N#pMG&BjkDCC59#MF44B+I&k&3LbzV~+|5AbAG_bGpqc{*zrNd5?~8
zPlf#|gR$w+;i~K}iXKKOW942&xIYr}ZPsxhMW6)MVjo_@;0Q<?r~zA9Mop2x9a$;E
zsM9RzI83dXAVNhVGE;vSZebma)Je6OsY(Yf4P_f;7qH@&PT}_Fz}J&~PrBD3ej%x~
zc5*}1qJvh!MTp@`YBC2CB@NVlb2-4{A|}VkWX##A2<wHIR2pytxf*J^;p~(KeN=eI
z6Lf3oC7Os@7kw%-1zO@^h<8B&6=e-3_(U>BFL7NgK<Voq$voJ=K;%Jlk+lX8248QK
zeO`-5gQhV7PV7X((X?Y6FpL5~C>U}Td;Jp70d8-$0CmbooIHUFE=qom(voMV7}LR9
zhNSWVKcISBezT|69Z%p;=LCf>*r#K@-?(cQC`|=w?5^Yh$%~w!2g(D)6reHUj`2ee
z|CBb(xic-E+Uc|vC~|i`;?v`=V_Sm#)wA1n2m3z&flz1l&%+Rt*`pv;&{Ztxz>m1p
zvq+cF<q@6RaPIb)Zv5u<IE)V8L87tzkz*rJd*#!T?#-PE#5nx(Q`GdPs!}Zc4OpvP
hu`)Al3;72NQdc)-=%ZCuq|e;U@>CpDmB0Y2e*vOpp$q^3

literal 1784
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
aQ;_0<7|fssH^{*bdhmj#px{^n0suQ0X@j5u

diff --git a/upload/style_images/1/p_report.gif b/upload/style_images/1/p_report.gif
index 1bc46746f5f45404bfd6f4d0072138ba24bdb119..34a76fb58b5b1360a472741e6e4397b62e052ff8 100644
GIT binary patch
literal 1601
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
E4fbyk@&Et;

literal 1758
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
Aod5s;

diff --git a/upload/style_images/1/p_unpin.gif b/upload/style_images/1/p_unpin.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5660d2dd71d373a702247bd0a6e0960a49ae9caa
GIT binary patch
literal 1553
zcmd6m`#%#10KnIXC08CfkGw7CR2~x{+`Ns6@^)nNn#Z>0RX8znUWJ)w5<W9K)?{9J
zB)3UyW0+~?5tHSu!>La9gZte575Dw&`}6mguPe;O(h6w@Py&1f0FqjF0`UwSWdre;
z8(P2$&K-#;<LP)1v81)AN<mERLVW#-v0ph9MKSyN2_&fc<P-Hq48=V3sYO`5NkHZJ
z+=g{Dd30uNcv8gXi?4?_@|JdR%^Oycq^X7Ns<z4UR!#+V{7%UvlE`QA*Vwb-N*Wj4
z_#vuV2t~INTiEQ`kF1$BZ1F1}Om)Tc2~^Ge;pby(M1$MC9ybil2~9aT`pY-tRX{$A
z^pcOGY$6EL{+UD8QKY$*owDXp@zx=_sE^KEAW~R1D6)9#fFoG<y5H-UJK~w#H8TCd
z2hS9W_PD}L!Sc3sc;n5KZg^tHo2k{<y7$hQ=MGp}aN$H)>6A?r35ILOHhr{4HlUs?
za0DAj0?#Y0KkV@YG`=Oiakc$-VQ>)#S;jMhXL+K^nUgDixo@yd;=`k3XDp4uU5Ts`
zSo!A_Hn9fT%RXr@!pf#!jtJ*OyXhtL8z_ofLVHBzyYH{xb;MBblGklxns27`#MCZA
z<60oWH35ZeXk<MsxeK1w8<a*J9AAme@3xL;^vxQ=G_DSeE&1h*I>xm+V`vu0dN~MM
z&!fOMhv}Ns5%Y8@zCq-X`qJycpbPeecTx)^uqv@-%ML|$h#>_PjNKy)h_?^1<d3M_
zj=b9b_=XQ-{Izkxy2YK^F}_$AmOs6?V~3)ImT(==R7BadZ3M|9nusQeIq%kueF>q(
zT<3&#*W^wI4Am7!^-S-FW10{|o@+{XSaz33VrL5N)BW}XpY;A;`#z&<1bz<&8Qf)Q
z!|0O<z{$x8;D3+KvE+Y^SN`?CPXItC09)TaJhO)R5Ts}r!lEM`Wt9y<$q6*l+ea#9
zaZ9X@CTC@d((f+9I?3#E10QM#>`;XnF%r(HgLP53Pc4%;HvaoH^akid84dUD7G4vy
zRMp0x*2@3QyUG2Tdk@v8d9>uTkYmm$Hn=wI($6zz7^}*vNyadsQj6U-LJM4X;VFs0
zOyNM!bAO}K&cIS76?h+@LZU$4@y8I+nMaWqWW3!*!xKA0eKVowBK3kGE_wO^Uu+Ed
zVy#jYX?@0kc{W&Dn`K8BG0(mVCfaK6YpWJ65B19O-Y=dpxOg-D<V#4T_a8dGXlYI8
z>u-2HX+rEzxRG!8A5@7}Cn_TCpu9t8qRwrdp$w_u)%UNwD5OCdi)D$6!YM6y)$U@{
zDXA<e#4QJif{M01<kA%oP%Z(F7v)?^1?HZ=V7=)GsRc^_H6_*L0)b%S=3C{0*nHXW
zu+&?+moJ0O?175lE{9^BT*8D3M6fxpW<Q%60nw4{&@0QWa0^GsT$>jwjj<>s^jOF$
z`KlGzM?%#cT>emsJ?QNyTOSLE))<1$oT=%;9|H~Z!HS%-)t2+*+ZgpOM*T0t^bu3T
zxcd_dCi_;fvuqGAM~>Y+Z4c2$AahU}HgQh6MHR@cCjDI<=_mS|!yEPPFnQP|5V>~y
zf*ZilK*6WwQxQNGpTTf~z!~y+r`Z`$m{DXfBVO6>N)CfQnCT5N(mE<Cq=5{gid1tz
zh`pY05n$8QvLK<Yht#d$a$f#O#JT+1i2yY24U}WbnmIw8)C8j*PD<PBrmkAs0|#vY
z_h;exhIIhMJ~KEl;jvP%`mTv|$n0SuC<})h1{v%l3qiVdxZ!hpEy(>bJzTb_w0fg9
zP)6NS7JpmQAYoL4F^e`cv92J!;o5xN{c{TX_XJ<cb6WlpxR|9dF$2H8cf|L0y_zy>
pgrU1Dx)TobG&NK9KF?|S(V0SEv+ilNbIomE7C`pkTTsA_e*nY1qeB1y

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/p_up.gif b/upload/style_images/1/p_up.gif
index 9b6e7df7f2595cb8fa8ade82ae9d7773b87ff9b2..ed9217faec33e26984e678460eae06590b3cc879 100644
GIT binary patch
delta 1235
zcmV;^1T6cQ3Hl0uM@dFFIbkvY6#(}D0Q1m0c9+YAuHuKW<#?LTf~($ur`vj+(M@lt
zf27!apw(D+sm<8v^Xa<D)#b+0<IvmcTYIk2-0REM=VXMpTz#*iw9(4d<$R;q%hl$~
z*5+Y_w_${~U4F51iL76Ov~7*Rf2Z4Oki%evwtb`6>F)J^wZz+frrXEU<cG25eWlsn
z=I@8G=X|5r)!*!Di@kZA(ahNAbD7L|pVN4p&uWUjcAU_EsNL%C^@X6ufvVn-smy7I
zx^<Sy&e`d6l*fgy<ZzM2cbUy?ki>A3#?090XN9-S*XPI5<d>_=agxM>tKeRNven({
zSa_>pfw5zMg|}XNtY?R|h_mQwjlY?$&9=qcUVgFQ=kaNZxnzQ|qqfpvgtvsQ;$DHX
zV1u-1jJ}Gr>Wa1Mg|X&#p3;P^;b4KXWQDl6#@%Cquw;n3bezx7+v|;^#$tiAPHv!M
zgtu>wz<ry;V1TlAn9FB~x53Ted!f~5iM(iyzF&WTvBlEjZiK0!v(Imj!{6rbbehdq
zaGJQt-iNT{#L?oJtHyVdx@(ZaWQDhAiMv^KrFWapd7sl~ioIlpxXRV$f2G-4daTyp
z?9JHcz|7!%qScP2$60u&e4^H3gttXtj$e46Xo$ODf3l^y)pC=?kfOh3iMxZF!HBcx
zd7RH(V1cu&z13ZQuwa9=WQVy=Z=t=)-F249qqo$z#@ua?!EJ=7KwXS?oX>%%+=Z>-
zWrw+UoY11R(s`lOi?-{CwCMBp`i{Eqbd|`Axb1V3#)YZdn8EVI(cwB*hm&yvoRfe8
z7?TYH4SzBK6#xJT{{SH{aPUBw!Gj1BDqP4=;R6Q@1bP@ov7*I`7&B_zILyPqVZlO*
z97(dI$&)C94I?-Vn9G+iW6GRKvnH@%1&96G$+M@=pFo2O{WZ+suwF=$CRGwgiPEP~
zqe@j;RM@ZpShHgNVPu$*A6l`3=(M10SqgsKEPsf=iB%8^Wg}1s5;j29VFdE(CD4P%
zum;0;^w>+F)P-G$5j!zNY1fKAXDFCJyuw5pI)v{Y*vwf-jlTc@*AT+_K%yiT{_L_~
zK}(4yZS3qyGUu=;Q>$N;K5$ooZ{ILLfCdnH7zh}@13bBuVONAGw{}@l6sbgpE6pQB
z*nefE)^Fc;6Nvv8Ph&Xo;xxurB4tLyt_p};z5k@geFghfc5QhvUi@7H00Kw?5eOh~
zUV%iA5FmhXOt4D_c%bnhB$+tafrE%mAjKjJ8gN$uAch#i5C#&5zz`vX7-A|%?Bc~C
zt?ZJ63?Ja&0uwFfP{%1$q^M$1gbX9Vkbgu9U_*%jAYen0M1~T>E+5>Hg^fE1vdaz}
zJo&*ZvdlsYlSLsB%Mt^WY32+_A~1uQY&KHFE+doyh8&XYf`ungsPX0q0t~{YnMGX?
z2pPH*YUl|CCVGOQi~_>J1|p22LmppjfQloy$ndBLjCNYoB%r(@MlPh1%EAp8q-1&n
z3#GQ2f(k7FSCLB?U0`AhBRWj+YOJmHS`-8*@WF*I#1?DpvB)N?tg<*s;KM4gsItZw
xyi{xLwb*8>?Y7viBmo;fpisyrns8+9xf*#S!MXxHg2WyT#VapE4@DFZ06XJQjj;d#

delta 1038
zcmV+p1o8X&3YZChM@dFFIbj(96#(}D0MXp*L1(o8|Nq9(-?F>N$I{@>+33pD<G#q&
z%-7|d)8>P+*R#CIccIUAqSDRS=7qG^a+=D9w%3x#@<M5~aGJ`DzUF9+z-f-al*;mu
z#_X2N@{`E#d#2O3z|Nl2=8M1UZkEYRaJZY&=D5MmZ<on`Lus{-!s%<7#%7DaZ<@=u
z#oL9q<AANzb)3m_oz8Qf&TgN^e5liHoW+v4*d$MLd#cmC%HOlS%80w^f2`Ppve-y#
zvu&5hcc{=US9yJ`*MhU$ahu7RzTuhD=HBJ(b)m=f_xpXW+GUHjWQ@OtwAD#$vu>8f
zo73iToz9Mb!|#5j(Ui#H@AUa=l)rwi)sw>LiMirxk+^xL)_bbig}3E>tJ>u0?})qS
zXq3lKa=D4H*S*W&d6L0ukH8{Lba<l5d8gNcu-j&gz$Q&{f2`Mpoy>Nf%Zk3{gtXdP
zfW4H=@`}Ied7#RMyX0zvv45}GaG}bDx#dZ1wS}~Q-dBCRBTsUFtI?3e=yIgWfUneQ
zkiXvN@SCT+z|Q4*s@Hm`(~`K{gPhBOn#w(Dkc+n0JZg?DS9giJ-NMl2aGlKP?eZ5s
zW01z+P;<G0vD<^G(RZWIYLUU2r@Vo(;bfG(lFIUrzU6eE%wv$ph`r=yki~MJ&W^(A
zZkWh_bDqzV#_W~K?}xYGlE>?7nahZ~=yaXO>G1b~vDc2p?_!O{ey!GQpT<aapk|H0
zxWdmzbDy-s+IyzWioWQO$ntfl&~TNz;py{?!Rvsh(uJPQVUfFcp3G^2v4*zVaGAr8
z!|O|KwRVueQ+=X%qtE~V00000000000001!ZUT~%4Fe5-82}Xk00{p80SFvOu%N+%
z2oov<@CX>C01zWa1cOM70fdB1sF3pEgMyDvMvNdbNfm_^4-T?{Lt_pZ3>Yq4pp_y;
z8W)T9j45!jpol=0A_%P@tPQCWB|?OVq9hN31O@{XQ`VsBuU>+v^e6@6#S=^cNF0dD
zN=AncVOj})5KtsZ1qX1O1i(=ssu>+?4oz9RwhI<WS<VOvKwv;rTxf<I;mbD?FHu@N
z5jI>fKp#DoW+Y=Qsf;ZYTrN$H+TseTSVkDDnT4W|CPSku@33IOO((`bg0aA}1xRdy
z0f?PAG0F<#Mw`6kSY_w;zyOX+Y0zNokD?lU7~PS70|G=4=K@8%b@6kG0|!t(V#wM>
z=M|J(NO&-)TQE_mC8;)Sh?5}$rwJ42;!72<)ZxKc1>Io67l2400R#{(AfYQZd_ut>
zPZ?yuEyx@r(T7Y7lSwT+9rQo}2#~-40W7vi00SN%P(Vru8IZsM1q`6$jsp~MKmt7h
I5D)+XJE2S_Qvd(}

diff --git a/upload/style_images/1/p_www.gif b/upload/style_images/1/p_www.gif
index 50e53a1e65b431647454c0df3c6bc358229902fe..9742933aa1880c43e08b32a7c2eb1ea0910269b0 100644
GIT binary patch
literal 1523
zcmd6m`9Bj10Kg}DVd|sjczj56^@JoV49OMGRgRQnGS}vqyI4{!a<;<e8nQ7KYs@GO
zQ=4<M&3#5~m|VSH8{X6B^WMk%^!|$X{o(ub_m{7myQ?)M{4zid@D~6Oh-M`=tR<5-
zf}aegwd};#2}27wFpMCk`a^X2Tx99w;aAG&>}LlAnK!>tM&S)lt--Lf{bM5A81nf5
z+~o33IaM(JVLS8z4cp9xL^X)FBo{;Q;iZ!{aFRt(<=U2HLG(L!T5JO&NcX?T6GWlU
z1e~cgn{Wb_%#rRL;95rW2t${k)t;#x&PlCTkyQVL%9xtvyTy##&&RH1_6Fq)K=U~$
z9MktfUmQUgU(n@)erE-%vyW@eseT_-vB2bh@=T>8sutn+rPP;OlD&fn+>CQ_TT(Ie
zMpkbx=c83<jaMc^u&^1P+Z9zli^Oz8vs#0Tc)^9--;!EgV#r~SJE_cB@wU_s(bU>E
zdj;Nf^U-^Ic;l70m(soOv9%weMZ9G4W*CM)FWm7?YI2RI*hiB*GTsn6#_pB9qp=p}
zg<l3IRtLsc`uHnMp3n!y@J@f@k<{v!(K`2O8ytf7z4x}XX&Cx!%rd0P4&Inv(gT6L
zaE@<rOQSm@DS34R0eQooa4a~u%I|(pOwAJM?F_PraT(EsY!Jh%7T9A#SjmJff~;<p
z6r2BA&pqEU;Z=0SoU#QH5?P;D-R%_Dd@bdrWmsL<GeHV@6H&F0+PsA%u5=A9SOizX
zo{z)vi}tbPEPVg^_O9=vKHl7C$jv-kc;l`7VU|FcNLrs*+PPK8jVB1rydL>KW@SEa
zADI^Sa+bL>;<k75`kn<o51Dq6^&``3LH8)vQE$BwI9oW$F@b`pUMeJUJkvXMJ+XJG
zUo&WufCo(f%<f#qKC)_#CHQpA7=FkH93CD5{(tCxm-{cu^oM^u0gyigoVP}U!tv}J
zc@<+Qr(M@sL0MZK!=^S2J=FlmEpzCRLmIMpLoN4?MlR0Cp8|zoH67uj5u>&4on%3c
zb=q*$%@WNHf<untDUa99lcXzn&8T#0%QP9aIl<n2O__Za*clwqgV99OU@}H@Crp)^
zVfaA5h$Z7HtEdlUzA(uL=Kf^nnoNxUg?3vbw%bC>fstGZ9#l64rIS5ZM$S2)W7xb!
z1yykEKgks%Ky?Jzrxrl(-rblWh1ltU7SQqYmK1};Ib@2O7A<Utvi`;SG@{Sn8ocIp
zT*Y?GFDtn#myseK#gn)R4&NT{97~kPd-qyi(6wq0I~*xv2Q?~b)kgnJ*DX7FGNU#j
zP;V$G&*_h~aT;Nz_&_%MEC{5TmOTF=BdtW2i0=C$!hpJ{BK`^E<qkJxW0;7q7%dVh
z{qzvltedYB0pnyJQLJDUMQEUi84*;*>X~ZmT?h5TC<z*DN~G%p6R6?(8kgmyktNQ5
zf{HLEig_%YkJxAKsi3S}R`t3)w?I$HT;z2s^dZDcb<CVKtQI{i89EzPU3f+|E*-m$
z^Pu;8$)MEDU5*b<SVos$QYuB%p+T!k3KfAO%vp+c1G`?`ZX0tn)<<fjP<q5|i-<Db
zcQv$-1H}RS_kx;Q2E8t9Q##64m9!h>Cw8}i?FY))VE34m9hDnd5hiUtHUm492IDuL
zrZjmX6_80RqUi8k?{f@P{>B2$Rld=S0Cp&IHqaaO^vQ|kOkf*B>}rDcYv$_}{wg;J
zbP3v<0=h5{hI#Jh7qxx+jm~IKD$2;*fn_Th-f?i&xT=ga?^guZCNVuiMS16oRY?*J
z7Z;Ia#066?;TTjRrCcKd-~Z?}w3ED9j%fs+e{mkUE3n?6g2&7PL`5ozP^_YXj#|Rr
c<Y|Zxd+Nxf)K&k))pPqZ#~clO9RRlf0$lU8(EtDd

literal 1840
zcmV-02haFNNk%w1VLSj80QUd@Ws%GXO|e#exl?hO#?jw|z2ni`>$A-2i=w>c?e}+~
z$dt|H#L(P^snN2#$QW(Rtz;1UnHr<i_gH$Q%GBe!*Z6al!fcq$ZlT?Tx$368*NnyF
zX_U%@yYYmx*Z!|a<mTz9xy?>;xTeJCh@-@Ov+(ir^=h2j&a97imAS*)_W!n5w6d@N
z|Nrdw|ADsRVvWj#wA-%b{ngI7kakU7iNt1ws+Xs}U53MPq18NSp=y%G|FKMHk-F36
z_=~>gJ!_h%)aQ4r<s?US-0S*trQFTf<$bc-+2ZSaqtWv9`E;r1W{}4Gt3UGl|3PQ8
z`}_O$u2*`m=9SFxO?t0Zhrf}=>v^iyVu-%a+2|-!ihi`}V2Q<YrR18@=5(dioV(p|
zp3#oN>Hm}pWR1mIjlP+**3{_xgPhFvi~u24ns}_;b*R>nvDDt?@;hmk^wPL(pVp4M
z>~W>m&D7nVu*mb<%XO;SM0BRe-}s!w@Gn}8xWUe8p4M4_x=VATgPgh6;_+XR%1Lds
zq{;EZ<NuS$?_PwxeW}t(b+AEgp|-@^ey-S8gu^ysnOK3nV1~VZvgXX;_;``6fVc5_
ztI}eO#Y}>$f3@Ldn9=3ZxM-NwLuj?r+vWZJ{d%m@G+>qa|NlmMrfHkZNqDHEzvgC@
z(IZZQf3@angRwhbhh2iazR1@9rZL0L+lRjJ|EV~YtjAk{yLzzTzm9^@-R*0i&e_`H
z;<bA^XqxZIuzs`QT$8`|`1iz$J;TAwtbc1zgtC*o?pBMpR*1R(o*yNB*O|=nX_wZC
zvdXZ>-^`0tc(3k{$mDOO;k32IvAV~-%ix->!~dZsh`8X0!Q<V^#BZY0|G8muqt?=Q
zDMWLtajL$NzxR^J-(il*<*0A<tz`*YzQNDrHfWTT)c-eRm5O;{czJxdpo)8})&Ie8
zfUniJ!qEBT(Qu5g(A?_JzNnJ9*kqW;l*aLv%J^xSz>%lK_wntSugqD8xIl59V2{Fx
zw(5Ja<!PJMA^8LV00000EC2ui06YK{000R801XHnI8f6JI$2Oah{A#bJc1A-N}Ncs
zqNWe6n&9#U;RCvMMk<ONS#ca15l=X!`v9v|v0`J=L>Tg<rp=o;bL!mrL<E{>Sq6^d
zbitdK89Z3Fnie4q9B?$ad0RlWD%ECKvu@bRwVGG21;UCQJL?;#MIjBKktI(-JZvj?
zG=T-vPACv4XiR{Fr7xtve-8;3ylR!K!-xGSUM!%o<Hr2hh_FB)sE8g7SgczSw@Irs
zx<a{daZ4KwEIU%GX2QBPnb)r^$(GHfHkTT>ap>O7LBJqZA)i=K01R$ix^{ZGNI>Mw
zuVv?YT$oOMI*04nu>;u79RQ5);KRfJkoANQ1p`kMAhJO#3J)G*;DmC*+=rw>&mauo
z5N1S+222Fff&~G(Va9)!2)ILnZZ!Bv7%kNDND?iW(a1Ld;P8Y41fZt?BMJoJKsXV&
zgO3v~5aB}wBUE69Dt~a01BJ0rp@a#52+%@4f3#4e5=sC<#g6y1pvZwrfTDqsiF{*9
z4I6g&L=udA5rhnNSd%~~XOyCX1P?qwNE<-tb3qPaAmNG)P=s(p3Q$a74iW^|(1M#O
zv@pR0Exe<_k^_u`gcgaIg3LEjqK8NfNn9yGIn5apKq-WXBaR*o08z#$VdS7eFMtq$
zfDy5Pum=@O0zv@-oy3yB9*QLYPzMDhbdrJ+_v}%{2`2!M=o9QvLrpR=NN~&<k~}b}
z9+nEzz#GJHnoR>H&>_tPP%sdJIc2cZLML_bNk9moRG|z7dTKyG3j^pN2nHCK@~a0w
z{BT4M63~-}4}=_0fgIul&<!F$M0?E~*C5f$BtSsni4BTeP(%VPOp;3rE!Y5rDPXi<
z!YL%Q0KzF$oX|xVoBSGs7-IYYVm&I@r$Pn&1fa$nZ{SgeEpyzlhBCdVLJB-B3_(Q^
zQXJ5NDtHiWG`vc<a*72l+@M7bCwFneuhdxKwHWsnk_Q+myg?2S`-l?ErajLR$rq#m
z!OtlByfIHCTg*X9E@fo@qKG+y2qA<ZxhNt?6^?B4&k~Hsk*EkOPhp55R=i-(C8At%
z$uMQ`GLJ26tT78JsAPZ&8`q4Eus<14vPBVn2q8rr{|He+2}}Ib#}dwDa>5eKFtfx7
zgK(%86CPMG#qx&Od&CQvM32cXFT9Y!^{-^F{q`Mn?>!~phfm4v<lip*KaHefo&nKt
z!T~!T#4msR?6C96CzVu!zdGt%(f<_y3?Lf@_=N&~AsYzHMh+Ipz&JS2fthFoCvE^7
z17u+l78nFiHpsya>SPe9xIsHABM>7HfE9djfC^X0LI*&jg)oev3}>i9KCprSX%R>k
ej6eYb`0$5745APXhe*UC0+9kn2#Ns$0suPz>8ij0

diff --git a/upload/style_images/1/p_yim.gif b/upload/style_images/1/p_yim.gif
index bc2cff841b9ac4aacd54b55ebddf5994e04edeb7..fa32751630d358800081918e5a2b4474d6f69e03 100644
GIT binary patch
literal 1271
zcmZ?wbhEHbRAvxm_|CwPG3!?9)N6T*9v3Woo;~k=^2Cc#Ek|NIP9*f4EnfLLqT#^3
zr|&M`es<&jt0%8MIixSs51stz#m7@upIK)tJ9+uZ$tzDzTzYJtv>>WzmSxJK)af@8
zCtXgMaKS2J{>dv(PhER9ZS6V7+|^b|3ru5YPg!-^Ie+csm8Y!ImVEs3!zO)+S^T{F
z&)yqH&wTRoW7V_+SMNN}S@3AxzU$ZSy~vn-$Gd2gTi%Mi#ZOLMdv2e#BDCf3{7vWP
zZ9F$|=`p*gj-c!*KDmpt=H3ga+vAWj&(ObN&7P}MR-egP_;ACa+a3k$3zxs}uiEKa
zwBh*0dyij!v`t^8<k=oju_Jxf?Wt?dPFiu&K7FY}&dN)-p4z7^z4_pkY0Rvf4_^x!
z=O}x37)4IMcJEd4<V$P!UQ6shAKrO#!@*mAh07nm{A3n8+ah6}L-q>m#Ce~-{`4r@
z8d$PAzkg3?+p*a0(-!e_gR6IEcWg_WaiewmmW5j`?KyQnedev0nzi<s%j~n3Tc<C}
zn0d=Od4X-lvg`L>7p-_1(R66>j;kioGw(im>y)+f#O24Wa}PyUu3EeIs&D?%%+}2Y
z;Zr|-`C%G0!!>8kq-7^Unh##T|0Zt2dArPIlNRr_NnMmZ|AAS|EYs*2?)hs%a;Az~
z6yz*=QojCU>6&-JRXbaEe9f70Ewpye#amC=wbK6o|IaWAU?HIRlLgGw0g<3Q!NBpK
zL0Ko`K*N-S%^bp7Atx3bWNMV~@|@$banaFkVM87r(N&9&_bWJeeTnEw&<xZFUKMk4
zQ|hT8R`14Ho|~7Qoo$gh%_t&k%K7;Y&0Mm-iq%&JaZS=%dXe!EvqtzFv)T^~hZeXO
zt}0uw&}8MsAhttYqKOBu@N2pFC~BSVXkV!o$@SJC)v@KqhIsxLce_(2YI-;Ys1&7~
z2oaan@X<87d}xZeMfKM@SBITN3w%VPWQ<(dgjs`iG-~EG9T$<fFjcc&_rR`F3Ev_g
z)2@lj{8@vQwO;fkKI-SZvo^Ax*I`dZgL%5j%%sIfI@yD@Y$_BU9`KVDy3ou1gKNR=
za)#nR9#;%XA9DA76j$*mNc8IMR(i6Z`9|hak;dOY-naiq&|;qO_wP(2H{NAm)LS)8
zKTN#ur=Mfk%pl;V;lOD=qv%kJ=)43jj%hNA9&!pZE*(=5de?GPAc<$eqb}wr6ArOt
zZ~37lCHz2uMYYN$=qQV~#KA{?Ef+qrC~%5oF5#6fU~p#gC|YokO)93yUBn>cz(F2Q
ziJ1rd1W#-@DL21G^Vy7)X_?Q|4J<b>3ELGsbW@*qMDzKal53vno_td_Ht|gTa)8sV
afoau5<`%9cN4Z&bm%MP|wG|Oyum%9BNb*zw

literal 1754
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

diff --git a/upload/style_images/1/pages_icon.gif b/upload/style_images/1/pages_icon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1cc22e26740aac6c49f53cbb80506abbe7948348
GIT binary patch
literal 94
zcmZ?wbhEHb<YwSzSj58c`op)?>$et_R(|^W^Z)<<3^1VhlZBCifrUW_Bmh#&z^v?{
pb!UxBkEiR7Nq*c8*XAtGb^IQ>)S^v2)5`Z&DPzf9^C=7r)&Sf-AAA4+

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/pip.gif b/upload/style_images/1/pip.gif
index 28929f73311c538a8be99cfdf7c2d2b404d079a0..ef30d94c36a5670559f5890603f8a5e0534b7719 100644
GIT binary patch
literal 125
zcmZ?wbhEHb<YwSv*v!Ci|JnPjId_9Acce_d64!OAb;s9$(k++ozI^iP)43bZ*tOCa
zP=Vr47O;R0hy<Czz@jBE$K^HSixp?TJ9aAdESc2cwQ!x9*Pa4tz7kz+$94DJ-fy49
N_gr~pgn=M~H2{XOEiM26

literal 125
zcmV-@0D}KVNk%w1VF~~V0J9GOL1(mXr`CA4?ro;vh0N$+lF)On=w_VQgq_ZBs@7nV
z%5bdTT8YDEoYHKh+4c4HA^8LW000jFEC2ui015yJ000Ck5P?YndLWU#6TnO%ip&Qn
fN17^TGrVtOI!0YP<|6F-Vg|rq;3KI_E)f7boe?wP

diff --git a/upload/style_images/1/post_snapback.gif b/upload/style_images/1/post_snapback.gif
new file mode 100644
index 0000000000000000000000000000000000000000..51235794407a55cce02b864f1ce6f72927dc3c2b
GIT binary patch
literal 61
zcmZ?wbhEHb<YM4rXkcLY^8D3|q*TS9EDRu^10p~&3``<D{fwux*Cf;kseD~G_u|)m
Lre~*$FjxZs^t2L>

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/profile_aim.gif b/upload/style_images/1/profile_aim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d03530336caee42fedb61b2d09159b50b9a8f38
GIT binary patch
literal 163
zcmZ?wbhEHb6ky<E*v!MQzn&pLp5gy`g$W4^3JMDH^78j5FckPR@bmKr7%=?b@6Uh=
z6o0ZXGBEHk=zxSlW-zb>OgO1|-Lm6V))b@DZn}5HyFwqSvRVmx7wzh1VmWA(?fO!4
z_r&K#84I(vF&u2Q_#@K!lx<-XQ<ybNqQRAwESo$Za-B2a;B-C^b8v$scZ(qtgEatR
C<uES*

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/profile_icq.gif b/upload/style_images/1/profile_icq.gif
new file mode 100644
index 0000000000000000000000000000000000000000..781d3d0e952eb51d9d12be484ca42d34a00bb4b3
GIT binary patch
literal 163
zcmZ?wbhEHb6ky<E*v!wsFpYs>Cj&zR10NsXojVK-4GhJ_3=9E40R{#j;||0B{|x_u
zY!GHRdGe&<PZmZ727U$|5Fca)153aM&zCZ5jlC~q{hp>KJNL6@Vwj~v(zJ61Ghc9p
zIGWcR++)#fU%e?pBy5IcbEAR|k5i+<jueG>-Ycn3ckOLhHQhPT`<%#v7QZhN&0%kH
IZI~FW0pK|`M*si-

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/profile_item.gif b/upload/style_images/1/profile_item.gif
new file mode 100644
index 0000000000000000000000000000000000000000..165b59d42c6ab0013628749e5bbaf0012a546f7c
GIT binary patch
literal 1134
zcmV-!1d;nkNk%w1VGjTm0Qdg@|NfY<|EyYU_3P^CqR;>C(vJWC`Ip1~le+!;?4{NJ
z*8274MMiqAoQ3=IgQwH~`1a#WOzlcq<Nx{L$oj(_cpHnX|59Pvh{@${di!GCW4yV#
zaE|@K%fh?A-2e8}Tf9{{usx0VkoV$)WpvelgL`}FjjzD4K16bRqtjc%Rz0>n|NsB|
z>9gDA|A)t8h_UjU`JrXuWS;+<@4{<BQMpfH@bcq@u-kV}$WVi@-mK#JV{T$*fcF3O
z(LzT2UuKiup(Bo~^X={HL_TQn)Ja@%`+A=5wEe$|@0z0jpQ_w=#{br?{;}}AFIBHl
z_2rU=@r=%@P}i|bU1W1hcTD;B?f3MD$jjaO`uadt`H9(t_vN{kzW>LuexuO;Qm|5q
z;*9z7f5!gGQey9MmbG2WT+WUil=hiNRHNj=X@bGg!2h&`yX{M0_D^K=^xI$c;dZsx
ze9X($fUSHks4cFSchu6>s^I^OiHTxqWc>aAoX7v8x}nnl)z#S9>gv<Kw1i@nVuhyj
zkg4))YKe}c_Wtq9<+@<r>ZWYobNAeM@y$zxlE7$ZbZc~Hd71Ql;C-dv`KsIYQfJ9u
za@N4c;Md*wpv`qjgGNP>L{yznum7v>`|kVt@T$1=NWD#p(X3>D<n8bE)c@by_uq}1
z+d{NG)uv9|u~0XiFcqN`S$=p?YEe^lT9>ao`}pg>$dEO(H9tc4`rL<$p7CALU!UFo
z`0j{~)tDlsB#PptYinzny#G2s@HjmGq0;$oiRY%({hYGvfbNG`)lvWVa{cPTC3_vF
zwcpDB%v)&XdW*DPb?jTqRoa~n#)%Vd=56J?Z5EytNmB7lU!s1FeMrJaWZ7<%xc;5@
ztN-z3j=JY-Y^GynrOcomjkN#&>Z<nNS2BVv^yY#3;(o&VyC0h%c#Qp1XVqwZ`Tzfm
zDXS@8YPer)zwz3oubX^@r~iPY{T+Q5i;0iAy4azt%!91H>fosV|NWW6{%L~xkE{Qs
zy`=v0hX4QnA^8LW00930EC2ui01p5a000R80RIUb_|L$C5#?w>FhG!?j{@WX+$iut
zU_Mw0pd|2g2$6$zVx%1tIN@C!e~a*iLseuOBPm=29#eA#04^GdVx0*BEf64qEvASw
z1}D`LMVRE^h?J|;KPz6IIr;YLg*GOn6tLM6W{-<x@a#0W7mCvuKMIhbF>`5Hms@xq
z^jfpa90g^>G^qF_gn*<SlL)lI(1cTfXgNR-8ie4BFklB@aEmcRiHuWE3<ZOvkIw;l
zM|32KBBGe8O|{ZB%Z32lK2a%5fU@Om934|NB=EBkPXMJd*koM;BdC+TG#AkI;IOP3
zs~qfBXzIseRHI56$fzU1%vA_obu#r!5$M645jO(bS+aI+)wC)n1lIHRMvIMZb4nna
zSD{r0fmi@R%?}Y2a>oXb@SsN?0|@j76|?-}iz5v-B+wAN5WxTn^kiY-KLG&%J28ce
AaR2}S

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/profile_msn.gif b/upload/style_images/1/profile_msn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0adc984a9e97ff252a9f1b3c8c9c9ebb60421b25
GIT binary patch
literal 1028
zcmd_p|4)($9Ki91jTUF$ysXs^{h;2~yxncrvRX}R<|wT>&*j|~w`QnRWHqzIbZO*O
z<}^@AdO|W$G*Q$L#<xs)1Pq1zf{+1~0cJkJk)j+)g`Zo0$G!i9*AMTMV@LNN$c{ud
zA)h749a}&HQ292<c;RK}=RYk49(h6qI*(Xqb^ug4SE}7BB}N}zc$Dv7<$FV1?^mw0
zPX>_1xAlfW8iq4Z$bqG$TaMrvVTu_bhj*g9ZGdaJRF4&RYYYt*M!7Pt$oL6Wk4kl>
zu4hWx{XwxtDsU9Z0m^vAYP=>JHM9pqyjM6=L&<88(%Gzgz06erhs%D0FYg@|w*-MZ
z`>n2Bc~d4oRik_6nBz^l8&#(M6;KY26^gMp0EI*U)Q_Dj(#|(oO7sA2a)WkqnlI}s
z8(*NcPN>JHaPNY9*2BkGGq}eFaPpDyxxGgXpndtAHR7Z`o}g6K)0)$3J>UrHuj=M2
znv~T&OyA;iiOF|=?yG;%&l3&S<DopY4^^-m18`R1y(qI!0bl_3Y1ifck9qR<WfL>k
zG&88#Nv-be4nwhi8MWoVw7zixjGA9RS%FfmQ|lF8@1%3*Lg(2Mjn*PmX;9e!XZQ;1
z<CohOH`5kG<?IGYU+et0+SxC($C(xG)y#+cD79%%`}EhXfpZm{F^4HfG$q2uMwi9;
zLi_NP{)1<R=MU4n(k!;=qPBs`xBmtKYOQ(a<#suaG6aT-IjAvZOVmSks*%!u+YJRp
zHQu8bnrL#B+_eYvVYs6AQFulGK>km~gop$Lks!Z*M}L0;A-Rz3A9lno9_vUXMr|Z(
zV@627rEfmYDTvz|9hGBCeVDwn`KN?mc9R>N5gbxH6N|J?5{RAK8H&Wk_^M38-=~uc
z{29sV)x?yDy)pD$UG$+1e^^zq9}GL9w-K`@t@xUbBb1Yfs3nCJcRZJRI7BN?C2fBo
zq3+5!JIp?Kh}uZG)52lzN!$4&Nr#P!V+H%nc<ycE&xHI3g?|Z<By@jdB&Ma!l55Co
zx4aW183<xRck%jrIT3f8(+I6}QBq~yx<82v#KTd@`1;>3oWMq!B^z2u<*B6^v3MPJ
H6G`|Fwkh9y

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/profile_yahoo.gif b/upload/style_images/1/profile_yahoo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45fcf226473fe25db5d923c274f07a13e7ce06f7
GIT binary patch
literal 153
zcmZ?wbhEHb6krfw*v!Fj;J|?f1|ay~(7^Ej|9=qcKLd!u0Th3-FfuT3FzA5fL1r+p
zxCxx})V8vakN$k+R(t1B)2`cwYna1=ZYG>@`+dmBmOsYt%zi1KR0R$OhJ*d)nj%HJ
c=DM=2<y^kiq2biTkeRV8+%kHzRRtNW0n?!?EdT%j

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/rate1.gif b/upload/style_images/1/rate1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fb60ba89c06a67123012f54cbd3fe40aa6d64b84
GIT binary patch
literal 311
zcmZ?wbhEHbG-lvpIKsei>%ogn^Oy7{q*QqM{$IB2=KbdlAz|mQ-U(n}_+MVWZr1!y
zC(i6xy88Z;H?vABKW*6Z<kcqzQh?%57O-+15DBuAfpv?5N?%Imyo@fc4u*~EPFV1m
zTsO*nU0K_|e}0E+hGN&cn@!Ime$DcEevY#?Xz7IHMIJYl6wV$mQY>pY`S{b$9<%n#
z-hxVw>(%%5wb%VG`24-DzBZw$S%9s$jDt;pv9gAbvA4frQeXYV$ulMiFfezPGcySA
za!ujm;$5<=Vdd)O>y~a<r8KXYW0CTv+I331S8Q3o=ivUm%G-9TY&y1Y*_rj{Pajla
XU|+1p%X)d&E%lqX_uW-iWUvMR;ca`7

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/rate2.gif b/upload/style_images/1/rate2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..54b99b944c41412d096922b4971dd01ec72576e2
GIT binary patch
literal 319
zcmZ?wbhEHbG-lvpIKsfNY5tOikg%KgpP#>a=l`;06<)r*2`RT8yjVAD{-+aXb}U_e
z|H+#G28RFT<+DmFKW*6Z<kcqzQh?%57O-+15DBuAfpw39N?%Imyo@fX9>$I9IQG9?
zVZl}M{L#9{W()j}DQxL7ofa6mTeYAs{T%1ie@g-tmfSE9+ST*+I(M6k{CSpJiDApH
zzuh`}Z|;rvy#~zn{MK>}jr=+FO${w=?MjT*6+DarJvIFT46TiP3{$7K&zjaYQ;D6m
zx001zVDVC(<pSIs)A=~K*KL@wdF#d<i<T@~v8Q^?{+-Rck8Ikaw7&j?>Z-LW=MSIS
faO}!imDAUh*_kijxu?#}bW-*4)0<CJ6d9}mL7aZ2

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/rate3.gif b/upload/style_images/1/rate3.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5624013bdd6ff50ece4693c959285575b53952b4
GIT binary patch
literal 319
zcmZ?wbhEHbG-lvpIKsft5E8a&{*v=o@7%oqeBG@1pH7_Fv2^wQCvW~QTUO!a+nbPb
z>%ogzrInvHYzbgs_+MWB<kcqzQh?%57O-+15DBuAfpw39N?%Imyo@fbKBkT9IQGA_
zIKSwi#DsItcgF=hbJ)^lIxTRfi&5;ZLw$-*U6+RjeoS;Jke!hGUHV&JuRxY_RD|)R
z+-=dnSKO9QIDU8D{p$yLc$=De^BY^5@&y>G%J~?&dut~2RQC%owm0)I&Y0CXSAd&y
z5+5h`q9rxUS1w({&N7RKg<W97rY*{gtCp=$+Fh|`|Ej&p+go=k9pAiFW%r?7OD-Hf
fs<Qp$v5hy*G3`_3zN`M=-Zkd4s_f5H6d9}m0P}x0

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/rate4.gif b/upload/style_images/1/rate4.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3eb4a97e748605bbc52528bc6daef1f5696d1cd6
GIT binary patch
literal 308
zcmZ?wbhEHbG-lvpIKsei|H+$%kgy#~SFf8j|I>*x=da$`G=Is>`_E^UR({&B<^Qr}
z6<)r*2`RT8ya-@m_+MWB<kcqzQh?%57O-+15DBuAfpw#TN?%Imyo@d*KIV<<IQGA_
zIA7H3%%t?eZnpD9saHKZi?ky{E=}=JIM_bppTc4Gz=fp=J8!?+&iyUzu#1POq3Q-f
zrQ^wd^)p_7vA)-L_p=~pV-shA0Ao=pA7fibWp{f;SI@+5wuWX7HYHx}UOsMKfjRRQ
zESg)nbn%LX49wG8m>HB;&0jcs`PR)lmToWFskF9%W25TgJ-hawIKKC^z`-MGysX=f
TURJ+!MdgM%1N$arMFwjC75jCf

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/rate5.gif b/upload/style_images/1/rate5.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b8131c7e68e95ecfbd96e550bea118fd0a15515
GIT binary patch
literal 226
zcmZ?wbhEHbG-lvp*v!Dt5E6F&>Ye|~mQ{H9_9mp<dhjBEf#H97`IA?l7_b4wpDbWu
z9S{jJgMp=A;H2m3y%xzy9FOL))ZI1dOX{3-?-b`;#_dHmlZ$<yf6t!Iag$L^LaNDi
zkzl5eT&tIaaTSl;x*La$yYCily|#XOG^@l3h8D@ScImt?zgoY0w@k3r@vec!gRil*
z_0>(4Ep=^;bwZsr-OW)=Jq>-ry^|(P6=|C>dDgV5xy_5_^v`BoHf@DC>uRyJD|^-n
I2{Kp%0HCE-P5=M^

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/stat_gzip.gif b/upload/style_images/1/stat_gzip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..62fe9523dbe452f9b70d03f706effe7816ff2b7b
GIT binary patch
literal 266
zcmZ?wbhEHb6k-r!I3mIT1poj4@95~5Y0O~Ez;GswAua7pXlUrFRjdBb1WFm-y?fW#
zIPL%cnKNhp|9>X!%$fi1-n|2I($au}|3Uik0>z&!j0_AS3_2iHAUhdY+Z9y%QaqJ1
z5`x^MSBMC4u(L88JnO`FxMP#6FN=g^MO%`Nf{bQl-?T|(68B1aUKekTJ<HPCv}xBO
z4zX4TM?(*Rz3onmKV<ONrJmYlprFFWWTk4%z|6?Y%hF__Y|Jgl%*)To!Xf0^sAAd5
iHMuKRRhXHJfwikriD@zGlm)X^v20wvVvCX@gEas>w^S<t

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/stat_load.gif b/upload/style_images/1/stat_load.gif
new file mode 100644
index 0000000000000000000000000000000000000000..75d809092cb0267f5ee08d2eb110fd9f2f2d523b
GIT binary patch
literal 1055
zcmZ?wbhEHb6k-r$_&$$e@7}$K4jtRReaD_Xdk!ByVQOlcmX@|<%dUqHpFMc+<mAb7
zhYlUzvuE$)$1mzz+IQ{RwRY{shYz1Wc<}W2@iXhzZCby6^U9TL{er`djg12X11k&5
z@7;SE859*25ar|JV`OBwW5?d3M^6>^cHg@7u&SggFfho+$@AE;Gog`jw{PDsDXPd!
z%E(B_jEIN`i;WL*4>)@C#OBRAV`8E+@(UA_((Ai=4<0-o5EgOZz%dOCjl8`4%<TMz
zDU;(8QY&UmYG`OKFRuuXNvvKvH#a4>Y|ix1n8c{1lS}Fv?%#i!kyTK)WA(|CCpT~2
zvS!Wt^h0Y)OUuiqO-N7AjEsy94-Y$V;K26nJ2T=_ckbMmkeZd6n%dafm6Vp5m0!4S
z-TKOc^1XZaHMDe;_4g#@7I=AiS1*`ZU0s`%oLyB`ThP)P9h(vro1C6oY;SKLosf}}
zkz0Rpf6UwoQIT=Q#if4HQF(bK@lnagj|0Q-Xxa3MD^{#dNJy%hJ}Ds~p=8Z`S6A1B
zxU~BEmcqi~Rjbz39@$da)3tBkzL21Zu&{{A{F1_*E4OalUD?o-5g%`9Y2oi5dh+D?
zEn9ZhOq`gKl5+d@!~Oe@R@XKs#;0cQS#|jENx#srfZ*_qipuch)IEFl{r~@;VH6Mw
z0mYvzj0_C(7<51iL3x6K;}3%^r;Nvjgo6wm!fJb(1>BZ5dYd(@aA;&=;qYaN+%RFe
zQ;R+myHAE<XMc~Tq|J}S%P*Y!v_n~pA`%=<&$M-aapu6K#V1;sCa|=qBphH=QdK%r
zuy7)q>oO+xmMSR+ksdb1iZ+#vSJY1Mt_WHw_2c1Dc0q0He<cP>INt;?n~JqI9@4nD
z)MAd$j=5e_+*OR4f8_{0X6c)_H;Hkg!k0AGZY!C%GmbtA-OXNF7j{H$cJ1YMmq_wR
zb#U;LRPbkd*|Es|)Iy<T5zkr!r-RC@WomOc8Z#StWu~YZ3jR=VZDHY5@o<>L&{)jE
YD^()tk;>5U`o?Bvjg$@5-y0aL0eHS-1poj5

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/stat_sql.gif b/upload/style_images/1/stat_sql.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ee7519a266f61ffdfb37ad482826fcafd65e2227
GIT binary patch
literal 633
zcmZ?wbhEHb6l4%&coxU7Zr!^7|NpO8v0~4jJzKVHS-*b$+O=yJELgC5_3BHPF5S9y
zYr}>OvuDpfeE9I1HEZtNx%24Jqx<*oA2@K}@#DugZ{9q6_UzH4N3UMJ`u+R&ix)5U
z_V!MkIPu`YgP%TqnlNF)j2Saty?XWU-@mO}w=Q11_|Tz4XU?42wr$(erAt?>T6N^e
zkzc=ltz5Zs)22;(_wGG*?AW(&-`>1=Gk^a4&6_vBd-v}4?c3+ipWnWH`@)3_XU&@R
z<HwK7moIm8bnMu%W66>wbLY<O@9*EYZ{M_O)AsM*|MlzF6DLlbJbCi@^XJc=Jv)8+
z^z!A)uU)(L_wV18D_6C(wcWUJ<Hd^?4<0=D@ZrP5hYwGkI<;)svW*)z?%ut-rKRP|
zmoF<;t+{aF!sN-5r%s(ZbLLE7urSabDE?$&WMGJ6&;eNmiW3I*YYlNt%`L5M3}VbI
zIxNg$4DIY{UIP3gB33FKhRiM6l0qWF0-Ri?yha|8Ega%P!UhqHmO(14qCPF$3@lvw
z-iprr%pvMwt$g<EN@`}@Owv+Ht#%9?%(|g`I^1mLeCjPsqE3RcvVq1XysUbjYq&Js
zv=|w+gvD4mnOfPEH3Rx=8Ut8dr!%)Q#C*KK?7+y(<i>LIBFm)(qMQ~MoeP#8Y31VO
znDW4!!<9`z(4d8*;b9{SbFc^3r31~(9aUc)1S(%BD)Q;cOBnpvkjl*5-8M;#i-o}&
E0AGm^CjbBd

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/stat_time.gif b/upload/style_images/1/stat_time.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba51bda93f6c95836018f7487fa5dfcb0d06ed69
GIT binary patch
literal 1039
zcmeH`?Mo8@0EcgS;%g++52L1-85AU0A9_J3&E64wfuQ=7Bt%fLiXeo-bX1n+vYVw@
zyVHfITQSnv=3ee@(`~-iHjOoh+uVFh(R15PH+Q@AU+8nsAMpF|{CLh^Ja_y=1sh-k
z>&*beFcyo2rfG_z0)c?ZWKyYA8jZ$aFm!i!+wFF#^uEnD5{*Vfq0RpO{-vd*U@$0=
z+;=)Z()6ra{Tah_63IP<0&=-TFpLlc5eTf)v;%@5k|aGIPbd_U%aP4ZdU0{Nr>DKG
z?UhC&@_OesHbQ#6erD#Q%{DBP^$ZOSQ&cb#p(Bw9j%zwQpUlh{ZMN?WGY>)U+-~>S
zm>ET-Yos5?^}*n}PWN?k60_U;91iEiM157&W2e)(vGI!}eM+VH)2FsAR#yjLxUILh
zS1cA7jYbT6j-q#5F7L#I?aP-3PG{5fw98^4C~A6iv=74w48tHu7!K14g;1$%_Ik%r
zw2>ebgM))O{vAQYZZ|9vy_U-bVsTePgJ6wZ^ZWg?vpTI7al1t{y{OT2GK_0(?vK@K
z_51Bs>)XD*{z$~zg-U$Baf<rk^ZC?jbu{Y0aXcK}oSGVw$?6EAV|?7qFzY^FU~;kt
zMel009~v9$5d;YYD1vAe3Y(<TuSVmDR;%@R=2a^7$_i#Sn}7dyY&{74=U)x%34tsC
zXa){$4{SF9BrF5DiQEe^n5a!i%*-o=tJ7lR+1IL4uLIR*V-mne)urVCu!AdDU;#My
zWV}2zmAuK%NZ$dbkT-Zm0BcV<&s-K)kiubQv-xMh7*>4#GY4K|sELV<yX?B+uhGK?
z8z1%Zyr+u_!K7@?P+6BinAgy3y1=h2PJ9|SfYzl~R&%q`IkGJ91+hCNwxu+jT2TV+
z%DDYg>7TvCJp`s@0j$E8NcO2S*AII-O5W9EHsuu5?%&yv#B1f69~j{F+*_Oj6?+%J
l_ebBx>`VXFJ_;Utc%-!D4VeffC+8Gj<(c>cd=?AH{|kY-ymSBn

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/stats.gif b/upload/style_images/1/stats.gif
index be51d57c20ceecee0ebfd331a5a1dd3f9ded040a..b0798e46835d9c39fe9d8bc2553ac0740e76a2ee 100644
GIT binary patch
literal 478
zcmZ?wbhEHblxC1-xXQo~(Rd)b?O0^<;mldLQ>R{y?>Un`{YGN{`Q(Y0au+;|?L3)1
z_ui3ncWym=9a6hHWy;lzS+|3#c81mMD_HtGv}Sky;wQmXJJ+0gzxK?>)*WASW?Wl)
z`osTss}#K_?K*muT`TSX83vjH#h)x-^L0QZ$WIJxzYnk-cGi*V_fT^Fk!dym!i(Y`
zCnMJ1Saa={Vx7r@4HZ6Y<+k$ORcG^dUwzJ>>bL&(`_DU4_V<_k6Rc@!7Aj<DZ<m$n
zmhIrHm*wkdFJziFO;$lcMs|8v&-7`9j7yfxoGrU_`JAOo3b{6HSUsVB)|`zS3R!pW
z-rPNBo9v$5h3v<UZ9aJL__0Ec^XE^lIC$ZFA<K;$mkzABd83f+;ltaTA3ZE&e);mr
z!B;N}xj%k<v*OdoLe8H*1t#$Sognb#X?O6#1qYisgvEM{7cM;9E}(4Iqr7yHtG>8V
u)}0d@laE<QJ9Wu;Zb~^}ArZ7H=H#Z-Q+hl)r+PM}cubn@IgN#p!5RQvW5XN(

literal 1301
zcmV+w1?u`oNk%w1VIBY;0QUd@$xcr8n3(T{g+HPg>FMcAOibI`+rGZO#Kgqh+}z;c
z;N;}w&CSi7ot=%1jpyg*-rnAnl$8IxyvfPQ&d$!Msj0}w$f~NUNn^&au&}hWv{zSG
z*>!bg$t`HiE^UnAkhAn|liAvTf0VcOjkWRalap@UI_a30V0+qTf8R~EB5;Y}bB*J0
zjpbg?GFx@mgQ)C>t?qs1M`(oMY>4B3>_cpi*=5x>dztEP(J_6R>2HhVX^YqLk&%a~
z@%EOMaggJ7kmYgVJea%qbL2U8<vwNDGyb-=iSkWe(Jx=mE_#*c-ezW7%Pn!1+JL3&
zgQV_-r0sCsH(|ysdZXTpuk()mNPnN~nZf&;!1<TI`)=Sj{Hm(>ot^QCiG-)|{;{$C
zt*!c{rRj5XoW%W{#{NdG9cF^v=X!dq(EqK`|8}0-S8>yGlIKcf$EnW$*l=)l-b0hP
z_l50D)@5Z<!6xyHjNFKbedIf%%Kl@5)n<p*O}Zmbyd~mlYJBKC^pKE{_)%KHC|<-V
zmi<$B;zgYQTvxs(&sSGYXv^(?e~+{Efa*SMhvJB>^K98Pq5oren&#$pb=zQIq5ou|
z|7F)|YK`?zp~wA%^g^c0{%qGkXVx-l)INNl>6-moi~2?Fjg4S`)O6uEeC$4p_ehYr
z^H|6$fTHe`yZQgJvg&npt<e8<mgSnm{d}G5pvnJ-^hW-&vVxxLl>Jbi#QTh~_4uEk
zaMLnYanNmTZH=w+_@tzF=sZwr%#Qj=YtJz7nVD6_De;}1)nH(DmFRSu+iKi3_nn<s
zbkY2%sPK!6{I0IYOiV<p9A$vt&Qnv^U|@5Q=Ap^{mc9A<si}zfMCpNn>xYN$f`W&K
zhk)@wc$eyf@kHu)c<X<EV$w8W)G?F)Ok~n9K%^P}xw-nIqmZ`uYKPxrf82QGI*GCG
zUU=G*`ci3w;Az=7dg(#hdU|l%L4oQ@h_dS2goIvu(}}6?Pq-xGZf^9GlUsMvQ@bVY
ze0*1N)Pn6lA^8LV00000EC2ui03HAy000R800{^jNU)&6g9sBUT*$DY!-oYO6qq>C
z0mOp^)UZnP23COu4=xfcpefI^GV}@<SRis>0Ze3EnW9pFfr5b&DHgD(us|&=T1e1D
zkicanN{|eR`xp{ofh^Qgty@#zfB~1E2+^{FM<q+AL*$%`VN55*cE3RV!&UR9(-Dho
z!EjPQg57ee3Ir-;jZuyQL=zSOQN_`d5Cx9N0u$y$flIM6{Q*|>s?%LQzId`xfEgEM
z!|oJ7(rueM50wSqgMum&j{?=im<v{~z?>SSMs-N-G|H7%t@ae)b*oDW5e4SK>m_9h
zZ;Z2Wa08;J0I~o-Ld7c}qX>~lgPt4mETE%Un-8K21keWv8;1ggglyp?NPNKpOQf|x
zXRkmHJ6>D^M*(q|aLhP|*f&xTJJ4{(J_RfzKsIPtQh+?~7@-6|3cAEXBQvCvOaTHY
z(vKu`6tKw+;WU9yhXNI_f;-QkkV^sIc(Y1A#1zm8I7ytM0*nL{kODg|u;EJqWB9>D
zG>8=7f-rUPVFr-}_>+hm7+_GqB+vi=Kr;pO;S4zg3_zqdW^K@>S-J#<kOB;3&_DzY
zRG`5HcjmcgpBdPc&;kZ9fWQF=OhADJhbFpcqYSK+&;tu7kbnURK%f8wmu9+YrwV}7
L(x{{o6c7MAm-DP$

diff --git a/upload/style_images/1/t_addpoll.gif b/upload/style_images/1/t_addpoll.gif
new file mode 100644
index 0000000000000000000000000000000000000000..13a7f1078e208deba4033eda898bc8b32b53296e
GIT binary patch
literal 1911
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

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/t_closed.gif b/upload/style_images/1/t_closed.gif
index 2cc27cfe8319f560f9da5ea9972bdd7f3a677554..6a31085217d51bdd86a7c7e425397089699f4fdb 100644
GIT binary patch
literal 1817
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
RDsfU6Qnq0Cgn%I6`w#!P`(Xe8

literal 2601
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
L&2XkjKmY(cu~uGv

diff --git a/upload/style_images/1/t_comments.gif b/upload/style_images/1/t_comments.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b69e589f307a96e5155061e74fc67266c3baafac
GIT binary patch
literal 1953
zcmV;S2VVF`Nk%w1VOanh0QUd@NprCiGiyR^t3hn4K4zs>gTgagnNEAVI%A<sc(yuZ
zqB&rnJ!q$LsOd0Qm2jozT7<-IqT^<l*K3~NU5Lov=khyerfHhn@$~rr%m8AK&|i$q
zWRuj%)#a6|%r;=2uD{sH)Z~_}&hqv7WtZ0E>hj6d<@ovg?C<lFsmpGSyUNz*HC~<a
z^Y;JkqsY_aIAWkXW1^L;&0&$zlc>r;YN&;s!f&MIOm?-cz12Z!s5xY!L1v)d-rmX6
z<X?}@lBmhb*5-ws!(x@&yvpC?>G71R%V3evX@|7v?e;uoq%>TcYMtH6)#f~8qB2>R
zQhd8)dY@Q^#X)PSz0Bcip59@Fw*CG7Ib)zZWT84{q&Z@sU5(6Ad%kOlw_=gWWtGlT
zd9H7dyh3WJO?tUCU7LoW#VuBmZGxq3q2Ig7-bHMtufNzlXQjKy+)Hw`dX~UFXr<QP
z>rZ#OM|83`UYul<)MJy<YKOL8iOWxUxb^n<aHi$&^7T!5xcK?}`}_QLrs-yw*z)xF
zKx(K!YpLw+^8Wt+H(i=IV4X>AuT6EhN_MmcCSe9AUq)`IL~yNZpWxTv?9JBYW|`SC
zRgs9I$4YgyN^i1=p~m<3_j{PZY>K#TqT)$)vs{VDX`I|bX`~lAbVP5hVUN&Ykk30_
znp}&^S%kwgSCl|xo>YFlY@*~)dbm4ao>PCpM{uuWl+-p}ns}1DUy#pRiOFG)&rf~4
zP;;tVhs0ZYtS3&2ld{<6=H{8X;BltsZK2_krpQKbt!tj%J!hp>fyP&b#LLp&X@#>u
zYN<YGrWiSKTZqTl;O#6^j!tl<ScJbKM0!DIq+E!|YJZ|SUz|B&pJJ8RW|r3Y`TA#?
z+FgFJXqwtcb+l7{xMY^rQhK&!m)BN+ywKO;WR=wvHgK}J#0o8GYoOshW~57Xwb$S4
zHd>cNZL2|VuR?9Cz02RUyTwIuuvme?RC~KqdAMwt)>eMLsm=I>xb=0d?{ur|cdzm4
z?ePaHX8-^HA^8LV00000EC2ui09gPV000R80RIUbDDY2`3J4P_Oqk>k!G{ndN}Ncs
zqQxZsGHTq&F^R>GAVZ22Si#>%e-%cmTuJfDi54jO$?P}Dq(y&|X6oF@v!~CWKz*WU
zal&O3j{X|i#K*L0Q-Mj5N}Wozs#U8|Ui!<&wQHcIPMtyx)U~YHvuM+*UAxvFOn>&`
z%FP2dEK{g?<m%nax3Ay7fC2l9>93yQ!;0$Kg{tVV<HwLAOP)-bvOk&r=xN@JNpV=H
zm^O<ZO}ez{)2LBj?&t5G>(_5Qi~Z;C&FkB^bL-yCyLa!^{^kiEzQ|@pe~X4IU(UR_
z^XJf^1BXDp`W)jF{mrS)9f}SE4$8p)(nG+30|I&=;E3Ts2bA^g;k%a)-@Jnw=4(K}
zUxU5<`_%zQ!GHvIA=^{5bwMD30H~4!2LBXM$1`pS<c2Q7IPt<iIgFtphcRr};fFbd
zNYE1kAp-!4!EAUUfxvAb<BYFhH;^X1^q^xrj=VCXjGypO1O_%BVFM2s5NSh_&&1$E
zl4bDl4+cIY@+1aPPFbZ7{~+O|0Rk1l1DHVA07Mc0009I6GXkf<n{XE6nJ*lbg9@B)
zszbv+LZpI-D|-r2NhP!VL&E}csPPXTLSPU=2xTO?XrqtT5yC%9m?F&*|6ED~r!=sW
z%B4$GvkIKRaiFTIXJmv1L_KW(l}{D{fMd(5s*VD}KcTcT%@n(`00k5*`~yO<DGZVV
z2q2hX0<y|7>ue$>{Nsfe+aSBnKe+spLOTdl%K|f`tO}e2=%VY73oaPf6faw45sf!@
zq?_&lMEvtXz4+>DhaDgM!$!bHbU;K2W^~X2!3HC&ur(bFwD3Pha3V0po+uOX2lh$;
z+yx*zkWmI1xJpp0w2Ffb$Si|=i3k5=a=<As{{zPX2f*=<2QcjHK?(n?(L@P7d+>A6
zLu1jzKQO?MMbWar^G^vLB#_L~FtmIDa1(UBt_viyi=8?C1ON>;U8kLPEn$o>f($Bb
z@`&4(SmO30JNyIpKay<!5yU@v@7?#`JN&J};eiX#w%%k2K)Biy02jgJ{*Y{W$s0K$
zN-o1p?)m4SKw<?I0yV?H=mJq;1tenpBZ2}eh!DpL|Fr&k?6d!)1?>ZA;kq9Jh~WAy
zqtLF!=Mez+!1B(FjQK7@L_fqef&jDp_1HgfLpT6zVSxn<kU<9)-(x|?9r9Q}2qSGw
z;fE3yq@zCj?!*5M{NGz3fCYubLJKkcBS!(?*NyC5#t{B!fCAI-h02xe3u#cG1Sd$r
z3I3uAN05RsN)ZVRN<j)osKO1j@dFYtfdrIb!VI`@gc6=Gg){hpAZ8$i0u+D?-<Saj
zZg2w<aAAj?h+!mtD0rDZECU_;Na8+P<&QHc@rh83q7<h{#VT6yiu<_C9;o3CeRxqH
zd;kL&`0&Ltn(>TiOrsjt$i_D6V=#ai$2sW03Vzt}j(E(Y9{0${KKk*GfW)I)4v~#x
nL}3|MNu(kd$;hi@<sXLt#2)%!h@e>Vl9<dSCWlg#fB*nHCi3e)

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/t_ecard.gif b/upload/style_images/1/t_ecard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ce02f619408a57e77decda034b0d8da34128d48c
GIT binary patch
literal 1834
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
Ya-ahx4CRMF45APRhuD*%93>zCJ9Bil2mk;8

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/t_favorite.gif b/upload/style_images/1/t_favorite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5ac716f3ef411497255c447f374bdad1f7ac26dc
GIT binary patch
literal 2102
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

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/t_media.gif b/upload/style_images/1/t_media.gif
new file mode 100644
index 0000000000000000000000000000000000000000..363b9c7931c5b907da7de7c2b7bd08b2c080b05a
GIT binary patch
literal 2241
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
PXickH(JB_Q1Oxy(f0u75

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/t_new.gif b/upload/style_images/1/t_new.gif
index 1566a1c2363c819e3c7a101e35ef3629b078c9e1..49f6ac595382c7db57844f212464ea176d04c15d 100644
GIT binary patch
literal 1947
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

literal 2629
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

diff --git a/upload/style_images/1/t_newimage.gif b/upload/style_images/1/t_newimage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2897b4b1226159daf441bb66a4b330a050346eda
GIT binary patch
literal 2108
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

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/t_options.gif b/upload/style_images/1/t_options.gif
index 2608b0319f238d1e317ec483f05513cef8e7b747..9d0546467432e0b6441e1c2e9ce82f879bf5b8fd 100644
GIT binary patch
literal 1932
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
S1m%#3Or#<cIh3LV1OPkT2jB((

literal 1480
zcmeH`>sOKo0LEX0<TZ;ZU6PsU)NCDhj@H)Ps_n%x$(qsD&3h<{m^0Fu7*1dChNj_A
zLyPKFFqt`q<{YJ+14t%b61?OMON_IHkwZ&GySURn?@!qC;ra0U_WaIyf({+@|B~Vk
zxB`m+u(Gm3rG)bNd?KxR$@+S3ZqB;!YH@ycbaZs#_20`&3vZUK^RH$G2XqG#e=olO
zY<YS4veK9$Y|CjH;CGnj=jSamFA7?Q^m;v8Iym#v{Qmv>sN%lLo|$*=-ra5;56kO}
zr%@|9&AE5<PbS8S?&-6n0|tWut{*g+O!-&kPoGTa$A@2<O@;S{=VoVON(V!89z=4x
zGsKUgx$V@7p(Mm8Xc>O<=B?Fg)o3*8cE!Z_NG_X|F6>DbO=ru74l(3~`EXV5>`7SJ
zpfa4ju9ZpaD{puH^h>w6W#B}XB2J)>XXcrv&EGNQS-1OssvTh5G9OKsFIbn&(|<*?
z<zbmE7bUujWylXj>Qtec{_}&vmM4KJjY;LLCo@}*Wwz4`R5Zajt6?lnGBrBfpLk;`
z=92mhe~{N<OuRXDI=eNsMjKx8h$&JgT$@b3))QB$k1WweUeblI?z8GgV#`L3oRh~3
z#$nkoqvkPPI2FoK{aDkTQlT(Uo9M!)b*<xB(qTsJ^K;c>Y1I!Y#a-dt?#Ro!Q-!@@
zMSao5eFu|Tq6#%xzYQf^)s?9yB1*K>@)2s;$ho=~5e1!wN&T)UK{T&7q3Usb<;1>(
zI#$DDU0+WKt1Xn<m3*`B{EbJz|M@Qi?n{_|vCoJ8@Cg810Z^a|NrotMK!+U>Tt*NN
zz<UI*(Z*tN`4}EZX@uCERc`w)eCA;U4+8#Q=SrGj7=^~fbQM>@fxxF*B}~$3HA(<r
zalVA$aw12B^(h6BPdear_}v7b4aNX55VQ#->_E<Pq&7Yl5Q<&ri49I6ZQ-`Fd7HCk
zSuYbE>00sby1jORv9JS(`9^lv(2hM>9nRzI(++WZy$*8;b{w%HgdHZ=SNfqPT9Mt1
zE0Yc-!30Uk-bTKS48n$!4-`%<oqaB~Rpf86uld8n7Z-Az;IF_JJ%duy*9JRpV>=y=
zBMFF9Am3nv?ddF~kW)HD$_*=cU)PHO-lczW6N~_}o*q+JrbgI&g!gA1<HJtY;wVv<
zmnpWh^fQg@xEoGf3r&-)jw1)yMfMc9W%y+nbvCOS@Ct8)yi?<jkN-l6-foNkKG`p=
z7CL1QYAHYzNu}OaRSqfurvsCsqFr?BG19J>Ca%j7t&YS}-<^!bKq^l$Y4vHC2nap-
z4+*K0O6mnKvRgbTXeI~RCnO@bu5JXHI5_w1HV>U?`f3r{i;K`U1~B^-H(}c`c>lK+
zN_+L^{uVDF=FEB`b_=;Q5Og@<9N-ZB7NNVjM4X?1I9diu{4v?0z#M9GSJpQ)-OJmW
zOR9AbbWW4F>7nEPaGw4CHS0}iuLxfy24c`ujobFd1Z}Dqoa_L;YTjLn-HJiw**jXp
z>Yb0)Jpa}8dg(FJS{HxB#`em340{6(@yoGyQtvUhL5|nh+s`*ENd&Y6hHa&5n~As(
zH_8J5^lq@I&=J)f93cU@Lfj0Iq1E1JU`2;Zy57&$TTF(I+hqX6RUbJbb6q}nig#iJ
M*F9emQ7B-~Kl9a8b^rhX

diff --git a/upload/style_images/1/t_poll.gif b/upload/style_images/1/t_poll.gif
index ab73498a84329da6f2721636b481db8912019c69..fc267bd2a3b4830249a807b17aaf3962750307a5 100644
GIT binary patch
literal 1891
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

literal 2499
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
NAd{H*#1IJx06UCky`KO8

diff --git a/upload/style_images/1/t_qr-small.gif b/upload/style_images/1/t_qr-small.gif
deleted file mode 100644
index adc1938a4f7c3afcb5326b0cda6c4a4ac3c352ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1508
zcmV<A1snQDNk%w1VIKe<0QUd@|NsAzl9FU$SwUyC_Vw`c^78un_}SUn`S<ns_Ve}g
z?nG*}jJ@OU?(CAr>FVj}gR|0(!sPY!^@p|9in-nW{r#BC?*9J%?d<8))6s>q-1qqS
z+}zx&yW5DGxQMyed!x>Pu+`k#*MX_jrnlFX$?SNX%i-bSna%P0`}}*T(0{JeNpQH`
z+t_rRzgUCCh=zh^Xk|yi0+qPik&%&Gg~?--*kX~>UWvnY>@#VR#!}n@$jHdv-P(nM
zd}DyR!N9$Glc4qV?|rGuRO13+j?PYcy|TmDeyh(^gQ|tC)?$;?Q{Muzu&rI`3~Qaz
zY@y|8o#UIY%2a;9L1(j3c7BbyaDDAPi@R-s?n0E-Y*&jlPt*e8;M{+vVpD@Ple~Fd
zhsBe`-Mh!GWR}`sipY$NjI_q1NliRvmPSUs0z`u#bDPfT?BGFTBv^mEZIG`)dOS+T
z0xfC;X@|ltXah^h0?N_A_xJTy=K_AM*M#mzc%#8~p~k<!ySdD$Z<SMP>mo?M0rm6o
z*xS-qvLG*K0*i}_d#TJebT40y&rx@{L0=0udI@i#*>9xjFn0-QoZ@$)&02i6ONLCG
z@oG!U0$YsEgtOOvuGD4GC0ma-beXz8c|tC42v>%)hVM#F&;mn%G_b^<Q{V!Nyy0%3
z(dXvme(gS2=mVnib7q&^Pkx_aVpV36&02##X_B`&j|Dk^5;chdP}c%zo7`@jPcCc=
zP0#{Gc_VI@#B-m)ZJXAq@PJ`nR@v9mS(Y(1i2_N*0#b-BE^GuXWddG|&0pycIgtT4
zcQI|6O;vlkZ=>mBmDO*g>Q8!_Gk^nGg28o~yLX6diq~Cxq|-Be3paKzRer$p@$N*o
z0(Y-deXG!Iio|@W&1dQxKA-~9(a%tCl19D)c&X9v@9j!`dzA2Bo$_pGuR@Q;<c#lA
zYM$XtfmDdxR&t=weXGx7jKpc2&_rDgP0s?J@@_-40juAOW|Bru(*j+K%x9b5R_FqI
zuF}rU%Wb0OA^8LV00000EC2ui03QGz000R8009UbNU)&6g9sBUTu2az4*?J(N)+G&
zND77mo4^oZprgl+27bY4!Z1aL7!M2}NRR-5%a<+*h!D_WLj{CK7U&Q_Ac2CPKot-e
zN}xdx0WSu0FmR#Z5f&4~@FWnRs#U61F|-iiNZtYx8=4ACvB1O(T~mV+4KOr7gPDs=
z;TVu|V23v|OqfXflPK1zZv{-5@`Qzy0yhD4(=h`Ch^bbuMsBe6#fv9Ke$)j}c7%#*
zJQMgG%914l$^vTC__S=n2?+uR^cg`rbX6f=hP|3LxkoE=qSka8zyUUZ0U(qp(IbH6
zP$6fwX|a;V%bzx*lx<0;N!Bwe2MWah9-^Uq^8{6CnAzkGU9Wp!Y+<2>>YJcz(FTN%
zjikJW^QC1o1~8zUQ;#Z@tdoNiL_oqy82X8K+zJ#_*c<{@(QrsEh2)UM9#;gC2PyU>
zqevMM#s&ccEDGRKOD+v^M<e_=aZD;i?7)R5Nsv)QipNdBA_FdBm|;2ifWrh6JJ5m)
zGKt)<%8&aU_dx_$7Wq;~co0HNDEZK1i7<vFu}>6B0672!4zw9V7Z^N%!JHU0a0(!?
z*dd1u!7y?|BvIG^<N|D#P(lze_>;k+jE3XK9OKBKMloox0|gW|EKnsKDnwv`1r7ue
z!$c7I;s!J_%rcKS%s5kvF_RR*ClCoZOz>$54ln@05PZ1ct2CUzaf>!}Q~}E)|14pI
z2d@dV!2&9LfC37jGC;uu5I_*Z3M+Wijx}-YA_*_eTrvO;n^iyp3rKw60JXTPgJlFP
zmVyZ-{bcfvEBY+p0SAZ;WB>^Z!~?<y6C|8%wjngk4I=Q6!v;13cyK@i1`u??1`kN_
z!vG+MEHcPcgzNzi95fJCK^GWMzyl|6aKOwo*Ie@n4-~)@LKPSwfdmBvE%eYsOJG1^
K7$t2`Kma>VLduc=

diff --git a/upload/style_images/1/t_qr.gif b/upload/style_images/1/t_qr.gif
index 3505629f2dd9a42913816cc41fad73442ed71c2c..ff9859952d145147bfb2a9539b4bad188fa2cc19 100644
GIT binary patch
literal 1972
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
G0suQncGfKb

literal 2616
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
a&2WyhoaanuIj6Y<A)<+%_dJn+002Ab8UYyq

diff --git a/upload/style_images/1/t_reply.gif b/upload/style_images/1/t_reply.gif
index 2470c8ce68c67345649403e03a5c7f97b0af3946..0225885bdfe433acbcc8acd664720e215bf701f2 100644
GIT binary patch
literal 1957
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

literal 2609
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
T&21)g2uwtiI@@_70RaFz9$4Oa

diff --git a/upload/style_images/1/t_slideshow.gif b/upload/style_images/1/t_slideshow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ff0f38674ad79a47363051a824acb02c44b61eee
GIT binary patch
literal 2176
zcmV-`2!HoSNk%w1VO{_m0QUd@-N~0-h{!o)qG_7jPI|fI#hdNFiu~lRlBmh>&93RW
zi$-v+*tw!%k<sP9h}5i#ZjQUj)a7oX;~6YS%BhRSs*NyLmBP&1-K>j#et$`Iw6Mb4
zK4_*GIdQ<KlRRdm^7Z*ZX{K<c=3#@hHC~<S$f;|d-{!)hRZd6$;-l>E^D9DRRD!|v
z)3zx_biB&nTUb;5{r>vZkBFkjL29UloWkzRtx9sNL2RmNhqTt->+Q&@yrPeFr|L6X
znM!c7XPDX4vW(-jirce{GFg{GZml_CpYz_VG+djNtj$q>zOB91^UkKMxzI#ysrdQ(
z?aHe~Zms3HkGsj<W|!B~v6NDLyY|<)v!#)~t&;ZCnmT5r0~IqgO>RA8qI;OZHejC0
z*5`SZzD#zuScSwQHdtAR$GxkOUysgOiO4u&pk#WVU5v|Fgv3U4vrKfbZ=~hR)Z~tp
zpgLuwX`J0SUY##TYI3OQT7<;q>+@fX%wmtwWRui3U7I^+rr_uE<mvHnb9wUf_Fj(7
z@$~p>pWt4P)XLT7bas1Skk91m@{*>=$kXH6;q5zPqDgMAlc~#QYjZ(qsQdf;_4fE(
zeXl`gpk9EnU4F62)8syCs7rFS@ACCdai>^<!Cj5a*Wm15ip;&s;C7I@vA@_^hs9))
z)4H#g#j}&fx0X9(p~Rw#Lu;vImDS<1hp)WR?XiPXf5PO!l<&ch@63?@@UzLJh{3y<
z>9>gI$)xMbtn19K_}ro7>GIXUpr5kNm8;B2bF%2koJ?}CqO{YaxYhC1kW_xXVO~}G
z*`L&_h4Q+G+pULdpy6zy<a>>+{ot28W1?z*qU^`0ScJpN(%#V5;<>Z6S5i{;&W^2}
zkKnhTpt8@Roul%=i|*U1`OA&dw3<?Txoe5HQG31=BRx%ZxNDu>u#}6mn~J`hiMy|p
z!n2dP#@oQRm#@It#j=(_WS;)qmz=7?Sb@P*d%IJ4xP`d&Y?#(oe!h3F@pP-~b*=B}
z?ePaHX8-^HA^8LV00000EC2ui0A2ta000R80RIUTm;q6sgMSh#TzD`Lq6`BgN}Ncs
zqQ#3CF(Tr^(VxeUAU$&Af+(ZOlPFV048#SZ$qZZqshmj@WsE0+RP>9)<=?!YK!XPT
z$0bs~qezn~UCOkn)2B~W2zqjJ%||Z&e5O#qfI*28P<AA^a;3$*fBvwBT+6nt+qZDv
zuEFW=p4}c<=cUk6C7jo3x}YRzVHRx<yNDAjUd*_$<HwNg`pfALpXE?_y~&WF<%F+X
zx&qtSan@fb%cxVUUd_6->({U?`_t*qp6y3@mt{+KKp3hcyLKhmaia7i+sKnEU(UR_
z^XJfQ`#b8dp7kGj!O;S6B1o1aC$=&F8DIK`_4DY{t6$H)z5Dmpr}y)hul}aIu%z5N
zg#}9i3_{40LJFmAQs03HCaB<o3^wTCgZ0Vh4?Pr`lNSb6xC4(i6(}$ZGzJ)8Olf75
zQwD`7rl{hIEVk(4i!e%v$BYEz#e)Y~RDezpxD-%}E2{ud8Yyy2FyoO6^wEbCG+02x
zj7`$eq>?^3;mMRrE?|WueOS=P0**L|N0W|>fk!Y#c)7rpPHySs7>;~-q=W&~Nlsov
zJV3z^Je<MKHwQSdN(H4|(~b*u*2zi@fB^Cf5&sZTC!|C`+9)B5L}6*8b;Pp-ApZc8
z10#_J04XD0uri7cp)Nv04gW0vBFPf}j1mnajnt8-gnINEOI}hiBZL7%oRJDIvnW#m
z1%)=DL9e~~@Q)=vcp<G1(f;GZwLVxv2m;(9!3qNZAdo{1on)e|9@1vwNDlu@k;4@K
zp!*Lub+8JqPaHri;T{05ke4mCNFmFh>s0W-!s?U;gR=kwjKn{cd~nRfNJ#t-5*QCt
zM-7Bv{DwFo(3%4hM${3(#$!wzfe}*>;)4Y~5E20rHc#Bk6qWq*OcW7I$j8tt^d!{L
zKoNyZ6JrcLGzXCU14$Gl{6oUfRg;jlDQ#qJ^&ATjFpfZqh@r~Lkfi-j1XaJ>h7l{1
z5HluHgCfR1m{{SogjDqZU9?LX!SwJLefLd<5tk710vP{*(Kq8@Ku$#ikpH8IA}<u7
z$|WxdB*q~U9m4n_98kdl=wL)WgWXaS0!AW*OE|#nc8nC)NZ7nW&g`>OLCptF{G*2O
zvk$L^@dFS53@FB{!2t_agy6#^|A+$m@xvdY#vvdGz=i-IfT9Wn{~YoT^@oT;0}#AR
zXu|tl*df0ihSXob3&eDj4i6~wj{-J_df)q$-~>&KpnLxi01j{<fCM&Bfd@>&13AC}
zC46B95J<v5k`RUjilc#H_`nyc2LVz1;|sxPAP6KVkR*&jfF_WT1ZGIX8q#nAa)`qP
zcF4mx6p4oCSO5tB@{k7zY~de7EaE@5a6}@4A_*L5A`u}_3=kl310?9+79?=QFyMd#
zGspuHzrX=LXaW@ffPf#+ID$0PP(mVzqa5cb#}!Oq1vhwu9^Y^SJFY;Ea3FvmKH!H1
zEWi(Q@B;^E;0Fz80Fi^FK^oiuNe*ZL2ZR*B2NocJMvCB(A7B9*Xwb<y&>#^KP(mV$
zK!8=6V2;yKfj{m*%Uas<mblF29ZWEYQVe1Mbm*lS2GIaM6rvElOv5LD00(52VwhCm
zLmJ4ChE~v_0ca@19SVVl21q~zKwtwI*f0PQ+(80~Ag2iu@riQUayp#oKr{A1&wASP
zp7_kCKKIF8&wl!|pVOg)G>X8Ff*SOo2u-L$7s}9vI`p9qoy{by;SV=BLmwE;s75!+
z(T;lbqaY2bNIyE6e>|ZYYv@2+R?5<ry7Z-U5y&Jc!3mu}<)%2zsZMu#6sb@pAOJhq
CaZn`y

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/tile_back.gif b/upload/style_images/1/tile_back.gif
index 1286a915b1487f14555cd16f5e89004500db80f5..621b8be28d08c783559e87cbf0e37cee28e1e7cf 100644
GIT binary patch
literal 940
zcmZ?wbhEHb6lZW@c*ejGSiUWP$<xB+FG8wzMKm0UXgnC(c`~eSZ&=;Ff~C)*T8<R2
zdQ-aQT|(cvqzM<&r{8GZ@wI5htLV04#VcPYPr6jH=56ZKYmv=|v*z5*o_jBM;iJ%+
z-KA^a=gfZ)TDvE)|9ts|Pvsjv23PHj?>-$~zdyF)MCR-}ab2ehmOamyaWie&^_&^k
zV%m@AEqa{Lb2fY4{ou+S(XB@V%eF-}9ZH>YwS4`@+yxI)CSNI9@iL@(SIO$P8MAIB
zPrR7F_(@R3_Of*!0!p_q3}vABlLhR29S{kM69)GG4GvAsEv;=$0-asmJ-waU6DCfY
zJY|B>^cgc}&7RIMZ~lUXi{{xaUABD1%2lh^*cq(fuyNDo^-9~e@7TF(8}r_M`wtx4
zYkB18vEwI>NS{7)_T2f?a+fY&xq9sq`^{Uo@7%q~@!;X3$4?%pJb&@>)$8Xh@7{m-
z_~{+%*Kgl{{QPSC=kLG&3_oKfJT@#i*vu@d5p!b0Lg!XPC9gRi8<Si(C5*G~oDfv*
z?pJW`lKHu@<>X|I;8iA>3znXqZjijq#&Pqqv$HKS`)-`vy!`xp>sSt1uPrMA7xGTh
ziaoU@^Adl+Vz0SgqN|!$M{LfzTQ#-)`uc>!U0=NxuDQ86<MOn<2e+-gy}jW7%}X=9
zx39aqyIA+d-P7CG$M4l*;+FH-QSgAhLs&cRj6`AA@d?V_^Zrz{KRrFeID1>pqRr3G
zFK{kD=CEta%gZY~(<9FA+WPwX>i84$e0Oily(wGt`rg^y<$2Nvnz`luWOlSYJ~3H4
zzHU$J=jRs|dzar^yzA@h8=J%V5A5Cj{r!WT>Jt9@_Wb<(IB-S$`F(q<zcM{KJ>P$S
zU5(6-&#&*Fm#=U6&%mbfpy9u7!h=Q*wG|5*xlLX?Xcln0v4Bq`EaPFTL{P-RHkq;)
z58I`U6drY`Ov_l*A+uz~qb{9oGam699MgE*V{$Fyaj*TA1&{k|zP(u7r^urDWP*#B
YqzZ?J+R7)KlYEpaPfYe_V`8ud0Q(4=WdHyG

literal 157
zcmZ?wbhEHbWMnX5IKlt||Ns9FDBTiLvpcfsP)x^(_@1+gedpu4PE~C9pE~tg%H%6a
z6E9}Wyqz=uVb+|x>C<my&%Kwo@NvP?=lM&XmaqR*w(dje+V>@^-xjZYU9|jV#m3J-
z1HlG^2*sZ)j0_Ai3_2hV$W8`UsRSh+mqrQp%^CrpUHV*nquOG_w!W=-|9`&#gEat5
Cct)uJ

diff --git a/upload/style_images/1/tile_cat.gif b/upload/style_images/1/tile_cat.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33c467f9abffa5b7dc36deaa0e14721b934ac5ba
GIT binary patch
literal 2760
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
Ou0t%4y=+<p1OPh(a4*vU

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/tile_sub.gif b/upload/style_images/1/tile_sub.gif
index 0b79b4c328d37c327e38385893d40f32502f2d60..d1ef4946b629005fe52c5ccfaf623f55a88cf5f0 100644
GIT binary patch
literal 1581
zcmeH`=~Gh&6vbay8WXkz#Uh)4xQw-kRs^JC2obPYjq*Wkof@oTtAiF1>rzAm5n5%e
zxXd8hX&9&lXS6|<1O!Q5_LaP>Z_7dwvY{P7XB2Ct*gv3uLGOqA<(!#w&u`|I>?qF7
zt4sk>fL8!uu?MC4i7~Yu)H=<!pu*tp2NAV-azKpetlkl&?TG@H>Rq7DX~YA32|AAW
z#$lfU^NYtPgc`@_f<cZ8WY~}l6G*W^3CfqEW_z$7giUxrVRS!L*)*0(wb=t<{xP*f
zW%5YICqx>D$rc;{5gFvtS|;^~PmlNq#c00>9uy-_Rdyp5Fxdj5D!a<)8I&LfETA-b
zAk;rB!~4aE#XhBjy~A>BNRIb`FogJoT8G&dkV7sx<knieTB}!PaEY`IxxuA0dWL1#
zsLEzQ{T9cR)gFWpztujav3dp4g*slo6qAfQ^{CJ4m>QDdV%-E^g778Sh{9&E1@#M|
za(n=UEsh|B2GpiWBj$f1w;Aw&7WVdm$dDW}+XEVlSNtAPP^5A8i4YSWG};0($Zd5j
zAoUn=ztZH^S{KkQ9OizaunmaOF^!!sMkP9@P;FNl-NOpJUxcVlo<R^1NKgn1Xswe&
zGE@(HCAx`GC2qD)4M|b)xKm;Dj4Esp>Qk8~&9*56?jKR$LsCp<^{Gs5q1rJ3qM*((
zrg8L%VBr7xPXcLkVgKsu-tYH60W6vawvm!bd0bIrNK`Fw$SI9TrR3KI^%EWKS2zVd
z=Vp|&d(q326H0r(CMu)zmt5I!l>1xTlFYclD$*%p!`+<n_y$NG9ul9EN7(L6mwwJI
zrN*D0p^2AAB~-zeRMO(|%$Ng$>*S)wh(8h@Y<~W@<Ld3qW!=o)S?=>D{)wE!ifP)T
z+x+I>Aysu+=m%pLHXL|eHVIu8H;2DUZXq<LM{cWQ>1S88EL~Ml%Uaag*|&6gW&K;$
z<6`2G<bt-h6@4uBWy{04{(={8G+b-lx(e>YzXtxakQ)xp#*Q>J6q8$4@B4}^$Z*BA
z?E|QtTcRkY-*Y;so%Be`Cc(jZBE+dXH@zvWDwYPukYYnzeXFUZ^>wdbxPKVl%?3$n
zJ2FnvW8ck{urAK8gny;H6BV*4)sb1W)lrem4$g<0xgDIPHQkk$6Qg<3xW%_}*@<6P
zRl4H#wPmqMS-SvIOXkKyA*m;J3TXi08N4Di|Ba&aXL?9pSL=4l9tQQZR5pjq=$<}I
zt?lMDlPlIjUF6y|g`69VXEUO<aCndK&NuZ;@154}{g>KL+?YE;$aeA=QD-vu&`G(s
zm_?+s&w5DFxz7C!sr7Gu3QfsPV*a=&J&DrOb(6l9zKqB^FT8(uZ~D>u#GSn$IgP_&
z^c1&z5hRyq>^+uvylsBV18Vs_)v=HgXFDxsYsU5Bl#;Gi;iIjd^Ndv_Pwx~@vx*rW
zL182k!l?eV<6&2KmK~2XK4yMAV63^iJ))3DVMKV^6QzPYo<1bLkU=PpxY?h&KB9sl
zqDRMGPh&66n=WfwyrMJ<6unFMlpY<vzC|%Mf2~@ae5CDUXhJleS|mGDwXRUMky9s@
zC*EZ@t^8Jz)kv(-Ov_X$XPq?7C%Kmzh#!q-HHX&Z@@6%sMkWBln#e*RaSes`(hwH^
zu+~tN`gg5y*F_NlNU9cw60ZTmP=NK_g>2w9g_Rw1ko8M83>=0w1I!k}_sOSAMUD8$
XvY9Y=_e*kAc+B3?*6<|+0+9a?q#w(n

delta 132
zcmV-~0DJ$f44VN}M@dFFIbi_+FaX2=0Ke1jpS<I}(e1O!>Z-)&w$1Ci(Cmw>+oize
zld|5Z!{)Kc>AuqKm$l%czT}9h+K;c@y3g#Jx#FzF=(x`7u*m7I#^|-n>XY#S7?TYH
m4Iu#lFaQ7r7~pe2Nh1Xgq7ai+EyGn%ks&ZZuJ3%mhX6YqxJbPK

diff --git a/upload/style_images/1/to_down_pipe.gif b/upload/style_images/1/to_down_pipe.gif
new file mode 100644
index 0000000000000000000000000000000000000000..af1f335ac7bde3512c02e974007749feba16bbc4
GIT binary patch
literal 76
zcmZ?wbhEHb6k!lyXkcV$Z*Twq|G(l-7DfgJMg|=QAOOiQFe&%QH=JI<d%n9MC~f^^
d-Opci<;=65mIh^R348cWDp&lpX@w|*H2`Po8HfM?

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/to_post.gif b/upload/style_images/1/to_post.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba088ec9f11d70009f11eb00d8739c1b8ce7f10d
GIT binary patch
literal 321
zcmV-H0lxl6Nk%w1VF~~X0M$PLWMNtV|Nr>*^Zx(<q@tbq_w@Gk@A~-m|A&Y8_w)Dl
z@%;Pw)6>z^($MAP;qvkC`S|qzx3~Z5>iG8ZkdBD|czFMWgx=oV+uGUx3=I7I`}g+p
z{|O2A_45C6a{od?|K#N8=jPPY(b(72-rd^m?CSsX^YQTQ)6>%X`S}0#_V@Mh|LyJd
z^YHKQ?bFiF(9g{J`S$<1y8jOk_Vw`pPEPy#`2Wet_4M-X?CJLO@c)^a?Ca^exV8UL
zQUCw{A^8LW002J#EC2ui015yL000JFz@JbUFd+f~0$@pj-7>NrV6m`)YO}$>0uUSu
zDb{DekpK(|gHGeCcn|>EWTl8jTs;+_lh_CfI3xf8T@VQc2M-qjKL9N!JUJyH7>oc8
TBQFgi3@D6BOQ8S+KS2OHP{F>;

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/to_post_no_children.gif b/upload/style_images/1/to_post_no_children.gif
new file mode 100644
index 0000000000000000000000000000000000000000..78ebad50eda4d13f4290992a1278a7ea33b70a94
GIT binary patch
literal 73
zcmZ?wbhEHb6k!lyXkcV$Z*Twq|G(l-7DfgJMg|=QAOOiQFe&uNH=JI<d%n9MC~f^^
a-Opci<;=4VbS}#{vF#oA@lP_M4AuZ3R~Z}t

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/to_post_off.gif b/upload/style_images/1/to_post_off.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d99d2ecc14b3704ea314ace661904375f8894086
GIT binary patch
literal 64
zcmZ?wbhEHb<Y3@rn8?8J<khF5(#lU?e=;yIDE?#tk_-$wAOa-Mz$DniFK{U7)}78X
P0hPK}KUM@YFjxZsV9pa&

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/to_post_with_children.gif b/upload/style_images/1/to_post_with_children.gif
new file mode 100644
index 0000000000000000000000000000000000000000..21b8c231a788c34958b8ddb15ec5ce520d6a69db
GIT binary patch
literal 79
zcmZ?wbhEHb6k!lyXkcV$Z*Twq|G(l-7DfgJMg|=QAOOiQFsb#(H=JI<d%n9MC~f^^
g-Opci<;=4VbS}#f&s!T9XK3nP`t^`yg(!nH0Iu^IK>z>%

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/topic_l.gif b/upload/style_images/1/topic_l.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a8836439232ab862bf05a97401b5cb3162fb75be
GIT binary patch
literal 69
zcmZ?wbhEHb6l4%(XkcXUDc|=0|9{1wEQ|~cj0`#qKmd|qV3O(SUwQg1r`!~cpyd2z
W(ciwy9`NY9-ns16sckuo4Aua<#TSwQ

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/topic_selected.gif b/upload/style_images/1/topic_selected.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36b63208815b709d7374a1b39add6c476ba0203c
GIT binary patch
literal 70
zcmZ?wbhEHb<YM4rn8?8J@zK*yPoB?6O8xTumEunp1`yBz5g>U6Ch;l#MyIpy%7qj)
Uwy$JxmJ8!#T;bq1Nrb@~08365GXMYp

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/topic_unselected.gif b/upload/style_images/1/topic_unselected.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0ae33768f258b6fd9ea0d6b1e360707cfab384e2
GIT binary patch
literal 70
zcmZ?wbhEHb<YM4rn8?6z>;B7I4_?QY&%5*Zo#Iax1`yBz5g>U6Ch;l#MyIpy%7qj)
Uwy$JxmJ8!#T;bq1Nrb@~06=pV0ssI2

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/user.gif b/upload/style_images/1/user.gif
index f65e28b89565fbcfda910138d31202eabe4f3a14..28670a11b3f0dbda310c5a6bcc0c47ecd23335f8 100644
GIT binary patch
literal 790
zcmV+x1L^!nNk%w1VH*G&0OkMy|L&@7py6ws-d%~wUyRIKhQ?Tdz*&RCVUN#Rh{?px
z++&f_WtG)SdAw(r*lC*EptZoGtAL%NccH0%+TrVAk<vzTwM%uim5fAan%hx$wo`ey
zUyje7q<Nd5bx?M+o2|EWi<L-lv74^BMs2P^YOGXyyHtC+U5w0dg^n&&mr8K1PIa>?
zQIuno)S<S*V2{pYlG8F-oIz-)mybwPe7j3^wqcLZVUW>Sgv3N{u~vV+FIJdPd%IG4
zxo4Q!Lv62GhQ~;Cw?}lhFIAOSgTqvT!Bc#@Pj|LqkkCnWxLJh6KWC_0iOQU%eNA||
zN_V;}P>@l2xiVUvMs2M}Z?9X2$548?E>)O6W~EPcv^rv=Gh3c5Q<Y41wR?zdUyaQ)
zT%VYaNk3_;kEOL$f4@_FyjFt2qq)RAWTjPnyH<X_aHZ#OqvTV1xva|Xt<3R-xb<w9
z)~(C%Axo0F#nlHYX8+6p000000000000000000000000000000A^8LV00000EC2ui
z02=@s000O7fD{UKgoTEOh=dA)c8!jYkdcprc5#-Mn3<ZEc7%3vprN9pq@bO3c5bSx
ztgWu9r*>+yw6$s{8yX)U8XG6Iv1`J^#A_xZBqb#zA|}MK2GP+wJ}fIMELv14ARsAK
zHPQyL2j%5QVJdWVDl$wX9v&k=X66U61^M|>JQx4~7`mj9Kv05?GWrU{8o-bt5;_3x
z+yOu*ONb5~LfBZ+a6l{qAVFTCBT*uq85b;AxbVbENCL4C$dq|ziWrGBu#ADg6T*-p
zU}nZzK$K_>E=1NvX+dU!(+Mw>1i3*p7K5t{l6ZmmkKz|65yD150|my_SPs(0=mD|h
zL^@k@gfy5t7f0Gy5Arr?>-MdY3V<uP_>ni3fWs)(DPBwm#o@<~V+EL;fkT4Jm@jk4
zFu8N*SZzX!9!<J*=vZu0t6t5zb?R7>V$1gQrnc?dxO3NzHK(`l-@t?Sjs>T<@#Dyo
U7w@D%w)04f1|^!FXi*>lJMPwPi~s-t

literal 1574
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
YRP!Bn<iSTDc=y2v(x$}&ZBRe}JCm+D9RL6T

diff --git a/upload/style_images/1/users.gif b/upload/style_images/1/users.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e303f72d49e704344b065541d80c19256838a73
GIT binary patch
literal 1386
zcmdUu>sQhT0EQvaY+7k8XLc_uHM`6@Yn7*=Sz4J#R1iT+a~deLMrx!eR}rny67iBw
zF2>AjBpQSu$WO3B2?;M*iIlfSMrLh0ySVDV*!$uA^n7^FbIu!j{Mh#glGcINfqn;p
z$|`G-R8?N94UwlLi{Hf2HMz|*Xr?y%_5@L6&1sx^F)^D}XGtnHoVlt`D16Xs7&47m
z`%I(B*9V@C&s?}QH8%P7VuOuPKZB&J<C$7r|6qE}3vAUWo;UuJ@Ks8g`CR#MG+BY+
z7|~3P!u<Xm$9P9Kg`#UPoX2sD?yjMa%E5Vbeot<VzFG59@nlYBc!RAlH>t<7#r8y6
z+rjwC7T{GZNp`K{bw!OZ>C#P7+gvz7jJwv&mf8@xa&8qbw|1aaJBiGbmvq`Gbwk85
zAdM`@YO!ZmJS@IH3-pg>HqExlRHPci+CakK^U191s)A-qaB3Y{@FWnHS#ods4E63c
z#k{h2h$b2-Rn8Sxh^|Pcio_ExyRh8ukL-@AOPrqQ%lERHW;2CjtG>fuuGFLQdypBz
z<-1eA+KHvtkLKL$V@N;bH@;xCT4QOd7_t(Pr@&W_aPK}n%YFp^nO`S=2FsD5nA(+l
z)5*2{FrpMm@5XRVnS$pl_oZXY%{3y4;MZnc<xp*XdmIBmF?-U=O;IFSOr8Ro%uir_
zQq+h2#B(&Uv~H%*KoE>&lxm3O+SD8UaB5fVML`TnjxNyskW`z(F-GUeBa#a!d}A2C
z5m#wO&{QY}kj3o@#Wj#?4Jd{NQ#L>sn&7#L^VLs<^)06^b)04Q1)jc16AVPAu;5g6
zTs{y(R-jqEaEdY_Q-ZHDBk7uWCJ;rumw5xAOFwYbA1G~hTKhX%$9p(Q9-S@I^_ds@
zr7kQifc_`h^e5!YQvc8W`4b@L1<+3aL>i<>Om|-C7w+u1q||XyJ4L;Do4)mm=ianV
z&ttA0dr%&c!>}zb#ru^}4e<{GCf2NvOSAFZ#`UYbjx%PSJ!so*@ZQ%_UAR&0SsrkT
z=9}<P;%nNLBK0f<sgc)RzM){BKWyI-+jR75kWVUZiIXd2K=j62(A)?Mutr6lwAfZ8
z_w@c-9~neB({+)(<S+u8KORJOwEsgb$FY}ha1G;<((U3f|9~S^I1quY)pio?JYEJi
zoO`kixwKb8GoFT$$5mh|ew5&krl}8^@eoNDg>B*=p}o|tOF_1rGqR?NO1Ar~Up&uo
z+oaz!+;3qQy=@PuSn%9kBwuZdhHAiIK?Lulw-ucgG!{|xmkcQ`aJb*cSYX=Dj!<;-
z?iy<A-}{5s@bE?zeW^Z}mr`7v$lvL99$e+VEMpq9<wiJB?_28nEwD{O#6U3cK#SFZ
zJiU3d&*f(qH0ujHk&c+)wH9G9i{<&qB}DY@B{-P!F$5eQP|0L9=r?ZlJ>_ACV9rB$
zx42aj%T_-x#%;Bq59hd!3zmYtyc{GWq79<Rprc#v3@18l=g&WO*!7F_0LY8y3kLQu
zJkqB5tVMjtX*XvA#2pCno2la<P5|yC=tinP@ehi_>Q08=>-sw838!U;f1E3XxUcPI
zdPQ9gH9l&R45t0olpMx)TEhr|s+|&$Vr?+6OTt{0fP<<R!Elz49S0#`mE;K`9q)GV
cYb)RcgL<!kB~NUfmA;z1b-UHg5du2&A9`|e+W-In

literal 0
HcmV?d00001

diff --git a/upload/style_images/1/warn0.gif b/upload/style_images/1/warn0.gif
index 90c30161590caa11f2606c0989c502d6b983c8f7..454f3ab84aaf56232e1f40e6a94be847ca820e96 100644
GIT binary patch
literal 213
zcmZ?wbhEHbG-BXl*v!E2@Wsc4yY4MN{Cvs2$FtU7-g5EF?2T9NJb8EP(c99lH4GR)
z@h1ydOb0}Q%wS+?5|D9u&A2Jb#&p+A_Oe^0Dj8jJ%V%wRcl%hu9G}jG?>VQw-zE2m
zT|}tTF5yCWhE?x5b>papptXU?38$|XZNHbl<Mr>R+U6~{R>Up7&1@EP&y4F`h4sI6
z_rHI(tFEzQX>D_BYj5df>FDX}v^CZ<HJPk6b;@*oMO7I&`T0tV=FOEBWUvMRmls%b

literal 235
zcmV<H02Kd6Nk%w1VKD#+0J9GO*}<Ud$+qjuvhU8e=gF`0(7E=}yYtM#=GMXL$+zLf
ztnACR=*Y6<$FJ|qxBvhDA^8LW000jFEC2ui05Jdw000D-5P?Ynda}-&HP;&kT0nA~
zX97GWny#&@vZf5zs0t`V-zzYlj{sx|eZ}377+eAY4S`hJfJLW*D(gDcLa|vZxC&ql
z&SwV9j2@_2Z1lU_cCYJdz@otCFJOCp1%E7oeS~^~gMf;E01gI`kq$7Bk_MD4mXeu|
lmzb5GlmG#xrU5Xgrm3o^EUm7jtt22HwIa726}BD`06QY-ZRP*~

diff --git a/upload/style_images/1/warn1.gif b/upload/style_images/1/warn1.gif
index 805a3fbcc4540d47160ef417a20b903881d48e68..4ef326cbf7ab55547a87b3d37126299641d6672a 100644
GIT binary patch
literal 301
zcmZ?wbhEHbG-BXlIKsei_1>%C${hivTe9Zdjq5s<GWkmDj<5HheR%ld<HB9{mLGn;
zWZ&Zpw_eOze|gKrFS9pZW!Fl(^W@#FM{i5J)-VtO6o0aSRq238kev*ys~#{Kq;Sf3
zsI1LtS(5X6)y5}>wsJevoM)ccS)kFw(&?;hR2kzYF`=P^E73!(e@)q@Ls^^eycWMB
zYri9)xhi(A)x8fNSmfScy8mf6Gq2*0|GC1P%`HVOt+DORZCy32{Sz9wCr>GwGBtMk
z<Y}{NnCCBO<XXI>Xvxyp<%^fCs$p8cp^<m<mZB|NW4CYKwkyWk&ep-()z`!8@NqvS
VRW%J0L-X@S78i_7%{UYptN|ySd_e#J

literal 321
zcmV-H0lxl6Nk%w1VKD#+0K^^u*}<T+ghA@bw(rii_R+iZ%);}~x$Dca=gF_;*1_-0
zx8%pK;l-@%%eCmpvg*mV)|77OqI1}oX3&&i=$VD!o^9@>c+Rhc*_dp~k6_Z1X5X4{
z!;4zhl5hY2{{R30A^8LW0015UEC2ui05Jdw000HP;1!HyaCr%!u0VpatDC~@OD91`
z?Ryt^fJb3Cd;ow#V!?=1E{{Q{F~FHvt(+f#f#`M_P_7pN28zAq?U)P*WF&BSM!PuJ
z?F(rAe#is&cYXkXcx@ULh=>|m4g-#k4p5Dc1Cc<JkCp(KkZl+dpr9C94F;yB4N#@0
z2B|=+r>+37sBIe-xVRfy3Ix8s3Q)bj1i?VVzs3N_z-<uE&=6Vz)YSq|*45bA*FfCY
TA|)dyGcYnVHRUYlHz5E!j2)T*

diff --git a/upload/style_images/1/warn2.gif b/upload/style_images/1/warn2.gif
index 4a802e4e8b5de0b86b8402cf6305c8315f4a0605..052ac8915e366b42df42a35693132f77d9689dd9 100644
GIT binary patch
literal 315
zcmZ?wbhEHbG-BXlIKsfty5nm=>6W;zQ}>^J$eMHa;fs&Kl{-=<U%7hk)xur(mLGn;
zWZ&ai>o0G)_+|FSt9PEfyKw6TyH?t*M{i5J)-VtO6o0aSRq238kev*yJ03JRq;&Em
zW%3<W-uoeVOM%Vqtt!fa@4s{0JKtX6(|6+W;TbM^v;91dIIMN^xUBV6Yo^7%2PaQ+
z|LfYFy4i&*WB2-;^4ZpzH{L)0b$8zV&({T+nwkq5o102FySgj8dy@OQl7iT$PHUYu
zT_Bcw?!3x*^OG0Ooh-<*VrA>fRkMY;Hf*fixG8zdhGmSqcDL@{vySKBp~^#tlaC%u
ma&i`QJmcUK;2$7-`I4rVfcgzBbrVaY`=$>q9<wSkSOWl-fr<G5

literal 328
zcmV-O0k{4~Nk%w1VKD#+0K^^u*}<T+ghA@bw(rii^U%5T%)<83yX(uc=gF_uly2tM
z!S1Da=$VD+qI1xcVBnr@*qCO{uY}>ntmw$H>dCk4%eCakukXya*_dqBl5fh7VA7Lj
z!;4zqnsERB{{R30A^8LW0015UEC2ui05Jdw000HWU=)mG5P4!bo(kZ;fa0~VE7P?S
zWK7>@0ng6&3j!#GWRe2#9F@!F6Uq#599S$TXw7Pk5`<VRk%q^JvhzGH2Q-j)T*HOS
zA#|tZz~@_}dwmCgdV+%h0UHmCiyK^uj1P`Z69bl(6H=9z1DTYZoro9>q@);Jqooa}
zP89^NuN6|RumrNLwYG>I3%$J^T)e&uz)lwi$jBE`$H@lE#?H@(3DwpKT-Vk{0^QyM
aQs3U;;@~MNC+8(BH8wNtG4JgPApkp1z@WVV

diff --git a/upload/style_images/1/warn3.gif b/upload/style_images/1/warn3.gif
index 356461c294d8eb207b4f4650c39464ac3c49e58d..5cace5705e70e1b869435bf38bd13a59c789b86a 100644
GIT binary patch
literal 314
zcmZ?wbhEHbG-BXlIKsd%d*jtv>o0G)_~qe?j|+F*yZ`LN^25)U?0bCY$-AsMcY`Z;
zq)fgN*LA9O$Jc<;Em!Zoy7lO7Y1f(yw_dPor7;iz6o0aSRq238kev*y+Y>%|r2G^~
z%3QQqYc4a>SrelpCAK!f@4xfkJ1;IHBsg)2QKy66RF0D_j%)oqE^B?&x|*jtfg{1E
z@63@W8zXOJ?A|H-U0ORo{&3Ttdp*~mUl-<SYA$GQiD+vo7i8(}tLf?MZQ!0dtzg>p
zh?!Hn+2=2quwbD;5a;q01uIrYtX|&DwsF&hO`Der^X=SKuxoe3-ksfyhmTA+a#X;{
k&DBl#%xOP=LElS0ntJNjwQlO(X0@;sFneHWrpRCo08ToCk^lez

literal 334
zcmV-U0kQr^Nk%w1VKD#+0K^^uw1h#~!JyWZZs4A6=$VD+qI1}oX3&&i?xlF@$+pg~
zgy+ex_R+iR%d+##!t>C%@6NX7*1_4BY{QFM-<ojBk6_l4Z_<-y;l-@#$+zswweQTg
z<j1e*$g=<c{{R30A^8LW0015UEC2ui05Jdw000HcpaP5}pm<_Ao~e39K`aN62hVW?
zSVZ4j0ME|%3l51uPaxxHHZuVw)9HW$CWmZxV#I0>T%lJR4qz5&G$v|Js{??FVLq=I
z<#dBxh^OxZ91Vhk9BhGu4TS&~1C5OrMvRUFkV2A<l>r?PoSYqOo1GA!01^eKrxHe{
zs0FG*tf;R68V|O%8f>+<54ivo2*JS=M!>=d#6rfx$pIS-(9j!f&(RFi00P?E0!G~1
g-rwCy3FYPqZ0F_yEhQ`}D=6?LHaI!;_7NcfJJbf5VE_OC

diff --git a/upload/style_images/1/warn4.gif b/upload/style_images/1/warn4.gif
index dd5f4642be58c299714f02a89e96350733482841..7128905d366194270eaff1b45e234d606626cad2 100644
GIT binary patch
literal 302
zcmZ?wbhEHbG-BXlIKsei=gGU-8?SD;_+|Ow=S%iIUbyStto4^4zW8|m*@vt-cW*s<
z8(g^~W%8A{u2Zc$z6O+TDeYQw_1>!sw_dPor7;iz6o0aSRq238kev*ys}+PiQzR9W
zG8Zk@n!B=Et|96E0YTrI^X}I1{2DTB-GU4$Cu5jYCbyPYDY`Ddq$M(YYms;;tBQl3
zvq(UD)!MmhZeH8IOSim5v1!jgp4=b*bL$(zn(7)`%UQd+YlM0FC*)3;7&f_o(zJ4x
z*>ie1=P$@zurO@#{6)*knOCpr<zK%ccf-c8&FeR9D`(riC*9r2#Z~yA$9_9cUtb18
VEd$-NI(qsSjW|rqE!Y(qtO5A&b^ZVV

literal 319
zcmV-F0l@x8Nk%w1VKD#+0K^^uw1h#~!JyWZZtkUc=%RDro^8;SVAz;u=$VDiuY}5v
zVA7Lj!;4zkm~7vgaMqG<>dChA(7E%>!uHX-=gF_@%d+pzw&vEs@65OA$+zswwc*9A
z=*Y6<$FKkY{{R30A^8LW0015UEC2ui05Jdw000HNU;>OJka%J_o~g>Jt9J!-9bCYJ
z?E3?FIbQD<6#9TV<1dhrIGvdQfMKXs8APhpfCXx;-RYLQ+)&QvjZ|@Hw-rRT`v3>Z
z-F3kIz3f!}e;rZ_1%-tRM1+O~h(L;ljR22_OB@!LmmE?J1f87?M4X-kpg^LYr2wa&
zOBxZcuNqPg1GTjdM6|X8xIntLy#T+rOBfT!#~4xq%*_Hs&dt!#&p_1G0T9~T5CJVE
RFEHUQC@>~6HZ>O^06W<inlk_Z

diff --git a/upload/style_images/1/warn5.gif b/upload/style_images/1/warn5.gif
index d6ea72ad3098b3e0f671366f478e3c3a756f7025..eb140bebb09a047a47c7b6ab8e8f018b192eb2d2 100644
GIT binary patch
literal 213
zcmZ?wbhEHbG-BXl*v!Ci|JjGEId_9Acce_d64!OAb;s9$(k)l-y}EGg1-n)n0|rq1
z$pRMB0g)gx7+9JFWL#b|Zi=!o-8GZF>{h8tMwi_3S)1P7K2|Wtr*px3&Z+Nr$vt8h
z5vsIHxDcLU)q76eII1CNZJ=`E>8nNC@8$1!{ky5QdCRR8af@#=o5kESV|!O&{cqj<
x@1O0eYwXxs+uYjPTRPb~dipwTjrB}TCTmTdGF@L$RYp#JzS5$3bEO3ttO0v7Q~Uq`

literal 235
zcmV<H02Kd6Nk%w1VKD#+0J9GOw1h#{ly2^&c;KFG=$VDklwjzhbJ&<>&aZ^ll5fh7
zVBeZ>!;4zdlV;hNZ2$lNA^8LW000jFEC2ui05Jdw000D-5P?Ynda}-&HP;&kT0laa
zX97GWny#&@vZf5zs0uJe-!m|tuK;8TeZ}377+eAYii1?DfJLW=D(gDcLa|vZxC&?t
z&gTZqj2@_2Z1lU_cCYJdfWyG&J79Z#27fGpeS~^~gMf;E01E<<kqa=8k^+=0mXeu|
lmzb5GlmG#xrU5Xgrm3o^EUm7jtt22HwIa726}BD`06WO<W+DIp

diff --git a/upload/style_images/1/warn_add.gif b/upload/style_images/1/warn_add.gif
index f27e0cf3867de5de7de7bf3bc0ac4bca8ea96356..7addbfe0b73234976b68dbb1a85460abf2abb2cb 100644
GIT binary patch
literal 120
zcmZ?wbhEHb<YM4r*v!Ci|JnPWy}bt*8P78^-eX|6eD~$;xVUpSo~5y~GhhRXKUu)S
zIv^5c1_O(#z!c}~i5jnMCjL}#QgqDhVpm$D)5TNpMyTX%)5E}=+oqvYyjd8m0RZM9
A+W-In

literal 130
zcmZ?wbhEHb<YM4t*v!wc#oh7$|NqzW>R+@jdr{nUBdy><Li)M(mUk6h*YcYVM<w1b
zXgrmWc`2><W=<7QrQ%N(Mg|6c1|0?<0GYwSqW?kGLED0V$-zpdnMo1{S2QpLiyS<)
hz*pfk?<)b92J0713XS)fR5hen7j(83buchk0|0?|G|d12

diff --git a/upload/style_images/1/warn_minus.gif b/upload/style_images/1/warn_minus.gif
index 2a3ed9c9f8426d54d1a9dd5d3cfd9d7432d65d66..0b18c08018c6ce512c9a05ae4353ddcb2b02f1d2 100644
GIT binary patch
literal 121
zcmZ?wbhEHb<YM4r*v!D7p2mLt*||F}FBfhJXgd|R<!fu{j^G)0v-+>3Jbizk0Rt%h
zWC4rmfJl%T3@mB}oerxfD7?05{Hfr;=$hHZ=&(kIOQGP6T*+I$3O%mdWxk@PRGAp8
E0fH?hA^-pY

literal 125
zcmZ?wbhEHb<YM4t*v!Y^xW%>cTHf*(t^fc3?|xU2c_E?YMRC!MwCqy}E$7;j4oB78
z%xS(~&~hywsDOciLGdRGBLf2;gAS0*05XGtMa!Vk)3Inl=U(XpUW#3(*cIGoDXAIl
b(eKuEi`7?ieq)`?b|B$_@=6~)K?Z98?qx7E

diff --git a/upload/upgrade/core/functions.php b/upload/upgrade/core/functions.php
new file mode 100644
index 00000000..4ff9584f
--- /dev/null
+++ b/upload/upgrade/core/functions.php
@@ -0,0 +1,727 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE LOADER
+|   > Script written by Matt Mecham
+|   > Date started: 21st April 2004
+|   > Interesting fact: Radiohead rock (still)
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class core_functions
+{
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function core_functions()
+	{
+	
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// FINISH _EVERYTHING_
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>IPB Upgrade Complete!</div>
+			 <div class='tdrow1' style='padding:6px'>You have now been upgraded!
+			 <br /><br />
+			 You may want to disable permissions on the script 'upgrade/index.php' to increase security or rename the 'upgrade' directory.
+			 </div>
+			</div>
+			";
+		
+		$ibforums->template->output();
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD SETTINGS
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_settings()
+	{
+		global $ibforums, $DB, $std;
+		
+		$updated     = 0;
+		$inserted    = 0;
+		$need_update = array();
+		
+		if ( ! @file_exists( THIS_PATH.'upg_'.$ibforums->current_version.'/ipb_settings_partial.xml' ) )
+		{
+			$ibforums->core->redirect( "index.php?act=recache&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "No settings to import or update, proceeding to rebuild caches..." );
+		}
+		
+		$content = implode( '', @file( THIS_PATH.'upg_'.$ibforums->current_version.'/ipb_settings_partial.xml' ) );
+		
+		//-------------------------------
+		// Get current settings.
+		//-------------------------------
+		
+		$cur_settings = array();
+		
+		$DB->simple_construct( array( 'select' => 'conf_id, conf_key',
+									  'from'   => 'conf_settings',
+									  'order'  => 'conf_id' ) );
+		
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$cur_settings[ $r['conf_key'] ] = $r['conf_id'];
+		}
+		
+		//-------------------------------
+		// Get xml mah-do-dah
+		//-------------------------------
+		
+		require( KERNEL_PATH.'class_xml.php' );
+
+		$xml = new class_xml();
+		
+		//-------------------------------
+		// Unpack the datafile
+		//-------------------------------
+		
+		$xml->xml_parse_document( $content );
+		
+		//-------------------------------
+		// pArse
+		//-------------------------------
+		
+		$fields = array( 'conf_title'   , 'conf_description', 'conf_group'    , 'conf_type'    , 'conf_key'        , 'conf_default',
+						 'conf_extra'   , 'conf_evalphp'    , 'conf_protected', 'conf_position', 'conf_start_group', 'conf_end_group',
+						 'conf_help_key', 'conf_add_cache' );
+		
+		foreach( $xml->xml_array['settingexport']['settinggroup']['setting'] as $id => $entry )
+		{
+			$newrow = array();
+			
+			//-----------------------------------
+			// Make PHP slashes safe
+			//-----------------------------------
+			
+			$entry['conf_evalphp']['VALUE'] = str_replace( '\\', '\\\\', $entry['conf_evalphp']['VALUE'] );
+			
+			foreach( $fields as $f )
+			{
+				$newrow[$f] = $entry[ $f ]['VALUE'];
+			}
+			
+			if ( $cur_settings[ $entry['conf_key']['VALUE'] ] )
+			{
+				//-----------------------------------
+				// Update
+				//-----------------------------------
+				
+				$DB->do_update( 'conf_settings', $newrow, 'conf_id='.$cur_settings[ $entry['conf_key']['VALUE'] ] );
+				$updated++;
+			}
+			else
+			{
+				//-----------------------------------
+				// INSERT
+				//-----------------------------------
+				
+				$DB->do_insert( 'conf_settings', $newrow );
+				$inserted++;
+			}
+			
+			$need_update[ $entry['conf_group']['VALUE'] ] = $entry['conf_group']['VALUE'];
+		}
+		
+		//-----------------------------------------
+		// Update group counts...
+		//-----------------------------------------
+		
+		if ( count( $need_update ) )
+		{
+			foreach( $need_update as $id )
+			{
+				$conf = $DB->simple_exec_query( array( 'select' => 'count(*) as count', 'from' => 'conf_settings', 'where' => 'conf_group='.$id ) );
+			
+				$count = intval($conf['count']);
+				
+				$DB->do_update( 'conf_settings_titles', array( 'conf_title_count' => $count ), 'conf_title_id='.$id );
+			}
+		}
+		
+		//-----------------------------------
+		// Boink..
+		//-----------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=recache&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$updated settings updated $inserted settings inserted, proceeding to rebuild caches..." );
+
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD TEMPLATES
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_templates_cache()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------
+		// Get ACP library
+		//-----------------------------------
+	
+		require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+		$acp = new admin_cache_functions();
+		
+		$justdone = intval($ibforums->input['justdone']);
+		$justdone = $justdone ? $justdone : 1;
+		
+		//-----------------------------------
+		// Get skins
+		//-----------------------------------
+		
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'skin_sets',
+									  'where'  => 'set_skin_set_id > '.$justdone,
+									  'order'  => 'set_skin_set_id',
+									  'limit'  => array( 0, 1 )
+						     )      );
+						     
+		$DB->simple_exec();
+		
+		//-----------------------------------
+		// Got a biggun?
+		//-----------------------------------
+		
+		$r = $DB->fetch_row();
+		
+		if ( $r['set_skin_set_id'] )
+		{
+			$acp->_rebuild_all_caches( array($r['set_skin_set_id']) );
+			
+			$extra = implode( "<br />", $acp->messages );
+			
+			$ibforums->core->redirect( "index.php?act=templatescache&justdone={$r['set_skin_set_id']}&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "Rebuild cache for skin set {$r['set_name']}<br />{$extra}<br />Proceeding to the next skin..." );
+		}
+		else
+		{
+			$ibforums->core->redirect( "index.php?act=finish&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "No more skins to rebuild..." );
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD TEMPLATES
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_templates()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-----------------------------------
+		// Get XML
+		//-----------------------------------
+		
+		require_once( KERNEL_PATH.'class_xml.php' );
+		
+		$xml = new class_xml();
+		
+		//-----------------------------------
+		// Get XML file (TEMPLATES)
+		//-----------------------------------
+		
+		$xmlfile = ROOT_PATH.'ipb_templates.xml';
+		
+		$setting_content = implode( "", file($xmlfile) );
+		
+		//-------------------------------
+		// Unpack the datafile (TEMPLATES)
+		//-------------------------------
+		
+		$xml->xml_parse_document( $setting_content );
+		
+		//-------------------------------
+		// (TEMPLATES)
+		//-------------------------------
+		
+		if ( ! is_array( $xml->xml_array['templateexport']['templategroup']['template'] ) )
+		{
+			install_error("Error with ipb_templates.xml - could not process XML properly");
+		}
+	
+		foreach( $xml->xml_array['templateexport']['templategroup']['template'] as $id => $entry )
+		{
+			
+			$row = $DB->simple_exec_query( array( 'select' => 'suid',
+												  'from'   => 'skin_templates',
+												  'where'  => "group_name='{$entry[ 'group_name' ]['VALUE']}' AND func_name='{$entry[ 'func_name' ]['VALUE']}' and set_id=1"
+										 )      );
+			
+			if ( $row['suid'] )
+			{
+				$DB->do_update( 'skin_templates', array( 'func_data'       => $entry[ 'func_data' ]['VALUE'],
+														 'section_content' => $entry[ 'section_content' ]['VALUE'],
+														 'updated'         => time()
+													   )
+											    , 'suid='.$row['suid'] );
+			}
+			else
+			{
+				$DB->do_insert( 'skin_templates', array( 'func_data'       => $entry[ 'func_data' ]['VALUE'],
+														 'func_name'       => $entry[ 'func_name' ]['VALUE'],
+														 'section_content' => $entry[ 'section_content' ]['VALUE'],
+														 'group_name'      => $entry[ 'group_name' ]['VALUE'],
+														 'updated'         => time(),
+														 'set_id'          => 1
+							 )                         );
+			}
+		}
+		
+		//-----------------------------------
+		// Boink..
+		//-----------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=templatescache&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "Master templates rebuilt, proceeding to recache templates..." );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// REBUILD CACHES
+	/*-------------------------------------------------------------------------*/
+	
+	function rebuild_caches()
+	{
+		global $ibforums, $DB, $std;
+		
+		//-------------------------------------------------------------
+		// BBCODE
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['bbcode'] = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'custom_bbcode' ) );
+		$bbcode = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($bbcode) )
+		{
+			$ibforums->cache['bbcode'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'bbcode', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// Forum cache
+		//-------------------------------------------------------------
+		
+		$std->update_forum_cache();
+			
+		//-------------------------------------------------------------
+		// Group Cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['group_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => "*",
+									  'from'   => 'groups'
+							 )      );
+		
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// Systemvars
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['systemvars'] = array();
+		
+		$result = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'mail_queue' ) );
+		
+		$ibforums->cache['systemvars']['mail_queue'] = intval( $result['cnt'] );
+		$ibforums->cache['systemvars']['task_next_run'] = time() + 3600;
+		
+		$std->update_cache( array( 'name' => 'systemvars', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Ranks
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['ranks'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+									  'from'   => 'titles',
+									  'order'  => "posts DESC",
+							)      );
+							
+		$DB->simple_exec();
+					
+		while ($i = $DB->fetch_row())
+		{
+			$ibforums->cache['ranks'][ $i['id'] ] = array(
+														  'TITLE' => $i['title'],
+														  'PIPS'  => $i['pips'],
+														  'POSTS' => $i['posts'],
+														);
+		}
+		
+		$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		
+		//-------------------------------------------------------------
+		// SETTINGS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['settings'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+		$info = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($info) )
+		{
+			$ibforums->cache['settings'][ $r['conf_key'] ] = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+		}
+		
+		$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// EMOTICONS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['emoticons'] = array();
+				
+		$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['emoticons'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// LANGUAGES
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['languages'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['languages'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// ATTACHMENT TYPES
+		//-------------------------------------------------------------
+			
+		$ibforums->cache['attachtypes'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		$ibforums->core->redirect( "index.php?act=templates&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "Caches rebuilt, proceeding to rebuild templates..." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// MODULE RUN - Look for next, or finish up...
+	/*-------------------------------------------------------------------------*/
+	
+	function module_complete()
+	{
+		global $ibforums, $DB, $std;
+		
+		//------------------------------------------
+		// Update DB
+		//------------------------------------------
+		
+		$DB->do_insert( 'upgrade_history', array( 'upgrade_version_id'    => $ibforums->current_upgrade,
+												  'upgrade_version_human' => $ibforums->versions[ $ibforums->current_upgrade ],
+												  'upgrade_date'          => time(),
+												  'upgrade_mid'           => $ibforums->input['mid']
+				      )                         );
+				      
+		//------------------------------------------
+		// Anymore to run?
+		//------------------------------------------
+		
+		if ( $ibforums->last_poss_id != $ibforums->current_upgrade )
+		{
+			$ibforums->core->redirect( "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "Upgrade module complete, moving on to the next upgrade module...." );
+		}
+		else
+		{
+			$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>IPB Upgrade Complete</div>
+			 <div class='tdrow1' style='padding:6px'>You have now been upgraded from {$ibforums->versions[$ibforums->current_version]} to {$ibforums->versions[$ibforums->current_upgrade]}
+			 <br /><br />
+			 The next few final steps will check for updated settings and recache your cached data (forums, groups, moderators, etc) and rebuild your master templates to ensure
+			 that all the template additions and modifications are updated.
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='index.php?act=settings&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			";
+		
+			$ibforums->template->output();
+		
+		}										  
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Redirect
+	/*-------------------------------------------------------------------------*/
+	
+	function redirect($url, $text, $time=2)
+	{
+		global $ibforums, $DB, $std;
+		
+		
+		$ibforums->template->content .= "<meta http-equiv='refresh' content=\"{$time}; url={$url}\">
+										 <div class='tableborder'>
+										 <div class='maintitle'>Redirecting</div>
+										 <div class='tdrow1' style='padding:8px'>
+										  <div style='font-size:12px'>$text
+										  <br />
+										  <br />
+										  <center><a href='{$url}'>Click here if not redirected...</a></center>
+										  </div>
+										 </div>
+										</div>";
+		
+		$ibforums->template->output("Redirecting...");
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SHOW LOG IN SCREEN
+	/*-------------------------------------------------------------------------*/
+	
+	function login_screen($msg='')
+	{
+		global $ibforums, $DB, $std;
+		
+		if ( ! file_exists( ROOT_PATH.'ipb_templates.xml' ) )
+		{
+			$msg .= "<div><b>Cannot locate XML templates</b><br />This should be located in 'ipb_templates.xml' please ensure this file is uploaded (recreating the file structure if needed) before continuing.
+					 <br /><strong>Failure to upload this file will mean that your templates will not be updated.</strong></div>";
+		}
+		
+		if ( $msg != "" )
+		{
+			$msg = "<div class='warnbox'>$msg</div><br />";
+		}
+		
+		$ibforums->template->content .= "
+				<form action='index.php?act=login' method='post' name='theAdminForm'>
+				{$msg}
+				<div>
+				<strong>You must log in with your forums administrative log in details to access the upgrade system.
+				<br />Upgrading from {$ibforums->versions[$ibforums->current_version]} to  {$ibforums->versions[$ibforums->current_upgrade]}</strong>
+				</div>
+				<br />
+				<div class='tableborder'>
+				<div class='maintitle'>Verification Required - Please Log In</div>
+				<table width='100%' cellspacing='0' cellpadding='5' align='center' border='0'>
+				<tr>
+				<td class='tdrow1'  width='40%'  valign='middle'>Your Forums Username:</td>
+				<td class='tdrow2'  width='60%'  valign='middle'><input type='text' style='width:100%' name='username' value=''></td>
+				</tr>
+				<tr>
+				<td class='tdrow1'  width='40%'  valign='middle'>Your Forums Password:</td>
+				<td class='tdrow2'  width='60%'  valign='middle'><input type='password' style='width:100%' name='password' value=''></td>
+				</tr>
+				<tr>
+				<td class='pformstrip' colspan='2'><div align='center'><input type='submit' value='Log in' id='button' accesskey='s'></div></td>
+				</tr>
+				</table>
+				</div>
+				</form>";
+				
+		$ibforums->template->output("Log In");
+
+	}
+
+	/*-------------------------------------------------------------------------*/
+	// Authorise da membah
+	/*-------------------------------------------------------------------------*/
+	
+	function get_member()
+	{
+		global $std, $DB, $ibforums;
+		
+		$member = array( 'id' => 0 );
+		
+		$ibforums->loginkey  = $this->check_md5( $ibforums->input['loginkey']  );
+		$ibforums->securekey = $this->check_md5( $ibforums->input['securekey'] );
+		$ibforums->member_id = trim(intval($ibforums->input['mid'] ) );
+		
+		if ( ! $ibforums->loginkey or ! $ibforums->securekey )
+		{
+			return $member;
+		}
+		
+		$DB->query( "SELECT m.*, g.* FROM ibf_members m
+					  LEFT JOIN ibf_groups g ON ( m.mgroup=g.g_id )
+					 WHERE member_login_key='{$ibforums->loginkey}' and id='{$ibforums->member_id}'" );
+		
+		$member = $DB->fetch_row();
+		
+		return $member;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get the current version and the next version to upgrade to..
+	/*-------------------------------------------------------------------------*/
+	
+	function get_version_latest()
+	{
+		global $ibforums;
+		
+		$ibforums->current_version = '';
+		$ibforums->current_upgrade = '';
+		
+		//------------------------------------------
+		// Copy & pop DB array and get next
+		// upgrade script
+		//------------------------------------------
+		
+		$tmp = $ibforums->db_contents;
+		
+		$ibforums->current_version = array_pop( $tmp );
+		
+		//------------------------------------------
+		// Get the next upgrade script
+		//------------------------------------------
+		
+		ksort( $ibforums->dir_contents );
+		
+		foreach( $ibforums->dir_contents as $i => $a )
+		{
+			if ( $a > $ibforums->current_version )
+			{
+				if ( ! $ibforums->current_upgrade )
+				{
+					$ibforums->current_upgrade  = $a;
+				}
+				
+				$ibforums->modules_to_run[] = $ibforums->versions[ $a ];
+			}
+		}		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// GET INFO FROM THE DERTABASTIC
+	/*-------------------------------------------------------------------------*/
+	
+	function get_db_structure()
+	{
+		global $std, $DB, $ibforums;
+		
+		$vers = array();
+		
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'upgrade_history', 'order' =>  'upgrade_version_id ASC' ) );
+		$DB->simple_exec();
+		
+		while( $r = $DB->fetch_row() )
+		{
+			$vers[ $r['upgrade_version_id'] ] = $r['upgrade_version_id'];
+		}
+		
+		return $vers;
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Get dir structure..
+	/*-------------------------------------------------------------------------*/
+	
+	function get_dir_structure()
+	{
+		$return = array();
+		
+		//------------------------------------------
+ 		// Get the folder names
+ 		//------------------------------------------
+ 		
+ 		$dh = opendir( THIS_PATH );
+ 		
+ 		while ( $file = readdir( $dh ) )
+ 		{
+			if ( is_dir( THIS_PATH."/".$file ) )
+			{
+				if ( $file != "." && $file != ".." )
+				{
+					if ( strstr( $file, 'upg_' ) )
+					{
+						$tmp = str_replace( "upg_", "", $file );
+						$return[ $tmp ] = $tmp;
+					}
+				}
+			}
+ 		}
+ 		
+ 		closedir( $dh );
+ 		
+ 		sort($return);
+ 		
+ 		return $return;
+	}
+
+	/*-------------------------------------------------------------------------*/
+	// Check to see if its a 'real' MD5
+	/*-------------------------------------------------------------------------*/
+	
+	function check_md5($t)
+	{
+		$t = preg_replace( "#[^a-z0-9]#", "", trim($t) );
+		
+		if ( strlen($t) != 32 )
+		{
+			return '';
+		}
+		else
+		{
+			return $t;
+		}
+	}
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/core/template.php b/upload/upgrade/core/template.php
new file mode 100644
index 00000000..dc25f636
--- /dev/null
+++ b/upload/upgrade/core/template.php
@@ -0,0 +1,124 @@
+<?php
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE TEMPLATE MODULES
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class template
+{
+	var $content  = "";
+	
+	function output($title='')
+	{
+		print $this->print_top($title);
+		print $this->content;
+		print "<br><br><br><br><center><span id='copy'><a href='http://www.invisionboard.com'>Invision Power Board</a> &copy; 2004 <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a></span></center>
+			   </div></body>
+			   </html>";
+		exit();
+	}
+	
+	//--------------------------------------
+
+	function print_top($title="")
+	{
+	
+		return "<html>
+		          <head><title>Invision Power Board Upgrade System :: $title </title>
+		          <style type='text/css'>
+		          	
+		          	BODY		          	
+		          	{
+		          		font-size: 11px;
+		          		font-family: Verdana, Arial;
+		          		color: #000;
+		          		margin: 0px;
+		          		padding: 0px;
+		          		background-image: url(../install/img/fadebg.jpg);
+		          		background-repeat: no-repeat;
+		          		background-position: right bottom;
+		          	}
+		          	
+		          	TABLE, TR, TD     { font-family:Verdana, Arial;font-size: 11px; color:#000 }
+					
+					a:link, a:visited, a:active  { color:#000055 }
+					a:hover                      { color:#333377;text-decoration:underline }
+					
+					.centerbox { margin-right:10%;margin-left:10%;text-align:left }
+					
+					.warnbox {
+							   border:1px solid #F00;
+							   background: #FFE0E0;
+							   padding:6px;
+							   margin-right:10%;margin-left:10%;text-align:left;
+							 }
+					
+					.tablepad    { background-color:#F5F9FD;padding:6px }
+				    .description { color:gray;font-size:10px }
+					.pformstrip { background-color: #D1DCEB; color:#3A4F6C;font-weight:bold;padding:7px;margin-top:1px;text-align:left }
+					.pformleftw { background-color: #F5F9FD; padding:6px; margin-top:1px;width:50%; border-top:1px solid #C2CFDF; border-right:1px solid #C2CFDF; }
+					.pformright { background-color: #F5F9FD; padding:6px; margin-top:1px;border-top:1px solid #C2CFDF; }
+
+					.tableborder { border:1px solid #345487;background-color:#FFF; padding:0px; margin:0px; width:100% }
+
+					.maintitle { text-align:left;vertical-align:middle;font-weight:bold; color:#FFF; letter-spacing:1px; padding:8px 0px 8px 5px; background-image: url(../install/img/tile_back.gif) }
+					.maintitle a:link, .maintitle  a:visited, .maintitle  a:active { text-decoration: none; color: #FFF }
+					.maintitle a:hover { text-decoration: underline }
+					
+					#copy { font-size:10px }
+										
+					#button   { background-color: #4C77B6; color: #FFFFFF; font-family:Verdana, Arial; font-size:11px }
+					
+					#textinput { background-color: #EEEEEE; color:Ê#000000; font-family:Verdana, Arial; font-size:11px; width:100% }
+					
+					#dropdown { background-color: #EEEEEE; color:Ê#000000; font-family:Verdana, Arial; font-size:10px }
+					
+					#multitext { background-color: #EEEEEE; color:Ê#000000; font-family:Courier, Verdana, Arial; font-size:10px }
+					
+					#logostrip {
+								 padding: 0px;
+								 margin: 0px;
+								 background: #7AA3D0;
+							   }
+							   
+					.fade					
+					{
+						background-image: url(../install/img/fade.jpg);
+						background-repeat: repeat-x;
+					}
+					
+				  </style>
+				  </head>
+				 <body marginheight='0' marginwidth='0' leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>
+				 
+				 <div id='logostrip'><img src='../install/img/title.gif' border='0' alt='Invision Power Board Installer' /></div>
+				 <div class='fade'>&nbsp;</div>
+				 <br />
+				 <div style='padding:10px'>
+				 ";
+				  	   
+	}
+}
+?>
\ No newline at end of file
diff --git a/upload/upgrade/index.php b/upload/upgrade/index.php
new file mode 100644
index 00000000..811b7477
--- /dev/null
+++ b/upload/upgrade/index.php
@@ -0,0 +1,419 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE LOADER
+|   > Script written by Matt Mecham
+|   > Date started: 21st April 2004
+|   > Interesting fact: Radiohead rock (still)
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+define( 'THIS_PATH'  , './'  );
+define( 'ROOT_PATH'  , "../" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+define( 'CACHE_PATH' , ROOT_PATH );
+
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define ( 'IN_IPB', 0 );
+define ( 'IN_DEV', 0 );
+define ( 'SAFE_MODE_ON', 0 );
+ 
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+
+//===========================================================================
+// MAIN PROGRAM
+//===========================================================================
+
+//--------------------------------
+// Import $INFO, now!
+//--------------------------------
+
+$INFO = array();
+
+require ROOT_PATH."conf_global.php";
+
+//--------------------------------
+// The clocks a' tickin'
+//--------------------------------
+		
+$Debug = new Debug;
+$Debug->startTimer();
+
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
+
+$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mysql' : $INFO['sql_driver'];
+$INFO['sql_driver'] = strtolower($INFO['sql_driver']);
+
+if ( ! @file_exists( ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_admin_queries.php' ) )
+{
+	print "Cannot find the file: ".ROOT_PATH.'sources/sql/'.$INFO['sql_driver']."_admin_queries.php - make sure the file exists before continuing.";
+	exit();
+}
+
+require ( KERNEL_PATH.'class_db_'.strtolower($INFO['sql_driver']).".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.$INFO['sql_driver'].'_admin_queries.php';
+$DB->obj['use_shutdown']     = 0;
+$DB->obj['debug']            = 0;
+
+//-----------------------------------
+// Required vars?
+//-----------------------------------
+
+if ( is_array( $DB->connect_vars ) and count( $DB->connect_vars ) )
+{
+	foreach( $DB->connect_vars as $k => $v )
+	{
+		$DB->connect_vars[ $k ] = $INFO[ $k ];
+	}
+}
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+//--------------------------------
+// Wrap it all up in a nice easy to
+// transport super class
+//--------------------------------
+
+$ibforums = new info();
+
+//--------------------------------
+// Require our global functions
+//--------------------------------
+
+require ROOT_PATH."sources/functions.php";
+require KERNEL_PATH."class_converge.php";
+require THIS_PATH."core/functions.php";
+require THIS_PATH."core/template.php";
+
+$std    = new FUNC;
+
+//--------------------------------
+//  Set up our vars
+//--------------------------------
+
+$ibforums->input    = $std->parse_incoming();
+$ibforums->core     = new core_functions();
+$ibforums->template = new template();
+
+//--------------------------------
+// Get dir contents
+//--------------------------------
+
+$ibforums->dir_contents = $ibforums->core->get_dir_structure();
+
+//--------------------------------
+// Get DB contents
+//--------------------------------
+
+$ibforums->db_contents  = $ibforums->core->get_db_structure();
+
+//--------------------------------
+// Get latest ID...
+//--------------------------------
+
+$ibforums->last_poss_id = array_shift( array_reverse($ibforums->dir_contents) );
+
+//--------------------------------
+// Get datafile
+//--------------------------------
+
+if ( ! $ibforums->last_poss_id )
+{
+	$ibforums->core->login_screen( "An error has occured, we are unable to determine the current version or if there are any required upgrade files left to run" );
+}
+
+if ( file_exists( THIS_PATH.'upg_'.$ibforums->last_poss_id.'/version_history.php' ) )
+{
+	require_once( THIS_PATH.'upg_'.$ibforums->last_poss_id.'/version_history.php' );
+	
+	$ibforums->versions = $import_versions;
+}
+else
+{
+	$ibforums->core->login_screen( "Could not locate the required upgrade script: 'upg_{$ibforums->last_poss_id}/version_history.php'");
+}
+
+//--------------------------------
+// Version logic check
+//--------------------------------
+
+$ibforums->core->get_version_latest();
+
+if ( ! $ibforums->current_version )
+{
+	$ibforums->core->login_screen( "An error has occured, we are unable to determine the current version or if there are any required upgrade files left to run" );
+}
+				
+if ( ! $ibforums->input['act'] )
+{
+	if ( $ibforums->current_version >= $ibforums->current_upgrade )
+	{
+		$ibforums->core->login_screen( "This IPB installation is up-to-date and there are no more upgrades required" );
+	}
+}
+
+//--------------------------------
+//  Get our loverly member
+//--------------------------------
+
+$ibforums->member = $ibforums->core->get_member();
+
+//--------------------------------
+//  Set converge
+//--------------------------------
+
+$ibforums->converge = new class_converge( $DB );
+
+//--------------------------------
+// Log in?
+//--------------------------------
+
+if ( $ibforums->input['act'] != 'login' )
+{
+	if ( ! $ibforums->member['id'] )
+	{
+		$ibforums->core->login_screen("You do not have access to this upgrade system.");
+	}
+	
+	if ( $std->return_md5_check() != $ibforums->securekey )
+	{
+		$ibforums->core->login_screen("You do not have access to this upgrade system!");
+	}
+	
+	if ( ! $ibforums->member['g_access_cp'] )
+	{
+		$ibforums->core->login_screen('You must be an admin to access this upgrade script');
+	}
+}
+else
+{
+	//----------------------------------
+	// We must have submitted the form
+	// time to check some details.
+	//----------------------------------
+	
+	if ( empty($ibforums->input['username']) )
+	{
+		$ibforums->core->login_screen("You must enter a username before proceeding");
+	}
+	
+	if ( empty($ibforums->input['password']) )
+	{
+		$ibforums->core->login_screen("You must enter a password before proceeding");
+	}
+	
+	//----------------------------------
+	// Attempt to get the details from the
+	// DB
+	//----------------------------------
+	
+	$DB->query("SELECT m.*, g.* FROM ibf_members m, ibf_groups g WHERE LOWER(name)='".strtolower($ibforums->input['username'])."' and m.mgroup=g.g_id");
+	
+	$mem = $DB->fetch_row();
+	
+	//----------------------------------
+	// Get perms
+	//----------------------------------
+	
+	if ( empty($mem['id']) )
+	{
+		$ibforums->core->login_screen("Could not find a record matching that username, please check the spelling");
+	}
+	
+	//----------------------------------
+	// Load converge member
+	//----------------------------------
+	
+	$ibforums->converge->converge_load_member($mem['email']);
+		
+	if ( ! $ibforums->converge->member['converge_id'] )
+	{
+		$ibforums->core->login_screen("Could not find a record matching that username, please check the spelling");
+	}
+	
+	//----------------------------------
+	// Check converge pass
+	//----------------------------------
+	
+	$pass = md5( $ibforums->input['password'] );
+	
+	//------------------------------
+	// Check password...
+	//------------------------------
+	
+	if ( $ibforums->converge->converge_authenticate_member( $pass ) != TRUE )
+	{
+		$ibforums->core->login_screen("The password you entered is not correct");
+	}
+	else
+	{
+		if ($mem['g_access_cp'] != 1)
+		{
+			$ibforums->core->login_screen("You do not have access to the administrative CP");
+		}
+		else
+		{
+		
+			//----------------------------------
+			// All is good, bounce onwards...
+			//----------------------------------
+			
+			$ibforums->member = $mem;
+			
+			$ibforums->core->redirect( "index.php?act=work&loginkey={$mem['member_login_key']}&securekey=".$std->return_md5_check()."&mid={$mem['id']}", "Thanks for logging in...." );
+		}
+	}
+}
+
+//===========================================================================
+// MAIN LOGIC...
+//===========================================================================
+
+//--------------------------------
+// Get and run upgrade script
+//--------------------------------
+
+if ( ! in_array( $ibforums->input['act'], $ibforums->safe_act ) )
+{
+	if ( file_exists( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/version_upgrade.php' ) )
+	{
+		require_once( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/version_upgrade.php' );
+		$runme = new version_upgrade();
+	}
+	else
+	{
+		$ibforums->core->login_screen( "Could not locate the required upgrade script: 'upg_{$ibforums->current_upgrade}/version_upgrade.php'");
+	}
+}
+
+// Module(work) -> done -> settings -> recache -> templates -> templatesrecache -> finish
+
+switch ($ibforums->input['act'])
+{
+	case 'recache':
+		$ibforums->core->rebuild_caches();
+		break;
+	case 'templates':
+		$ibforums->core->rebuild_templates();
+		break;
+	case 'templatescache':
+		$ibforums->core->rebuild_templates_cache();
+		break;
+	case 'settings':
+		$ibforums->core->rebuild_settings();
+		break;
+	case 'finish':
+		$ibforums->core->upgrade_complete();
+		break;
+	case 'done':
+		$ibforums->core->module_complete();
+		break;
+	case 'work':
+		$runme->auto_run();
+		break;
+	default:
+		$ibforums->core->login_screen();
+		break;
+}
+
+/*-------------------------------------------------------------------------*/
+// Major fatal and possibly dangerous error...
+/*-------------------------------------------------------------------------*/
+
+function fatal_error($msg="")
+{
+	print $msg;
+	exit();
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+// DEBUG CLASS
+/*-------------------------------------------------------------------------*/
+
+class Debug
+{
+    function startTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $starttime = $mtime;
+    }
+    function endTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $endtime = $mtime;
+        $totaltime = round (($endtime - $starttime), 5);
+        return $totaltime;
+    }
+}
+
+/*-------------------------------------------------------------------------*/
+// INFO CLASS
+/*-------------------------------------------------------------------------*/
+
+class info {
+
+	var $member          = array();
+	var $input           = array();
+	var $base_url        = "";
+	var $vars            = "";
+	var $upgrade_history = array();
+	var $current_version = '';
+    var $loginkey        = '';
+    var $securekey       = '';
+    var $current_action  = '';
+    var $safe_act        = array( 'recache', 'templates', 'templatescache', 'settings', 'finish' );
+    
+	function info()
+	{
+		global $sess, $std, $DB, $INFO;
+		
+		$this->vars = &$INFO;
+	}
+}
+
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/manual_upgradekit/readme.txt b/upload/upgrade/manual_upgradekit/readme.txt
new file mode 100644
index 00000000..3940ff66
--- /dev/null
+++ b/upload/upgrade/manual_upgradekit/readme.txt
@@ -0,0 +1,81 @@
+INVISION POWER BOARD 1.3 -> 2.0.0 MANUAL UPGRADE
+------------------------------------------------
+
+This file is intended to allow you to upgrade your Invision Power Board manually via shell which
+is ideal for those with large boards which may require several slow queries.
+
+-----------------------------------------------------------------------------------------------------
+IMPORTANT: It is assumed that you are comfortable with SQL and shell and understand the basic concepts
+of paths, files and source SQL files.
+-----------------------------------------------------------------------------------------------------
+
+It is assumed that you have read the upgrade text and you have backed up your database and files before
+proceeding. If you haven't backed up - read the file "Documents/upgradefromipb_1x.html" from the download
+zip.
+
+-----------------------------------------------------------------------------------------------------
+IMPORTANT: PERFORM A BACKUP OF YOUR DATABASE BEFORE USING THESE INSTRUCTIONS.
+-----------------------------------------------------------------------------------------------------
+
+To perform the update, we'll need to use a mixture of command line, PHP scripting and SQL source files.
+
+Firstly, upload sql_1.sql and sql_2.sql into the root IPB folder (the one with index.php in it)
+
+-----------------------------------------------------------------------------------------------------
+IMPORTANT: sql_1.sql and sql_2.sql have queries with the default 'ibf_' table prefix. If your table
+prefix is different, do a search and replace on those files to change 'ibf_' to your database prefix
+-----------------------------------------------------------------------------------------------------
+
+The first step is to log onto mysql from shell.
+
+------------------------------------------------
+When you have a new terminal window open, type:
+
+mysql -u{username} -p{password}
+
+(Substituting {username} for your SQL username and {password} for you SQL password)
+------------------------------------------------
+Then type:
+
+use {database}
+
+(Substituting {database} for your SQL database)
+------------------------------------------------
+You should see a message like so:
+
+> Reading table information for completion of table and column names
+> You can turn off this feature to get a quicker startup with -A
+>
+> Database changed
+------------------------------------------------
+Now we'll run the first source file. Type:
+
+source /home/website/public_html/forums/sql_1.sql
+
+(Substituting /home/website/public_html/forums/ with your real path to this file)
+------------------------------------------------
+Now we'll need to run the installer - but we only want a few steps to run, so copy the URL below carefully
+substituting {yourdomain.com/forum} with your real URL to your board:
+
+Go to: {yourdomain.com/forum}/upgrade/upgrade.php?act=work&version=103&step=7&dieafterstep=13
+
+This may take a while for some large boards.
+------------------------------------------------
+Now we'll run the second source file. Type:
+
+source /home/website/public_html/forums/sql_2.sql
+
+(Substituting /home/website/public_html/forums/ with your real path to this file)
+------------------------------------------------
+Now we'll need to run the installer again - but we only want a few steps to run, so copy the URL below carefully
+substituting {yourdomain.com/forum} with your real URL to your board:
+
+Go to: {yourdomain.com/forum}/upgrade/upgrade.php?act=work&version=103&step=22
+
+This may take a while for some large boards.
+This will insert your templates and settings and completes the upgrade
+------------------------------------------------
+
+That's it, you should now be running IPB 2!
+
+
diff --git a/upload/upgrade/manual_upgradekit/sql_1.sql b/upload/upgrade/manual_upgradekit/sql_1.sql
new file mode 100644
index 00000000..10a1b585
--- /dev/null
+++ b/upload/upgrade/manual_upgradekit/sql_1.sql
@@ -0,0 +1,331 @@
+ALTER TABLE ibf_forums RENAME ibf_forums_bak;
+DROP TABLE if exists ibf_attachments;
+DROP TABLE if exists ibf_announcements;
+CREATE TABLE ibf_attachments (
+attach_id int(10) NOT NULL auto_increment,
+attach_ext varchar(10) NOT NULL default '',
+attach_file varchar(250) NOT NULL default '',
+attach_location varchar(250) NOT NULL default '',
+attach_thumb_location varchar(250) NOT NULL default '',
+attach_thumb_width smallint(5) NOT NULL default '0',
+attach_thumb_height smallint(5) NOT NULL default '0',
+attach_is_image tinyint(1) NOT NULL default '0',
+attach_hits int(10) NOT NULL default '0',
+attach_date int(10) NOT NULL default '0',
+attach_temp tinyint(1) NOT NULL default '0',
+attach_pid int(10) NOT NULL default '0',
+attach_post_key varchar(32) NOT NULL default '0',
+attach_msg int(10) NOT NULL default '0',
+attach_member_id mediumint(8) NOT NULL default '0',
+attach_approved int(10) NOT NULL default '1',
+attach_filesize int(10) NOT NULL default '0',
+PRIMARY KEY (attach_id),
+KEY attach_pid (attach_pid),
+KEY attach_msg (attach_msg),
+KEY attach_post_key (attach_post_key),
+KEY attach_mid_size (attach_member_id, attach_filesize)
+);
+CREATE TABLE ibf_message_text (
+msg_id int(10) NOT NULL auto_increment,
+msg_date int(10) default NULL,
+msg_post text default '',
+msg_cc_users text default '',
+msg_sent_to_count smallint(5) NOT NULL default '0',
+msg_deleted_count smallint(5) NOT NULL default '0',
+msg_post_key varchar(32) NOT NULL default '0',
+msg_author_id mediumint(8) NOT NULL default '0',
+PRIMARY KEY (msg_id),
+KEY msg_date (msg_date),
+KEY msg_sent_to_count (msg_sent_to_count),
+KEY msg_deleted_count (msg_deleted_count)
+);
+CREATE TABLE ibf_message_topics (
+mt_id int(10) NOT NULL auto_increment,
+mt_msg_id int(10) NOT NULL default '0',
+mt_date int(10) NOT NULL default '0',
+mt_title varchar(255) NOT NULL default '',
+mt_from_id mediumint(8) NOT NULL default '0',
+mt_to_id mediumint(8) NOT NULL default '0',
+mt_owner_id mediumint(8) NOT NULL default '0',
+mt_vid_folder varchar(32) NOT NULL default '',
+mt_read tinyint(1) NOT NULL default '0',
+mt_hasattach smallint(5) NOT NULL default '0',
+mt_hide_cc tinyint(1) default '0',
+mt_tracking tinyint(1) default '0',
+mt_user_read int(10) default '0',
+PRIMARY KEY (mt_id),
+KEY mt_from_id (mt_from_id),
+KEY mt_owner_id (mt_owner_id, mt_to_id, mt_vid_folder)
+);
+CREATE TABLE ibf_skin_sets (
+set_skin_set_id int(10) NOT NULL auto_increment,
+set_name varchar(150) NOT NULL default '',
+set_image_dir varchar(200) NOT NULL default '',
+set_hidden tinyint(1) NOT NULL default '0',
+set_default tinyint(1) NOT NULL default '0',
+set_css_method varchar(100) NOT NULL default 'inline',
+set_skin_set_parent smallint(5) NOT NULL default '-1',
+set_author_email varchar(255) NOT NULL default '',
+set_author_name varchar(255) NOT NULL default '',
+set_author_url varchar(255) NOT NULL default '',
+set_css mediumtext NOT NULL default '',
+set_wrapper mediumtext NOT NULL default '',
+set_css_updated int(10) NOT NULL default '0',
+set_cache_css mediumtext NOT NULL default '',
+set_cache_macro mediumtext NOT NULL default '',
+set_cache_wrapper mediumtext NOT NULL default '',
+set_emoticon_folder varchar(60) NOT NULL default 'default',
+PRIMARY KEY(set_skin_set_id)
+);
+CREATE TABLE ibf_skin_templates_cache (
+template_id varchar(32) NOT NULL default '',
+template_group_name varchar(255) NOT NULL default '',
+template_group_content mediumtext NOT NULL default '',
+template_set_id int(10) NOT NULL default '0',
+primary key (template_id),
+KEY template_set_id (template_set_id),
+KEY template_group_name (template_group_name)
+);
+CREATE TABLE ibf_mail_queue(
+mail_id int(10) auto_increment NOT NULL,
+mail_date int(10) NOT NULL default '0',
+mail_to varchar(255) NOT NULL default '',
+mail_from varchar(255) NOT NULL default '',
+mail_subject text NOT NULL default '',
+mail_content text NOT NULL default '',
+mail_type varchar(200) NOT NULL default '',
+PRIMARY KEY (mail_id)
+);
+CREATE TABLE ibf_task_manager (
+task_id int(10) auto_increment NOT NULL,
+task_title varchar(255) NOT NULL default '',
+task_file varchar(255) NOT NULL default '',
+task_next_run int(10) NOT NULL default '',
+task_week_day tinyint(1) NOT NULL default '-1',
+task_month_day smallint(2) NOT NULL default '-1',
+task_hour smallint(2) NOT NULL default '-1',
+task_minute smallint(2) NOT NULL default '-1',
+task_cronkey varchar(32) NOT NULL default '',
+task_log tinyint(1) NOT NULL default '0',
+task_description text NOT NULL default '',
+task_enabled tinyint(1) NOT NULL default '1',
+task_key varchar(30) NOT NULL default '',
+task_safemode tinyint(1) NOT NULL default '',
+PRIMARY KEY(task_id),
+KEY task_next_run (task_next_run)
+);
+CREATE TABLE ibf_task_logs (
+log_id int(10) auto_increment NOT NULL,
+log_title varchar(255) NOT NULL default '',
+log_date int(10) NOT NULL default '0',
+log_ip varchar(16) NOT NULL default '0',
+log_desc text NOT NULL default '',
+PRIMARY KEY(log_id)
+);
+CREATE TABLE ibf_custom_bbcode (
+bbcode_id int(10) NOT NULL auto_increment,
+bbcode_title varchar(255) NOT NULL default '',
+bbcode_desc text NOT NULL default '',
+bbcode_tag varchar(255) NOT NULL default '',
+bbcode_replace text NOT NULL default '',
+bbcode_useoption tinyint(1) NOT NULL default '',
+bbcode_example text NOT NULL default '',
+PRIMARY KEY (bbcode_id)
+);
+CREATE TABLE ibf_conf_settings (
+conf_id int(10) NOT NULL auto_increment,
+conf_title varchar(255) NOT NULL default '',
+conf_description text NOT NULL default '',
+conf_group smallint(3) NOT NULL default '',
+conf_type varchar(255) NOT NULL default '',
+conf_key varchar(255) NOT NULL default '',
+conf_value text NOT NULL default '',
+conf_default text NOT NULL default '',
+conf_extra text NOT NULL default '',
+conf_evalphp text NOT NULL default '',
+conf_protected tinyint(1) NOT NULL default '',
+conf_position smallint(3) NOT NULL default '0',
+conf_start_group varchar(255) NOT NULL default '',
+conf_end_group tinyint(1) NOT NULL default '0',
+conf_help_key varchar(255) NOT NULL default '0',
+conf_add_cache tinyint(1) NOT NULL default '1',
+PRIMARY KEY (conf_id)
+);
+CREATE TABLE ibf_conf_settings_titles (
+conf_title_id smallint(3) NOT NULL auto_increment,
+conf_title_title varchar(255) NOT NULL default '',
+conf_title_desc text NOT NULL default '',
+conf_title_count smallint(3) NOT NULL default '0',
+conf_title_noshow tinyint(1) NOT NULL default '0',
+conf_title_keyword varchar(200) NOT NULL default '',
+PRIMARY KEY(conf_title_id)
+);
+CREATE TABLE ibf_topics_read (
+read_tid int(10) NOT NULL default '0',
+read_mid mediumint(8) NOT NULL default '0',
+read_date int(10) NOT NULL default '0',
+UNIQUE KEY read_tid_mid( read_tid, read_mid )
+);
+CREATE TABLE ibf_banfilters (
+ban_id int(10) NOT NULL auto_increment,
+ban_type varchar(10) NOT NULL default 'ip',
+ban_content text NOT NULL default '',
+ban_date int(10) NOT NULL default '0',
+PRIMARY KEY (ban_id)
+);
+CREATE TABLE ibf_attachments_type (
+atype_id int(10) NOT NULL auto_increment,
+atype_extension varchar(18) NOT NULL default '',
+atype_mimetype varchar(255) NOT NULL default '',
+atype_post tinyint(1) NOT NULL default '1',
+atype_photo tinyint(1) NOT NULL default '0',
+atype_img text NOT NULL default '',
+PRIMARY KEY (atype_id)
+);
+CREATE TABLE ibf_members_converge (
+converge_id int(10) auto_increment NOT NULL,
+converge_email varchar(250) NOT NULL default '',
+converge_joined int(10) NOT NULL default '',
+converge_pass_hash varchar(32) NOT NULL default '',
+converge_pass_salt varchar(5) NOT NULL default '',
+PRIMARY KEY( converge_id )
+);
+CREATE TABLE ibf_announcements (
+announce_id int(10) UNSIGNED NOT NULL auto_increment,
+announce_title varchar(255) NOT NULL default '',
+announce_post text NOT NULL default '',
+announce_forum text NOT NULL default '',
+announce_member_id mediumint(8) UNSIGNED NOT NULL default '0',
+announce_html_enabled tinyint(1) NOT NULL default '0',
+announce_views int(10) UNSIGNED NOT NULL default '0',
+announce_start int(10) UNSIGNED NOT NULL default '0',
+announce_end int(10) UNSIGNED NOT NULL default '0',
+announce_active tinyint(1) NOT NULL default '1',
+PRIMARY KEY (announce_id)
+);
+CREATE TABLE ibf_mail_error_logs (
+mlog_id int(10) auto_increment NOT NULL,
+mlog_date int(10) NOT NULL default '0',
+mlog_to varchar(250) NOT NULL default '',
+mlog_from varchar(250) NOT NULL default '',
+mlog_subject varchar(250) NOT NULL default '',
+mlog_content varchar(250) NOT NULL default '',
+mlog_msg text NOT NULL default '',
+mlog_code varchar(200) NOT NULL default '',
+mlog_smtp_msg text NOT NULL default '',
+PRIMARY KEY (mlog_id)
+);
+CREATE TABLE ibf_bulk_mail (
+mail_id int(10) NOT NULL auto_increment,
+mail_subject varchar(255) NOT NULL default '',
+mail_content mediumtext NOT NULL default '',
+mail_groups mediumtext NOT NULL default '',
+mail_honor tinyint(1) NOT NULL default '1',
+mail_opts mediumtext NOT NULL default '',
+mail_start int(10) NOT NULL default '0',
+mail_updated int(10) NOT NULL default '0',
+mail_sentto int(10) NOT NULL default '0',
+mail_active tinyint(1) NOT NULL default '0',
+mail_pergo smallint(5) NOT NULL default '0',
+PRIMARY KEY (mail_id)
+);
+CREATE TABLE ibf_upgrade_history (
+upgrade_id int(10) NOT NULL auto_increment,
+upgrade_version_id int(10) NOT NULL default '',
+upgrade_version_human varchar(200) NOT NULL default '',
+upgrade_date int(10) NOT NULL default '0',
+upgrade_mid int(10) NOT NULL default '0',
+upgrade_notes text NOT NULL default '',
+PRIMARY KEY (upgrade_id)
+);
+DROP TABLE ibf_forums;
+CREATE TABLE ibf_forums (
+id smallint(5) NOT NULL default '0',
+topics mediumint(6) default '0',
+posts mediumint(6) default '0',
+last_post int(10) default NULL,
+last_poster_id mediumint(8) NOT NULL default '0',
+last_poster_name varchar(32) default NULL,
+name varchar(128) NOT NULL default '',
+description text,
+position tinyint(2) default NULL,
+use_ibc tinyint(1) default NULL,
+use_html tinyint(1) default NULL,
+status varchar(10) default NULL,
+password varchar(32) default NULL,
+last_title varchar(128) default NULL,
+last_id int(10) default NULL,
+sort_key varchar(32) default NULL,
+sort_order varchar(32) default NULL,
+prune tinyint(3) default NULL,
+show_rules tinyint(1) default NULL,
+preview_posts tinyint(1) default NULL,
+allow_poll tinyint(1) NOT NULL default '1',
+allow_pollbump tinyint(1) NOT NULL default '0',
+inc_postcount tinyint(1) NOT NULL default '1',
+skin_id int(10) default NULL,
+parent_id mediumint(5) default '-1',
+sub_can_post tinyint(1) default '1',
+quick_reply tinyint(1) default '0',
+redirect_url varchar(250) default '',
+redirect_on tinyint(1) NOT NULL default '0',
+redirect_hits int(10) NOT NULL default '0',
+redirect_loc varchar(250) default '',
+rules_title varchar(255) NOT NULL default '',
+rules_text text NOT NULL,
+topic_mm_id varchar(250) NOT NULL default '',
+notify_modq_emails text default '',
+permission_custom_error text NOT NULL default '',
+permission_array mediumtext NOT NULL default '',
+permission_showtopic tinyint(1) NOT NULL default '0',
+queued_topics mediumint(6) NOT NULL default '0',
+queued_posts  mediumint(6) NOT NULL default '0',
+PRIMARY KEY  (id),
+KEY position (position, parent_id)
+);
+alter table ibf_posts add post_parent int(10) NOT NULL default '0';
+alter table ibf_posts ADD post_key varchar(32) NOT NULL default '0';
+alter table ibf_posts add post_htmlstate smallint(1) NOT NULL default '0';
+alter table ibf_topics ADD topic_hasattach smallint(5) NOT NULL default '0';
+alter table ibf_members add login_anonymous varchar(3) NOT NULL default '0&0';
+alter table ibf_members add ignored_users text NOT NULL default '';
+alter table ibf_members add mgroup_others varchar(255) NOT NULL default '';
+alter table ibf_member_extra
+ADD aim_name varchar(40) NOT NULL default '',
+ADD icq_number int(15) NOT NULL default '',
+ADD website varchar(250) NOT NULL default '',
+ADD yahoo varchar(40) NOT NULL default '',
+ADD interests text NOT NULL default '',
+ADD msnname varchar(200) NOT NULL default '',
+ADD vdirs text NOT NULL default '',
+ADD location varchar(250) NOT NULL default '',
+ADD signature text NOT NULL default '',
+ADD avatar_location varchar(128) NOT NULL default '',
+ADD avatar_size varchar(9) NOT NULL default '',
+ADD avatar_type varchar(15) NOT NULL default 'local';
+alter table ibf_members add member_login_key varchar(32) NOT NULL default '';
+alter table ibf_members change password legacy_password varchar(32) NOT NULL default '';
+alter table ibf_macro rename ibf_skin_macro;
+alter table ibf_skin_macro change can_remove macro_can_remove tinyint(1) default '0';
+alter table ibf_groups add g_bypass_badwords tinyint(1) NOT NULL default '0';
+alter table ibf_cache_store change cs_value cs_value mediumtext NOT NULL default '';
+alter table ibf_cache_store add cs_array tinyint(1) NOT NULL default '0';
+alter table ibf_sessions add in_error tinyint(1) NOT NULL default '';
+alter table ibf_topic_mmod add mm_forums text NOT NULL default '';
+alter table ibf_groups change g_icon g_icon text NOT NULL default '';
+alter table ibf_emoticons add emo_set varchar(64) NOT NULL default 'default';
+alter table ibf_admin_sessions change ID session_id varchar(32) NOT NULL default '';
+alter table ibf_admin_sessions change IP_ADDRESS session_ip_address varchar(32) NOT NULL default '';
+alter table ibf_admin_sessions change MEMBER_NAME session_member_name varchar(250) NOT NULL default '';
+alter table ibf_admin_sessions change MEMBER_ID session_member_id mediumint(8) NOT NULL default '';
+alter table ibf_admin_sessions change SESSION_KEY session_member_login_key varchar(32) NOT NULL default '';
+alter table ibf_admin_sessions change LOCATION session_location varchar(64) NOT NULL default '';
+alter table ibf_admin_sessions change LOG_IN_TIME session_log_in_time int(10) NOT NULL default '';
+alter table ibf_admin_sessions change RUNNING_TIME session_running_time int(10) NOT NULL default '';
+alter table ibf_forum_tracker add forum_track_type varchar(100) NOT NULL default 'delayed';
+alter table ibf_tracker add topic_track_type varchar(100) NOT NULL default 'delayed';
+delete from ibf_members where id=0 LIMIT 1;
+delete from ibf_member_extra where id=0 limit 1;
+alter table ibf_groups add g_attach_per_post int(10) NOT NULL default '0';
+		
+	
\ No newline at end of file
diff --git a/upload/upgrade/manual_upgradekit/sql_2.sql b/upload/upgrade/manual_upgradekit/sql_2.sql
new file mode 100644
index 00000000..00852bc3
--- /dev/null
+++ b/upload/upgrade/manual_upgradekit/sql_2.sql
@@ -0,0 +1,138 @@
+ALTER TABLE ibf_posts DROP attach_id, DROP attach_hits, DROP attach_type, DROP attach_file;
+alter table ibf_posts change queued queued tinyint(1) NOT NULL default '0';
+alter table ibf_posts drop forum_id;
+ALTER TABLE ibf_topics add topic_firstpost int(10) NOT NULL default '0';
+alter table ibf_topics add topic_queuedposts int(10) NOT NULL default '0';
+ALTER TABLE ibf_members DROP msg_from_id, DROP msg_msg_id;
+ALTER TABLE ibf_members DROP org_supmod, DROP integ_msg;
+alter table ibf_members DROP aim_name, DROP icq_number, DROP website, DROP yahoo, DROP interests,
+DROP msnname, DROP vdirs, DROP signature, DROP location, DROP avatar, DROP avatar_size;
+alter table ibf_members change auto_track auto_track varchar(50) default '0';
+alter table ibf_members add subs_pkg_chosen smallint(3) NOT NULL default '0';
+ALTER TABLE ibf_members change temp_ban temp_ban varchar(100) default '0';
+ALTER TABLE ibf_members change msg_total msg_total smallint(5) default '0';
+alter table ibf_topic_mmod add topic_approve tinyint(1) NOT NULL default '0';
+alter table ibf_groups add g_can_msg_attach tinyint(1) NOT NULL default '0';
+alter table ibf_pfields_data
+change fid pf_id smallint(5) NOT NULL auto_increment,
+change ftitle pf_title varchar(250) NOT NULL default '',
+change fdesc pf_desc varchar(250) NOT NULL default '',
+change fcontent pf_content text NOT NULL default '',
+change ftype pf_type varchar(250) NOT NULL default '',
+change freq pf_not_null tinyint(1) NOT NULL default '0',
+change fhide pf_member_hide tinyint(1) NOT NULL default '0',
+change fmaxinput pf_max_input smallint(6) NOT NULL default '0',
+change fedit pf_member_edit tinyint(1) NOT NULL default '0',
+change forder pf_position smallint(6) NOT NULL default '0',
+change fshowreg pf_show_on_reg tinyint(1) NOT NULL default '0',
+add pf_input_format text NOT NULL default '',
+add pf_admin_only tinyint(1) NOT NULL default '0',
+add pf_topic_format text NOT NULL default '';
+INSERT INTO ibf_task_manager VALUES (1, 'Hourly Clean Out', 'cleanout.php', 1076074920, -1, -1, -1, 59, '2a7d083832daa123b73a68f9c51fdb29', 1, 'Kill old sessions, reg images, searches',1,'',0);
+INSERT INTO ibf_task_manager VALUES (2, 'Daily Stats Rebuild', 'rebuildstats.php', 1076112000, -1, -1, 0, 0, '640b9a6c373ff207bc1b1100a98121af', 1, 'Rebuilds board statistics',1,'',0);
+INSERT INTO ibf_task_manager VALUES (3, 'Daily Clean Out', 'dailycleanout.php', 1076122800, -1, -1, 3, 0, 'e71b52f3ff9419abecedd14b54e692c4', 1, 'Prunes topic subscriptions',1,'',0);
+INSERT INTO ibf_task_manager VALUES (4, 'Birthday and Events Cache', 'calendarevents.php', 1076100960, -1, -1, 12, -1, '2c148c9bd754d023a7a19dd9b1535796', 1, 'Caches calendar events &amp; birthdays',1,'',0);
+INSERT INTO ibf_task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (9, 'Announcements Update', 'announcements.php', 1080747660, -1, -1, 4, -1, 'e82f2c19ab1ed57c140fccf8aea8b9fe', 1, 'Rebuilds cache and expires out of date announcements', 1);
+INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Send Bulk Mail', 'bulkmail.php', 1086706080, -1, -1, -1, -1, '61359ac93eb93ebbd935a4e275ade2db', 0, 'Dynamically assigned, no need to edit or change', 0, 'bulkmail', 1);
+INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Daily Topic &amp; Forum Digest', 'dailydigest.php', 1086912600, -1, -1, 0, 10, '723cab2aae32dd5d04898b1151038846', 1, 'Emails out daily topic &amp; forum digest emails', 1, 'dailydigest', 0);
+INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Weekly Topic &amp; Forum Digest', 'weeklydigest.php', 1087096200, 0, -1, 3, 10, '7e7fccd07f781bdb24ac108d26612931', 1, 'Emails weekly topic &amp; forum digest emails', 1, 'weeklydigest', 0);
+INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Snap Back', 'This tag displays a little linked image which links back to a post - used when quoting posts from the board. Opens in same window by default.', 'snapback', '<a href=\"index.php?act=findpost&amp;pid={content}\"><{POST_SNAPBACK}></a>', 0, '[snapback]100[/snapback]');
+INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Right', 'Aligns content to the right of the posting area', 'right', '<div align=\'right\'>{content}</div>', 0, '[right]Some text here[/right]');
+INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Left', 'Aligns content to the left of the post', 'left', '<div align=\'left\'>{content}</div>', 0, '[left]Left aligned text[/left]');
+INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Center', 'Aligns content to the center of the posting area.', 'center', '<div align=\'center\'>{content}</div>', 0, '[center]Centered Text[/center]');
+INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Topic Link', 'This tag provides an easy way to link to a topic', 'topic', '<a href=\'index.php?showtopic={option}\'>{content}</a>', 1, '[topic=100]Click me![/topic]');
+INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Link', 'This tag provides an easy way to link to a post.', 'post', '<a href=\'index.php?act=findpost&pid={option}\'>{content}</a>', 1, '[post=100]Click me![/post]');
+INSERT INTO ibf_subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('Authorize.net', 'authorizenet', '', '', '', '', '', '', '', '1', '1', NULL, NULL, '1', 'USD');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (1, 'pdf', 'application/pdf', 1, 0, 'folder_mime_types/pdf.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (2, 'png', 'image/png', 1, 1, 'folder_mime_types/quicktime.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (3, 'viv', 'video/vivo', 1, 0, 'folder_mime_types/win_player.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (4, 'wmv', 'video/x-msvideo', 1, 0, 'folder_mime_types/win_player.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (5, 'html', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (6, 'ram', 'audio/x-pn-realaudio', 1, 0, 'folder_mime_types/real_audio.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (7, 'gif', 'image/gif', 1, 1, 'folder_mime_types/gif.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (8, 'mpg', 'video/mpeg', 1, 0, 'folder_mime_types/quicktime.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (9, 'ico', 'image/ico', 1, 0, 'folder_mime_types/gif.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (10, 'tar', 'application/x-tar', 1, 0, 'folder_mime_types/zip.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (11, 'bmp', 'image/x-MS-bmp', 1, 0, 'folder_mime_types/gif.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (12, 'tiff', 'image/tiff', 1, 0, 'folder_mime_types/quicktime.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (13, 'rtf', 'text/richtext', 1, 0, 'folder_mime_types/rtf.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (14, 'hqx', 'application/mac-binhex40', 1, 0, 'folder_mime_types/stuffit.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (15, 'aiff', 'audio/x-aiff', 1, 0, 'folder_mime_types/quicktime.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (31, 'zip', 'application/zip', 1, 0, 'folder_mime_types/zip.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (17, 'ps', 'application/postscript', 1, 0, 'folder_mime_types/eps.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (18, 'doc', 'application/msword', 1, 0, 'folder_mime_types/doc.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (19, 'mov', 'video/quicktime', 1, 0, 'folder_mime_types/quicktime.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (20, 'ppt', 'application/powerpoint', 1, 0, 'folder_mime_types/ppt.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (21, 'wav', 'audio/x-wav', 1, 0, 'folder_mime_types/music.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (22, 'mp3', 'audio/x-mpeg', 1, 0, 'folder_mime_types/music.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (23, 'jpg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (24, 'txt', 'text/plain', 1, 0, 'folder_mime_types/txt.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (25, 'xml', 'text/xml', 1, 0, 'folder_mime_types/script.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (26, 'css', 'text/css', 1, 0, 'folder_mime_types/script.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (27, 'swf', 'application/x-shockwave-flash', 0, 0, 'folder_mime_types/quicktime.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (32, 'php', 'application/octet-stream', 1, 0, 'folder_mime_types/php.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (28, 'htm', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (29, 'jpeg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');
+INSERT INTO ibf_attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (33, 'gz', 'application/x-gzip', 1, 0, 'folder_mime_types/zip.gif');
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('skin_id_cache', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('bbcode', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('moderators', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('multimod', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('banfilters', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('attachtypes', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('emoticons', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('forum_cache', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('badwords', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('systemvars', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('ranks', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('group_cache', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('stats', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('profilefields', 'a:0:{}', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('settings','', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('languages', '', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('birthdays', 'a:0:{}', '', 1);
+INSERT INTO ibf_cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);
+INSERT INTO ibf_skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');
+INSERT INTO ibf_skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');
+INSERT INTO ibf_skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (2, 'CPU Saving &amp; Optimization', 'This section allows certain features to be limited or removed to get more performance out of your board.', 16);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (3, 'Date &amp; Time Formats', 'This section contains the date and time formats used throughout the board.', 7);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (4, 'User Profiles', 'This section allows you to adjust your member\'s global permissions and other options.', 22);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (5, 'Topics, Posts and Polls', 'These options control various elements when posting, reading topics and reading polls.', 32);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (6, 'Security and Privacy', 'These options allow you to adjust the security and privacy options for your board.', 18);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (7, 'Cookies', 'This section allows you to set the default cookie options.', 3);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (8, 'COPPA Set-up', 'This section allows you to comply with <a href=\'http://www.ftc.gov/ogc/coppa1.htm\'>COPPA</a>.', 3);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (9, 'Calendar &amp; Birthdays', 'This section will allow you to set up the board calendar and its related options.', 8);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (10, 'News Set-up', 'This section will allow you to specify the forum you wish to export news topics from to be used with ssi.php and IPDynamic Lite.', 2);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (11, 'Personal Message Set-up', 'This section allows you to control the global PM options.', 3);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (12, 'Email Set-up', 'This section will allow you to change the incoming and outgoing email addresses as well as the email method.', 7);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (13, 'Warn Set-up', 'This section will allow you to set up the warning system.', 15);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (14, 'Trash Can Set-up', 'The trashcan is a special forum in which topics are moved into instead of being deleted.', 6);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (15, 'Board Offline / Online', 'Use this setting to turn switch your board online or offline and leave a message for your visitors.', 2);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (16, 'Search Engine Spiders', 'This section will allow you to set up and maintain your search engine bot spider recognition settings.', 7);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (17, 'Board Guidelines', 'This section allows you to maintain your board guidelines. If enabled, a link will be added to the board header linking to the board guidelines.', 4);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (18, 'Converge Set Up', 'Converge is Invision Power Services central authentication method for all IPS applications. This allows you to have a single log-in for all your IPS products.', 1);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (19, 'Full Text Search Set-Up', 'Full text searching is a very fast and very efficient way of searching large amounts of posts without maintaining a manual index. This may not be available for your system.', 2);
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (20,'Invision Chat Settings (Legacy Version)', 'This will allow you to customize your Invision Chat integration settings for the legacy edition.', 14, 1, 'chat');
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (21,'Invision Chat Settings', 'This will allow you to customize your Invision Chat integration settings for the new 2004 edition', 10, 1, 'chat04');
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (22,'IPB Portal', 'These settings enable you to enable or disable IPB Portal and control the options IPB Portal offers.', 20, 0, 'ipbportal');
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (23,'Subscriptions Manager', 'These settings control various subscription manager features.', 3, 0, 'subsmanager');
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (24,'IPB Registration', 'This section will allow you to edit your IPB registered licence settings.', 3, 1, 'ipbreg');
+INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (25,'IPB Copyright Removal', 'This section allows you to manage your copyright removal key.', 2, 1, 'ipbcopyright');
+INSERT INTO ibf_upgrade_history (upgrade_id, upgrade_version_id, upgrade_version_human, upgrade_date, upgrade_mid, upgrade_notes) VALUES ('', '20010', '2.0.0', '0', '0', '');
+DROP TABLE ibf_tmpl_names;
+DROP TABLE ibf_forums_bak;
+DROP TABLE ibf_categories;
+DROP TABLE ibf_messages;
+alter table ibf_tracker change topic_id topic_id int(10) NOT NULL default '0';
+ALTER TABLE ibf_tracker ADD INDEX(topic_id);
+ALTER TABLE ibf_topics CHANGE pinned pinned TINYINT( 1 ) DEFAULT '0' NOT NULL;
+ALTER TABLE ibf_topics CHANGE approved approved TINYINT( 1 ) DEFAULT '0' NOT NULL;
+ALTER TABLE ibf_topics ADD INDEX(topic_firstpost);
+alter table ibf_posts drop index topic_id;
+alter table ibf_posts drop index author_id;
+alter table ibf_posts add index topic_id (topic_id, queued, pid);
+alter table ibf_posts add index author_id( author_id, topic_id);
+ALTER TABLE ibf_posts DROP INDEX forum_id, ADD INDEX(post_date);
+UPDATE ibf_members SET language=''";
\ No newline at end of file
diff --git a/upload/upgrade/pre_20000/10001_mysql_queries.php b/upload/upgrade/pre_20000/10001_mysql_queries.php
new file mode 100644
index 00000000..492e16ff
--- /dev/null
+++ b/upload/upgrade/pre_20000/10001_mysql_queries.php
@@ -0,0 +1,1630 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE 1.1 -> 2.0 SQL STUFF!
+|   > Script written by Matt Mecham
+|   > Date started: 21st April 2004
+|   > Interesting fact: Turin Brakes are also good
++--------------------------------------------------------------------------
+*/
+
+class upgrade_sql
+{
+	var $errors   = array();
+	var $sqlcount = 0;
+	var $sqlbit   = array();
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $DB, $ibforums, $std;
+		
+		define( 'THIS_HUMAN_VERSION', '2.0.0' );
+		define( 'THIS_LONG_VERSION' , '20010' );
+		
+		$this->sqlbit['attach'] = "attach_file != ''";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 24: RECACHE & REBUILD
+	/*-------------------------------------------------------------------------*/
+	
+	function step_24()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------
+		// Get ACP library
+		//-----------------------------------
+	
+		require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+		$acp = new admin_cache_functions();
+		
+		//-----------------------------------
+		// Cache skins and shit
+		//-----------------------------------
+		
+		$acp->_rebuild_all_caches( array(2,3) );
+		
+		//-------------------------------------------------------------
+		// Forum cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['forum_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'forums',
+									  'order'  => 'parent_id, position'
+							 )      );
+		$DB->simple_exec();
+		
+		while( $fr = $DB->fetch_row() )
+		{
+			$perms = unserialize(stripslashes($fr['permission_array']));
+			
+			$fr['read_perms']   = $perms['read_perms'];
+			$fr['reply_perms']  = $perms['reply_perms'];
+			$fr['start_perms']  = $perms['start_perms'];
+			$fr['upload_perms'] = $perms['upload_perms'];
+			$fr['show_perms']   = $perms['show_perms'];
+			
+			unset($fr['permission_array']);
+			
+			$ibforums->cache['forum_cache'][ $fr['id'] ] = $fr;
+		}
+		
+		$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Group Cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['group_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => "*",
+									  'from'   => 'groups'
+							 )      );
+		
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// Systemvars
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['systemvars'] = array();
+		
+		$result = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'mail_queue' ) );
+		
+		$ibforums->cache['systemvars']['mail_queue'] = intval( $result['cnt'] );
+		$ibforums->cache['systemvars']['task_next_run'] = time() + 3600;
+		
+		$std->update_cache( array( 'name' => 'systemvars', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Stats
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['stats'] = array();
+		
+		$DB->simple_construct( array( 'select' => 'count(pid) as posts', 'from' => 'posts', 'where' => "queued <> 1" ) );
+		$DB->simple_exec();
+	
+		$r = $DB->fetch_row();
+		$stats['total_replies'] = intval($r['posts']);
+		
+		$DB->simple_construct( array( 'select' => 'count(tid) as topics', 'from' => 'topics', 'where' => "approved = 1" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$stats['total_topics']   = intval($r['topics']);
+		$stats['total_replies'] -= $stats['total_topics'];
+		
+		$DB->simple_construct( array( 'select' => 'count(id) as members', 'from' => 'members', 'where' => "mgroup <> '".$ibforums->vars['auth_group']."'" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$stats['mem_count'] = intval($r['members']);
+			
+		$ibforums->cache['stats']['total_replies'] = $stats['total_replies'];
+		$ibforums->cache['stats']['total_topics']  = $stats['total_topics'];
+		$ibforums->cache['stats']['mem_count']     = $stats['mem_count'];
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'id, name',
+											'from'   => 'members',
+											'order'  => 'id DESC',
+											'limit'  => '0,1'
+								   )      );
+								   
+		$ibforums->cache['stats']['last_mem_name'] = $r['name'];
+		$ibforums->cache['stats']['last_mem_id']   = $r['id'];
+		
+		$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Ranks
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['ranks'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+									  'from'   => 'titles',
+									  'order'  => "posts DESC",
+							)      );
+							
+		$DB->simple_exec();
+					
+		while ($i = $DB->fetch_row())
+		{
+			$ibforums->cache['ranks'][ $i['id'] ] = array(
+														  'TITLE' => $i['title'],
+														  'PIPS'  => $i['pips'],
+														  'POSTS' => $i['posts'],
+														);
+		}
+		
+		$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		
+		//-------------------------------------------------------------
+		// SETTINGS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['settings'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+		$info = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($info) )
+		{
+			$ibforums->cache['settings'][ $r['conf_key'] ] = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+		}
+		
+		$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// EMOTICONS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['emoticons'] = array();
+				
+		$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['emoticons'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// LANGUAGES
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['languages'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['languages'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// ATTACHMENT TYPES
+		//-------------------------------------------------------------
+			
+		$ibforums->cache['attachtypes'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 21: OPTIMIZATION II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_21()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop index topic_id;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop index author_id;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add index topic_id (topic_id, queued, pid);";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add index author_id( author_id, topic_id);";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."posts DROP INDEX forum_id, ADD INDEX(post_date);";
+		
+		$SQL[] = "update ".SQL_PREFIX."members SET restrict_post=0";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 20: OPTIMIZATION
+	/*-------------------------------------------------------------------------*/
+	
+	function step_20()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."tracker change topic_id topic_id int(10) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."tracker ADD INDEX(topic_id);";
+
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics CHANGE pinned pinned TINYINT( 1 ) DEFAULT '0' NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics CHANGE approved approved TINYINT( 1 ) DEFAULT '0' NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics ADD INDEX(topic_firstpost);";
+		
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events change eventid eventid mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events change userid userid mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."contacts change id id mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."contacts change contact_id contact_id mediumint(8) NOT NULL;";
+		$SQL[] = "alter table ".SQL_PREFIX."contacts change member_id member_id mediumint(8) NOT NULL;";
+		$SQL[] = "alter table ".SQL_PREFIX."faq change id id mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."forum_tracker change frid frid mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."forum_tracker change forum_id forum_id smallint(5) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."forums change last_poster_id last_poster_id mediumint(8) NOT NULL DEFAULT '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."languages change lid lid mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra change id id mediumint(8) NOT NULL;";
+		$SQL[] = "alter table ".SQL_PREFIX."members change id id mediumint(8) NOT NULL;";
+		$SQL[] = "alter table ".SQL_PREFIX."members change mgroup mgroup smallint(3) NOT NULL;";
+
+		
+		$SQL[] = "alter table ".SQL_PREFIX."moderator_logs change id id int(10) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."moderator_logs change topic_id topic_id int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."moderator_logs change post_id post_id int(10);";
+		$SQL[] = "alter table ".SQL_PREFIX."moderator_logs change member_id member_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."moderator_logs change ip_address ip_address VARCHAR(16) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."moderators change mid mid mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."moderators change member_id member_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."pfields_content change member_id member_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."polls change pid pid mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."polls change tid tid int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."polls change starter_id starter_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."polls change votes votes smallint(5) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."polls change forum_id forum_id smallint(5) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change pid pid int(10) NOT NULL default '0' auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change author_id author_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change topic_id topic_id int(10) NOT NULL default '0';";
+
+		$SQL[] = "alter table ".SQL_PREFIX."posts change ip_address ip_address varchar(16) NOT NULL DEFAULT '';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change use_sig use_sig tinyint(1) NOT NULL DEFAULT '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change use_emo use_emo tinyint(1) NOT NULL DEFAULT '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."sessions change member_id member_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."sessions change in_forum in_forum smallint(5) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."stats change TOTAL_REPLIES TOTAL_REPLIES int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."stats change TOTAL_TOPICS TOTAL_TOPICS int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."stats change LAST_MEM_ID LAST_MEM_ID mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."stats change MEM_COUNT MEM_COUNT mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topics change tid tid int(10) NOT NULL default '0' auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."topics change starter_id starter_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topics change last_poster_id last_poster_id mediumint(8) NOT NULL DEFAULT '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."tracker change trid trid mediumint(8) NOT NULL auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."tracker change member_id member_id mediumint(8) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."voters change vid vid int(10) NOT NULL default '0' auto_increment;";
+		$SQL[] = "alter table ".SQL_PREFIX."voters change tid tid int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."voters change forum_id forum_id smallint(5) NOT NULL default '0';";
+		
+		$SQL[] = "UPDATE ".SQL_PREFIX."members SET language=''";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 19: DROPPING TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_19()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."tmpl_names;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."forums_bak;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."categories;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."messages;";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 18: SAFE INSERTS
+	/*-------------------------------------------------------------------------*/
+	
+	function step_18()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (1, 'Hourly Clean Out', 'cleanout.php', 1076074920, -1, -1, -1, 59, '2a7d083832daa123b73a68f9c51fdb29', 1, 'Kill old sessions, reg images, searches',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (2, 'Daily Stats Rebuild', 'rebuildstats.php', 1076112000, -1, -1, 0, 0, '640b9a6c373ff207bc1b1100a98121af', 1, 'Rebuilds board statistics',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (3, 'Daily Clean Out', 'dailycleanout.php', 1076122800, -1, -1, 3, 0, 'e71b52f3ff9419abecedd14b54e692c4', 1, 'Prunes topic subscriptions',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (4, 'Birthday and Events Cache', 'calendarevents.php', 1076100960, -1, -1, 12, -1, '2c148c9bd754d023a7a19dd9b1535796', 1, 'Caches calendar events &amp; birthdays',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (9, 'Announcements Update', 'announcements.php', 1080747660, -1, -1, 4, -1, 'e82f2c19ab1ed57c140fccf8aea8b9fe', 1, 'Rebuilds cache and expires out of date announcements', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Send Bulk Mail', 'bulkmail.php', 1086706080, -1, -1, -1, -1, '61359ac93eb93ebbd935a4e275ade2db', 0, 'Dynamically assigned, no need to edit or change', 0, 'bulkmail', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Daily Topic &amp; Forum Digest', 'dailydigest.php', 1086912600, -1, -1, 0, 10, '723cab2aae32dd5d04898b1151038846', 1, 'Emails out daily topic &amp; forum digest emails', 1, 'dailydigest', 0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Weekly Topic &amp; Forum Digest', 'weeklydigest.php', 1087096200, 0, -1, 3, 10, '7e7fccd07f781bdb24ac108d26612931', 1, 'Emails weekly topic &amp; forum digest emails', 1, 'weeklydigest', 0);";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Snap Back', 'This tag displays a little linked image which links back to a post - used when quoting posts from the board. Opens in same window by default.', 'snapback', '<a href=\"index.php?act=findpost&amp;pid={content}\"><{POST_SNAPBACK}></a>', 0, '[snapback]100[/snapback]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Right', 'Aligns content to the right of the posting area', 'right', '<div align=\'right\'>{content}</div>', 0, '[right]Some text here[/right]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Left', 'Aligns content to the left of the post', 'left', '<div align=\'left\'>{content}</div>', 0, '[left]Left aligned text[/left]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Center', 'Aligns content to the center of the posting area.', 'center', '<div align=\'center\'>{content}</div>', 0, '[center]Centered Text[/center]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Topic Link', 'This tag provides an easy way to link to a topic', 'topic', '<a href=\'index.php?showtopic={option}\'>{content}</a>', 1, '[topic=100]Click me![/topic]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Link', 'This tag provides an easy way to link to a post.', 'post', '<a href=\'index.php?act=findpost&pid={option}\'>{content}</a>', 1, '[post=100]Click me![/post]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
+
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='USD', subcurrency_desc='United States Dollars', subcurrency_exchange='1.00', subcurrency_default=1;";
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='GBP', subcurrency_desc='United Kingdom Pounds', subcurrency_exchange=' 0.630776', subcurrency_default=0;";
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='CAD', subcurrency_desc='Canada Dollars', subcurrency_exchange='1.37080', subcurrency_default=0;";
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='EUR', subcurrency_desc='Euro', subcurrency_exchange='0.901517', subcurrency_default=0;";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('PayPal', 'paypal', '', '', '', '', '', '', '', 0, 1, 'All major credit cards accepted. See <a href=\"https://www.paypal.com/affil/pal=9DJEWQQKVB6WL\" target=\"_blank\">PayPal</a> for more information.', '', 1, 'USD');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('NOCHEX', 'nochex', '', '', '', '', '', '', '', 0, 1, 'UK debit and credit cards, such as Switch, Solo and VISA Delta. All prices will be convereted into GBP (UK Pounds) upon ordering.', NULL, 1, 'GBP');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('Post Service', 'manual', '', '', '', '', '', '', '', 0, 0, 'You can use this method if you wish to send us a check, postal order or international money order.', NULL, 1, 'USD');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('2CheckOut', '2checkout', '', '', '', '', '', '', '', 1, 1, 'All major credit cards accepted. See <a href=\'http://www.2checkout.com/cgi-bin/aff.2c?affid=28376\' target=\'_blank\'>2CheckOut</a> for more information.', NULL, 1, 'USD');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('Authorize.net', 'authorizenet', '', '', '', '', '', '', '', '1', '1', NULL, NULL, '1', 'USD');";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (1, 'pdf', 'application/pdf', 1, 0, 'folder_mime_types/pdf.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (2, 'png', 'image/png', 1, 1, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (3, 'viv', 'video/vivo', 1, 0, 'folder_mime_types/win_player.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (4, 'wmv', 'video/x-msvideo', 1, 0, 'folder_mime_types/win_player.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (5, 'html', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (6, 'ram', 'audio/x-pn-realaudio', 1, 0, 'folder_mime_types/real_audio.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (7, 'gif', 'image/gif', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (8, 'mpg', 'video/mpeg', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (9, 'ico', 'image/ico', 1, 0, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (10, 'tar', 'application/x-tar', 1, 0, 'folder_mime_types/zip.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (11, 'bmp', 'image/x-MS-bmp', 1, 0, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (12, 'tiff', 'image/tiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (13, 'rtf', 'text/richtext', 1, 0, 'folder_mime_types/rtf.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (14, 'hqx', 'application/mac-binhex40', 1, 0, 'folder_mime_types/stuffit.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (15, 'aiff', 'audio/x-aiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (31, 'zip', 'application/zip', 1, 0, 'folder_mime_types/zip.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (17, 'ps', 'application/postscript', 1, 0, 'folder_mime_types/eps.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (18, 'doc', 'application/msword', 1, 0, 'folder_mime_types/doc.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (19, 'mov', 'video/quicktime', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (20, 'ppt', 'application/powerpoint', 1, 0, 'folder_mime_types/ppt.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (21, 'wav', 'audio/x-wav', 1, 0, 'folder_mime_types/music.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (22, 'mp3', 'audio/x-mpeg', 1, 0, 'folder_mime_types/music.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (23, 'jpg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (24, 'txt', 'text/plain', 1, 0, 'folder_mime_types/txt.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (25, 'xml', 'text/xml', 1, 0, 'folder_mime_types/script.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (26, 'css', 'text/css', 1, 0, 'folder_mime_types/script.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (27, 'swf', 'application/x-shockwave-flash', 0, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (32, 'php', 'application/octet-stream', 1, 0, 'folder_mime_types/php.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (28, 'htm', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (29, 'jpeg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (33, 'gz', 'application/x-gzip', 1, 0, 'folder_mime_types/zip.gif');";
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('skin_id_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('bbcode', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('moderators', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('multimod', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('banfilters', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('attachtypes', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('emoticons', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('forum_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('badwords', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('systemvars', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('ranks', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('group_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('stats', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('profilefields', 'a:0:{}', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('settings','', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('languages', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('birthdays', 'a:0:{}', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (2, 'CPU Saving &amp; Optimization', 'This section allows certain features to be limited or removed to get more performance out of your board.', 16);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (3, 'Date &amp; Time Formats', 'This section contains the date and time formats used throughout the board.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (4, 'User Profiles', 'This section allows you to adjust your member\'s global permissions and other options.', 22);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (5, 'Topics, Posts and Polls', 'These options control various elements when posting, reading topics and reading polls.', 32);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (6, 'Security and Privacy', 'These options allow you to adjust the security and privacy options for your board.', 18);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (7, 'Cookies', 'This section allows you to set the default cookie options.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (8, 'COPPA Set-up', 'This section allows you to comply with <a href=\'http://www.ftc.gov/ogc/coppa1.htm\'>COPPA</a>.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (9, 'Calendar &amp; Birthdays', 'This section will allow you to set up the board calendar and its related options.', 8);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (10, 'News Set-up', 'This section will allow you to specify the forum you wish to export news topics from to be used with ssi.php and IPDynamic Lite.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (11, 'Personal Message Set-up', 'This section allows you to control the global PM options.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (12, 'Email Set-up', 'This section will allow you to change the incoming and outgoing email addresses as well as the email method.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (13, 'Warn Set-up', 'This section will allow you to set up the warning system.', 15);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (14, 'Trash Can Set-up', 'The trashcan is a special forum in which topics are moved into instead of being deleted.', 6);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (15, 'Board Offline / Online', 'Use this setting to turn switch your board online or offline and leave a message for your visitors.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (16, 'Search Engine Spiders', 'This section will allow you to set up and maintain your search engine bot spider recognition settings.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (17, 'Board Guidelines', 'This section allows you to maintain your board guidelines. If enabled, a link will be added to the board header linking to the board guidelines.', 4);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (18, 'Converge Set Up', 'Converge is Invision Power Services central authentication method for all IPS applications. This allows you to have a single log-in for all your IPS products.', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (19, 'Full Text Search Set-Up', 'Full text searching is a very fast and very efficient way of searching large amounts of posts without maintaining a manual index. This may not be available for your system.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (20,'Invision Chat Settings (Legacy Version)', 'This will allow you to customize your Invision Chat integration settings for the legacy edition.', 14, 1, 'chat');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (21,'Invision Chat Settings', 'This will allow you to customize your Invision Chat integration settings for the new 2004 edition', 10, 1, 'chat04');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (22,'IPB Portal', 'These settings enable you to enable or disable IPB Portal and control the options IPB Portal offers.', 20, 0, 'ipbportal');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (23,'Subscriptions Manager', 'These settings control various subscription manager features.', 3, 0, 'subsmanager');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (24,'IPB Registration', 'This section will allow you to edit your IPB registered licence settings.', 3, 1, 'ipbreg');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (25,'IPB Copyright Removal', 'This section allows you to manage your copyright removal key.', 2, 1, 'ipbcopyright');";
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."upgrade_history (upgrade_id, upgrade_version_id, upgrade_version_human, upgrade_date, upgrade_mid, upgrade_notes) VALUES ('', '".THIS_LONG_VERSION."', '".THIS_HUMAN_VERSION."', '0', '0', '');";
+	
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (1, 'Registration benefits', 'To be able to use all the features on this board, the administrator will probably require that you register for a member account. Registration is free and only takes a moment to complete.\r<br>\r<br>During registration, the administrator requires that you supply a valid email address. This is important as the administrator may require that you validate your registration via an email. If this is the case, you will be notified when registering. If your e-mail does not arrive, then on the member bar at the top of the page, there will be a link that will allow you to re-send the validation e-mail. \r<br>\r<br>In some cases, the administrator will need to approve your registration before you can use your member account fully. If this is the case you will be notified during registration.\r<br>\r<br>Once you have registered and logged in, you will have access to your personal messenger and your control panel.\r<br>\r<br>For more information on these items, please see the relevant sections in this documentation.', 'How to register and the added benefits of being a registered member.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (2, 'Cookies and cookie usage', 'Using cookies is optional, but strongly recommended. Cookies are used to track topics, showing you which topics have new replies since your last visit and to automatically log you in when you return.\r<br>\r<br>If your computer is unable to use the cookie system to browse the board correctly, then the board will automatically add in a session ID to each link to track you around the board.\r<br>\r<br><b>Clearing Cookies</b>\r<br>\r<br>You can clear the cookies at any time by clicking on the link found at the bottom of the main board page (the first page you see when returning to the board). If this does not work for you, you may need to remove the cookies manually.\r<br>\r<br><u>Removing Cookies in Internet Explorer for Windows</u>\r<br>\r<br><ul>\r<br><li> Close all open Internet Explorer Windows\r<br><li> Click on the \'start\' button\r<br><li> Move up to \'Find\' and click on \'Files and Folders\'\r<br><li> When the new window appears, type in the domain name of the board you are using into the \'containing text\' field. (If the boards address was \'http://www.invisionboard.com/forums/index.php\' you would enter \'invisionboard.com\' without the quotes)\r<br><li> In the \'look in\' box, type in <b>C:WindowsCookies</b> and press \'Find Now\'\r<br><li> After it has finished searching, highlight all files (click on a file then press CTRL+A) and delete them.\r<br></ul>\r<br>\r<br><u>Removing Cookies in Internet Explorer for Macintosh</u>\r<br>\r<br><ul>\r<br><li> With Internet Explorer active, choose \'Edit\' and then \'Preferences\' from the Macintosh menu bar at the top of the screen\r<br><li> When the preferences panel opens, choose \'Cookies\' found in the \'Receiving Files\' section.\r<br><li> When the cookie pane loads, look for the domain name of the board (If the boards address was \'http://www.invisionboard.com/forums/index.php\' look for \'invisionboard.com\' or \'www.invisionboard.com\'\r<br><li> For each cookie, click on the entry and press the delete button.\r<br></ul>\r<br>\r<br>Your cookies should now be removed. In some cases you may need to restart your computer for the changes to take effect.', 'The benefits of using cookies and how to remove cookies set by this board.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (3, 'Recovering lost or forgotten passwords', 'Security is a big feature on this board, and to that end, all passwords are encrypted when you register.\r<br>This means that we cannot email your password to you as we hold no record of your \'uncrypted\' password. You can however, apply to have your password reset.\r<br>\r<br>To do this, click on the <a href=\'index.php?act=Reg&CODE=10\'>Lost Password link</a> found on the log in page.\r<br>\r<br>Further instruction is available from there.', 'How to reset your password if you\'ve forgotton it.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (4, 'Your Control Panel (My Controls)', 'Your control panel is your own private board console. You can change how the board looks and feels as well as your own information from here.\r<br>\r<br><b>Subscriptions</b>\r<br>\r<br>This is where you manage your topic and forums subscriptions. Please see the help file \'Email Notification of new messages\' for more information on how to subscribe to topics.\r<br>\r<br><b>Edit Profile Info</b>\r<br>\r<br>This section allows you to add or edit your contact information and enter some personal information if you choose.\r<br>\r<br><b>Edit Signature</b>\r<br>\r<br>A board \'signature\' is very similar to an email signature. This signature is attached to the foot of every message you post unless you choose to check the box that allows you to ommit the signature in the message you are posting. You may use BB Code if available and in some cases, pure HTML (if the board administrator allows it).\r<br>\r<br><b>Edit Avatar Settings</b>\r<br>\r<br>An avatar is a little image that appears under your username when you view a topic or post you authored. If the administrator allows, you may either choose from the board gallery, enter a URL to an avatar stored on your server or upload an avatar to use. You may also set the width of the avatar to ensure that it\'s sized in proportion.\r<br>\r<br><b>Change Personal Photo</b>\r<br>\r<br>This section will allow you to add a photograph to your profile. This will be displayed when a user clicks to view your profile, on the mini-profile screen and will also be linked to from the member list.\r<br>\r<br><b>Email Settings</b>\r<br>\r<br><u>Hide my email address</u> allows you to deny the ability for other users to send you an email from the board.\r<br><u>Send me updates sent by the board administrator</u> will allow the administrator to include your email address in any mailings they send out - this is used mostly for important updates and community information.\r<br><u>Include a copy of the post when emailing me from a subscribed topic</u>, this allows you to have the new post included in any reply to topic notifications.\r<br><u>Send a confirmation email when I receive a new private message</u>, this will send you an e-mail notification to your registered e-mail address each time you receive a private message on the board.\r<br><u>Enable \'Email Notification\' by default?</u>, this will automatically subscribe you to any topic that you make a reply to. You may unsubscribe from the \'Subscriptions\' section of My Controls if you wish.\r<br>\r<br><b>Board Settings</b>\r<br>\r<br>From this section, you can set your time zone, choose to not see users signatures, avatars and posted images.\r<br>You can choose to get a pop up window informing you when you have a new message and choose to show or hide the \'Fast Reply\' box where it is enabled.\r<br>You are also able to choose display preferences for the number of topics/posts shown per page on the board.\r<br>\r<br><b>Skins and Languages</b>\r<br>\r<br>If available, you can choose a skin style and language choice. This affects how the board is displayed so you may wish to preview the skin before submitting the form.\r<br>\r<br><b>Change Email Address</b>\r<br>\r<br>At any time, you can change the email address that is registered to your account. In some cases, you will need to revalidate your account after changing your email address. If this is the case, you will be notified before your email address change is processed.\r<br>\r<br><b>Change Password</b>\r<br>\r<br>You may change your password from this section. Please note that you will need to know your current password before you can change your password.', 'Editing contact information, personal information, avatars, signatures, board settings, languages and style choices.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (5, 'Email Notification of new messages', 'This board can notify you when a new reply is added to a topic. Many users find this useful to keep up to date on topics without the need to view the board to check for new messages.\r<br>\r<br>There are three ways to subscribe to a topic:\r<br>\r<br><li>Click the \'Track This Topic\' link at the top of the topic that you wish to track\r<br><li> On the posting screen when replying to or creating a topic, check the \'Enable email notification of replies?\' checkbox\r<br><li> From the E-Mail settings section of your User CP (My Controls) check the \'Enable Email Notification by default?\' option, this will automatically subscribe you to any topic that you make a reply to\r<br>\r<br>Please note that to avoid multiple emails being sent to your email address, you will only get one e-mail for each topic you are subscribed to until the next time you visit the board.\r<br>\r<br>You are also able to subscribe to each individual forum on the board, to be notified when a new topic is created in that particular forum. To enable this, click the \'Subscribe to this forum\' link at the bottom of the forum that you wish to subscribe to.\r<br>\r<br>To unsubscribe from any forums or topics that you are subscribed to - just go to the \'Subscriptions\' section of \'My Controls\' and you can do this from there.', 'How to get emailed when a new reply is added to a topic.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (6, 'Your Personal Messenger', 'Your personal messenger acts much like an email account in that you can send and receive messages and store messages in folders.\r<br>\r<br><b>Send a new PM</b>\r<br>\r<br>This will allow you to send a message to another member. If you have names in your contact list, you can choose a name from it - or you may choose to enter a name in the relevant form field. This will be automatically filled in if you clicked a \'PM\' button on the board (from the member list or a post). If allowed, you may also be able to enter in multiple names in the box provided, will need to add one username per line.\r<br>If the administrator allows, you may use BB Code and HTML in your private message. If you choose to check the \'Add a copy of this message to you sent items folder\' box, a copy of the message will be saved for you for later reference. If you tick the \'Track this message?\' box, then the details of the message will be available in your \'Message Tracker\' where you will be able to see if/when it has been read.\r<br>\r<br><b>Go to Inbox</b>\r<br>\r<br>Your inbox is where all new messages are sent to. Clicking on the message title will show you the message in a similar format to the board topic view. You can also delete or move messages from your inbox.\r<br>\r<br><b>Empty PM Folders</b>\r<br>\r<br>This option provides you with a quick and easy way to clear out all of your PM folders.\r<br>\r<br><b>Edit Storage Folders</b>\r<br>\r<br>You may rename, add or remove folders to store messages is, allowing you to organise your messages to your preference. You cannot remove \'Sent Items\' or \'Inbox\'.\r<br>\r<br><b>PM Buddies/Block List</b>\r<br>\r<br>You may add in users names in this section, or edit any saved entries. You can also use this as a ban list, denying the named member the ability to message you.\r<br>Names entered in this section will appear in the drop down list when sending a new PM, allowing you to quickly choose the members name when sending a message.\r<br>\r<br><b>Archive Messages</b>\r<br>\r<br>If your messenger folders are full and you are unable to receive new messages, you can archive them off. This compiles the messages into a single HTML page or Microsoft © Excel Format. This page is then emailed to your registered email address for your convenience.\r<br>\r<br><b>Saved (Unsent) PMs</b>\r<br>\r<br>This area will allow you to go back to any PM\'s that you have chosen to save to be sent later.\r<br>\r<br><b>Message Tracker</B>\r<br>\r<br>This is the page that any messages that you have chosen to track will appear. Details of if and when they have been read by the recipient will appear here. This also gives you the chance to delete any messages that you have sent and not yet been read by the intended recipient.', 'How to send personal messages, track them, edit your messenger folders and archive stored messages.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (7, 'Contacting the moderating team & reporting posts', '<b>Contacting the moderating team</b>\r<br>\r<br>If you need to contact a moderator or simply wish to view the complete administration team, you can click the link \'The moderating team\' found at the bottom of the main board page (the first page you see when visiting the board), or from \'My Assistant\'.\r<br>\r<br>This list will show you administrators (those who have administration control panel access), global moderators (those who can moderate in all forums) and the moderators of the individual forums.\r<br>\r<br>If you wish to contact someone about your member account, then contact an administrator - if you wish to contact someone about a post or topic, contact either a global moderator or the forum moderator.\r<br>\r<br><b>Reporting a post</b>\r<br>\r<br>If the administrator has enabled this function on the board, you\'ll see a \'Report\' button in a post, next to the \'Quote\' button. This function will let you report the post to the forum moderator (or the administrator(s), if there isn\'t a specific moderator available). You can use this function when you think the moderator(s) should be aware of the existance of that post. However, <b>do not use this to chat with the moderator(s)!</b>. You can use the email function or the Personal Messenger function for that.', 'Where to find a list of the board moderators and administrators.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (8, 'Viewing members profile information', 'You can view a members profile at any time by clicking on their name when it is underlined (as a link) or by clicking on their name in a post within a topic.\r<br>\r<br>This will show you their profile page which contains their contact information (if they have entered some) and their \'active stats\'.\r<br>\r<br>You can also click on the \'Mini Profile\' button underneath their posts, this will show up a mini \'e-card\' with their contact information and a photograph if they have chosen to have one.', 'How to view members contact information.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (9, 'Viewing active topics and new posts', 'You can view which new topics have new replies today by clicking on the \'Today\'s Active Topics\' link found at the bottom of the main board page (the first page you see when visiting the board). You can set your own date criteria, choosing to view all topics  with new replies during several date choices.\r<br>\r<br>The \'View New Posts\' link in the member bar at the top of each page, will allow you to view all of the topics which have new replies in since your last visit to the board.', 'How to view all the topics which have a new reply today and the new posts made since your last visit.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (10, 'Searching Topics and Posts', 'The search feature is designed to allow you to quickly find topics and posts that contain the keywords you enter.\r<br>\r<br>There are two types of search form available, simple search and advanced search. You may switch between the two using the \'More Options\' and \'Simple Mode\' buttons.\r<br>\r<br><b>Simple Mode</b>\r<br>\r<br>All you need to do here is enter in a keyword into the search box, and select a forum(s) to search in. (to select multiple forums, hold down the control key on a PC, or the Shift/Apple key on a Mac) choose a sorting order and search.\r<br>\r<br><b>Advanced Mode</b>\r<br>\r<br>The advanced search screen, will give you a much greater range of options to choose from to refine your search. In addition to searching by keyword, you are able to search by a members username or a combination of both. You can also choose to refine your search by selecting a date range, and there are a number of sorting options available. There are also two ways of displaying the search results, can either show the post text in full or just show a link to the topic, can choose this using the radio buttons available.\r<br>\r<br>If the administrator has enabled it, you may have a minimum amount of time to wait between searches, this is known as search flood control.\r<br>\r<br>There are also search boxes available at the bottom of each forum, to allow you to carry out a quick search of all of the topics within that particular forum.', 'How to use the search feature.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (11, 'Logging in and out', 'If you have chosen not to remember your log in details in cookies, or you are accessing the board on another computer, you will need to log into the board to access your member profile and post with your registered name.\r<br>\r<br>When you log in, you have the choice to save cookies that will log you in automatically when you return. Do not use this option on a shared computer for security.\r<br>\r<br>You can also choose to hide - this will keep your name from appearing in the active users list.\r<br>\r<br>Logging out is simply a matter of clicking on the \'Log Out\' link that is displayed when you are logged in. If you find that you are not logged out, you may need to manually remove your cookies. See the \'Cookies\' help file for more information.', 'How to log in and out from the board and how to remain anonymous and not be shown on the active users list.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (13, 'My Assistant', 'This feature is sometimes referred to as a \'Browser Buddy\'. \r<br>\r<br>At the top it tells you how many posts have been made since you last visited the board.. Also underneath this the number of posts with replies that have been made in topics that the individual has also posted in.\r<br>Click on the \'View\' link on either of the two sentences to see the posts.\r<br>\r<br>The next section is five links to useful features:\r<br>\r<br><li>The link to the moderating team is basically a quick link to see all those that either administrate or moderate certain forums on the message board.\r<br><li> The link to \'Today\'s Active Topics\' shows you all the topics that have been created in the last 24 hours on the board.\r<br><li>Today\'s Top 10 Posters link shows you exactly as the name suggests. It shows you the amount of posts by the members and also their total percentage of the total posts made that day.\r<br><li>The overall Top 10 Posters link shows you the top 10 posters for the whole time that the board has been installed.\r<br><li>My last 10 posts links to the latest topics that you have made on the board. These are shortened on the page, to save space, and are linked to if you require to read more of them.\r<br>\r<br>The two search features allow you to search the whole board for certain words in a whole topic. It isn\'t as featured as the normal search option so it is not as comprehensive.\r<br>\r<br>The Help Search is just as comprehensive as the normal help section\'s search function and allows for quick searching of all the help topics on the board.', 'A comprehensive guide to use this handy little feature.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (12, 'Posting', 'There are three different posting screens available. The new topic button, visible in forums and in topics allows you to add a new topic to that particular forum. The new poll button (is the admin has enabled it) will also be viewable in topics and forums allowing you to create a new poll in the forum. When viewing a topic, there will be an add reply button, allowing you to add a new reply onto that particular topic. \r\n<br>\r\n<br><b>Posting new topics and replying</b>\r\n<br>\r\n<br>When making a post, you will most likely have the option to use IBF code when posting. This will allow you to add various types of formatting to your messages. For more information on this, click the \'BB Code Help\' link under the emoticon box to launch the help window.\r\n<br>\r\n<br>On the left of the text entry box, there is the clickable emoticons box - you can click on these to add them to the content of your message (these are sometimes known as \'smilies\').\r\n<br>\r\n<br>There are three options available when making a post or a reply. \'Enable emoticons?\' if this is unchecked, then any text that would normally be converted into an emoticon will not be. \'Enable signature?\' allows you to choose whether or not you would like your signature to appear on that individual post. \'Enable email notification of replies?\' ticking this box will mean that you will receive e-mail updates to the topic, see the \'Email Notification of new messages\' help topic for more information on this.\r\n<br>\r\n<br>You also have the option to choose a post icon for the topic/post when creating one. This icon will appear next to the topic name on the topic listing in that forum, or will appear next to the date/time of the message if making a reply to a topic.\r\n<br>\r\n<br>If the admin has enabled it, you will also see a file attachments option, this will allow you to attach a file to be uploaded when making a post. Click the browse button to select a file from your computer to be uploaded. If you upload an image file, it may be shown in the content of the post, all other file types will be linked to.\r\n<br>\r\n<br><b>Poll Options</b>\r\n<br>\r\n<br>If you have chosen to post a new poll, there will be an extra two option boxes at the top of the help screen. The first input box will allow you to enter the question that you are asking in the poll. The text field underneath is where you will input the choices for the poll. Simply enter a different option on each line. The maximum number of choices is set by the board admin, and this figure is displayed on the left.\r\n<br>\r\n<br><b>Quoting Posts</b>\r\n<br>\r\n<br>Displayed above each post in a topic, there is a \'Quote\' button. Pressing this button will allow you to reply to a topic, and have the text from a particular reply quoted in your own reply. When you choose to do this, an extra text field will appear below the main text input box to allow you to edit the content of the post being quoted.\r\n<br>\r\n<br><b>Editing Posts</b>\r\n<br>\r\n<br>Above any posts that you have made, you may see an \'Edit\' button. Pressing this will allow you to edit the post that you had previously made. \r\n<br>\r\n<br>When editing you may see an option to \'Add the \'Edit by\' line in this post?\'. If you tick this then it will show up in the posts that it has been edited and the time at which it was edited. If this option does not appear, then the edit by line will always be added to the post.\r\n<br>\r\n<br>If you are unable to see the edit button displayed on each post that you have made, then the administrator may have prevented you from editing posts, or the time limit for editing may have expired.\r\n<br>\r\n<br><b>Fast Reply</b>\r\n<br>\r\n<br>Where it has been enabled, there will be a fast reply button on each topic. Clicking this will open up a posting box on the topic view screen, cutting down on the time required to load the main posting screen. Click the fast reply button to expand the reply box and type the post inside of there. Although the fast reply box is not expanded by default, you can choose the option to have it expanded by default, from the board settings section of your control panel. Pressing the \'More Options\' button will take you to the normal posting screen.', 'A guide to the features avaliable when posting on the boards.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (14, 'Member List', 'The member list, accessed via the \'Members\' link at the top of each page, is basically a listing of all of the members that have registered on the board. \r\n<br>\r\n<br>If you are looking to search for a particular member by all/part of their username, then in the drop down box at the bottom of the page, change the selection from \'Search All Available\' to \'Name Begins With\' or \'Name Contains\' and input all/part of their name in the text input field and press the \'Go!\' button. \r\n<br>\r\n<br>Also, at the bottom of the member list page, there are a number of sorting options available to alter the way in which the list is displayed. \r\n<br>\r\n<br>If a member has chosen to add a photo to their profile information, then a camera icon will appear next to their name, and you may click this to view the photo.', 'Explaining the different ways to sort and search through the list of members.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (15, 'Topic Options', 'At the bottom of each topic, there is a \'Topic Options\' button. Pressing this button will expand the topic options box. \r\n<br>\r\n<br>From this box, you can select from the following options: \r\n<br>\r\n<br><li>Track this topic - this option will allow you to receive e-mail updates for the topic, see the \'Email Notification of new messages\' help file for more information on this \r\n<br><li>Subscribe to this forum - will allow you to receive e-mail updates for any new topics posted in the forum, see the Notification of new messages\' help file for more information on this \r\n<br><li>Download / Print this Topic - will show the topic in a number of different formats. \'Printer Friendly Version\' will display a version of the topic that is suitable for printing out. \'Download HTML Version\' will download a copy of the topic to your hard drive, and this can then be viewed in a web browser, without having to visit the board. \'Download Microsoft Word Version\' will allow you to download the file to your hard drive and open it up in the popular word processing application, Microsoft Word, for viewing offline.', 'A guide to the options avaliable when viewing a topic.');";
+		$SQL[] = "REPLACE INTO ".SQL_PREFIX."faq VALUES (16, 'Calendar', 'This board features it\'s very own calendar feature, which can be accessed via the calendar link at the top of the board.\r\n<br>\r\n<br>You are able to add your own personal events to the calendar - and these are only viewable by yourself. To add a new event, use the \'Add New Event\' button to be taken to the event posting screen. There are three types of events that you can now add:\r\n<br>\r\n<br><li>A single day/one off event can be added using the first option, by just selecting the date for it to appear on.\r\n<br><li>Ranged Event - is an event that spans across multiple days, to do this in addition to selecting the start date as above, will need to add the end date for the event. There are also options available  to highlight the message on the calendar, useful if there is more than one ranged event being displayed at any one time.\r\n<br><li>Recurring Event - is a one day event, that you can set to appear at set intervals on the calendar, either weekly, monthly or yearly.\r\n<br>\r\n<br>If the admistrator allows you, you may also be able to add a public event, that will not just be shown to yourself, but will be viewable by everyone.\r\n<br>\r\n<br>Also, if the admistrator has chosen,  there will be a link to all the birthdays happening on a particular day displayed on the calendar, and your birthday will appear if you have chosen to enter a date of birth in the Profile Info section of your control panel.', 'More information on the boards calendar feature.');";
+
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 17: ALTER OTHERS TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_17()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_attach_per_post int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topic_mmod add topic_approve tinyint(1) NOT NULL default '0';";
+		
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_can_msg_attach tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."pfields_data
+				change fid pf_id smallint(5) NOT NULL auto_increment,
+				change ftitle pf_title varchar(250) NOT NULL default '',
+				change fdesc pf_desc varchar(250) NOT NULL default '',
+				change fcontent pf_content text NOT NULL default '',
+				change ftype pf_type varchar(250) NOT NULL default '',
+				change freq pf_not_null tinyint(1) NOT NULL default '0',
+				change fhide pf_member_hide tinyint(1) NOT NULL default '0',
+				change fmaxinput pf_max_input smallint(6) NOT NULL default '0',
+				change fedit pf_member_edit tinyint(1) NOT NULL default '0',
+				change forder pf_position smallint(6) NOT NULL default '0',
+				change fshowreg pf_show_on_reg tinyint(1) NOT NULL default '0',
+				add pf_input_format text NOT NULL default '',
+				add pf_admin_only tinyint(1) NOT NULL default '0',
+				add pf_topic_format text NOT NULL default '';";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 16: ALTER MEMBERS TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_16()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."members add sub_end int(10) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members DROP msg_from_id, DROP msg_msg_id;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members DROP org_supmod, DROP integ_msg;";
+		$SQL[] = "alter table ".SQL_PREFIX."members DROP aim_name, DROP icq_number, DROP website, DROP yahoo, DROP interests,
+				  DROP msnname, DROP vdirs, DROP signature, DROP location, DROP avatar, DROP avatar_size;";
+		$SQL[] = "alter table ".SQL_PREFIX."members change auto_track auto_track varchar(50) default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add subs_pkg_chosen smallint(3) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members change temp_ban temp_ban varchar(100) default '0'";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members change msg_total msg_total smallint(5) default '0'";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 15: ALTER TOPIC TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_15()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics add topic_firstpost int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topics add topic_queuedposts int(10) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics DROP INDEX forum_id;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics ADD INDEX forum_id(forum_id,approved,pinned);";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics ADD INDEX(last_post);";
+	
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 14: ALTER POST TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_14()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."posts DROP attach_id, DROP attach_hits, DROP attach_type, DROP attach_file;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change queued queued tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop forum_id;";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 7: IMPORT FORUMS
+	/*-------------------------------------------------------------------------*/
+	
+	function step_7()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Convert existing forums
+		//-----------------------------------------
+		
+		$o = $DB->query("SELECT * FROM ".SQL_PREFIX."forums_bak ORDER BY id");
+		
+		while( $r = $DB->fetch_row( $o ) )
+		{
+			$perm_array = addslashes(serialize(array(
+													  'start_perms'  => $r['start_perms'],
+													  'reply_perms'  => $r['reply_perms'],
+													  'read_perms'   => $r['read_perms'],
+													  'upload_perms' => $r['upload_perms'],
+													  'show_perms'   => $r['read_perms']
+									)		  )     );
+			
+			$DB->do_insert( 'forums', array (
+											  'id'                      => $r['id'],
+											  'position'                => $r['position'],
+											  'topics'                  => $r['topics'],
+											  'posts'                   => $r['posts'],
+											  'last_post'               => $r['last_post'],
+											  'last_poster_id'          => $r['last_poster_id'],
+											  'last_poster_name'        => $r['last_poster_name'],
+											  'name'                    => $r['name'],
+											  'description'             => $r['description'],
+											  'use_ibc'                 => $r['use_ibc'],
+											  'use_html'                => $r['use_html'],
+											  'status'                  => $r['status'],
+											  'password'                => $r['password'],
+											  'last_id'                 => $r['last_id'],
+											  'last_title'              => $r['last_title'],
+											  'sort_key'                => $r['sort_key'],
+											  'sort_order'              => $r['sort_order'],
+											  'prune'                   => $r['prune'],
+											  'show_rules'              => $r['show_rules'],
+											  'preview_posts'           => $r['preview_posts'],
+											  'allow_poll'              => $r['allow_poll'],
+											  'allow_pollbump'          => $r['allow_pollbump'],
+											  'inc_postcount'           => $r['inc_postcount'],
+											  'parent_id'               => $r['parent_id'],
+											  'sub_can_post'            => $r['sub_can_post'],
+											  'quick_reply'             => $r['quick_reply'],
+											  'redirect_on'             => $r['redirect_on'],
+											  'redirect_hits'           => $r['redirect_hits'],
+											  'redirect_url'            => $r['redirect_url'],
+											  'redirect_loc'		    => $r['redirect_loc'],
+											  'rules_title'			    => $r['rules_title'],
+  											  'rules_text'			    => $r['rules_text'],
+											  'notify_modq_emails'      => $r['notify_modq_emails'],
+											  'permission_array'        => $perm_array,
+											  'permission_showtopic'    => '',
+											  'permission_custom_error' => '',
+									)       );
+		}
+		
+		//-----------------------------------------
+		// Convert categories
+		//-----------------------------------------
+		
+		$DB->query("SELECT MAX(id) as max FROM ".SQL_PREFIX."forums");
+		$max = $DB->fetch_row();
+		
+		$fid = $max['max'];
+		
+		$o = $DB->query("SELECT * FROM ".SQL_PREFIX."categories WHERE id > 0");
+		
+		while( $r = $DB->fetch_row( $o ) )
+		{
+			$fid++;
+			
+			$perm_array = addslashes(serialize(array(
+													  'start_perms'  => '*',
+													  'reply_perms'  => '*',
+													  'read_perms'   => '*',
+													  'upload_perms' => '*',
+													  'show_perms'   => '*',
+									)		  )     );
+									
+			$DB->do_insert( 'forums', array(
+											 'id'               => $fid,
+											 'position'         => $r['position'],
+											 'name'             => $r['name'],
+											 'sub_can_post'     => 0,
+											 'permission_array' => $perm_array,
+											 'parent_id'        => -1,
+						  )                );
+						  
+			//-----------------------------------------
+			// Update old categories
+			//-----------------------------------------
+			
+			$n = $DB->query("SELECT id FROM ".SQL_PREFIX."forums_bak WHERE category={$r['id']} AND parent_id = -1");
+			
+			$ids = array();
+			
+			while( $c = $DB->fetch_row($n) )
+			{
+				$ids[] = $c['id'];
+			}
+			
+			if ( count($ids) )
+			{
+				$DB->do_update( 'forums', array( 'parent_id' => $fid ), 'id IN ('.implode(',',$ids).')' );
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 6: ALTER OTHER TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_6()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."macro rename ibf_skin_macro;";
+		$SQL[] = "alter table ".SQL_PREFIX."skin_macro change can_remove macro_can_remove tinyint(1) default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_bypass_badwords tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."cache_store change cs_value cs_value mediumtext NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."cache_store add cs_array tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."sessions add in_error tinyint(1) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."topic_mmod add mm_forums text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups change g_icon g_icon text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."emoticons add emo_set varchar(64) NOT NULL default 'default';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change ID session_id varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change IP_ADDRESS session_ip_address varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change MEMBER_NAME session_member_name varchar(250) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change MEMBER_ID session_member_id mediumint(8) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change SESSION_KEY session_member_login_key varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change LOCATION session_location varchar(64) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change LOG_IN_TIME session_log_in_time int(10) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change RUNNING_TIME session_running_time int(10) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."forum_tracker add forum_track_type varchar(100) NOT NULL default 'delayed';";
+		$SQL[] = "alter table ".SQL_PREFIX."tracker add topic_track_type varchar(100) NOT NULL default 'delayed';";
+		
+		$SQL[] = "delete from ".SQL_PREFIX."members where id=0 LIMIT 1;";
+		$SQL[] = "delete from ".SQL_PREFIX."member_extra where id=0 limit 1;";
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."groups ADD g_perm_id varchar(255) NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."groups ADD g_photo_max_vars VARCHAR(200) DEFAULT '100:250:250';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_dohtml tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_edit_topic tinyint(1) NOT NULL DEFAULT '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_email_limit varchar(15) NOT NULL DEFAULT '10:15';";
+	
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add end_day int(2), add end_month int(2), add end_year int(4);";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add end_unix_stamp int(10);";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add event_ranged tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add event_repeat tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add repeat_unit char(2) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add event_bgcolor varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."calendar_events add event_color varchar(32) NOT NULL default '';";
+	
+		$SQL[] = "alter table ".SQL_PREFIX."skins add css_method varchar(100) default 'inline';";
+		$SQL[] = "alter table ".SQL_PREFIX."css add updated int(10) default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."search_results add query_cache text;";
+
+		$SQL[] = "alter table ".SQL_PREFIX."moderators add can_mm tinyint(1) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 5: ALTER MEMBERS TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_5()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."members add login_anonymous varchar(3) NOT NULL default '0&0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add ignored_users text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add mgroup_others varchar(255) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra
+		ADD aim_name varchar(40) NOT NULL default '',
+		ADD icq_number int(15) NOT NULL default '',
+		ADD website varchar(250) NOT NULL default '',
+		ADD yahoo varchar(40) NOT NULL default '',
+		ADD interests text NOT NULL default '',
+		ADD msnname varchar(200) NOT NULL default '',
+		ADD vdirs text NOT NULL default '',
+		ADD location varchar(250) NOT NULL default '',
+		ADD signature text NOT NULL default '',
+		ADD avatar_location varchar(128) NOT NULL default '',
+		ADD avatar_size varchar(9) NOT NULL default '',
+		ADD avatar_type varchar(15) NOT NULL default 'local';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add member_login_key varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members change password legacy_password varchar(32) NOT NULL default '';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members ADD org_supmod TINYINT(1) DEFAULT '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members ADD org_perm_id varchar(255) DEFAULT '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members drop validate_key;";
+		$SQL[] = "alter table ".SQL_PREFIX."members drop new_pass;";
+		$SQL[] = "alter table ".SQL_PREFIX."members drop prev_group;";
+		$SQL[] = "alter table ".SQL_PREFIX."members add temp_ban varchar(100);";
+		$SQL[] = "alter table ".SQL_PREFIX."members change allow_post restrict_post varchar(100) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members change mod_posts mod_posts varchar(100) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add warn_lastwarn int(10) not null default '0' after warn_level;";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra add photo_type varchar(10) default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra add photo_location varchar(255) default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra add photo_dimensions varchar(200) default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add integ_msg varchar(250) default '';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 4: ALTER TOPIC TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_4()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."topics ADD topic_hasattach smallint(5) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topics change posts posts int(10) default null, change views views int(10) default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 3: ALTER POST TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_3()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."posts add post_parent int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts ADD post_key varchar(32) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add post_htmlstate smallint(1) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 2: DROP FORUMS TABLE, CREATE NEW TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_2()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."attachments (
+		   attach_id int(10) NOT NULL auto_increment,
+		   attach_ext varchar(10) NOT NULL default '',
+		   attach_file varchar(250) NOT NULL default '',
+		   attach_location varchar(250) NOT NULL default '',
+		   attach_thumb_location varchar(250) NOT NULL default '',
+		   attach_thumb_width smallint(5) NOT NULL default '0',
+		   attach_thumb_height smallint(5) NOT NULL default '0',
+		   attach_is_image tinyint(1) NOT NULL default '0',
+		   attach_hits int(10) NOT NULL default '0',
+		   attach_date int(10) NOT NULL default '0',
+		   attach_temp tinyint(1) NOT NULL default '0',
+		   attach_pid int(10) NOT NULL default '0',
+		   attach_post_key varchar(32) NOT NULL default '0',
+		   attach_msg int(10) NOT NULL default '0',
+		   attach_member_id mediumint(8) NOT NULL default '0',
+		   attach_approved int(10) NOT NULL default '1',
+		   attach_filesize int(10) NOT NULL default '0',
+		PRIMARY KEY (attach_id),
+		KEY attach_pid (attach_pid),
+		KEY attach_msg (attach_msg),
+		KEY attach_post_key (attach_post_key),
+		KEY attach_mid_size (attach_member_id, attach_filesize)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."message_text (
+		 msg_id int(10) NOT NULL auto_increment,
+		 msg_date int(10) default NULL,
+		 msg_post text default '',
+		 msg_cc_users text default '',
+		 msg_sent_to_count smallint(5) NOT NULL default '0',
+		 msg_deleted_count smallint(5) NOT NULL default '0',
+		 msg_post_key varchar(32) NOT NULL default '0',
+		 msg_author_id mediumint(8) NOT NULL default '0',
+		PRIMARY KEY (msg_id),
+		KEY msg_date (msg_date),
+		KEY msg_sent_to_count (msg_sent_to_count),
+		KEY msg_deleted_count (msg_deleted_count)
+		);";
+		
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."message_topics (
+		   mt_id int(10) NOT NULL auto_increment,
+		   mt_msg_id int(10) NOT NULL default '0',
+		   mt_date int(10) NOT NULL default '0',
+		   mt_title varchar(255) NOT NULL default '',
+		   mt_from_id mediumint(8) NOT NULL default '0',
+		   mt_to_id mediumint(8) NOT NULL default '0',
+		   mt_owner_id mediumint(8) NOT NULL default '0',
+		   mt_vid_folder varchar(32) NOT NULL default '',
+		   mt_read tinyint(1) NOT NULL default '0',
+		   mt_hasattach smallint(5) NOT NULL default '0',
+		   mt_hide_cc tinyint(1) default '0',
+		   mt_tracking tinyint(1) default '0',
+		   mt_user_read int(10) default '0',
+		PRIMARY KEY (mt_id),
+		KEY mt_from_id (mt_from_id),
+		KEY mt_owner_id (mt_owner_id, mt_to_id, mt_vid_folder)
+		);";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."skin_sets (
+		   set_skin_set_id int(10) NOT NULL auto_increment,
+		   set_name varchar(150) NOT NULL default '',
+		   set_image_dir varchar(200) NOT NULL default '',
+		   set_hidden tinyint(1) NOT NULL default '0',
+		   set_default tinyint(1) NOT NULL default '0',
+		   set_css_method varchar(100) NOT NULL default 'inline',
+		   set_skin_set_parent smallint(5) NOT NULL default '-1',
+		   set_author_email varchar(255) NOT NULL default '',
+		   set_author_name varchar(255) NOT NULL default '',
+		   set_author_url varchar(255) NOT NULL default '',
+		   set_css mediumtext NOT NULL default '',
+		   set_wrapper mediumtext NOT NULL default '',
+		   set_css_updated int(10) NOT NULL default '0',
+		   set_cache_css mediumtext NOT NULL default '',
+		   set_cache_macro mediumtext NOT NULL default '',
+		   set_cache_wrapper mediumtext NOT NULL default '',
+		   set_emoticon_folder varchar(60) NOT NULL default 'default',
+		   PRIMARY KEY(set_skin_set_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."skin_templates_cache (
+		   template_id varchar(32) NOT NULL default '',
+		   template_group_name varchar(255) NOT NULL default '',
+		   template_group_content mediumtext NOT NULL default '',
+		   template_set_id int(10) NOT NULL default '0',
+		   primary key (template_id),
+		   KEY template_set_id (template_set_id),
+		   KEY template_group_name (template_group_name)
+	   );";
+	   
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."mail_queue(
+		   mail_id int(10) auto_increment NOT NULL,
+		   mail_date int(10) NOT NULL default '0',
+		   mail_to varchar(255) NOT NULL default '',
+		   mail_from varchar(255) NOT NULL default '',
+		   mail_subject text NOT NULL default '',
+		   mail_content text NOT NULL default '',
+		   mail_type varchar(200) NOT NULL default '',
+		   PRIMARY KEY (mail_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."task_manager (
+		   task_id int(10) auto_increment NOT NULL,
+		   task_title varchar(255) NOT NULL default '',
+		   task_file varchar(255) NOT NULL default '',
+		   task_next_run int(10) NOT NULL default '',
+		   task_week_day tinyint(1) NOT NULL default '-1',
+		   task_month_day smallint(2) NOT NULL default '-1',
+		   task_hour smallint(2) NOT NULL default '-1',
+		   task_minute smallint(2) NOT NULL default '-1',
+		   task_cronkey varchar(32) NOT NULL default '',
+		   task_log tinyint(1) NOT NULL default '0',
+		   task_description text NOT NULL default '',
+		   task_enabled tinyint(1) NOT NULL default '1',
+		   task_key varchar(30) NOT NULL default '',
+		   task_safemode tinyint(1) NOT NULL default '',
+		   PRIMARY KEY(task_id),
+		   KEY task_next_run (task_next_run)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."task_logs (
+		   log_id int(10) auto_increment NOT NULL,
+		   log_title varchar(255) NOT NULL default '',
+		   log_date int(10) NOT NULL default '0',
+		   log_ip varchar(16) NOT NULL default '0',
+		   log_desc text NOT NULL default '',
+		   PRIMARY KEY(log_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."custom_bbcode (
+		   bbcode_id int(10) NOT NULL auto_increment,
+		   bbcode_title varchar(255) NOT NULL default '',
+		   bbcode_desc text NOT NULL default '',
+		   bbcode_tag varchar(255) NOT NULL default '',
+		   bbcode_replace text NOT NULL default '',
+		   bbcode_useoption tinyint(1) NOT NULL default '',
+		   bbcode_example text NOT NULL default '',
+		   PRIMARY KEY (bbcode_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."conf_settings (
+		   conf_id int(10) NOT NULL auto_increment,
+		   conf_title varchar(255) NOT NULL default '',
+		   conf_description text NOT NULL default '',
+		   conf_group smallint(3) NOT NULL default '',
+		   conf_type varchar(255) NOT NULL default '',
+		   conf_key varchar(255) NOT NULL default '',
+		   conf_value text NOT NULL default '',
+		   conf_default text NOT NULL default '',
+		   conf_extra text NOT NULL default '',
+		   conf_evalphp text NOT NULL default '',
+		   conf_protected tinyint(1) NOT NULL default '',
+		   conf_position smallint(3) NOT NULL default '0',
+		   conf_start_group varchar(255) NOT NULL default '',
+		   conf_end_group tinyint(1) NOT NULL default '0',
+		   conf_help_key varchar(255) NOT NULL default '0',
+		   conf_add_cache tinyint(1) NOT NULL default '1',
+		   PRIMARY KEY (conf_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."conf_settings_titles (
+		   conf_title_id smallint(3) NOT NULL auto_increment,
+		   conf_title_title varchar(255) NOT NULL default '',
+		   conf_title_desc text NOT NULL default '',
+		   conf_title_count smallint(3) NOT NULL default '0',
+		   conf_title_noshow tinyint(1) NOT NULL default '0',
+		   conf_title_keyword varchar(200) NOT NULL default '',
+		   PRIMARY KEY(conf_title_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."topics_read (
+		 read_tid int(10) NOT NULL default '0',
+		 read_mid mediumint(8) NOT NULL default '0',
+		 read_date int(10) NOT NULL default '0',
+		 UNIQUE KEY read_tid_mid( read_tid, read_mid )
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."banfilters (
+		   ban_id int(10) NOT NULL auto_increment,
+		   ban_type varchar(10) NOT NULL default 'ip',
+		   ban_content text NOT NULL default '',
+		   ban_date int(10) NOT NULL default '0',
+		   PRIMARY KEY (ban_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."attachments_type (
+		   atype_id int(10) NOT NULL auto_increment,
+		   atype_extension varchar(18) NOT NULL default '',
+		   atype_mimetype varchar(255) NOT NULL default '',
+		   atype_post tinyint(1) NOT NULL default '1',
+		   atype_photo tinyint(1) NOT NULL default '0',
+		   atype_img text NOT NULL default '',
+		   PRIMARY KEY (atype_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."members_converge (
+		   converge_id int(10) auto_increment NOT NULL,
+		   converge_email varchar(250) NOT NULL default '',
+		   converge_joined int(10) NOT NULL default '',
+		   converge_pass_hash varchar(32) NOT NULL default '',
+		   converge_pass_salt varchar(5) NOT NULL default '',
+		   PRIMARY KEY( converge_id )
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."announcements (
+		announce_id int(10) UNSIGNED NOT NULL auto_increment,
+		announce_title varchar(255) NOT NULL default '',
+		announce_post text NOT NULL default '',
+		announce_forum text NOT NULL default '',
+		announce_member_id mediumint(8) UNSIGNED NOT NULL default '0',
+		announce_html_enabled tinyint(1) NOT NULL default '0',
+		announce_views int(10) UNSIGNED NOT NULL default '0',
+		announce_start int(10) UNSIGNED NOT NULL default '0',
+		announce_end int(10) UNSIGNED NOT NULL default '0',
+		announce_active tinyint(1) NOT NULL default '1',
+	   PRIMARY KEY (announce_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."mail_error_logs (
+		   mlog_id int(10) auto_increment NOT NULL,
+		   mlog_date int(10) NOT NULL default '0',
+		   mlog_to varchar(250) NOT NULL default '',
+		   mlog_from varchar(250) NOT NULL default '',
+		   mlog_subject varchar(250) NOT NULL default '',
+		   mlog_content varchar(250) NOT NULL default '',
+		   mlog_msg text NOT NULL default '',
+		   mlog_code varchar(200) NOT NULL default '',
+		   mlog_smtp_msg text NOT NULL default '',
+		   PRIMARY KEY (mlog_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."bulk_mail (
+		   mail_id int(10) NOT NULL auto_increment,
+		   mail_subject varchar(255) NOT NULL default '',
+		   mail_content mediumtext NOT NULL default '',
+		   mail_groups mediumtext NOT NULL default '',
+		   mail_honor tinyint(1) NOT NULL default '1',
+		   mail_opts mediumtext NOT NULL default '',
+		   mail_start int(10) NOT NULL default '0',
+		   mail_updated int(10) NOT NULL default '0',
+		   mail_sentto int(10) NOT NULL default '0',
+		   mail_active tinyint(1) NOT NULL default '0',
+		   mail_pergo smallint(5) NOT NULL default '0',
+		   PRIMARY KEY (mail_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."upgrade_history (
+		   upgrade_id int(10) NOT NULL auto_increment,
+		   upgrade_version_id int(10) NOT NULL default '',
+		   upgrade_version_human varchar(200) NOT NULL default '',
+		   upgrade_date int(10) NOT NULL default '0',
+		   upgrade_mid int(10) NOT NULL default '0',
+		   upgrade_notes text NOT NULL default '',
+		   PRIMARY KEY (upgrade_id)
+	   );";
+	   
+	   $SQL[] = "DROP TABLE ".SQL_PREFIX."forums";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."forums (
+				 id smallint(5) NOT NULL default '0',
+				 topics mediumint(6) default '0',
+				 posts mediumint(6) default '0',
+				 last_post int(10) default NULL,
+				 last_poster_id mediumint(8) NOT NULL default '0',
+				 last_poster_name varchar(32) default NULL,
+				 name varchar(128) NOT NULL default '',
+				 description text,
+				 position tinyint(2) default NULL,
+				 use_ibc tinyint(1) default NULL,
+				 use_html tinyint(1) default NULL,
+				 status varchar(10) default NULL,
+				 password varchar(32) default NULL,
+				 last_title varchar(128) default NULL,
+				 last_id int(10) default NULL,
+				 sort_key varchar(32) default NULL,
+				 sort_order varchar(32) default NULL,
+				 prune tinyint(3) default NULL,
+				 show_rules tinyint(1) default NULL,
+				 preview_posts tinyint(1) default NULL,
+				 allow_poll tinyint(1) NOT NULL default '1',
+				 allow_pollbump tinyint(1) NOT NULL default '0',
+				 inc_postcount tinyint(1) NOT NULL default '1',
+				 skin_id int(10) default NULL,
+				 parent_id mediumint(5) default '-1',
+				 sub_can_post tinyint(1) default '1',
+				 quick_reply tinyint(1) default '0',
+				 redirect_url varchar(250) default '',
+				 redirect_on tinyint(1) NOT NULL default '0',
+				 redirect_hits int(10) NOT NULL default '0',
+				 redirect_loc varchar(250) default '',
+				 rules_title varchar(255) NOT NULL default '',
+				 rules_text text NOT NULL,
+				 topic_mm_id varchar(250) NOT NULL default '',
+				 notify_modq_emails text default '',
+				 permission_custom_error text NOT NULL default '',
+				 permission_array mediumtext NOT NULL default '',
+				 permission_showtopic tinyint(1) NOT NULL default '0',
+				 queued_topics mediumint(6) NOT NULL default '0',
+				 queued_posts  mediumint(6) NOT NULL default '0',
+				 PRIMARY KEY  (id),
+				 KEY position (position, parent_id)
+			   );";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscriptions (
+		 sub_id smallint(5) NOT NULL auto_increment,
+		 sub_title varchar(250) NOT NULL default '',
+		 sub_desc text,
+		 sub_new_group mediumint(8) NOT NULL default 0,
+		 sub_length smallint(5) NOT NULL default '1',
+		 sub_unit varchar(2) NOT NULL default 'm',
+		 sub_cost decimal(10,2) NOT NULL default '0.00',
+		 sub_run_module varchar(250) NOT NULL default '',
+		 PRIMARY KEY (sub_id)
+		);";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_extra (
+		 subextra_id smallint(5) NOT NULL auto_increment,
+		 subextra_sub_id smallint(5) NOT NULL default '0',
+		 subextra_method_id smallint(5) NOT NULL default '0',
+		 subextra_product_id varchar(250) NOT NULL default '0',
+		 subextra_can_upgrade tinyint(1) NOT NULL default '0',
+		 subextra_recurring tinyint(1) NOT NULL default '0',
+		 subextra_custom_1 text,
+		 subextra_custom_2 text,
+		 subextra_custom_3 text,
+		 subextra_custom_4 text,
+		 subextra_custom_5 text,
+		 PRIMARY KEY(subextra_id)
+		);";
+		
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_trans (
+		 subtrans_id int(10) NOT NULL auto_increment,
+		 subtrans_sub_id smallint(5) NOT NULL default '0',
+		 subtrans_member_id mediumint(8) NOT NULL default '0',
+		 subtrans_old_group smallint(5) NOT NULL default '0',
+		 subtrans_paid decimal(10,2) NOT NULL default '0.00',
+		 subtrans_cumulative decimal(10,2) NOT NULL default '0.00',
+		 subtrans_method varchar(20) NOT NULL default '',
+		 subtrans_start_date int(11) NOT NULL default '0',
+		 subtrans_end_date int(11) NOT NULL default '0',
+		 subtrans_state varchar(200) NOT NULL default '',
+		 subtrans_trxid varchar(200) NOT NULL default '',
+		 subtrans_subscrid varchar(200) NOT NULL default '',
+		 subtrans_currency varchar(10) NOT NULL default 'USD',
+		 PRIMARY KEY (subtrans_id)
+		);";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_logs (
+		 sublog_id int(10) NOT NULL auto_increment,
+		 sublog_date int(10) NOT NULL default '',
+		 sublog_member_id mediumint(8) NOT NULL default '0',
+		 sublog_transid int(10) NOT NULL default '',
+		 sublog_ipaddress varchar(16) NOT NULL default '',
+		 sublog_data text,
+		 sublog_postdata text,
+		 PRIMARY KEY (sublog_id)
+		);";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_methods (
+		 submethod_id smallint(5) NOT NULL auto_increment,
+		 submethod_title varchar(250) NOT NULL default '',
+		 submethod_name varchar(20) NOT NULL default '',
+		 submethod_email varchar(250) NOT NULL default '',
+		 submethod_sid text,
+		 submethod_custom_1 text,
+		 submethod_custom_2 text,
+		 submethod_custom_3 text,
+		 submethod_custom_4 text,
+		 submethod_custom_5 text,
+		 submethod_is_cc tinyint(1) NOT NULL default '0',
+		 submethod_is_auto tinyint(1) NOT NULL default '0',
+		 submethod_desc text,
+		 submethod_logo text,
+		 submethod_active tinyint(1) NOT NULL default '',
+		 submethod_use_currency varchar(10) NOT NULL default 'USD',
+		 PRIMARY KEY (submethod_id)
+		);";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_currency (
+		 subcurrency_code varchar(10) NOT NULL,
+		 subcurrency_desc varchar(250) NOT NULL default '',
+		 subcurrency_exchange decimal(10, 8) NOT NULL,
+		 subcurrency_default tinyint(1) NOT NULL default '0',
+		 PRIMARY KEY(subcurrency_code)
+		);";
+		
+		$SQL[]="CREATE TABLE ".SQL_PREFIX."validating (
+		vid varchar(32) NOT NULL,
+		member_id mediumint(8) NOT NULL,
+		real_group smallint(3) NOT NULL default '0',
+		temp_group smallint(3) NOT NULL default '0',
+		entry_date int(10) NOT NULL default '0',
+		coppa_user tinyint(1) NOT NULL default '0',
+		lost_pass tinyint(1) NOT NULL default '0',
+		new_reg tinyint(1) NOT NULL default '0',
+		email_chg tinyint(1) NOT NULL default '0',
+		ip_address varchar(16) NOT NULL default '0',
+		PRIMARY KEY(vid),
+		KEY new_reg(new_reg)
+		);";
+		
+		$SQL[]="create table ".SQL_PREFIX."cache_store (
+		  cs_key varchar(255) NOT NULL default '',
+		  cs_value text NOT NULL default '',
+		  cs_extra varchar(255) NOT NULL default '',
+		  PRIMARY KEY(cs_key)
+		);";
+		
+		$SQL[]="create table ".SQL_PREFIX."email_logs (
+		email_id int(10) NOT NULL auto_increment,
+		email_subject varchar(255) NOT NULL,
+		email_content text NOT NULL,
+		email_date int(10) NOT NULL default '0',
+		from_member_id mediumint(8) NOT NULL default '0',
+		from_email_address varchar(250) NOT NULL,
+		from_ip_address varchar(16) NOT NULL default '127.0.0.1',
+		to_member_id mediumint(8) NOT NULL default '0',
+		to_email_address varchar(250) NOT NULL,
+		topic_id int(10) NOT NULL default '0',
+		PRIMARY KEY(email_id),
+		KEY from_member_id(from_member_id),
+		KEY email_date(email_date)
+		);";
+		
+		$SQL[]="CREATE TABLE ".SQL_PREFIX."topic_mmod (
+		mm_id smallint(5) NOT NULL auto_increment,
+		mm_title varchar(250) NOT NULL,
+		mm_enabled tinyint(1) NOT NULL default '0',
+		topic_state varchar(10) NOT NULL default 'leave',
+		topic_pin varchar(10) NOT NULL default 'leave',
+		topic_move smallint(5) NOT NULL default '0',
+		topic_move_link tinyint(1) NOT NULL default '0',
+		topic_title_st varchar(250) NOT NULL default '',
+		topic_title_end varchar(250) NOT NULL default '',
+		topic_reply tinyint(1) NOT NULL default '0',
+		topic_reply_content text NOT NULL default '',
+		topic_reply_postcount tinyint(1) NOT NULL default '0',
+		PRIMARY KEY(mm_id)
+		);";
+		
+		$SQL[]="create table ".SQL_PREFIX."spider_logs (
+		sid int(10) NOT NULL auto_increment,
+		bot varchar(255) NOT NULL default '',
+		query_string text NOT NULL default '',
+		entry_date int(10) NOT NULL default '0',
+		ip_address varchar(16) NOT NULL default '',
+		PRIMARY KEY(sid)
+		);";
+		
+		
+		
+		$SQL[]="CREATE TABLE ".SQL_PREFIX."warn_logs (
+		wlog_id int(10) auto_increment NOT NULL,
+		wlog_mid mediumint(8) NOT NULL default '0',
+		wlog_notes text NOT NULL default '',
+		wlog_contact varchar(250) NOT NULL default 'none',
+		wlog_contact_content text NOT NULL default '',
+		wlog_date int(10) NOT NULL default '',
+		wlog_type varchar(6) NOT NULL default 'pos',
+		wlog_addedby mediumint(8) NOT NULL default '0',
+		PRIMARY KEY(wlog_id)
+		);";
+
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+		
+		$oq = $DB->query("SELECT * FROM ".SQL_PREFIX."rules");
+	
+		while ( $r = $DB->fetch_row($oq) )
+		{
+			$nq = $DB->query("UPDATE ".SQL_PREFIX."forums SET rules_title='{$r['title']}', rules_text='{$r['body']}' WHERE id={$r['fid']}");
+		}
+		
+		$DB->query("drop table if exists ".SQL_PREFIX."rules");
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 1: COPY AND POPULATE BACK UP FORUMS TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_1()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "DROP TABLE if exists ".SQL_PREFIX."forums_perms";
+		
+		$SQL[]="CREATE TABLE ".SQL_PREFIX."forum_perms(
+			perm_id int(10) auto_increment NOT NULL,
+			perm_name varchar(250) NOT NULL,
+			PRIMARY KEY(perm_id)
+		);";
+		
+		$SQL[] = "DROP TABLE if exists ".SQL_PREFIX."forums_bak";
+		
+		$table = $DB->sql_get_table_schematic( 'forums' );
+		
+		$SQL[] = str_replace( SQL_PREFIX."forums", SQL_PREFIX."forums_bak", $table['Create Table'] );
+				 
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."forums_bak SELECT * FROM ".SQL_PREFIX."forums";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $query."<br /><br />".$DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+		
+		$oq = $DB->query("SELECT g_id, g_title FROM ".SQL_PREFIX."groups ORDER BY g_id");
+
+		while( $r = $DB->fetch_row($oq) )
+		{
+			$nq = $DB->query("REPLACE INTO ".SQL_PREFIX."forum_perms SET perm_id={$r['g_id']}, perm_name='{$r['g_title']} Mask'");
+			$bq = $DB->query("UPDATE ".SQL_PREFIX."groups SET g_perm_id={$r['g_id']} WHERE g_id={$r['g_id']}");
+		}
+	
+		$DB->query("update ".SQL_PREFIX."messages SET read_state=1 where vid='sent'");
+	
+		$DB->query("DROP TABLE if exists ".SQL_PREFIX."attachments");
+	}
+	
+	//#------------------------------------------------------------------------
+	// OTHER SQL WORK
+	//#------------------------------------------------------------------------
+	
+	function sql_members($a, $b)
+	{
+		return "SELECT m.*, me.id as mextra FROM ibf_members m LEFT JOIN ibf_member_extra me ON ( me.id=m.id ) LIMIT $a, $b";
+	}
+	
+	function sql_members_email( $a )
+	{
+		return "select id, name, email, count(email) as count from ibf_members group by email order by count desc LIMIT 0, $a";
+	}
+	
+	function sql_members_email_update( $push_auth )
+	{
+		return "UPDATE ibf_members SET email=concat( id, '-', email ) where id IN(".implode(",", $push_auth).")";
+	}
+	
+	function sql_members_converge( $start, $end )
+	{
+		return "SELECT m.*, c.converge_id as cid FROM ibf_members m LEFT JOIN ibf_members_converge c ON ( c.converge_id=m.id ) WHERE id >= $start and id < $end";
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/pre_20000/10002_mysql_queries.php b/upload/upgrade/pre_20000/10002_mysql_queries.php
new file mode 100644
index 00000000..166ff0bb
--- /dev/null
+++ b/upload/upgrade/pre_20000/10002_mysql_queries.php
@@ -0,0 +1,1428 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE 1.2 -> 2.0 SQL STUFF!
+|   > Script written by Matt Mecham
+|   > Date started: 21st April 2004
+|   > Interesting fact: Turin Brakes are also good
++--------------------------------------------------------------------------
+*/
+
+class upgrade_sql
+{
+	var $errors   = array();
+	var $sqlcount = 0;
+	var $sqlbit   = array();
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $DB, $ibforums, $std;
+		
+		define( 'THIS_HUMAN_VERSION', '2.0.0' );
+		define( 'THIS_LONG_VERSION' , '20010' );
+		
+		$this->sqlbit['attach'] = "attach_file != ''";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 24: RECACHE & REBUILD
+	/*-------------------------------------------------------------------------*/
+	
+	function step_24()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------
+		// Get ACP library
+		//-----------------------------------
+	
+		require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+		$acp = new admin_cache_functions();
+		
+		//-----------------------------------
+		// Cache skins and shit
+		//-----------------------------------
+		
+		$acp->_rebuild_all_caches( array(2,3) );
+		
+		//-------------------------------------------------------------
+		// Forum cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['forum_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'forums',
+									  'order'  => 'parent_id, position'
+							 )      );
+		$DB->simple_exec();
+		
+		while( $fr = $DB->fetch_row() )
+		{
+			$perms = unserialize(stripslashes($fr['permission_array']));
+			
+			$fr['read_perms']   = $perms['read_perms'];
+			$fr['reply_perms']  = $perms['reply_perms'];
+			$fr['start_perms']  = $perms['start_perms'];
+			$fr['upload_perms'] = $perms['upload_perms'];
+			$fr['show_perms']   = $perms['show_perms'];
+			
+			unset($fr['permission_array']);
+			
+			$ibforums->cache['forum_cache'][ $fr['id'] ] = $fr;
+		}
+		
+		$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Group Cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['group_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => "*",
+									  'from'   => 'groups'
+							 )      );
+		
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// Systemvars
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['systemvars'] = array();
+		
+		$result = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'mail_queue' ) );
+		
+		$ibforums->cache['systemvars']['mail_queue'] = intval( $result['cnt'] );
+		$ibforums->cache['systemvars']['task_next_run'] = time() + 3600;
+		
+		$std->update_cache( array( 'name' => 'systemvars', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Stats
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['stats'] = array();
+		
+		$DB->simple_construct( array( 'select' => 'count(pid) as posts', 'from' => 'posts', 'where' => "queued <> 1" ) );
+		$DB->simple_exec();
+	
+		$r = $DB->fetch_row();
+		$stats['total_replies'] = intval($r['posts']);
+		
+		$DB->simple_construct( array( 'select' => 'count(tid) as topics', 'from' => 'topics', 'where' => "approved = 1" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$stats['total_topics']   = intval($r['topics']);
+		$stats['total_replies'] -= $stats['total_topics'];
+		
+		$DB->simple_construct( array( 'select' => 'count(id) as members', 'from' => 'members', 'where' => "mgroup <> '".$ibforums->vars['auth_group']."'" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$stats['mem_count'] = intval($r['members']);
+			
+		$ibforums->cache['stats']['total_replies'] = $stats['total_replies'];
+		$ibforums->cache['stats']['total_topics']  = $stats['total_topics'];
+		$ibforums->cache['stats']['mem_count']     = $stats['mem_count'];
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'id, name',
+											'from'   => 'members',
+											'order'  => 'id DESC',
+											'limit'  => '0,1'
+								   )      );
+								   
+		$ibforums->cache['stats']['last_mem_name'] = $r['name'];
+		$ibforums->cache['stats']['last_mem_id']   = $r['id'];
+		
+		$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Ranks
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['ranks'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+									  'from'   => 'titles',
+									  'order'  => "posts DESC",
+							)      );
+							
+		$DB->simple_exec();
+					
+		while ($i = $DB->fetch_row())
+		{
+			$ibforums->cache['ranks'][ $i['id'] ] = array(
+														  'TITLE' => $i['title'],
+														  'PIPS'  => $i['pips'],
+														  'POSTS' => $i['posts'],
+														);
+		}
+		
+		$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		
+		//-------------------------------------------------------------
+		// SETTINGS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['settings'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+		$info = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($info) )
+		{
+			$ibforums->cache['settings'][ $r['conf_key'] ] = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+		}
+		
+		$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// EMOTICONS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['emoticons'] = array();
+				
+		$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['emoticons'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// LANGUAGES
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['languages'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['languages'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// ATTACHMENT TYPES
+		//-------------------------------------------------------------
+			
+		$ibforums->cache['attachtypes'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 21: OPTIMIZATION II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_21()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop index topic_id;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop index author_id;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add index topic_id (topic_id, queued, pid);";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add index author_id( author_id, topic_id);";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."posts DROP INDEX forum_id, ADD INDEX(post_date);";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 20: OPTIMIZATION
+	/*-------------------------------------------------------------------------*/
+	
+	function step_20()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."tracker change topic_id topic_id int(10) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."tracker ADD INDEX(topic_id);";
+
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics CHANGE pinned pinned TINYINT( 1 ) DEFAULT '0' NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics CHANGE approved approved TINYINT( 1 ) DEFAULT '0' NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics ADD INDEX(topic_firstpost);";
+		
+		$SQL[] = "UPDATE ".SQL_PREFIX."members SET language=''";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 19: DROPPING TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_19()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."tmpl_names;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."forums_bak;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."categories;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."messages;";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 18: SAFE INSERTS
+	/*-------------------------------------------------------------------------*/
+	
+	function step_18()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (1, 'Hourly Clean Out', 'cleanout.php', 1076074920, -1, -1, -1, 59, '2a7d083832daa123b73a68f9c51fdb29', 1, 'Kill old sessions, reg images, searches',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (2, 'Daily Stats Rebuild', 'rebuildstats.php', 1076112000, -1, -1, 0, 0, '640b9a6c373ff207bc1b1100a98121af', 1, 'Rebuilds board statistics',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (3, 'Daily Clean Out', 'dailycleanout.php', 1076122800, -1, -1, 3, 0, 'e71b52f3ff9419abecedd14b54e692c4', 1, 'Prunes topic subscriptions',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (4, 'Birthday and Events Cache', 'calendarevents.php', 1076100960, -1, -1, 12, -1, '2c148c9bd754d023a7a19dd9b1535796', 1, 'Caches calendar events &amp; birthdays',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (9, 'Announcements Update', 'announcements.php', 1080747660, -1, -1, 4, -1, 'e82f2c19ab1ed57c140fccf8aea8b9fe', 1, 'Rebuilds cache and expires out of date announcements', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Send Bulk Mail', 'bulkmail.php', 1086706080, -1, -1, -1, -1, '61359ac93eb93ebbd935a4e275ade2db', 0, 'Dynamically assigned, no need to edit or change', 0, 'bulkmail', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Daily Topic &amp; Forum Digest', 'dailydigest.php', 1086912600, -1, -1, 0, 10, '723cab2aae32dd5d04898b1151038846', 1, 'Emails out daily topic &amp; forum digest emails', 1, 'dailydigest', 0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Weekly Topic &amp; Forum Digest', 'weeklydigest.php', 1087096200, 0, -1, 3, 10, '7e7fccd07f781bdb24ac108d26612931', 1, 'Emails weekly topic &amp; forum digest emails', 1, 'weeklydigest', 0);";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Snap Back', 'This tag displays a little linked image which links back to a post - used when quoting posts from the board. Opens in same window by default.', 'snapback', '<a href=\"index.php?act=findpost&amp;pid={content}\"><{POST_SNAPBACK}></a>', 0, '[snapback]100[/snapback]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Right', 'Aligns content to the right of the posting area', 'right', '<div align=\'right\'>{content}</div>', 0, '[right]Some text here[/right]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Left', 'Aligns content to the left of the post', 'left', '<div align=\'left\'>{content}</div>', 0, '[left]Left aligned text[/left]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Center', 'Aligns content to the center of the posting area.', 'center', '<div align=\'center\'>{content}</div>', 0, '[center]Centered Text[/center]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Topic Link', 'This tag provides an easy way to link to a topic', 'topic', '<a href=\'index.php?showtopic={option}\'>{content}</a>', 1, '[topic=100]Click me![/topic]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Link', 'This tag provides an easy way to link to a post.', 'post', '<a href=\'index.php?act=findpost&pid={option}\'>{content}</a>', 1, '[post=100]Click me![/post]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
+
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='USD', subcurrency_desc='United States Dollars', subcurrency_exchange='1.00', subcurrency_default=1;";
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='GBP', subcurrency_desc='United Kingdom Pounds', subcurrency_exchange=' 0.630776', subcurrency_default=0;";
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='CAD', subcurrency_desc='Canada Dollars', subcurrency_exchange='1.37080', subcurrency_default=0;";
+		$SQL[] = "insert into ".SQL_PREFIX."subscription_currency SET subcurrency_code='EUR', subcurrency_desc='Euro', subcurrency_exchange='0.901517', subcurrency_default=0;";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('PayPal', 'paypal', '', '', '', '', '', '', '', 0, 1, 'All major credit cards accepted. See <a href=\"https://www.paypal.com/affil/pal=9DJEWQQKVB6WL\" target=\"_blank\">PayPal</a> for more information.', '', 1, 'USD');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('NOCHEX', 'nochex', '', '', '', '', '', '', '', 0, 1, 'UK debit and credit cards, such as Switch, Solo and VISA Delta. All prices will be convereted into GBP (UK Pounds) upon ordering.', NULL, 1, 'GBP');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('Post Service', 'manual', '', '', '', '', '', '', '', 0, 0, 'You can use this method if you wish to send us a check, postal order or international money order.', NULL, 1, 'USD');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('2CheckOut', '2checkout', '', '', '', '', '', '', '', 1, 1, 'All major credit cards accepted. See <a href=\'http://www.2checkout.com/cgi-bin/aff.2c?affid=28376\' target=\'_blank\'>2CheckOut</a> for more information.', NULL, 1, 'USD');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('Authorize.net', 'authorizenet', '', '', '', '', '', '', '', '1', '1', NULL, NULL, '1', 'USD');";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (1, 'pdf', 'application/pdf', 1, 0, 'folder_mime_types/pdf.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (2, 'png', 'image/png', 1, 1, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (3, 'viv', 'video/vivo', 1, 0, 'folder_mime_types/win_player.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (4, 'wmv', 'video/x-msvideo', 1, 0, 'folder_mime_types/win_player.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (5, 'html', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (6, 'ram', 'audio/x-pn-realaudio', 1, 0, 'folder_mime_types/real_audio.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (7, 'gif', 'image/gif', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (8, 'mpg', 'video/mpeg', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (9, 'ico', 'image/ico', 1, 0, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (10, 'tar', 'application/x-tar', 1, 0, 'folder_mime_types/zip.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (11, 'bmp', 'image/x-MS-bmp', 1, 0, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (12, 'tiff', 'image/tiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (13, 'rtf', 'text/richtext', 1, 0, 'folder_mime_types/rtf.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (14, 'hqx', 'application/mac-binhex40', 1, 0, 'folder_mime_types/stuffit.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (15, 'aiff', 'audio/x-aiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (31, 'zip', 'application/zip', 1, 0, 'folder_mime_types/zip.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (17, 'ps', 'application/postscript', 1, 0, 'folder_mime_types/eps.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (18, 'doc', 'application/msword', 1, 0, 'folder_mime_types/doc.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (19, 'mov', 'video/quicktime', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (20, 'ppt', 'application/powerpoint', 1, 0, 'folder_mime_types/ppt.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (21, 'wav', 'audio/x-wav', 1, 0, 'folder_mime_types/music.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (22, 'mp3', 'audio/x-mpeg', 1, 0, 'folder_mime_types/music.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (23, 'jpg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (24, 'txt', 'text/plain', 1, 0, 'folder_mime_types/txt.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (25, 'xml', 'text/xml', 1, 0, 'folder_mime_types/script.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (26, 'css', 'text/css', 1, 0, 'folder_mime_types/script.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (27, 'swf', 'application/x-shockwave-flash', 0, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (32, 'php', 'application/octet-stream', 1, 0, 'folder_mime_types/php.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (28, 'htm', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (29, 'jpeg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (33, 'gz', 'application/x-gzip', 1, 0, 'folder_mime_types/zip.gif');";
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('skin_id_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('bbcode', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('moderators', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('multimod', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('banfilters', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('attachtypes', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('emoticons', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('forum_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('badwords', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('systemvars', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('ranks', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('group_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('stats', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('profilefields', 'a:0:{}', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('settings','', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('languages', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('birthdays', 'a:0:{}', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (2, 'CPU Saving &amp; Optimization', 'This section allows certain features to be limited or removed to get more performance out of your board.', 16);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (3, 'Date &amp; Time Formats', 'This section contains the date and time formats used throughout the board.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (4, 'User Profiles', 'This section allows you to adjust your member\'s global permissions and other options.', 22);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (5, 'Topics, Posts and Polls', 'These options control various elements when posting, reading topics and reading polls.', 32);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (6, 'Security and Privacy', 'These options allow you to adjust the security and privacy options for your board.', 18);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (7, 'Cookies', 'This section allows you to set the default cookie options.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (8, 'COPPA Set-up', 'This section allows you to comply with <a href=\'http://www.ftc.gov/ogc/coppa1.htm\'>COPPA</a>.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (9, 'Calendar &amp; Birthdays', 'This section will allow you to set up the board calendar and its related options.', 8);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (10, 'News Set-up', 'This section will allow you to specify the forum you wish to export news topics from to be used with ssi.php and IPDynamic Lite.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (11, 'Personal Message Set-up', 'This section allows you to control the global PM options.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (12, 'Email Set-up', 'This section will allow you to change the incoming and outgoing email addresses as well as the email method.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (13, 'Warn Set-up', 'This section will allow you to set up the warning system.', 15);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (14, 'Trash Can Set-up', 'The trashcan is a special forum in which topics are moved into instead of being deleted.', 6);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (15, 'Board Offline / Online', 'Use this setting to turn switch your board online or offline and leave a message for your visitors.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (16, 'Search Engine Spiders', 'This section will allow you to set up and maintain your search engine bot spider recognition settings.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (17, 'Board Guidelines', 'This section allows you to maintain your board guidelines. If enabled, a link will be added to the board header linking to the board guidelines.', 4);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (18, 'Converge Set Up', 'Converge is Invision Power Services central authentication method for all IPS applications. This allows you to have a single log-in for all your IPS products.', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (19, 'Full Text Search Set-Up', 'Full text searching is a very fast and very efficient way of searching large amounts of posts without maintaining a manual index. This may not be available for your system.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (20,'Invision Chat Settings (Legacy Version)', 'This will allow you to customize your Invision Chat integration settings for the legacy edition.', 14, 1, 'chat');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (21,'Invision Chat Settings', 'This will allow you to customize your Invision Chat integration settings for the new 2004 edition', 10, 1, 'chat04');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (22,'IPB Portal', 'These settings enable you to enable or disable IPB Portal and control the options IPB Portal offers.', 20, 0, 'ipbportal');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (23,'Subscriptions Manager', 'These settings control various subscription manager features.', 3, 0, 'subsmanager');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (24,'IPB Registration', 'This section will allow you to edit your IPB registered licence settings.', 3, 1, 'ipbreg');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (25,'IPB Copyright Removal', 'This section allows you to manage your copyright removal key.', 2, 1, 'ipbcopyright');";
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."upgrade_history (upgrade_id, upgrade_version_id, upgrade_version_human, upgrade_date, upgrade_mid, upgrade_notes) VALUES ('', '".THIS_LONG_VERSION."', '".THIS_HUMAN_VERSION."', '0', '0', '');";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 17: ALTER OTHERS TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_17()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_attach_per_post int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topic_mmod add topic_approve tinyint(1) NOT NULL default '0';";
+		
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_can_msg_attach tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."pfields_data
+				change fid pf_id smallint(5) NOT NULL auto_increment,
+				change ftitle pf_title varchar(250) NOT NULL default '',
+				change fdesc pf_desc varchar(250) NOT NULL default '',
+				change fcontent pf_content text NOT NULL default '',
+				change ftype pf_type varchar(250) NOT NULL default '',
+				change freq pf_not_null tinyint(1) NOT NULL default '0',
+				change fhide pf_member_hide tinyint(1) NOT NULL default '0',
+				change fmaxinput pf_max_input smallint(6) NOT NULL default '0',
+				change fedit pf_member_edit tinyint(1) NOT NULL default '0',
+				change forder pf_position smallint(6) NOT NULL default '0',
+				change fshowreg pf_show_on_reg tinyint(1) NOT NULL default '0',
+				add pf_input_format text NOT NULL default '',
+				add pf_admin_only tinyint(1) NOT NULL default '0',
+				add pf_topic_format text NOT NULL default '';";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 16: ALTER MEMBERS TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_16()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."members add sub_end int(10) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members DROP msg_from_id, DROP msg_msg_id;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members DROP org_supmod, DROP integ_msg;";
+		$SQL[] = "alter table ".SQL_PREFIX."members DROP aim_name, DROP icq_number, DROP website, DROP yahoo, DROP interests,
+				  DROP msnname, DROP vdirs, DROP signature, DROP location, DROP avatar, DROP avatar_size;";
+		$SQL[] = "alter table ".SQL_PREFIX."members change auto_track auto_track varchar(50) default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members change temp_ban temp_ban varchar(100) default '0'";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members change msg_total msg_total smallint(5) default '0'";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 15: ALTER TOPIC TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_15()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics add topic_firstpost int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topics add topic_queuedposts int(10) NOT NULL default '0';";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 14: ALTER POST TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_14()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."posts DROP attach_id, DROP attach_hits, DROP attach_type, DROP attach_file;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change queued queued tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop forum_id;";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 7: IMPORT FORUMS
+	/*-------------------------------------------------------------------------*/
+	
+	function step_7()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Convert existing forums
+		//-----------------------------------------
+		
+		$o = $DB->query("SELECT * FROM ".SQL_PREFIX."forums_bak ORDER BY id");
+		
+		while( $r = $DB->fetch_row( $o ) )
+		{
+			$perm_array = addslashes(serialize(array(
+													  'start_perms'  => $r['start_perms'],
+													  'reply_perms'  => $r['reply_perms'],
+													  'read_perms'   => $r['read_perms'],
+													  'upload_perms' => $r['upload_perms'],
+													  'show_perms'   => $r['read_perms']
+									)		  )     );
+			
+			$DB->do_insert( 'forums', array (
+											  'id'                      => $r['id'],
+											  'position'                => $r['position'],
+											  'topics'                  => $r['topics'],
+											  'posts'                   => $r['posts'],
+											  'last_post'               => $r['last_post'],
+											  'last_poster_id'          => $r['last_poster_id'],
+											  'last_poster_name'        => $r['last_poster_name'],
+											  'name'                    => $r['name'],
+											  'description'             => $r['description'],
+											  'use_ibc'                 => $r['use_ibc'],
+											  'use_html'                => $r['use_html'],
+											  'status'                  => $r['status'],
+											  'password'                => $r['password'],
+											  'last_id'                 => $r['last_id'],
+											  'last_title'              => $r['last_title'],
+											  'sort_key'                => $r['sort_key'],
+											  'sort_order'              => $r['sort_order'],
+											  'prune'                   => $r['prune'],
+											  'show_rules'              => $r['show_rules'],
+											  'preview_posts'           => $r['preview_posts'],
+											  'allow_poll'              => $r['allow_poll'],
+											  'allow_pollbump'          => $r['allow_pollbump'],
+											  'inc_postcount'           => $r['inc_postcount'],
+											  'parent_id'               => $r['parent_id'],
+											  'sub_can_post'            => $r['sub_can_post'],
+											  'quick_reply'             => $r['quick_reply'],
+											  'redirect_on'             => $r['redirect_on'],
+											  'redirect_hits'           => $r['redirect_hits'],
+											  'redirect_url'            => $r['redirect_url'],
+											  'redirect_loc'		    => $r['redirect_loc'],
+											  'rules_title'			    => $r['rules_title'],
+  											  'rules_text'			    => $r['rules_text'],
+											  'notify_modq_emails'      => $r['notify_modq_emails'],
+											  'permission_array'        => $perm_array,
+											  'permission_showtopic'    => '',
+											  'permission_custom_error' => '',
+									)       );
+		}
+		
+		//-----------------------------------------
+		// Convert categories
+		//-----------------------------------------
+		
+		$DB->query("SELECT MAX(id) as max FROM ".SQL_PREFIX."forums");
+		$max = $DB->fetch_row();
+		
+		$fid = $max['max'];
+		
+		$o = $DB->query("SELECT * FROM ".SQL_PREFIX."categories WHERE id > 0");
+		
+		while( $r = $DB->fetch_row( $o ) )
+		{
+			$fid++;
+			
+			$perm_array = addslashes(serialize(array(
+													  'start_perms'  => '*',
+													  'reply_perms'  => '*',
+													  'read_perms'   => '*',
+													  'upload_perms' => '*',
+													  'show_perms'   => '*',
+									)		  )     );
+									
+			$DB->do_insert( 'forums', array(
+											 'id'               => $fid,
+											 'position'         => $r['position'],
+											 'name'             => $r['name'],
+											 'sub_can_post'     => 0,
+											 'permission_array' => $perm_array,
+											 'parent_id'        => -1,
+						  )                );
+						  
+			//-----------------------------------------
+			// Update old categories
+			//-----------------------------------------
+			
+			$n = $DB->query("SELECT id FROM ".SQL_PREFIX."forums_bak WHERE category={$r['id']} AND parent_id = -1");
+			
+			$ids = array();
+			
+			while( $c = $DB->fetch_row($n) )
+			{
+				$ids[] = $c['id'];
+			}
+			
+			if ( count($ids) )
+			{
+				$DB->do_update( 'forums', array( 'parent_id' => $fid ), 'id IN ('.implode(',',$ids).')' );
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 6: ALTER OTHER TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_6()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."macro rename ibf_skin_macro;";
+		$SQL[] = "alter table ".SQL_PREFIX."skin_macro change can_remove macro_can_remove tinyint(1) default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_bypass_badwords tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."cache_store change cs_value cs_value mediumtext NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."cache_store add cs_array tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."sessions add in_error tinyint(1) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."topic_mmod add mm_forums text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups change g_icon g_icon text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."emoticons add emo_set varchar(64) NOT NULL default 'default';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change ID session_id varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change IP_ADDRESS session_ip_address varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change MEMBER_NAME session_member_name varchar(250) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change MEMBER_ID session_member_id mediumint(8) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change SESSION_KEY session_member_login_key varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change LOCATION session_location varchar(64) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change LOG_IN_TIME session_log_in_time int(10) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change RUNNING_TIME session_running_time int(10) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."forum_tracker add forum_track_type varchar(100) NOT NULL default 'delayed';";
+		$SQL[] = "alter table ".SQL_PREFIX."tracker add topic_track_type varchar(100) NOT NULL default 'delayed';";
+		
+		$SQL[] = "delete from ".SQL_PREFIX."members where id=0 LIMIT 1;";
+		$SQL[] = "delete from ".SQL_PREFIX."member_extra where id=0 limit 1;";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 5: ALTER MEMBERS TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_5()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."members add login_anonymous varchar(3) NOT NULL default '0&0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add ignored_users text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add mgroup_others varchar(255) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra
+		ADD aim_name varchar(40) NOT NULL default '',
+		ADD icq_number int(15) NOT NULL default '',
+		ADD website varchar(250) NOT NULL default '',
+		ADD yahoo varchar(40) NOT NULL default '',
+		ADD interests text NOT NULL default '',
+		ADD msnname varchar(200) NOT NULL default '',
+		ADD vdirs text NOT NULL default '',
+		ADD location varchar(250) NOT NULL default '',
+		ADD signature text NOT NULL default '',
+		ADD avatar_location varchar(128) NOT NULL default '',
+		ADD avatar_size varchar(9) NOT NULL default '',
+		ADD avatar_type varchar(15) NOT NULL default 'local';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add member_login_key varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members change password legacy_password varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add subs_pkg_chosen smallint(3) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 4: ALTER POST TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_4()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."topics ADD topic_hasattach smallint(5) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 3: ALTER POST TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_3()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."posts add post_parent int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts ADD post_key varchar(32) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add post_htmlstate smallint(1) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 2: DROP FORUMS TABLE, CREATE NEW TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_2()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."attachments (
+		   attach_id int(10) NOT NULL auto_increment,
+		   attach_ext varchar(10) NOT NULL default '',
+		   attach_file varchar(250) NOT NULL default '',
+		   attach_location varchar(250) NOT NULL default '',
+		   attach_thumb_location varchar(250) NOT NULL default '',
+		   attach_thumb_width smallint(5) NOT NULL default '0',
+		   attach_thumb_height smallint(5) NOT NULL default '0',
+		   attach_is_image tinyint(1) NOT NULL default '0',
+		   attach_hits int(10) NOT NULL default '0',
+		   attach_date int(10) NOT NULL default '0',
+		   attach_temp tinyint(1) NOT NULL default '0',
+		   attach_pid int(10) NOT NULL default '0',
+		   attach_post_key varchar(32) NOT NULL default '0',
+		   attach_msg int(10) NOT NULL default '0',
+		   attach_member_id mediumint(8) NOT NULL default '0',
+		   attach_approved int(10) NOT NULL default '1',
+		   attach_filesize int(10) NOT NULL default '0',
+		PRIMARY KEY (attach_id),
+		KEY attach_pid (attach_pid),
+		KEY attach_msg (attach_msg),
+		KEY attach_post_key (attach_post_key),
+		KEY attach_mid_size (attach_member_id, attach_filesize)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."message_text (
+		 msg_id int(10) NOT NULL auto_increment,
+		 msg_date int(10) default NULL,
+		 msg_post text default '',
+		 msg_cc_users text default '',
+		 msg_sent_to_count smallint(5) NOT NULL default '0',
+		 msg_deleted_count smallint(5) NOT NULL default '0',
+		 msg_post_key varchar(32) NOT NULL default '0',
+		 msg_author_id mediumint(8) NOT NULL default '0',
+		PRIMARY KEY (msg_id),
+		KEY msg_date (msg_date),
+		KEY msg_sent_to_count (msg_sent_to_count),
+		KEY msg_deleted_count (msg_deleted_count)
+		);";
+		
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."message_topics (
+		   mt_id int(10) NOT NULL auto_increment,
+		   mt_msg_id int(10) NOT NULL default '0',
+		   mt_date int(10) NOT NULL default '0',
+		   mt_title varchar(255) NOT NULL default '',
+		   mt_from_id mediumint(8) NOT NULL default '0',
+		   mt_to_id mediumint(8) NOT NULL default '0',
+		   mt_owner_id mediumint(8) NOT NULL default '0',
+		   mt_vid_folder varchar(32) NOT NULL default '',
+		   mt_read tinyint(1) NOT NULL default '0',
+		   mt_hasattach smallint(5) NOT NULL default '0',
+		   mt_hide_cc tinyint(1) default '0',
+		   mt_tracking tinyint(1) default '0',
+		   mt_user_read int(10) default '0',
+		PRIMARY KEY (mt_id),
+		KEY mt_from_id (mt_from_id),
+		KEY mt_owner_id (mt_owner_id, mt_to_id, mt_vid_folder)
+		);";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."skin_sets (
+		   set_skin_set_id int(10) NOT NULL auto_increment,
+		   set_name varchar(150) NOT NULL default '',
+		   set_image_dir varchar(200) NOT NULL default '',
+		   set_hidden tinyint(1) NOT NULL default '0',
+		   set_default tinyint(1) NOT NULL default '0',
+		   set_css_method varchar(100) NOT NULL default 'inline',
+		   set_skin_set_parent smallint(5) NOT NULL default '-1',
+		   set_author_email varchar(255) NOT NULL default '',
+		   set_author_name varchar(255) NOT NULL default '',
+		   set_author_url varchar(255) NOT NULL default '',
+		   set_css mediumtext NOT NULL default '',
+		   set_wrapper mediumtext NOT NULL default '',
+		   set_css_updated int(10) NOT NULL default '0',
+		   set_cache_css mediumtext NOT NULL default '',
+		   set_cache_macro mediumtext NOT NULL default '',
+		   set_cache_wrapper mediumtext NOT NULL default '',
+		   set_emoticon_folder varchar(60) NOT NULL default 'default',
+		   PRIMARY KEY(set_skin_set_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."skin_templates_cache (
+		   template_id varchar(32) NOT NULL default '',
+		   template_group_name varchar(255) NOT NULL default '',
+		   template_group_content mediumtext NOT NULL default '',
+		   template_set_id int(10) NOT NULL default '0',
+		   primary key (template_id),
+		   KEY template_set_id (template_set_id),
+		   KEY template_group_name (template_group_name)
+	   );";
+	   
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."mail_queue(
+		   mail_id int(10) auto_increment NOT NULL,
+		   mail_date int(10) NOT NULL default '0',
+		   mail_to varchar(255) NOT NULL default '',
+		   mail_from varchar(255) NOT NULL default '',
+		   mail_subject text NOT NULL default '',
+		   mail_content text NOT NULL default '',
+		   mail_type varchar(200) NOT NULL default '',
+		   PRIMARY KEY (mail_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."task_manager (
+		   task_id int(10) auto_increment NOT NULL,
+		   task_title varchar(255) NOT NULL default '',
+		   task_file varchar(255) NOT NULL default '',
+		   task_next_run int(10) NOT NULL default '',
+		   task_week_day tinyint(1) NOT NULL default '-1',
+		   task_month_day smallint(2) NOT NULL default '-1',
+		   task_hour smallint(2) NOT NULL default '-1',
+		   task_minute smallint(2) NOT NULL default '-1',
+		   task_cronkey varchar(32) NOT NULL default '',
+		   task_log tinyint(1) NOT NULL default '0',
+		   task_description text NOT NULL default '',
+		   task_enabled tinyint(1) NOT NULL default '1',
+		   task_key varchar(30) NOT NULL default '',
+		   task_safemode tinyint(1) NOT NULL default '',
+		   PRIMARY KEY(task_id),
+		   KEY task_next_run (task_next_run)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."task_logs (
+		   log_id int(10) auto_increment NOT NULL,
+		   log_title varchar(255) NOT NULL default '',
+		   log_date int(10) NOT NULL default '0',
+		   log_ip varchar(16) NOT NULL default '0',
+		   log_desc text NOT NULL default '',
+		   PRIMARY KEY(log_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."custom_bbcode (
+		   bbcode_id int(10) NOT NULL auto_increment,
+		   bbcode_title varchar(255) NOT NULL default '',
+		   bbcode_desc text NOT NULL default '',
+		   bbcode_tag varchar(255) NOT NULL default '',
+		   bbcode_replace text NOT NULL default '',
+		   bbcode_useoption tinyint(1) NOT NULL default '',
+		   bbcode_example text NOT NULL default '',
+		   PRIMARY KEY (bbcode_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."conf_settings (
+		   conf_id int(10) NOT NULL auto_increment,
+		   conf_title varchar(255) NOT NULL default '',
+		   conf_description text NOT NULL default '',
+		   conf_group smallint(3) NOT NULL default '',
+		   conf_type varchar(255) NOT NULL default '',
+		   conf_key varchar(255) NOT NULL default '',
+		   conf_value text NOT NULL default '',
+		   conf_default text NOT NULL default '',
+		   conf_extra text NOT NULL default '',
+		   conf_evalphp text NOT NULL default '',
+		   conf_protected tinyint(1) NOT NULL default '',
+		   conf_position smallint(3) NOT NULL default '0',
+		   conf_start_group varchar(255) NOT NULL default '',
+		   conf_end_group tinyint(1) NOT NULL default '0',
+		   conf_help_key varchar(255) NOT NULL default '0',
+		   conf_add_cache tinyint(1) NOT NULL default '1',
+		   PRIMARY KEY (conf_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."conf_settings_titles (
+		   conf_title_id smallint(3) NOT NULL auto_increment,
+		   conf_title_title varchar(255) NOT NULL default '',
+		   conf_title_desc text NOT NULL default '',
+		   conf_title_count smallint(3) NOT NULL default '0',
+		   conf_title_noshow tinyint(1) NOT NULL default '0',
+		   conf_title_keyword varchar(200) NOT NULL default '',
+		   PRIMARY KEY(conf_title_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."topics_read (
+		 read_tid int(10) NOT NULL default '0',
+		 read_mid mediumint(8) NOT NULL default '0',
+		 read_date int(10) NOT NULL default '0',
+		 UNIQUE KEY read_tid_mid( read_tid, read_mid )
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."banfilters (
+		   ban_id int(10) NOT NULL auto_increment,
+		   ban_type varchar(10) NOT NULL default 'ip',
+		   ban_content text NOT NULL default '',
+		   ban_date int(10) NOT NULL default '0',
+		   PRIMARY KEY (ban_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."attachments_type (
+		   atype_id int(10) NOT NULL auto_increment,
+		   atype_extension varchar(18) NOT NULL default '',
+		   atype_mimetype varchar(255) NOT NULL default '',
+		   atype_post tinyint(1) NOT NULL default '1',
+		   atype_photo tinyint(1) NOT NULL default '0',
+		   atype_img text NOT NULL default '',
+		   PRIMARY KEY (atype_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."members_converge (
+		   converge_id int(10) auto_increment NOT NULL,
+		   converge_email varchar(250) NOT NULL default '',
+		   converge_joined int(10) NOT NULL default '',
+		   converge_pass_hash varchar(32) NOT NULL default '',
+		   converge_pass_salt varchar(5) NOT NULL default '',
+		   PRIMARY KEY( converge_id )
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."announcements (
+		announce_id int(10) UNSIGNED NOT NULL auto_increment,
+		announce_title varchar(255) NOT NULL default '',
+		announce_post text NOT NULL default '',
+		announce_forum text NOT NULL default '',
+		announce_member_id mediumint(8) UNSIGNED NOT NULL default '0',
+		announce_html_enabled tinyint(1) NOT NULL default '0',
+		announce_views int(10) UNSIGNED NOT NULL default '0',
+		announce_start int(10) UNSIGNED NOT NULL default '0',
+		announce_end int(10) UNSIGNED NOT NULL default '0',
+		announce_active tinyint(1) NOT NULL default '1',
+	   PRIMARY KEY (announce_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."mail_error_logs (
+		   mlog_id int(10) auto_increment NOT NULL,
+		   mlog_date int(10) NOT NULL default '0',
+		   mlog_to varchar(250) NOT NULL default '',
+		   mlog_from varchar(250) NOT NULL default '',
+		   mlog_subject varchar(250) NOT NULL default '',
+		   mlog_content varchar(250) NOT NULL default '',
+		   mlog_msg text NOT NULL default '',
+		   mlog_code varchar(200) NOT NULL default '',
+		   mlog_smtp_msg text NOT NULL default '',
+		   PRIMARY KEY (mlog_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."bulk_mail (
+		   mail_id int(10) NOT NULL auto_increment,
+		   mail_subject varchar(255) NOT NULL default '',
+		   mail_content mediumtext NOT NULL default '',
+		   mail_groups mediumtext NOT NULL default '',
+		   mail_honor tinyint(1) NOT NULL default '1',
+		   mail_opts mediumtext NOT NULL default '',
+		   mail_start int(10) NOT NULL default '0',
+		   mail_updated int(10) NOT NULL default '0',
+		   mail_sentto int(10) NOT NULL default '0',
+		   mail_active tinyint(1) NOT NULL default '0',
+		   mail_pergo smallint(5) NOT NULL default '0',
+		   PRIMARY KEY (mail_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."upgrade_history (
+		   upgrade_id int(10) NOT NULL auto_increment,
+		   upgrade_version_id int(10) NOT NULL default '',
+		   upgrade_version_human varchar(200) NOT NULL default '',
+		   upgrade_date int(10) NOT NULL default '0',
+		   upgrade_mid int(10) NOT NULL default '0',
+		   upgrade_notes text NOT NULL default '',
+		   PRIMARY KEY (upgrade_id)
+	   );";
+	   
+	   $SQL[] = "DROP TABLE ".SQL_PREFIX."forums";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."forums (
+				 id smallint(5) NOT NULL default '0',
+				 topics mediumint(6) default '0',
+				 posts mediumint(6) default '0',
+				 last_post int(10) default NULL,
+				 last_poster_id mediumint(8) NOT NULL default '0',
+				 last_poster_name varchar(32) default NULL,
+				 name varchar(128) NOT NULL default '',
+				 description text,
+				 position tinyint(2) default NULL,
+				 use_ibc tinyint(1) default NULL,
+				 use_html tinyint(1) default NULL,
+				 status varchar(10) default NULL,
+				 password varchar(32) default NULL,
+				 last_title varchar(128) default NULL,
+				 last_id int(10) default NULL,
+				 sort_key varchar(32) default NULL,
+				 sort_order varchar(32) default NULL,
+				 prune tinyint(3) default NULL,
+				 show_rules tinyint(1) default NULL,
+				 preview_posts tinyint(1) default NULL,
+				 allow_poll tinyint(1) NOT NULL default '1',
+				 allow_pollbump tinyint(1) NOT NULL default '0',
+				 inc_postcount tinyint(1) NOT NULL default '1',
+				 skin_id int(10) default NULL,
+				 parent_id mediumint(5) default '-1',
+				 sub_can_post tinyint(1) default '1',
+				 quick_reply tinyint(1) default '0',
+				 redirect_url varchar(250) default '',
+				 redirect_on tinyint(1) NOT NULL default '0',
+				 redirect_hits int(10) NOT NULL default '0',
+				 redirect_loc varchar(250) default '',
+				 rules_title varchar(255) NOT NULL default '',
+				 rules_text text NOT NULL,
+				 topic_mm_id varchar(250) NOT NULL default '',
+				 notify_modq_emails text default '',
+				 permission_custom_error text NOT NULL default '',
+				 permission_array mediumtext NOT NULL default '',
+				 permission_showtopic tinyint(1) NOT NULL default '0',
+				 queued_topics mediumint(6) NOT NULL default '0',
+				 queued_posts  mediumint(6) NOT NULL default '0',
+				 PRIMARY KEY  (id),
+				 KEY position (position, parent_id)
+			   );";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscriptions (
+		 sub_id smallint(5) NOT NULL auto_increment,
+		 sub_title varchar(250) NOT NULL default '',
+		 sub_desc text,
+		 sub_new_group mediumint(8) NOT NULL default 0,
+		 sub_length smallint(5) NOT NULL default '1',
+		 sub_unit varchar(2) NOT NULL default 'm',
+		 sub_cost decimal(10,2) NOT NULL default '0.00',
+		 sub_run_module varchar(250) NOT NULL default '',
+		 PRIMARY KEY (sub_id)
+		) TYPE=MyISAM;";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_extra (
+		 subextra_id smallint(5) NOT NULL auto_increment,
+		 subextra_sub_id smallint(5) NOT NULL default '0',
+		 subextra_method_id smallint(5) NOT NULL default '0',
+		 subextra_product_id varchar(250) NOT NULL default '0',
+		 subextra_can_upgrade tinyint(1) NOT NULL default '0',
+		 subextra_recurring tinyint(1) NOT NULL default '0',
+		 subextra_custom_1 text,
+		 subextra_custom_2 text,
+		 subextra_custom_3 text,
+		 subextra_custom_4 text,
+		 subextra_custom_5 text,
+		 PRIMARY KEY(subextra_id)
+		) TYPE=MyISAM;";
+		
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_trans (
+		 subtrans_id int(10) NOT NULL auto_increment,
+		 subtrans_sub_id smallint(5) NOT NULL default '0',
+		 subtrans_member_id mediumint(8) NOT NULL default '0',
+		 subtrans_old_group smallint(5) NOT NULL default '0',
+		 subtrans_paid decimal(10,2) NOT NULL default '0.00',
+		 subtrans_cumulative decimal(10,2) NOT NULL default '0.00',
+		 subtrans_method varchar(20) NOT NULL default '',
+		 subtrans_start_date int(11) NOT NULL default '0',
+		 subtrans_end_date int(11) NOT NULL default '0',
+		 subtrans_state varchar(200) NOT NULL default '',
+		 subtrans_trxid varchar(200) NOT NULL default '',
+		 subtrans_subscrid varchar(200) NOT NULL default '',
+		 subtrans_currency varchar(10) NOT NULL default 'USD',
+		 PRIMARY KEY (subtrans_id)
+		) TYPE=MyISAM;";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_logs (
+		 sublog_id int(10) NOT NULL auto_increment,
+		 sublog_date int(10) NOT NULL default '',
+		 sublog_member_id mediumint(8) NOT NULL default '0',
+		 sublog_transid int(10) NOT NULL default '',
+		 sublog_ipaddress varchar(16) NOT NULL default '',
+		 sublog_data text,
+		 sublog_postdata text,
+		 PRIMARY KEY (sublog_id)
+		) TYPE=MyISAM;";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_methods (
+		 submethod_id smallint(5) NOT NULL auto_increment,
+		 submethod_title varchar(250) NOT NULL default '',
+		 submethod_name varchar(20) NOT NULL default '',
+		 submethod_email varchar(250) NOT NULL default '',
+		 submethod_sid text,
+		 submethod_custom_1 text,
+		 submethod_custom_2 text,
+		 submethod_custom_3 text,
+		 submethod_custom_4 text,
+		 submethod_custom_5 text,
+		 submethod_is_cc tinyint(1) NOT NULL default '0',
+		 submethod_is_auto tinyint(1) NOT NULL default '0',
+		 submethod_desc text,
+		 submethod_logo text,
+		 submethod_active tinyint(1) NOT NULL default '',
+		 submethod_use_currency varchar(10) NOT NULL default 'USD',
+		 PRIMARY KEY (submethod_id)
+		) TYPE=MyISAM;";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."subscription_currency (
+		 subcurrency_code varchar(10) NOT NULL,
+		 subcurrency_desc varchar(250) NOT NULL default '',
+		 subcurrency_exchange decimal(10, 8) NOT NULL,
+		 subcurrency_default tinyint(1) NOT NULL default '0',
+		 PRIMARY KEY(subcurrency_code)
+		) TYPE=MyISAM;";
+
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 1: COPY AND POPULATE BACK UP FORUMS TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_1()
+	{
+		global $DB, $std, $ibforums;
+		
+		$table = $DB->sql_get_table_schematic( 'forums' );
+		
+		$SQL[] = str_replace( SQL_PREFIX."forums", SQL_PREFIX."forums_bak", $table['Create Table'] );
+				 
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."forums_bak SELECT * FROM ".SQL_PREFIX."forums";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+		
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
+		
+		$DB->query( "SELECT COUNT(*) as count FROM ".SQL_PREFIX."forums_bak" );
+		$count = $DB->fetch_row();
+		
+		if ( intval( $count['count'] ) < 1 )
+		{
+			print "The back-up forums table has not been populated successfully. Continuing this convert WILL delete all forums permanently. Contact technical support immediately.";
+			exit();
+		}
+	}
+	
+	//#------------------------------------------------------------------------
+	// OTHER SQL WORK
+	//#------------------------------------------------------------------------
+	
+	function sql_members($a, $b)
+	{
+		return "SELECT m.*, me.id as mextra FROM ibf_members m LEFT JOIN ibf_member_extra me ON ( me.id=m.id ) LIMIT $a, $b";
+	}
+	
+	function sql_members_email( $a )
+	{
+		return "select id, name, email, count(email) as count from ibf_members group by email order by count desc LIMIT 0, $a";
+	}
+	
+	function sql_members_email_update( $push_auth )
+	{
+		return "UPDATE ibf_members SET email=concat( id, '-', email ) where id IN(".implode(",", $push_auth).")";
+	}
+	
+	function sql_members_converge( $start, $end )
+	{
+		return "SELECT m.*, c.converge_id as cid FROM ibf_members m LEFT JOIN ibf_members_converge c ON ( c.converge_id=m.id ) WHERE id >= $start and id < $end";
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/pre_20000/10003_mysql_queries.php b/upload/upgrade/pre_20000/10003_mysql_queries.php
new file mode 100644
index 00000000..b3a62ff5
--- /dev/null
+++ b/upload/upgrade/pre_20000/10003_mysql_queries.php
@@ -0,0 +1,1342 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE 1.3 -> 2.0 SQL STUFF!
+|   > Script written by Matt Mecham
+|   > Date started: 21st April 2004
+|   > Interesting fact: Turin Brakes are also good
++--------------------------------------------------------------------------
+*/
+
+class upgrade_sql
+{
+	var $errors   = array();
+	var $sqlcount = 0;
+	var $sqlbit   = array();
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $DB, $ibforums, $std;
+		
+		define( 'THIS_HUMAN_VERSION', '2.0.0' );
+		define( 'THIS_LONG_VERSION' , '20010' );
+		
+		$this->sqlbit['attach'] = "attach_file != ''";
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 24: RECACHE & REBUILD
+	/*-------------------------------------------------------------------------*/
+	
+	function step_24()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------
+		// Get ACP library
+		//-----------------------------------
+	
+		require_once( ROOT_PATH.'sources/admin/admin_cache_functions.php' );
+		$acp = new admin_cache_functions();
+		
+		//-----------------------------------
+		// Cache skins and shit
+		//-----------------------------------
+		
+		$acp->_rebuild_all_caches( array(2,3) );
+		
+		//-------------------------------------------------------------
+		// Forum cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['forum_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*',
+									  'from'   => 'forums',
+									  'order'  => 'parent_id, position'
+							 )      );
+		$DB->simple_exec();
+		
+		while( $fr = $DB->fetch_row() )
+		{
+			$perms = unserialize(stripslashes($fr['permission_array']));
+			
+			$fr['read_perms']   = $perms['read_perms'];
+			$fr['reply_perms']  = $perms['reply_perms'];
+			$fr['start_perms']  = $perms['start_perms'];
+			$fr['upload_perms'] = $perms['upload_perms'];
+			$fr['show_perms']   = $perms['show_perms'];
+			
+			unset($fr['permission_array']);
+			
+			$ibforums->cache['forum_cache'][ $fr['id'] ] = $fr;
+		}
+		
+		$std->update_cache( array( 'name' => 'forum_cache', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Group Cache
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['group_cache'] = array();
+	
+		$DB->simple_construct( array( 'select' => "*",
+									  'from'   => 'groups'
+							 )      );
+		
+		$DB->simple_exec();
+		
+		while ( $i = $DB->fetch_row() )
+		{
+			$ibforums->cache['group_cache'][ $i['g_id'] ] = $i;
+		}
+		
+		$std->update_cache( array( 'name' => 'group_cache', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// Systemvars
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['systemvars'] = array();
+		
+		$result = $DB->simple_exec_query( array( 'select' => 'count(*) as cnt', 'from' => 'mail_queue' ) );
+		
+		$ibforums->cache['systemvars']['mail_queue'] = intval( $result['cnt'] );
+		$ibforums->cache['systemvars']['task_next_run'] = time() + 3600;
+		
+		$std->update_cache( array( 'name' => 'systemvars', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Stats
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['stats'] = array();
+		
+		$DB->simple_construct( array( 'select' => 'count(pid) as posts', 'from' => 'posts', 'where' => "queued <> 1" ) );
+		$DB->simple_exec();
+	
+		$r = $DB->fetch_row();
+		$stats['total_replies'] = intval($r['posts']);
+		
+		$DB->simple_construct( array( 'select' => 'count(tid) as topics', 'from' => 'topics', 'where' => "approved = 1" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$stats['total_topics']   = intval($r['topics']);
+		$stats['total_replies'] -= $stats['total_topics'];
+		
+		$DB->simple_construct( array( 'select' => 'count(id) as members', 'from' => 'members', 'where' => "mgroup <> '".$ibforums->vars['auth_group']."'" ) );
+		$DB->simple_exec();
+		
+		$r = $DB->fetch_row();
+		$stats['mem_count'] = intval($r['members']);
+			
+		$ibforums->cache['stats']['total_replies'] = $stats['total_replies'];
+		$ibforums->cache['stats']['total_topics']  = $stats['total_topics'];
+		$ibforums->cache['stats']['mem_count']     = $stats['mem_count'];
+		
+		$r = $DB->simple_exec_query( array( 'select' => 'id, name',
+											'from'   => 'members',
+											'order'  => 'id DESC',
+											'limit'  => '0,1'
+								   )      );
+								   
+		$ibforums->cache['stats']['last_mem_name'] = $r['name'];
+		$ibforums->cache['stats']['last_mem_id']   = $r['id'];
+		
+		$std->update_cache( array( 'name' => 'stats', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// Ranks
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['ranks'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'id, title, pips, posts',
+									  'from'   => 'titles',
+									  'order'  => "posts DESC",
+							)      );
+							
+		$DB->simple_exec();
+					
+		while ($i = $DB->fetch_row())
+		{
+			$ibforums->cache['ranks'][ $i['id'] ] = array(
+														  'TITLE' => $i['title'],
+														  'PIPS'  => $i['pips'],
+														  'POSTS' => $i['posts'],
+														);
+		}
+		
+		$std->update_cache( array( 'name' => 'ranks', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		
+		//-------------------------------------------------------------
+		// SETTINGS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['settings'] = array();
+	
+		$DB->simple_construct( array( 'select' => '*', 'from' => 'conf_settings', 'where' => 'conf_add_cache=1' ) );
+		$info = $DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row($info) )
+		{
+			$ibforums->cache['settings'][ $r['conf_key'] ] = $r['conf_value'] != "" ? $r['conf_value'] : $r['conf_default'];
+		}
+		
+		$std->update_cache( array( 'name' => 'settings', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// EMOTICONS
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['emoticons'] = array();
+				
+		$DB->simple_construct( array( 'select' => 'typed,image,clickable,emo_set', 'from' => 'emoticons' ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['emoticons'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'emoticons', 'array' => 1, 'deletefirst' => 1 ) );
+		
+		//-------------------------------------------------------------
+		// LANGUAGES
+		//-------------------------------------------------------------
+		
+		$ibforums->cache['languages'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'ldir,lname', 'from' => 'languages' ) );
+		$DB->simple_exec();
+		
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['languages'][] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'languages', 'array' => 1, 'deletefirst' => 1 ) );
+			
+		//-------------------------------------------------------------
+		// ATTACHMENT TYPES
+		//-------------------------------------------------------------
+			
+		$ibforums->cache['attachtypes'] = array();
+	
+		$DB->simple_construct( array( 'select' => 'atype_extension,atype_mimetype,atype_post,atype_photo,atype_img', 'from' => 'attachments_type', 'where' => "atype_photo=1 OR atype_post=1" ) );
+		$DB->simple_exec();
+	
+		while ( $r = $DB->fetch_row() )
+		{
+			$ibforums->cache['attachtypes'][ $r['atype_extension'] ] = $r;
+		}
+		
+		$std->update_cache( array( 'name' => 'attachtypes', 'array' => 1, 'deletefirst' => 1 ) );
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 21: OPTIMIZATION II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_21()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop index topic_id;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop index author_id;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add index topic_id (topic_id, queued, pid);";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add index author_id( author_id, topic_id);";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."posts DROP INDEX forum_id, ADD INDEX(post_date);";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 20: OPTIMIZATION
+	/*-------------------------------------------------------------------------*/
+	
+	function step_20()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."tracker change topic_id topic_id int(10) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."tracker ADD INDEX(topic_id);";
+
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics CHANGE pinned pinned TINYINT( 1 ) DEFAULT '0' NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics CHANGE approved approved TINYINT( 1 ) DEFAULT '0' NOT NULL;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics ADD INDEX(topic_firstpost);";
+		
+		$SQL[] = "UPDATE ".SQL_PREFIX."members SET language=''";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 19: DROPPING TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_19()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."tmpl_names;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."forums_bak;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."categories;";
+		$SQL[] = "DROP TABLE ".SQL_PREFIX."messages;";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 18: SAFE INSERTS
+	/*-------------------------------------------------------------------------*/
+	
+	function step_18()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (1, 'Hourly Clean Out', 'cleanout.php', 1076074920, -1, -1, -1, 59, '2a7d083832daa123b73a68f9c51fdb29', 1, 'Kill old sessions, reg images, searches',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (2, 'Daily Stats Rebuild', 'rebuildstats.php', 1076112000, -1, -1, 0, 0, '640b9a6c373ff207bc1b1100a98121af', 1, 'Rebuilds board statistics',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (3, 'Daily Clean Out', 'dailycleanout.php', 1076122800, -1, -1, 3, 0, 'e71b52f3ff9419abecedd14b54e692c4', 1, 'Prunes topic subscriptions',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager VALUES (4, 'Birthday and Events Cache', 'calendarevents.php', 1076100960, -1, -1, 12, -1, '2c148c9bd754d023a7a19dd9b1535796', 1, 'Caches calendar events &amp; birthdays',1,'',0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_id, task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled) VALUES (9, 'Announcements Update', 'announcements.php', 1080747660, -1, -1, 4, -1, 'e82f2c19ab1ed57c140fccf8aea8b9fe', 1, 'Rebuilds cache and expires out of date announcements', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Send Bulk Mail', 'bulkmail.php', 1086706080, -1, -1, -1, -1, '61359ac93eb93ebbd935a4e275ade2db', 0, 'Dynamically assigned, no need to edit or change', 0, 'bulkmail', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Daily Topic &amp; Forum Digest', 'dailydigest.php', 1086912600, -1, -1, 0, 10, '723cab2aae32dd5d04898b1151038846', 1, 'Emails out daily topic &amp; forum digest emails', 1, 'dailydigest', 0);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Weekly Topic &amp; Forum Digest', 'weeklydigest.php', 1087096200, 0, -1, 3, 10, '7e7fccd07f781bdb24ac108d26612931', 1, 'Emails weekly topic &amp; forum digest emails', 1, 'weeklydigest', 0);";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Snap Back', 'This tag displays a little linked image which links back to a post - used when quoting posts from the board. Opens in same window by default.', 'snapback', '<a href=\"index.php?act=findpost&amp;pid={content}\"><{POST_SNAPBACK}></a>', 0, '[snapback]100[/snapback]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Right', 'Aligns content to the right of the posting area', 'right', '<div align=\'right\'>{content}</div>', 0, '[right]Some text here[/right]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Left', 'Aligns content to the left of the post', 'left', '<div align=\'left\'>{content}</div>', 0, '[left]Left aligned text[/left]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Center', 'Aligns content to the center of the posting area.', 'center', '<div align=\'center\'>{content}</div>', 0, '[center]Centered Text[/center]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Topic Link', 'This tag provides an easy way to link to a topic', 'topic', '<a href=\'index.php?showtopic={option}\'>{content}</a>', 1, '[topic=100]Click me![/topic]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Link', 'This tag provides an easy way to link to a post.', 'post', '<a href=\'index.php?act=findpost&pid={option}\'>{content}</a>', 1, '[post=100]Click me![/post]');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
+
+
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."subscription_methods (submethod_title, submethod_name, submethod_email, submethod_sid, submethod_custom_1, submethod_custom_2, submethod_custom_3, submethod_custom_4, submethod_custom_5, submethod_is_cc, submethod_is_auto, submethod_desc, submethod_logo, submethod_active, submethod_use_currency) VALUES ('Authorize.net', 'authorizenet', '', '', '', '', '', '', '', '1', '1', NULL, NULL, '1', 'USD');";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (1, 'pdf', 'application/pdf', 1, 0, 'folder_mime_types/pdf.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (2, 'png', 'image/png', 1, 1, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (3, 'viv', 'video/vivo', 1, 0, 'folder_mime_types/win_player.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (4, 'wmv', 'video/x-msvideo', 1, 0, 'folder_mime_types/win_player.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (5, 'html', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (6, 'ram', 'audio/x-pn-realaudio', 1, 0, 'folder_mime_types/real_audio.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (7, 'gif', 'image/gif', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (8, 'mpg', 'video/mpeg', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (9, 'ico', 'image/ico', 1, 0, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (10, 'tar', 'application/x-tar', 1, 0, 'folder_mime_types/zip.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (11, 'bmp', 'image/x-MS-bmp', 1, 0, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (12, 'tiff', 'image/tiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (13, 'rtf', 'text/richtext', 1, 0, 'folder_mime_types/rtf.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (14, 'hqx', 'application/mac-binhex40', 1, 0, 'folder_mime_types/stuffit.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (15, 'aiff', 'audio/x-aiff', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (31, 'zip', 'application/zip', 1, 0, 'folder_mime_types/zip.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (17, 'ps', 'application/postscript', 1, 0, 'folder_mime_types/eps.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (18, 'doc', 'application/msword', 1, 0, 'folder_mime_types/doc.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (19, 'mov', 'video/quicktime', 1, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (20, 'ppt', 'application/powerpoint', 1, 0, 'folder_mime_types/ppt.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (21, 'wav', 'audio/x-wav', 1, 0, 'folder_mime_types/music.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (22, 'mp3', 'audio/x-mpeg', 1, 0, 'folder_mime_types/music.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (23, 'jpg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (24, 'txt', 'text/plain', 1, 0, 'folder_mime_types/txt.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (25, 'xml', 'text/xml', 1, 0, 'folder_mime_types/script.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (26, 'css', 'text/css', 1, 0, 'folder_mime_types/script.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (27, 'swf', 'application/x-shockwave-flash', 0, 0, 'folder_mime_types/quicktime.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (32, 'php', 'application/octet-stream', 1, 0, 'folder_mime_types/php.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (28, 'htm', 'application/octet-stream', 1, 0, 'folder_mime_types/html.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (29, 'jpeg', 'image/jpeg', 1, 1, 'folder_mime_types/gif.gif');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."attachments_type (atype_id, atype_extension, atype_mimetype, atype_post, atype_photo, atype_img) VALUES (33, 'gz', 'application/x-gzip', 1, 0, 'folder_mime_types/zip.gif');";
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('skin_id_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('bbcode', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('moderators', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('multimod', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('banfilters', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('attachtypes', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('emoticons', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('forum_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('badwords', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('systemvars', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('ranks', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('group_cache', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('stats', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('profilefields', 'a:0:{}', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('settings','', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('languages', '', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('birthdays', 'a:0:{}', '', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."cache_store (cs_key, cs_value, cs_extra, cs_array) VALUES ('calendar', 'a:0:{}', '', 1);";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (1, 'IPB Master Skin Set', '1', 0, 0, '0', -1, '', '', '', '', '', '', 1079109298, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (2, 'IPB Default Skin', '1', 0, 1, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."skin_sets (set_skin_set_id, set_name, set_image_dir, set_hidden, set_default, set_css_method, set_skin_set_parent, set_author_email, set_author_name, set_author_url, set_css, set_cache_macro, set_wrapper, set_css_updated, set_cache_css, set_cache_wrapper, set_emoticon_folder) VALUES (3, 'IPB Pre-2.0 Skins', '1', 0, 0, '0', -1, 'ipbauto@invisionboard.com', 'Invision Power Services', 'www.invisionboard.com', '', '', '', 1074679074, '', '', 'default');";
+		
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (1, 'General Configuration', 'These settings control the basics of the board such as URLs and paths.', 17);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (2, 'CPU Saving &amp; Optimization', 'This section allows certain features to be limited or removed to get more performance out of your board.', 16);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (3, 'Date &amp; Time Formats', 'This section contains the date and time formats used throughout the board.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (4, 'User Profiles', 'This section allows you to adjust your member\'s global permissions and other options.', 22);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (5, 'Topics, Posts and Polls', 'These options control various elements when posting, reading topics and reading polls.', 32);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (6, 'Security and Privacy', 'These options allow you to adjust the security and privacy options for your board.', 18);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (7, 'Cookies', 'This section allows you to set the default cookie options.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (8, 'COPPA Set-up', 'This section allows you to comply with <a href=\'http://www.ftc.gov/ogc/coppa1.htm\'>COPPA</a>.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (9, 'Calendar &amp; Birthdays', 'This section will allow you to set up the board calendar and its related options.', 8);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (10, 'News Set-up', 'This section will allow you to specify the forum you wish to export news topics from to be used with ssi.php and IPDynamic Lite.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (11, 'Personal Message Set-up', 'This section allows you to control the global PM options.', 3);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (12, 'Email Set-up', 'This section will allow you to change the incoming and outgoing email addresses as well as the email method.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (13, 'Warn Set-up', 'This section will allow you to set up the warning system.', 15);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (14, 'Trash Can Set-up', 'The trashcan is a special forum in which topics are moved into instead of being deleted.', 6);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (15, 'Board Offline / Online', 'Use this setting to turn switch your board online or offline and leave a message for your visitors.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (16, 'Search Engine Spiders', 'This section will allow you to set up and maintain your search engine bot spider recognition settings.', 7);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (17, 'Board Guidelines', 'This section allows you to maintain your board guidelines. If enabled, a link will be added to the board header linking to the board guidelines.', 4);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (18, 'Converge Set Up', 'Converge is Invision Power Services central authentication method for all IPS applications. This allows you to have a single log-in for all your IPS products.', 1);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count) VALUES (19, 'Full Text Search Set-Up', 'Full text searching is a very fast and very efficient way of searching large amounts of posts without maintaining a manual index. This may not be available for your system.', 2);";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (20,'Invision Chat Settings (Legacy Version)', 'This will allow you to customize your Invision Chat integration settings for the legacy edition.', 14, 1, 'chat');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (21,'Invision Chat Settings', 'This will allow you to customize your Invision Chat integration settings for the new 2004 edition', 10, 1, 'chat04');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (22,'IPB Portal', 'These settings enable you to enable or disable IPB Portal and control the options IPB Portal offers.', 20, 0, 'ipbportal');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (23,'Subscriptions Manager', 'These settings control various subscription manager features.', 3, 0, 'subsmanager');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (24,'IPB Registration', 'This section will allow you to edit your IPB registered licence settings.', 3, 1, 'ipbreg');";
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (25,'IPB Copyright Removal', 'This section allows you to manage your copyright removal key.', 2, 1, 'ipbcopyright');";
+
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."upgrade_history (upgrade_id, upgrade_version_id, upgrade_version_human, upgrade_date, upgrade_mid, upgrade_notes) VALUES ('', '".THIS_LONG_VERSION."', '".THIS_HUMAN_VERSION."', '0', '0', '');";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 17: ALTER OTHERS TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_17()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_attach_per_post int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topic_mmod add topic_approve tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_can_msg_attach tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."pfields_data
+				change fid pf_id smallint(5) NOT NULL auto_increment,
+				change ftitle pf_title varchar(250) NOT NULL default '',
+				change fdesc pf_desc varchar(250) NOT NULL default '',
+				change fcontent pf_content text NOT NULL default '',
+				change ftype pf_type varchar(250) NOT NULL default '',
+				change freq pf_not_null tinyint(1) NOT NULL default '0',
+				change fhide pf_member_hide tinyint(1) NOT NULL default '0',
+				change fmaxinput pf_max_input smallint(6) NOT NULL default '0',
+				change fedit pf_member_edit tinyint(1) NOT NULL default '0',
+				change forder pf_position smallint(6) NOT NULL default '0',
+				change fshowreg pf_show_on_reg tinyint(1) NOT NULL default '0',
+				add pf_input_format text NOT NULL default '',
+				add pf_admin_only tinyint(1) NOT NULL default '0',
+				add pf_topic_format text NOT NULL default '';";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 16: ALTER MEMBERS TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_16()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members DROP msg_from_id, DROP msg_msg_id;";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members DROP org_supmod, DROP integ_msg;";
+		$SQL[] = "alter table ".SQL_PREFIX."members DROP aim_name, DROP icq_number, DROP website, DROP yahoo, DROP interests,
+				  DROP msnname, DROP vdirs, DROP signature, DROP location, DROP avatar, DROP avatar_size;";
+		$SQL[] = "alter table ".SQL_PREFIX."members change auto_track auto_track varchar(50) default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add subs_pkg_chosen smallint(3) NOT NULL default '0';";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members change temp_ban temp_ban varchar(100) default '0'";
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."members change msg_total msg_total smallint(5) default '0'";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 15: ALTER TOPIC TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_15()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."topics add topic_firstpost int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."topics add topic_queuedposts int(10) NOT NULL default '0';";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 14: ALTER POST TABLE II
+	/*-------------------------------------------------------------------------*/
+	
+	function step_14()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "ALTER TABLE ".SQL_PREFIX."posts DROP attach_id, DROP attach_hits, DROP attach_type, DROP attach_file;";
+		$SQL[] = "alter table ".SQL_PREFIX."posts change queued queued tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts drop forum_id;";
+
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 7: IMPORT FORUMS
+	/*-------------------------------------------------------------------------*/
+	
+	function step_7()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Convert existing forums
+		//-----------------------------------------
+		
+		$o = $DB->query("SELECT * FROM ".SQL_PREFIX."forums_bak ORDER BY id");
+		
+		while( $r = $DB->fetch_row( $o ) )
+		{
+			$perm_array = addslashes(serialize(array(
+													  'start_perms'  => $r['start_perms'],
+													  'reply_perms'  => $r['reply_perms'],
+													  'read_perms'   => $r['read_perms'],
+													  'upload_perms' => $r['upload_perms'],
+													  'show_perms'   => $r['read_perms']
+									)		  )     );
+			
+			$DB->do_insert( 'forums', array (
+											  'id'                      => $r['id'],
+											  'position'                => $r['position'],
+											  'topics'                  => $r['topics'],
+											  'posts'                   => $r['posts'],
+											  'last_post'               => $r['last_post'],
+											  'last_poster_id'          => $r['last_poster_id'],
+											  'last_poster_name'        => $r['last_poster_name'],
+											  'name'                    => $r['name'],
+											  'description'             => $r['description'],
+											  'use_ibc'                 => $r['use_ibc'],
+											  'use_html'                => $r['use_html'],
+											  'status'                  => $r['status'],
+											  'password'                => $r['password'],
+											  'last_id'                 => $r['last_id'],
+											  'last_title'              => $r['last_title'],
+											  'sort_key'                => $r['sort_key'],
+											  'sort_order'              => $r['sort_order'],
+											  'prune'                   => $r['prune'],
+											  'show_rules'              => $r['show_rules'],
+											  'preview_posts'           => $r['preview_posts'],
+											  'allow_poll'              => $r['allow_poll'],
+											  'allow_pollbump'          => $r['allow_pollbump'],
+											  'inc_postcount'           => $r['inc_postcount'],
+											  'parent_id'               => $r['parent_id'],
+											  'sub_can_post'            => $r['sub_can_post'],
+											  'quick_reply'             => $r['quick_reply'],
+											  'redirect_on'             => $r['redirect_on'],
+											  'redirect_hits'           => $r['redirect_hits'],
+											  'redirect_url'            => $r['redirect_url'],
+											  'redirect_loc'		    => $r['redirect_loc'],
+											  'rules_title'			    => $r['rules_title'],
+  											  'rules_text'			    => $r['rules_text'],
+											  'notify_modq_emails'      => $r['notify_modq_emails'],
+											  'permission_array'        => $perm_array,
+											  'permission_showtopic'    => '',
+											  'permission_custom_error' => '',
+									)       );
+		}
+		
+		//-----------------------------------------
+		// Convert categories
+		//-----------------------------------------
+		
+		$DB->query("SELECT MAX(id) as max FROM ".SQL_PREFIX."forums");
+		$max = $DB->fetch_row();
+		
+		$fid = $max['max'];
+		
+		$o = $DB->query("SELECT * FROM ".SQL_PREFIX."categories WHERE id > 0");
+		
+		while( $r = $DB->fetch_row( $o ) )
+		{
+			$fid++;
+			
+			$perm_array = addslashes(serialize(array(
+													  'start_perms'  => '*',
+													  'reply_perms'  => '*',
+													  'read_perms'   => '*',
+													  'upload_perms' => '*',
+													  'show_perms'   => '*',
+									)		  )     );
+									
+			$DB->do_insert( 'forums', array(
+											 'id'               => $fid,
+											 'position'         => $r['position'],
+											 'name'             => $r['name'],
+											 'sub_can_post'     => 0,
+											 'permission_array' => $perm_array,
+											 'parent_id'        => -1,
+						  )                );
+						  
+			//-----------------------------------------
+			// Update old categories
+			//-----------------------------------------
+			
+			$n = $DB->query("SELECT id FROM ".SQL_PREFIX."forums_bak WHERE category={$r['id']} AND parent_id = -1");
+			
+			$ids = array();
+			
+			while( $c = $DB->fetch_row($n) )
+			{
+				$ids[] = $c['id'];
+			}
+			
+			if ( count($ids) )
+			{
+				$DB->do_update( 'forums', array( 'parent_id' => $fid ), 'id IN ('.implode(',',$ids).')' );
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 6: ALTER OTHER TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_6()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."macro rename ibf_skin_macro;";
+		$SQL[] = "alter table ".SQL_PREFIX."skin_macro change can_remove macro_can_remove tinyint(1) default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups add g_bypass_badwords tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."cache_store change cs_value cs_value mediumtext NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."cache_store add cs_array tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."sessions add in_error tinyint(1) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."topic_mmod add mm_forums text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."groups change g_icon g_icon text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."emoticons add emo_set varchar(64) NOT NULL default 'default';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change ID session_id varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change IP_ADDRESS session_ip_address varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change MEMBER_NAME session_member_name varchar(250) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change MEMBER_ID session_member_id mediumint(8) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change SESSION_KEY session_member_login_key varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change LOCATION session_location varchar(64) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change LOG_IN_TIME session_log_in_time int(10) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."admin_sessions change RUNNING_TIME session_running_time int(10) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."forum_tracker add forum_track_type varchar(100) NOT NULL default 'delayed';";
+		$SQL[] = "alter table ".SQL_PREFIX."tracker add topic_track_type varchar(100) NOT NULL default 'delayed';";
+		
+		$SQL[] = "delete from ".SQL_PREFIX."members where id=0 LIMIT 1;";
+		$SQL[] = "delete from ".SQL_PREFIX."member_extra where id=0 limit 1;";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 5: ALTER MEMBERS TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_5()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."members add login_anonymous varchar(3) NOT NULL default '0&0';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add ignored_users text NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add mgroup_others varchar(255) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."member_extra
+		ADD aim_name varchar(40) NOT NULL default '',
+		ADD icq_number int(15) NOT NULL default '',
+		ADD website varchar(250) NOT NULL default '',
+		ADD yahoo varchar(40) NOT NULL default '',
+		ADD interests text NOT NULL default '',
+		ADD msnname varchar(200) NOT NULL default '',
+		ADD vdirs text NOT NULL default '',
+		ADD location varchar(250) NOT NULL default '',
+		ADD signature text NOT NULL default '',
+		ADD avatar_location varchar(128) NOT NULL default '',
+		ADD avatar_size varchar(9) NOT NULL default '',
+		ADD avatar_type varchar(15) NOT NULL default 'local';";
+		$SQL[] = "alter table ".SQL_PREFIX."members add member_login_key varchar(32) NOT NULL default '';";
+		$SQL[] = "alter table ".SQL_PREFIX."members change password legacy_password varchar(32) NOT NULL default '';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 4: ALTER POST TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_4()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."topics ADD topic_hasattach smallint(5) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 3: ALTER POST TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_3()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "alter table ".SQL_PREFIX."posts add post_parent int(10) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts ADD post_key varchar(32) NOT NULL default '0';";
+		$SQL[] = "alter table ".SQL_PREFIX."posts add post_htmlstate smallint(1) NOT NULL default '0';";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 2: DROP FORUMS TABLE, CREATE NEW TABLES
+	/*-------------------------------------------------------------------------*/
+	
+	function step_2()
+	{
+		global $DB, $std, $ibforums;
+		
+		$SQL[] = "DROP TABLE if exists ".SQL_PREFIX."attachments";
+		$SQL[] = "DROP TABLE if exists ".SQL_PREFIX."announcements";
+		
+		$SQL[] = "CREATE TABLE ".SQL_PREFIX."attachments (
+		   attach_id int(10) NOT NULL auto_increment,
+		   attach_ext varchar(10) NOT NULL default '',
+		   attach_file varchar(250) NOT NULL default '',
+		   attach_location varchar(250) NOT NULL default '',
+		   attach_thumb_location varchar(250) NOT NULL default '',
+		   attach_thumb_width smallint(5) NOT NULL default '0',
+		   attach_thumb_height smallint(5) NOT NULL default '0',
+		   attach_is_image tinyint(1) NOT NULL default '0',
+		   attach_hits int(10) NOT NULL default '0',
+		   attach_date int(10) NOT NULL default '0',
+		   attach_temp tinyint(1) NOT NULL default '0',
+		   attach_pid int(10) NOT NULL default '0',
+		   attach_post_key varchar(32) NOT NULL default '0',
+		   attach_msg int(10) NOT NULL default '0',
+		   attach_member_id mediumint(8) NOT NULL default '0',
+		   attach_approved int(10) NOT NULL default '1',
+		   attach_filesize int(10) NOT NULL default '0',
+		PRIMARY KEY (attach_id),
+		KEY attach_pid (attach_pid),
+		KEY attach_msg (attach_msg),
+		KEY attach_post_key (attach_post_key),
+		KEY attach_mid_size (attach_member_id, attach_filesize)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."message_text (
+		 msg_id int(10) NOT NULL auto_increment,
+		 msg_date int(10) default NULL,
+		 msg_post text default '',
+		 msg_cc_users text default '',
+		 msg_sent_to_count smallint(5) NOT NULL default '0',
+		 msg_deleted_count smallint(5) NOT NULL default '0',
+		 msg_post_key varchar(32) NOT NULL default '0',
+		 msg_author_id mediumint(8) NOT NULL default '0',
+		PRIMARY KEY (msg_id),
+		KEY msg_date (msg_date),
+		KEY msg_sent_to_count (msg_sent_to_count),
+		KEY msg_deleted_count (msg_deleted_count)
+		);";
+		
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."message_topics (
+		   mt_id int(10) NOT NULL auto_increment,
+		   mt_msg_id int(10) NOT NULL default '0',
+		   mt_date int(10) NOT NULL default '0',
+		   mt_title varchar(255) NOT NULL default '',
+		   mt_from_id mediumint(8) NOT NULL default '0',
+		   mt_to_id mediumint(8) NOT NULL default '0',
+		   mt_owner_id mediumint(8) NOT NULL default '0',
+		   mt_vid_folder varchar(32) NOT NULL default '',
+		   mt_read tinyint(1) NOT NULL default '0',
+		   mt_hasattach smallint(5) NOT NULL default '0',
+		   mt_hide_cc tinyint(1) default '0',
+		   mt_tracking tinyint(1) default '0',
+		   mt_user_read int(10) default '0',
+		PRIMARY KEY (mt_id),
+		KEY mt_from_id (mt_from_id),
+		KEY mt_owner_id (mt_owner_id, mt_to_id, mt_vid_folder)
+		);";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."skin_sets (
+		   set_skin_set_id int(10) NOT NULL auto_increment,
+		   set_name varchar(150) NOT NULL default '',
+		   set_image_dir varchar(200) NOT NULL default '',
+		   set_hidden tinyint(1) NOT NULL default '0',
+		   set_default tinyint(1) NOT NULL default '0',
+		   set_css_method varchar(100) NOT NULL default 'inline',
+		   set_skin_set_parent smallint(5) NOT NULL default '-1',
+		   set_author_email varchar(255) NOT NULL default '',
+		   set_author_name varchar(255) NOT NULL default '',
+		   set_author_url varchar(255) NOT NULL default '',
+		   set_css mediumtext NOT NULL default '',
+		   set_wrapper mediumtext NOT NULL default '',
+		   set_css_updated int(10) NOT NULL default '0',
+		   set_cache_css mediumtext NOT NULL default '',
+		   set_cache_macro mediumtext NOT NULL default '',
+		   set_cache_wrapper mediumtext NOT NULL default '',
+		   set_emoticon_folder varchar(60) NOT NULL default 'default',
+		   PRIMARY KEY(set_skin_set_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."skin_templates_cache (
+		   template_id varchar(32) NOT NULL default '',
+		   template_group_name varchar(255) NOT NULL default '',
+		   template_group_content mediumtext NOT NULL default '',
+		   template_set_id int(10) NOT NULL default '0',
+		   primary key (template_id),
+		   KEY template_set_id (template_set_id),
+		   KEY template_group_name (template_group_name)
+	   );";
+	   
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."mail_queue(
+		   mail_id int(10) auto_increment NOT NULL,
+		   mail_date int(10) NOT NULL default '0',
+		   mail_to varchar(255) NOT NULL default '',
+		   mail_from varchar(255) NOT NULL default '',
+		   mail_subject text NOT NULL default '',
+		   mail_content text NOT NULL default '',
+		   mail_type varchar(200) NOT NULL default '',
+		   PRIMARY KEY (mail_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."task_manager (
+		   task_id int(10) auto_increment NOT NULL,
+		   task_title varchar(255) NOT NULL default '',
+		   task_file varchar(255) NOT NULL default '',
+		   task_next_run int(10) NOT NULL default '',
+		   task_week_day tinyint(1) NOT NULL default '-1',
+		   task_month_day smallint(2) NOT NULL default '-1',
+		   task_hour smallint(2) NOT NULL default '-1',
+		   task_minute smallint(2) NOT NULL default '-1',
+		   task_cronkey varchar(32) NOT NULL default '',
+		   task_log tinyint(1) NOT NULL default '0',
+		   task_description text NOT NULL default '',
+		   task_enabled tinyint(1) NOT NULL default '1',
+		   task_key varchar(30) NOT NULL default '',
+		   task_safemode tinyint(1) NOT NULL default '',
+		   PRIMARY KEY(task_id),
+		   KEY task_next_run (task_next_run)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."task_logs (
+		   log_id int(10) auto_increment NOT NULL,
+		   log_title varchar(255) NOT NULL default '',
+		   log_date int(10) NOT NULL default '0',
+		   log_ip varchar(16) NOT NULL default '0',
+		   log_desc text NOT NULL default '',
+		   PRIMARY KEY(log_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."custom_bbcode (
+		   bbcode_id int(10) NOT NULL auto_increment,
+		   bbcode_title varchar(255) NOT NULL default '',
+		   bbcode_desc text NOT NULL default '',
+		   bbcode_tag varchar(255) NOT NULL default '',
+		   bbcode_replace text NOT NULL default '',
+		   bbcode_useoption tinyint(1) NOT NULL default '',
+		   bbcode_example text NOT NULL default '',
+		   PRIMARY KEY (bbcode_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."conf_settings (
+		   conf_id int(10) NOT NULL auto_increment,
+		   conf_title varchar(255) NOT NULL default '',
+		   conf_description text NOT NULL default '',
+		   conf_group smallint(3) NOT NULL default '',
+		   conf_type varchar(255) NOT NULL default '',
+		   conf_key varchar(255) NOT NULL default '',
+		   conf_value text NOT NULL default '',
+		   conf_default text NOT NULL default '',
+		   conf_extra text NOT NULL default '',
+		   conf_evalphp text NOT NULL default '',
+		   conf_protected tinyint(1) NOT NULL default '',
+		   conf_position smallint(3) NOT NULL default '0',
+		   conf_start_group varchar(255) NOT NULL default '',
+		   conf_end_group tinyint(1) NOT NULL default '0',
+		   conf_help_key varchar(255) NOT NULL default '0',
+		   conf_add_cache tinyint(1) NOT NULL default '1',
+		   PRIMARY KEY (conf_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."conf_settings_titles (
+		   conf_title_id smallint(3) NOT NULL auto_increment,
+		   conf_title_title varchar(255) NOT NULL default '',
+		   conf_title_desc text NOT NULL default '',
+		   conf_title_count smallint(3) NOT NULL default '0',
+		   conf_title_noshow tinyint(1) NOT NULL default '0',
+		   conf_title_keyword varchar(200) NOT NULL default '',
+		   PRIMARY KEY(conf_title_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."topics_read (
+		 read_tid int(10) NOT NULL default '0',
+		 read_mid mediumint(8) NOT NULL default '0',
+		 read_date int(10) NOT NULL default '0',
+		 UNIQUE KEY read_tid_mid( read_tid, read_mid )
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."banfilters (
+		   ban_id int(10) NOT NULL auto_increment,
+		   ban_type varchar(10) NOT NULL default 'ip',
+		   ban_content text NOT NULL default '',
+		   ban_date int(10) NOT NULL default '0',
+		   PRIMARY KEY (ban_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."attachments_type (
+		   atype_id int(10) NOT NULL auto_increment,
+		   atype_extension varchar(18) NOT NULL default '',
+		   atype_mimetype varchar(255) NOT NULL default '',
+		   atype_post tinyint(1) NOT NULL default '1',
+		   atype_photo tinyint(1) NOT NULL default '0',
+		   atype_img text NOT NULL default '',
+		   PRIMARY KEY (atype_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."members_converge (
+		   converge_id int(10) auto_increment NOT NULL,
+		   converge_email varchar(250) NOT NULL default '',
+		   converge_joined int(10) NOT NULL default '',
+		   converge_pass_hash varchar(32) NOT NULL default '',
+		   converge_pass_salt varchar(5) NOT NULL default '',
+		   PRIMARY KEY( converge_id )
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."announcements (
+		announce_id int(10) UNSIGNED NOT NULL auto_increment,
+		announce_title varchar(255) NOT NULL default '',
+		announce_post text NOT NULL default '',
+		announce_forum text NOT NULL default '',
+		announce_member_id mediumint(8) UNSIGNED NOT NULL default '0',
+		announce_html_enabled tinyint(1) NOT NULL default '0',
+		announce_views int(10) UNSIGNED NOT NULL default '0',
+		announce_start int(10) UNSIGNED NOT NULL default '0',
+		announce_end int(10) UNSIGNED NOT NULL default '0',
+		announce_active tinyint(1) NOT NULL default '1',
+	   PRIMARY KEY (announce_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."mail_error_logs (
+		   mlog_id int(10) auto_increment NOT NULL,
+		   mlog_date int(10) NOT NULL default '0',
+		   mlog_to varchar(250) NOT NULL default '',
+		   mlog_from varchar(250) NOT NULL default '',
+		   mlog_subject varchar(250) NOT NULL default '',
+		   mlog_content varchar(250) NOT NULL default '',
+		   mlog_msg text NOT NULL default '',
+		   mlog_code varchar(200) NOT NULL default '',
+		   mlog_smtp_msg text NOT NULL default '',
+		   PRIMARY KEY (mlog_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."bulk_mail (
+		   mail_id int(10) NOT NULL auto_increment,
+		   mail_subject varchar(255) NOT NULL default '',
+		   mail_content mediumtext NOT NULL default '',
+		   mail_groups mediumtext NOT NULL default '',
+		   mail_honor tinyint(1) NOT NULL default '1',
+		   mail_opts mediumtext NOT NULL default '',
+		   mail_start int(10) NOT NULL default '0',
+		   mail_updated int(10) NOT NULL default '0',
+		   mail_sentto int(10) NOT NULL default '0',
+		   mail_active tinyint(1) NOT NULL default '0',
+		   mail_pergo smallint(5) NOT NULL default '0',
+		   PRIMARY KEY (mail_id)
+	   );";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."upgrade_history (
+		   upgrade_id int(10) NOT NULL auto_increment,
+		   upgrade_version_id int(10) NOT NULL default '',
+		   upgrade_version_human varchar(200) NOT NULL default '',
+		   upgrade_date int(10) NOT NULL default '0',
+		   upgrade_mid int(10) NOT NULL default '0',
+		   upgrade_notes text NOT NULL default '',
+		   PRIMARY KEY (upgrade_id)
+	   );";
+	   
+	   $SQL[] = "DROP TABLE ".SQL_PREFIX."forums";
+	   
+	   $SQL[] = "CREATE TABLE ".SQL_PREFIX."forums (
+				 id smallint(5) NOT NULL default '0',
+				 topics mediumint(6) default '0',
+				 posts mediumint(6) default '0',
+				 last_post int(10) default NULL,
+				 last_poster_id mediumint(8) NOT NULL default '0',
+				 last_poster_name varchar(32) default NULL,
+				 name varchar(128) NOT NULL default '',
+				 description text,
+				 position tinyint(2) default NULL,
+				 use_ibc tinyint(1) default NULL,
+				 use_html tinyint(1) default NULL,
+				 status varchar(10) default NULL,
+				 password varchar(32) default NULL,
+				 last_title varchar(128) default NULL,
+				 last_id int(10) default NULL,
+				 sort_key varchar(32) default NULL,
+				 sort_order varchar(32) default NULL,
+				 prune tinyint(3) default NULL,
+				 show_rules tinyint(1) default NULL,
+				 preview_posts tinyint(1) default NULL,
+				 allow_poll tinyint(1) NOT NULL default '1',
+				 allow_pollbump tinyint(1) NOT NULL default '0',
+				 inc_postcount tinyint(1) NOT NULL default '1',
+				 skin_id int(10) default NULL,
+				 parent_id mediumint(5) default '-1',
+				 sub_can_post tinyint(1) default '1',
+				 quick_reply tinyint(1) default '0',
+				 redirect_url varchar(250) default '',
+				 redirect_on tinyint(1) NOT NULL default '0',
+				 redirect_hits int(10) NOT NULL default '0',
+				 redirect_loc varchar(250) default '',
+				 rules_title varchar(255) NOT NULL default '',
+				 rules_text text NOT NULL,
+				 topic_mm_id varchar(250) NOT NULL default '',
+				 notify_modq_emails text default '',
+				 permission_custom_error text NOT NULL default '',
+				 permission_array mediumtext NOT NULL default '',
+				 permission_showtopic tinyint(1) NOT NULL default '0',
+				 queued_topics mediumint(6) NOT NULL default '0',
+				 queued_posts  mediumint(6) NOT NULL default '0',
+				 PRIMARY KEY  (id),
+				 KEY position (position, parent_id)
+			   );";
+		
+		$this->error   = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// STEP 1: COPY AND POPULATE BACK UP FORUMS TABLE
+	/*-------------------------------------------------------------------------*/
+	
+	function step_1()
+	{
+		global $DB, $std, $ibforums;
+		
+		//-----------------------------------------
+		// Get table schematic
+		//-----------------------------------------
+		
+		$table = $DB->sql_get_table_schematic( 'forums' );
+		
+		$SQL[] = str_replace( SQL_PREFIX."forums", SQL_PREFIX."forums_bak", $table['Create Table'] );
+		
+		$SQL[] = "INSERT INTO ".SQL_PREFIX."forums_bak SELECT * FROM ".SQL_PREFIX."forums";
+		
+		$this->error    = array();
+		$this->sqlcount = 0;
+		
+		$DB->return_die = 1;
+		
+		foreach( $SQL as $query )
+		{
+			$DB->query( $query );
+			
+			if ( $DB->error )
+			{
+				$this->error[ $DB->error ] = $DB->error;
+			}
+			else
+			{
+				$this->sqlcount++;
+			}
+		}
+		
+		//-----------------------------------------
+		// Check...
+		//-----------------------------------------
+		
+		$DB->query( "SELECT COUNT(*) as count FROM ".SQL_PREFIX."forums_bak" );
+		$count = $DB->fetch_row();
+		
+		if ( intval( $count['count'] ) < 1 )
+		{
+			print "The back-up forums table has not been populated successfully. Continuing this convert WILL delete all forums permanently. Contact technical support immediately.";
+			exit();
+		}
+	}
+	
+	//#------------------------------------------------------------------------
+	// OTHER SQL WORK
+	//#------------------------------------------------------------------------
+	
+	function sql_members($a, $b)
+	{
+		return "SELECT m.*, me.id as mextra FROM ibf_members m LEFT JOIN ibf_member_extra me ON ( me.id=m.id ) LIMIT $a, $b";
+	}
+	
+	function sql_members_email( $a )
+	{
+		return "select id, name, email, count(email) as count from ibf_members group by email order by count desc LIMIT 0, $a";
+	}
+	
+	function sql_members_email_update( $push_auth )
+	{
+		return "UPDATE ibf_members SET email=concat( id, '-', email ) where id IN(".implode(",", $push_auth).")";
+	}
+	
+	function sql_members_converge( $start, $end )
+	{
+		return "SELECT m.*, c.converge_id as cid FROM ibf_members m LEFT JOIN ibf_members_converge c ON ( c.converge_id=m.id ) WHERE id >= $start and id < $end";
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20002/version_history.php b/upload/upgrade/upg_20002/version_history.php
new file mode 100644
index 00000000..602ec94c
--- /dev/null
+++ b/upload/upgrade/upg_20002/version_history.php
@@ -0,0 +1,9 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20002/version_upgrade.php b/upload/upgrade/upg_20002/version_upgrade.php
new file mode 100644
index 00000000..c4030dd3
--- /dev/null
+++ b/upload/upgrade/upg_20002/version_upgrade.php
@@ -0,0 +1,248 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20002';
+	var $upgrade_from = '20001';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$sql = $this->_get_sql();
+		
+		foreach( $sql as $q )
+		{
+			$DB->query( $q );
+			
+			$cnt++;
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL (ARRAY)
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_sql()
+	{
+		
+		$SQL = array();
+		
+		$SQL[]="create table ibf_announcements (
+		announce_id int(10) UNSIGNED NOT NULL auto_increment,
+		announce_title varchar(255) NOT NULL default '',
+		announce_post text NOT NULL default '',
+		announce_forum text NOT NULL default '',
+		announce_member_id mediumint(8) UNSIGNED NOT NULL default '0',
+		announce_html_enabled tinyint(1) NOT NULL default '0',
+		announce_views int(10) UNSIGNED NOT NULL default '0',
+		announce_start int(10) UNSIGNED NOT NULL default '0',
+		announce_end int(10) UNSIGNED NOT NULL default '0',
+		announce_active tinyint(1) NOT NULL default '1',
+		PRIMARY KEY (announce_id)
+		);";
+		
+		$SQL[]="INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day,
+				task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled)
+				VALUES ('Announcements Update', 'announcements.php', 1080747660, -1, -1, 4, -1, 'e82f2c19ab1ed57c140fccf8aea8b9fe', 1,
+				'Rebuilds cache and expires out of date announcements', 1);";
+		
+		$SQL[]="CREATE TABLE ibf_bulk_mail (
+		  mail_id int(10) NOT NULL auto_increment,
+		  mail_subject varchar(255) NOT NULL default '',
+		  mail_content mediumtext NOT NULL default '',
+		  mail_groups mediumtext NOT NULL default '',
+		  mail_honor tinyint(1) NOT NULL default '1',
+		  mail_opts mediumtext NOT NULL default '',
+		  mail_start int(10) NOT NULL default '0',
+		  mail_updated int(10) NOT NULL default '0',
+		  mail_sentto int(10) NOT NULL default '0',
+		  mail_active tinyint(1) NOT NULL default '0',
+		  mail_pergo smallint(5) NOT NULL default '0',
+		  PRIMARY KEY (mail_id)
+		);";
+		
+		
+		$SQL[]="alter table ibf_task_manager add task_key varchar(30) NOT NULL default '', add task_safemode tinyint(1) NOT NULL default '';";
+		
+		$SQL[]="INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value,
+				conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group,
+				conf_end_group, conf_help_key, conf_add_cache) VALUES ('Add &#39;&lt;&#39; and &#39;&gt;&#39; to &#39;to&#39; and &#39;from&#39; addresses?',
+				'Some SMTP mailers require that email addresses are in the following format \'<\' address \'>\' (no quotes).
+				If you are getting errors in the mail error log, enabled this option', '12', 'yes_no', 'mail_wrap_brackets', '', '0', '', '', 1, 6, '', 0, '', 1);";
+		
+		$SQL[]="create table ibf_mail_error_logs (
+		  mlog_id int(10) auto_increment NOT NULL,
+		  mlog_date int(10) NOT NULL default '0',
+		  mlog_to varchar(250) NOT NULL default '',
+		  mlog_from varchar(250) NOT NULL default '',
+		  mlog_subject varchar(250) NOT NULL default '',
+		  mlog_content varchar(250) NOT NULL default '',
+		  mlog_msg text NOT NULL default '',
+		  mlog_code varchar(200) NOT NULL default '',
+		  mlog_smtp_msg text NOT NULL default '',
+		  PRIMARY KEY (mlog_id)
+		);";
+		
+		
+		$SQL[]="alter table ibf_pfields_data
+		change fid pf_id smallint(5) NOT NULL auto_increment,
+		change ftitle pf_title varchar(250) NOT NULL default '',
+		change fdesc pf_desc varchar(250) NOT NULL default '',
+		change fcontent pf_content text NOT NULL default '',
+		change ftype pf_type varchar(250) NOT NULL default '',
+		change freq pf_not_null tinyint(1) NOT NULL default '0',
+		change fhide pf_member_hide tinyint(1) NOT NULL default '0',
+		change fmaxinput pf_max_input smallint(6) NOT NULL default '0',
+		change fedit pf_member_edit tinyint(1) NOT NULL default '0',
+		change forder pf_position smallint(6) NOT NULL default '0',
+		change fshowreg pf_show_on_reg tinyint(1) NOT NULL default '0',
+		add pf_input_format text NOT NULL default '',
+		add pf_admin_only tinyint(1) NOT NULL default '0',
+		add pf_topic_format text NOT NULL default '';";
+		
+		$SQL[]="INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_set) VALUES ( 'POST_SNAPBACK', \"<img src='style_images/<#IMG_DIR#>/post_snapback.gif' alt='*' border='0' />\", 1);";
+		
+		$SQL[]="alter table ibf_forum_tracker add forum_track_type varchar(100) NOT NULL default 'delayed';";
+		$SQL[]="alter table ibf_tracker add topic_track_type varchar(100) NOT NULL default 'delayed';";
+		
+		$SQL[]="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Snap Back', 'This tag displays a little linked image which links back to a post - used when quoting posts from the board. Opens in same window by default.', 'snapback', '<a href=\"index.php?act=findpost&amp;pid={content}\"><{POST_SNAPBACK}></a>', 0, '[snapback]100[/snapback]');";
+		$SQL[]="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Right', 'Aligns content to the right of the posting area', 'right', '<div align=\'right\'>{content}</div>', 0, '[right]Some text here[/right]');";
+		$SQL[]="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Left', 'Aligns content to the left of the post', 'left', '<div align=\'left\'>{content}</div>', 0, '[left]Left aligned text[/left]');";
+		$SQL[]="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Center', 'Aligns content to the center of the posting area.', 'center', '<div align=\'center\'>{content}</div>', 0, '[center]Centered Text[/center]');";
+		$SQL[]="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Topic Link', 'This tag provides an easy way to link to a topic', 'topic', '<a href=\'index.php?showtopic={option}\'>{content}</a>', 1, '[topic=100]Click me![/topic]');";
+		$SQL[]="INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('Post Link', 'This tag provides an easy way to link to a post.', 'post', '<a href=\'index.php?act=findpost&pid={option}\'>{content}</a>', 1, '[post=100]Click me![/post]');";
+		
+		$SQL[]="alter table ibf_members change auto_track auto_track varchar(50) default '0';";
+		
+		
+		$SQL[]="alter table ibf_conf_settings_titles
+		add conf_title_noshow tinyint(1) NOT NULL default '0',
+		add conf_title_keyword varchar(200) NOT NULL default '0'";
+		
+		return $SQL;
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20003/version_history.php b/upload/upgrade/upg_20003/version_history.php
new file mode 100644
index 00000000..1988c8ad
--- /dev/null
+++ b/upload/upgrade/upg_20003/version_history.php
@@ -0,0 +1,10 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20003/version_upgrade.php b/upload/upgrade/upg_20003/version_upgrade.php
new file mode 100644
index 00000000..da864531
--- /dev/null
+++ b/upload/upgrade/upg_20003/version_upgrade.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20003';
+	var $upgrade_from = '20002';
+	var $first_step   = 'update your templates.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&act=done'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20004/version_history.php b/upload/upgrade/upg_20004/version_history.php
new file mode 100644
index 00000000..2c4b9cd1
--- /dev/null
+++ b/upload/upgrade/upg_20004/version_history.php
@@ -0,0 +1,11 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20004/version_upgrade.php b/upload/upgrade/upg_20004/version_upgrade.php
new file mode 100644
index 00000000..5f900691
--- /dev/null
+++ b/upload/upgrade/upg_20004/version_upgrade.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20004';
+	var $upgrade_from = '20003';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$sql = $this->_get_sql();
+		
+		foreach( $sql as $q )
+		{
+			$DB->query( $q );
+			
+			$cnt++;
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL (ARRAY)
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_sql()
+	{
+		
+		$SQL = array();
+		
+		$SQL[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id, conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (22,'IPB Portal', 'These settings enable you to enable or disable IPB Portal and control the options IPB Portal offers.', 20, 0, 'ipbportal');";
+		
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('ENABLE IPB Portal?', 'If \'yes\', IPB Portal can be accessed via \'index.php?act=home\' or via the special \'index.php\' script (see documentation for more info).', '22', 'yes_no', 'csite_on', '', '1', '', '', 1, 1, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('IPB Portal Page Title?', 'This will appear inbetween the &lt;title&gt; elements on the page', '22', 'input', 'csite_title', '', 'IPB Portal', '', '', 1, 2, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Forums to export articles from', 'Separate <b>forum ids</b> with a comma for more than one', '22', 'input', 'csite_article_forum', '1,2,3,4,5,6', '', '', '', 1, 3, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Number of Articles to display in the main section', '', '22', 'input', 'csite_article_max', '', '15', '', '', 1, 4, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Enable Recent Articles?', 'This will show a list of recent topic titles on the IPB Portal page', '22', 'yes_no', 'csite_article_recent_on', '', '1', '', '', 1, 5, 'IPB Portal Recent Articles', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Max. no recent articles to show', '', '22', 'input', 'csite_article_recent_max', '', '5', '', '', 1, 6, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Max. length of topic titles', '', '22', 'input', 'csite_article_len', '', '30', '', '', 1, 7, '', 1, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Date format for articles', '<a href=\'http://www.php.net/date\'>Same as PHP\'s date function', '22', 'input', 'csite_article_date', '', 'm-j-y H:i', '', '', 1, 3, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Enable Recent Discussions', '', '22', 'yes_no', 'csite_discuss_on', '', '1', '', '', 1, 9, 'IPB Portal Recent Discussions', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Max. no recent discussions to show', '', '22', 'input', 'csite_discuss_max', '', '10', '', '', 1, 10, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Max. length of topic titles', '', '22', 'input', 'csite_discuss_len', '', '30', '', '', 1, 11, '', 1, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show User / Guest Info box?', '', '22', 'yes_no', 'csite_pm_show', '', '1', '', '', 1, 12, 'IPB Portal Components', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show online users?', '', '22', 'yes_no', 'csite_online_show', '', '1', '', '', 1, 13, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show search box?', '', '22', 'yes_no', 'csite_search_show', '', '1', '', '', 1, 14, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Enable skin selection choice dropdown?', '', '22', 'yes_no', 'csite_skinchange_show', '', '1', '', '', 1, 15, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Enter URL to poll topic for inclusion', 'Leave blank to not show a poll or the poll box', '22', 'input', 'csite_poll_url', '', '', '', '', 1, 17, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show Site Navigation Menu?', '', '22', 'yes_no', 'csite_nav_show', '', '1', '', '', 1, 18, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Site Navigation Menu Links', 'One per line in this format<br>http://www.apple.com [Apple\'s Website]<br><br>{board_url} will convert into your board', '22', 'textarea', 'csite_nav_contents', '', '{board_url} [Forums]\r\n{board_url}act=Search&CODE=getactive [Today\'s Active Topics]\r\n{board_url}act=Stats [Today\'s Top 10 Posters]\r\n{board_url}act=Stats&CODE=leaders [Contact Staff]', '', 'if ( $show == 1)\r\n{\r\n    $value = preg_replace( \"/&(middot|quot|copy|amp)/\", \"&\\\\1\", $value );\r\n}', 1, 19, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show Affiliates / Favoured Sites box?', '', '22', 'yes_no', 'csite_fav_show', '', '0', '', '', 1, 20, '', 0, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show Affiliates / Favoured Sites box content', 'Raw HTML enabled', '22', 'textarea', 'csite_fav_contents', '', '', '', 'if ( $show == 1)\r\n{\r\n $value = preg_replace( \"/&(middot|quot|copy|amp)/\", \"&\\\\1\", $value );\r\n}', 1, 21, '', 1, '', 0);";
+
+		
+		return $SQL;
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20005/version_history.php b/upload/upgrade/upg_20005/version_history.php
new file mode 100644
index 00000000..d9a3efa6
--- /dev/null
+++ b/upload/upgrade/upg_20005/version_history.php
@@ -0,0 +1,12 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+						 '20005' => '2.0.0 PDR 5',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20005/version_upgrade.php b/upload/upgrade/upg_20005/version_upgrade.php
new file mode 100644
index 00000000..8a97efcc
--- /dev/null
+++ b/upload/upgrade/upg_20005/version_upgrade.php
@@ -0,0 +1,161 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20005';
+	var $upgrade_from = '20004';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$sql = $this->_get_sql();
+		
+		foreach( $sql as $q )
+		{
+			$DB->query( $q );
+			
+			$cnt++;
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL (ARRAY)
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_sql()
+	{
+		
+		$SQL = array();
+		
+		$SQL[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Send Bulk Mail', 'bulkmail.php', 1086706080, -1, -1, -1, -1, '61359ac93eb93ebbd935a4e275ade2db', 0, 'Dynamically assigned, no need to edit or change', 0, 'bulkmail', 1);";
+		$SQL[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Daily Topic &amp; Forum Digest', 'dailydigest.php', 1086912600, -1, -1, 0, 10, '723cab2aae32dd5d04898b1151038846', 1, 'Emails out daily topic &amp; forum digest emails', 1, 'dailydigest', 0);";
+		$SQL[] = "INSERT INTO ibf_task_manager (task_title, task_file, task_next_run, task_week_day, task_month_day, task_hour, task_minute, task_cronkey, task_log, task_description, task_enabled, task_key, task_safemode) VALUES ('Weekly Topic &amp; Forum Digest', 'weeklydigest.php', 1087096200, 0, -1, 3, 10, '7e7fccd07f781bdb24ac108d26612931', 1, 'Emails weekly topic &amp; forum digest emails', 1, 'weeklydigest', 0);";
+
+		
+		return $SQL;
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20006/version_history.php b/upload/upgrade/upg_20006/version_history.php
new file mode 100644
index 00000000..87851f86
--- /dev/null
+++ b/upload/upgrade/upg_20006/version_history.php
@@ -0,0 +1,13 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+						 '20005' => '2.0.0 PDR 5',
+						 '20006' => '2.0.0 PF 1',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20006/version_upgrade.php b/upload/upgrade/upg_20006/version_upgrade.php
new file mode 100644
index 00000000..4b98c676
--- /dev/null
+++ b/upload/upgrade/upg_20006/version_upgrade.php
@@ -0,0 +1,208 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PDR1 -> PDR 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20006';
+	var $upgrade_from = '20005';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$sql = $this->_get_sql();
+		
+		foreach( $sql as $q )
+		{
+			$DB->query( $q );
+			
+			$cnt++;
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL (ARRAY)
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_sql()
+	{
+		global $ibforums, $DB, $std;
+		
+		$SQL = array();
+		
+		if ( ! $DB->field_exists( 'subs_pkg_chosen', SQL_PREFIX.'members' ) )
+		{
+			$SQL[] = "alter table ibf_members add subs_pkg_chosen smallint(3) NOT NULL default '0';";
+		}
+		
+		$SQL[] = "alter table ibf_topic_mmod add topic_approve tinyint(1) NOT NULL default '0';";
+		$SQL[] = "alter table ibf_groups add g_attach_per_post int(10) NOT NULL default '0';";
+		$SQL[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id,conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (23,'Subscriptions Manager', 'These settings control various subscription manager features.', 3, 0, 'subsmanager');";
+		$SQL[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id,conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (24,'IPB Registration', 'This section will allow you to edit your IPB registered licence settings.', 3, 1, 'ipbreg');";
+		$SQL[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id,conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (25,'IPB Copyright Removal', 'This section allows you to manage your copyright removal key.', 2, 1, 'ipbcopyright');";
+		$SQL[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id,conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (20,'Invision Chat Settings (Legacy Version)', 'This will allow you to customize your Invision Chat integration settings for the legacy edition.', 14, 1, 'chat');";
+		$SQL[] = "INSERT INTO ibf_conf_settings_titles (conf_title_id,conf_title_title, conf_title_desc, conf_title_count, conf_title_noshow, conf_title_keyword) VALUES (21,'Invision Chat Settings', 'This will allow you to customize your Invision Chat integration settings for the new 2004 edition', 10, 1, 'chat04');";
+
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Add &#39;&lt;&#39; and &#39;&gt;&#39; to &#39;to&#39; and &#39;from&#39; addresses?', 'Some SMTP mailers require that email addresses are in the following format \'<\' address \'>\' (no quotes). If you are getting errors in the mail error log, enabled this option', '12', 'yes_no', 'mail_wrap_brackets', '', '0', '', '', 1, 6, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Account Number?', 'Removing this number will remove all links / chat functionality within IPB.\r\n', '20', 'input', 'chat_account_no', '', '', '', '', 1, 1, 'Account Specifics', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Server?', '<!--SERVER-->', '20', 'input', 'chat_server_addr', '', '', '', '', 1, 2, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Enable &#39;Who&#39;s Chatting?&#39;', 'If enabled, this will show who\'s chatting in the chat room on your forums home page underneath the active users list.', '20', 'yes_no', 'chat_who_on', '', '1', '', '', 1, 3, 'Who&#39;s Chatting', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Hide Who&#39;s Chatting when no members are logged into chat?', '', '20', 'yes_no', 'chat_hide_whoschatting', '', '1', '', '', 1, 4, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Update local list no less than every:', 'The local list is updated from the master chat server by the frequency you set and cached locally.', '20', 'dropdown', '', '', '15', '5=5\r\n10=10\r\n15=15\r\n30=30', '', 1, 5, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Changed your IPChat control panel password?', 'If you have changed your IPChat control panel password, please add the new password here. Leave blank if it\'s not changed.', '20', 'input', 'chat_pass_md5', '', '', '', '', 1, 6, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('ENTER YOUR IPCHAT CONTROL PANEL PASSWORD', 'You must enter your IPChat control panel password to allow retrieval of the Who\'s Chatting list.', '20', 'input', 'chat_pass_md5_new', '', '', '', '', 1, 7, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Dimensions (WIDTH)?', '', '20', 'input', 'chat_width', '', '600', '', '', 1, 8, 'Showing the chat room', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Dimensions (HEIGHT)?', '', '20', 'input', 'chat_height', '', '350', '', '', 1, 9, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Pop-up Window Padding? (in px)', 'Allows window to open without scrollbars', '20', 'input', 'chat_poppad', '', '50', '', '', 1, 10, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Default Chat Room Interface Language?', '', '20', 'dropdown', 'chat_language', '', 'en', 'en=English\r\nar=Arabic\r\nde=German\r\nes=Spanish\r\nfr=French\r\nhr=Croation\r\nit=Italian\r\niw=Hebrew\r\nnl=Dutch\r\npl=Polish\r\npt=Portuguese', '', 1, 11, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Load the chat room in...?', '', '20', 'dropdown', 'chat_display', '', 'self', 'self=Normal IPB Page\r\nnew=New Pop Up Window', '', 1, 9, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Allow chat access to these groups', 'You may select more than one', '20', 'multi', 'chat_access_groups', '', '', '#show_groups#', 'if ( \$save == 1)\r\n{\r\n	if ( is_array(\$POST[\'chat_access_groups\']) )\r\n	{\r\n		\$POST[\'chat_access_groups\'] = implode(\",\",\$POST[\'chat_access_groups\']);\r\n	}\r\n	else\r\n	{\r\n		\$POST[\'chat_access_groups\'] = '';\r\n	}\r\n	\r\n	\$key = \'chat_access_groups\';\r\n}if ( \$show == 1 ) { \$key=\'chat_access_groups[]\'; }', 1, 13, 'Access Permissions', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Allow ADMIN access to these groups', 'You may select more than one - please choose carefully!', '20', 'multi', 'chat_admin_groups', '', '', '#show_groups#', 'if ( \$save == 1)\r\n{\r\n	if ( is_array(\$POST[\'chat_admin_groups\']) )\r\n	{\r\n		\$POST[\'chat_admin_groups\'] = implode(\",\",\$POST[\'chat_admin_groups\']);\r\n	}\r\n	else\r\n	{\r\n		\$POST[\'chat_admin_groups\'] = '';\r\n	}\r\n	\r\n	\$key = \'chat_admin_groups\';\r\n}if ( \$show == 1 ) { \$key=\'chat_admin_groups[]\'; }', 1, 14, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Account Number?', 'Removing this number will remove all links / chat functionality within IPB.\r\n', '21', 'input', 'chat04_account_no', '', '', '', '', 1, 1, 'Account Specifics', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room URL?', '<!--SERVER-->', '21', 'input', 'chat04_whodat_server_addr', '', 'http://invision.parachat.com/cgi-bin/userlist/test', '', '', 1, 2, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Enable &#39;Who&#39;s Chatting?&#39;', 'If enabled, this will show who\'s chatting in the chat room on your forums home page underneath the active users list.', '21', 'yes_no', 'chat04_who_on', '', '1', '', '', 1, 3, 'Who&#39;s Chatting', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Hide Who&#39;s Chatting when no members are logged into chat?', '', '21', 'yes_no', 'chat04_hide_whoschatting', '', '1', '', '', 1, 4, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Update local list no less than every:', 'The local list is updated from the master chat server by the frequency you set and cached locally.', '21', 'dropdown', 'chat04_who_save', '', '1', '1=1\r\n5=5\r\n10=10\r\n15=15\r\n30=30', '', 1, 5, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Dimensions (WIDTH)?', '', '21', 'input', 'chat04_width', '', '600', '', '', 1, 8, 'Showing the chat room', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Dimensions (HEIGHT)?', '', '21', 'input', 'chat04_height', '', '350', '', '', 1, 9, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Chat Room Pop-up Window Padding? (in px)', 'Allows window to open without scrollbars', '21', 'input', 'chat04_poppad', '', '50', '', '', 1, 10, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Load the chat room in...?', '', '21', 'dropdown', 'chat04_display', '', 'self', 'self=Normal IPB Page\r\nnew=New Pop Up Window', '', 1, 9, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Allow chat access to these groups', 'You may select more than one', '21', 'multi', 'chat04_access_groups', '', '', '#show_groups#', 'if ( \$save == 1)\r\n{\r\n	if ( is_array(\$POST[\'chat04_access_groups\']) )\r\n	{\r\n		\$POST[\'chat04_access_groups\'] = implode(\",\",\$POST[\'chat04_access_groups\']);\r\n	}\r\n	else\r\n	{\r\n		\$POST[\'chat04_access_groups\'] = '';\r\n	}\r\n	\r\n	\$key = \'chat04_access_groups\';\r\n}', 1, 13, 'Access Permissions', 1, '', 1);";
+
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Allow poll creator to vote in own poll?', 'If set to \"yes\", the poll creator will have the option of voting in their own poll.', '5', 'yes_no', 'allow_creator_vote', '', '1', '', '', 1, 31, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Registration Terms &amp; Rules', 'The content of this section will be displayed before a member can register a new account.\r\n<b>HTML ENABLED</b>', '17', 'textarea', 'reg_rules', '', '<b>Forum Terms & Rules</b>\r\n\r\nPlease take a moment to review these rules detailed below. If you agree with them and wish to proceed with the registration, simply click the \"Register\" button below. To cancel this registration, simply hit the \'back\' button on your browser.\r\n\r\nPlease remember that we are not responsible for any messages posted. We do not vouch for or warrant the accuracy, completeness or usefulness of any message, and are not responsible for the contents of any message.\r\n\r\nThe messages express the views of the author of the message, not necessarily the views of this bulletin board. Any user who feels that a posted message is objectionable is encouraged to contact us immediately by email. We have the ability to remove objectionable messages and we will make every effort to do so, within a reasonable time frame, if we determine that removal is necessary.\r\n\r\nYou agree, through your use of this service, that you will not use this bulletin board to post any material which is knowingly false and/or defamatory, inaccurate, abusive, vulgar, hateful, harassing, obscene, profane, sexually oriented, threatening, invasive of a person\'s privacy, or otherwise violative of any law.\r\n\r\nYou agree not to post any copyrighted material unless the copyright is owned by you or by this bulletin board.\r\n', '', '', 1, 5, 'Registration Terms &amp; Rules', 1, '', 0);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show subscription packages when registering?', 'If enabled, the subscription packages will be shown in the registration page and the registering member will be able to select one.', '23', 'yes_no', 'subsm_show_reg', '', '1', '', '', 1, 1, 'Optional Purchase Upon Registration', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Force every member to require a subscriptions package', 'If enabled, the member must choose a package upon registration to proceed past the validating group and current members must purchase a subscription to view the board.', '23', 'yes_no', 'subsm_enforce', '', '0', '', '', 1, 2, 'Force Package Purchase', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Member group to use after registration but before package purchase?', 'If you require that every member purchases a subscription, choose a group to move the member into once they have validated their registration prior to purchasing a subscriptions manager package.\r\nMembers in this group will see the \'Purchase Subscriptions\' page when logged in and if they don\'t already have a package.', '23', 'dropdown', 'subsm_nopkg_group', '', '1', '#show_groups#', '', 1, 3, '', 1, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Reported Post Notifications sent to', 'Where do you want reported post notifications to go?', '6', 'dropdown', 'reportpost_method', '', 'pm', 'email=Email\r\npm=Personal Message', '', 1, 19, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Display registered to line?', 'If enabled, you can optionally add a \"registered to\" line at the bottom of your board.', '24', 'yes_no', 'ipb_reg_show', '', '0', '', '', 1, 2, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Show as registered to...', 'Examples: <em>Matthew Mecham</em>, <em>IPS, Inc.', '24', 'input', 'ipb_reg_name', '', '', '', '', 1, 3, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('IPB Registered Licence Key', 'This is the IPB registraton key NOT your customer code or client center password. To get your key, log into your client center and click on \'Invision Power Board\' under \'Purchased Services\'.\r\n<br />DO NOT REMOVE OR EDIT THIS KEY UNLESS YOU\'RE SURE OF WHAT YOU\'RE DOING!', '24', 'input', 'ipb_reg_number', '', '', '', '', 1, 1, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('IPB Copyright Removal Key', 'Your copyright removal key obtained from IPS.', '25', 'input', 'ipb_copy_number', '', '', '', '', 1, 1, '', 0, '', 1);";
+		$SQL[] = "INSERT INTO ibf_conf_settings (conf_title, conf_description, conf_group, conf_type, conf_key, conf_value, conf_default, conf_extra, conf_evalphp, conf_protected, conf_position, conf_start_group, conf_end_group, conf_help_key, conf_add_cache) VALUES ('Copyright Purchased?', '', '25', 'yes_no', 'ips_cp_purchase', '', '0', '', '', 1, 2, '', 0, '', 1);";
+		
+		return $SQL;
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20007/ipb_settings_partial.xml b/upload/upgrade/upg_20007/ipb_settings_partial.xml
new file mode 100644
index 00000000..6604ff60
--- /dev/null
+++ b/upload/upgrade/upg_20007/ipb_settings_partial.xml
@@ -0,0 +1,1139 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<settingexport exported="1090502939">
+	<settinggroup>
+		<setting>
+			<conf_id>188</conf_id>
+			<conf_title>Chat Room Account Number?</conf_title>
+			<conf_description>Removing this number will remove all links / chat functionality within IPB.
+</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_account_no</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Account Specifics</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>202</conf_id>
+			<conf_title>Chat Room Account Number?</conf_title>
+			<conf_description>Removing this number will remove all links / chat functionality within IPB.
+</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_account_no</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Account Specifics</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>216</conf_id>
+			<conf_title>ENABLE IPB Portal?</conf_title>
+			<conf_description><![CDATA[If 'yes', IPB Portal can be accessed via 'index.php?act=home' or via the special 'index.php' script (see documentation for more info).]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>246</conf_id>
+			<conf_title>IPB Copyright Removal Key</conf_title>
+			<conf_description>Your copyright removal key obtained from IPS.</conf_description>
+			<conf_group>25</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_copy_number</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>245</conf_id>
+			<conf_title>IPB Registered Licence Key</conf_title>
+			<conf_description><![CDATA[This is the IPB registraton key NOT your customer code or client center password. To get your key, log into your client center and click on 'Invision Power Board' under 'Purchased Services'.
+<br />DO NOT REMOVE OR EDIT THIS KEY UNLESS YOU'RE SURE OF WHAT YOU'RE DOING!]]></conf_description>
+			<conf_group>24</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_reg_number</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>239</conf_id>
+			<conf_title>Show subscription packages when registering?</conf_title>
+			<conf_description>If enabled, the subscription packages will be shown in the registration page and the registering member will be able to select one.</conf_description>
+			<conf_group>23</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>subsm_show_reg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>1</conf_position>
+			<conf_start_group>Optional Purchase Upon Registration</conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>189</conf_id>
+			<conf_title>Chat Room Server?</conf_title>
+			<conf_description><![CDATA[<!--SERVER-->]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_server_addr</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>203</conf_id>
+			<conf_title>Chat Room URL?</conf_title>
+			<conf_description><![CDATA[<!--SERVER-->]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_whodat_server_addr</conf_key>
+			<conf_value></conf_value>
+			<conf_default>http://invision.parachat.com/cgi-bin/userlist/test</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>247</conf_id>
+			<conf_title>Copyright Purchased?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>25</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>ips_cp_purchase</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>243</conf_id>
+			<conf_title>Display registered to line?</conf_title>
+			<conf_description><![CDATA[If enabled, you can optionally add a "registered to" line at the bottom of your board.]]></conf_description>
+			<conf_group>24</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>ipb_reg_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>240</conf_id>
+			<conf_title>Force every member to require a subscriptions package</conf_title>
+			<conf_description>If enabled, the member must choose a package upon registration to proceed past the validating group and current members must purchase a subscription to view the board.</conf_description>
+			<conf_group>23</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>subsm_enforce</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group>Force Package Purchase</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>217</conf_id>
+			<conf_title>IPB Portal Page Title?</conf_title>
+			<conf_description><![CDATA[This will appear inbetween the &lt;title&gt; elements on the page]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_title</conf_key>
+			<conf_value></conf_value>
+			<conf_default>IPB Portal</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>223</conf_id>
+			<conf_title>Date format for articles</conf_title>
+			<conf_description><![CDATA[<a href='http://www.php.net/date'>Same as PHP's date function]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_date</conf_key>
+			<conf_value></conf_value>
+			<conf_default>m-j-y H:i</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>190</conf_id>
+			<conf_title><![CDATA[Enable &#39;Who&#39;s Chatting?&#39;]]></conf_title>
+			<conf_description><![CDATA[If enabled, this will show who's chatting in the chat room on your forums home page underneath the active users list.]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat_who_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group><![CDATA[Who&#39;s Chatting]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>204</conf_id>
+			<conf_title><![CDATA[Enable &#39;Who&#39;s Chatting?&#39;]]></conf_title>
+			<conf_description><![CDATA[If enabled, this will show who's chatting in the chat room on your forums home page underneath the active users list.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_who_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group><![CDATA[Who&#39;s Chatting]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>218</conf_id>
+			<conf_title>Forums to export articles from</conf_title>
+			<conf_description><![CDATA[Separate <b>forum ids</b> with a comma for more than one]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_forum</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>241</conf_id>
+			<conf_title>Member group to use after registration but before package purchase?</conf_title>
+			<conf_description><![CDATA[If you require that every member purchases a subscription, choose a group to move the member into once they have validated their registration prior to purchasing a subscriptions manager package.
+Members in this group will see the 'Purchase Subscriptions' page when logged in and if they don't already have a package.]]></conf_description>
+			<conf_group>23</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>subsm_nopkg_group</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>244</conf_id>
+			<conf_title>Show as registered to...</conf_title>
+			<conf_description><![CDATA[Examples: <em>Matthew Mecham</em>, <em>IPS, Inc.]]></conf_description>
+			<conf_group>24</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_reg_name</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>191</conf_id>
+			<conf_title><![CDATA[Hide Who&#39;s Chatting when no members are logged into chat?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat_hide_whoschatting</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>205</conf_id>
+			<conf_title><![CDATA[Hide Who&#39;s Chatting when no members are logged into chat?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_hide_whoschatting</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>219</conf_id>
+			<conf_title>Number of Articles to display in the main section</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>15</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>220</conf_id>
+			<conf_title>Enable Recent Articles?</conf_title>
+			<conf_description>This will show a list of recent topic titles on the IPB Portal page</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_article_recent_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group>IPB Portal Recent Articles</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>238</conf_id>
+			<conf_title><![CDATA[Registration Terms &amp; Rules]]></conf_title>
+			<conf_description><![CDATA[The content of this section will be displayed before a member can register a new account.
+<b>HTML ENABLED</b>]]></conf_description>
+			<conf_group>17</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>reg_rules</conf_key>
+			<conf_value></conf_value>
+			<conf_default><![CDATA[<b>Forum Terms & Rules</b>
+
+Please take a moment to review these rules detailed below. If you agree with them and wish to proceed with the registration, simply click the "Register" button below. To cancel this registration, simply hit the 'back' button on your browser.
+
+Please remember that we are not responsible for any messages posted. We do not vouch for or warrant the accuracy, completeness or usefulness of any message, and are not responsible for the contents of any message.
+
+The messages express the views of the author of the message, not necessarily the views of this bulletin board. Any user who feels that a posted message is objectionable is encouraged to contact us immediately by email. We have the ability to remove objectionable messages and we will make every effort to do so, within a reasonable time frame, if we determine that removal is necessary.
+
+You agree, through your use of this service, that you will not use this bulletin board to post any material which is knowingly false and/or defamatory, inaccurate, abusive, vulgar, hateful, harassing, obscene, profane, sexually oriented, threatening, invasive of a person's privacy, or otherwise violative of any law.
+
+You agree not to post any copyrighted material unless the copyright is owned by you or by this bulletin board.
+]]></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group><![CDATA[Registration Terms &amp; Rules]]></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>192</conf_id>
+			<conf_title>Update local list no less than every:</conf_title>
+			<conf_description>The local list is updated from the master chat server by the frequency you set and cached locally.</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat_refresh_list</conf_key>
+			<conf_value></conf_value>
+			<conf_default>15</conf_default>
+			<conf_extra>5=5
+10=10
+15=15
+30=30</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>206</conf_id>
+			<conf_title>Update local list no less than every:</conf_title>
+			<conf_description>The local list is updated from the master chat server by the frequency you set and cached locally.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_who_save</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra>1=1
+5=5
+10=10
+15=15
+30=30</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>193</conf_id>
+			<conf_title>Changed your IPChat control panel password?</conf_title>
+			<conf_description><![CDATA[If you have changed your IPChat control panel password, please add the new password here. Leave blank if it's not changed.]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_pass_md5</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>221</conf_id>
+			<conf_title>Max. no recent articles to show</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_recent_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>5</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>194</conf_id>
+			<conf_title>ENTER YOUR IPCHAT CONTROL PANEL PASSWORD</conf_title>
+			<conf_description><![CDATA[You must enter your IPChat control panel password to allow retrieval of the Who's Chatting list.]]></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_pass_md5_new</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>222</conf_id>
+			<conf_title>Max. length of topic titles</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_article_len</conf_key>
+			<conf_value></conf_value>
+			<conf_default>30</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>7</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>195</conf_id>
+			<conf_title>Chat Room Dimensions (WIDTH)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_width</conf_key>
+			<conf_value></conf_value>
+			<conf_default>600</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Showing the chat room</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>209</conf_id>
+			<conf_title>Chat Room Dimensions (WIDTH)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_width</conf_key>
+			<conf_value></conf_value>
+			<conf_default>600</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Showing the chat room</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>196</conf_id>
+			<conf_title>Chat Room Dimensions (HEIGHT)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_height</conf_key>
+			<conf_value></conf_value>
+			<conf_default>350</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>210</conf_id>
+			<conf_title>Chat Room Dimensions (HEIGHT)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_height</conf_key>
+			<conf_value></conf_value>
+			<conf_default>350</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>224</conf_id>
+			<conf_title>Enable Recent Discussions</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_discuss_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group>IPB Portal Recent Discussions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>199</conf_id>
+			<conf_title>Load the chat room in...?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat_display</conf_key>
+			<conf_value></conf_value>
+			<conf_default>self</conf_default>
+			<conf_extra>self=Normal IPB Page
+new=New Pop Up Window</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>213</conf_id>
+			<conf_title>Load the chat room in...?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_display</conf_key>
+			<conf_value></conf_value>
+			<conf_default>self</conf_default>
+			<conf_extra>self=Normal IPB Page
+new=New Pop Up Window</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>197</conf_id>
+			<conf_title>Chat Room Pop-up Window Padding? (in px)</conf_title>
+			<conf_description>Allows window to open without scrollbars</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat_poppad</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>211</conf_id>
+			<conf_title>Chat Room Pop-up Window Padding? (in px)</conf_title>
+			<conf_description>Allows window to open without scrollbars</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_poppad</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>225</conf_id>
+			<conf_title>Max. no recent discussions to show</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_discuss_max</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>198</conf_id>
+			<conf_title>Default Chat Room Interface Language?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat_language</conf_key>
+			<conf_value></conf_value>
+			<conf_default>en</conf_default>
+			<conf_extra>en=English
+ar=Arabic
+de=German
+es=Spanish
+fr=French
+hr=Croation
+it=Italian
+iw=Hebrew
+nl=Dutch
+pl=Polish
+pt=Portuguese</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>226</conf_id>
+			<conf_title>Max. length of topic titles</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_discuss_len</conf_key>
+			<conf_value></conf_value>
+			<conf_default>30</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>227</conf_id>
+			<conf_title>Show User / Guest Info box?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_pm_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group>IPB Portal Components</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>200</conf_id>
+			<conf_title>Allow chat access to these groups</conf_title>
+			<conf_description>You may select more than one</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>chat_access_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat_access_groups']) )
+	{
+		$_POST['chat_access_groups'] = implode(",",$_POST['chat_access_groups']);
+	}
+	else
+	{
+		$_POST['chat_access_groups'] = "";
+	}
+	
+	$key = 'chat_access_groups';
+}
+if ( $show == 1 )
+{
+    $key='chat_access_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group>Access Permissions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>214</conf_id>
+			<conf_title>Allow chat access to these groups</conf_title>
+			<conf_description>You may select more than one</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key><![CDATA[chat04_access_groups[]]]></conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat04_access_groups']) )
+	{
+		$_POST['chat04_access_groups'] = implode(",",$_POST['chat04_access_groups']);
+	}
+	else
+	{
+		$_POST['chat04_access_groups'] = "";
+	}
+	
+	$key = 'chat04_access_groups';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group>Access Permissions</conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>228</conf_id>
+			<conf_title>Show online users?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_online_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>13</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>201</conf_id>
+			<conf_title>Allow ADMIN access to these groups</conf_title>
+			<conf_description>You may select more than one - please choose carefully!</conf_description>
+			<conf_group>20</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>chat_admin_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat_admin_groups']) )
+	{
+		$_POST['chat_admin_groups'] = implode(",",$_POST['chat_admin_groups']);
+	}
+	else
+	{
+		$_POST['chat_admin_groups'] = "";
+	}
+	
+	$key = 'chat_admin_groups';
+}
+if ( $show == 1 )
+{
+    $key='chat_admin_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>229</conf_id>
+			<conf_title>Show search box?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_search_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>230</conf_id>
+			<conf_title>Enable skin selection choice dropdown?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_skinchange_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>15</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>232</conf_id>
+			<conf_title>Enter URL to poll topic for inclusion</conf_title>
+			<conf_description>Leave blank to not show a poll or the poll box</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>csite_poll_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>233</conf_id>
+			<conf_title>Show Site Navigation Menu?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_nav_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>242</conf_id>
+			<conf_title>Reported Post Notifications sent to</conf_title>
+			<conf_description>Where do you want reported post notifications to go?</conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>reportpost_method</conf_key>
+			<conf_value></conf_value>
+			<conf_default>pm</conf_default>
+			<conf_extra>email=Email
+pm=Personal Message</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>234</conf_id>
+			<conf_title>Site Navigation Menu Links</conf_title>
+			<conf_description><![CDATA[One per line in this format<br>http://www.apple.com [Apple's Website]<br><br>{board_url} will convert into your board]]></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>csite_nav_contents</conf_key>
+			<conf_value></conf_value>
+			<conf_default><![CDATA[{board_url} [Forums]
+{board_url}act=Search&CODE=getactive [Today's Active Topics]
+{board_url}act=Stats [Today's Top 10 Posters]
+{board_url}act=Stats&CODE=leaders [Contact Staff]]]></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp><![CDATA[if ( $show == 1)
+{
+    $value = preg_replace( "/&(middot|quot|copy|amp)/", "&\\1", $value );
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>235</conf_id>
+			<conf_title>Show Affiliates / Favoured Sites box?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>csite_fav_show</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>20</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>236</conf_id>
+			<conf_title>Show Affiliates / Favoured Sites box content</conf_title>
+			<conf_description>Raw HTML enabled</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>csite_fav_contents</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp><![CDATA[if ( $show == 1)
+{
+ $value = preg_replace( "/&(middot|quot|copy|amp)/", "&\\1", $value );
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>21</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>237</conf_id>
+			<conf_title>Allow poll creator to vote in own poll?</conf_title>
+			<conf_description><![CDATA[If set to "yes", the poll creator will have the option of voting in their own poll.]]></conf_description>
+			<conf_group>5</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>allow_creator_vote</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>31</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+	</settinggroup>
+
+</settingexport>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20007/version_history.php b/upload/upgrade/upg_20007/version_history.php
new file mode 100644
index 00000000..6482e6a8
--- /dev/null
+++ b/upload/upgrade/upg_20007/version_history.php
@@ -0,0 +1,14 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+						 '20005' => '2.0.0 PDR 5',
+						 '20006' => '2.0.0 PF 1',
+						 '20007' => '2.0.0 PF 2',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20007/version_upgrade.php b/upload/upgrade/upg_20007/version_upgrade.php
new file mode 100644
index 00000000..aa9c2c16
--- /dev/null
+++ b/upload/upgrade/upg_20007/version_upgrade.php
@@ -0,0 +1,159 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PF1 -> PF 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20007';
+	var $upgrade_from = '20006';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$sql = $this->_get_sql();
+		
+		foreach( $sql as $q )
+		{
+			$DB->query( $q );
+			
+			$cnt++;
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL (ARRAY)
+	/*-------------------------------------------------------------------------*/
+	
+	function _get_sql()
+	{
+		global $ibforums, $DB, $std;
+		
+		$SQL = array();
+		
+		$SQL[] = "INSERT INTO ibf_custom_bbcode (bbcode_title, bbcode_desc, bbcode_tag, bbcode_replace, bbcode_useoption, bbcode_example) VALUES ('CODEBOX', 'Use this BBCode tag to show a scrolling codebox. Useful for long sections of code.', 'codebox', '<div class=\'codetop\'>CODE</div><div class=\'codemain\' style=\'height:200px;white-space:pre;overflow:auto\'>{content}</div>', 0, '[codebox]long_code_here = '';[/codebox]');";
+				
+		return $SQL;
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20008/ipb_settings_partial.xml b/upload/upgrade/upg_20008/ipb_settings_partial.xml
new file mode 100644
index 00000000..84b68061
--- /dev/null
+++ b/upload/upgrade/upg_20008/ipb_settings_partial.xml
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<settingexport exported="1092402393">
+	<settinggroup>
+		<setting>
+			<conf_id>253</conf_id>
+			<conf_title>Chat Room Type</conf_title>
+			<conf_description>This is the type of chat service you purchased</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_servicetype</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>advanced=Advanced
+premium=Premium</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>252</conf_id>
+			<conf_title>Default Chat Room</conf_title>
+			<conf_description>This is the room that your chat users will be logged into first</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_default_room</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>2</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>203</conf_id>
+			<conf_title>Chat Room URL?</conf_title>
+			<conf_description><![CDATA[<!--SERVER-->]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_whodat_server_addr</conf_key>
+			<conf_value></conf_value>
+			<conf_default>--Not currently required--</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>204</conf_id>
+			<conf_title><![CDATA[Enable &#39;Who&#39;s Chatting?&#39;]]></conf_title>
+			<conf_description><![CDATA[If enabled, this will show who's chatting in the chat room on your forums home page underneath the active users list.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_who_on</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>4</conf_position>
+			<conf_start_group><![CDATA[Who&#39;s Chatting]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>205</conf_id>
+			<conf_title><![CDATA[Hide Who&#39;s Chatting when no members are logged into chat?]]></conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_hide_whoschatting</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>5</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>262</conf_id>
+			<conf_title>Enable X_FORWARDED_FOR IP matching?</conf_title>
+			<conf_description><![CDATA[If enabled, this will check the X_FORWARDED_FOR headers to match the user's IP address. This is useful in a intranet situation if the REMOTE_ADDR will be the same across the network. It will also help maintain AOL sessions but can be abused to forge incorrect headers to report an incorrect IP address. If unsure, leave off.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>xforward_matching</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>206</conf_id>
+			<conf_title>Update local list no less than every:</conf_title>
+			<conf_description>The local list is updated from the master chat server by the frequency you set and cached locally. In minutes.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_who_save</conf_key>
+			<conf_value></conf_value>
+			<conf_default>2</conf_default>
+			<conf_extra>2=2
+5=5
+10=10
+15=15
+30=30</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>6</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>209</conf_id>
+			<conf_title>Chat Room Dimensions (WIDTH)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_width</conf_key>
+			<conf_value></conf_value>
+			<conf_default>600</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Showing the chat room</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>248</conf_id>
+			<conf_title>Moderators can ban via warn panel?</conf_title>
+			<conf_description><![CDATA[Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_mod_ban</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group>Forum Moderator Permissions</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>210</conf_id>
+			<conf_title>Chat Room Dimensions (HEIGHT)?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_height</conf_key>
+			<conf_value></conf_value>
+			<conf_default>350</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>249</conf_id>
+			<conf_title>Moderators can mod queue members via warn panel?</conf_title>
+			<conf_description><![CDATA[Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_mod_modq</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>9</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>50</conf_id>
+			<conf_title><![CDATA[Auto prune all topic subscriptions if the topic has no replies over [x] days]]></conf_title>
+			<conf_description>Leave blank or enter 0 for no auto prune limit</conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>subs_autoprune</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group><![CDATA[Topic &amp; Forum Subscriptions]]></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key>0</conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>254</conf_id>
+			<conf_title>Default Chat Room Language</conf_title>
+			<conf_description>This is the default language used for the chat user inteface (buttons and labels, etc)</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_default_lang</conf_key>
+			<conf_value></conf_value>
+			<conf_default>english.conf</conf_default>
+			<conf_extra>english.conf=English
+spanish.conf=Spanish
+portuguese.conf=Portuguese
+italian.conf=Italian
+french.conf=French
+german.conf=German</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>250</conf_id>
+			<conf_title>Moderators can remove post rights via warn panel?</conf_title>
+			<conf_description><![CDATA[Applies to those moderators allowed to use the warning system<br />Admins can automatically do this via the warn panel.]]></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>warn_mod_post</conf_key>
+			<conf_value></conf_value>
+			<conf_default>1</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>10</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>263</conf_id>
+			<conf_title>Automatically subscribe to every forum</conf_title>
+			<conf_description><![CDATA[Please choose which user groups you'd like to automatically be subscribed for email notification of <b>new</b> topics (not replies) in every forum available to them. This means that members having a selected PRIMARY group will be emailed everytime there is a new topic and they are not online to view it.<br /><b>Note</b> This will only send the email to those who have chosen to 'Allow emails from the administrators'.]]></conf_description>
+			<conf_group>4</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>autoforum_sub_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['autoforum_sub_groups']) )
+	{
+		$_POST['autoforum_sub_groups'] = implode(",",$_POST['autoforum_sub_groups']);
+	}
+	else
+	{
+		$_POST['autoforum_sub_groups'] = "";
+	}
+	
+	$key = 'autoforum_sub_groups';
+}
+if ( $show == 1 )
+{
+    $key='autoforum_sub_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>255</conf_id>
+			<conf_title><![CDATA[Enable &quot;Plain Mode&quot;?]]></conf_title>
+			<conf_description><![CDATA["Plain mode" removes the colored chat text from your Invision Power Chat Advanced room(s), and implements single-colored (non-GUI) chat text. This will disable the graphic emoticons and click-able URLs.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>chat04_plainmode</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>251</conf_id>
+			<conf_title>Number of times per day a moderator can warn a single member</conf_title>
+			<conf_description></conf_description>
+			<conf_group>13</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>warn_mod_day</conf_key>
+			<conf_value></conf_value>
+			<conf_default>3</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>11</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>213</conf_id>
+			<conf_title>Load the chat room in...?</conf_title>
+			<conf_description></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>dropdown</conf_type>
+			<conf_key>chat04_display</conf_key>
+			<conf_value></conf_value>
+			<conf_default>self</conf_default>
+			<conf_extra>self=Normal IPB Page
+new=New Pop Up Window</conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>12</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>211</conf_id>
+			<conf_title>Chat Room Pop-up Window Padding? (in px)</conf_title>
+			<conf_description>Allows window to open without scrollbars</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_poppad</conf_key>
+			<conf_value></conf_value>
+			<conf_default>50</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>14</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>256</conf_id>
+			<conf_title>Applet: Background Color</conf_title>
+			<conf_description>To change your chat applet background color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_applet_bg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#BCD0ED</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>16</conf_position>
+			<conf_start_group>Chat Room Style Options</conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>257</conf_id>
+			<conf_title>Applet: Foreground Color</conf_title>
+			<conf_description>To change your chat applet foreground color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_applet_fg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#345487</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>258</conf_id>
+			<conf_title>Chat Window: Background Color</conf_title>
+			<conf_description>To change your chat window background color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_window_bg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#F5F9FD</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>259</conf_id>
+			<conf_title>Chat Window: Foreground Color</conf_title>
+			<conf_description>To change your chat window foreground color select any RGB value.</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_window_fg</conf_key>
+			<conf_value></conf_value>
+			<conf_default>#345487</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>17</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>261</conf_id>
+			<conf_title>Additional PARAM information</conf_title>
+			<conf_description><![CDATA[Use this field to enter any custom param tags for the chat applet.
+Example:<br />
+&lt;param name="cmd.BeepEnter" value="true"&gt;
+<br />&lt;param name="cmd.BeepLeave" value="true"&gt;
+<br />Please refer to the Invision Chat documentation for more info.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>textarea</conf_type>
+			<conf_key>chat04_customparams</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>110</conf_id>
+			<conf_title>Remove chr(0xCA) from input?</conf_title>
+			<conf_description><![CDATA[Can be used as a 'hidden' space to emulate registered names - but can cause problems in non Western character sets.]]></conf_description>
+			<conf_group>6</conf_group>
+			<conf_type>yes_no</conf_type>
+			<conf_key>strip_space_chr</conf_key>
+			<conf_value></conf_value>
+			<conf_default>0</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>18</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>260</conf_id>
+			<conf_title>Chat Room Font Size</conf_title>
+			<conf_description><![CDATA[To customize your font size replace "10" to whatever numeric value you wish.]]></conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>chat04_style_font_size</conf_key>
+			<conf_value></conf_value>
+			<conf_default>10</conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>19</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>214</conf_id>
+			<conf_title>Allow chat access to these groups</conf_title>
+			<conf_description>You may select more than one</conf_description>
+			<conf_group>21</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>chat04_access_groups</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_groups#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['chat04_access_groups']) )
+	{
+		$_POST['chat04_access_groups'] = implode(",",$_POST['chat04_access_groups']);
+	}
+	else
+	{
+		$_POST['chat04_access_groups'] = "";
+	}
+	
+	$key = 'chat04_access_groups';
+}
+if ( $show == 1 )
+{
+$key = 'chat04_access_groups[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>25</conf_position>
+			<conf_start_group>Access Permissions</conf_start_group>
+			<conf_end_group>1</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+	</settinggroup>
+
+</settingexport>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20008/mysql_updates.php b/upload/upgrade/upg_20008/mysql_updates.php
new file mode 100644
index 00000000..d5acf30e
--- /dev/null
+++ b/upload/upgrade/upg_20008/mysql_updates.php
@@ -0,0 +1,5 @@
+<?php
+
+//$SQL[] = "UPDATE blah..";					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20008/version_history.php b/upload/upgrade/upg_20008/version_history.php
new file mode 100644
index 00000000..58be5bdb
--- /dev/null
+++ b/upload/upgrade/upg_20008/version_history.php
@@ -0,0 +1,15 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+						 '20005' => '2.0.0 PDR 5',
+						 '20006' => '2.0.0 PF 1',
+						 '20007' => '2.0.0 PF 2',
+						 '20008' => '2.0.0 PF 3',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20008/version_upgrade.php b/upload/upgrade/upg_20008/version_upgrade.php
new file mode 100644
index 00000000..f0771693
--- /dev/null
+++ b/upload/upgrade/upg_20008/version_upgrade.php
@@ -0,0 +1,149 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PF1 -> PF 2
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20008';
+	var $upgrade_from = '20007';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$SQL = array();
+		
+		if ( file_exists( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/'.strtolower($ibforums->vars['sql_driver']).'_updates.php' ) )
+		{
+			require_once( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/'.strtolower($ibforums->vars['sql_driver']).'_updates.php' );
+		
+			foreach( $SQL as $q )
+			{
+				$DB->query( $q );
+				
+				$cnt++;
+			}
+		}
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20009/components.php b/upload/upgrade/upg_20009/components.php
new file mode 100644
index 00000000..d03b6721
--- /dev/null
+++ b/upload/upgrade/upg_20009/components.php
@@ -0,0 +1,1356 @@
+<?php
+
+$WRAPPER = <<<EOF
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
+<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head> 
+<title><% TITLE %></title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
+<% GENERATOR %> 
+<% CSS %> 
+<% JAVASCRIPT %> 
+</head> 
+<body>
+<div id="ipbwrapper">
+<% BOARD HEADER %>
+<% MEMBER BAR %>
+<% NAVIGATION %>
+<!--IBF.NEWPMBOX-->
+<% BOARD %>
+<% BOARD FOOTER %>
+<% STATS %> 
+<% COPYRIGHT %>
+</div>
+</body> 
+</html>
+EOF;
+
+
+$CSS = <<<EOF
+/* 
+ * Cascading Style Sheet(CSS 467), for Invision Power Board 2.0.0
+ * Author: James A. Mathias, admin@leihu.com, http://www.1lotus.com 
+ * Copyright: 2004 Invision Power Services, all rights reserved 
+ *
+ * All style attributes in alpha-numeric order starting from 0
+ *
+ */
+
+/* 
+ * ========================================
+ * global element styles 
+ * ========================================
+ */
+
+html{
+	overflow-x: auto; /* fixes MSIE scrollbar bug DO NOT REMOVE, has no effect in Mozilla, or Opera */
+}
+
+body{ 
+	background: #FFF;
+	color: #222;
+	font-family: Verdana, Tahoma, Arial, Trebuchet MS, Sans-Serif, Georgia, Courier, Times New Roman, Serif;
+	font-size: 11px;
+	line-height: 135%;
+	margin: 0;
+	padding: 0; /* required for Opera to have 0 margin */
+	text-align: center; /* centers board in MSIE */
+}
+
+table,
+tr,
+td{ /* required for text in tables, because tables do not inherit from body */
+	background: transparent;
+	color: #222;
+	font-size: 11px;
+	line-height: 135%;
+}
+
+table{ /* makes all tables 100% wide */
+	width: 100%;
+}
+
+td,
+.divpad{ /* gives all tables faux cellpadding of 5px */
+	padding: 5px;
+}
+
+td.nopad{ /* allows some tables to have no padding on the td */
+	padding: 0;
+}
+
+form{
+	display: inline;
+	margin: 0; /* removes mystery form tag gapping */
+	padding: 0; /* removes mystery form tag gapping */
+}
+
+img{
+	border: 0; /* makes sure linked images do not have a border */
+	vertical-align: middle;
+}
+
+/* 
+ * ========================================
+ * global hyperlink styles 
+ * ========================================
+ */
+
+a:link,
+a:visited,
+a:active{
+	background: transparent;
+	color: #222;
+	text-decoration: underline;
+}
+
+a:hover{
+	background: transparent;
+	color: #34498B;
+}
+
+/* 
+ * ========================================
+ * Main wrapper, this controls the overall width of the board in you browser view window. 
+ * ========================================
+ */
+
+#ipbwrapper{ 
+	margin: 20px auto 20px auto; /* centers the box, no matter the overall width, also applies a 20px gap at the top and bottom of the board */
+	text-align: left; /* re_aligns text to left second part of two part MSIE centering workaround */
+	/* EDIT THIS TO CHANGE THE WIDTH OF THE BOARD -> 750px is a common fixed resolution size */
+	width: 98%;
+}
+
+/* 
+ * ========================================
+ * styles for pagination links 
+ * ========================================
+ */
+ 
+
+.pagelink,
+.pagelinklast,
+.pagecurrent,
+.minipagelink,
+.minipagelinklast{
+	background: #F0F5FA;
+	border: 1px solid #072A66;
+	padding: 1px 3px 1px 3px;
+}
+
+.pagelinklast,
+.minipagelinklast{
+	background: #DFE6EF;
+}
+
+
+.pagecurrent{
+	background: #FFC9A5;
+}
+
+.minipagelink,
+.minipagelinklast{
+	border: 1px solid #C2CFDF;
+	font-size: 10px;
+	margin: 0 1px 0 0;
+}
+
+.pagelink a:active,
+.pagelink a:visited,
+.pagelink a:link,
+.pagelinklast a:active,
+.pagelinklast a:visited,
+.pagelinklast a:link,
+.pagecurrent a:active,
+.pagecurrent a:visited,
+.pagecurrent a:link,
+.minipagelink a:active,
+.minipagelink a:visited,
+.minipagelink a:link,
+.minipagelinklast a:active,
+.minipagelinklast a:visited,
+.minipagelinklast a:link{
+	text-decoration: none;
+}
+
+/* fake button effect for some links */
+.fauxbutton{
+	background: #BFCDE0;
+	border: 1px solid #072A66;
+	font-size: 11px;
+	font-weight: bold;
+	padding: 4px;
+}
+
+.fauxbutton a:link,
+.fauxbutton a:visited,
+.fauxbutton a:active{
+	color: #222 !important;
+	text-decoration: none;
+}
+
+.forumdesc,
+.forumdesc a:link,
+.forumdesc a:visited,
+.forumdesc a:active{ 
+	background: transparent;
+	font-size: 10px; 
+	color: #666;
+	line-height: 135%;
+	margin: 2px 0 0 0;
+	padding: 0;
+}
+
+/* =================================================================================== */
+/* =================================================================================== */
+/* =================================================================================== */
+
+.searchlite {
+	background-color:yellow;
+	font-weight:bold;
+	color: red;
+}
+
+.activeusers{
+	background: #FFF;
+	border: 1px solid #072A66;
+	color: #000;
+	margin: 0px;
+	padding: 1px;
+}
+
+.activeuserposting a:link,
+.activeuserposting a:visited,
+.activeuserposting a:active,
+.activeuserposting
+{
+	font-style:italic;
+	text-decoration: none;
+	border-bottom:1px dotted black;
+}
+
+fieldset.search{ 
+	line-height: 150%;
+	padding: 6px; 
+}
+
+label{ 
+	cursor: pointer; 
+}
+
+img.attach{ 
+	background: #808080 url(<#IMG_DIR#>/click2enlarge.gif) no-repeat top right;
+	border: 1px solid #808080;
+	margin: 0 2px 0 0;
+	padding: 11px 2px 2px 2px;
+}
+
+.thumbwrap,
+.thumbwrapp,
+.fullimagewrap{
+	border: 1px solid #072A66;
+	margin: 2px;
+}
+
+.thumbwrapp{
+	border: 2px solid #660707;
+}
+
+.fullimagewrap{
+	background: #F5F9FD;
+	text-align: center;
+	margin: 5px 0 5px 0;
+	padding: 5px;
+}
+
+.thumbwrap h4,
+.thumbwrapp h4{	
+	background: #DDE6F2;
+	border: 0 !important;
+	border-bottom: 1px solid #5176B5 !important;
+	color: #5176B5; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.thumbwrap p,
+.thumbwrapp p{
+	background: #EEF2F7 !important;
+	border: 0 !important;
+	border-top: 1px solid #5176B5 !important;
+	margin: 0 !important;
+	padding: 5px !important;
+	text-align: left;
+}
+
+.thumbwrap p.alt,
+.thumbwrapp p.alt{
+	background: #DFE6EF !important;
+	margin: 0 !important;
+	padding: 5px !important;
+	text-align: left;
+}
+
+.thumbwrapp p.pin{
+	background: #EFDFDF !important;
+	text-align: center !important;
+}
+	
+.thumbwrap img.galattach,
+.thumbwrapp img.galattach{
+	background: #FFF url(<#IMG_DIR#>/img_larger.gif) no-repeat bottom right;
+	border: 1px solid #072A66;
+	margin: 5px;
+	padding: 2px 2px 10px 2px;
+}
+
+li.helprow{ 
+	margin: 0 0 10px 0;
+	padding: 0; 
+}
+
+ul#help{ 
+	padding: 0 0 0 15px; 
+}
+
+.warngood,
+.warnbad{ 
+	color: #0B9500;
+	font-weight: bold;
+}
+
+.warnbad{ 
+	color: #DD0000;
+}
+
+#padandcenter{ 
+	margin: 0 auto 0 auto;
+	padding: 14px 0 14px 0;
+	text-align: center;
+}
+
+#profilename{ 
+	font-size: 28px; 
+	font-weight: bold; 
+}
+
+#photowrap{ 
+	padding: 6px; 
+}
+
+#phototitle{ 
+	border-bottom: 1px solid #000; 
+	font-size: 24px; 
+}
+
+#photoimg{ 
+	margin: 15px 0 0 0;
+	text-align: center; 
+} 
+
+#ucpmenu,
+#ucpcontent{ 
+	background: #F5F9FD;
+	border: 1px solid #345487;
+	line-height: 150%;
+}
+
+#ucpmenu p{ 
+	margin: 0; 
+	padding: 2px 5px 6px 9px;
+}
+
+#ucpmenu a:link, 
+#ucpmenu a:active, 
+#ucpmenu a:visited{ 
+	text-decoration: none; 
+}
+
+#ucpcontent{ 
+	width: auto;
+}
+
+#ucpcontent p{ 
+	margin: 0;
+	padding: 10px;
+}
+
+.activeuserstrip{ 
+	background: #BCD0ED;
+	padding: 6px;
+}
+
+/* Topic View elements */
+.signature{  
+	background: transparent;
+	color: #339; 
+	font-size: 10px;
+	line-height: 150%;
+}
+
+.postdetails{ 
+	font-size: 10px;
+	line-height:140%;
+}
+
+.postcolor{ 
+	font-size: 12px; 
+	line-height: 160%;
+}
+
+.normalname{ 
+	color: #003;
+	font-size: 12px; 
+	font-weight: bold; 
+}
+
+.normalname a:link, 
+.normalname a:visited, 
+.normalname a:active{ 
+	font-size: 12px;
+}
+
+.post1,
+.bg1{ 
+	background: #F5F9FD;
+}
+
+.post2,
+.bg3{ 
+	background: #EEF2F7;
+}
+
+.row2shaded,
+.post1shaded { background-color: #DEDBE4 }
+.row4shaded,
+.post2shaded { background-color: #E3DFE7 }
+
+.row1{ 
+	background: #DFE6EF; 
+}
+
+.row2{ 
+	background: #E4EAF2; 
+}
+
+.darkrow1{ 
+	background: #BCD0ED;
+	color: #3A4F6C; 
+}
+
+.darkrow3{ 
+	background: #D1DCEB; 
+	color: #3A4F6C; 
+}
+
+/* tableborders gives the white column / row lines effect */
+.plainborder,
+.tablefill,
+.tablepad{ 
+	background: #F5F9FD;
+	border: 1px solid #345487;
+}
+
+.tablefill,
+.tablepad{ 
+	padding: 6px;  
+}
+
+.tablepad{ 
+	border: 0 !important;
+}
+
+.wrapmini{ 
+	float: left;
+	line-height: 1.5em;
+	width: 25%;
+}
+
+.pagelinks{
+	float: left;
+	line-height: 1.2em;
+	width: 35%;
+}
+
+.desc{ 
+	font-size: 11px; 
+	color: #434951;
+}
+
+.lastaction
+{
+	font-size: 10px; 
+	color: #434951;
+}
+
+.edit{ 
+	font-size: 9px;
+}
+
+.thin{ 
+	border: 1px solid #FFF;
+	border-left: 0;
+	border-right: 0;
+	line-height: 150%;
+	margin: 2px 0 2px 0;
+	padding: 6px 0 6px 0;
+}
+
+/* =================================================================================== */
+/* =================================================================================== */
+/* =================================================================================== */
+
+/* 
+ * ========================================
+ * calendar styles 
+ * ========================================
+ */
+	
+.calmonths{ 
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	font-size: 18px; 
+	font-weight: bold; 
+	margin: 5px 0 5px 0;
+	padding: 8px;
+	text-align: center;
+}
+
+.weekday{
+	font-size: 14px;
+	font-weight: bold;
+}
+
+.calmonths a{
+	text-decoration: none;
+}
+
+.calday,
+.calweekday{ 
+	background: #DFE6EF;
+	color: #666;
+	font-size: 11px;
+	font-weight: bold;
+	margin: 0;
+	padding: 4px;
+	text-align: right;
+}
+
+.calweekday{
+	border-right: 1px solid #AAA;
+	color: #222;
+	font-size: 14px;
+	padding: 6px;
+	text-align: center;
+}
+
+.cellblank,
+.celldate,
+.celltoday,
+.mcellblank,
+.mcelldate,
+.mcelltoday{
+	background: #EEF2F7;
+	height: 100px;
+	margin: 0;
+	padding: 0;
+	vertical-align: top;
+}
+
+.mcellblank,
+.mcelldate,
+.mcelltoday{
+	height: auto;
+}
+
+.cellblank,
+.mcellblank{
+	background: #C2CFDF;
+}
+
+.celltoday,
+.mcelltoday{
+	border: 2px solid #8B0000;
+}
+
+/* 
+ * ========================================
+ * form styles 
+ * ========================================
+ */
+
+input,
+textarea,
+select{
+	background: #FFF;
+	border: 1px solid #4C77B6;
+	color: #000;
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 11px;
+	margin: 5px;
+	padding: 2px;
+	vertical-align: middle;
+}
+
+select{
+	border: 0;
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 12px;
+	margin: 0;
+	padding: 0;
+}
+
+input.button{
+	margin: 0;
+	width: auto;
+}
+
+optgroup option{
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 12px;
+}
+
+.codebuttons{ 
+	font-family: Verdana, Helvetica, Sans-Serif; 
+	font-size: 10px; 
+	vertical-align: middle;
+	margin:2px;
+}
+
+.textarea,
+.searchinput,
+.button,
+.gobutton{
+	background: #FFF;
+	border: 1px solid #4C77B6;
+	color: #000;
+	font-family: Verdana, Helvetica, Sans-Serif;
+	font-size: 11px;
+	padding: 2px;
+	vertical-align: middle;
+}
+	
+.button{
+	background: #DFE6EF;
+}
+
+.gobutton{
+	background: transparent;
+	border: 0;
+	color: #072A66;
+	margin: 0;
+	vertical-align: middle;
+}
+
+.radiobutton,
+.checkbox,
+.helpbox { 
+	border: 0;
+	vertical-align: middle;
+}
+
+/* 
+ * class.formtable 
+ *
+ * used for tabled forms 
+ * technically tables should not be used for form display 
+ * but, in the case of IPB a table is easier to work with
+ * for the average webmaster, who has little to no CSS knowledge.
+ *
+ */
+
+.formtable{
+	background: transparent;
+}
+
+.formtable td,
+.pformleft,
+.pformleftw,
+.pformright{
+	background:#F5F9FD;
+	border: 1px solid #C2CFDF;
+	border-bottom: 0;
+	border-left: 0;
+	font-weight: bold;
+	margin: 1px 0 0 0;
+	padding: 6px;
+	width: 25%;
+} 
+
+.formtable td.wider,
+.pformleftw,
+.pformright{
+	width: 40%;
+}
+
+.formtable td.formright,
+.pformright{
+	border-right: 0;
+	font-weight: normal;
+	width: auto;
+} 
+
+.formtable td.formtitle,
+.formsubtitle{
+	background: #D1DCEB;
+	border: 1px solid #9FB9D4; 
+	border-bottom: 0;
+	border-left: 0;
+	border-right: 0;
+	font-weight: normal;
+}
+
+.formsubtitle{ 
+	border: 0;
+	color: #3A4F6C;
+	font-weight: bold;
+	padding: 5px;
+}
+
+.formtable td.formstrip{
+	background: #DDE8F2;
+	border: 1px solid #9FB9D4;
+	border-left: 0;
+	border-right: 0;
+	font-weight: normal;
+}
+
+/* 
+ * ========================================
+ * new style quote and code wrappers MATT's DESIGN 
+ * ========================================
+ */
+
+.quotetop{
+	background: #E4EAF2 url(<#IMG_DIR#>/css_img_quote.gif) no-repeat right;
+	border: 1px dotted #000;
+	border-bottom: 0;
+	border-left: 4px solid #8394B2;
+	color: #000;
+	font-weight: bold;
+	font-size: 10px;
+	margin: 8px auto 0 auto;
+	padding: 3px;
+}
+
+.quotemain{
+	background: #FAFCFE;
+	border: 1px dotted #000;
+	border-left: 4px solid #8394B2;
+	border-top: 0;
+	color: #465584;
+	padding: 4px;
+	margin: 0 auto 8px auto;
+}
+
+.codetop,
+.sqltop,
+.htmltop{
+	background: #FDDBCC url(<#IMG_DIR#>/css_img_code.gif) no-repeat right;
+	color: #000;
+	font-weight: bold;
+	margin: 0 auto 0 auto;
+	padding: 3px;
+	width: 98%;
+}
+
+.codemain,
+.sqlmain,
+.htmlmain{
+	background: #FAFCFE;
+	border: 1px dotted #000;
+	color: #465584;
+	font-family: Courier, Courier New, Verdana, Arial;
+	margin: 0 auto 0 auto;
+	padding: 2px;
+	width: 98%;
+}
+
+/* 
+ * ========================================
+ * old school quote and code styles - backwards compatibility 
+ * ========================================
+ */
+
+#QUOTE,
+#CODE{  
+	background: #FAFCFE; 
+	border: 1px solid #000; 
+	color: #465584; 
+	font-family: Verdana, Arial; 
+	font-size: 11px; 
+	padding: 2px; 
+	white-space: normal;
+}
+
+#CODE{ 
+	font-family: Courier, Courier New, Verdana, Arial;
+}
+
+/* 
+ * ========================================
+ * All New Styles 
+ * ========================================
+ */
+.cleared{
+	clear: both;
+}
+
+.borderwrap,
+.borderwrapm{ /* this will affect the outlining border of all the tables and boxes through-out the skin. */
+	background: #FFF; 
+	border: 1px solid #072A66;
+	padding: 0; 
+	margin: 0; 
+}
+
+.borderwrapm{
+	margin: 5px;
+}
+
+.borderwrap h3,
+.maintitle,
+.maintitlecollapse{
+	background: transparent url(<#IMG_DIR#>/tile_cat.gif);
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	color: #FFF; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 8px;
+}
+
+.maintitlecollapse{
+	border: 1px solid #FFF;
+}
+
+.maintitle p,
+.maintitlecollapse p,
+.formsubtitle p{
+	background: transparent !important;
+	border: 0 !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+.maintitle p.expand,
+.maintitle p.goto,
+.maintitlecollapse p.expand,
+.formsubtitle p.members{
+	float: right;
+	width: auto !important;
+}
+
+.maintitle a:link, 
+.maintitle a:visited,
+.maintitlecollapse a:link, 
+.maintitlecollapse a:visited{ 
+	background: transparent;
+	color: #FFF;
+	text-decoration: none; 
+}
+
+.maintitle a:hover, 
+.maintitle a:active,
+.maintitlecollapse a:hover, 
+.maintitlecollapse a:active{ 
+	background: transparent;
+	color: #F1F1F1;
+}
+
+table th,
+.borderwrap table th,
+.subtitle,
+.subtitlediv,
+.postlinksbar{ 
+	background: transparent url(<#IMG_DIR#>/tile_sub.gif);
+	border-bottom: 1px solid #5176B5;
+	color: #3A4F6C; 
+	font-size: 10px;
+	font-weight: bold; 
+	letter-spacing: 1px;
+	margin: 0; 
+	padding: 5px; 
+}
+
+.subtitlediv{
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	text-align: right;
+}
+
+.borderwrap table th a:link,
+.subtitle a:link,
+.subtitlediv a:link,
+.borderwrap table th a:visited,
+.subtitle a:visited, 
+.subtitlediv a:visited, 
+.borderwrap table th a:active,
+.subtitle a:active,
+.subtitlediv a:active,
+.borderwrap table th a:hover,
+.subtitle a:hover,
+.subtitlediv a:hover{ 
+	background: transparent;
+	color: #3A4F6C;
+	text-decoration: none; 
+}
+
+.borderwrap h4{
+	background: #DDE6F2;
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	border-top: 1px solid #5176B5;
+	color: #5176B5; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.borderwrap p{
+	background: #F9F9F9;
+	border: 1px solid #CCC;
+	margin: 5px;
+	padding: 10px;
+	text-align: left;
+}
+
+td.formbuttonrow,
+.borderwrap p.formbuttonrow,
+.borderwrap p.formbuttonrow1{
+	background: #D1DCEB !important; 
+	border: 1px solid #FFF;
+	border-top: 1px solid #5176B5;
+	margin: 0px !important;
+	padding: 5px !important;
+	text-align: center;
+}
+
+td.formbuttonrow{
+	border-bottom: 0;
+	border-left: 0;
+	border-right: 0;
+}
+
+.borderwrap p.formbuttonrow1{
+	background: #F9F9F9 !important;
+	border: 0;
+	border-top: 1px solid #CCC;
+}
+
+.bar,
+.barb,
+.barc{
+	background: #DFE6EF;
+	border: 1px solid #FFF;
+}
+
+.barc{
+	border-bottom: 0;
+}
+
+.bar p,
+.barb p,
+.barc p{
+	background: transparent;
+	border: 0;
+	color: #222;
+	font-size: 11px;
+	margin: 0;
+	padding: 5px;
+	text-align: left;
+}
+
+.barb p{
+	text-align: right;
+}
+
+.bar p.over,
+.bar p.overs,
+.barc p.over,
+.barc p.overs{
+	float: right;
+}
+
+.barb p.over,
+.barb p.overs{
+	float: left;
+}
+
+.bar p.overs,
+.barb p.overs,
+.barc p.overs{
+	position: relative;
+	top: 5px;
+}
+
+.catend{
+	background: #8394B2;
+	color: #000;
+	font-size: 1px;
+	height: 5px;
+}
+
+.newslink{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 0;
+	width: 100%;
+}
+
+.newslink td{
+	color: #222;
+	font-size: 10px;
+	padding: 5px 5px 5px 10px;
+}
+
+.newslink span{
+	background: transparent;
+	color: #072A66;
+	font-style: italic;
+	font-weight: normal;
+}
+
+.newslink input{
+	background: #FFF;
+	border: 1px solid #999;
+	color: #072A66;
+	font-size: 10px;
+	padding: 3px;
+	vertical-align: middle;
+	width: auto;
+}
+
+.newslink input.button{
+	background: transparent;
+	border: 0;
+	color: #072A66;
+	vertical-align: middle;
+}
+
+.fieldwrap{
+	background: #F9F9F9;
+	border: 1px solid #CCC;
+	border-top: 0;
+	margin: 5px;
+	padding: 0;
+	text-align: left;
+}
+
+.fieldwrap h4{
+	background: #EEE;
+	border: 1px solid #CCC;
+	border-left: 0;
+	border-right: 0;
+	color: #444; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.errorwrap,
+#pmnotewrap{
+	background: #F2DDDD;
+	border: 1px solid #992A2A;
+	border-top: 0;
+	margin: 5px;
+	padding: 0;
+}
+
+#pmnotewrap{
+	line-height: 135%;
+	margin: 0 0 5px 0;
+}
+
+.errorwrap h4,
+#pmnotewrap h4{
+	background: #E3C0C0;
+	border: 1px solid #992A2A;
+	border-left: 0;
+	border-right: 0;
+	color: #992A2A; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.errorwrap p,
+#pmnotewrap p{
+	background: transparent;
+	border: 0;
+	color: #992A2A;
+	margin: 0;
+	padding: 8px;
+}
+
+#pmnotewrap p.pmavatar{
+	float: left;
+}
+
+#pmnotewrap p.pmnotefoot{
+	background: #E3C0C0;
+	border-top: 1px solid #992A2A;
+	text-align: right;
+}
+
+#pmnotewrap a:link, 
+#pmnotewrap  a:visited{ 
+	background: transparent; 
+	color: #992A2A; 
+	text-decoration: underline;
+}
+
+#pmnotewrap a:hover, 
+#pmnotewrap a:active{
+	background: transparent; 
+	color: #992A2A; 
+	text-decoration: none;
+}
+
+.ruleswrap{
+	background: #F2DDDD;
+	border: 1px solid #992A2A;
+	color: #992A2A; 
+	margin: 5px 0 5px 0;
+	padding: 5px;
+}
+
+#redirectwrap{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 200px auto 0 auto;
+	text-align: left;
+	width: 500px;
+}
+
+#redirectwrap h4{
+	background: #D0DDEA;
+	border-bottom: 1px solid #C2CFDF;
+	color: #3A4F6C;
+	font-size: 14px;
+	margin: 0;
+	padding: 5px;
+}
+
+#redirectwrap p{
+	margin: 0;
+	padding: 5px;
+}
+
+#redirectwrap p.redirectfoot{
+	background: #E3EBF4;
+	border-top: 1px solid #C2CFDF;
+	text-align: center;
+}
+
+
+#gfooter{
+	background: #8394B2;
+	margin: 5px 0 5px 0;
+	padding: 0;
+	width: 100%;
+}
+
+#gfooter td{
+	color: #FFF;
+	font-size: 10px;
+	padding: 4px;
+}
+
+#gfooter a:link,
+#gfooter a:visited{
+	color: #FFF;
+}
+
+#logostrip{ 
+	background: #3860BB url(<#IMG_DIR#>/tile_back.gif);
+	border: 1px solid #FFF;
+	height: 68px;
+	margin: 0;
+	padding: 0;
+}
+
+#logographic{
+	background: transparent url(<#IMG_DIR#>/logo4.gif) no-repeat left;
+	height: 68px;
+	margin: 0;
+	padding: 0;
+}
+
+#submenu{ 
+	background: transparent url(<#IMG_DIR#>/tile_sub.gif);
+	border: 1px solid #FFF;
+	border-top: 0;
+	color: #3A4F6C; 
+	margin: 0; 
+}
+
+#userlinks,
+#userlinksguest{ 
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 5px 0 5px 0;
+	padding: 0 5px 0 5px;
+}
+
+#userlinksguest{ 
+	background: #F4E7EA;
+	border: 1px solid #986265;
+}
+
+#submenu p,
+#userlinks p,
+#userlinksguest p{
+	background: transparent !important;
+	border: 0 !important;
+	font-size: 10px;
+	font-weight: bold; 
+	letter-spacing: 1px;
+	margin: 0 !important;
+	padding: 7px 0 7px 0; 
+	text-align: right;
+}
+
+#userlinks p,
+#userlinksguest p{
+	font-weight: normal;
+	letter-spacing: 0;
+}
+
+#submenu p.home,
+#userlinks p.home,
+#userlinksguest p.home{
+	float: left;
+}
+
+#userlinksguest p.pcen{
+	text-align: center;
+}
+
+#submenu a:link, 
+#submenu  a:visited{ 
+	background: transparent; 
+	color: #3A4F6C; 
+	padding: 0 6px 0 6px;
+	text-decoration: none;
+}
+
+#submenu a:hover, 
+#submenu a:active{
+	background: transparent; 
+	color: #5176B5; 
+}
+#navstrip{ 
+	background: transparent;
+	color: #999;
+	font-size: 12px;
+	font-weight: bold;
+	margin: 0 0 5px 0;
+	padding: 8px 0 8px 0px; 
+}
+
+#navstrip a:link, 
+#navstrip  a:visited{ 
+	background: transparent; 
+	color: #222; 
+	text-decoration: none;
+}
+
+#navstrip a:hover, 
+#navstrip a:active{
+	background: transparent; 
+	color: #5176B5; 
+}
+
+.toplinks{
+	background: transparent;
+	color: #000;
+	margin: 0;
+	padding: 0 0 5px 0;
+	text-align: right;
+}
+
+.toplinks span{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	border-bottom: 0;
+	color: #000;
+	font-size: 10px;
+	font-weight: bold;
+	margin: 0 10px 0 0;
+	padding: 5px;
+}
+
+.copyright{ 
+	background: #EEE;
+	font-size: 11px; 
+	margin: 0 0 5px 0;
+	padding: 8px;
+}
+
+/* 
+ * ========================================
+ * print page styles 
+ * ========================================
+ */
+
+#print{
+	margin: 20px auto 20px auto;
+	padding: 0;
+	text-align: left;
+	width: 85%;
+}
+
+#print h1,
+#print h2,
+#print h3,
+#print h4,
+#print p{
+	color: #036;
+	font-size: 18px;
+	font-weight: bold;
+	margin: 0;
+	padding: 8px;
+}
+
+#print h2,
+#print h3,
+#print p{
+	border-bottom: 1px solid #999;
+	font-size: 11px;
+	font-weight: normal;
+}
+
+#print h3{
+	background: #F5F5F5;
+	font-size: 12px;
+	font-weight: bold;
+	margin: 0 0 10px 0;
+}
+
+#print h4{
+	background: #F9F9F9;
+	font-size: 11px;
+}
+
+#print p{
+	margin: 0 0 5px 0;
+	padding: 10px;
+}
+
+#print p.printcopy{
+	border: 0;
+	color: #000;
+	text-align: center;
+}
+
+EOF;
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20009/ipb_settings_partial.xml b/upload/upgrade/upg_20009/ipb_settings_partial.xml
new file mode 100644
index 00000000..a6a80fef
--- /dev/null
+++ b/upload/upgrade/upg_20009/ipb_settings_partial.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<settingexport exported="1094651620">
+	<settinggroup>
+		<setting>
+			<conf_id>218</conf_id>
+			<conf_title>Forums to export articles from</conf_title>
+			<conf_description>You may select more than one.</conf_description>
+			<conf_group>22</conf_group>
+			<conf_type>multi</conf_type>
+			<conf_key>csite_article_forum</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra>#show_forums#</conf_extra>
+			<conf_evalphp><![CDATA[if ( $save == 1)
+{
+	if ( is_array($_POST['csite_article_forum']) )
+	{
+		$_POST['csite_article_forum'] = implode(",",$_POST['csite_article_forum']);
+	}
+	else
+	{
+		$_POST['csite_article_forum'] = "";
+	}
+	
+	$key = 'csite_article_forum';
+}
+if ( $show == 1 )
+{
+$key = 'csite_article_forum[]';
+}]]></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>3</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>0</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>265</conf_id>
+			<conf_title>Caching PATH</conf_title>
+			<conf_description><![CDATA[<b>This can be left blank</b>
+<br />This is useful for specifing a PATH for the IPB written files (skin_cache, style_avatars, style_emoticons, style_images) when dealing with load balanced/clustered servers. If you enter a PATH, please ensure that it ends with a trailing slash]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_cache_path</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+
+		<setting>
+			<conf_id>264</conf_id>
+			<conf_title>Image URL</conf_title>
+			<conf_description><![CDATA[<b>This can be left blank</b>
+<br />This can be used if you wish to serve images from a different server or when using clustered servers. Please ensure that you use a trailing slash and that it starts with http(s):// if entering a URL]]></conf_description>
+			<conf_group>1</conf_group>
+			<conf_type>input</conf_type>
+			<conf_key>ipb_img_url</conf_key>
+			<conf_value></conf_value>
+			<conf_default></conf_default>
+			<conf_extra></conf_extra>
+			<conf_evalphp></conf_evalphp>
+			<conf_protected>1</conf_protected>
+			<conf_position>8</conf_position>
+			<conf_start_group></conf_start_group>
+			<conf_end_group>0</conf_end_group>
+			<conf_help_key></conf_help_key>
+			<conf_add_cache>1</conf_add_cache>
+		</setting>
+	</settinggroup>
+
+</settingexport>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20009/mysql_updates.php b/upload/upgrade/upg_20009/mysql_updates.php
new file mode 100644
index 00000000..ab65fe3b
--- /dev/null
+++ b/upload/upgrade/upg_20009/mysql_updates.php
@@ -0,0 +1,15 @@
+<?php
+
+
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('P_UP', '<img src=\'style_images/<#IMG_DIR#>/p_up.gif\' border=\'0\'  alt=\'Go to the top of the page\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('P_CARD', '<img src=\'style_images/<#IMG_DIR#>/p_card.gif\' border=\'0\'  alt=\'Profile Card\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_AIM', '<img src=\'style_images/<#IMG_DIR#>/profile_aim.gif\' border=\'0\'  alt=\'AIM\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_ITEM', '<img src=\'style_images/<#IMG_DIR#>/profile_item.gif\' border=\'0\'  alt=\'Profile Item\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_MSN', '<img src=\'style_images/<#IMG_DIR#>/profile_msn.gif\' border=\'0\'  alt=\'MSN\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_ICQ', '<img src=\'style_images/<#IMG_DIR#>/profile_icq.gif\' border=\'0\'  alt=\'ICQ\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_YIM', '<img src=\'style_images/<#IMG_DIR#>/profile_yahoo.gif\' border=\'0\'  alt=\'Yahoo\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_CONTACT', '<img src=\'style_images/<#IMG_DIR#>/icon_msg_nonew.gif\' border=\'0\'  alt=\'Contact\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('BAR_LEFT', '<img src=\'style_images/<#IMG_DIR#>/bar_left.gif\' border=\'0\'  alt=\'*\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('BAR_RIGHT', '<img src=\'style_images/<#IMG_DIR#>/bar_right.gif\' border=\'0\'  alt=\'*\' />', 1, 1);";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('CAL_GOTO', '<img src=\'style_images/<#IMG_DIR#>/cal_goto.gif\' border=\'0\'  alt=\'Goto Month\' />', 1, 1);";
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20009/version_history.php b/upload/upgrade/upg_20009/version_history.php
new file mode 100644
index 00000000..c22db3f5
--- /dev/null
+++ b/upload/upgrade/upg_20009/version_history.php
@@ -0,0 +1,16 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+						 '20005' => '2.0.0 PDR 5',
+						 '20006' => '2.0.0 PF 1',
+						 '20007' => '2.0.0 PF 2',
+						 '20008' => '2.0.0 PF 3',
+						 '20009' => '2.0.0 PF 4',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20009/version_upgrade.php b/upload/upgrade/upg_20009/version_upgrade.php
new file mode 100644
index 00000000..f5ef5325
--- /dev/null
+++ b/upload/upgrade/upg_20009/version_upgrade.php
@@ -0,0 +1,163 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PF3 -> PF 4
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20009';
+	var $upgrade_from = '20008';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$SQL = array();
+		
+		if ( file_exists( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/'.strtolower($ibforums->vars['sql_driver']).'_updates.php' ) )
+		{
+			require_once( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/'.strtolower($ibforums->vars['sql_driver']).'_updates.php' );
+		
+			foreach( $SQL as $q )
+			{
+				$DB->query( $q );
+				
+				$cnt++;
+			}
+		}
+		
+		//--------------------------------
+		// Upgrade templates
+		//--------------------------------
+		
+		require_once( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/components.php' );
+		
+		$DB->do_update( 'skin_sets', array( 'set_css'           => $CSS,
+										    'set_cache_css'     => $CSS,
+										    'set_wrapper'       => $WRAPPER,
+										    'set_cache_wrapper' => $WRAPPER,
+										  ), 'set_skin_set_id=1' );
+		
+		$cnt++;
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20010/components.php b/upload/upgrade/upg_20010/components.php
new file mode 100644
index 00000000..512624b6
--- /dev/null
+++ b/upload/upgrade/upg_20010/components.php
@@ -0,0 +1,1349 @@
+<?php
+
+$WRAPPER = <<<EOF
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
+<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head> 
+<title><% TITLE %></title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> 
+<% GENERATOR %> 
+<% CSS %> 
+<% JAVASCRIPT %> 
+</head> 
+<body>
+<div id="ipbwrapper">
+<% BOARD HEADER %>
+<% MEMBER BAR %>
+<% NAVIGATION %>
+<!--IBF.NEWPMBOX-->
+<% BOARD %>
+<% BOARD FOOTER %>
+<% STATS %> 
+<% COPYRIGHT %>
+</div>
+</body> 
+</html>
+EOF;
+
+
+$CSS = <<<EOF
+/* 
+ * Cascading Style Sheet(CSS 467), for Invision Power Board 2.0.0
+ * Author: James A. Mathias, admin@leihu.com, http://www.1lotus.com 
+ * Copyright: 2004 Invision Power Services, all rights reserved 
+ *
+ * All style attributes in alpha-numeric order starting from 0
+ *
+ */
+
+/* 
+ * ========================================
+ * global element styles 
+ * ========================================
+ */
+
+html{
+	overflow-x: auto; /* fixes MSIE scrollbar bug DO NOT REMOVE, has no effect in Mozilla, or Opera */
+}
+
+body{ 
+	background: #FFF;
+	color: #222;
+	font-family: Verdana, Tahoma, Arial, Trebuchet MS, Sans-Serif, Georgia, Courier, Times New Roman, Serif;
+	font-size: 11px;
+	line-height: 135%;
+	margin: 0;
+	padding: 0; /* required for Opera to have 0 margin */
+	text-align: center; /* centers board in MSIE */
+}
+
+table,
+tr,
+td{ /* required for text in tables, because tables do not inherit from body */
+	background: transparent;
+	color: #222;
+	font-size: 11px;
+	line-height: 135%;
+}
+
+table{ /* makes all tables 100% wide */
+	width: 100%;
+}
+
+td,
+.divpad{ /* gives all tables faux cellpadding of 5px */
+	padding: 5px;
+}
+
+td.nopad{ /* allows some tables to have no padding on the td */
+	padding: 0;
+}
+
+form{
+	display: inline;
+	margin: 0; /* removes mystery form tag gapping */
+	padding: 0; /* removes mystery form tag gapping */
+}
+
+img{
+	border: 0; /* makes sure linked images do not have a border */
+	vertical-align: middle;
+}
+
+/* 
+ * ========================================
+ * global hyperlink styles 
+ * ========================================
+ */
+
+a:link,
+a:visited,
+a:active{
+	background: transparent;
+	color: #222;
+	text-decoration: underline;
+}
+
+a:hover{
+	background: transparent;
+	color: #34498B;
+}
+
+/* 
+ * ========================================
+ * Main wrapper, this controls the overall width of the board in you browser view window. 
+ * ========================================
+ */
+
+#ipbwrapper{ 
+	margin: 20px auto 20px auto; /* centers the box, no matter the overall width, also applies a 20px gap at the top and bottom of the board */
+	text-align: left; /* re_aligns text to left second part of two part MSIE centering workaround */
+	/* EDIT THIS TO CHANGE THE WIDTH OF THE BOARD -> 750px is a common fixed resolution size */
+	width: 98%;
+}
+
+/* 
+ * ========================================
+ * styles for pagination links 
+ * ========================================
+ */
+ 
+
+.pagelink,
+.pagelinklast,
+.pagecurrent,
+.minipagelink,
+.minipagelinklast{
+	background: #F0F5FA;
+	border: 1px solid #072A66;
+	padding: 1px 3px 1px 3px;
+}
+
+.pagelinklast,
+.minipagelinklast{
+	background: #DFE6EF;
+}
+
+
+.pagecurrent{
+	background: #FFC9A5;
+}
+
+.minipagelink,
+.minipagelinklast{
+	border: 1px solid #C2CFDF;
+	font-size: 10px;
+	margin: 0 1px 0 0;
+}
+
+.pagelink a:active,
+.pagelink a:visited,
+.pagelink a:link,
+.pagelinklast a:active,
+.pagelinklast a:visited,
+.pagelinklast a:link,
+.pagecurrent a:active,
+.pagecurrent a:visited,
+.pagecurrent a:link,
+.minipagelink a:active,
+.minipagelink a:visited,
+.minipagelink a:link,
+.minipagelinklast a:active,
+.minipagelinklast a:visited,
+.minipagelinklast a:link{
+	text-decoration: none;
+}
+
+/* fake button effect for some links */
+.fauxbutton{
+	background: #BFCDE0;
+	border: 1px solid #072A66;
+	font-size: 11px;
+	font-weight: bold;
+	padding: 4px;
+}
+
+.fauxbutton a:link,
+.fauxbutton a:visited,
+.fauxbutton a:active{
+	color: #222 !important;
+	text-decoration: none;
+}
+
+.forumdesc,
+.forumdesc a:link,
+.forumdesc a:visited,
+.forumdesc a:active{ 
+	background: transparent;
+	font-size: 10px; 
+	color: #666;
+	line-height: 135%;
+	margin: 2px 0 0 0;
+	padding: 0;
+}
+
+/* =================================================================================== */
+/* =================================================================================== */
+/* =================================================================================== */
+
+.searchlite {
+	background-color:yellow;
+	font-weight:bold;
+	color: red;
+}
+
+.activeusers{
+	background: #FFF;
+	border: 1px solid #072A66;
+	color: #000;
+	margin: 0px;
+	padding: 1px;
+}
+
+.activeuserposting a:link,
+.activeuserposting a:visited,
+.activeuserposting a:active,
+.activeuserposting
+{
+	font-style:italic;
+	text-decoration: none;
+	border-bottom:1px dotted black;
+}
+
+fieldset.search{ 
+	line-height: 150%;
+	padding: 6px; 
+}
+
+label{ 
+	cursor: pointer; 
+}
+
+img.attach{ 
+	background: #808080 url(<#IMG_DIR#>/click2enlarge.gif) no-repeat top right;
+	border: 1px solid #808080;
+	margin: 0 2px 0 0;
+	padding: 11px 2px 2px 2px;
+}
+
+.thumbwrap,
+.thumbwrapp,
+.fullimagewrap{
+	border: 1px solid #072A66;
+	margin: 2px;
+}
+
+.thumbwrapp{
+	border: 2px solid #660707;
+}
+
+.fullimagewrap{
+	background: #F5F9FD;
+	text-align: center;
+	margin: 5px 0 5px 0;
+	padding: 5px;
+}
+
+.thumbwrap h4,
+.thumbwrapp h4{	
+	background: #DDE6F2;
+	border: 0 !important;
+	border-bottom: 1px solid #5176B5 !important;
+	color: #5176B5; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.thumbwrap p,
+.thumbwrapp p{
+	background: #EEF2F7 !important;
+	border: 0 !important;
+	border-top: 1px solid #5176B5 !important;
+	margin: 0 !important;
+	padding: 5px !important;
+	text-align: left;
+}
+
+.thumbwrap p.alt,
+.thumbwrapp p.alt{
+	background: #DFE6EF !important;
+	margin: 0 !important;
+	padding: 5px !important;
+	text-align: left;
+}
+
+.thumbwrapp p.pin{
+	background: #EFDFDF !important;
+	text-align: center !important;
+}
+	
+.thumbwrap img.galattach,
+.thumbwrapp img.galattach{
+	background: #FFF url(<#IMG_DIR#>/img_larger.gif) no-repeat bottom right;
+	border: 1px solid #072A66;
+	margin: 5px;
+	padding: 2px 2px 10px 2px;
+}
+
+li.helprow{ 
+	margin: 0 0 10px 0;
+	padding: 0; 
+}
+
+ul#help{ 
+	padding: 0 0 0 15px; 
+}
+
+.warngood,
+.warnbad{ 
+	color: #0B9500;
+	font-weight: bold;
+}
+
+.warnbad{ 
+	color: #DD0000;
+}
+
+#padandcenter{ 
+	margin: 0 auto 0 auto;
+	padding: 14px 0 14px 0;
+	text-align: center;
+}
+
+#profilename{ 
+	font-size: 28px; 
+	font-weight: bold; 
+}
+
+#photowrap{ 
+	padding: 6px; 
+}
+
+#phototitle{ 
+	border-bottom: 1px solid #000; 
+	font-size: 24px; 
+}
+
+#photoimg{ 
+	margin: 15px 0 0 0;
+	text-align: center; 
+} 
+
+#ucpmenu,
+#ucpcontent{ 
+	background: #F5F9FD;
+	border: 1px solid #345487;
+	line-height: 150%;
+}
+
+#ucpmenu p{ 
+	margin: 0; 
+	padding: 2px 5px 6px 9px;
+}
+
+#ucpmenu a:link, 
+#ucpmenu a:active, 
+#ucpmenu a:visited{ 
+	text-decoration: none; 
+}
+
+#ucpcontent{ 
+	width: auto;
+}
+
+#ucpcontent p{ 
+	margin: 0;
+	padding: 10px;
+}
+
+.activeuserstrip{ 
+	background: #BCD0ED;
+	padding: 6px;
+}
+
+/* Topic View elements */
+.signature{  
+	background: transparent;
+	color: #339; 
+	font-size: 10px;
+	line-height: 150%;
+}
+
+.postdetails{ 
+	font-size: 10px;
+	line-height:140%;
+}
+
+.postcolor{ 
+	font-size: 12px; 
+	line-height: 160%;
+}
+
+.normalname{ 
+	color: #003;
+	font-size: 12px; 
+	font-weight: bold; 
+}
+
+.normalname a:link, 
+.normalname a:visited, 
+.normalname a:active{ 
+	font-size: 12px;
+}
+
+.post1,
+.bg1{ 
+	background: #F5F9FD;
+}
+
+.post2,
+.bg3{ 
+	background: #EEF2F7;
+}
+
+.row2shaded,
+.post1shaded { background-color: #DEDBE4 }
+.row4shaded,
+.post2shaded { background-color: #E3DFE7 }
+
+.row1{ 
+	background: #DFE6EF; 
+}
+
+.row2{ 
+	background: #E4EAF2; 
+}
+
+.darkrow1{ 
+	background: #BCD0ED;
+	color: #3A4F6C; 
+}
+
+.darkrow3{ 
+	background: #D1DCEB; 
+	color: #3A4F6C; 
+}
+
+/* tableborders gives the white column / row lines effect */
+.plainborder,
+.tablefill,
+.tablepad{ 
+	background: #F5F9FD;
+	border: 1px solid #345487;
+}
+
+.tablefill,
+.tablepad{ 
+	padding: 6px;  
+}
+
+.tablepad{ 
+	border: 0 !important;
+}
+
+.wrapmini{ 
+	float: left;
+	line-height: 1.5em;
+	width: 25%;
+}
+
+.pagelinks{
+	float: left;
+	line-height: 1.2em;
+	width: 35%;
+}
+
+.desc{ 
+	font-size: 11px; 
+	color: #434951;
+}
+
+.lastaction
+{
+	font-size: 10px; 
+	color: #434951;
+}
+
+.edit{ 
+	font-size: 9px;
+}
+
+.thin{ 
+	border: 1px solid #FFF;
+	border-left: 0;
+	border-right: 0;
+	line-height: 150%;
+	margin: 2px 0 2px 0;
+	padding: 6px 0 6px 0;
+}
+
+/* =================================================================================== */
+/* =================================================================================== */
+/* =================================================================================== */
+
+/* 
+ * ========================================
+ * calendar styles 
+ * ========================================
+ */
+	
+.calmonths{ 
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	font-size: 18px; 
+	font-weight: bold; 
+	margin: 5px 0 5px 0;
+	padding: 8px;
+	text-align: center;
+}
+
+.weekday{
+	font-size: 14px;
+	font-weight: bold;
+}
+
+.calmonths a{
+	text-decoration: none;
+}
+
+.calday,
+.calweekday{ 
+	background: #DFE6EF;
+	color: #666;
+	font-size: 11px;
+	font-weight: bold;
+	margin: 0;
+	padding: 4px;
+	text-align: right;
+}
+
+.calweekday{
+	border-right: 1px solid #AAA;
+	color: #222;
+	font-size: 14px;
+	padding: 6px;
+	text-align: center;
+}
+
+.cellblank,
+.celldate,
+.celltoday,
+.mcellblank,
+.mcelldate,
+.mcelltoday{
+	background: #EEF2F7;
+	height: 100px;
+	margin: 0;
+	padding: 0;
+	vertical-align: top;
+}
+
+.mcellblank,
+.mcelldate,
+.mcelltoday{
+	height: auto;
+}
+
+.cellblank,
+.mcellblank{
+	background: #C2CFDF;
+}
+
+.celltoday,
+.mcelltoday{
+	border: 2px solid #8B0000;
+}
+
+/* 
+ * ========================================
+ * form styles 
+ * ========================================
+ */
+
+input,
+textarea,
+select{
+	background: #FFF;
+	border: 1px solid #4C77B6;
+	color: #000;
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 11px;
+	margin: 5px;
+	padding: 2px;
+	vertical-align: middle;
+}
+
+select{
+	border: 0;
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 12px;
+	margin: 0;
+	padding: 0;
+}
+
+input.button{
+	margin: 0;
+	width: auto;
+}
+
+optgroup option{
+	font-family: verdana, helvetica, sans-serif;
+	font-size: 12px;
+}
+
+.codebuttons{ 
+	font-family: Verdana, Helvetica, Sans-Serif; 
+	font-size: 10px; 
+	vertical-align: middle;
+	margin:2px;
+}
+
+.textarea,
+.searchinput,
+.button,
+.gobutton{
+	background: #FFF;
+	border: 1px solid #4C77B6;
+	color: #000;
+	font-family: Verdana, Helvetica, Sans-Serif;
+	font-size: 11px;
+	padding: 2px;
+	vertical-align: middle;
+}
+	
+.button{
+	background: #DFE6EF;
+}
+
+.gobutton{
+	background: transparent;
+	border: 0;
+	color: #072A66;
+	margin: 0;
+	vertical-align: middle;
+}
+
+.radiobutton,
+.checkbox,
+.helpbox { 
+	border: 0;
+	vertical-align: middle;
+}
+
+/* 
+ * class.formtable 
+ *
+ * used for tabled forms 
+ * technically tables should not be used for form display 
+ * but, in the case of IPB a table is easier to work with
+ * for the average webmaster, who has little to no CSS knowledge.
+ *
+ */
+
+.formtable{
+	background: transparent;
+}
+
+.formtable td,
+.pformleft,
+.pformleftw,
+.pformright{
+	background:#F5F9FD;
+	border: 1px solid #C2CFDF;
+	border-bottom: 0;
+	border-left: 0;
+	font-weight: bold;
+	margin: 1px 0 0 0;
+	padding: 6px;
+	width: 25%;
+} 
+
+.formtable td.wider,
+.pformleftw,
+.pformright{
+	width: 40%;
+}
+
+.formtable td.formright,
+.pformright{
+	border-right: 0;
+	font-weight: normal;
+	width: auto;
+} 
+
+.formtable td.formtitle,
+.formsubtitle{
+	background: #D1DCEB;
+	border: 1px solid #9FB9D4; 
+	border-bottom: 0;
+	border-left: 0;
+	border-right: 0;
+	font-weight: normal;
+}
+
+.formsubtitle{ 
+	border: 0;
+	color: #3A4F6C;
+	font-weight: bold;
+	padding: 5px;
+}
+
+.formtable td.formstrip{
+	background: #DDE8F2;
+	border: 1px solid #9FB9D4;
+	border-left: 0;
+	border-right: 0;
+	font-weight: normal;
+}
+
+/* 
+ * ========================================
+ * new style quote and code wrappers MATT's DESIGN 
+ * ========================================
+ */
+
+.quotetop{
+	background: #E4EAF2 url(<#IMG_DIR#>/css_img_quote.gif) no-repeat right;
+	border: 1px dotted #000;
+	border-bottom: 0;
+	border-left: 4px solid #8394B2;
+	color: #000;
+	font-weight: bold;
+	font-size: 10px;
+	margin: 8px auto 0 auto;
+	padding: 3px;
+}
+
+.quotemain{
+	background: #FAFCFE;
+	border: 1px dotted #000;
+	border-left: 4px solid #8394B2;
+	border-top: 0;
+	color: #465584;
+	padding: 4px;
+	margin: 0 auto 8px auto;
+}
+
+.codetop,
+.sqltop,
+.htmltop{
+	background: #FDDBCC url(<#IMG_DIR#>/css_img_code.gif) no-repeat right;
+	color: #000;
+	font-weight: bold;
+	margin: 0 auto 0 auto;
+	padding: 3px;
+	width: 98%;
+}
+
+.codemain,
+.sqlmain,
+.htmlmain{
+	background: #FAFCFE;
+	border: 1px dotted #000;
+	color: #465584;
+	font-family: Courier, Courier New, Verdana, Arial;
+	margin: 0 auto 0 auto;
+	padding: 2px;
+	width: 98%;
+}
+
+/* 
+ * ========================================
+ * old school quote and code styles - backwards compatibility 
+ * ========================================
+ */
+
+#QUOTE,
+#CODE{  
+	background: #FAFCFE; 
+	border: 1px solid #000; 
+	color: #465584; 
+	font-family: Verdana, Arial; 
+	font-size: 11px; 
+	padding: 2px; 
+	white-space: normal;
+}
+
+#CODE{ 
+	font-family: Courier, Courier New, Verdana, Arial;
+}
+
+/* 
+ * ========================================
+ * All New Styles 
+ * ========================================
+ */
+.cleared{
+	clear: both;
+}
+
+.borderwrap,
+.borderwrapm{ /* this will affect the outlining border of all the tables and boxes through-out the skin. */
+	background: #FFF; 
+	border: 1px solid #072A66;
+	padding: 0; 
+	margin: 0; 
+}
+
+.borderwrapm{
+	margin: 5px;
+}
+
+.borderwrap h3,
+.maintitle,
+.maintitlecollapse{
+	background: transparent url(<#IMG_DIR#>/tile_cat.gif);
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	color: #FFF; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 8px;
+}
+
+.maintitlecollapse{
+	border: 1px solid #FFF;
+}
+
+.maintitle p,
+.maintitlecollapse p,
+.formsubtitle p{
+	background: transparent !important;
+	border: 0 !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+.maintitle p.expand,
+.maintitle p.goto,
+.maintitlecollapse p.expand,
+.formsubtitle p.members{
+	float: right;
+	width: auto !important;
+}
+
+.maintitle a:link, 
+.maintitle a:visited,
+.maintitlecollapse a:link, 
+.maintitlecollapse a:visited{ 
+	background: transparent;
+	color: #FFF;
+	text-decoration: none; 
+}
+
+.maintitle a:hover, 
+.maintitle a:active,
+.maintitlecollapse a:hover, 
+.maintitlecollapse a:active{ 
+	background: transparent;
+	color: #F1F1F1;
+}
+
+table th,
+.borderwrap table th,
+.subtitle,
+.subtitlediv,
+.postlinksbar{ 
+	background: transparent url(<#IMG_DIR#>/tile_sub.gif);
+	border-bottom: 1px solid #5176B5;
+	color: #3A4F6C; 
+	font-size: 10px;
+	font-weight: bold; 
+	letter-spacing: 1px;
+	margin: 0; 
+	padding: 5px; 
+}
+
+.subtitlediv{
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	text-align: right;
+}
+
+.borderwrap table th a:link,
+.subtitle a:link,
+.subtitlediv a:link,
+.borderwrap table th a:visited,
+.subtitle a:visited, 
+.subtitlediv a:visited, 
+.borderwrap table th a:active,
+.subtitle a:active,
+.subtitlediv a:active,
+.borderwrap table th a:hover,
+.subtitle a:hover,
+.subtitlediv a:hover{ 
+	background: transparent;
+	color: #3A4F6C;
+	text-decoration: none; 
+}
+
+.borderwrap h4{
+	background: #DDE6F2;
+	border: 1px solid #FFF;
+	border-bottom: 1px solid #5176B5;
+	border-top: 1px solid #5176B5;
+	color: #5176B5; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.borderwrap p{
+	background: #F9F9F9;
+	border: 1px solid #CCC;
+	margin: 5px;
+	padding: 10px;
+	text-align: left;
+}
+
+td.formbuttonrow,
+.borderwrap p.formbuttonrow,
+.borderwrap p.formbuttonrow1{
+	background: #D1DCEB !important; 
+	border: 1px solid #FFF;
+	border-top: 1px solid #5176B5;
+	margin: 0px !important;
+	padding: 5px !important;
+	text-align: center;
+}
+
+td.formbuttonrow{
+	border-bottom: 0;
+	border-left: 0;
+	border-right: 0;
+}
+
+.borderwrap p.formbuttonrow1{
+	background: #F9F9F9 !important;
+	border: 0;
+	border-top: 1px solid #CCC;
+}
+
+.bar,
+.barb,
+.barc{
+	background: #DFE6EF;
+	border: 1px solid #FFF;
+}
+
+.barc{
+	border-bottom: 0;
+}
+
+.bar p,
+.barb p,
+.barc p{
+	background: transparent;
+	border: 0;
+	color: #222;
+	font-size: 11px;
+	margin: 0;
+	padding: 5px;
+	text-align: left;
+}
+
+.barb p{
+	text-align: right;
+}
+
+.bar p.over,
+.bar p.overs,
+.barc p.over,
+.barc p.overs{
+	float: right;
+}
+
+.barb p.over,
+.barb p.overs{
+	float: left;
+}
+
+.bar p.overs,
+.barb p.overs,
+.barc p.overs{
+	position: relative;
+	top: 5px;
+}
+
+.catend{
+	background: #8394B2;
+	color: #000;
+	font-size: 1px;
+	height: 5px;
+}
+
+.newslink{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 0;
+	width: 100%;
+}
+
+.newslink td{
+	color: #222;
+	font-size: 10px;
+	padding: 5px 5px 5px 10px;
+}
+
+.newslink span{
+	background: transparent;
+	color: #072A66;
+	font-style: italic;
+	font-weight: normal;
+}
+
+.newslink input{
+	background: #FFF;
+	border: 1px solid #999;
+	color: #072A66;
+	font-size: 10px;
+	padding: 3px;
+	vertical-align: middle;
+	width: auto;
+}
+
+.newslink input.button{
+	background: transparent;
+	border: 0;
+	color: #072A66;
+	vertical-align: middle;
+}
+
+.fieldwrap{
+	background: #F9F9F9;
+	border: 1px solid #CCC;
+	border-top: 0;
+	margin: 5px;
+	padding: 0;
+	text-align: left;
+}
+
+.fieldwrap h4{
+	background: #EEE;
+	border: 1px solid #CCC;
+	border-left: 0;
+	border-right: 0;
+	color: #444; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.errorwrap,
+#pmnotewrap{
+	background: #F2DDDD;
+	border: 1px solid #992A2A;
+	border-top: 0;
+	margin: 5px;
+	padding: 0;
+}
+
+#pmnotewrap{
+	line-height: 135%;
+	margin: 0 0 5px 0;
+}
+
+.errorwrap h4,
+#pmnotewrap h4{
+	background: #E3C0C0;
+	border: 1px solid #992A2A;
+	border-left: 0;
+	border-right: 0;
+	color: #992A2A; 
+	font-size: 12px;
+	font-weight: bold; 
+	margin: 0;
+	padding: 5px;
+}
+
+.errorwrap p,
+#pmnotewrap p{
+	background: transparent;
+	border: 0;
+	color: #992A2A;
+	margin: 0;
+	padding: 8px;
+}
+
+#pmnotewrap p.pmavatar{
+	float: left;
+}
+
+#pmnotewrap p.pmnotefoot{
+	background: #E3C0C0;
+	border-top: 1px solid #992A2A;
+	text-align: right;
+}
+
+#pmnotewrap a:link, 
+#pmnotewrap  a:visited{ 
+	background: transparent; 
+	color: #992A2A; 
+	text-decoration: underline;
+}
+
+#pmnotewrap a:hover, 
+#pmnotewrap a:active{
+	background: transparent; 
+	color: #992A2A; 
+	text-decoration: none;
+}
+
+.ruleswrap{
+	background: #F2DDDD;
+	border: 1px solid #992A2A;
+	color: #992A2A; 
+	margin: 5px 0 5px 0;
+	padding: 5px;
+}
+
+#redirectwrap{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 200px auto 0 auto;
+	text-align: left;
+	width: 500px;
+}
+
+#redirectwrap h4{
+	background: #D0DDEA;
+	border-bottom: 1px solid #C2CFDF;
+	color: #3A4F6C;
+	font-size: 14px;
+	margin: 0;
+	padding: 5px;
+}
+
+#redirectwrap p{
+	margin: 0;
+	padding: 5px;
+}
+
+#redirectwrap p.redirectfoot{
+	background: #E3EBF4;
+	border-top: 1px solid #C2CFDF;
+	text-align: center;
+}
+
+
+#gfooter{
+	background: #8394B2;
+	margin: 5px 0 5px 0;
+	padding: 0;
+	width: 100%;
+}
+
+#gfooter td{
+	color: #FFF;
+	font-size: 10px;
+	padding: 4px;
+}
+
+#gfooter a:link,
+#gfooter a:visited{
+	color: #FFF;
+}
+
+#logostrip{ 
+	background: #3860BB url(<#IMG_DIR#>/tile_back.gif);
+	border: 1px solid #FFF;
+	height: 68px;
+	margin: 0;
+	padding: 0;
+}
+
+#submenu{ 
+	background: transparent url(<#IMG_DIR#>/tile_sub.gif);
+	border: 1px solid #FFF;
+	border-top: 0;
+	color: #3A4F6C; 
+	margin: 0; 
+}
+
+#userlinks,
+#userlinksguest{ 
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	margin: 5px 0 5px 0;
+	padding: 0 5px 0 5px;
+}
+
+#userlinksguest{ 
+	background: #F4E7EA;
+	border: 1px solid #986265;
+}
+
+#submenu p,
+#userlinks p,
+#userlinksguest p{
+	background: transparent !important;
+	border: 0 !important;
+	font-size: 10px;
+	font-weight: bold; 
+	letter-spacing: 1px;
+	margin: 0 !important;
+	padding: 7px 0 7px 0; 
+	text-align: right;
+}
+
+#userlinks p,
+#userlinksguest p{
+	font-weight: normal;
+	letter-spacing: 0;
+}
+
+#submenu p.home,
+#userlinks p.home,
+#userlinksguest p.home{
+	float: left;
+}
+
+#userlinksguest p.pcen{
+	text-align: center;
+}
+
+#submenu a:link, 
+#submenu  a:visited{ 
+	background: transparent; 
+	color: #3A4F6C; 
+	padding: 0 6px 0 6px;
+	text-decoration: none;
+}
+
+#submenu a:hover, 
+#submenu a:active{
+	background: transparent; 
+	color: #5176B5; 
+}
+#navstrip{ 
+	background: transparent;
+	color: #999;
+	font-size: 12px;
+	font-weight: bold;
+	margin: 0 0 5px 0;
+	padding: 8px 0 8px 0px; 
+}
+
+#navstrip a:link, 
+#navstrip  a:visited{ 
+	background: transparent; 
+	color: #222; 
+	text-decoration: none;
+}
+
+#navstrip a:hover, 
+#navstrip a:active{
+	background: transparent; 
+	color: #5176B5; 
+}
+
+.toplinks{
+	background: transparent;
+	color: #000;
+	margin: 0;
+	padding: 0 0 5px 0;
+	text-align: right;
+}
+
+.toplinks span{
+	background: #F0F5FA;
+	border: 1px solid #C2CFDF;
+	border-bottom: 0;
+	color: #000;
+	font-size: 10px;
+	font-weight: bold;
+	margin: 0 10px 0 0;
+	padding: 5px;
+}
+
+.copyright{ 
+	background: #EEE;
+	font-size: 11px; 
+	margin: 0 0 5px 0;
+	padding: 8px;
+}
+
+/* 
+ * ========================================
+ * print page styles 
+ * ========================================
+ */
+
+#print{
+	margin: 20px auto 20px auto;
+	padding: 0;
+	text-align: left;
+	width: 85%;
+}
+
+#print h1,
+#print h2,
+#print h3,
+#print h4,
+#print p{
+	color: #036;
+	font-size: 18px;
+	font-weight: bold;
+	margin: 0;
+	padding: 8px;
+}
+
+#print h2,
+#print h3,
+#print p{
+	border-bottom: 1px solid #999;
+	font-size: 11px;
+	font-weight: normal;
+}
+
+#print h3{
+	background: #F5F5F5;
+	font-size: 12px;
+	font-weight: bold;
+	margin: 0 0 10px 0;
+}
+
+#print h4{
+	background: #F9F9F9;
+	font-size: 11px;
+}
+
+#print p{
+	margin: 0 0 5px 0;
+	padding: 10px;
+}
+
+#print p.printcopy{
+	border: 0;
+	color: #000;
+	text-align: center;
+}
+
+EOF;
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20010/mysql_updates.php b/upload/upgrade/upg_20010/mysql_updates.php
new file mode 100644
index 00000000..4ed58346
--- /dev/null
+++ b/upload/upgrade/upg_20010/mysql_updates.php
@@ -0,0 +1,15 @@
+<?php
+
+# Fix bug where ICQ alt text missing last single quote
+
+$SQL[] = "DELETE FROM ibf_skin_macro WHERE macro_value='PRO_ICQ' and macro_set=1";
+$SQL[] = "INSERT INTO ibf_skin_macro (macro_value, macro_replace, macro_can_remove, macro_set) VALUES ('PRO_ICQ', '<img src=\'style_images/<#IMG_DIR#>/profile_icq.gif\' border=\'0\'  alt=\'ICQ\' />', 1, 1);";
+
+# Fix bug where update "msg_total=msg_total+1" doesn't update when msg_total is NULL
+
+$SQL[] = "ALTER TABLE ibf_members change msg_total msg_total smallint(5) default '0'";
+
+# Fix bug where "select * from members where temp_ban..." prevents NULL IS NOT NULL confusion
+
+$SQL[] = "ALTER TABLE ibf_members change temp_ban temp_ban varchar(100) default '0'";
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20010/version_history.php b/upload/upgrade/upg_20010/version_history.php
new file mode 100644
index 00000000..bc569531
--- /dev/null
+++ b/upload/upgrade/upg_20010/version_history.php
@@ -0,0 +1,17 @@
+<?php
+
+$import_versions = array(
+						 '20001' => '2.0.0 PDR 1',
+						 '20002' => '2.0.0 PDR 2',
+						 '20003' => '2.0.0 PDR 3',
+						 '20004' => '2.0.0 PDR 4',
+						 '20005' => '2.0.0 PDR 5',
+						 '20006' => '2.0.0 PF 1',
+						 '20007' => '2.0.0 PF 2',
+						 '20008' => '2.0.0 PF 3',
+						 '20009' => '2.0.0 PF 4',
+						 '20010' => '2.0.0 FINAL',
+					   );
+					   
+
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upg_20010/version_upgrade.php b/upload/upgrade/upg_20010/version_upgrade.php
new file mode 100644
index 00000000..912b31e5
--- /dev/null
+++ b/upload/upgrade/upg_20010/version_upgrade.php
@@ -0,0 +1,163 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE MODULE:: IPB 2.0.0 PF4 -> FINAL
+|   > Script written by Matt Mecham
+|   > Date started: 23rd April 2004
+|   > "So what, pop is dead - it's no great loss.
+	   So many facelifts, it's face flew off"
++--------------------------------------------------------------------------
+*/
+
+if ( ! defined( 'IN_IPB' ) )
+{
+	print "<h1>Incorrect access</h1>You cannot access this file directly. If you have recently upgraded, make sure you upgraded all the relevant files.";
+	exit();
+}
+
+class version_upgrade
+{
+	var $this_version = '20010';
+	var $upgrade_from = '20009';
+	var $first_step   = 'update your database to include the new schematic modifications.';
+	var $md5_check    = '';
+	var $base_url     = '';
+	var $mod_to_run   = '';
+	
+	/*-------------------------------------------------------------------------*/
+	// CONSTRUCTOR
+	/*-------------------------------------------------------------------------*/
+	
+	function version_upgrade()
+	{
+		global $ibforums, $std, $DB;
+		
+		$this->md5_check = $std->return_md5_check();
+		
+		$this->base_url  = "index.php?act=work&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}";
+		
+		if ( is_array( $ibforums->modules_to_run ) and count( $ibforums->modules_to_run ) )
+		{
+			$tmp = array_shift( $ibforums->modules_to_run );
+			
+			$this->mod_to_run = implode( ', ', $ibforums->modules_to_run );
+		}
+		
+		if ( ! $this->mod_to_run )
+		{
+			$this->mod_to_run = 'None';
+		}
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// Auto run..
+	/*-------------------------------------------------------------------------*/
+	
+	function auto_run()
+	{
+		global $ibforums, $std, $DB;
+		
+		//--------------------------------
+		// What are we doing?
+		//--------------------------------
+		
+		switch( $ibforums->input['workact'] )
+		{
+			case 'sql':
+				$this->upgrade_sql();
+				break;
+			default:
+				$this->upgrade_intro();
+				break;
+		}
+	}
+	
+	
+	/*-------------------------------------------------------------------------*/
+	// SQL
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_sql()
+	{
+		global $ibforums, $std, $DB;
+		
+		$cnt = 0;
+		$SQL = array();
+		
+		if ( file_exists( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/'.strtolower($ibforums->vars['sql_driver']).'_updates.php' ) )
+		{
+			require_once( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/'.strtolower($ibforums->vars['sql_driver']).'_updates.php' );
+		
+			foreach( $SQL as $q )
+			{
+				$DB->query( $q );
+				
+				$cnt++;
+			}
+		}
+		
+		//--------------------------------
+		// Upgrade templates
+		//--------------------------------
+		
+		require_once( THIS_PATH.'upg_'.$ibforums->current_upgrade.'/components.php' );
+		
+		$DB->do_update( 'skin_sets', array( 'set_css'           => $CSS,
+										    'set_cache_css'     => $CSS,
+										    'set_wrapper'       => $WRAPPER,
+										    'set_cache_wrapper' => $WRAPPER,
+										  ), 'set_skin_set_id=1' );
+		
+		$cnt++;
+		
+		//--------------------------------
+		// Next page...
+		//--------------------------------
+		
+		$ibforums->core->redirect( "index.php?act=done&loginkey={$ibforums->input['loginkey']}&securekey={$ibforums->input['securekey']}&mid={$ibforums->input['mid']}", "$cnt queries run...." );
+		
+	}
+	
+	/*-------------------------------------------------------------------------*/
+	// INTRO
+	/*-------------------------------------------------------------------------*/
+	
+	function upgrade_intro()
+	{
+		global $ibforums, $std, $DB;
+		
+		$ibforums->template->content .= "
+			<div class='tableborder'>
+			 <div class='maintitle'>Welcome to the IPB Upgrade System</div>
+			 <div class='tdrow1' style='padding:6px'>This upgrade module will upgrade you from <b>{$ibforums->versions[$this->upgrade_from]}</b> to <b>{$ibforums->versions[$this->this_version]}</b>
+			 <br /><br />This first step will {$this->first_step}
+			 <br /><br />
+			 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$this->base_url}&workact=sql'>Proceed...</a></span></div>
+			 </div>
+			</div>
+			<br />
+			<div align='center'>Modules to run after this module: {$this->mod_to_run}</div>
+			";
+		
+		$ibforums->template->output();
+		
+	}
+	
+}
+	
+	
+?>
\ No newline at end of file
diff --git a/upload/upgrade/upgrade.php b/upload/upgrade/upgrade.php
new file mode 100644
index 00000000..f35a8c71
--- /dev/null
+++ b/upload/upgrade/upgrade.php
@@ -0,0 +1,1596 @@
+<?php
+
+/*
++--------------------------------------------------------------------------
+|   Invision Power Board v2.0.0 
+|   ========================================
+|   by Matthew Mecham
+|   (c) 2001 - 2004 Invision Power Services
+|   http://www.invisionpower.com
+|   ========================================
+|   Web: http://www.invisionboard.com
+|   Time: Tue, 21 Sep 2004 16:34:28 GMT
+|   Release: 150aa7a702c3c8b6f6eb90ad49305d2f
+|   Email: matt@invisionpower.com
+|   Licence Info: http://www.invisionboard.com/?license
++---------------------------------------------------------------------------
+|
+|   > IPB UPGRADE 1.x -> 2.0!
+|   > Script written by Matt Mecham
+|   > Date started: 21st April 2004
+|   > Interesting fact: Radiohead rock (Rain down, Rain down,
+					   come on rain down. On me. From a great height)
++--------------------------------------------------------------------------
+*/
+
+//-----------------------------------------------
+// USER CONFIGURABLE ELEMENTS
+//-----------------------------------------------
+
+define( 'THIS_PATH'  , './'  );
+define( 'ROOT_PATH'  , "../" );
+define( 'KERNEL_PATH', ROOT_PATH.'ips_kernel/' );
+define( 'CACHE_PATH' , ROOT_PATH );
+//-----------------------------------------------
+// NO USER EDITABLE SECTIONS BELOW
+//-----------------------------------------------
+
+define ( 'IN_IPB', 0 );
+define ( 'IN_DEV', 0 );
+define ( 'SAFE_MODE_ON', 0 );
+define ( 'THIS_SCRIPT' , 'upgrade.php' );
+ 
+error_reporting  (E_ERROR | E_WARNING | E_PARSE);
+set_magic_quotes_runtime(0);
+@set_time_limit(0);
+
+//===========================================================================
+// MAIN PROGRAM
+//===========================================================================
+
+//--------------------------------
+// Import $INFO, now!
+//--------------------------------
+
+$INFO = array();
+
+require ROOT_PATH."conf_global.php";
+
+//--------------------------------
+// The clocks a' tickin'
+//--------------------------------
+		
+$Debug = new Debug;
+$Debug->startTimer();
+
+//--------------------------------
+// Load the DB driver and such
+//--------------------------------
+
+$INFO['sql_driver'] = !$INFO['sql_driver'] ? 'mysql' : $INFO['sql_driver'];
+$INFO['sql_driver'] = strtolower($INFO['sql_driver']);
+
+if ( ! @file_exists( ROOT_PATH.'sources/sql/'.strtolower($INFO['sql_driver']).'_admin_queries.php' ) )
+{
+	print "Cannot find the file: ".ROOT_PATH.'sources/sql/'.strtolower($INFO['sql_driver'])."_admin_queries.php - make sure the file exists before continuing.";
+	exit();
+}
+
+require ( KERNEL_PATH.'class_db_'.strtolower($INFO['sql_driver']).".php" );
+
+$DB = new db_driver;
+
+$DB->obj['sql_database']     = $INFO['sql_database'];
+$DB->obj['sql_user']         = $INFO['sql_user'];
+$DB->obj['sql_pass']         = $INFO['sql_pass'];
+$DB->obj['sql_host']         = $INFO['sql_host'];
+$DB->obj['sql_tbl_prefix']   = $INFO['sql_tbl_prefix'];
+$DB->obj['query_cache_file'] = ROOT_PATH.'sources/sql/'.strtolower($INFO['sql_driver']).'_admin_queries.php';
+$DB->obj['use_shutdown']     = 0;
+$DB->obj['debug']            = 0;
+
+//--------------------------------
+// Get a DB connection
+//--------------------------------
+
+$DB->connect();
+
+define ( 'SQL_DRIVER', strtolower($INFO['sql_driver']) );
+
+//--------------------------------
+// Wrap it all up in a nice easy to
+// transport super class
+//--------------------------------
+
+$ibforums = new info();
+
+//--------------------------------
+// Require our global functions
+//--------------------------------
+
+require ROOT_PATH."sources/functions.php";
+require KERNEL_PATH."class_converge.php";
+require THIS_PATH."core/functions.php";
+require THIS_PATH."core/template.php";
+
+$std    = new FUNC;
+
+//--------------------------------
+//  Set up our vars
+//--------------------------------
+
+$ibforums->input     = $std->parse_incoming();
+$ibforums->core      = new core_functions();
+$ibforums->template  = new template();
+$ibforums->base_url  = THIS_SCRIPT.'?';
+$ibforums->next_step = intval($ibforums->input['step']) + 1;
+
+//--------------------------------
+// GET QUERIES FILE (1.2 or 1.3)?
+// If we have subs table, it's 1.3
+//--------------------------------
+
+if ( ! $ibforums->input['version'] )
+{
+	if ( _check_for_two() )
+	{
+		$ibforums->input['version'] = '200';
+		print "You appear to be running IPB 2.0.0 already and no upgrade is required.";
+		exit();
+	}
+	else if ( $DB->field_exists( 'sub_id', SQL_PREFIX.'subscriptions' ) )
+	{
+		$ibforums->input['version'] = '103';
+	}
+	else if ( $DB->field_exists( 'perm_id', SQL_PREFIX.'forum_perms' ) )
+	{
+		$ibforums->input['version'] = '102';
+	}
+	else
+	{
+		$ibforums->input['version'] = '101';
+	}
+}
+
+switch( $ibforums->input['version'] )
+{
+	case '103':
+		define( 'UPGRADE_FROM', '1.3' );
+		require_once( THIS_PATH.'pre_20000/10003_'.strtolower($INFO['sql_driver']).'_queries.php' );
+		break;
+	case '102':
+		define( 'UPGRADE_FROM', '1.2' );
+		require_once( THIS_PATH.'pre_20000/10002_'.strtolower($INFO['sql_driver']).'_queries.php' );
+		break;
+	case '101':
+		define( 'UPGRADE_FROM', '1.1' );
+		require_once( THIS_PATH.'pre_20000/10001_'.strtolower($INFO['sql_driver']).'_queries.php' );
+		break;
+}
+
+$ibforums->sql = new upgrade_sql();
+
+//--------------------------------
+// Quitting on this step?
+//--------------------------------
+
+if ( $ibforums->input['dieafterstep'] )
+{
+	if ( $ibforums->input['step']  - 1 == $ibforums->input['dieafterstep'] )
+	{
+		$ibforums->template->content .= "
+			 <div class='tableborder'>
+			  <div class='maintitle'>You have chosen to stop before step {$ibforums->input['step']}</div>
+			  <div class='tdrow1' style='padding:6px'>The upgrade script has been been stopped as requested...
+			  </div>
+			 </div>
+			 ";
+	
+		$ibforums->template->output();
+		exit();
+	}
+}
+
+//--------------------------------
+// What in gods name are we doing?
+//--------------------------------
+
+switch ($ibforums->input['act'])
+{
+	case 'work':
+		
+		if ( intval( $ibforums->input['step'] ) )
+		{
+			$func_to_run = 'step_'.$ibforums->input['step'];
+		}
+		
+		$func_to_run();
+		
+		break;
+	
+	default:
+		show_intro();
+		break;
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 25: COMPLETED - YAY!!
+/*-------------------------------------------------------------------------*/
+
+function step_25()
+{
+	global $ibforums, $std, $DB;
+	
+	//-----------------------------------------
+	// Tidy up old skins
+	//-----------------------------------------
+	
+	$DB->simple_construct( array( 'select' => '*', 'from' => 'skin_sets' ) );
+	$DB->simple_exec();
+	
+	$skins = array();
+	
+	while( $r = $DB->fetch_row() )
+	{
+		$skins[] = $r['set_skin_set_id'];
+	}
+	
+	if ( count( $skins ) )
+	{
+		$DB->simple_exec_query( array( 'delete' => 'skin_templates', 'where' => 'set_id NOT IN('.implode( ',', $skins ).')' ) );
+		$DB->simple_exec_query( array( 'delete' => 'skin_macro'    , 'where' => 'macro_set NOT IN('.implode( ',', $skins ).')' ) );
+	}
+	
+	$DB->do_update( 'members', array( 'skin' => '' ) );
+	
+	//-----------------------------------------
+	// Convert major rows
+	//-----------------------------------------
+	
+	$major_pain_in_the_ass[] = array( 'global_board_header'    , 'skin_global', 'BoardHeader' );
+	$major_pain_in_the_ass[] = array( 'catheader_expanded'     , 'skin_boards', 'CatHeader_Expanded' );
+	$major_pain_in_the_ass[] = array( 'pagetop'                , 'skin_boards', 'PageTop' );
+	$major_pain_in_the_ass[] = array( 'forumrow'               , 'skin_boards', 'ForumRow' );
+	$major_pain_in_the_ass[] = array( 'pagetop'                , 'skin_forum' , 'PageTop' );
+	$major_pain_in_the_ass[] = array( 'tableend'               , 'skin_forum' , 'TableEnd' );
+	$major_pain_in_the_ass[] = array( 'render_forum_row'       , 'skin_forum' , 'RenderRow' );
+	$major_pain_in_the_ass[] = array( 'topic_page_top_new_mode', 'skin_topic' , 'PageTop' );
+	$major_pain_in_the_ass[] = array( 'tablefooter'            , 'skin_topic' , 'TableFooter' );
+	$major_pain_in_the_ass[] = array( 'renderrow'              , 'skin_topic' , 'RenderRow' );
+	
+	foreach( $major_pain_in_the_ass as $relief => $preperation_h )
+	{
+		$DB->do_update( 'skin_templates', array( 'func_name' => $preperation_h[0] ), "group_name='{$preperation_h[1]}' and func_name='{$preperation_h[2]}'" );
+	}
+	
+	//-----------------------------------------
+	// Update 'portal' skin
+	//-----------------------------------------
+	
+	$DB->do_update( 'skin_templates', array( 'group_name' => 'skin_portal' ), "group_name='skin_csite'" );
+	
+	//-----------------------------------------
+	// Drop old tables
+	//-----------------------------------------
+	
+	$DB->sql_drop_table( 'templates' );
+	$DB->sql_drop_table( 'macro_name' );
+	$DB->sql_drop_table( 'skins' );
+	$DB->sql_drop_table( 'css' );
+	
+	$ibforums->template->content .= "
+		<div class='tableborder'>
+		 <div class='maintitle'>Your upgrade is complete!</div>
+		 <div class='tdrow1' style='padding:6px'>The upgrade script has been run successfully and you're now running IPB 2.0.0</b>
+		 <br /><br />All of your current skins have been moved to a pre 2.0 parent. To use these skins, you'll need to first to the following:
+		 <ul>
+		  <li> Log into your Admin Control Panel
+		  <li> Click on 'Skins & Templates' and then on 'Skin Tools'
+		  <li> Use the tool 'Rebuild skin set cache on set...' on each of your original skins to rebuild their caches
+		 </ul>
+		 This will complete the import of your old skins. You will need to edit them to add in the new IPB 2.0.0 sections and to account for some of the renaming procedures.
+		 </div>
+		</div>
+		";
+	
+	$ibforums->template->output();
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 24: RECACHE & REBUILD
+/*-------------------------------------------------------------------------*/
+
+function step_24()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_24();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Rebuild completed - finishing up...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+	}
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 23: IMPORT SETTINGS
+/*-------------------------------------------------------------------------*/
+
+function step_23()
+{
+	global $INFO, $ibforums, $std, $DB;
+	
+	//-----------------------------------
+	// Get XML
+	//-----------------------------------
+	
+	require_once( KERNEL_PATH.'class_xml.php' );
+	
+	$xml = new class_xml();
+	
+	//-----------------------------------
+	// Get XML
+	//-----------------------------------
+	
+	require_once( KERNEL_PATH.'class_xml.php' );
+	
+	$xml = new class_xml();
+	
+	//-----------------------------------
+	// Get XML file
+	//-----------------------------------
+	
+	$xmlfile = ROOT_PATH.'install/installfiles/ipb_settings.xml';
+	
+	$setting_content = implode( "", file($xmlfile) );
+	
+	//-------------------------------
+	// Unpack the datafile
+	//-------------------------------
+	
+	$xml->xml_parse_document( $setting_content );
+	
+	//-------------------------------
+	// pArse
+	//-------------------------------
+	
+	$fields = array( 'conf_title', 'conf_description', 'conf_group', 'conf_type', 'conf_key', 'conf_value', 'conf_default',
+					 'conf_extra', 'conf_evalphp', 'conf_protected', 'conf_position', 'conf_start_group', 'conf_end_group', 'conf_help_key', 'conf_add_cache' );
+	
+	
+	if ( ! is_array( $xml->xml_array['settingexport']['settinggroup']['setting'] ) )
+	{
+		show_error("Error with ipb_settings.xml - could not process XML properly");
+	}
+
+	foreach( $xml->xml_array['settingexport']['settinggroup']['setting'] as $id => $entry )
+	{
+		if ( ! $entry['conf_key']['VALUE'] )
+		{
+			continue;
+		}
+		
+		$newrow = array();
+		
+		$entry['conf_value']['VALUE'] = "";
+		
+		if ( $INFO[ $entry['conf_key']['VALUE'] ] != "" and $INFO[ $entry['conf_key']['VALUE'] ] != $entry['conf_default']['VALUE'] )
+		{
+			$entry['conf_value']['VALUE'] = $INFO[ $entry['conf_key']['VALUE'] ];
+		}
+		
+		//-----------------------------------
+		// Special considerations?
+		//-----------------------------------
+		
+		if ( $entry['conf_key']['VALUE'] == 'img_ext' )
+		{
+			$entry['conf_value']['VALUE'] = str_replace( '|', ',', $entry['conf_value']['VALUE'] );
+		}
+		else if ( $entry['conf_key']['VALUE'] == 'photo_ext' )
+		{
+			$entry['conf_value']['VALUE'] = str_replace( '|', ',', $entry['conf_value']['VALUE'] );
+		}
+		else if ( $entry['conf_key']['VALUE'] == 'avatar_ext' )
+		{
+			$entry['conf_value']['VALUE'] = str_replace( '|', ',', $entry['conf_value']['VALUE'] );
+		}
+		
+		//-----------------------------------
+		// Make PHP slashes safe
+		//-----------------------------------
+		
+		$entry['conf_evalphp']['VALUE'] = str_replace( '\\', '\\\\', $entry['conf_evalphp']['VALUE'] );
+		
+		foreach( $fields as $f )
+		{
+			$newrow[$f] = $entry[ $f ]['VALUE'];
+		}
+		
+		$db_string = $DB->compile_db_insert_string($newrow);
+		$query = "INSERT INTO ".SQL_PREFIX."conf_settings (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+
+		if ( ! $DB->query($query) )
+		{
+			show_error($query."<br /><br />".$DB->error);
+		}
+	}
+	
+	$msg = "<b>Settings imported, recache & rebuild next...</b>";
+	$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg );
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 22: IMPORT SKINS & SETTINGS
+/*-------------------------------------------------------------------------*/
+
+function step_22()
+{
+	global $ibforums, $std, $DB;
+	
+	//-----------------------------------------
+	// Get old skins data
+	//-----------------------------------------
+	
+	$DB->simple_construct( array( 'select' => '*', 'from' => 'skins' ) );
+	$outer = $DB->simple_exec();
+	
+	while( $r = $DB->fetch_row( $outer ) )
+	{
+		//-----------------------------------------
+		// Get CSS
+		//-----------------------------------------
+		
+		$css = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'css', 'where' => 'cssid='.$r['css_id'] ) );
+		
+		//-----------------------------------------
+		// Get Wrapper
+		//-----------------------------------------
+		
+		$wrapper = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'templates', 'where' => 'tmid='.$r['tmpl_id'] ) );
+		
+		//-----------------------------------------
+		// Insert...
+		//-----------------------------------------
+		
+		$DB->do_insert( 'skin_sets', array(
+											'set_name'            => $r['sname'],
+											'set_image_dir'       => $r['img_dir'],
+											'set_hidden'          => 1,
+											'set_default'         => 0,
+											'set_css_method'      => 0,
+											'set_skin_set_parent' => 3,
+											'set_author_email'    => '',
+											'set_author_name'     => 'IPB 2.0 Import',
+											'set_author_url'      => '',
+											'set_css'             => stripslashes($css['css_text']),
+											'set_wrapper'         => stripslashes($wrapper['template']),
+											'set_emoticon_folder' => 'default',
+					 )                    );
+		
+		$new_id = $DB->get_insert_id();
+		 
+		//-----------------------------------------
+		// Update templates
+		//-----------------------------------------
+		
+		$DB->do_update( 'skin_templates', array( 'set_id' => $new_id ), 'set_id='.$r['set_id'] );
+		
+		//-----------------------------------------
+		// Update macros
+		//-----------------------------------------
+		
+		$DB->do_update( 'skin_macro', array( 'macro_set' => $new_id ), 'macro_set='.$r['set_id'] );
+	}
+	
+	//-----------------------------------
+	// Get XML
+	//-----------------------------------
+	
+	require_once( KERNEL_PATH.'class_xml.php' );
+	
+	$xml = new class_xml();
+	
+	//-----------------------------------
+	// Get XML file (TEMPLATES)
+	//-----------------------------------
+	
+	$xmlfile = ROOT_PATH.'ipb_templates.xml';
+	
+	$setting_content = implode( "", file($xmlfile) );
+	
+	//-------------------------------
+	// Unpack the datafile (TEMPLATES)
+	//-------------------------------
+	
+	$xml->xml_parse_document( $setting_content );
+	
+	//-------------------------------
+	// (TEMPLATES)
+	//-------------------------------
+	
+	if ( ! is_array( $xml->xml_array['templateexport']['templategroup']['template'] ) )
+	{
+		show_error("Error with ipb_templates.xml - could not process XML properly");
+	}
+
+	foreach( $xml->xml_array['templateexport']['templategroup']['template'] as $id => $entry )
+	{
+		$newrow = array();
+		
+		$newrow['group_name']      = $entry[ 'group_name' ]['VALUE'];
+		$newrow['section_content'] = $entry[ 'section_content' ]['VALUE'];
+		$newrow['func_name']       = $entry[ 'func_name' ]['VALUE'];
+		$newrow['func_data']       = $entry[ 'func_data' ]['VALUE'];
+		$newrow['set_id']          = 1;
+		$newrow['updated']         = time();
+		
+		$db_string = $DB->compile_db_insert_string($newrow);
+		$query = "INSERT INTO ".SQL_PREFIX."skin_templates (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+		
+		if ( ! $DB->query($query) )
+		{
+			show_error($query."<br /><br />".$DB->error);
+		}
+	}
+	
+	//-------------------------------
+	// GET MACRO
+	//-------------------------------
+	
+	$xmlfile = ROOT_PATH.'install/installfiles/ipb_macro.xml';
+	
+	$setting_content = implode( "", file($xmlfile) );
+	
+	//-------------------------------
+	// Unpack the datafile (MACRO)
+	//-------------------------------
+	
+	$xml->xml_parse_document( $setting_content );
+	
+	//-------------------------------
+	// (MACRO)
+	//-------------------------------
+	
+	if ( ! is_array( $xml->xml_array['macroexport']['macrogroup']['macro'] ) )
+	{
+		show_error("Error with ipb_macro.xml - could not process XML properly");
+	}
+
+	foreach( $xml->xml_array['macroexport']['macrogroup']['macro'] as $id => $entry )
+	{
+		$newrow = array();
+		
+		$newrow['macro_value']   = $entry[ 'macro_value' ]['VALUE'];
+		$newrow['macro_replace'] = $entry[ 'macro_replace' ]['VALUE'];
+		$newrow['macro_set']     = 1;
+		
+		$db_string = $DB->compile_db_insert_string($newrow);
+		$query = "INSERT INTO ".SQL_PREFIX."skin_macro (" .$db_string['FIELD_NAMES']. ") VALUES (". $db_string['FIELD_VALUES'] .")";
+		
+		if ( ! $DB->query($query) )
+		{
+			show_error($query."<br /><br />".$DB->error);
+		}
+	}
+	
+	//-------------------------------
+	// WRAPPER / CSS
+	//-------------------------------
+	
+	require_once( ROOT_PATH.'install/installfiles/components.php' );
+	
+	$wrapper_record = array( 'set_wrapper'	=>	$WRAPPER,
+							 'set_css'		=>	$CSS,
+						   );
+						   
+	$str = $DB->compile_db_update_string($wrapper_record);
+	$query = "UPDATE ".SQL_PREFIX."skin_sets set ".$str." where set_skin_set_id=1";
+
+	if ( ! $DB->query($query) )
+	{
+		show_error($query."<br /><br />".$DB->error);
+	}
+	
+	//-----------------------------------------
+	// Import XML
+	//-----------------------------------------
+	
+	$msg = "<b>Skins imported, importing settings...</b>";
+	$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+}
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 21: OPTIMIZE: Part 2
+/*-------------------------------------------------------------------------*/
+
+function step_21()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_21();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Optimization completed, new skins import next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 20: OPTIMIZE: Part 1
+/*-------------------------------------------------------------------------*/
+
+function step_20()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_20();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Optimization started...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 19: DROP TABLES
+/*-------------------------------------------------------------------------*/
+
+function step_19()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_19();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Old tables dropped, optimization next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 18: INSERTS
+/*-------------------------------------------------------------------------*/
+
+function step_18()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_18();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Inserts completed, dropping old tables next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 17: ALTER OTHER TABLES II
+/*-------------------------------------------------------------------------*/
+
+function step_17()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_17();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Other tables altered, converting forums next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 16: ALTER MEMBERS TABLE II
+/*-------------------------------------------------------------------------*/
+
+function step_16()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_16();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Members table altered, other tables next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 15: ALTER TOPIC TABLE II
+/*-------------------------------------------------------------------------*/
+
+function step_15()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_15();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Topic table altered, altering members table next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 14: ALTER POST TABLE II
+/*-------------------------------------------------------------------------*/
+
+function step_14()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_14();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Post table altered, altering topic table next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 13: CONVERT TOPIC MULTI_MODS
+/*-------------------------------------------------------------------------*/
+
+function step_13()
+{
+	global $ibforums, $std, $DB;
+	
+	$f = $DB->query("SELECT * FROM ibf_forums");
+
+	$final = array();
+	
+	while ( $r = $DB->fetch_row($f) )
+	{
+		$mmids = preg_split( "/,/", $r['topic_mm_id'], -1, PREG_SPLIT_NO_EMPTY );
+		
+		if ( is_array( $mmids ) )
+		{
+			foreach( $mmids as $m )
+			{
+				$final[ $m ][] = $r['id'];
+			}
+		}
+	}
+	
+	$real_final = array();
+	
+	foreach( $final as $id => $forums_ids )
+	{
+		$ff = implode( ",",$forums_ids );
+		
+		$DB->do_update( 'topic_mmod', array( 'mm_forums' => $ff ), 'mm_id='.$id );
+	}
+	
+	$msg = "<b>Topic multi-moderation converted, alterting tables, stage 2...</b>";
+	$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+}
+	
+/*-------------------------------------------------------------------------*/
+// STEP 12: CONVERT PMs
+/*-------------------------------------------------------------------------*/
+
+function step_12()
+{
+	global $ibforums, $std, $DB;
+	
+	$start = intval($_GET['st']);
+	$lend  = 300;
+	$end   = $start + $lend;
+
+	//-----------------------------------------
+	// In steps...
+	//-----------------------------------------
+	
+	$DB->simple_construct( array( 'select' => '*', 'from' => 'messages', 'limit' => array( $start, $lend ) ) );
+	$o = $DB->simple_exec();
+
+	//-----------------------------------------
+	// Do it...
+	//-----------------------------------------
+	
+	if ( $DB->get_num_rows() )
+	{
+		//-----------------------------------------
+		// Got some to convert!
+		//-----------------------------------------
+		
+		$ibforums->next_step--;
+		
+		while ( $r = $DB->fetch_row($o) )
+		{
+			if ( $r['vid'] != 'sent' )
+			{
+				$DB->do_insert( 'message_text',
+								array( 'msg_date'          => $r['msg_date'],
+									   'msg_post'          => $r['message'],
+									   'msg_cc_users'      => $r['cc_users'],
+									   'msg_author_id'     => $r['from_id'],
+									   'msg_sent_to_count' => 1,
+									   'msg_deleted_count' => 0,
+							  )      );
+							  
+				$msg_id = $DB->get_insert_id();
+				
+				$DB->do_insert( 'message_topics',
+								array( 'mt_msg_id'     => $msg_id,
+									   'mt_date'       => $r['msg_date'],
+									   'mt_title'      => $r['title'],
+									   'mt_from_id'    => $r['from_id'],
+									   'mt_to_id'      => $r['recipient_id'],
+									   'mt_vid_folder' => $r['vid'],
+									   'mt_read'       => $r['read_state'],
+									   'mt_tracking'   => $r['tracking'],
+									   'mt_owner_id'   => $r['recipient_id'],
+							 )        );
+			}
+			else
+			{
+				$DB->do_insert( 'message_text',
+								array( 'msg_date'          => $r['msg_date'],
+									   'msg_post'          => $r['message'],
+									   'msg_cc_users'      => $r['cc_users'],
+									   'msg_author_id'     => $r['from_id'],
+									   'msg_sent_to_count' => 1,
+									   'msg_deleted_count' => 0,
+							  )      );
+							  
+				$msg_id = $DB->get_insert_id();
+				
+				$DB->do_insert( 'message_topics',
+								array( 'mt_msg_id'     => $msg_id,
+									   'mt_date'       => $r['msg_date'],
+									   'mt_title'      => $r['title'],
+									   'mt_from_id'    => $r['from_id'],
+									   'mt_to_id'      => $r['recipient_id'],
+									   'mt_vid_folder' => $r['vid'],
+									   'mt_read'       => $r['read_state'],
+									   'mt_tracking'   => $r['tracking'],
+									   'mt_owner_id'   => $r['from_id'],
+							 )        );
+			}
+		
+		}
+		
+		$msg = "<b>Personal messages: $start to $end completed....</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}&st={$end}", $msg  );
+	}
+	else
+	{
+		$msg = "<b>Personal messages converted, proceeding to update topic multi-moderation...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+	}
+}
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 11: CONVERGE
+/*-------------------------------------------------------------------------*/
+
+function step_11()
+{
+	global $ibforums, $std, $DB;
+	
+	$start = intval($_GET['st']);
+	$lend  = 300;
+	$end   = $start + $lend;
+
+	//-----------------------------------------
+	// In steps...
+	//-----------------------------------------
+	
+	require_once( ROOT_PATH."ips_kernel/class_converge.php" );
+	$converge = new class_converge($DB);
+
+	$max = 0;
+
+	$DB->query("SELECT id FROM ibf_members where id > $end");
+
+	$max = $DB->fetch_row();
+	
+	$o = $DB->query( $ibforums->sql->sql_members_converge( $start, $end ) );
+
+	$found = 0;
+
+	//-----------------------------------------
+	// Do it...
+	//-----------------------------------------
+	
+	while ( $r = $DB->fetch_row($o) )
+	{
+		if ( ! $r['cid'] or ! $r['id'] )
+		{
+			$r['password'] = $r['password'] ? $r['password'] : $r['legacy_password'];
+			
+			$salt = $converge->generate_password_salt(5);
+			$salt = str_replace( '\\', "\\\\", $salt );
+			
+			$DB->do_insert( 'members_converge',
+							array( 'converge_id'        => $r['id'],
+								   'converge_email'     => $r['email'],
+								   'converge_joined'    => $r['joined'],
+								   'converge_pass_hash' => md5( md5($salt) . $r['password'] ),
+								   'converge_pass_salt' => $salt
+						 )       );
+						 
+			$DB->do_update( 'members', array( 'member_login_key' => $converge->generate_auto_log_in_key() ), 'id='.$r['id'] );
+		}
+		
+		$found++;
+	}
+	
+	if ( ! $found and ! $max['id'] )
+	{
+		$msg = "<b>Converge completed, converting personal messages...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+	}
+	else
+	{
+		$ibforums->next_step--;
+		
+		$msg = "<b>Converge added: $start to $end completed....</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}&st={$end}", $msg  );
+	}
+}
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 10: CHECK EMAIL ADDRESSES
+/*-------------------------------------------------------------------------*/
+
+function step_10()
+{
+	global $ibforums, $std, $DB;
+	
+	$start = intval($_GET['st']);
+	$lend  = 300;
+	$end   = $start + $lend;
+
+	//-----------------------------------------
+	// In steps...
+	//-----------------------------------------
+	
+	$o = $DB->query( $ibforums->sql->sql_members_email( $lend ) );
+
+	//-----------------------------------------
+	// Do it...
+	//-----------------------------------------
+	
+	while ( $r = $DB->fetch_row($o) )
+	{
+		if ( $r['count'] < 2 )
+		{
+			break;
+		}
+		else
+		{
+			$dupe_emails[] = $r['email'];
+		}
+	}
+	
+	if ( count( $dupe_emails ) )
+	{
+		foreach( $dupe_emails as $email )
+		{
+			$first = 0;
+			
+			$DB->query( "SELECT id, name, email FROM ibf_members WHERE email='{$email}' ORDER BY joined ASC" );
+			
+			while( $r = $DB->fetch_row() )
+			{
+				// First?
+				
+				if ( ! $first )
+				{
+					$first = 1;
+					continue;
+				}
+				else
+				{
+					// later dupe..
+					
+					$push_auth[] = $r['id'];
+				}
+			}
+		}
+		
+		if ( count( $push_auth ) )
+		{
+			$DB->do_update( 'member_extra', array( 'bio' => 'dupemail' ), 'id IN ('.implode(",", $push_auth).")" );
+			$DB->query( $ibforums->sql->sql_members_email_update( $push_auth ) );
+		}
+		
+		$ibforums->next_step--;
+		
+		$msg = "<b>Members email addresses checked $start to $end completed....</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}&st={$end}", $msg  );
+	}
+	else
+	{
+		$msg = "<b>Members email addresses checked, adding to converge...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 9: CONVERT MEMBERS
+/*-------------------------------------------------------------------------*/
+
+function step_9()
+{
+	global $ibforums, $std, $DB;
+	
+	$start = intval($_GET['st']);
+	$lend  = 300;
+	$end   = $start + $lend;
+
+	//-----------------------------------------
+	// In steps...
+	//-----------------------------------------
+	
+	$o = $DB->query( $ibforums->sql->sql_members( $start, $lend ) );
+
+	//-----------------------------------------
+	// Do it...
+	//-----------------------------------------
+	
+	if ( $DB->get_num_rows() )
+	{
+		//-----------------------------------------
+		// Got some to convert!
+		//-----------------------------------------
+		
+		$ibforums->next_step--;
+		
+		while ( $r = $DB->fetch_row($o) )
+		{
+			if ( $r['mextra'] )
+			{
+				$DB->do_update( 'member_extra',
+								array( 'aim_name'        => $r['aim_name'],
+									   'icq_number'      => $r['icq_number'],
+									   'website'         => $r['website'],
+									   'yahoo'           => $r['yahoo'],
+									   'interests'       => $r['interests'],
+									   'msnname'         => $r['msnname'],
+									   'vdirs'           => $r['vdirs'],
+									   'location'        => $r['location'],
+									   'signature'       => $r['signature'],
+									   'avatar_location' => $r['avatar'],
+									   'avatar_size'     => $r['avatar_size'],
+									   'avatar_type'     => preg_match( "/^upload\:/", $r['avatar'] ) ? 'upload' : ( preg_match( "#^http://#", $r['avatar'] ) ? 'url' : 'local' )
+							 ), 'id='.$r['mextra']        );
+			}
+			else
+			{
+				$DB->do_insert( 'member_extra',
+								array( 'id'              => $r['id'],
+									   'aim_name'        => $r['aim_name'],
+									   'icq_number'      => $r['icq_number'],
+									   'website'         => $r['website'],
+									   'yahoo'           => $r['yahoo'],
+									   'interests'       => $r['interests'],
+									   'msnname'         => $r['msnname'],
+									   'vdirs'           => $r['vdirs'],
+									   'location'        => $r['location'],
+									   'signature'       => $r['signature'],
+									   'avatar_location' => $r['avatar'],
+									   'avatar_size'     => $r['avatar_size'],
+									   'avatar_type'     => preg_match( "/^upload\:/", $r['avatar'] ) ? 'upload' : ( preg_match( "#^http://#", $r['avatar'] ) ? 'url' : 'local' )
+							 )  );
+			}
+		}
+		
+		$msg = "<b>Members adjusted $start to $end completed....</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}&st={$end}", $msg  );
+	}
+	else
+	{
+		$msg = "<b>Members converted, making members email addresses safe for converge...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+	}
+}
+
+
+/*-------------------------------------------------------------------------*/
+// STEP 8: CONVERT ATTACHMENTS
+/*-------------------------------------------------------------------------*/
+
+function step_8()
+{
+	global $ibforums, $std, $DB;
+	
+	$start = intval($_GET['st']);
+	$lend  = 300;
+	$end   = $start + $lend;
+
+	//-----------------------------------------
+	// In steps...
+	//-----------------------------------------
+	
+	$DB->simple_construct( array( "select" => '*',
+								  'from'   => 'posts',
+								  'where'  => "attach_file != ''",
+								  'limit'  => array( $start, $lend ) ) );
+					   		  
+	$outer = $DB->simple_exec();
+	
+	//-----------------------------------------
+	// Do it...
+	//-----------------------------------------
+	
+	if ( $DB->get_num_rows() )
+	{
+		//-----------------------------------------
+		// Got some to convert!
+		//-----------------------------------------
+		
+		$ibforums->next_step--;
+		
+		while( $r = $DB->fetch_row( $outer ) )
+		{
+			$image   = 0;
+			$ext     = strtolower( str_replace( ".", "", substr( $r['attach_file'], strrpos( $r['attach_file'], '.' ) ) ) );
+			$postkey = md5( $r['post_date'].','.$r['pid'] );
+			
+			if ( in_array( $ext, array( 'gif', 'jpeg', 'jpg', 'png' ) ) )
+			{
+				$image = 1;
+			}
+			
+			$DB->do_insert( 'attachments', array( 'attach_ext'       => $ext,
+												  'attach_file'      => $r['attach_file'],
+												  'attach_location'  => $r['attach_id'],
+												  'attach_is_image'  => $image,
+												  'attach_hits'      => $r['attach_hits'],
+												  'attach_date'      => $r['post_date'],
+												  'attach_pid'       => $r['pid'],
+												  'attach_post_key'  => $postkey,
+												  'attach_member_id' => $r['author_id'],
+												  'attach_approved'  => 1,
+												  'attach_filesize'  => @filesize( ROOT_PATH.'uploads/'.$r['attach_id'] ),
+						 )                      );
+						 
+			$DB->do_update( 'posts', array( 'post_key' => $postkey ), 'pid='.$r['pid'] );
+			$DB->simple_exec_query( array( 'update' => 'topics', 'set' => 'topic_hasattach=topic_hasattach+1', 'where' => 'tid='.$r['topic_id'] ) );
+		}
+		
+		$msg = "<b>Attachments $start to $end completed....</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}&st={$end}", $msg );
+	}
+	else
+	{
+		$msg = "<b>Attachments converted, converting members...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 7: CONVERT FORUMS
+/*-------------------------------------------------------------------------*/
+
+function step_7()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_7();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Forums converted, converting attachments next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg  );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 6: ALTER OTHER TABLES
+/*-------------------------------------------------------------------------*/
+
+function step_6()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_6();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Other tables altered, converting forums next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 5: ALTER MEMBERS TABLE
+/*-------------------------------------------------------------------------*/
+
+function step_5()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_5();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Members table altered, other tables next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 4: ALTER TOPIC TABLE
+/*-------------------------------------------------------------------------*/
+
+function step_4()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_4();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Topic table altered, altering members table next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 3: ALTER POST TABLE
+/*-------------------------------------------------------------------------*/
+
+function step_3()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_3();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Post table altered, altering topic table next...</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 2: ADD NEW TABLES
+/*-------------------------------------------------------------------------*/
+
+function step_2()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_2();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>New tables created. Altering tables (Part 1, section 1 - post table)</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+
+/*-------------------------------------------------------------------------*/
+// STEP 1: COPY FORUMS TABLE
+/*-------------------------------------------------------------------------*/
+
+function step_1()
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->sql->step_1();
+	
+	if ( count($ibforums->sql->error) )
+	{
+		show_error( implode( "<br />", $ibforums->sql->error ) );
+	}
+	else
+	{
+		$msg = "<b>Forums table backed up - creating new tables next....</b>";
+		$ibforums->core->redirect( "{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}", $msg ."<br /><br />".intval($ibforums->sql->sqlcount)." queries run successfully!" );
+	}
+}
+	
+/*-------------------------------------------------------------------------*/
+// STEP 0: SHOW INTRO
+/*-------------------------------------------------------------------------*/
+
+function show_intro()
+{
+	global $ibforums, $std, $DB;
+	
+	//-----------------------------------------
+	// Check for missing files
+	//-----------------------------------------
+	
+	$ibforums->template->content .= "
+		<div class='tableborder'>
+		 <div class='maintitle'>Welcome to the IPB ".UPGRADE_FROM." -> 2.0.0 Upgrade System</div>
+		 <div class='tdrow1' style='padding:6px'>This upgrade script will upgrade your ".UPGRADE_FROM.".x board to IPB 2.0.0</b>
+		 <br /><br />There are quite a few steps to perform to update your SQL tables and convert the current data over to the new system.
+		 <br /><br /><span style='color:red'><b>WARNING: This upgrade script WILL upgrade your current database tables AND there is NO 'downgrade' script!
+		 <br />PLEASE ensure that you have a very
+		 recent SQL back-up so that you can restore your working board quickly if you need to do so.
+		 <br />We cannot stress how important it is to ensure that you have a backup of this database before continuing</span>
+		 <br /><br />First step: Copying drastically altered SQL tables for use later in the convert program.
+		 <br /><br />
+		";
+		
+	$warnings   = array();
+	
+	$checkfiles = array( ROOT_PATH     ."ipb_templates.xml",
+						 ROOT_PATH     ."install/installfiles/components.php",
+						 ROOT_PATH     ."install/installfiles/ipb_macro.xml",
+						 ROOT_PATH     ."install/installfiles/ipb_settings.xml",
+						 ROOT_PATH     ."sources/sql",
+						 KERNEL_PATH   ."class_converge.php",
+						 KERNEL_PATH   ."class_xml.php",
+						 KERNEL_PATH   ."class_db_".SQL_DRIVER.".php",
+						 ROOT_PATH     ."conf_global.php",
+						 
+					  );
+					  
+	$writeable  = array( ROOT_PATH."conf_global.php",
+						 ROOT_PATH."skin_cache/"
+					   );
+	
+	foreach ( $checkfiles as $cf )
+	{
+		if ( ! file_exists($cf) )
+		{
+			$warnings[] = "Cannot locate the file '$cf'.";
+		}
+	}
+	
+	foreach ( $writeable as $cf )
+	{
+		if ( ! is_writeable($cf) )
+		{
+			$warnings[] = "Cannot write to the file '$cf'. Please CHMOD to 0777.";
+		}
+	}
+	
+	$phpversion = phpversion();
+	
+	//----------------------------------
+	// CHECK BASICS
+	//----------------------------------
+	
+	if ($phpversion < '4.1.0')
+	{
+		$warnings[] = "<b>You cannot install Invision Power Board. Invision Power Board requires PHP Version 4.1.0 or better.</b>";
+	}
+	
+	if ( ! function_exists('get_cfg_var') )
+	{
+		$warnings[] = "<b>You cannot install Invision Power Board. Your PHP installation isn't sufficient to run IPB.</b>";
+	}
+	
+	if ( ! function_exists('xml_parse_into_struct') )
+	{
+		$warnings[] = "<b>You cannot install Invision Power Board. IPB requires that the XML functions in PHP are enabled, please ask your host to enable XML.</b>";
+	}
+	
+	//----------------------------------
+	// Got error?
+	//----------------------------------
+	
+	if ( count($warnings) > 0 )
+	{
+	
+		$err_string = '&middot;'.implode( "<br /><br />&middot;", $warnings );
+	
+		$ibforums->template->content .= "<br /><br />
+							    <div class='warnbox'>
+							     <strong>Warning!</strong>
+							     <b>The following errors must be rectified before continuing!</b>
+								 <br><br>
+								 $err_string
+							    </div>";
+	}
+	else
+	{
+		$ibforums->template->content .= "<div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}'>Proceed...</a></span></div>";
+	}
+	
+	$ibforums->template->content .= "</div></div>";
+	
+	$ibforums->template->output();
+}
+
+/*-------------------------------------------------------------------------*/
+// check for IPB 2
+/*-------------------------------------------------------------------------*/
+
+function _check_for_two()
+{
+	global $DB, $std, $ibforums;
+	
+	if ( ! $DB->field_exists( 'cs_key', SQL_PREFIX.'cache_store' ) )
+	{
+		return 0;
+	}
+	
+	$r = $DB->simple_exec_query( array( 'select' => '*', 'from' => 'cache_store', 'where' => "cs_key='forum_cache'" ) );
+	
+	if ( $r['cs_value'] )
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+
+/*-------------------------------------------------------------------------*/
+// SHOW ERROR WITH CONTINUE
+/*-------------------------------------------------------------------------*/
+
+function show_error( $msg )
+{
+	global $ibforums, $std, $DB;
+	
+	$ibforums->template->content .= "
+		<div class='tableborder'>
+		 <div class='maintitle'>Error!</div>
+		 <div class='tdrow1' style='padding:6px'>The following error has been returned:</b>
+		 <br /><br />$msg
+		 <div align='center'><span style='font-weight:bold;font-size:14px'>&raquo; <a href='{$ibforums->base_url}&act=work&version={$ibforums->input['version']}&step={$ibforums->next_step}&dieafterstep={$ibforums->input['dieafterstep']}'>Continue regardless?</a></span></div>
+		 </div>
+		</div>
+		";
+	
+	$ibforums->template->output();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*-------------------------------------------------------------------------*/
+// Major fatal and possibly dangerous error...
+/*-------------------------------------------------------------------------*/
+
+function fatal_error($msg="")
+{
+	print $msg;
+	exit();
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+// DEBUG CLASS
+/*-------------------------------------------------------------------------*/
+
+class Debug
+{
+    function startTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $starttime = $mtime;
+    }
+    function endTimer()
+    {
+        global $starttime;
+        $mtime = microtime ();
+        $mtime = explode (' ', $mtime);
+        $mtime = $mtime[1] + $mtime[0];
+        $endtime = $mtime;
+        $totaltime = round (($endtime - $starttime), 5);
+        return $totaltime;
+    }
+}
+
+/*-------------------------------------------------------------------------*/
+// INFO CLASS
+/*-------------------------------------------------------------------------*/
+
+class info {
+
+	var $member          = array();
+	var $input           = array();
+	var $base_url        = "";
+	var $vars            = "";
+	var $upgrade_history = array();
+	var $current_version = '';
+    var $loginkey        = '';
+    var $securekey       = '';
+    var $current_action  = '';
+    var $safe_act        = array( 'recache', 'templates', 'templatescache', 'finish' );
+    
+	function info()
+	{
+		global $sess, $std, $DB, $INFO;
+		
+		$this->vars = &$INFO;
+	}
+}
+
+
+?>
\ No newline at end of file